summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_device.cc
diff options
context:
space:
mode:
authornewt <newt@chromium.org>2015-08-11 14:00:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-11 21:01:33 +0000
commit5e483dea759499680a0aaa11f4b9b03cc65d7f32 (patch)
tree91d25dd444fb9bf6d42ad32d0fad2b4f7203ca87 /device/bluetooth/bluetooth_device.cc
parent5fe2bb67cf286c5bbd6fc0d50536c93f4642c3fe (diff)
downloadchromium_src-5e483dea759499680a0aaa11f4b9b03cc65d7f32.zip
chromium_src-5e483dea759499680a0aaa11f4b9b03cc65d7f32.tar.gz
chromium_src-5e483dea759499680a0aaa11f4b9b03cc65d7f32.tar.bz2
Rename device_bluetooth_strings to bluetooth_strings.
Our translation process doesn't support xtb files that have a different basename than their corresponding grd file. i.e. the xtb files for bluetooth_strings.grd need to be named bluetooth_strings_fr.xtb, etc, not device_bluetooth_strings_fr.xtb. This discrepancy has prevented translations for bluetooth_strings.grd from being copied into Chromium. This CL fixes that. (A future update to the translation process will help prevent situations like this from occurring silently in the future.) BUG=518020 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/1279393002 Cr-Commit-Position: refs/heads/master@{#342886}
Diffstat (limited to 'device/bluetooth/bluetooth_device.cc')
-rw-r--r--device/bluetooth/bluetooth_device.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/device/bluetooth/bluetooth_device.cc b/device/bluetooth/bluetooth_device.cc
index fe21162..6696d51 100644
--- a/device/bluetooth/bluetooth_device.cc
+++ b/device/bluetooth/bluetooth_device.cc
@@ -10,7 +10,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "device/bluetooth/bluetooth_gatt_service.h"
-#include "grit/device_bluetooth_strings.h"
+#include "grit/bluetooth_strings.h"
#include "ui/base/l10n/l10n_util.h"
namespace device {