diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
index a40766a1047138..b8ef5240256461 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/chrome/chrome_repack_locales.gni
@@ -47,8 +47,10 @@ template("_repack_one_locale") {
if (is_chromeos) {
sources += [
"${root_gen_dir}/ui/chromeos/strings/ui_chromeos_strings_${locale}.pak",
+ "${root_gen_dir}/remoting/resources/${locale}.pak",
]
deps += [
+ "//remoting/resources",
"//ui/chromeos/strings",
]
}
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index eb1914dcb0c890..67f4d8b4002b9a 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -462,6 +462,7 @@
}],
['chromeos==1', {
'dependencies': [
+ '<(DEPTH)/remoting/remoting.gyp:remoting_resources',
'<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
'<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
],
diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py
index 0c56fe507fc1df..a5a8e9fc56a503 100755
--- a/chrome/tools/build/repack_locales.py
+++ b/chrome/tools/build/repack_locales.py
@@ -97,6 +97,8 @@ def calc_inputs(locale):
if CHROMEOS:
inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'chromeos', 'strings',
'ui_chromeos_strings_%s.pak' % locale))
+ inputs.append(os.path.join(SHARE_INT_DIR, 'remoting', 'resources',
+ '%s.pak' % locale))
if OS != 'ios':
#e.g.
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 638135e2f051de..ca2db490715246 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -158,7 +158,6 @@
],
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)',
- 'grit_resource_ids': 'resources/resource_ids',
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/main.html',
'base/resources_unittest.cc',
diff --git a/remoting/resources/BUILD.gn b/remoting/resources/BUILD.gn
index 5d17f337f6b475..085ac3f14b6786 100644
--- a/remoting/resources/BUILD.gn
+++ b/remoting/resources/BUILD.gn
@@ -6,8 +6,10 @@ import("//tools/grit/grit_rule.gni")
# See also remoting_locales_with_underscores below.
remoting_locales = [
+ "am",
"ar",
"bg",
+ "bn",
"ca",
"cs",
"da",
@@ -18,9 +20,12 @@ remoting_locales = [
"es",
"es-419",
"et",
+ "fa",
+ "fake-bidi",
"fi",
"fil",
"fr",
+ "gu",
"he",
"hi",
"hr",
@@ -28,9 +33,13 @@ remoting_locales = [
"id",
"it",
"ja",
+ "kn",
"ko",
"lt",
"lv",
+ "ml",
+ "mr",
+ "ms",
"nb",
"nl",
"pl",
@@ -42,6 +51,9 @@ remoting_locales = [
"sl",
"sr",
"sv",
+ "sw",
+ "ta",
+ "te",
"th",
"tr",
"uk",
@@ -56,6 +68,7 @@ remoting_locales_with_underscores = remoting_locales
remoting_locales_with_underscores -= [
"en-GB",
"es-419",
+ "fake-bidi",
"pt-BR",
"pt-PT",
"zh-CN",
@@ -64,12 +77,18 @@ remoting_locales_with_underscores -= [
remoting_locales_with_underscores += [
"en_GB",
"es_419",
+ "fake_bidi",
"pt_BR",
"pt_PT",
"zh_CN",
"zh_TW",
]
+if (is_chromeos) {
+ remoting_locales += ["en-US"]
+ remoting_locales_with_underscores += ["en_US"]
+}
+
group("resources") {
deps = [
":copy_locales",
@@ -134,8 +153,6 @@ grit("strings") {
# generated file root.
output_dir = root_gen_dir
- resource_ids = "resource_ids"
-
outputs = [
"remoting/base/string_resources.h",
]
diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd
index 764cf78e2b8f6a..99bc94ac709f24 100644
--- a/remoting/resources/remoting_strings.grd
+++ b/remoting/resources/remoting_strings.grd
@@ -6,31 +6,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -43,21 +87,32 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -65,6 +120,7 @@
+
@@ -72,10 +128,14 @@
+
+
+
+
@@ -87,6 +147,9 @@
+
+
+
@@ -144,6 +207,7 @@
+
diff --git a/remoting/resources/resource_ids b/remoting/resources/resource_ids
deleted file mode 100644
index 3becde5684453e..00000000000000
--- a/remoting/resources/resource_ids
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-# This file is used to assign starting resource ids for resources and strings
-# used by Chromoting. This is done to ensure that resource ids are unique
-# across all the grd files. If you are adding a new grd file, please add
-# a new entry to this file.
-#
-# The first entry in the file, SRCDIR, is special: It is a relative path from
-# this file to the base of your checkout.
-#
-# http://msdn.microsoft.com/en-us/library/t2zechd4(VS.71).aspx says that the
-# range for IDR_ is 1 to 28,671 and the range for IDS_ is 1 to 32,767 and
-# common convention starts practical use of IDs at 100 or 101.
-{
- "SRCDIR": "../..",
-
- "remoting/resources/remoting_strings.grd": {
- "messages": [1000],
- },
-}
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 7fa7d9f1bbfe07..a1fce5c1f10384 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -10,7 +10,7 @@
# The first entry in the file, SRCDIR, is special: It is a relative path from
# this file to the base of your checkout.
#
-# The range of ID values, which is used by pak files, is from 0 to 2^16 - 1.
+# The range of ID values, which is used by pak files, is from 0 to 2^16 - 1.
{
"SRCDIR": "../..",
@@ -215,6 +215,9 @@
"chrome/app/address_input_strings.grd": {
"messages": [29100],
},
+ "remoting/resources/remoting_strings.grd": {
+ "messages": [29550],
+ },
"components/components_strings.grd": {
"messages": [30000],
},