[automerger skipped] Merge "Replace PlaybackActivityMonitor with AudioDeviceCallback" am: 3424cdb269 am: f2799acb5d am: f4a8a48238 -s ours

am skip reason: Merged-In Ieab2b408af537b477030ba75f8ae2b69ea8e4528 with SHA-1 e30838778e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2504276

Change-Id: I6253c439758711565a11253d4f84f1c09b607b4b
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index ebc8717..3546364 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -34,6 +34,6 @@
     <string name="pop" msgid="8568493898002509539">"ପପ୍"</string>
     <string name="rock" msgid="4226553710464965901">"ରକ୍"</string>
     <string name="ci_extreme" msgid="67259122484788490">"FX ବୁଷ୍ଟର୍"</string>
-    <string name="user" msgid="8392147515328861077">"ଉପଯୋଗକର୍ତ୍ତା"</string>
+    <string name="user" msgid="8392147515328861077">"ୟୁଜର"</string>
     <string name="picker_title" msgid="4756201760847390691">"ମ୍ୟୁଜିକ ଇଫେକ୍ଟ କଣ୍ଟ୍ରୋଲପ୍ୟାନେଲ"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1df8740..776d4af 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,10 +19,10 @@
     <string name="app_name" msgid="2227320688818248940">"MusicFX"</string>
     <string name="no_effects" msgid="9023408561505030260">"Efectele nu sunt disponibile."</string>
     <string name="eq_dialog_title" msgid="3237402214371962070">"Egalizator"</string>
-    <string name="headset_plug" msgid="1774198554148807517">"Pentru aceste efecte trebuie să conectați căștile."</string>
+    <string name="headset_plug" msgid="1774198554148807517">"Pentru aceste efecte trebuie să conectezi căștile."</string>
     <string name="bass_boost_strength" msgid="8643071340166812205">"Amplificare bas"</string>
     <string name="virtualizer_strength" msgid="2139410708760989842">"Sunet surround"</string>
-    <string name="setup" msgid="4811197673396615722">"Configurați"</string>
+    <string name="setup" msgid="4811197673396615722">"Configurează"</string>
     <string name="normal" msgid="757786146857325609">"Normal"</string>
     <string name="classical" msgid="1975693421508209132">"Clasică"</string>
     <string name="dance" msgid="212617702657103572">"Dance"</string>