Revert 165041 (caused http://crbug.com/158995, which is apparently somewhat

tricky to fix -- this can reland with the fix)
- Move Chromoting strings to string_resources.grd.

Previously all strings were in messages.json files. Moving them to GRD 
file will allow to share them with native components. Also added script 
that I used to convert translations - to make it easier to review this 
CL and just in case we need it again in the future.


Review URL: https://chromiumcodereview.appspot.com/11150008

TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11312087

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

1 files changed, 48 insertions, 100 deletions

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index a11c523e..4d7e4ca 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -34,8 +34,6 @@
     'branding_path': '../remoting/branding_<(branding)',
     'copyright_info': '<!(python <(version_py_path) -f <(branding_path) -t "@COPYRIGHT@")',
 
-    'webapp_locale_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/webapp/_locales',
-
     # Use consistent strings across all platforms.
     # These values must match host/plugin/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
@@ -74,52 +72,52 @@
 
       ['branding=="Chrome"', {
         'remoting_webapp_locale_files': [
-          '<(webapp_locale_dir)/ar/messages.json',
-          '<(webapp_locale_dir)/bg/messages.json',
-          '<(webapp_locale_dir)/ca/messages.json',
-          '<(webapp_locale_dir)/cs/messages.json',
-          '<(webapp_locale_dir)/da/messages.json',
-          '<(webapp_locale_dir)/de/messages.json',
-          '<(webapp_locale_dir)/el/messages.json',
-          '<(webapp_locale_dir)/en/messages.json',
-          '<(webapp_locale_dir)/en_GB/messages.json',
-          '<(webapp_locale_dir)/es/messages.json',
-          '<(webapp_locale_dir)/es_419/messages.json',
-          '<(webapp_locale_dir)/et/messages.json',
-          '<(webapp_locale_dir)/fi/messages.json',
-          '<(webapp_locale_dir)/fil/messages.json',
-          '<(webapp_locale_dir)/fr/messages.json',
-          '<(webapp_locale_dir)/he/messages.json',
-          '<(webapp_locale_dir)/hi/messages.json',
-          '<(webapp_locale_dir)/hr/messages.json',
-          '<(webapp_locale_dir)/hu/messages.json',
-          '<(webapp_locale_dir)/id/messages.json',
-          '<(webapp_locale_dir)/it/messages.json',
-          '<(webapp_locale_dir)/ja/messages.json',
-          '<(webapp_locale_dir)/ko/messages.json',
-          '<(webapp_locale_dir)/lt/messages.json',
-          '<(webapp_locale_dir)/lv/messages.json',
-          '<(webapp_locale_dir)/nb/messages.json',
-          '<(webapp_locale_dir)/nl/messages.json',
-          '<(webapp_locale_dir)/pl/messages.json',
-          '<(webapp_locale_dir)/pt_BR/messages.json',
-          '<(webapp_locale_dir)/pt_PT/messages.json',
-          '<(webapp_locale_dir)/ro/messages.json',
-          '<(webapp_locale_dir)/ru/messages.json',
-          '<(webapp_locale_dir)/sk/messages.json',
-          '<(webapp_locale_dir)/sl/messages.json',
-          '<(webapp_locale_dir)/sr/messages.json',
-          '<(webapp_locale_dir)/sv/messages.json',
-          '<(webapp_locale_dir)/th/messages.json',
-          '<(webapp_locale_dir)/tr/messages.json',
-          '<(webapp_locale_dir)/uk/messages.json',
-          '<(webapp_locale_dir)/vi/messages.json',
-          '<(webapp_locale_dir)/zh_CN/messages.json',
-          '<(webapp_locale_dir)/zh_TW/messages.json',
+          'webapp/_locales.official/ar/messages.json',
+          'webapp/_locales.official/bg/messages.json',
+          'webapp/_locales.official/ca/messages.json',
+          'webapp/_locales.official/cs/messages.json',
+          'webapp/_locales.official/da/messages.json',
+          'webapp/_locales.official/de/messages.json',
+          'webapp/_locales.official/el/messages.json',
+          'webapp/_locales.official/en/messages.json',
+          'webapp/_locales.official/en_GB/messages.json',
+          'webapp/_locales.official/es/messages.json',
+          'webapp/_locales.official/es_419/messages.json',
+          'webapp/_locales.official/et/messages.json',
+          'webapp/_locales.official/fi/messages.json',
+          'webapp/_locales.official/fil/messages.json',
+          'webapp/_locales.official/fr/messages.json',
+          'webapp/_locales.official/he/messages.json',
+          'webapp/_locales.official/hi/messages.json',
+          'webapp/_locales.official/hr/messages.json',
+          'webapp/_locales.official/hu/messages.json',
+          'webapp/_locales.official/id/messages.json',
+          'webapp/_locales.official/it/messages.json',
+          'webapp/_locales.official/ja/messages.json',
+          'webapp/_locales.official/ko/messages.json',
+          'webapp/_locales.official/lt/messages.json',
+          'webapp/_locales.official/lv/messages.json',
+          'webapp/_locales.official/nb/messages.json',
+          'webapp/_locales.official/nl/messages.json',
+          'webapp/_locales.official/pl/messages.json',
+          'webapp/_locales.official/pt_BR/messages.json',
+          'webapp/_locales.official/pt_PT/messages.json',
+          'webapp/_locales.official/ro/messages.json',
+          'webapp/_locales.official/ru/messages.json',
+          'webapp/_locales.official/sk/messages.json',
+          'webapp/_locales.official/sl/messages.json',
+          'webapp/_locales.official/sr/messages.json',
+          'webapp/_locales.official/sv/messages.json',
+          'webapp/_locales.official/th/messages.json',
+          'webapp/_locales.official/tr/messages.json',
+          'webapp/_locales.official/uk/messages.json',
+          'webapp/_locales.official/vi/messages.json',
+          'webapp/_locales.official/zh_CN/messages.json',
+          'webapp/_locales.official/zh_TW/messages.json',
         ],
       }, {  # else: branding!="Chrome"
         'remoting_webapp_locale_files': [
-          '<(webapp_locale_dir)/en/messages.json',
+          'webapp/_locales/en/messages.json',
         ],
       }],
       ['OS=="win"', {
@@ -1216,7 +1214,6 @@
       'target_name': 'remoting_webapp',
       'type': 'none',
       'dependencies': [
-        'remoting_resources',
         'remoting_host_plugin',
       ],
       'sources': [
@@ -1238,7 +1235,7 @@
           'action_name': 'Verify Remoting WebApp i18n',
           'inputs': [
             'host/plugin/host_script_object.cc',
-            '<(webapp_locale_dir)/en/messages.json',
+            'webapp/_locales/en/messages.json',
             'webapp/client_screen.js',
             'webapp/host_controller.js',
             'webapp/host_table_entry.js',
@@ -1255,7 +1252,7 @@
             'python',
             'webapp/verify-webapp.py',
             '<(PRODUCT_DIR)/remoting/webapp_verified.stamp',
-            '<(webapp_locale_dir)/en/messages.json',
+            'webapp/_locales/en/messages.json',
             'webapp/client_screen.js',
             'webapp/host_controller.js',
             'webapp/host_table_entry.js',
@@ -1365,58 +1362,9 @@
         # Copy results to the product directory.
         {
           'destination': '<(PRODUCT_DIR)/remoting_locales',
-          'conditions': [
-            ['branding=="Chrome"', {
-              'files': [
-                '<(grit_out_dir)/remoting/resources/ar.pak',
-                '<(grit_out_dir)/remoting/resources/bg.pak',
-                '<(grit_out_dir)/remoting/resources/ca.pak',
-                '<(grit_out_dir)/remoting/resources/cs.pak',
-                '<(grit_out_dir)/remoting/resources/da.pak',
-                '<(grit_out_dir)/remoting/resources/de.pak',
-                '<(grit_out_dir)/remoting/resources/el.pak',
-                '<(grit_out_dir)/remoting/resources/en-US.pak',
-                '<(grit_out_dir)/remoting/resources/en-GB.pak',
-                '<(grit_out_dir)/remoting/resources/es.pak',
-                '<(grit_out_dir)/remoting/resources/es-419.pak',
-                '<(grit_out_dir)/remoting/resources/et.pak',
-                '<(grit_out_dir)/remoting/resources/fi.pak',
-                '<(grit_out_dir)/remoting/resources/fil.pak',
-                '<(grit_out_dir)/remoting/resources/fr.pak',
-                '<(grit_out_dir)/remoting/resources/he.pak',
-                '<(grit_out_dir)/remoting/resources/hi.pak',
-                '<(grit_out_dir)/remoting/resources/hr.pak',
-                '<(grit_out_dir)/remoting/resources/hu.pak',
-                '<(grit_out_dir)/remoting/resources/id.pak',
-                '<(grit_out_dir)/remoting/resources/it.pak',
-                '<(grit_out_dir)/remoting/resources/ja.pak',
-                '<(grit_out_dir)/remoting/resources/ko.pak',
-                '<(grit_out_dir)/remoting/resources/lt.pak',
-                '<(grit_out_dir)/remoting/resources/lv.pak',
-                '<(grit_out_dir)/remoting/resources/nb.pak',
-                '<(grit_out_dir)/remoting/resources/nl.pak',
-                '<(grit_out_dir)/remoting/resources/pl.pak',
-                '<(grit_out_dir)/remoting/resources/pt-BR.pak',
-                '<(grit_out_dir)/remoting/resources/pt-PT.pak',
-                '<(grit_out_dir)/remoting/resources/ro.pak',
-                '<(grit_out_dir)/remoting/resources/ru.pak',
-                '<(grit_out_dir)/remoting/resources/sk.pak',
-                '<(grit_out_dir)/remoting/resources/sl.pak',
-                '<(grit_out_dir)/remoting/resources/sr.pak',
-                '<(grit_out_dir)/remoting/resources/sv.pak',
-                '<(grit_out_dir)/remoting/resources/th.pak',
-                '<(grit_out_dir)/remoting/resources/tr.pak',
-                '<(grit_out_dir)/remoting/resources/uk.pak',
-                '<(grit_out_dir)/remoting/resources/vi.pak',
-                '<(grit_out_dir)/remoting/resources/zh-CN.pak',
-                '<(grit_out_dir)/remoting/resources/zh-TW.pak',
-              ],
-            }, {  # else: branding!="Chrome"
-              'files': [
-                '<(grit_out_dir)/remoting/resources/en-US.pak',
-              ]
-            }]
-          ],
+          'files': [
+            '<(grit_out_dir)/remoting/resources/en-US.pak',
+          ]
         },
         {
           'destination': '<(PRODUCT_DIR)',