summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 19:51:33 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 19:51:33 +0000
commit6e73472fa6749ec5cfe7bbe961ca0487d0a43bb3 (patch)
tree93ca6ac939e843f3e41d9ab674af1ae04c0a7cbe /chrome/app
parent67e4a1e97749307ead19746a1b81f36efcaa6589 (diff)
downloadchromium_src-6e73472fa6749ec5cfe7bbe961ca0487d0a43bb3.zip
chromium_src-6e73472fa6749ec5cfe7bbe961ca0487d0a43bb3.tar.gz
chromium_src-6e73472fa6749ec5cfe7bbe961ca0487d0a43bb3.tar.bz2
Revert "Use grit to generate locale rc files and remove the old locale rc files from the tree."
Revert "window_ is null during BrowserWindow creation. Assume full screen" Revert "Move SupportsWindowFeature from BrowserView to Browser so" git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/locales/ar.vcproj2
-rw-r--r--chrome/app/locales/bg.vcproj2
-rw-r--r--chrome/app/locales/bn.vcproj2
-rw-r--r--chrome/app/locales/ca.vcproj2
-rw-r--r--chrome/app/locales/cs.vcproj2
-rw-r--r--chrome/app/locales/da.vcproj2
-rw-r--r--chrome/app/locales/de.vcproj2
-rw-r--r--chrome/app/locales/el.vcproj2
-rw-r--r--chrome/app/locales/en-GB.vcproj2
-rw-r--r--chrome/app/locales/en-US.vcproj2
-rw-r--r--chrome/app/locales/es-419.vcproj2
-rw-r--r--chrome/app/locales/es.vcproj2
-rw-r--r--chrome/app/locales/et.vcproj2
-rw-r--r--chrome/app/locales/fi.vcproj2
-rw-r--r--chrome/app/locales/fil.vcproj2
-rw-r--r--chrome/app/locales/fr.vcproj2
-rw-r--r--chrome/app/locales/gu.vcproj2
-rw-r--r--chrome/app/locales/he.vcproj2
-rw-r--r--chrome/app/locales/hi.vcproj2
-rw-r--r--chrome/app/locales/hr.vcproj2
-rw-r--r--chrome/app/locales/hu.vcproj2
-rw-r--r--chrome/app/locales/id.vcproj2
-rw-r--r--chrome/app/locales/it.vcproj2
-rw-r--r--chrome/app/locales/ja.vcproj2
-rw-r--r--chrome/app/locales/kn.vcproj2
-rw-r--r--chrome/app/locales/ko.vcproj2
-rw-r--r--chrome/app/locales/lt.vcproj2
-rw-r--r--chrome/app/locales/lv.vcproj2
-rw-r--r--chrome/app/locales/ml.vcproj2
-rw-r--r--chrome/app/locales/mr.vcproj2
-rw-r--r--chrome/app/locales/nb.vcproj2
-rw-r--r--chrome/app/locales/nl.vcproj2
-rw-r--r--chrome/app/locales/or.vcproj2
-rw-r--r--chrome/app/locales/pl.vcproj2
-rw-r--r--chrome/app/locales/pt-BR.vcproj2
-rw-r--r--chrome/app/locales/pt-PT.vcproj2
-rw-r--r--chrome/app/locales/ro.vcproj2
-rw-r--r--chrome/app/locales/ru.vcproj2
-rw-r--r--chrome/app/locales/sk.vcproj2
-rw-r--r--chrome/app/locales/sl.vcproj2
-rw-r--r--chrome/app/locales/sr.vcproj2
-rw-r--r--chrome/app/locales/sv.vcproj2
-rw-r--r--chrome/app/locales/ta.vcproj2
-rw-r--r--chrome/app/locales/te.vcproj2
-rw-r--r--chrome/app/locales/th.vcproj2
-rw-r--r--chrome/app/locales/tr.vcproj2
-rw-r--r--chrome/app/locales/uk.vcproj2
-rw-r--r--chrome/app/locales/vi.vcproj2
-rw-r--r--chrome/app/locales/zh-CN.vcproj2
-rw-r--r--chrome/app/locales/zh-TW.vcproj2
-rwxr-xr-xchrome/app/resources/locale_settings.grd187
-rw-r--r--chrome/app/resources/locale_settings_ar.rc77
-rw-r--r--chrome/app/resources/locale_settings_ar.xtb60
-rw-r--r--chrome/app/resources/locale_settings_bg.rc76
-rw-r--r--chrome/app/resources/locale_settings_bg.xtb60
-rw-r--r--chrome/app/resources/locale_settings_bn.rc76
-rw-r--r--chrome/app/resources/locale_settings_bn.xtb60
-rw-r--r--chrome/app/resources/locale_settings_ca.rc76
-rw-r--r--chrome/app/resources/locale_settings_ca.xtb60
-rw-r--r--chrome/app/resources/locale_settings_cs.rc76
-rw-r--r--chrome/app/resources/locale_settings_cs.xtb60
-rw-r--r--chrome/app/resources/locale_settings_da.rc76
-rw-r--r--chrome/app/resources/locale_settings_da.xtb60
-rw-r--r--chrome/app/resources/locale_settings_de.rc76
-rw-r--r--chrome/app/resources/locale_settings_de.xtb60
-rw-r--r--chrome/app/resources/locale_settings_el.rc76
-rw-r--r--chrome/app/resources/locale_settings_el.xtb60
-rw-r--r--chrome/app/resources/locale_settings_en-GB.rc76
-rw-r--r--chrome/app/resources/locale_settings_en-GB.xtb60
-rw-r--r--chrome/app/resources/locale_settings_en-US.rc76
-rw-r--r--chrome/app/resources/locale_settings_en-US.xtb60
-rw-r--r--chrome/app/resources/locale_settings_es-419.rc76
-rw-r--r--chrome/app/resources/locale_settings_es-419.xtb60
-rw-r--r--chrome/app/resources/locale_settings_es.rc76
-rw-r--r--chrome/app/resources/locale_settings_es.xtb60
-rw-r--r--chrome/app/resources/locale_settings_et.rc76
-rw-r--r--chrome/app/resources/locale_settings_et.xtb60
-rw-r--r--chrome/app/resources/locale_settings_fi.rc76
-rw-r--r--chrome/app/resources/locale_settings_fi.xtb60
-rw-r--r--chrome/app/resources/locale_settings_fil.rc76
-rw-r--r--chrome/app/resources/locale_settings_fil.xtb60
-rw-r--r--chrome/app/resources/locale_settings_fr.rc76
-rw-r--r--chrome/app/resources/locale_settings_fr.xtb60
-rw-r--r--chrome/app/resources/locale_settings_gu.rc76
-rw-r--r--chrome/app/resources/locale_settings_gu.xtb60
-rw-r--r--chrome/app/resources/locale_settings_he.rc76
-rw-r--r--chrome/app/resources/locale_settings_he.xtb60
-rw-r--r--chrome/app/resources/locale_settings_hi.rc76
-rw-r--r--chrome/app/resources/locale_settings_hi.xtb60
-rw-r--r--chrome/app/resources/locale_settings_hr.rc76
-rw-r--r--chrome/app/resources/locale_settings_hr.xtb60
-rw-r--r--chrome/app/resources/locale_settings_hu.rc76
-rw-r--r--chrome/app/resources/locale_settings_hu.xtb60
-rw-r--r--chrome/app/resources/locale_settings_id.rc76
-rw-r--r--chrome/app/resources/locale_settings_id.xtb60
-rw-r--r--chrome/app/resources/locale_settings_it.rc76
-rw-r--r--chrome/app/resources/locale_settings_it.xtb60
-rw-r--r--chrome/app/resources/locale_settings_ja.rc76
-rw-r--r--chrome/app/resources/locale_settings_ja.xtb60
-rw-r--r--chrome/app/resources/locale_settings_kn.rc76
-rw-r--r--chrome/app/resources/locale_settings_kn.xtb60
-rw-r--r--chrome/app/resources/locale_settings_ko.rc76
-rw-r--r--chrome/app/resources/locale_settings_ko.xtb60
-rw-r--r--chrome/app/resources/locale_settings_lt.rc76
-rw-r--r--chrome/app/resources/locale_settings_lt.xtb60
-rw-r--r--chrome/app/resources/locale_settings_lv.rc76
-rw-r--r--chrome/app/resources/locale_settings_lv.xtb60
-rw-r--r--chrome/app/resources/locale_settings_ml.rc76
-rw-r--r--chrome/app/resources/locale_settings_ml.xtb60
-rw-r--r--chrome/app/resources/locale_settings_mr.rc76
-rw-r--r--chrome/app/resources/locale_settings_mr.xtb60
-rw-r--r--chrome/app/resources/locale_settings_nb.rc76
-rw-r--r--chrome/app/resources/locale_settings_nb.xtb60
-rw-r--r--chrome/app/resources/locale_settings_nl.rc76
-rw-r--r--chrome/app/resources/locale_settings_nl.xtb60
-rw-r--r--chrome/app/resources/locale_settings_or.rc76
-rw-r--r--chrome/app/resources/locale_settings_or.xtb60
-rw-r--r--chrome/app/resources/locale_settings_pl.rc76
-rw-r--r--chrome/app/resources/locale_settings_pl.xtb60
-rw-r--r--chrome/app/resources/locale_settings_pt-BR.rc76
-rw-r--r--chrome/app/resources/locale_settings_pt-BR.xtb60
-rw-r--r--chrome/app/resources/locale_settings_pt-PT.rc76
-rw-r--r--chrome/app/resources/locale_settings_pt-PT.xtb60
-rw-r--r--chrome/app/resources/locale_settings_ro.rc76
-rw-r--r--chrome/app/resources/locale_settings_ro.xtb60
-rw-r--r--chrome/app/resources/locale_settings_ru.rc76
-rw-r--r--chrome/app/resources/locale_settings_ru.xtb60
-rw-r--r--chrome/app/resources/locale_settings_sk.rc76
-rw-r--r--chrome/app/resources/locale_settings_sk.xtb60
-rw-r--r--chrome/app/resources/locale_settings_sl.rc76
-rw-r--r--chrome/app/resources/locale_settings_sl.xtb60
-rw-r--r--chrome/app/resources/locale_settings_sr.rc76
-rw-r--r--chrome/app/resources/locale_settings_sr.xtb60
-rw-r--r--chrome/app/resources/locale_settings_sv.rc76
-rw-r--r--chrome/app/resources/locale_settings_sv.xtb60
-rw-r--r--chrome/app/resources/locale_settings_ta.rc76
-rw-r--r--chrome/app/resources/locale_settings_ta.xtb60
-rw-r--r--chrome/app/resources/locale_settings_te.rc76
-rw-r--r--chrome/app/resources/locale_settings_te.xtb60
-rw-r--r--chrome/app/resources/locale_settings_th.rc76
-rw-r--r--chrome/app/resources/locale_settings_th.xtb60
-rw-r--r--chrome/app/resources/locale_settings_tr.rc76
-rw-r--r--chrome/app/resources/locale_settings_tr.xtb60
-rw-r--r--chrome/app/resources/locale_settings_uk.rc76
-rw-r--r--chrome/app/resources/locale_settings_uk.xtb60
-rw-r--r--chrome/app/resources/locale_settings_vi.rc76
-rw-r--r--chrome/app/resources/locale_settings_vi.xtb60
-rw-r--r--chrome/app/resources/locale_settings_zh-CN.rc76
-rw-r--r--chrome/app/resources/locale_settings_zh-CN.xtb60
-rw-r--r--chrome/app/resources/locale_settings_zh-TW.rc76
-rw-r--r--chrome/app/resources/locale_settings_zh-TW.xtb60
151 files changed, 3919 insertions, 3169 deletions
diff --git a/chrome/app/locales/ar.vcproj b/chrome/app/locales/ar.vcproj
index 6b6be02..a6905e8 100644
--- a/chrome/app/locales/ar.vcproj
+++ b/chrome/app/locales/ar.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ar.rc"
+ RelativePath="..\resources\locale_settings_ar.rc"
>
</File>
<File
diff --git a/chrome/app/locales/bg.vcproj b/chrome/app/locales/bg.vcproj
index 3c8c0c1..c6a1999 100644
--- a/chrome/app/locales/bg.vcproj
+++ b/chrome/app/locales/bg.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_bg.rc"
+ RelativePath="..\resources\locale_settings_bg.rc"
>
</File>
<File
diff --git a/chrome/app/locales/bn.vcproj b/chrome/app/locales/bn.vcproj
index b6dc3d1..2286ccb 100644
--- a/chrome/app/locales/bn.vcproj
+++ b/chrome/app/locales/bn.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_bn.rc"
+ RelativePath="..\resources\locale_settings_bn.rc"
>
</File>
<File
diff --git a/chrome/app/locales/ca.vcproj b/chrome/app/locales/ca.vcproj
index 9d0f720..d5060ad 100644
--- a/chrome/app/locales/ca.vcproj
+++ b/chrome/app/locales/ca.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ca.rc"
+ RelativePath="..\resources\locale_settings_ca.rc"
>
</File>
<File
diff --git a/chrome/app/locales/cs.vcproj b/chrome/app/locales/cs.vcproj
index dfa56f9..18868ee 100644
--- a/chrome/app/locales/cs.vcproj
+++ b/chrome/app/locales/cs.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_cs.rc"
+ RelativePath="..\resources\locale_settings_cs.rc"
>
</File>
<File
diff --git a/chrome/app/locales/da.vcproj b/chrome/app/locales/da.vcproj
index 83d1af6..dd54dc6 100644
--- a/chrome/app/locales/da.vcproj
+++ b/chrome/app/locales/da.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_da.rc"
+ RelativePath="..\resources\locale_settings_da.rc"
>
</File>
<File
diff --git a/chrome/app/locales/de.vcproj b/chrome/app/locales/de.vcproj
index 2d0ffaf..01ded29 100644
--- a/chrome/app/locales/de.vcproj
+++ b/chrome/app/locales/de.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_de.rc"
+ RelativePath="..\resources\locale_settings_de.rc"
>
</File>
<File
diff --git a/chrome/app/locales/el.vcproj b/chrome/app/locales/el.vcproj
index 44aa2c8..33a44b3 100644
--- a/chrome/app/locales/el.vcproj
+++ b/chrome/app/locales/el.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_el.rc"
+ RelativePath="..\resources\locale_settings_el.rc"
>
</File>
<File
diff --git a/chrome/app/locales/en-GB.vcproj b/chrome/app/locales/en-GB.vcproj
index 3af6a97..5b84029 100644
--- a/chrome/app/locales/en-GB.vcproj
+++ b/chrome/app/locales/en-GB.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_en-GB.rc"
+ RelativePath="..\resources\locale_settings_en-GB.rc"
>
</File>
<File
diff --git a/chrome/app/locales/en-US.vcproj b/chrome/app/locales/en-US.vcproj
index 42a2c3e..1970cdf 100644
--- a/chrome/app/locales/en-US.vcproj
+++ b/chrome/app/locales/en-US.vcproj
@@ -146,7 +146,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_en-US.rc"
+ RelativePath="..\resources\locale_settings_en-US.rc"
>
</File>
<File
diff --git a/chrome/app/locales/es-419.vcproj b/chrome/app/locales/es-419.vcproj
index 8800b99..c5aee26 100644
--- a/chrome/app/locales/es-419.vcproj
+++ b/chrome/app/locales/es-419.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_es-419.rc"
+ RelativePath="..\resources\locale_settings_es-419.rc"
>
</File>
<File
diff --git a/chrome/app/locales/es.vcproj b/chrome/app/locales/es.vcproj
index 26e71f9..9db651f 100644
--- a/chrome/app/locales/es.vcproj
+++ b/chrome/app/locales/es.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_es.rc"
+ RelativePath="..\resources\locale_settings_es.rc"
>
</File>
<File
diff --git a/chrome/app/locales/et.vcproj b/chrome/app/locales/et.vcproj
index a16de13..5a42c05 100644
--- a/chrome/app/locales/et.vcproj
+++ b/chrome/app/locales/et.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_et.rc"
+ RelativePath="..\resources\locale_settings_et.rc"
>
</File>
<File
diff --git a/chrome/app/locales/fi.vcproj b/chrome/app/locales/fi.vcproj
index d4f59ac..ad86bd0 100644
--- a/chrome/app/locales/fi.vcproj
+++ b/chrome/app/locales/fi.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_fi.rc"
+ RelativePath="..\resources\locale_settings_fi.rc"
>
</File>
<File
diff --git a/chrome/app/locales/fil.vcproj b/chrome/app/locales/fil.vcproj
index 28da016..6f90057 100644
--- a/chrome/app/locales/fil.vcproj
+++ b/chrome/app/locales/fil.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_fil.rc"
+ RelativePath="..\resources\locale_settings_fil.rc"
>
</File>
<File
diff --git a/chrome/app/locales/fr.vcproj b/chrome/app/locales/fr.vcproj
index da80646..3e7aada 100644
--- a/chrome/app/locales/fr.vcproj
+++ b/chrome/app/locales/fr.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_fr.rc"
+ RelativePath="..\resources\locale_settings_fr.rc"
>
</File>
<File
diff --git a/chrome/app/locales/gu.vcproj b/chrome/app/locales/gu.vcproj
index 51b321e..16d26ab 100644
--- a/chrome/app/locales/gu.vcproj
+++ b/chrome/app/locales/gu.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_gu.rc"
+ RelativePath="..\resources\locale_settings_gu.rc"
>
</File>
<File
diff --git a/chrome/app/locales/he.vcproj b/chrome/app/locales/he.vcproj
index cde9e65..f2772f0 100644
--- a/chrome/app/locales/he.vcproj
+++ b/chrome/app/locales/he.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_he.rc"
+ RelativePath="..\resources\locale_settings_he.rc"
>
</File>
<File
diff --git a/chrome/app/locales/hi.vcproj b/chrome/app/locales/hi.vcproj
index b5694fb..86877ed 100644
--- a/chrome/app/locales/hi.vcproj
+++ b/chrome/app/locales/hi.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_hi.rc"
+ RelativePath="..\resources\locale_settings_hi.rc"
>
</File>
<File
diff --git a/chrome/app/locales/hr.vcproj b/chrome/app/locales/hr.vcproj
index 683e9ec..2f2e49b 100644
--- a/chrome/app/locales/hr.vcproj
+++ b/chrome/app/locales/hr.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_hr.rc"
+ RelativePath="..\resources\locale_settings_hr.rc"
>
</File>
<File
diff --git a/chrome/app/locales/hu.vcproj b/chrome/app/locales/hu.vcproj
index 4a3bebb..2e1d4d1 100644
--- a/chrome/app/locales/hu.vcproj
+++ b/chrome/app/locales/hu.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_hu.rc"
+ RelativePath="..\resources\locale_settings_hu.rc"
>
</File>
<File
diff --git a/chrome/app/locales/id.vcproj b/chrome/app/locales/id.vcproj
index 6142bb6..0f9e190 100644
--- a/chrome/app/locales/id.vcproj
+++ b/chrome/app/locales/id.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_id.rc"
+ RelativePath="..\resources\locale_settings_id.rc"
>
</File>
<File
diff --git a/chrome/app/locales/it.vcproj b/chrome/app/locales/it.vcproj
index 8026886..10641dd 100644
--- a/chrome/app/locales/it.vcproj
+++ b/chrome/app/locales/it.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_it.rc"
+ RelativePath="..\resources\locale_settings_it.rc"
>
</File>
<File
diff --git a/chrome/app/locales/ja.vcproj b/chrome/app/locales/ja.vcproj
index a7ffb75..83a4965 100644
--- a/chrome/app/locales/ja.vcproj
+++ b/chrome/app/locales/ja.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ja.rc"
+ RelativePath="..\resources\locale_settings_ja.rc"
>
</File>
<File
diff --git a/chrome/app/locales/kn.vcproj b/chrome/app/locales/kn.vcproj
index ddabb37..2e63392 100644
--- a/chrome/app/locales/kn.vcproj
+++ b/chrome/app/locales/kn.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_kn.rc"
+ RelativePath="..\resources\locale_settings_kn.rc"
>
</File>
<File
diff --git a/chrome/app/locales/ko.vcproj b/chrome/app/locales/ko.vcproj
index fd7ca3a..a71d5cb 100644
--- a/chrome/app/locales/ko.vcproj
+++ b/chrome/app/locales/ko.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ko.rc"
+ RelativePath="..\resources\locale_settings_ko.rc"
>
</File>
<File
diff --git a/chrome/app/locales/lt.vcproj b/chrome/app/locales/lt.vcproj
index 55f4b20..4496dc2 100644
--- a/chrome/app/locales/lt.vcproj
+++ b/chrome/app/locales/lt.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_lt.rc"
+ RelativePath="..\resources\locale_settings_lt.rc"
>
</File>
<File
diff --git a/chrome/app/locales/lv.vcproj b/chrome/app/locales/lv.vcproj
index abc93ad..b209c16 100644
--- a/chrome/app/locales/lv.vcproj
+++ b/chrome/app/locales/lv.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_lv.rc"
+ RelativePath="..\resources\locale_settings_lv.rc"
>
</File>
<File
diff --git a/chrome/app/locales/ml.vcproj b/chrome/app/locales/ml.vcproj
index a92c287..36be6f5 100644
--- a/chrome/app/locales/ml.vcproj
+++ b/chrome/app/locales/ml.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ml.rc"
+ RelativePath="..\resources\locale_settings_ml.rc"
>
</File>
<File
diff --git a/chrome/app/locales/mr.vcproj b/chrome/app/locales/mr.vcproj
index 0e37828..7521069 100644
--- a/chrome/app/locales/mr.vcproj
+++ b/chrome/app/locales/mr.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_mr.rc"
+ RelativePath="..\resources\locale_settings_mr.rc"
>
</File>
<File
diff --git a/chrome/app/locales/nb.vcproj b/chrome/app/locales/nb.vcproj
index c874907..e5bd161 100644
--- a/chrome/app/locales/nb.vcproj
+++ b/chrome/app/locales/nb.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_nb.rc"
+ RelativePath="..\resources\locale_settings_nb.rc"
>
</File>
<File
diff --git a/chrome/app/locales/nl.vcproj b/chrome/app/locales/nl.vcproj
index 901ddd4..0b45f0e 100644
--- a/chrome/app/locales/nl.vcproj
+++ b/chrome/app/locales/nl.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_nl.rc"
+ RelativePath="..\resources\locale_settings_nl.rc"
>
</File>
<File
diff --git a/chrome/app/locales/or.vcproj b/chrome/app/locales/or.vcproj
index c238327..359cab4 100644
--- a/chrome/app/locales/or.vcproj
+++ b/chrome/app/locales/or.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_or.rc"
+ RelativePath="..\resources\locale_settings_or.rc"
>
</File>
<File
diff --git a/chrome/app/locales/pl.vcproj b/chrome/app/locales/pl.vcproj
index a00a2c0..7a2ec9f 100644
--- a/chrome/app/locales/pl.vcproj
+++ b/chrome/app/locales/pl.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_pl.rc"
+ RelativePath="..\resources\locale_settings_pl.rc"
>
</File>
<File
diff --git a/chrome/app/locales/pt-BR.vcproj b/chrome/app/locales/pt-BR.vcproj
index be27dc0e3..a570f29 100644
--- a/chrome/app/locales/pt-BR.vcproj
+++ b/chrome/app/locales/pt-BR.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_pt-BR.rc"
+ RelativePath="..\resources\locale_settings_pt-BR.rc"
>
</File>
<File
diff --git a/chrome/app/locales/pt-PT.vcproj b/chrome/app/locales/pt-PT.vcproj
index 74192a8..c0d30305 100644
--- a/chrome/app/locales/pt-PT.vcproj
+++ b/chrome/app/locales/pt-PT.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_pt-PT.rc"
+ RelativePath="..\resources\locale_settings_pt-PT.rc"
>
</File>
<File
diff --git a/chrome/app/locales/ro.vcproj b/chrome/app/locales/ro.vcproj
index c1bcc0a..933ee8a 100644
--- a/chrome/app/locales/ro.vcproj
+++ b/chrome/app/locales/ro.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ro.rc"
+ RelativePath="..\resources\locale_settings_ro.rc"
>
</File>
<File
diff --git a/chrome/app/locales/ru.vcproj b/chrome/app/locales/ru.vcproj
index c37451a..b665412 100644
--- a/chrome/app/locales/ru.vcproj
+++ b/chrome/app/locales/ru.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ru.rc"
+ RelativePath="..\resources\locale_settings_ru.rc"
>
</File>
<File
diff --git a/chrome/app/locales/sk.vcproj b/chrome/app/locales/sk.vcproj
index 5d64852..61779df 100644
--- a/chrome/app/locales/sk.vcproj
+++ b/chrome/app/locales/sk.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_sk.rc"
+ RelativePath="..\resources\locale_settings_sk.rc"
>
</File>
<File
diff --git a/chrome/app/locales/sl.vcproj b/chrome/app/locales/sl.vcproj
index 21e052dd..a3a13ea 100644
--- a/chrome/app/locales/sl.vcproj
+++ b/chrome/app/locales/sl.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_sl.rc"
+ RelativePath="..\resources\locale_settings_sl.rc"
>
</File>
<File
diff --git a/chrome/app/locales/sr.vcproj b/chrome/app/locales/sr.vcproj
index d6d1474..4a1e2d7 100644
--- a/chrome/app/locales/sr.vcproj
+++ b/chrome/app/locales/sr.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_sr.rc"
+ RelativePath="..\resources\locale_settings_sr.rc"
>
</File>
<File
diff --git a/chrome/app/locales/sv.vcproj b/chrome/app/locales/sv.vcproj
index 9b497bc..8862640 100644
--- a/chrome/app/locales/sv.vcproj
+++ b/chrome/app/locales/sv.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_sv.rc"
+ RelativePath="..\resources\locale_settings_sv.rc"
>
</File>
<File
diff --git a/chrome/app/locales/ta.vcproj b/chrome/app/locales/ta.vcproj
index 98a3846..293f0e3 100644
--- a/chrome/app/locales/ta.vcproj
+++ b/chrome/app/locales/ta.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_ta.rc"
+ RelativePath="..\resources\locale_settings_ta.rc"
>
</File>
<File
diff --git a/chrome/app/locales/te.vcproj b/chrome/app/locales/te.vcproj
index 2a5bf58..bd769f2 100644
--- a/chrome/app/locales/te.vcproj
+++ b/chrome/app/locales/te.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_te.rc"
+ RelativePath="..\resources\locale_settings_te.rc"
>
</File>
<File
diff --git a/chrome/app/locales/th.vcproj b/chrome/app/locales/th.vcproj
index c46d63a..a9bc058 100644
--- a/chrome/app/locales/th.vcproj
+++ b/chrome/app/locales/th.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_th.rc"
+ RelativePath="..\resources\locale_settings_th.rc"
>
</File>
<File
diff --git a/chrome/app/locales/tr.vcproj b/chrome/app/locales/tr.vcproj
index 06119bb..5329891 100644
--- a/chrome/app/locales/tr.vcproj
+++ b/chrome/app/locales/tr.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_tr.rc"
+ RelativePath="..\resources\locale_settings_tr.rc"
>
</File>
<File
diff --git a/chrome/app/locales/uk.vcproj b/chrome/app/locales/uk.vcproj
index 15ee42c..c841ff3 100644
--- a/chrome/app/locales/uk.vcproj
+++ b/chrome/app/locales/uk.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_uk.rc"
+ RelativePath="..\resources\locale_settings_uk.rc"
>
</File>
<File
diff --git a/chrome/app/locales/vi.vcproj b/chrome/app/locales/vi.vcproj
index eb8efa0..d3debab 100644
--- a/chrome/app/locales/vi.vcproj
+++ b/chrome/app/locales/vi.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_vi.rc"
+ RelativePath="..\resources\locale_settings_vi.rc"
>
</File>
<File
diff --git a/chrome/app/locales/zh-CN.vcproj b/chrome/app/locales/zh-CN.vcproj
index 4e5a851..3d79f21 100644
--- a/chrome/app/locales/zh-CN.vcproj
+++ b/chrome/app/locales/zh-CN.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_zh-CN.rc"
+ RelativePath="..\resources\locale_settings_zh-CN.rc"
>
</File>
<File
diff --git a/chrome/app/locales/zh-TW.vcproj b/chrome/app/locales/zh-TW.vcproj
index cdcf313..941348d 100644
--- a/chrome/app/locales/zh-TW.vcproj
+++ b/chrome/app/locales/zh-TW.vcproj
@@ -144,7 +144,7 @@
>
</File>
<File
- RelativePath="$(OutDir)\grit_derived_sources\locale_settings_zh-TW.rc"
+ RelativePath="..\resources\locale_settings_zh-TW.rc"
>
</File>
<File
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 9848ad7..4ca7b73 100755
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -13,7 +13,7 @@
<output filename="locale_settings_de.rc" type="rc_all" lang="de" />
<output filename="locale_settings_el.rc" type="rc_all" lang="el" />
<output filename="locale_settings_en-GB.rc" type="rc_all" lang="en-GB" />
- <output filename="locale_settings_en-US.rc" type="rc_all" lang="en" />
+ <output filename="locale_settings_en-US.rc" type="rc_all" lang="en-US" />
<output filename="locale_settings_es.rc" type="rc_all" lang="es" />
<output filename="locale_settings_es-419.rc" type="rc_all" lang="es-419" />
<output filename="locale_settings_et.rc" type="rc_all" lang="et" />
@@ -57,59 +57,8 @@
<output filename="locale_settings_zh-CN.rc" type="rc_all" lang="zh-CN" />
<output filename="locale_settings_zh-TW.rc" type="rc_all" lang="zh-TW" />
- <output filename="locale_settings_en-US.pak" type="data_package" lang="en" />
+ <output filename="locale_settings_en-US.pak" type="data_package" lang="en-US" />
</outputs>
- <translations>
- <file path="locale_settings_ar.xtb" lang="ar" />
- <file path="locale_settings_bg.xtb" lang="bg" />
- <file path="locale_settings_bn.xtb" lang="bn" />
- <file path="locale_settings_ca.xtb" lang="ca" />
- <file path="locale_settings_cs.xtb" lang="cs" />
- <file path="locale_settings_da.xtb" lang="da" />
- <file path="locale_settings_de.xtb" lang="de" />
- <file path="locale_settings_el.xtb" lang="el" />
- <file path="locale_settings_en-GB.xtb" lang="en-GB" />
- <file path="locale_settings_es.xtb" lang="es" />
- <file path="locale_settings_es-419.xtb" lang="es-419" />
- <file path="locale_settings_et.xtb" lang="et" />
- <file path="locale_settings_fi.xtb" lang="fi" />
- <file path="locale_settings_fil.xtb" lang="fil" />
- <file path="locale_settings_fr.xtb" lang="fr" />
- <file path="locale_settings_gu.xtb" lang="gu" />
- <file path="locale_settings_he.xtb" lang="he" />
- <file path="locale_settings_hi.xtb" lang="hi" />
- <file path="locale_settings_hr.xtb" lang="hr" />
- <file path="locale_settings_hu.xtb" lang="hu" />
- <file path="locale_settings_id.xtb" lang="id" />
- <file path="locale_settings_it.xtb" lang="it" />
- <file path="locale_settings_ja.xtb" lang="ja" />
- <file path="locale_settings_kn.xtb" lang="kn" />
- <file path="locale_settings_ko.xtb" lang="ko" />
- <file path="locale_settings_lt.xtb" lang="lt" />
- <file path="locale_settings_lv.xtb" lang="lv" />
- <file path="locale_settings_ml.xtb" lang="ml" />
- <file path="locale_settings_mr.xtb" lang="mr" />
- <file path="locale_settings_nl.xtb" lang="nl" />
- <file path="locale_settings_nb.xtb" lang="no" />
- <file path="locale_settings_or.xtb" lang="or" />
- <file path="locale_settings_pl.xtb" lang="pl" />
- <file path="locale_settings_pt-BR.xtb" lang="pt-BR" />
- <file path="locale_settings_pt-PT.xtb" lang="pt-PT" />
- <file path="locale_settings_ro.xtb" lang="ro" />
- <file path="locale_settings_ru.xtb" lang="ru" />
- <file path="locale_settings_sk.xtb" lang="sk" />
- <file path="locale_settings_sl.xtb" lang="sl" />
- <file path="locale_settings_sr.xtb" lang="sr" />
- <file path="locale_settings_sv.xtb" lang="sv" />
- <file path="locale_settings_ta.xtb" lang="ta" />
- <file path="locale_settings_te.xtb" lang="te" />
- <file path="locale_settings_th.xtb" lang="th" />
- <file path="locale_settings_tr.xtb" lang="tr" />
- <file path="locale_settings_uk.xtb" lang="uk" />
- <file path="locale_settings_vi.xtb" lang="vi" />
- <file path="locale_settings_zh-CN.xtb" lang="zh-CN" />
- <file path="locale_settings_zh-TW.xtb" lang="zh-TW" />
- </translations>
<release seq="1" allow_pseudo="false">
<includes>
<!-- The HTML for the about:terms page -->
@@ -122,7 +71,7 @@
<if expr="pp_ifdef('_google_chrome') and 'de' == lang"> <include name="IDR_TERMS_HTML" file="terms\terms_de.html" type="BINDATA" /></if>
<if expr="pp_ifdef('_google_chrome') and 'el' == lang"> <include name="IDR_TERMS_HTML" file="terms\terms_el.html" type="BINDATA" /></if>
<if expr="pp_ifdef('_google_chrome') and 'en-GB' == lang"> <include name="IDR_TERMS_HTML" file="terms\terms_en-GB.html" type="BINDATA" /></if>
- <if expr="pp_ifdef('_google_chrome') and 'en' == lang"> <include name="IDR_TERMS_HTML" file="terms\terms_en.html" type="BINDATA" /></if>
+ <if expr="pp_ifdef('_google_chrome') and 'en-US' == lang"> <include name="IDR_TERMS_HTML" file="terms\terms_en.html" type="BINDATA" /></if>
<if expr="pp_ifdef('_google_chrome') and 'es' == lang"> <include name="IDR_TERMS_HTML" file="terms\terms_es.html" type="BINDATA" /></if>
<if expr="pp_ifdef('_google_chrome') and 'es-419' == lang"><include name="IDR_TERMS_HTML" file="terms\terms_es-419.html" type="BINDATA" /></if>
<if expr="pp_ifdef('_google_chrome') and 'et' == lang"> <include name="IDR_TERMS_HTML" file="terms\terms_et.html" type="BINDATA" /></if>
@@ -168,308 +117,308 @@
<include name="IDR_TERMS_HTML" file="terms\terms_chromium.html" type="BINDATA" />
</if>
</includes>
- <messages>
+ <messages fallback_to_english="true">
<!-- The font used in web-style native pages (e.g. History). -->
- <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
+ <message name="IDS_WEB_FONT_FAMILY">
Arial
</message>
<!-- The default value for HTTP Accept-Language header. -->
- <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
+ <message name="IDS_ACCEPT_LANGUAGES">
en-US,en
</message>
<!-- The default value for |WebPreference::default_encoding|. -->
- <message name="IDS_DEFAULT_ENCODING" use_name_for_id="true">
+ <message name="IDS_DEFAULT_ENCODING">
ISO-8859-1
</message>
<!-- The default value to determine whether
|WebPreference::standard_font_family| serif or sans-serif -->
- <message name="IDS_STANDARD_FONT_IS_SERIF" use_name_for_id="true">
+ <message name="IDS_STANDARD_FONT_IS_SERIF">
true
</message>
<!-- The default value for |WebPreference::fixed_font_family| -->
- <message name="IDS_FIXED_FONT_FAMILY" use_name_for_id="true">
+ <message name="IDS_FIXED_FONT_FAMILY">
Courier New
</message>
<!-- The default value for |WebPreference::serif_font_family| -->
- <message name="IDS_SERIF_FONT_FAMILY" use_name_for_id="true">
+ <message name="IDS_SERIF_FONT_FAMILY">
Times New Roman
</message>
<!-- The default value for |WebPreference::sans_serif_font_family| -->
- <message name="IDS_SANS_SERIF_FONT_FAMILY" use_name_for_id="true">
+ <message name="IDS_SANS_SERIF_FONT_FAMILY">
Arial
</message>
<!-- The default value for |WebPreference::cursive_font_family| -->
- <message name="IDS_CURSIVE_FONT_FAMILY" use_name_for_id="true">
+ <message name="IDS_CURSIVE_FONT_FAMILY">
Comic Sans MS
</message>
<!-- The default value for |WebPreference::fantasy_font_family| -->
- <message name="IDS_FANTASY_FONT_FAMILY" use_name_for_id="true">
+ <message name="IDS_FANTASY_FONT_FAMILY">
Impact
</message>
<!-- The default value for |WebPreference::default_font_size| -->
- <message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true">
+ <message name="IDS_DEFAULT_FONT_SIZE">
16
</message>
<!-- The default value for |WebPreference::default_fixed_font_size| -->
- <message name="IDS_DEFAULT_FIXED_FONT_SIZE" use_name_for_id="true">
+ <message name="IDS_DEFAULT_FIXED_FONT_SIZE">
13
</message>
<!-- The default value for |WebPreference::minimum_font_size| -->
- <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true">
+ <message name="IDS_MINIMUM_FONT_SIZE">
1
</message>
<!-- The default value for |WebPreference::minimum_logical_font_size|. -->
- <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true">
+ <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE">
6
</message>
<!-- The default value for |WebPreference::uses_universal_detector|. -->
- <message name="IDS_USES_UNIVERSAL_DETECTOR" use_name_for_id="true">
+ <message name="IDS_USES_UNIVERSAL_DETECTOR">
false
</message>
<!-- The file name of the spellchecking dictionary without the extension (case-sensitive). -->
- <message name="IDS_SPELLCHECK_DICTIONARY" use_name_for_id="true">
+ <message name="IDS_SPELLCHECK_DICTIONARY">
en-US
</message>
<!-- URL for the "Learn more" link on the malware blocking page. -->
- <message name="IDS_LEARN_MORE_MALWARE_URL" translateable="false">
- http://www.google.com/support/bin/answer.py?answer=45449&amp;topic=360&amp;hl=[GRITLANGCODE]&amp;sa=X&amp;oi=malwarewarninglink&amp;resnum=1&amp;ct=help
+ <message name="IDS_LEARN_MORE_MALWARE_URL">
+ http://www.google.com/support/bin/answer.py?answer=45449&amp;topic=360&amp;hl=en&amp;sa=X&amp;oi=malwarewarninglink&amp;resnum=1&amp;ct=help
</message>
<!-- URL for the "Learn more" link on the phishing blocking page. -->
- <message name="IDS_LEARN_MORE_PHISHING_URL" translateable="false">
+ <message name="IDS_LEARN_MORE_PHISHING_URL">
http://www.google.com/support/bin/answer.py?answer=106318&amp;hl=[GRITLANGCODE]
</message>
<!-- The width of the Options dialog box, in characters (character width = -->
<!-- average character width for default dialog box font) -->
- <message name="IDS_OPTIONS_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_OPTIONS_DIALOG_WIDTH_CHARS">
98
</message>
<!-- The height of the Options dialog box, in lines (line height = character -->
<!-- height for default dialog box font) -->
- <message name="IDS_OPTIONS_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_OPTIONS_DIALOG_HEIGHT_LINES">
36
</message>
<!-- The width of the title column of the Options dialog box, in characters (see -->
<!-- above for defn of character width) -->
- <message name="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">
23
</message>
<!-- The width and height of the Bug Reporting dialog box in characters and lines -->
<!-- (See above). -->
- <message name="IDS_BUGREPORT_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">
85
</message>
- <message name="IDS_BUGREPORT_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">
17
</message>
<!-- The width and height of the Clear Browsing Data dialog box in characters and -->
<!-- lines (See above). -->
- <message name="IDS_CLEARDATA_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">
63
</message>
- <message name="IDS_CLEARDATA_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">
15.5
</message>
<!-- The width and height of the Import dialog box in characters and lines (See -->
<!-- above). -->
- <message name="IDS_IMPORT_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_IMPORT_DIALOG_WIDTH_CHARS">
60
</message>
- <message name="IDS_IMPORT_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_IMPORT_DIALOG_HEIGHT_LINES">
14
</message>
<!-- The width and height of the About dialog box in characters and lines (See -->
<!-- above). -->
- <message name="IDS_ABOUT_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_ABOUT_DIALOG_WIDTH_CHARS">
70
</message>
- <message name="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">
4
</message>
<!-- The width and height of the Fonts and Languages dialog box in characters and -->
<!-- lines (See above). -->
- <message name="IDS_FONTSLANG_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">
96
</message>
- <message name="IDS_FONTSLANG_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">
26
</message>
<!-- The width of the font style column in the Fonts and Languages dialog box, -->
<!-- in character widths. -->
- <message name="IDS_FONTSLANG_LABEL_WIDTH" use_name_for_id="true">
+ <message name="IDS_FONTSLANG_LABEL_WIDTH">
18
</message>
<!-- The width and height of the Page Info dialog box in characters and lines -->
<!-- (See above). -->
- <message name="IDS_PAGEINFO_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">
70
</message>
- <message name="IDS_PAGEINFO_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">
25
</message>
<!-- The width and height of the Search Engines dialog box in characters and -->
<!-- lines (See above). -->
- <message name="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">
95
</message>
- <message name="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">
25
</message>
<!-- The width and height of the Shelf Item dialog box in characters and -->
<!-- lines (See above). -->
- <message name="IDS_SHELFITEM_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">
80
</message>
- <message name="IDS_SHELFITEM_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">
30
</message>
<!-- The width and height of the Edit Bookmark dialog box in characters and lines -->
<!-- (See above). -->
- <message name="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">
70
</message>
- <message name="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">
25
</message>
<!-- The width and height of the First Run dialog box in characters and lines -->
<!-- (See above). -->
- <message name="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">
90
</message>
- <message name="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">
16
</message>
<!-- The width and height of the First Run Customize dialog box in characters and -->
<!-- lines (See above). -->
- <message name="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">
90
</message>
- <message name="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">
17
</message>
<!-- The width and height of the Cookies dialog box in characters and lines -->
<!-- (See above). -->
- <message name="IDS_COOKIES_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_COOKIES_DIALOG_WIDTH_CHARS">
80
</message>
- <message name="IDS_COOKIES_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_COOKIES_DIALOG_HEIGHT_LINES">
29
</message>
<!-- The width and height of the Import Progress dialog box in characters and -->
<!-- lines (See above). -->
- <message name="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">
75
</message>
- <message name="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">
16
</message>
<!-- The width and height of the "Mozilla Firefox is locked" dialog box in -->
<!-- characters and lines (See above). -->
- <message name="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">
50
</message>
- <message name="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">
8
</message>
<!-- The width and height of the First Run Search Information bubble in -->
<!-- characters and lines (See above). -->
- <message name="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">
93
</message>
- <message name="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">
12
</message>
<!-- The URL to be loaded to display Help -->
- <message name="IDS_HELP_CONTENT_URL" translateable="false">
+ <message name="IDS_HELP_CONTENT_URL">
http://www.google.com/support/chrome/?hl=[GRITLANGCODE]
</message>
<!-- URL to post bug reports to -->
- <message name="IDS_BUGREPORT_POST_URL" translateable="false">
+ <message name="IDS_BUGREPORT_POST_URL">
http://web-bug.appspot.com/bugreport
</message>
<!-- Locale-dependent static encodings string -->
- <message name="IDS_STATIC_ENCODING_LIST" use_name_for_id="true">
+ <message name="IDS_STATIC_ENCODING_LIST">
ISO-8859-1,windows-1252
</message>
<!-- The URL for the the Welcome to Chrome page shown on first run. -->
- <message name="IDS_WELCOME_PAGE_URL" translateable="false">
+ <message name="IDS_WELCOME_PAGE_URL">
http://tools.google.com/chrome/intl/[GRITLANGCODE]/welcome.html
</message>
<!-- The URL for the the Learn More page shown on incognito new tab. -->
- <message name="IDS_LEARN_MORE_INCOGNITO_URL" translateable="false">
+ <message name="IDS_LEARN_MORE_INCOGNITO_URL">
http://www.google.com/support/chrome/bin/answer.py?answer=95464&amp;hl=[GRITLANGCODE]
</message>
<!-- The URL for the "Learn more" page for the Privacy section under Options. -->
- <message name="IDS_LEARN_MORE_PRIVACY_URL" translateable="false">
+ <message name="IDS_LEARN_MORE_PRIVACY_URL">
http://www.google.com/support/chrome/bin/answer.py?answer=114836&amp;hl=[GRITLANGCODE]
</message>
<!-- The width and height of the bookmark manager in characters and lines -->
<!-- (See above). -->
- <message name="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">
150
</message>
- <message name="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">
40
</message>
<!-- The language dependent download view size. -->
- <message name="IDS_DOWNLOAD_BIG_PROGRESS_SIZE" use_name_for_id="true">
+ <message name="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">
52
</message>
<!-- The width and height of the Select Profile dialog in characters and lines -->
<!-- (See above). -->
- <message name="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">
60
</message>
- <message name="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES" use_name_for_id="true">
+ <message name="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">
5
</message>
<!-- The width of the New Profile dialog in characters (See above). -->
- <message name="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ <message name="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">
60
</message>
</messages>
diff --git a/chrome/app/resources/locale_settings_ar.rc b/chrome/app/resources/locale_settings_ar.rc
new file mode 100644
index 0000000..2238180
--- /dev/null
+++ b/chrome/app/resources/locale_settings_ar.rc
@@ -0,0 +1,77 @@
+
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "ar,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1256"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=ar&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=ar"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "64"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "17"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ar"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1256,ISO-8859-6"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ar/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ar"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ar"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_ar.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_ar.html"
+#else
+#include "chromium_strings_ar.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_ar.xtb b/chrome/app/resources/locale_settings_ar.xtb
deleted file mode 100644
index 2401ed1..0000000
--- a/chrome/app/resources/locale_settings_ar.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="ar">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">ar,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1256</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">64</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">17</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1256,ISO-8859-6</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_bg.rc b/chrome/app/resources/locale_settings_bg.rc
new file mode 100644
index 0000000..e41e4a1
--- /dev/null
+++ b/chrome/app/resources/locale_settings_bg.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "bg-BG,bg"
+ IDS_DEFAULT_ENCODING "windows-1251"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=bg"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "104"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "38"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "81"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=bg"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1251,KOI8-R,ISO-8859-5"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/bg/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=bg"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=bg"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_bg.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_bg.html"
+#else
+#include "chromium_strings_bg.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_bg.xtb b/chrome/app/resources/locale_settings_bg.xtb
deleted file mode 100644
index 67e5d66..0000000
--- a/chrome/app/resources/locale_settings_bg.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="bg">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">bg-BG,bg</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1251</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">104</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">38</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">81</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1251,KOI8-R,ISO-8859-5</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_bn.rc b/chrome/app/resources/locale_settings_bn.rc
new file mode 100644
index 0000000..fe82944
--- /dev/null
+++ b/chrome/app/resources/locale_settings_bn.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "bn-IN,bn,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=bn"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=bn"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/bn/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=bn"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=bn"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_bn.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_bn.html"
+#else
+#include "chromium_strings_bn.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_bn.xtb b/chrome/app/resources/locale_settings_bn.xtb
deleted file mode 100644
index 4be837d4..0000000
--- a/chrome/app/resources/locale_settings_bn.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="bn">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">bn-IN,bn,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_ca.rc b/chrome/app/resources/locale_settings_ca.rc
new file mode 100644
index 0000000..695749b
--- /dev/null
+++ b/chrome/app/resources/locale_settings_ca.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "ca-ES,ca"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "ca"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=ca"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "73"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ca"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ca/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ca"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ca"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_ca.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_ca.html"
+#else
+#include "chromium_strings_ca.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_ca.xtb b/chrome/app/resources/locale_settings_ca.xtb
deleted file mode 100644
index 2dea0ed..0000000
--- a/chrome/app/resources/locale_settings_ca.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="ca">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">ca-ES,ca</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">ca</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">73</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_cs.rc b/chrome/app/resources/locale_settings_cs.rc
new file mode 100644
index 0000000..231ff40
--- /dev/null
+++ b/chrome/app/resources/locale_settings_cs.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "cs-CZ,cs"
+ IDS_DEFAULT_ENCODING "windows-1250"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "cs"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=cs"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "66"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=cs"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/cs/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=cs"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=cs"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_cs.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_cs.html"
+#else
+#include "chromium_strings_cs.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_cs.xtb b/chrome/app/resources/locale_settings_cs.xtb
deleted file mode 100644
index 6c937aa..0000000
--- a/chrome/app/resources/locale_settings_cs.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="cs">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">cs-CZ,cs</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1250</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">cs</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_da.rc b/chrome/app/resources/locale_settings_da.rc
new file mode 100644
index 0000000..b19f304
--- /dev/null
+++ b/chrome/app/resources/locale_settings_da.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "da-DK,da,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "da"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=da"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "95"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "25"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=da"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/da/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=da"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=da"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_da.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_da.html"
+#else
+#include "chromium_strings_da.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_da.xtb b/chrome/app/resources/locale_settings_da.xtb
deleted file mode 100644
index 2fe608a..0000000
--- a/chrome/app/resources/locale_settings_da.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="da">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">da-DK,da,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">da</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">25</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_de.rc b/chrome/app/resources/locale_settings_de.rc
new file mode 100644
index 0000000..1230e6e
--- /dev/null
+++ b/chrome/app/resources/locale_settings_de.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "de-DE,de,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "de"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=de&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=de"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "18"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "71"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=de"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/de/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=de"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=de"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_de.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_de.html"
+#else
+#include "chromium_strings_de.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_de.xtb b/chrome/app/resources/locale_settings_de.xtb
deleted file mode 100644
index f7436ad..0000000
--- a/chrome/app/resources/locale_settings_de.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="de">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">de-DE,de,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">de</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">18</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">71</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_el.rc b/chrome/app/resources/locale_settings_el.rc
new file mode 100644
index 0000000..a939307
--- /dev/null
+++ b/chrome/app/resources/locale_settings_el.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "el-GR,el"
+ IDS_DEFAULT_ENCODING "ISO-8859-7"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "el"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=el"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "106"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "37"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "20"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "78"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "6"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=el"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-7,windows-1253"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/el/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=el"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=el"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_el.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_el.html"
+#else
+#include "chromium_strings_el.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_el.xtb b/chrome/app/resources/locale_settings_el.xtb
deleted file mode 100644
index 2f7c4b7..0000000
--- a/chrome/app/resources/locale_settings_el.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="el">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">el-GR,el</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-7</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">el</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">106</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">37</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">20</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">78</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">6</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-7,windows-1253</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_en-GB.rc b/chrome/app/resources/locale_settings_en-GB.rc
new file mode 100644
index 0000000..10d7d32
--- /dev/null
+++ b/chrome/app/resources/locale_settings_en-GB.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "en-GB,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-GB"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=en-GB"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "23"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "63"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "96"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "90"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "16"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "90"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=en-GB"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/en-GB/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=en-GB"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=en-GB"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_en-GB.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_en-GB.html"
+#else
+#include "chromium_strings_en-GB.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_en-GB.xtb b/chrome/app/resources/locale_settings_en-GB.xtb
deleted file mode 100644
index 4b55ebf..0000000
--- a/chrome/app/resources/locale_settings_en-GB.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="en-GB">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">en-GB,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-GB</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">23</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">63</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">96</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">90</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">90</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_en-US.rc b/chrome/app/resources/locale_settings_en-US.rc
new file mode 100644
index 0000000..fe659df
--- /dev/null
+++ b/chrome/app/resources/locale_settings_en-US.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=en-US"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "23"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "63"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "96"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "90"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "16"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "90"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=en-US"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/en-US/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=en-US"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=en-US"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_en-US.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_en.html"
+#else
+#include "chromium_strings_en-US.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_en-US.xtb b/chrome/app/resources/locale_settings_en-US.xtb
deleted file mode 100644
index e67c83c..0000000
--- a/chrome/app/resources/locale_settings_en-US.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="en-US">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">23</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">63</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">96</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">90</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">90</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_es-419.rc b/chrome/app/resources/locale_settings_es-419.rc
new file mode 100644
index 0000000..eaadb37
--- /dev/null
+++ b/chrome/app/resources/locale_settings_es-419.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "es-419,es"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "es"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=es&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=es-419"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "104"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "24"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=es-419"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/es-419/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=es-419"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=es-419"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_es-419.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_es-419.html"
+#else
+#include "chromium_strings_es-419.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_es-419.xtb b/chrome/app/resources/locale_settings_es-419.xtb
deleted file mode 100644
index 859fc0e3..0000000
--- a/chrome/app/resources/locale_settings_es-419.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="es-419">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">es-419,es</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">es</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">104</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">24</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_es.rc b/chrome/app/resources/locale_settings_es.rc
new file mode 100644
index 0000000..09f8919
--- /dev/null
+++ b/chrome/app/resources/locale_settings_es.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "es-ES,es"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "es"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=es&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=es"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "104"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "24"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "66"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=es"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/es/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=es"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=es"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_es.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_es.html"
+#else
+#include "chromium_strings_es.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_es.xtb b/chrome/app/resources/locale_settings_es.xtb
deleted file mode 100644
index 70f2580..0000000
--- a/chrome/app/resources/locale_settings_es.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="es">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">es-ES,es</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">es</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">104</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">24</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_et.rc b/chrome/app/resources/locale_settings_et.rc
new file mode 100644
index 0000000..3497311
--- /dev/null
+++ b/chrome/app/resources/locale_settings_et.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "et-EE,et,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1257"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "et"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=et"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "70"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=et"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1257,ISO-8859-4,ISO-8859-13"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/et/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=et"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=et"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_et.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_et.html"
+#else
+#include "chromium_strings_et.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_et.xtb b/chrome/app/resources/locale_settings_et.xtb
deleted file mode 100644
index 976a365..0000000
--- a/chrome/app/resources/locale_settings_et.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="et">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">et-EE,et,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1257</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">et</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1257,ISO-8859-4,ISO-8859-13</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_fi.rc b/chrome/app/resources/locale_settings_fi.rc
new file mode 100644
index 0000000..6e9c6e2
--- /dev/null
+++ b/chrome/app/resources/locale_settings_fi.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "fi-FI,fi,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=fi"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "60"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "19"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=fi"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252,ISO-8859-15"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/fi/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=fi"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=fi"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_fi.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_fi.html"
+#else
+#include "chromium_strings_fi.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_fi.xtb b/chrome/app/resources/locale_settings_fi.xtb
deleted file mode 100644
index ce0399c..0000000
--- a/chrome/app/resources/locale_settings_fi.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="fi">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">fi-FI,fi,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">19</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252,ISO-8859-15</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_fil.rc b/chrome/app/resources/locale_settings_fil.rc
new file mode 100644
index 0000000..91d8dd1
--- /dev/null
+++ b/chrome/app/resources/locale_settings_fil.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "fil,fil-PH,tl,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=fil&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=fil"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "38"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "70"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "14"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=fil"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/fil/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=fil"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=fil"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_fil.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_fil.html"
+#else
+#include "chromium_strings_fil.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_fil.xtb b/chrome/app/resources/locale_settings_fil.xtb
deleted file mode 100644
index 93bc855..0000000
--- a/chrome/app/resources/locale_settings_fil.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="fil">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">fil,fil-PH,tl,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">38</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_fr.rc b/chrome/app/resources/locale_settings_fr.rc
new file mode 100644
index 0000000..ebe069f
--- /dev/null
+++ b/chrome/app/resources/locale_settings_fr.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "fr-FR,fr,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "fr"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.fr/support/bin/answer.py?answer=45449&topic=360&hl=fr&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=fr"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "74"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=fr"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252,ISO-8859-15"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/fr/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=fr"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=fr"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_fr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_fr.html"
+#else
+#include "chromium_strings_fr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_fr.xtb b/chrome/app/resources/locale_settings_fr.xtb
deleted file mode 100644
index a882dc2..0000000
--- a/chrome/app/resources/locale_settings_fr.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="fr">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">fr-FR,fr,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">fr</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">74</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252,ISO-8859-15</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_gu.rc b/chrome/app/resources/locale_settings_gu.rc
new file mode 100644
index 0000000..73b09bc
--- /dev/null
+++ b/chrome/app/resources/locale_settings_gu.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "gu-IN,gu,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=gu"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=gu"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/gu/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=gu"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=gu"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_gu.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_gu.html"
+#else
+#include "chromium_strings_gu.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_gu.xtb b/chrome/app/resources/locale_settings_gu.xtb
deleted file mode 100644
index 351172e..0000000
--- a/chrome/app/resources/locale_settings_gu.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="gu">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">gu-IN,gu,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_he.rc b/chrome/app/resources/locale_settings_he.rc
new file mode 100644
index 0000000..3963923
--- /dev/null
+++ b/chrome/app/resources/locale_settings_he.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "he-IL,he,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1255"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "true"
+ IDS_SPELLCHECK_DICTIONARY "he"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.co.il/support/bin/answer.py?answer=45449&topic=360&hl=he&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=he"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "25"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=he"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-8,windows-1255,ISO-8859-1"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/he/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=he"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=he"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_he.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_he.html"
+#else
+#include "chromium_strings_he.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_he.xtb b/chrome/app/resources/locale_settings_he.xtb
deleted file mode 100644
index baa02c4..0000000
--- a/chrome/app/resources/locale_settings_he.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="he">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">he-IL,he,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1255</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">true</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">he</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">25</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-8,windows-1255,ISO-8859-1</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_hi.rc b/chrome/app/resources/locale_settings_hi.rc
new file mode 100644
index 0000000..eacd260
--- /dev/null
+++ b/chrome/app/resources/locale_settings_hi.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "hi-IN,hi,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "hi"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=hi"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=hi"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/hi/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=hi"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=hi"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_hi.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_hi.html"
+#else
+#include "chromium_strings_hi.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_hi.xtb b/chrome/app/resources/locale_settings_hi.xtb
deleted file mode 100644
index e4f974c..0000000
--- a/chrome/app/resources/locale_settings_hi.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="hi">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">hi-IN,hi,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">hi</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_hr.rc b/chrome/app/resources/locale_settings_hr.rc
new file mode 100644
index 0000000..ff03539
--- /dev/null
+++ b/chrome/app/resources/locale_settings_hr.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "hr-HR,hr,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1250"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "hr"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=hr"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "68"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=hr"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/hr/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=hr"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=hr"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_hr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_hr.html"
+#else
+#include "chromium_strings_hr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_hr.xtb b/chrome/app/resources/locale_settings_hr.xtb
deleted file mode 100644
index 571f5a4..0000000
--- a/chrome/app/resources/locale_settings_hr.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="hr">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">hr-HR,hr,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1250</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">hr</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">68</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_hu.rc b/chrome/app/resources/locale_settings_hu.rc
new file mode 100644
index 0000000..0e704b3
--- /dev/null
+++ b/chrome/app/resources/locale_settings_hu.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "hu-HU,hu,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-2"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=hu"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "38"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "71"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "100"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "115"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=hu"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/hu/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=hu"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=hu"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_hu.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_hu.html"
+#else
+#include "chromium_strings_hu.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_hu.xtb b/chrome/app/resources/locale_settings_hu.xtb
deleted file mode 100644
index f1a6597..0000000
--- a/chrome/app/resources/locale_settings_hu.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="hu">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">hu-HU,hu,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-2</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">38</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">71</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">100</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">115</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_id.rc b/chrome/app/resources/locale_settings_id.rc
new file mode 100644
index 0000000..a5d3c85
--- /dev/null
+++ b/chrome/app/resources/locale_settings_id.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "id-ID,id,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "id"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=id"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "63"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=id"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/id/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=id"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=id"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_id.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_id.html"
+#else
+#include "chromium_strings_id.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_id.xtb b/chrome/app/resources/locale_settings_id.xtb
deleted file mode 100644
index b9b8b09..0000000
--- a/chrome/app/resources/locale_settings_id.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="id">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">id-ID,id,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">id</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">63</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_it.rc b/chrome/app/resources/locale_settings_it.rc
new file mode 100644
index 0000000..05842e2
--- /dev/null
+++ b/chrome/app/resources/locale_settings_it.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "it-IT,it,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "it"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.it/support/bin/answer.py?answer=45449&topic=360&hl=it&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=it"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "70"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "17"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "13"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=it"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/it/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=it"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=it"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_it.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_it.html"
+#else
+#include "chromium_strings_it.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_it.xtb b/chrome/app/resources/locale_settings_it.xtb
deleted file mode 100644
index 768c23968..0000000
--- a/chrome/app/resources/locale_settings_it.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="it">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">it-IT,it,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">it</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">17</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">13</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_ja.rc b/chrome/app/resources/locale_settings_ja.rc
new file mode 100644
index 0000000..ee47f55
--- /dev/null
+++ b/chrome/app/resources/locale_settings_ja.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "MS PGothic"
+ IDS_ACCEPT_LANGUAGES "ja,en-US,en"
+ IDS_DEFAULT_ENCODING "Shift_JIS"
+ IDS_STANDARD_FONT_IS_SERIF "false"
+ IDS_FIXED_FONT_FAMILY "MS Gothic"
+ IDS_SERIF_FONT_FAMILY "MS PMincho"
+ IDS_SANS_SERIF_FONT_FAMILY "MS PGothic"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.co.jp/support/bin/answer.py?answer=45449&topic=360&hl=ja&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=ja"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "100"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "39"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "25"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "62"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "102"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ja"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "Shift_JIS,EUC-JP,ISO-2022-JP"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ja/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ja"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ja"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_ja.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_ja.html"
+#else
+#include "chromium_strings_ja.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb
deleted file mode 100644
index a9825aa..0000000
--- a/chrome/app/resources/locale_settings_ja.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="ja">
-<translation id="IDS_WEB_FONT_FAMILY">MS PGothic</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">ja,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">Shift_JIS</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">MS Gothic</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">MS PMincho</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">MS PGothic</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">100</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">39</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">25</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">62</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">102</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">Shift_JIS,EUC-JP,ISO-2022-JP</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_kn.rc b/chrome/app/resources/locale_settings_kn.rc
new file mode 100644
index 0000000..25fdb6d
--- /dev/null
+++ b/chrome/app/resources/locale_settings_kn.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "kn-IN,kn,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=kn"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=kn"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/kn/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=kn"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=kn"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_kn.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_kn.html"
+#else
+#include "chromium_strings_kn.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_kn.xtb b/chrome/app/resources/locale_settings_kn.xtb
deleted file mode 100644
index 8f03c4b..0000000
--- a/chrome/app/resources/locale_settings_kn.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="kn">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">kn-IN,kn,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_ko.rc b/chrome/app/resources/locale_settings_ko.rc
new file mode 100644
index 0000000..0acf661
--- /dev/null
+++ b/chrome/app/resources/locale_settings_ko.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Gulim"
+ IDS_ACCEPT_LANGUAGES "ko-KR,ko,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-949"
+ IDS_STANDARD_FONT_IS_SERIF "false"
+ IDS_FIXED_FONT_FAMILY "Gulimche"
+ IDS_SERIF_FONT_FAMILY "Batang"
+ IDS_SANS_SERIF_FONT_FAMILY "Gulim"
+ IDS_CURSIVE_FONT_FAMILY "Gungsuh"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.co.kr/support/bin/answer.py?answer=45449&topic=360&hl=ko&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=ko"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "39"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "74"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "7"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "16"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ko"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-949"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ko/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ko"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ko"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_ko.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_ko.html"
+#else
+#include "chromium_strings_ko.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_ko.xtb b/chrome/app/resources/locale_settings_ko.xtb
deleted file mode 100644
index 7fb4124..0000000
--- a/chrome/app/resources/locale_settings_ko.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="ko">
-<translation id="IDS_WEB_FONT_FAMILY">Gulim</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">ko-KR,ko,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-949</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Gulimche</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Batang</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Gulim</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Gungsuh</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">39</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">74</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">7</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">16</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-949</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_lt.rc b/chrome/app/resources/locale_settings_lt.rc
new file mode 100644
index 0000000..c13ebf8
--- /dev/null
+++ b/chrome/app/resources/locale_settings_lt.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "lt,en-US,en,ru,pl"
+ IDS_DEFAULT_ENCODING "windows-1257"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "lt"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=li"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "68"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=lt"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1257,ISO-8859-4,ISO-8859-13"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/lt/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=lt"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=lt"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_lt.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_lt.html"
+#else
+#include "chromium_strings_lt.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_lt.xtb b/chrome/app/resources/locale_settings_lt.xtb
deleted file mode 100644
index e1ffe46..0000000
--- a/chrome/app/resources/locale_settings_lt.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="lt">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">lt,en-US,en,ru,pl</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1257</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">lt</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">68</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1257,ISO-8859-4,ISO-8859-13</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_lv.rc b/chrome/app/resources/locale_settings_lv.rc
new file mode 100644
index 0000000..0b57293
--- /dev/null
+++ b/chrome/app/resources/locale_settings_lv.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "lv-LV,lv,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1257"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "lv"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=lv"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "62"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "110"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=lv"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1257,ISO-8859-4,ISO-8859-13"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/lv/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=lv"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=lv"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_lv.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_lv.html"
+#else
+#include "chromium_strings_lv.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_lv.xtb b/chrome/app/resources/locale_settings_lv.xtb
deleted file mode 100644
index dcc327d..0000000
--- a/chrome/app/resources/locale_settings_lv.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="lv">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">lv-LV,lv,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1257</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">lv</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">62</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1257,ISO-8859-4,ISO-8859-13</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_ml.rc b/chrome/app/resources/locale_settings_ml.rc
new file mode 100644
index 0000000..33ef651
--- /dev/null
+++ b/chrome/app/resources/locale_settings_ml.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "ml-IN,ml,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=ml"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ml"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ml/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ml"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ml"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_ml.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_ml.html"
+#else
+#include "chromium_strings_ml.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_ml.xtb b/chrome/app/resources/locale_settings_ml.xtb
deleted file mode 100644
index 9a7a496..0000000
--- a/chrome/app/resources/locale_settings_ml.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="ml">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">ml-IN,ml,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_mr.rc b/chrome/app/resources/locale_settings_mr.rc
new file mode 100644
index 0000000..c8c3028
--- /dev/null
+++ b/chrome/app/resources/locale_settings_mr.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "mr-IN,mr,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=mr"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=mr"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/mr/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=mr"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=mr"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_mr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_mr.html"
+#else
+#include "chromium_strings_mr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_mr.xtb b/chrome/app/resources/locale_settings_mr.xtb
deleted file mode 100644
index 8c4b392..0000000
--- a/chrome/app/resources/locale_settings_mr.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="mr">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">mr-IN,mr,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_nb.rc b/chrome/app/resources/locale_settings_nb.rc
new file mode 100644
index 0000000..0aa4ab4
--- /dev/null
+++ b/chrome/app/resources/locale_settings_nb.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "nb-NO,nb,no,nn,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "nb"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=nb"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "66"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "16"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=nb"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/no/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=nb"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=nb"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_nb.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_nb.html"
+#else
+#include "chromium_strings_nb.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_nb.xtb b/chrome/app/resources/locale_settings_nb.xtb
deleted file mode 100644
index 092d0df..0000000
--- a/chrome/app/resources/locale_settings_nb.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="nb">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">nb-NO,nb,no,nn,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">nb</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">16</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_nl.rc b/chrome/app/resources/locale_settings_nl.rc
new file mode 100644
index 0000000..6251413
--- /dev/null
+++ b/chrome/app/resources/locale_settings_nl.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "nl-NL,nl,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "nl"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.nl/support/bin/answer.py?answer=45449&topic=360&hl=nl&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=nl"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "102"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "30"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "67"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "21"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=nl"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/nl/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=nl"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=nl"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_nl.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_nl.html"
+#else
+#include "chromium_strings_nl.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_nl.xtb b/chrome/app/resources/locale_settings_nl.xtb
deleted file mode 100644
index 3cf5a16..0000000
--- a/chrome/app/resources/locale_settings_nl.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="nl">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">nl-NL,nl,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">nl</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">102</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">30</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">67</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">21</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_or.rc b/chrome/app/resources/locale_settings_or.rc
new file mode 100644
index 0000000..9bcc065
--- /dev/null
+++ b/chrome/app/resources/locale_settings_or.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "or-IN,or,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=or"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=or"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/or/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=or"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=or"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_or.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_or.html"
+#else
+#include "chromium_strings_or.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_or.xtb b/chrome/app/resources/locale_settings_or.xtb
deleted file mode 100644
index 78c2abe..0000000
--- a/chrome/app/resources/locale_settings_or.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="or">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">or-IN,or,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_pl.rc b/chrome/app/resources/locale_settings_pl.rc
new file mode 100644
index 0000000..b14353d
--- /dev/null
+++ b/chrome/app/resources/locale_settings_pl.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "pl-PL,pl,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-2"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "pl"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.pl/support/bin/answer.py?answer=45449&topic=360&hl=pl&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=pl"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "102"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "55"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=pl"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/pl/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=pl"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=pl"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_pl.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_pl.html"
+#else
+#include "chromium_strings_pl.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_pl.xtb b/chrome/app/resources/locale_settings_pl.xtb
deleted file mode 100644
index 682c438..0000000
--- a/chrome/app/resources/locale_settings_pl.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="pl">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">pl-PL,pl,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-2</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">pl</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">102</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">55</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_pt-BR.rc b/chrome/app/resources/locale_settings_pt-BR.rc
new file mode 100644
index 0000000..7a9f773
--- /dev/null
+++ b/chrome/app/resources/locale_settings_pt-BR.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "pt-BR,pt,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "pt-BR"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com.br/support/bin/answer.py?answer=45449&topic=360&hl=pt-BR&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=pt-BR"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "110"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "30"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "19"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=pt-BR"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/pt-BR/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=pt-BR"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=pt-BR"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_pt-BR.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_pt-BR.html"
+#else
+#include "chromium_strings_pt-BR.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_pt-BR.xtb b/chrome/app/resources/locale_settings_pt-BR.xtb
deleted file mode 100644
index b5da8d7..0000000
--- a/chrome/app/resources/locale_settings_pt-BR.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="pt-BR">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">pt-BR,pt,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">pt-BR</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">30</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">19</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_pt-PT.rc b/chrome/app/resources/locale_settings_pt-PT.rc
new file mode 100644
index 0000000..b761d35
--- /dev/null
+++ b/chrome/app/resources/locale_settings_pt-PT.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "pt-PT,pt,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "pt-PT"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=pt-PT"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "110"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "30"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "64"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=pt-PT"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/pt-PT/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=pt-PT"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=pt-PT"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "66"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_pt-PT.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_pt-PT.html"
+#else
+#include "chromium_strings_pt-PT.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_pt-PT.xtb b/chrome/app/resources/locale_settings_pt-PT.xtb
deleted file mode 100644
index 97e556c..0000000
--- a/chrome/app/resources/locale_settings_pt-PT.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="pt-PT">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">pt-PT,pt,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">pt-PT</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">30</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">64</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">66</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_ro.rc b/chrome/app/resources/locale_settings_ro.rc
new file mode 100644
index 0000000..dd33bbf
--- /dev/null
+++ b/chrome/app/resources/locale_settings_ro.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "ro-RO,ro,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-2"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "ro"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=ro"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "37"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "73"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "19"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ro"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ro/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ro"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ro"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_ro.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_ro.html"
+#else
+#include "chromium_strings_ro.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_ro.xtb b/chrome/app/resources/locale_settings_ro.xtb
deleted file mode 100644
index 76afe10..0000000
--- a/chrome/app/resources/locale_settings_ro.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="ro">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">ro-RO,ro,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-2</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">ro</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">37</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">73</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">19</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_ru.rc b/chrome/app/resources/locale_settings_ru.rc
new file mode 100644
index 0000000..7dccf0f
--- /dev/null
+++ b/chrome/app/resources/locale_settings_ru.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "ru-RU,ru,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1251"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "ru"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.ru/support/bin/answer.py?answer=45449&topic=360&hl=ru&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=ru"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "38"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "66"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "6"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "19"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ru"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1251,,KOI8-R,KOI8-U,ISO-8859-5"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ru/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ru"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ru"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_ru.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_ru.html"
+#else
+#include "chromium_strings_ru.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_ru.xtb b/chrome/app/resources/locale_settings_ru.xtb
deleted file mode 100644
index a5534d8..0000000
--- a/chrome/app/resources/locale_settings_ru.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="ru">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">ru-RU,ru,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1251</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">ru</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">38</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">6</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">19</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1251,,KOI8-R,KOI8-U,ISO-8859-5</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_sk.rc b/chrome/app/resources/locale_settings_sk.rc
new file mode 100644
index 0000000..9457669
--- /dev/null
+++ b/chrome/app/resources/locale_settings_sk.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "sk-SK,sk,cs,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1250"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "sk"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=sk"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "38"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "66"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=sk"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1250,ISO-8859-2"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/sk/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=sk"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=sk"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_sk.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_sk.html"
+#else
+#include "chromium_strings_sk.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_sk.xtb b/chrome/app/resources/locale_settings_sk.xtb
deleted file mode 100644
index f1893de..0000000
--- a/chrome/app/resources/locale_settings_sk.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="sk">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">sk-SK,sk,cs,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1250</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">sk</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">38</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1250,ISO-8859-2</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_sl.rc b/chrome/app/resources/locale_settings_sl.rc
new file mode 100644
index 0000000..217c195
--- /dev/null
+++ b/chrome/app/resources/locale_settings_sl.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "sl-SI,sl,en-GB,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-2"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "sl"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=sl"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "66"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=sl"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/sl/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=sl"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=sl"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_sl.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_sl.html"
+#else
+#include "chromium_strings_sl.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_sl.xtb b/chrome/app/resources/locale_settings_sl.xtb
deleted file mode 100644
index 6648056..0000000
--- a/chrome/app/resources/locale_settings_sl.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="sl">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">sl-SI,sl,en-GB,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-2</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">sl</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_sr.rc b/chrome/app/resources/locale_settings_sr.rc
new file mode 100644
index 0000000..e78a8e0
--- /dev/null
+++ b/chrome/app/resources/locale_settings_sr.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "sr-RS,sr,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1251"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=sr"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "72"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "18"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "110"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=sr"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1251,KOI8-R,ISO-8859-5"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/sr/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=sr"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=sr"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_sr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_sr.html"
+#else
+#include "chromium_strings_sr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_sr.xtb b/chrome/app/resources/locale_settings_sr.xtb
deleted file mode 100644
index fc9e1db..0000000
--- a/chrome/app/resources/locale_settings_sr.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="sr">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">sr-RS,sr,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1251</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">72</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">18</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1251,KOI8-R,ISO-8859-5</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_sv.rc b/chrome/app/resources/locale_settings_sv.rc
new file mode 100644
index 0000000..c27caeb
--- /dev/null
+++ b/chrome/app/resources/locale_settings_sv.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "sv-SE,sv,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "sv"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.se/support/bin/answer.py?answer=45449&topic=360&hl=sv&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=sv"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "63"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=sv"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/sv/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=sv"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=sv"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_sv.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_sv.html"
+#else
+#include "chromium_strings_sv.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_sv.xtb b/chrome/app/resources/locale_settings_sv.xtb
deleted file mode 100644
index c906ba0..0000000
--- a/chrome/app/resources/locale_settings_sv.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="sv">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">sv-SE,sv,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">sv</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">63</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_ta.rc b/chrome/app/resources/locale_settings_ta.rc
new file mode 100644
index 0000000..dc256e8
--- /dev/null
+++ b/chrome/app/resources/locale_settings_ta.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "ta-IN,ta,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=ta"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ta"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ta/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ta"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ta"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_ta.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_ta.html"
+#else
+#include "chromium_strings_ta.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_ta.xtb b/chrome/app/resources/locale_settings_ta.xtb
deleted file mode 100644
index 8579fbb..0000000
--- a/chrome/app/resources/locale_settings_ta.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="ta">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">ta-IN,ta,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_te.rc b/chrome/app/resources/locale_settings_te.rc
new file mode 100644
index 0000000..674b833
--- /dev/null
+++ b/chrome/app/resources/locale_settings_te.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "te-IN,te,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-1"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=te"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=te"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/te/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=te"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=te"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_te.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_te.html"
+#else
+#include "chromium_strings_te.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_te.xtb b/chrome/app/resources/locale_settings_te.xtb
deleted file mode 100644
index 2ed44eb..0000000
--- a/chrome/app/resources/locale_settings_te.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="te">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">te-IN,te,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-1</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">110</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_th.rc b/chrome/app/resources/locale_settings_th.rc
new file mode 100644
index 0000000..cc2d0d6
--- /dev/null
+++ b/chrome/app/resources/locale_settings_th.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "tahoma"
+ IDS_ACCEPT_LANGUAGES "th-TH,th"
+ IDS_DEFAULT_ENCODING "windows-874"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "tahoma"
+ IDS_SERIF_FONT_FAMILY "tahoma"
+ IDS_SANS_SERIF_FONT_FAMILY "tahoma"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.co.th/support/bin/answer.py?answer=45449&topic=360&hl=th&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=th"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "60"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "19"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=th"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-874"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/th/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=th"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=th"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_th.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_th.html"
+#else
+#include "chromium_strings_th.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_th.xtb b/chrome/app/resources/locale_settings_th.xtb
deleted file mode 100644
index 5f49658..0000000
--- a/chrome/app/resources/locale_settings_th.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="th">
-<translation id="IDS_WEB_FONT_FAMILY">tahoma</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">th-TH,th</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-874</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">tahoma</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">tahoma</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">tahoma</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">19</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-874</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_tr.rc b/chrome/app/resources/locale_settings_tr.rc
new file mode 100644
index 0000000..d966103
--- /dev/null
+++ b/chrome/app/resources/locale_settings_tr.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "tr-TR,tr,en-US,en"
+ IDS_DEFAULT_ENCODING "ISO-8859-9"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "tr"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com.tr/support/bin/answer.py?answer=45449&topic=360&hl=tr&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=tr"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "65"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "20"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=tr"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "ISO-8859-9,windows-1254"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/tr/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=tr"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=tr"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "66"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_tr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_tr.html"
+#else
+#include "chromium_strings_tr.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_tr.xtb b/chrome/app/resources/locale_settings_tr.xtb
deleted file mode 100644
index 78b775f..0000000
--- a/chrome/app/resources/locale_settings_tr.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="tr">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">tr-TR,tr,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">ISO-8859-9</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">tr</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">99</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">20</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-9,windows-1254</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">66</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_uk.rc b/chrome/app/resources/locale_settings_uk.rc
new file mode 100644
index 0000000..ee7df04
--- /dev/null
+++ b/chrome/app/resources/locale_settings_uk.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "uk-UA,uk,ru,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1251"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=uk"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "36"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "66"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "19"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=uk"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1251,KOI8-U,KOI8-R,ISO-8859-5"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/uk/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=uk"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=uk"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_uk.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_uk.html"
+#else
+#include "chromium_strings_uk.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_uk.xtb b/chrome/app/resources/locale_settings_uk.xtb
deleted file mode 100644
index ac67f2a..0000000
--- a/chrome/app/resources/locale_settings_uk.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="uk">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">uk-UA,uk,ru,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1251</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">36</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">19</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1251,KOI8-U,KOI8-R,ISO-8859-5</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_vi.rc b/chrome/app/resources/locale_settings_vi.rc
new file mode 100644
index 0000000..d4f1b08
--- /dev/null
+++ b/chrome/app/resources/locale_settings_vi.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "vi-VN,vi,fr-FR,fr,en-US,en"
+ IDS_DEFAULT_ENCODING "windows-1258"
+ IDS_STANDARD_FONT_IS_SERIF "true"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "vi"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=vi"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "37"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "67"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "17"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=vi"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "windows-1258"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/vi/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=vi"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=vi"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_vi.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_vi.html"
+#else
+#include "chromium_strings_vi.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_vi.xtb b/chrome/app/resources/locale_settings_vi.xtb
deleted file mode 100644
index 1adb5f6..0000000
--- a/chrome/app/resources/locale_settings_vi.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="vi">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">vi-VN,vi,fr-FR,fr,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">windows-1258</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">vi</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">37</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">67</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">17</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">windows-1258</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_zh-CN.rc b/chrome/app/resources/locale_settings_zh-CN.rc
new file mode 100644
index 0000000..ff158c2
--- /dev/null
+++ b/chrome/app/resources/locale_settings_zh-CN.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Simsun"
+ IDS_ACCEPT_LANGUAGES "zh-CN,zh"
+ IDS_DEFAULT_ENCODING "gb18030"
+ IDS_STANDARD_FONT_IS_SERIF "false"
+ IDS_FIXED_FONT_FAMILY "NSimsun"
+ IDS_SERIF_FONT_FAMILY "Simsun"
+ IDS_SANS_SERIF_FONT_FAMILY "Simsun"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "6"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.cn/support/bin/answer.py?answer=45449&topic=360&hl=zh-CN&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=zh-CN"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "98"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "39"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "26"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "60"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "17"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=zh-CN"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "GBK,gb18030"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/zh-CN/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=zh-CN"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=zh-CN"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_zh-CN.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_zh-CN.html"
+#else
+#include "chromium_strings_zh-CN.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb
deleted file mode 100644
index a9b8db6..0000000
--- a/chrome/app/resources/locale_settings_zh-CN.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="zh-CN">
-<translation id="IDS_WEB_FONT_FAMILY">Simsun</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">zh-CN,zh</translation>
-<translation id="IDS_DEFAULT_ENCODING">gb18030</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">NSimsun</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Simsun</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Simsun</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">6</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">98</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">39</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">26</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">17</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">GBK,gb18030</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>
diff --git a/chrome/app/resources/locale_settings_zh-TW.rc b/chrome/app/resources/locale_settings_zh-TW.rc
new file mode 100644
index 0000000..12aa07c
--- /dev/null
+++ b/chrome/app/resources/locale_settings_zh-TW.rc
@@ -0,0 +1,76 @@
+#include "grit/locale_settings.h"
+
+STRINGTABLE
+BEGIN
+ IDS_WEB_FONT_FAMILY "Arial"
+ IDS_ACCEPT_LANGUAGES "zh-TW,zh,en-US,en"
+ IDS_DEFAULT_ENCODING "Big5"
+ IDS_STANDARD_FONT_IS_SERIF "false"
+ IDS_FIXED_FONT_FAMILY "Courier New"
+ IDS_SERIF_FONT_FAMILY "Times New Roman"
+ IDS_SANS_SERIF_FONT_FAMILY "Arial"
+ IDS_CURSIVE_FONT_FAMILY "Comic Sans MS"
+ IDS_FANTASY_FONT_FAMILY "Impact"
+ IDS_DEFAULT_FONT_SIZE "16"
+ IDS_DEFAULT_FIXED_FONT_SIZE "13"
+ IDS_MINIMUM_FONT_SIZE "1"
+ IDS_MINIMUM_LOGICAL_FONT_SIZE "10"
+ IDS_USES_UNIVERSAL_DETECTOR "false"
+ IDS_SPELLCHECK_DICTIONARY "en-US"
+ IDS_LEARN_MORE_MALWARE_URL "http://www.google.com.tw/support/bin/answer.py?answer=45449&topic=360&hl=zh-TW&sa=X&oi=malwarewarninglink&resnum=1&ct=help"
+ IDS_LEARN_MORE_PHISHING_URL "http://www.google.com/support/bin/answer.py?answer=106318&hl=zh-TW"
+ IDS_OPTIONS_DIALOG_WIDTH_CHARS "95"
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES "39"
+ IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS "25"
+ IDS_BUGREPORT_DIALOG_WIDTH_CHARS "85"
+ IDS_BUGREPORT_DIALOG_HEIGHT_LINES "17"
+ IDS_CLEARDATA_DIALOG_WIDTH_CHARS "57"
+ IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
+ IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
+ IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
+ IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+ IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
+ IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
+ IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
+ IDS_FONTSLANG_LABEL_WIDTH "17"
+ IDS_PAGEINFO_DIALOG_WIDTH_CHARS "70"
+ IDS_PAGEINFO_DIALOG_HEIGHT_LINES "25"
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS "95"
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES "25"
+ IDS_SHELFITEM_DIALOG_WIDTH_CHARS "80"
+ IDS_SHELFITEM_DIALOG_HEIGHT_LINES "30"
+ IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS "70"
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES "25"
+ IDS_FIRSTRUN_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUN_DIALOG_HEIGHT_LINES "19"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS "80"
+ IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES "17"
+ IDS_COOKIES_DIALOG_WIDTH_CHARS "80"
+ IDS_COOKIES_DIALOG_HEIGHT_LINES "29"
+ IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75"
+ IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16"
+ IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50"
+ IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8"
+ IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93"
+ IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
+ IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=zh-TW"
+ IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
+ IDS_STATIC_ENCODING_LIST "Big5,Big5-HKSCS"
+ IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/zh-TW/welcome.html"
+ IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=zh-TW"
+ IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=zh-TW"
+ IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+ IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
+ IDS_DOWNLOAD_BIG_PROGRESS_SIZE "52"
+ IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS "60"
+ IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES "5"
+ IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS "60"
+END
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "google_chrome_strings_zh-TW.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_zh-TW.html"
+#else
+#include "chromium_strings_zh-TW.rc"
+IDR_TERMS_HTML BINDATA "terms\\terms_chromium.html"
+#endif
diff --git a/chrome/app/resources/locale_settings_zh-TW.xtb b/chrome/app/resources/locale_settings_zh-TW.xtb
deleted file mode 100644
index db0c39fd..0000000
--- a/chrome/app/resources/locale_settings_zh-TW.xtb
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE translationbundle>
-<translationbundle lang="zh-TW">
-<translation id="IDS_WEB_FONT_FAMILY">Arial</translation>
-<translation id="IDS_ACCEPT_LANGUAGES">zh-TW,zh,en-US,en</translation>
-<translation id="IDS_DEFAULT_ENCODING">Big5</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
-<translation id="IDS_FIXED_FONT_FAMILY">Courier New</translation>
-<translation id="IDS_SERIF_FONT_FAMILY">Times New Roman</translation>
-<translation id="IDS_SANS_SERIF_FONT_FAMILY">Arial</translation>
-<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
-<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
-<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
-<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
-<translation id="IDS_MINIMUM_FONT_SIZE">1</translation>
-<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">10</translation>
-<translation id="IDS_USES_UNIVERSAL_DETECTOR">false</translation>
-<translation id="IDS_SPELLCHECK_DICTIONARY">en-US</translation>
-<translation id="IDS_OPTIONS_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_OPTIONS_DIALOG_HEIGHT_LINES">39</translation>
-<translation id="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">25</translation>
-<translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
-<translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">57</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation>
-<translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
-<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">5</translation>
-<translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation>
-<translation id="IDS_FONTSLANG_LABEL_WIDTH">17</translation>
-<translation id="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">95</translation>
-<translation id="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">30</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">25</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">19</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">17</translation>
-<translation id="IDS_COOKIES_DIALOG_WIDTH_CHARS">80</translation>
-<translation id="IDS_COOKIES_DIALOG_HEIGHT_LINES">29</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">16</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">50</translation>
-<translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation>
-<translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation>
-<translation id="IDS_STATIC_ENCODING_LIST">Big5,Big5-HKSCS</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation>
-<translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation>
-<translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
-<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-</translationbundle>