Merge branch 'cm-13.0-oss' into HEAD

Change-Id: Ie762fdbe5b70dec6843ce489e78d802662e148fb

1 files changed, 32 insertions, 6 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 16d24ff..bea5314 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -14,8 +14,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources>
-    <string name="app_name_cm" translatable="false">AudioFX</string>
+<resources xmlns:xliff="rn:oasis:names:tc:xliff:document:1.2">
+    <string name="snack_bar_not_default">AudioFX is not your default effects control panel.</string>
+    <string name="snack_bar_not_default_set">Set default</string>
+    <string name="snack_bar_not_default_not_now">Not now</string>
+
+    <string name="qs_tile_content_description">Toggle AudioFX on/off for the current device</string>
+    <string name="qs_tile_label">AudioFX (%1$s)</string>
 
     <string name="normal">Normal</string>
     <string name="classical">Classical</string>
@@ -27,9 +32,11 @@
     <string name="jazz">Jazz</string>
     <string name="pop">Pop</string>
     <string name="rock">Rock</string>
-    <string name="electronic">Electronic</string>
+    <string name="ci_extreme">Electronic</string>
     <string name="small_speakers">Small speakers</string>
-    <string name="custom">Custom</string>
+    <string name="multimedia">Multimedia</string>
+    <string name="user">Custom</string>
+    <string name="user_n">Custom <xliff:g id="preset_num">%1$d</xliff:g></string>
 
     <string name="none">None</string>
     <string name="smallroom">Small room</string>
@@ -41,13 +48,32 @@
 
     <string name="power_on_prompt">Press the power button on the top-right.</string>
     <string name="effect_unavalable_for_speaker">Effect not available for Speaker mode.</string>
-    
+
     <string name="device_headset">Headset</string>
     <string name="device_speaker">Speaker</string>
-    <string name="device_lineout">Line out</string>
     <string name="device_usb">USB</string>
     <string name="device_bluetooth">Bluetooth</string>
     <string name="device_wireless">Wireless</string>
+    <string name="device_line_out">Line out</string>
+
     <string name="reverb">Reverb</string>
     <string name="eq_preset">Equalizer preset</string>
+
+    <string name="devices">Devices</string>
+
+    <string name="virtualizer">Virtualizer</string>
+    <string name="treble">Treble</string>
+    <string name="bass">Bass</string>
+
+    <string name="rename">Rename</string>
+    <string name="remove_custom_preset_warning_message">Are you sure you want to remove %1$s?</string>
+
+    <string name="app_name" translatable="false">AudioFX</string>
+    <string name="app_title" translatable="false">@string/app_name</string>
+
+    <string name="powered_by_maxx_audio" translatable="false">Powered by MaxxAudio</string>
+    <string name="mode_dts" translatable="false">with DTS Sound&#8482;</string>
+    <string name="powered_by">powered by</string>
+
+
 </resources>