MD Settings: re-enable settings translations ONCE AND FOR ALL

chrome/chrome_repack_locales.gni

Index: chrome/chrome_repack_locales.gni
diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
index 54559c7658b4eb67623e14601f471c3ac157cf1e..7f5b7b7780d0ca1ee30e0ff813a4573f679457df 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/chrome/chrome_repack_locales.gni
@@ -52,11 +52,6 @@ template("_repack_one_locale") {
       "//components/strings:components_strings",
     ]
 
-    # The settings strings are not being treated as strings because they are
-    # not translated (English only), this should change in late 2015.
-    sources += [ "${root_gen_dir}/chrome/settings_strings.pak" ]
-    deps += [ "//chrome/app:settings_strings" ]
-
     if (defined(invoker.additional_source_patterns)) {
       sources += process_file_template(invoker.additional_source_patterns,
                                        [ "{{source}}_${locale}.pak" ])
@@ -105,23 +100,19 @@ template("_repack_one_locale") {
     if (is_chrome_branded) {
       sources += [
         "${root_gen_dir}/chrome/google_chrome_strings_${locale}.pak",
-        "${root_gen_dir}/chrome/settings_google_chrome_strings.pak",
         "${root_gen_dir}/components/strings/components_google_chrome_strings_${locale}.pak",
       ]
       deps += [
         "//chrome/app:google_chrome_strings",
-        "//chrome/app:settings_google_chrome_strings",
         "//components/strings:components_google_chrome_strings",
       ]
     } else {
       sources += [
         "${root_gen_dir}/chrome/chromium_strings_${locale}.pak",
-        "${root_gen_dir}/chrome/settings_chromium_strings.pak",
         "${root_gen_dir}/components/strings/components_chromium_strings_${locale}.pak",
       ]
       deps += [
         "//chrome/app:chromium_strings",
-        "//chrome/app:settings_chromium_strings",
         "//components/strings:components_chromium_strings",
       ]
     }