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

chrome/chrome_repack_locales.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//tools/grit/repack.gni")
 
 # Arguments:
@@ skipping 34 matching lines @@
       "${root_gen_dir}/components/strings/components_strings_${locale}.pak",
     ]
     deps = [
       "//chrome/app:generated_resources",
       "//chrome/app/resources:locale_settings",
       "//chrome/app/resources:platform_locale_settings",
       "//components/strings:components_locale_settings",
       "//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" ])
       deps += invoker.additional_deps
     }
 
     if (use_ash) {
       sources += [ "${root_gen_dir}/ash/strings/ash_strings_${locale}.pak" ]
       deps += [ "//ash/strings" ]
     }
@@ skipping 28 matching lines @@
         # TODO(jamescook): When Android stops building extensions code move
         # this to the OS != 'ios' and OS != 'android' section.
         "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak",
       ]
       deps += [ "//extensions/strings" ]
     }
 
     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",
       ]
     }
 
     output = invoker.output
   }
 }
 
 # Creates an action to call the repack_locales script.
 #
@@ skipping 70 matching lines @@
 
     current_index = current_index + 1
   }
 
   # The group that external targets depend on which collects all deps.
   group(group_target_name) {
     forward_variables_from(invoker, [ "visibility" ])
     public_deps = locale_targets
   }
 }