Use grit to generate locale rc files and remove the old locale rc files from the tree.

I made a small change to grit so we can use our resource ID as the translation ID making it a bit easier to read.

The old locale_settings*.rc files would #include the google_strings.rc or chromium_strings.rc.  Instead, I added it to the vcproj file using $(CHROMIUM_BUILD) to grab the right file.  This required changing the output names in the grd files.

TBR=deanm

Review URL: http://codereview.chromium.org/39152

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

50 files changed, 250 insertions, 50 deletions

diff --git a/chrome/app/locales/ar.vcproj b/chrome/app/locales/ar.vcproj
index a6905e8..e972e43 100644
--- a/chrome/app/locales/ar.vcproj
+++ b/chrome/app/locales/ar.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_ar.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ar.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ar.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_ar.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/bg.vcproj b/chrome/app/locales/bg.vcproj
index c6a1999..beecc27 100644
--- a/chrome/app/locales/bg.vcproj
+++ b/chrome/app/locales/bg.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_bg.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_bg.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_bg.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_bg.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/bn.vcproj b/chrome/app/locales/bn.vcproj
index 2286ccb..6f585cb 100644
--- a/chrome/app/locales/bn.vcproj
+++ b/chrome/app/locales/bn.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_bn.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_bn.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_bn.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_bn.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/ca.vcproj b/chrome/app/locales/ca.vcproj
index d5060ad..d5245f9 100644
--- a/chrome/app/locales/ca.vcproj
+++ b/chrome/app/locales/ca.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_ca.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ca.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ca.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_ca.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/cs.vcproj b/chrome/app/locales/cs.vcproj
index 18868ee..b4fd610 100644
--- a/chrome/app/locales/cs.vcproj
+++ b/chrome/app/locales/cs.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_cs.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_cs.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_cs.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_cs.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/da.vcproj b/chrome/app/locales/da.vcproj
index dd54dc6..9fbf9f7 100644
--- a/chrome/app/locales/da.vcproj
+++ b/chrome/app/locales/da.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_da.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_da.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_da.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_da.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/de.vcproj b/chrome/app/locales/de.vcproj
index 01ded29..8291075 100644
--- a/chrome/app/locales/de.vcproj
+++ b/chrome/app/locales/de.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_de.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_de.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_de.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_de.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/el.vcproj b/chrome/app/locales/el.vcproj
index 33a44b3..8e0ba03 100644
--- a/chrome/app/locales/el.vcproj
+++ b/chrome/app/locales/el.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_el.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_el.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_el.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_el.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/en-GB.vcproj b/chrome/app/locales/en-GB.vcproj
index 5b84029..944fdb9 100644
--- a/chrome/app/locales/en-GB.vcproj
+++ b/chrome/app/locales/en-GB.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_en-GB.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_en-GB.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-GB.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_en-GB.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/en-US.vcproj b/chrome/app/locales/en-US.vcproj
index 1970cdf..ea6c3be 100644
--- a/chrome/app/locales/en-US.vcproj
+++ b/chrome/app/locales/en-US.vcproj
@@ -146,13 +146,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_en-US.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_en-US.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-US.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_en-US.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/es-419.vcproj b/chrome/app/locales/es-419.vcproj
index c5aee26..b4673e1 100644
--- a/chrome/app/locales/es-419.vcproj
+++ b/chrome/app/locales/es-419.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_es-419.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_es-419.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_es-419.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_es-419.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/es.vcproj b/chrome/app/locales/es.vcproj
index 9db651f..a3b0761 100644
--- a/chrome/app/locales/es.vcproj
+++ b/chrome/app/locales/es.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_es.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_es.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_es.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_es.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/et.vcproj b/chrome/app/locales/et.vcproj
index 5a42c05..00806f6 100644
--- a/chrome/app/locales/et.vcproj
+++ b/chrome/app/locales/et.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_et.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_et.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_et.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_et.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/fi.vcproj b/chrome/app/locales/fi.vcproj
index ad86bd0..7284f68 100644
--- a/chrome/app/locales/fi.vcproj
+++ b/chrome/app/locales/fi.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_fi.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_fi.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fi.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_fi.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/fil.vcproj b/chrome/app/locales/fil.vcproj
index 6f90057..1566861 100644
--- a/chrome/app/locales/fil.vcproj
+++ b/chrome/app/locales/fil.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_fil.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_fil.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fil.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_fil.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/fr.vcproj b/chrome/app/locales/fr.vcproj
index 3e7aada..816d4d8 100644
--- a/chrome/app/locales/fr.vcproj
+++ b/chrome/app/locales/fr.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_fr.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_fr.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fr.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_fr.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/gu.vcproj b/chrome/app/locales/gu.vcproj
index 16d26ab..0ae14f6 100644
--- a/chrome/app/locales/gu.vcproj
+++ b/chrome/app/locales/gu.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_gu.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_gu.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_gu.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_gu.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/he.vcproj b/chrome/app/locales/he.vcproj
index f2772f0..191adaa 100644
--- a/chrome/app/locales/he.vcproj
+++ b/chrome/app/locales/he.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_he.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_he.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_he.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_he.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/hi.vcproj b/chrome/app/locales/hi.vcproj
index 86877ed..4fb374b 100644
--- a/chrome/app/locales/hi.vcproj
+++ b/chrome/app/locales/hi.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_hi.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_hi.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hi.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_hi.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/hr.vcproj b/chrome/app/locales/hr.vcproj
index 2f2e49b..1d7f4d5 100644
--- a/chrome/app/locales/hr.vcproj
+++ b/chrome/app/locales/hr.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_hr.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_hr.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hr.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_hr.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/hu.vcproj b/chrome/app/locales/hu.vcproj
index 2e1d4d1..bb1a1a6 100644
--- a/chrome/app/locales/hu.vcproj
+++ b/chrome/app/locales/hu.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_hu.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_hu.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hu.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_hu.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/id.vcproj b/chrome/app/locales/id.vcproj
index 0f9e190..17bc92a 100644
--- a/chrome/app/locales/id.vcproj
+++ b/chrome/app/locales/id.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_id.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_id.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_id.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_id.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/it.vcproj b/chrome/app/locales/it.vcproj
index 10641dd..bb8632f 100644
--- a/chrome/app/locales/it.vcproj
+++ b/chrome/app/locales/it.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_it.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_it.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_it.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_it.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/ja.vcproj b/chrome/app/locales/ja.vcproj
index 83a4965..8b88fc8 100644
--- a/chrome/app/locales/ja.vcproj
+++ b/chrome/app/locales/ja.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_ja.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ja.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ja.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_ja.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/kn.vcproj b/chrome/app/locales/kn.vcproj
index 2e63392..7179c08 100644
--- a/chrome/app/locales/kn.vcproj
+++ b/chrome/app/locales/kn.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_kn.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_kn.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_kn.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_kn.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/ko.vcproj b/chrome/app/locales/ko.vcproj
index a71d5cb..91dc2b0 100644
--- a/chrome/app/locales/ko.vcproj
+++ b/chrome/app/locales/ko.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_ko.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ko.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ko.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_ko.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/lt.vcproj b/chrome/app/locales/lt.vcproj
index 4496dc2..170c078 100644
--- a/chrome/app/locales/lt.vcproj
+++ b/chrome/app/locales/lt.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_lt.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_lt.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_lt.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_lt.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/lv.vcproj b/chrome/app/locales/lv.vcproj
index b209c16..3e8aa3a 100644
--- a/chrome/app/locales/lv.vcproj
+++ b/chrome/app/locales/lv.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_lv.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_lv.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_lv.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_lv.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/ml.vcproj b/chrome/app/locales/ml.vcproj
index 36be6f5..6b37f02 100644
--- a/chrome/app/locales/ml.vcproj
+++ b/chrome/app/locales/ml.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_ml.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ml.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ml.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_ml.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/mr.vcproj b/chrome/app/locales/mr.vcproj
index 7521069..ba0b230 100644
--- a/chrome/app/locales/mr.vcproj
+++ b/chrome/app/locales/mr.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_mr.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_mr.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_mr.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_mr.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/nb.vcproj b/chrome/app/locales/nb.vcproj
index e5bd161..ddd5d60 100644
--- a/chrome/app/locales/nb.vcproj
+++ b/chrome/app/locales/nb.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_nb.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_nb.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_nb.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_nb.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/nl.vcproj b/chrome/app/locales/nl.vcproj
index 0b45f0e..5964888 100644
--- a/chrome/app/locales/nl.vcproj
+++ b/chrome/app/locales/nl.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_nl.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_nl.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_nl.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_nl.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/or.vcproj b/chrome/app/locales/or.vcproj
index 359cab4..04779ec 100644
--- a/chrome/app/locales/or.vcproj
+++ b/chrome/app/locales/or.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_or.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_or.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_or.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_or.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/pl.vcproj b/chrome/app/locales/pl.vcproj
index 7a2ec9f..186b933 100644
--- a/chrome/app/locales/pl.vcproj
+++ b/chrome/app/locales/pl.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_pl.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_pl.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pl.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_pl.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/pt-BR.vcproj b/chrome/app/locales/pt-BR.vcproj
index a570f29..fa4293c 100644
--- a/chrome/app/locales/pt-BR.vcproj
+++ b/chrome/app/locales/pt-BR.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_pt-BR.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_pt-BR.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pt-BR.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_pt-BR.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/pt-PT.vcproj b/chrome/app/locales/pt-PT.vcproj
index c0d30305..600077e 100644
--- a/chrome/app/locales/pt-PT.vcproj
+++ b/chrome/app/locales/pt-PT.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_pt-PT.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_pt-PT.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pt-PT.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_pt-PT.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/ro.vcproj b/chrome/app/locales/ro.vcproj
index 933ee8a..e662853 100644
--- a/chrome/app/locales/ro.vcproj
+++ b/chrome/app/locales/ro.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_ro.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ro.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ro.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_ro.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/ru.vcproj b/chrome/app/locales/ru.vcproj
index b665412..0acec23 100644
--- a/chrome/app/locales/ru.vcproj
+++ b/chrome/app/locales/ru.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_ru.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ru.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ru.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_ru.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/sk.vcproj b/chrome/app/locales/sk.vcproj
index 61779df..4772679 100644
--- a/chrome/app/locales/sk.vcproj
+++ b/chrome/app/locales/sk.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_sk.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_sk.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sk.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_sk.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/sl.vcproj b/chrome/app/locales/sl.vcproj
index a3a13ea..a468384 100644
--- a/chrome/app/locales/sl.vcproj
+++ b/chrome/app/locales/sl.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_sl.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_sl.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sl.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_sl.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/sr.vcproj b/chrome/app/locales/sr.vcproj
index 4a1e2d7..8fa065c 100644
--- a/chrome/app/locales/sr.vcproj
+++ b/chrome/app/locales/sr.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_sr.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_sr.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sr.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_sr.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/sv.vcproj b/chrome/app/locales/sv.vcproj
index 8862640..aef7ba0 100644
--- a/chrome/app/locales/sv.vcproj
+++ b/chrome/app/locales/sv.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_sv.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_sv.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sv.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_sv.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/ta.vcproj b/chrome/app/locales/ta.vcproj
index 293f0e3..7b6360b 100644
--- a/chrome/app/locales/ta.vcproj
+++ b/chrome/app/locales/ta.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_ta.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ta.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ta.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_ta.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/te.vcproj b/chrome/app/locales/te.vcproj
index bd769f2..4b29924 100644
--- a/chrome/app/locales/te.vcproj
+++ b/chrome/app/locales/te.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_te.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_te.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_te.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_te.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/th.vcproj b/chrome/app/locales/th.vcproj
index a9bc058..3e6cef3 100644
--- a/chrome/app/locales/th.vcproj
+++ b/chrome/app/locales/th.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_th.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_th.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_th.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_th.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/tr.vcproj b/chrome/app/locales/tr.vcproj
index 5329891..fe691d9 100644
--- a/chrome/app/locales/tr.vcproj
+++ b/chrome/app/locales/tr.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_tr.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_tr.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_tr.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_tr.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/uk.vcproj b/chrome/app/locales/uk.vcproj
index c841ff3..ecff800 100644
--- a/chrome/app/locales/uk.vcproj
+++ b/chrome/app/locales/uk.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_uk.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_uk.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_uk.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_uk.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/vi.vcproj b/chrome/app/locales/vi.vcproj
index d3debab..1223af8 100644
--- a/chrome/app/locales/vi.vcproj
+++ b/chrome/app/locales/vi.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_vi.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_vi.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_vi.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_vi.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/zh-CN.vcproj b/chrome/app/locales/zh-CN.vcproj
index 3d79f21..c9c3288 100644
--- a/chrome/app/locales/zh-CN.vcproj
+++ b/chrome/app/locales/zh-CN.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_zh-CN.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_zh-CN.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-CN.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_zh-CN.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/locales/zh-TW.vcproj b/chrome/app/locales/zh-TW.vcproj
index 941348d..6e3b2fb 100644
--- a/chrome/app/locales/zh-TW.vcproj
+++ b/chrome/app/locales/zh-TW.vcproj
@@ -144,13 +144,17 @@
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_zh-TW.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\locale_settings_zh-TW.rc"
 			>
 		</File>
 		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-TW.rc"
 			>
 		</File>
+		<File
+			RelativePath="$(OutDir)\grit_derived_sources\strings$(CHROMIUM_BUILD)_zh-TW.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>