Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release

4 files changed, 60 insertions, 2 deletions

diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
new file mode 100644
index 0000000..711893b
--- /dev/null
+++ b/res/values-bs/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2010-2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="no_effects" msgid="5067916002004255814">"Efekti nisu dostupni."</string>
+    <string name="eq_dialog_title" msgid="2020244436368289652">"Ekvalizator"</string>
+    <string name="headset_plug" msgid="4505819850289423141">"Priključite slušalice za ove efekte."</string>
+    <string name="bass_boost_strength" msgid="882301530007752270">"Pojačanje basova"</string>
+    <string name="virtualizer_strength" msgid="106561253469770096">"Okružujući zvuk"</string>
+    <string name="setup" msgid="1103677904576339192">"Postavljanje"</string>
+    <string name="ci_extreme" msgid="1736938429763948084">"FX booster"</string>
+    <string name="user" msgid="3949460956502898057">"Korisnik"</string>
+    <string name="picker_title" msgid="8464126693702817261">"Upravljačka ploča glazbenih efekata"</string>
+</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 85a0094..12d1f6d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -22,7 +22,7 @@
     <string name="headset_plug" msgid="4505819850289423141">"Tilslut hovedtelefoner for at få disse effekter."</string>
     <string name="bass_boost_strength" msgid="882301530007752270">"Bass boost"</string>
     <string name="virtualizer_strength" msgid="106561253469770096">"Surroundsound"</string>
-    <string name="setup" msgid="1103677904576339192">"Opsætning"</string>
+    <string name="setup" msgid="1103677904576339192">"Konfiguration"</string>
     <string name="ci_extreme" msgid="1736938429763948084">"FX booster"</string>
     <string name="user" msgid="3949460956502898057">"Tilpasset"</string>
     <string name="picker_title" msgid="8464126693702817261">"Kontrolpanel for musikeffekter"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..842d7e0
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2010-2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
+    <string name="no_effects" msgid="5067916002004255814">"Effects not available."</string>
+    <string name="eq_dialog_title" msgid="2020244436368289652">"Equaliser"</string>
+    <string name="headset_plug" msgid="4505819850289423141">"Plug in headphones for these effects."</string>
+    <string name="bass_boost_strength" msgid="882301530007752270">"Bass boost"</string>
+    <string name="virtualizer_strength" msgid="106561253469770096">"Surround sound"</string>
+    <string name="setup" msgid="1103677904576339192">"Setup"</string>
+    <string name="ci_extreme" msgid="1736938429763948084">"FX booster"</string>
+    <string name="user" msgid="3949460956502898057">"User"</string>
+    <string name="picker_title" msgid="8464126693702817261">"Music effects control panel"</string>
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cbb2411..0c028ee 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -23,7 +23,7 @@
     <string name="bass_boost_strength" msgid="882301530007752270">"バスブースト"</string>
     <string name="virtualizer_strength" msgid="106561253469770096">"サラウンドサウンド"</string>
     <string name="setup" msgid="1103677904576339192">"セットアップ"</string>
-    <string name="ci_extreme" msgid="1736938429763948084">"FXブースター"</string>
+    <string name="ci_extreme" msgid="1736938429763948084">"FX ブースター"</string>
     <string name="user" msgid="3949460956502898057">"ユーザー"</string>
     <string name="picker_title" msgid="8464126693702817261">"サウンド効果コントロールパネル"</string>
 </resources>