diff --git a/fmapp2/AndroidManifest.xml b/fmapp2/AndroidManifest.xml
index 9f38bea..57bc67e 100644
--- a/fmapp2/AndroidManifest.xml
+++ b/fmapp2/AndroidManifest.xml
@@ -90,7 +90,7 @@
         </receiver>
 
         <activity android:name=".Settings"
-            android:label="@string/settings_menu">
+            android:label="@string/menu_settings">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -117,7 +117,7 @@
         </activity>
 
        <activity android:name=".StationListActivity"
-            android:label="@string/app_label_all_channels"
+            android:label="@string/menu_all_channels"
             android:configChanges="orientation|keyboardHidden|screenSize|fontScale">
 
             <intent-filter>
diff --git a/fmapp2/fmtransmitter.xml b/fmapp2/fmtransmitter.xml
deleted file mode 100644
index 5e65620..0000000
--- a/fmapp2/fmtransmitter.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2009, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of The Linux Foundation nor
- *      the names of its contributors may be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-
-	<!--
-		This LinearLayout contains Station Information display and the
-		function buttons
-	-->
-	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:orientation="horizontal">
-
-		<LinearLayout android:background="@drawable/station_border"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:orientation="vertical"
-			android:gravity="top|fill_vertical">
-
-			<RelativeLayout android:id="@+id/station_layout"
-				android:layout_width="fill_parent"
-				android:layout_height="fill_parent">
-
-				<!-- This included layout contains Station Information to display -->
-				<LinearLayout android:id="@+id/stationinfo_layout"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="5px"
-					android:layout_marginLeft="5px"
-					android:layout_marginRight="5px"
-					android:orientation="vertical"
-					android:gravity="fill_vertical">
-
-					<LinearLayout android:id="@+id/station_frequency_row"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:orientation="vertical"
-						android:paddingTop="25px"
-						android:paddingBottom="25px"
-						android:gravity="fill_vertical|center">
-
-						<TextView android:id="@+id/transmit_msg_tv"
-							android:textAppearance="?android:attr/textAppearanceSmall"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:textSize="15px"
-							android:layout_centerHorizontal="true"
-							android:layout_alignWithParentIfMissing="true"
-							android:text="@string/transmit_msg_string" />
-
-						<TextView android:id="@+id/prog_frequency_tv"
-							android:textAppearance="?android:attr/textAppearanceLarge"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_centerHorizontal="true"
-							android:layout_alignWithParentIfMissing="true"
-							android:layout_alignParentTop="true"
-							android:layout_alignParentLeft="true"
-							android:textSize="56px"
-							android:text="@string/frequency_string" />
-					</LinearLayout>
-
-					<!-- Station Radio Text information display -->
-					<TextView android:id="@+id/radio_text_tv"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:textAppearance="?android:attr/textAppearanceMedium"
-						android:textSize="16sp"
-						android:singleLine="true"
-						android:textStyle="bold"
-						android:paddingBottom="2px"
-						android:paddingLeft="5px"
-						android:paddingRight="5px"
-						android:gravity="center_horizontal"
-						android:text="@string/radio_text_string" />
-					<!-- android:gravity="center_horizontal" -->
-				</LinearLayout>
-
-				<ImageView android:id="@+id/btn_back"
-				    android:clickable="true"
-					android:focusable="true"
-					android:layout_width="wrap_content"
-					android:layout_height="fill_parent"
-					android:paddingLeft="10px"
-					android:paddingRight="2px"
-					android:layout_alignParentLeft="true"
-					android:layout_centerVertical="true"
-					android:visibility="visible"
-					android:src="@drawable/btn_arrow_left" />
-
-				<ImageView android:id="@+id/btn_forward"
-					android:clickable="true"
-					android:focusable="true"
-					android:layout_width="wrap_content"
-					android:layout_height="fill_parent"
-					android:paddingLeft="2px"
-					android:paddingRight="10px"
-					android:layout_alignParentRight="true"
-					android:layout_centerVertical="true"
-					android:visibility="visible"
-					android:src="@drawable/btn_arrow_right" />
-
-			</RelativeLayout>
-		</LinearLayout>
-		<LinearLayout android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:layout_gravity="center"
-			android:layout_marginLeft="5px"
-			android:layout_marginRight="5px"
-			android:layout_marginBottom="2px">
-			<!-- On-Off button -->
-			<ImageButton android:id="@+id/btn_onoff"
-				android:layout_width="75px"
-				android:layout_height="75px"
-				android:src="@drawable/ic_btn_onoff"
-				android:layout_marginTop="15px"
-				android:layout_marginBottom="15px" />
-		</LinearLayout>
-
-	</LinearLayout>
-     <View
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="#ffffffff" />
-
-	<!--
-		Layout contains the Next/Previous Presets and Tune buttons and status
-		msg text
-	-->
-     <LinearLayout android:id="@+id/presets_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-    		android:layout_weight="0"
-            android:layout_gravity="center"
-            android:layout_marginTop="15dip"
-            android:layout_marginBottom="10dip"
-            android:gravity="center_horizontal">
-
-         <Button android:id="@+id/presets_button_1"
-         android:text="@string/default_station"
-         android:layout_marginLeft="20dip"
-         android:layout_marginRight="20dip"
-         android:textSize="24sp"
-         android:singleLine="true"
-         android:layout_width="110dip"
-         android:layout_height="65dip" />
-
-         <Button android:id="@+id/presets_button_2"
-             android:text="@string/default_station"
-             android:layout_marginRight="20dip"
-             android:textSize="24sp"
-             android:singleLine="true"
-             android:layout_width="110dip"
-             android:layout_height="65dip" />
-
-         <Button android:id="@+id/presets_button_3"
-         android:text="@string/default_station"
-         android:layout_marginRight="20dip"
-             android:textSize="24sp"
-             android:singleLine="true"
-             android:layout_width="110dip"
-             android:layout_height="65dip" />
-
-         <Button android:id="@+id/presets_button_4"
-             android:text="@string/default_blank"
-             android:layout_marginRight="20dip"
-             android:textSize="24sp"
-             android:singleLine="true"
-             android:layout_width="110dip"
-             android:layout_height="65dip" />
-
-         <Button android:id="@+id/presets_button_5"
-             android:text="@string/default_blank"
-             android:layout_marginRight="20dip"
-             android:textSize="24sp"
-             android:singleLine="true"
-             android:layout_width="110dip"
-             android:layout_height="65dip" />
-
-            <Button android:id="@+id/presets_button_6"
-                android:text="@string/default_blank"
-                android:layout_marginRight="20dip"
-                android:textSize="24sp"
-                android:singleLine="true"
-                android:layout_width="110dip"
-                android:layout_height="65dip"/>
-
-        </LinearLayout>
-
-
-</LinearLayout>
diff --git a/fmapp2/res/drawable/application_border.xml b/fmapp2/res/drawable/application_border.xml
deleted file mode 100644
index eaf0918..0000000
--- a/fmapp2/res/drawable/application_border.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- * Copyright (c) 2009, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of The Linux Foundation nor
- *      the names of its contributors may be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1dp" android:color="#A0000000" />
-    <padding android:left="1dp" android:top="1dp"
-            android:right="1dp" android:bottom="1dp" />
-    <corners android:radius="1dp" />
-</shape>
diff --git a/fmapp2/res/drawable/btn_recorder.xml b/fmapp2/res/drawable/btn_recorder.xml
deleted file mode 100644
index 2161ba1..0000000
--- a/fmapp2/res/drawable/btn_recorder.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true"
-        android:drawable="@drawable/recorder_stop" />
-    <item android:state_enabled="false"
-         android:drawable="@drawable/recorder_start" />
-</selector>
diff --git a/fmapp2/res/drawable/btn_strip_trans_left.xml b/fmapp2/res/drawable/btn_strip_trans_left.xml
deleted file mode 100644
index 0a30f34..0000000
--- a/fmapp2/res/drawable/btn_strip_trans_left.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_strip_trans_left_pressed" />
-
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_strip_trans_left_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/btn_strip_trans_left_normal" />
-
-</selector>
diff --git a/fmapp2/res/drawable/btn_strip_trans_middle.xml b/fmapp2/res/drawable/btn_strip_trans_middle.xml
deleted file mode 100644
index b6b95a6..0000000
--- a/fmapp2/res/drawable/btn_strip_trans_middle.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_strip_trans_middle_pressed" />
-
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_strip_trans_middle_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/btn_strip_trans_middle_normal" />
-
-</selector>
diff --git a/fmapp2/res/drawable/btn_strip_trans_right.xml b/fmapp2/res/drawable/btn_strip_trans_right.xml
deleted file mode 100644
index 512c963..0000000
--- a/fmapp2/res/drawable/btn_strip_trans_right.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_strip_trans_right_pressed" />
-
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_strip_trans_right_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/btn_strip_trans_right_normal" />
-
-</selector>
diff --git a/fmapp2/res/drawable/station_border.xml b/fmapp2/res/drawable/station_border.xml
deleted file mode 100644
index 2aee777..0000000
--- a/fmapp2/res/drawable/station_border.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- * Copyright (c) 2009, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of The Linux Foundation nor
- *      the names of its contributors may be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1dp" android:color="#FFFFFFFF" />
-    <padding android:left="1dp" android:top="1dp"
-            android:right="1dp" android:bottom="1dp" />
-    <corners android:radius="1dp" />
-</shape>
diff --git a/fmapp2/res/layout-800x480/fmtransmitter.xml b/fmapp2/res/layout-800x480/fmtransmitter.xml
index 4754780..62d0995 100644
--- a/fmapp2/res/layout-800x480/fmtransmitter.xml
+++ b/fmapp2/res/layout-800x480/fmtransmitter.xml
@@ -87,7 +87,7 @@
                 android:layout_centerInParent="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/frequency_string"
+                android:text="@string/default_blank"
                 android:textColor="@android:color/white"/>
 
             <ImageView android:id="@+id/btn_forward"
@@ -122,7 +122,7 @@
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="10dp"
                 android:layout_centerInParent="true"
-                android:text="@string/radio_text_string"/>
+                android:text="@string/default_blank"/>
 
         </RelativeLayout>
 
diff --git a/fmapp2/res/layout-800x480/navigate.xml b/fmapp2/res/layout-800x480/navigate.xml
deleted file mode 100644
index 7e60d32..0000000
--- a/fmapp2/res/layout-800x480/navigate.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2009, 2012, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of The Linux Foundation nor
- *      the names of its contributors may be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <RelativeLayout android:id="@+id/message_row"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp">
-
-     <TextView android:id="@+id/record_msg_tv"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:textSize="28dp"
-        android:textStyle="bold"
-        android:gravity="fill"
-        android:text="@string/default_record" />
-
-     <Button android:id="@+id/btn_presets_list"
-        android:text="@string/default_preset_list_name"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="24dp"
-        android:textStyle="bold"
-        android:singleLine="true"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentTop="true"
-        android:layout_gravity="center"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="10dp"
-        android:gravity="fill"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-     <TextView android:id="@+id/sleep_msg_tv"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignBaseline="@+id/btn_presets_list"
-        android:textSize="28dp"
-        android:textStyle="bold"
-        android:gravity="fill"
-        android:text="@string/default_sleep" />
-  </RelativeLayout>
-
-  <RelativeLayout android:id="@+id/presets_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/message_row"
-        android:layout_centerInParent="true">
-
-   <!--  Upper Presets -->
-   <RelativeLayout android:id="@+id/presets_upper_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="top">
-
-     <Button android:id="@+id/presets_button_1"
-        android:text="@string/default_blank"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="24dp"
-        android:singleLine="true"
-        android:gravity="fill"
-        android:layout_width="120dp"
-        android:layout_height="65dp" />
-
-     <Button android:id="@+id/presets_button_2"
-        android:text="@string/default_blank"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="24dp"
-        android:singleLine="true"
-        android:layout_toRightOf="@id/presets_button_1"
-        android:layout_alignTop="@id/presets_button_1"
-        android:layout_alignBottom="@id/presets_button_1"
-        android:gravity="fill"
-        android:layout_width="120dp"
-        android:layout_height="65dp" />
-
-     <Button android:id="@+id/presets_button_3"
-        android:text="@string/default_blank"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="24dp"
-        android:singleLine="true"
-        android:layout_toRightOf="@id/presets_button_2"
-        android:layout_alignTop="@id/presets_button_2"
-        android:layout_alignBottom="@id/presets_button_2"
-        android:layout_width="120dp"
-        android:gravity="fill"
-        android:layout_height="65dp" />
-  </RelativeLayout>
-
-<!--  Lower Presets -->
-  <RelativeLayout android:id="@+id/presets_lower_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/presets_upper_layout"
-        android:layout_alignLeft="@id/presets_upper_layout"
-        android:layout_alignRight="@id/presets_upper_layout">
-
-     <Button android:id="@+id/presets_button_4"
-        android:text="@string/default_blank"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="24dp"
-        android:singleLine="true"
-        android:layout_width="120dp"
-        android:gravity="fill"
-        android:layout_alignLeft="@id/presets_button_1"
-        android:layout_alignRight="@id/presets_button_1"
-        android:layout_height="65dp" />
-
-     <Button android:id="@+id/presets_button_5"
-        android:text="@string/default_blank"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="24dp"
-        android:singleLine="true"
-        android:layout_toRightOf="@id/presets_button_4"
-        android:layout_alignTop="@id/presets_button_4"
-        android:layout_alignBottom="@id/presets_button_4"
-        android:layout_alignLeft="@id/presets_button_2"
-        android:layout_alignRight="@id/presets_button_2"
-        android:gravity="fill"
-        android:layout_width="120dp"
-        android:layout_height="65dp" />
-
-     <ImageButton android:id="@+id/btn_preset_page"
-        android:src="@drawable/ic_btn_forward"
-        android:layout_toRightOf="@id/presets_button_5"
-        android:layout_alignTop="@id/presets_button_5"
-        android:layout_alignBottom="@id/presets_button_5"
-        android:layout_alignLeft="@id/presets_button_3"
-        android:layout_alignRight="@id/presets_button_3"
-        android:gravity="fill"
-        android:layout_width="120dp"
-        android:layout_height="65dp" />
-   </RelativeLayout>
- </RelativeLayout>
-
- <RelativeLayout android:id="@+id/scanning_stoplayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:gravity="center">
-
-    <Button android:id="@+id/btn_scanning_stop"
-        android:clickable="true"
-        android:text="@string/stop_scanning"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="32dip"
-        android:singleLine="true"
-        android:padding="20dip"
-        android:gravity="fill"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
- </RelativeLayout>
-
-</merge>
diff --git a/fmapp2/res/layout-land-finger-800x480/fmradio.xml b/fmapp2/res/layout-land-finger-800x480/fmradio.xml
index 4075e8d..ad35332 100644
--- a/fmapp2/res/layout-land-finger-800x480/fmradio.xml
+++ b/fmapp2/res/layout-land-finger-800x480/fmradio.xml
@@ -60,7 +60,7 @@
             android:clickable="true"
             android:focusable="true"
             android:visibility="invisible"
-            android:text="@string/default_record"/>
+            android:text="@string/default_blank"/>
 
         <TextView android:id="@+id/prog_service_tv"
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -73,7 +73,7 @@
             android:textColor="@android:color/white"
             android:singleLine="true"
             android:textStyle="bold"
-            android:text="@string/prog_service_string"/>
+            android:text="@string/default_blank"/>
 
         <ImageView android:id="@+id/btn_silent"
             android:src="@drawable/ic_silent_mode_off"
diff --git a/fmapp2/res/layout-land-finger-800x480/fmtransmitter.xml b/fmapp2/res/layout-land-finger-800x480/fmtransmitter.xml
index d32ffbc..090cb2f 100644
--- a/fmapp2/res/layout-land-finger-800x480/fmtransmitter.xml
+++ b/fmapp2/res/layout-land-finger-800x480/fmtransmitter.xml
@@ -88,7 +88,7 @@
                 android:layout_centerInParent="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/frequency_string"/>
+                android:text="@string/default_blank"/>
 
             <ImageView android:id="@+id/btn_forward"
                 android:clickable="true"
@@ -120,7 +120,7 @@
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="10dp"
                 android:layout_centerInParent="true"
-                android:text="@string/radio_text_string"/>
+                android:text="@string/default_blank"/>
 
         </RelativeLayout>
 
diff --git a/fmapp2/res/layout-land-finger-800x480/navigate.xml b/fmapp2/res/layout-land-finger-800x480/navigate.xml
deleted file mode 100644
index 269793b..0000000
--- a/fmapp2/res/layout-land-finger-800x480/navigate.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2009, 2012, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of The Linux Foundation nor
- *      the names of its contributors may be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-     <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="#ffffffff" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="2dip"
-        android:orientation="vertical"
-        android:gravity="bottom"
-        >
-            <RelativeLayout android:id="@+id/message_row"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                >
-
-                <TextView android:id="@+id/record_msg_tv"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_alignParentLeft="true"
-                    android:textSize="14dip"
-                    android:textStyle="bold"
-                    android:text="@string/default_record"
-                    />
-
-                <Button android:id="@+id/btn_presets_list"
-                    android:text= "@string/default_preset_list_name"
-                    android:textStyle="bold"
-                    android:singleLine="true"
-                    android:layout_gravity="center"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="10dip"
-                    android:layout_marginRight="10dip"
-                    android:layout_width="140dip"
-                    android:layout_height="45dip" />
-
-                <TextView android:id="@+id/sleep_msg_tv"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignBaseline="@+id/btn_presets_list"
-                    android:layout_gravity="center_vertical"
-                    android:textSize="14dip"
-                    android:textStyle="bold"
-                    android:text="@string/default_sleep"
-                    />
-            </RelativeLayout>
-         </LinearLayout>
-
-        <LinearLayout android:id="@+id/presets_upper_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center"
-            android:layout_marginBottom="5dip"
-            android:gravity="center_horizontal">
-
-            <Button android:id="@+id/presets_button_1"
-                android:text="@string/default_station"
-                android:layout_width="80dip"
-                android:layout_height="50dip" />
-
-            <Button android:id="@+id/presets_button_2"
-                android:text="@string/default_station"
-                android:layout_width="80dp"
-                android:layout_height="50dp" />
-
-            <Button android:id="@+id/presets_button_3"
-                android:text="@string/default_station"
-                android:layout_width="80dip"
-                android:layout_height="50dip"
-                android:visibility="visible" />
-
-            <Button android:id="@+id/presets_button_4"
-                android:text="@string/default_blank"
-                android:layout_width="80dip"
-                android:layout_height="50dip"  />
-
-            <Button android:id="@+id/presets_button_5"
-                android:text="@string/default_blank"
-                android:layout_width="80dip"
-                android:layout_height="50dip"  />
-
-            <ImageButton android:id="@+id/btn_preset_page"
-                android:src="@drawable/ic_btn_forward"
-                android:layout_marginRight="2dp"
-                android:layout_width="80dip"
-                android:layout_height="50dip"
-                android:visibility="visible" />
-        </LinearLayout>
-</merge>
diff --git a/fmapp2/res/layout-land-finger-800x480/station_info.xml b/fmapp2/res/layout-land-finger-800x480/station_info.xml
index c9b787b..4a5d1ec 100644
--- a/fmapp2/res/layout-land-finger-800x480/station_info.xml
+++ b/fmapp2/res/layout-land-finger-800x480/station_info.xml
@@ -56,7 +56,7 @@
                 android:layout_marginLeft="25dp"
                 android:textStyle="bold"
                 android:visibility="invisible"
-                android:text="@string/default_sleep" />
+                android:text="@string/default_blank" />
 
             <TextView android:id="@+id/eradio_text_tv"
                 android:layout_width="wrap_content"
@@ -71,7 +71,7 @@
                 android:layout_toLeftOf="@+id/sleep_msg_tv"
                 android:layout_toRightOf="@+id/stereo_text_tv"
                 android:layout_centerInParent="true"
-                android:text="@string/eradio_text_string"/>
+                android:text="@string/default_blank"/>
 
             <TextView android:id="@+id/stereo_text_tv"
                 android:textAppearance="?android:attr/textAppearanceSmall"
@@ -83,7 +83,7 @@
                 android:layout_alignBaseline="@id/signal_level"
                 android:textSize="13sp"
                 android:textColor="@android:color/white"
-                android:text="@string/default_audio"/>
+                android:text="@string/default_blank"/>
 
         </RelativeLayout>
 
@@ -104,7 +104,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_alignParentLeft="true"
                 android:paddingLeft="16dp"
-                android:text="@string/station_id_string" />
+                android:text="@string/default_blank" />
 
             <TextView android:id="@+id/radio_text_tv"
                 android:layout_width="wrap_content"
@@ -115,7 +115,7 @@
                 android:singleLine="true"
                 android:textStyle="bold"
                 android:layout_centerInParent="true"
-                android:text="@string/radio_text_string"/>
+                android:text="@string/default_blank"/>
 
             <TextView android:id="@+id/pty_tv"
                 android:textAppearance="?android:attr/textAppearanceMedium"
@@ -126,7 +126,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
                 android:paddingRight="16dp"
-                android:text="@string/pty_string" />
+                android:text="@string/default_blank" />
 
         </RelativeLayout>
 
@@ -150,7 +150,7 @@
                      android:focusable="true"
                      android:layout_toLeftOf="@+id/btn_forward"
                      android:layout_toRightOf="@+id/btn_back"
-                     android:text="@string/frequency_string"/>
+                     android:text="@string/default_blank"/>
 
                 <ImageView android:id="@+id/btn_back"
                      android:clickable="true"
diff --git a/fmapp2/res/layout-land-finger/fmradio.xml b/fmapp2/res/layout-land-finger/fmradio.xml
index 23d74fb..116981a 100644
--- a/fmapp2/res/layout-land-finger/fmradio.xml
+++ b/fmapp2/res/layout-land-finger/fmradio.xml
@@ -57,7 +57,7 @@
             android:clickable="true"
             android:focusable="true"
             android:visibility="invisible"
-            android:text="@string/default_record"/>
+            android:text="@string/default_blank"/>
 
         <TextView android:id="@+id/prog_service_tv"
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -69,7 +69,7 @@
             android:textSize="16sp"
             android:singleLine="true"
             android:textStyle="bold"
-            android:text="@string/prog_service_string"/>
+            android:text="@string/default_blank"/>
 
         <ImageView android:id="@+id/btn_silent"
             android:src="@drawable/ic_silent_mode_off"
diff --git a/fmapp2/res/layout-land-finger/fmtransmitter.xml b/fmapp2/res/layout-land-finger/fmtransmitter.xml
index 1e350b0..35d3867 100644
--- a/fmapp2/res/layout-land-finger/fmtransmitter.xml
+++ b/fmapp2/res/layout-land-finger/fmtransmitter.xml
@@ -88,7 +88,7 @@
                 android:layout_centerInParent="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/frequency_string"/>
+                android:text="@string/default_blank"/>
 
             <ImageView android:id="@+id/btn_forward"
                 android:clickable="true"
@@ -121,7 +121,7 @@
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="10dp"
                 android:layout_centerInParent="true"
-                android:text="@string/radio_text_string"/>
+                android:text="@string/default_blank"/>
 
         </RelativeLayout>
 
diff --git a/fmapp2/res/layout-land-finger/navigate.xml b/fmapp2/res/layout-land-finger/navigate.xml
deleted file mode 100644
index 269793b..0000000
--- a/fmapp2/res/layout-land-finger/navigate.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2009, 2012, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of The Linux Foundation nor
- *      the names of its contributors may be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-     <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="#ffffffff" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="2dip"
-        android:orientation="vertical"
-        android:gravity="bottom"
-        >
-            <RelativeLayout android:id="@+id/message_row"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                >
-
-                <TextView android:id="@+id/record_msg_tv"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_alignParentLeft="true"
-                    android:textSize="14dip"
-                    android:textStyle="bold"
-                    android:text="@string/default_record"
-                    />
-
-                <Button android:id="@+id/btn_presets_list"
-                    android:text= "@string/default_preset_list_name"
-                    android:textStyle="bold"
-                    android:singleLine="true"
-                    android:layout_gravity="center"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="10dip"
-                    android:layout_marginRight="10dip"
-                    android:layout_width="140dip"
-                    android:layout_height="45dip" />
-
-                <TextView android:id="@+id/sleep_msg_tv"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignBaseline="@+id/btn_presets_list"
-                    android:layout_gravity="center_vertical"
-                    android:textSize="14dip"
-                    android:textStyle="bold"
-                    android:text="@string/default_sleep"
-                    />
-            </RelativeLayout>
-         </LinearLayout>
-
-        <LinearLayout android:id="@+id/presets_upper_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center"
-            android:layout_marginBottom="5dip"
-            android:gravity="center_horizontal">
-
-            <Button android:id="@+id/presets_button_1"
-                android:text="@string/default_station"
-                android:layout_width="80dip"
-                android:layout_height="50dip" />
-
-            <Button android:id="@+id/presets_button_2"
-                android:text="@string/default_station"
-                android:layout_width="80dp"
-                android:layout_height="50dp" />
-
-            <Button android:id="@+id/presets_button_3"
-                android:text="@string/default_station"
-                android:layout_width="80dip"
-                android:layout_height="50dip"
-                android:visibility="visible" />
-
-            <Button android:id="@+id/presets_button_4"
-                android:text="@string/default_blank"
-                android:layout_width="80dip"
-                android:layout_height="50dip"  />
-
-            <Button android:id="@+id/presets_button_5"
-                android:text="@string/default_blank"
-                android:layout_width="80dip"
-                android:layout_height="50dip"  />
-
-            <ImageButton android:id="@+id/btn_preset_page"
-                android:src="@drawable/ic_btn_forward"
-                android:layout_marginRight="2dp"
-                android:layout_width="80dip"
-                android:layout_height="50dip"
-                android:visibility="visible" />
-        </LinearLayout>
-</merge>
diff --git a/fmapp2/res/layout-land-finger/station_info.xml b/fmapp2/res/layout-land-finger/station_info.xml
index 9383894..8f0bdab 100644
--- a/fmapp2/res/layout-land-finger/station_info.xml
+++ b/fmapp2/res/layout-land-finger/station_info.xml
@@ -55,7 +55,7 @@
                 android:layout_marginLeft="25dp"
                 android:textStyle="bold"
                 android:visibility="invisible"
-                android:text="@string/default_sleep" />
+                android:text="@string/default_blank" />
 
             <TextView android:id="@+id/eradio_text_tv"
                 android:layout_width="wrap_content"
@@ -69,7 +69,7 @@
                 android:layout_toRightOf="@+id/sleep_msg_tv"
                 android:layout_toLeftOf="@+id/stereo_text_tv"
                 android:layout_centerInParent="true"
-                android:text="@string/eradio_text_string"/>
+                android:text="@string/default_blank"/>
 
             <TextView android:id="@+id/stereo_text_tv"
                 android:textAppearance="?android:attr/textAppearanceSmall"
@@ -80,7 +80,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_alignBaseline="@id/signal_level"
                 android:textSize="13sp"
-                android:text="@string/default_audio"/>
+                android:text="@string/default_blank"/>
 
         </RelativeLayout>
 
@@ -100,7 +100,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_alignParentLeft="true"
                 android:paddingLeft="16dp"
-                android:text="@string/station_id_string" />
+                android:text="@string/default_blank" />
 
             <TextView android:id="@+id/radio_text_tv"
                 android:layout_width="wrap_content"
@@ -110,7 +110,7 @@
                 android:singleLine="true"
                 android:textStyle="bold"
                 android:layout_centerInParent="true"
-                android:text="@string/radio_text_string"/>
+                android:text="@string/default_blank"/>
 
             <TextView android:id="@+id/pty_tv"
                 android:textAppearance="?android:attr/textAppearanceMedium"
@@ -120,7 +120,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
                 android:paddingRight="16dp"
-                android:text="@string/pty_string" />
+                android:text="@string/default_blank" />
 
         </RelativeLayout>
 
@@ -141,7 +141,7 @@
                      android:gravity="center"
                      android:layout_toLeftOf="@+id/btn_forward"
                      android:layout_toRightOf="@+id/btn_back"
-                     android:text="@string/frequency_string"/>
+                     android:text="@string/default_blank"/>
 
                 <ImageView android:id="@+id/btn_back"
                      android:clickable="true"
diff --git a/fmapp2/res/layout/alert_dialog_list.xml b/fmapp2/res/layout/alert_dialog_list.xml
deleted file mode 100644
index 8b9ae52..0000000
--- a/fmapp2/res/layout/alert_dialog_list.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2009, 2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of The Linux Foundation nor
- *      the names of its contributors may be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <ListView android:id="@+id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-    </ListView>
-
-</LinearLayout>
diff --git a/fmapp2/res/layout/delete_dialog.xml b/fmapp2/res/layout/delete_dialog.xml
index 44df762..6a36970 100644
--- a/fmapp2/res/layout/delete_dialog.xml
+++ b/fmapp2/res/layout/delete_dialog.xml
@@ -52,14 +52,14 @@
         <Button android:id="@+id/delete"
             android:layout_width="120dp"
             android:layout_height="wrap_content"
-            android:text="@string/button_delete"
+            android:text="@android:string/ok"
             android:layout_gravity="center_horizontal"
             android:layout_alignParentLeft="true" />
 
         <Button android:id="@+id/cancel"
             android:layout_width="120dp"
             android:layout_height="wrap_content"
-            android:text="@string/button_cancel"
+            android:text="@android:string/cancel"
             android:layout_alignParentRight="true" />
 
     </RelativeLayout>
diff --git a/fmapp2/res/layout/fmtransmitter.xml b/fmapp2/res/layout/fmtransmitter.xml
index b2ba8e5..3bef48f 100644
--- a/fmapp2/res/layout/fmtransmitter.xml
+++ b/fmapp2/res/layout/fmtransmitter.xml
@@ -88,7 +88,7 @@
                 android:layout_centerInParent="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/frequency_string"/>
+                android:text="@string/default_blank"/>
 
             <ImageView android:id="@+id/btn_forward"
                 android:clickable="true"
@@ -121,7 +121,7 @@
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="10dp"
                 android:layout_centerInParent="true"
-                android:text="@string/radio_text_string"/>
+                android:text="@string/default_blank"/>
 
         </RelativeLayout>
 
diff --git a/fmapp2/res/layout/navigate.xml b/fmapp2/res/layout/navigate.xml
deleted file mode 100644
index 5e6b665..0000000
--- a/fmapp2/res/layout/navigate.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2009, 2012, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of The Linux Foundation nor
- *      the names of its contributors may be used to endorse or promote
- *      products derived from this software without specific prior written
- *      permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <RelativeLayout android:id="@+id/message_row"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dip"
-        android:orientation="horizontal">
-
-        <TextView android:id="@+id/record_msg_tv"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:textSize="14dip"
-            android:textStyle="bold"
-            android:text="@string/default_record"/>
-
-        <Button android:id="@+id/btn_presets_list"
-            android:text="@string/default_preset_list_name"
-            android:textStyle="bold"
-            android:singleLine="true"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentTop="true"
-            android:layout_gravity="center"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:layout_width="140dip"
-            android:layout_height="45dip" />
-
-        <TextView android:id="@+id/sleep_msg_tv"
-           android:textAppearance="?android:attr/textAppearanceMedium"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:layout_alignParentTop="true"
-           android:layout_alignParentRight="true"
-           android:layout_alignBaseline="@+id/btn_presets_list"
-           android:textSize="14dip"
-           android:textStyle="bold"
-           android:text="@string/default_sleep" />
-
-  </RelativeLayout>
-
-  <LinearLayout android:id="@+id/presets_layout"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_centerHorizontal="true"
-      android:orientation="vertical">
-
-      <!--  Upper Presets -->
-     <LinearLayout android:id="@+id/presets_upper_layout"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:orientation="horizontal"
-         android:layout_gravity="center"
-         android:layout_marginBottom="5dip"
-         android:gravity="center_horizontal">
-
-         <Button android:id="@+id/presets_button_1"
-             android:text="@string/default_station"
-             android:layout_marginLeft="10dip"
-             android:layout_width="90dip"
-             android:layout_height="55dip" />
-
-         <Button android:id="@+id/presets_button_2"
-             android:text="@string/default_station"
-             android:layout_marginLeft="10dip"
-             android:layout_marginRight="10dip"
-             android:layout_width="90dip"
-             android:layout_height="55dip" />
-
-         <Button android:id="@+id/presets_button_3"
-             android:text="@string/default_station"
-             android:layout_marginRight="10dip"
-             android:layout_width="90dip"
-             android:layout_height="55dip"
-             android:visibility="visible" />
-
-     </LinearLayout>
-
-     <!--  Lower Presets -->
-     <LinearLayout android:id="@+id/presets_lower_layout"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:orientation="horizontal"
-         android:layout_gravity="center"
-         android:layout_marginBottom="5dip"
-         android:gravity="center_horizontal">
-
-         <Button android:id="@+id/presets_button_4"
-             android:text="@string/default_blank"
-             android:layout_marginLeft="10dip"
-             android:layout_width="90dip"
-             android:layout_height="55dip" />
-
-         <Button android:id="@+id/presets_button_5"
-             android:text="@string/default_blank"
-             android:layout_marginLeft="10dip"
-             android:layout_marginRight="10dip"
-             android:layout_width="90dip"
-             android:layout_height="55dip" />
-
-         <ImageButton android:id="@+id/btn_preset_page"
-             android:src="@drawable/preset_page_button"
-             android:layout_marginRight="10dip"
-             android:layout_width="90dip"
-             android:layout_height="55dip"
-             android:visibility="visible" />
-
-     </LinearLayout>
-
-  </LinearLayout>
-
-  <LinearLayout android:id="@+id/scanning_stoplayout"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:visibility="gone"
-      android:gravity="center">
-
-      <Button android:id="@+id/btn_scanning_stop"
-          android:clickable="true"
-          android:text="@string/stop_scanning"
-          android:singleLine="true"
-          android:padding="20dip"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content" />
-
-  </LinearLayout>
-
-</merge>
diff --git a/fmapp2/res/layout/rename_dialog.xml b/fmapp2/res/layout/rename_dialog.xml
index bef5432..65ee7d8 100644
--- a/fmapp2/res/layout/rename_dialog.xml
+++ b/fmapp2/res/layout/rename_dialog.xml
@@ -44,6 +44,7 @@
         android:maxLength="16">
      <requestFocus />
      </EditText>
+
      <RelativeLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -52,13 +53,13 @@
          <Button android:id="@+id/save"
              android:layout_width="120dp"
              android:layout_height="wrap_content"
-             android:text="@string/button_ok"
+             android:text="@android:string/ok"
              android:layout_alignParentLeft="true" />
 
          <Button android:id="@+id/cancel"
              android:layout_width="120dp"
              android:layout_height="wrap_content"
-             android:text="@string/button_cancel"
+             android:text="@android:string/cancel"
              android:layout_alignParentRight="true" />
 
     </RelativeLayout>
diff --git a/fmapp2/res/layout/station_info.xml b/fmapp2/res/layout/station_info.xml
index aee2068..0bee765 100644
--- a/fmapp2/res/layout/station_info.xml
+++ b/fmapp2/res/layout/station_info.xml
@@ -62,7 +62,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_alignBaseline="@id/signal_level"
                 android:textSize="13sp"
-                android:text="@string/default_audio"/>
+                android:text="@string/default_blank"/>
 
         </RelativeLayout>
 
@@ -83,7 +83,7 @@
                  android:gravity="center"
                  android:clickable="true"
                  android:focusable="true"
-                 android:text="@string/frequency_string"/>
+                 android:text="@string/default_blank"/>
 
             <ImageView android:id="@+id/btn_back"
                  android:clickable="true"
@@ -124,7 +124,7 @@
                 android:alpha="0.5"
                 android:paddingRight="2dp"
                 android:paddingLeft="2dp"
-                android:text="@string/station_id_string" />
+                android:text="@string/default_blank" />
 
             <TextView android:id="@+id/pty_tv"
                 android:textColor="@android:color/white"
@@ -134,7 +134,7 @@
                 android:textAllCaps="true"
                 android:paddingRight="2dp"
                 android:paddingLeft="2dp"
-                android:text="@string/pty_string" />
+                android:text="@string/default_blank" />
 
         </LinearLayout>
 
@@ -150,7 +150,7 @@
             android:paddingRight="10dp"
             android:paddingTop="10dp"
             android:layout_gravity="center_horizontal"
-            android:text="@string/radio_text_string"/>
+            android:text="@string/default_blank"/>
 
         <TextView android:id="@+id/eradio_text_tv"
             android:textColor="@android:color/white"
@@ -162,7 +162,7 @@
             android:paddingLeft="2dp"
             android:paddingRight="2dp"
             android:gravity="center_horizontal"
-            android:text="@string/eradio_text_string"/>
+            android:text="@string/default_blank"/>
 
         <TextView android:id="@+id/prog_service_tv"
             android:textColor="@android:color/white"
@@ -172,7 +172,7 @@
             android:textSize="16sp"
             android:singleLine="true"
             android:textStyle="bold"
-            android:text="@string/prog_service_string"/>
+            android:text="@string/default_blank"/>
 
         <TextView android:id="@+id/sleep_msg_tv"
             android:textColor="@android:color/white"
@@ -187,7 +187,7 @@
             android:textStyle="bold"
             android:visibility="invisible"
             android:layout_gravity="center_horizontal"
-            android:text="@string/default_sleep" />
+            android:text="@string/default_blank" />
 
         <TextView android:id="@+id/record_msg_tv"
             android:textColor="@android:color/white"
@@ -201,7 +201,7 @@
             android:paddingBottom="5dp"
             android:drawablePadding="5dip"
             android:layout_gravity="center_horizontal"
-            android:text="@string/eradio_text_string"/>
+            android:text="@string/default_blank"/>
 
     </LinearLayout>
 
diff --git a/fmapp2/res/values-zh-rCN/arrays.xml b/fmapp2/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index 788b807..0000000
--- a/fmapp2/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
--->
-<resources>
-
-  <string-array name="ster_mon_entries">
-    <item>立体声</item>
-    <item>单声道</item>
-  </string-array>
-
-  <string-array name="record_durations_entries">
-    <item>5 分钟</item>
-    <item>15 分钟</item>
-    <item>30 分钟</item>
-    <item>直至停止</item>
-  </string-array>
-
-  <string-array name="sleep_duration_values">
-    <item>15 分钟之后</item>
-    <item>30 分钟之后</item>
-    <item>45 分钟之后</item>
-    <item>1 小时之后</item>
-  </string-array>
-
-  <string-array name="search_category_rbds_entries">
-    <item>全部电台</item>
-    <item>成人点击</item>
-    <item>古典</item>
-    <item>经典摇滚</item>
-    <item>校园</item>
-    <item>乡村</item>
-    <item>紧急</item>
-    <item>紧急  测试</item>
-    <item>外语频道</item>
-    <item>信息频道</item>
-    <item>爵士</item>
-    <item>新闻</item>
-    <item>怀旧</item>
-    <item>老歌</item>
-    <item>个性</item>
-    <item>公共频道</item>
-    <item>宗教音乐</item>
-    <item>宗教交流</item>
-    <item>节奏布鲁斯</item>
-    <item>摇滚</item>
-    <item>轻音乐</item>
-    <item>轻摇滚</item>
-    <item>轻节奏布鲁斯</item>
-    <item>体育</item>
-    <item>交流</item>
-    <item>前40</item>
-    <item>天气</item>
-  </string-array>
-
-  <string-array name="search_category_rds_entries">
-    <item>全部电台</item>
-    <item>文化</item>
-    <item>新闻时事</item>
-    <item>儿童节目</item>
-    <item>乡村音乐</item>
-    <item>记录</item>
-    <item>戏剧</item>
-    <item>轻音乐</item>
-    <item>教育</item>
-    <item>紧急</item>
-    <item>紧急测试</item>
-    <item>经济</item>
-    <item>民族音乐</item>
-    <item>信息</item>
-    <item>爵士音乐</item>
-    <item>轻古典音乐</item>
-    <item>休闲</item>
-    <item>新闻</item>
-    <item>民族音乐</item>
-    <item>其他音乐</item>
-    <item>怀旧</item>
-    <item>听众来电</item>
-    <item>流行音乐</item>
-    <item>宗教</item>
-    <item>摇滚音乐</item>
-    <item>科学</item>
-    <item>古典</item>
-    <item>社会事务</item>
-    <item>体育</item>
-    <item>旅行</item>
-    <item>变奏</item>
-    <item>天气</item>
-  </string-array>
-
-
-  <string-array name="presetlist_edit_category">
-    <item>重命名</item>
-    <item>自动选择</item>
-    <item>删除</item>
-  </string-array>
-
-
-  <string-array name="regional_band_entries">
-    <item>北美</item>
-    <item>欧洲</item>
-    <item>日本</item>
-    <item>日本 (宽频)</item>
-    <item>澳大利亚</item>
-    <item>奥地利</item>
-    <item>比利时</item>
-    <item>巴西</item>
-    <item>中国</item>
-    <item>捷克</item>
-    <item>丹麦</item>
-    <item>芬兰</item>
-    <item>法国</item>
-    <item>德国</item>
-    <item>希腊</item>
-    <item>香港</item>
-    <item>印度</item>
-    <item>爱尔兰</item>
-    <item>意大利</item>
-    <item>韩国</item>
-    <item>墨西哥</item>
-    <item>荷兰</item>
-    <item>新西兰</item>
-    <item>挪威</item>
-    <item>波兰</item>
-    <item>葡萄牙</item>
-    <item>俄罗斯</item>
-    <item>新加坡</item>
-    <item>斯洛伐克</item>
-    <item>西班牙</item>
-    <item>瑞士</item>
-    <item>瑞典</item>
-    <item>台湾</item>
-    <item>土耳其</item>
-    <item>英国</item>
-    <item>美国</item>
-    <item>用户定义的频段</item>
-  </string-array>
-
-  <string-array name="regional_band_summary">
-    <item>北美 (87.5MHz - 108.0MHz ，步长 200 Khz)</item>
-    <item>欧洲 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>日本 (76.0MHz - 90.0MHz ，步长 100 Khz)</item>
-    <item>日本 (宽频) (90.0MHz - 108.0MHz ，步长 50 Khz)</item>
-    <item>澳大利亚 (87.7MHz - 108.0MHz ， 步长 100 Khz)</item>
-    <item>奥地利 (87.5MHz - 108.0MHz ， 步长 50 Khz)</item>
-    <item>比利时 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>巴西 (87.5MHz - 108.0MHz ，步长 200 Khz)</item>
-    <item>中国 (87.0MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>捷克 (87.5MHz - 108.0MHz ， 步长 100 Khz)</item>
-    <item>丹麦 (87.5MHz - 108.0MHz ，步长 50 Khz)</item>
-    <item>芬兰 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>法国 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>德国 (87.5MHz - 108.0MHz ，步长 50 Khz)</item>
-    <item>希腊 (87.5MHz - 108.0MHz ，步长 50 Khz)</item>
-    <item>香港 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>印度 (91.0MHz - 106.4MHz ，步长 100 Khz)</item>
-    <item>爱尔兰 (87.5MHz - 108.0MHz ，步长  50 Khz)</item>
-    <item>意大利 (87.5MHz - 108.0MHz ， 步长 50 Khz)</item>
-    <item>韩国 (87.5MHz - 108.0MHz ，步长 200 Khz)</item>
-    <item>墨西哥 (88.1MHz - 107.9MHz ，步长  200 Khz)</item>
-    <item>荷兰 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>新西兰 (88.0MHz - 107.0MHz ，步长  100 Khz)</item>
-    <item>挪威 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>波兰 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>葡萄牙 (87.5MHz - 108.0MHz ，步长 50 Khz)</item>
-    <item>俄国 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>新加坡 (88.0MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>斯洛伐克 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>西班牙 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>瑞士 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>瑞典 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>台湾 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>土耳其 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>英国 (87.5MHz - 108.0MHz ，步长 100 Khz)</item>
-    <item>美国 (88.1MHz - 107.9MHz ，步长 200 Khz)</item>
-    <item>用户定义的频段</item>
-  </string-array>
-</resources>
diff --git a/fmapp2/res/values-zh-rCN/strings.xml b/fmapp2/res/values-zh-rCN/strings.xml
deleted file mode 100644
index d32c0cd..0000000
--- a/fmapp2/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">调频收音机</string>
-    <string name="menu_settings">设置</string>
-    <string name="menu_record_start">开始录音</string>
-    <string name="menu_record_stop">停止录音</string>
-    <string name="menu_all_channels">全部频道</string>
-    <string name="app_label_all_channels">全部频道</string>
-    <string name="button_ok">确定</string>
-    <string name="button_cancel">取消</string>
-    <string name="button_delete">删除</string>
-    <string name="error_sdcard_access">不能访问SD卡</string>
-    <string name="fm_service_started">调频 服务</string>
-    <string name="menu_sleep">自动关闭</string>
-    <string name="menu_sleep_cancel">取消自动关闭</string>
-    <string name="menu_scan_start">搜索</string>
-    <string name="button_text_stop">停止</string>
-    <string name="menu_scan_stop">停止搜索</string>
-    <string name="msg_seeking">搜索 调频 电台</string>
-    <string name="msg_scanning">搜索所有 调频 电台</string>
-    <string name="msg_scanning_pty">搜索 "<xliff:g id="pty_name">%1$s</xliff:g>"</string>
-    <string name="msg_noantenna">请插入耳机</string>
-    <!-- The messsage shown when FM radio was turned on, headset was plugged out -->
-    <string name="msg_headset_plug_out">收音机播放中拔出了耳机，收音机已经自动关闭。</string>
-    <string name="dialog_sleep_title">收音机自动关闭</string>
-    <string name="preset_name_dialog_title">输入名称 </string>
-    <string name="preset_name_title">重命名</string>
-    <string name="preset_search_title">搜索</string>
-    <string name="preset_search_name">搜索 "<xliff:g id="preset_name">%1$s</xliff:g>"</string>
-    <string name="preset_add">添加</string>
-    <string name="preset_replace">替换</string>
-    <string name="preset_tune">设定频率</string>
-    <string name="preset_rename">重命名</string>
-    <string name="preset_delete">删除</string>
-    <string name="sel_band_menu">选择地区</string>
-    <string name="settings_menu">设置</string>
-    <string name="regional_band">地区</string>
-    <string name="aud_output_mode">音频输出模式</string>
-    <string name="sel_audio_output">选择音频输出</string>
-    <string name="record_dur">录音时长</string>
-    <string name="sel_rec_dur">选择录音时长</string>
-    <string name="auto_select_af">备用频率</string>
-    <string name="auto_select_af_enabled">自动选择开启</string>
-    <string name="auto_select_af_disabled">自动选择关闭</string>
-    <string name="settings_revert_confirm_title">确定清除设置</string>
-    <string name="settings_revert_confirm_msg">将删除所有设置</string>
-    <string name="settings_back_summary">Return to previous view</string>
-    <string name="settings_revert_defaults_title">恢复出厂设置</string>
-    <string name="settings_revert_defaults_summary">清除所有设置</string>
-    <string name="audio_type_stereo">立体声</string>
-    <string name="audio_type_mono">单声道</string>
-    <string name="alert_dialog_ok">确定</string>
-    <string name="alert_dialog_cancel">取消</string>
-    <string name="alert_dialog_hint">输入一个名称</string>
-    <string name="search_dialog_title">搜索电台</string>
-    <string name="msg_search_title">调频 - <xliff:g id="frequency_string">%1$s</xliff:g></string>
-	<string name="presetlist_prefix_name">调频 - </string>
-        <string name="fm_command_timeout_title">超时</string>
-        <string name="fm_tune_timeout_msg">打开调频电台无响应。
-                     如果问题持续, 请重新启动FM收音机。</string>
-        <string name="fm_command_failed_title">调频 操作失败</string>
-        <string name="fm_cmd_failed_msg">调频 操作失败。如果问题持续， 请重新启动调频收音机。
-        </string>
-        <string name="fm_cmd_failed_msg_hdmi">调频 操作失败。 不支持 调频 和 HDMI 并发 。
-        </string>
-        <string name="fm_cmd_failed_call_on">调频 操作失败。通话期间禁止调频音频 </string>
-
-    <string name="station_name">电台:</string>
-    <string name="station_exists">此频率已存在!</string>
-    <string name="stat_notif_frequency">调频 收音机 "<xliff:g id="frequency">%1$s</xliff:g>" MHz</string>
-    <string name="cannot_startup_during_call">通话中不能启动调频！</string>
-    <string name="cannot_startup_during_airplane">"飞行模式中不能启动调频！"</string>
-    <string name="station_list_delete_station">删除:<xliff:g id="name">%s</xliff:g></string>
-    <string name="station_list_delete_station_prompt">要删除 <xliff:g id="name">%s</xliff:g> 吗？</string>
-    <string name="sdcard_no_space_cannot_recording">SD卡空间不足,不能录音</string>
-    <string name="recording_stop_no_space">SD卡空间不足，录音停止</string>
-    <string name="station_name_empty">电台名字不能为空，请新重输入</string>
-    <string name="station_name_exist">已存在名为\"<xliff:g id="name">%s</xliff:g>\"的电台，请输入其他名称。</string>
-    <!-- the title of rename dialog lack of translation -->
-    <string name="dialog_presetlist_rename_title">"请输入名字"</string>
-    <string name="menu_display_tags">显示标签</string>
-    <string name="usr_def_band_min">下限频率（Mhz）</string>
-    <string name="usr_def_band_max">更高的频率限制(Mhz)</string>
-    <string name="sel_chanl_spacing">选择信道间隔</string>
-    <string name="chanl_spacing">信道间隔</string>
-    <string name="set">设置</string>
-    <string name="cancel">取消</string>
-    <string name="rt_plus_tags">标签</string>
-    <string name="user_defind_band_msg">请输入有效的频段范围 76.0 - 108.0</string>
-</resources>
diff --git a/fmapp2/res/values-zh-rTW/strings.xml b/fmapp2/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 11a4cf7..0000000
--- a/fmapp2/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">調頻收音機</string>
-    <string name="menu_settings">設定</string>
-    <string name="menu_record_start">開始錄音</string>
-    <string name="menu_record_stop">停止錄音</string>
-    <string name="menu_all_channels">全部頻道</string>
-    <string name="app_label_all_channels">全部頻道</string>
-    <string name="button_ok">確定</string>
-    <string name="button_cancel">取消</string>
-    <string name="button_delete">取消</string>
-    <string name="error_sdcard_access">不能訪問SD卡</string>
-    <string name="fm_service_started">調頻 服務</string>
-    <string name="menu_sleep">自動關閉</string>
-    <string name="menu_sleep_cancel">取消自動關閉</string>
-    <string name="menu_scan_start">搜索</string>
-    <string name="button_text_stop">停止</string>
-    <string name="menu_scan_stop">停止搜索</string>
-    <string name="msg_seeking">搜索 調頻 電台</string>
-    <string name="msg_scanning">搜索所有 調頻 電台</string>
-    <string name="msg_scanning_pty">搜索 "<xliff:g id="pty_name">%1$s</xliff:g>"</string>
-    <string name="msg_noantenna">請插入耳機</string>
-    <string name="dialog_sleep_title">收音機自動關閉</string>
-    <string name="preset_name_dialog_title">輸入名稱 </string>
-    <string name="preset_name_title">重命名</string>
-    <string name="preset_search_title">搜索</string>
-    <string name="preset_search_name">搜索 "<xliff:g id="preset_name">%1$s</xliff:g>"</string>
-    <string name="preset_add">添加</string>
-    <string name="preset_replace">替換</string>
-    <string name="preset_tune">設定頻率</string>
-    <string name="preset_rename">重命名</string>
-    <string name="preset_delete">刪除</string>
-    <string name="sel_band_menu">選擇地區</string>
-    <string name="settings_menu">設定</string>
-    <string name="regional_band">地區</string>
-    <string name="aud_output_mode">音頻輸出模式</string>
-    <string name="sel_audio_output">選擇音頻輸出</string>
-    <string name="record_dur">錄音時長</string>
-    <string name="sel_rec_dur">選擇錄音時長</string>
-    <string name="auto_select_af">備用頻率</string>
-    <string name="auto_select_af_enabled">自動選擇開啟</string>
-    <string name="auto_select_af_disabled">自動選擇關閉</string>
-    <string name="settings_revert_confirm_title">確定清除設定</string>
-    <string name="settings_revert_confirm_msg">將刪除所有設定</string>
-    <string name="settings_revert_defaults_title">恢復出廠設定</string>
-    <string name="settings_revert_defaults_summary">清除所有設定</string>
-    <string name="audio_type_stereo">立體聲</string>
-    <string name="audio_type_mono">單聲道</string>
-    <string name="alert_dialog_ok">確定</string>
-    <string name="alert_dialog_cancel">取消</string>
-    <string name="search_dialog_title">搜索電台</string>
-    <string name="fm_command_timeout_title">超時</string>
-    <string name="fm_tune_timeout_msg">打開調頻 電台無響應。如果問題持續，請重新啟動調頻 收音機。</string>
-    <string name="fm_command_failed_title">調頻 操作失敗</string>
-    <string name="fm_cmd_failed_msg">調頻 操作失敗。如果問題持續，請重新啟動調頻 收音機。</string>
-    <string name="fm_cmd_failed_msg_hdmi">調頻 操作失敗。不支持調頻和 HDMI 並發。 </string>
-    <string name="fm_cmd_failed_call_on">調頻 操作失敗。通話期間禁止調頻音頻 </string>
-    <string name="station_name">電台:</string>
-    <string name="station_exists">此頻率已存在!</string>
-    <string name="stat_notif_frequency">調頻 收音機 "<xliff:g id="frequency">%1$s</xliff:g>" MHz</string>
-    <string name="cannot_startup_during_call">通话中不能启动調頻！</string>
-    <string name="cannot_startup_during_airplane">"通話中不能啟動調頻！"</string>
-    <string name="station_list_delete_station">删除:<xliff:g id="name">%s</xliff:g></string>
-    <string name="station_list_delete_station_prompt">要删除 <xliff:g id="name">%s</xliff:g> 吗？</string>
-    <string name="sdcard_no_space_cannot_recording">SD卡空間不足，不能錄音</string>
-    <string name="recording_stop_no_space">SD卡空間不足，錄音停止</string>
-    <string name="station_name_empty">電台名字不能為空，請新重輸入</string>
-    <string name="station_name_exist">已存在名為\"<xliff:g id="name">%s</xliff:g>\"的電台，請輸入其他名稱。</string>
-    <string name="dialog_presetlist_rename_title">請輸入名字</string>
-    <string name="user_defind_band_msg">请输入有效的频段范围 76.0 - 108.0</string>
-    <string name="FMRecording_reach_size_limit">已到达最长限制.</string>
-    <string name="unable_to_store">无法保存已录音频</string>
-
-</resources>
diff --git a/fmapp2/res/values/arrays.xml b/fmapp2/res/values/arrays.xml
index cda326c..24eb383 100644
--- a/fmapp2/res/values/arrays.xml
+++ b/fmapp2/res/values/arrays.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  * Copyright (c) 2009, 2011-2014 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2014-2015 The CyanogenMod Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -33,7 +34,7 @@
     <item>Mono</item>
   </string-array>
 
-  <string-array name="ster_mon_values">
+  <string-array name="ster_mon_values" translatable="false">
     <item>0</item>
     <item>1</item>
   </string-array>
@@ -42,7 +43,7 @@
     <item>Stereo</item>
   </string-array>
 
-  <string-array name="ster_values">
+  <string-array name="ster_values" translatable="false">
     <item>0</item>
   </string-array>
 
@@ -53,8 +54,7 @@
     <item>Until stopped</item>
   </string-array>
 
-
-  <string-array name="record_duration_values">
+  <string-array name="record_duration_values" translatable="false">
     <item>5</item>
     <item>15</item>
     <item>30</item>
@@ -65,27 +65,19 @@
     <item>15 minutes</item>
     <item>30 minutes</item>
     <item>45 minutes</item>
-    <item>1 Hour</item>
-  </string-array>
-
-    <!-- This array should be in seconds and should match the values above -->
-  <string-array name="sleep_duration_values_seconds">
-    <item>900</item>
-    <item>1800</item>
-    <item>2700</item>
-    <item>3600</item>
+    <item>1 hour</item>
   </string-array>
 
   <string-array name="search_category_rbds_entries">
-    <item>All Stations</item>
-    <item>Adult Hits</item>
+    <item>All stations</item>
+    <item>Adult hits</item>
     <item>Classical</item>
     <item>Classic Rock</item>
     <item>College</item>
     <item>Country</item>
     <item>Emergency</item>
-    <item>Emergency Test</item>
-    <item>Foreign Language</item>
+    <item>Emergency test</item>
+    <item>Foreign language</item>
     <item>Information</item>
     <item>Jazz</item>
     <item>News</item>
@@ -93,8 +85,8 @@
     <item>Oldies</item>
     <item>Personality</item>
     <item>Public</item>
-    <item>Religious Music</item>
-    <item>Religious Talk</item>
+    <item>Religious music</item>
+    <item>Religious talk</item>
     <item>Rhythm and Blues</item>
     <item>Rock</item>
     <item>Soft</item>
@@ -106,7 +98,7 @@
     <item>Weather</item>
   </string-array>
 
-  <string-array name="search_category_rbds_values">
+  <string-array name="search_category_rbds_values" translatable="false">
     <item>0</item>
     <item>7</item>
     <item>15</item>
@@ -136,43 +128,42 @@
     <item>29</item>
   </string-array>
 
-
   <string-array name="search_category_rds_entries">
-    <item>All Stations</item>
+    <item>All stations</item>
     <item>Culture</item>
-    <item>Current Affairs</item>
+    <item>Current affairs</item>
     <item>Children programs</item>
-    <item>Country Music</item>
+    <item>Country music</item>
     <item>Documentary</item>
     <item>Drama</item>
-    <item>Easy Listening Music</item>
+    <item>Easy listening music</item>
     <item>Education</item>
     <item>Emergency</item>
-    <item>Emergency Test</item>
+    <item>Emergency test</item>
     <item>Finance</item>
-    <item>Folk Music</item>
+    <item>Folk music</item>
     <item>Information</item>
-    <item>Jazz Music</item>
+    <item>Jazz music</item>
     <item>Light classical</item>
     <item>Leisure</item>
     <item>News</item>
-    <item>National Music</item>
-    <item>Other Music</item>
-    <item>Oldies Music</item>
-    <item>Phone In</item>
-    <item>Pop Music</item>
+    <item>National music</item>
+    <item>Other music</item>
+    <item>Oldies music</item>
+    <item>Phone in</item>
+    <item>Pop music</item>
     <item>Religion</item>
-    <item>Rock Music</item>
+    <item>Rock music</item>
     <item>Science</item>
     <item>Serious classical</item>
-    <item>Social Affairs</item>
+    <item>Social affairs</item>
     <item>Sport</item>
     <item>Travel</item>
     <item>Varied</item>
     <item>Weather</item>
   </string-array>
 
-  <string-array name="search_category_rds_values">
+  <string-array name="search_category_rds_values" translatable="false">
     <item>0</item>
     <item>7</item>
     <item>2</item>
@@ -207,24 +198,17 @@
     <item>16</item>
   </string-array>
 
-  <string-array name="presetlist_edit_category">
-    <item>Rename</item>
-    <item>Auto-Select</item>
-    <item>Delete</item>
-  </string-array>
-
-
   <string-array name="regional_band_entries">
     <item>North America</item>
     <item>Europe</item>
     <item>Japan</item>
-    <item>Japan (Wide)</item>
+    <item>Japan (wide)</item>
     <item>Australia</item>
     <item>Austria</item>
     <item>Belgium</item>
     <item>Brazil</item>
     <item>China</item>
-    <item>Czech</item>
+    <item>Czech Republic</item>
     <item>Denmark</item>
     <item>Finland</item>
     <item>France</item>
@@ -249,12 +233,12 @@
     <item>Sweden</item>
     <item>Taiwan</item>
     <item>Turkey</item>
-    <item>United Kingdom </item>
+    <item>United Kingdom</item>
     <item>United States</item>
-    <item>User Defined Band</item>
+    <item>User defined band</item>
   </string-array>
 
-  <string-array name="regional_band_values">
+  <string-array name="regional_band_values" translatable="false">
     <item>0</item>
     <item>1</item>
     <item>2</item>
@@ -295,153 +279,55 @@
   </string-array>
 
   <string-array name="regional_band_summary">
-    <item>North America (87.5MHz To 108.0MHz In 200 Khz Steps)</item>
-    <item>Europe (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Japan (76.0MHz To  90.0MHz In 100 Khz Steps)</item>
-    <item>Japan (Wide) (90.0MHz To 108.0MHz In 50 Khz Steps)</item>
-    <item>Australia (87.7MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Austria (87.5MHz To 108.0MHz In  50 Khz Steps)</item>
-    <item>Belgium (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Brazil (87.5MHz To 108.0MHz In 200 Khz Step)</item>
-    <item>China (87.0MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Czech (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Denmark (87.5MHz To 108.0MHz In 50 Khz Steps)</item>
-    <item>Finland (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>France (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Germany (87.5MHz To 108.0MHz In 50 Khz Steps)</item>
-    <item>Greece (87.5MHz To 108.0MHz In 50 Khz Steps)</item>
-    <item>Hong Kong (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>India (91.0MHz To 106.4MHz In 100 Khz Steps)</item>
-    <item>Ireland (87.5MHz To 108.0MHz In 50 Khz Steps)</item>
-    <item>Italy (87.5MHz To 108.0MHz In 50 Khz Steps)</item>
-    <item>Korea (87.5MHz To 108.0MHz In 200 Khz Steps)</item>
-    <item>Mexico (88.1MHz To 107.9MHz In 200 Khz Steps)</item>
-    <item>Netherlands (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>New Zealand (88.0MHz To 107.0MHz In 100 Khz Steps)</item>
-    <item>Norway (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Poland (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Portugal (87.5MHz To 108.0MHz In 50 Khz Steps)</item>
-    <item>Russia (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Singapore (88.0MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Slovakia (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Spain (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Switzerland (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Sweden (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Taiwan (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>Turkey (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>United Kingdom (87.5MHz To 108.0MHz In 100 Khz Steps)</item>
-    <item>United States (88.1MHz To 107.9MHz In 200 Khz Steps)</item>
-    <item>User Defined Band</item>
+    <item>North America (87.5MHz to 108.0MHz in 200 KHz steps)</item>
+    <item>Europe (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Japan (76.0MHz to  90.0MHz in 100 KHz steps)</item>
+    <item>Japan (wide) (90.0MHz to 108.0MHz in 50 KHz steps)</item>
+    <item>Australia (87.7MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Austria (87.5MHz to 108.0MHz in  50 KHz steps)</item>
+    <item>Belgium (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Brazil (87.5MHz to 108.0MHz in 200 KHz steps)</item>
+    <item>China (87.0MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Czech Republic (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Denmark (87.5MHz to 108.0MHz in 50 KHz steps)</item>
+    <item>Finland (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>France (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Germany (87.5MHz to 108.0MHz in 50 KHz steps)</item>
+    <item>Greece (87.5MHz to 108.0MHz in 50 KHz steps)</item>
+    <item>Hong Kong (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>India (91.0MHz to 106.4MHz in 100 KHz steps)</item>
+    <item>Ireland (87.5MHz to 108.0MHz in 50 KHz steps)</item>
+    <item>Italy (87.5MHz to 108.0MHz in 50 KHz steps)</item>
+    <item>Korea (87.5MHz to 108.0MHz in 200 KHz steps)</item>
+    <item>Mexico (88.1MHz to 107.9MHz in 200 KHz steps)</item>
+    <item>Netherlands (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>New Zealand (88.0MHz to 107.0MHz in 100 KHz steps)</item>
+    <item>Norway (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Poland (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Portugal (87.5MHz to 108.0MHz in 50 KHz steps)</item>
+    <item>Russia (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Singapore (88.0MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Slovakia (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Spain (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Switzerland (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Sweden (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Taiwan (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>Turkey (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>United Kingdom (87.5MHz to 108.0MHz in 100 KHz steps)</item>
+    <item>United States (88.1MHz to 107.9MHz in 200 KHz steps)</item>
+    <item>User defined band</item>
   </string-array>
 
-  <string-array name="rf_cfg">
-      <item> Get Current Station Parameters</item>
-      <item> Get Station Parameters Repeat 20 times</item>
-      <item> Get Search  station parameters</item>
-      <item> Get FM Band sweep parameters</item>
-      <item> Configure Performance Parameters</item>
-  </string-array>
-
-  <string-array name="cfg_rf1">
-      <item> Set RSSI Threshold</item>
-      <item> RF Statistics</item>
-  </string-array>
-
-  <string-array name="cfg_rf2">
-      <item> Set SINR Samples Count</item>
-      <item> Set SINR Threshold</item>
-      <item> Set IntfDetoutLow Threshold</item>
-      <item> Set IntfDetoutHigh Threshold</item>
-      <item> Set SinrFirstStage</item>
-      <item> Set RmssiFirstStage</item>
-      <item> Set CF0Th12</item>
-      <item> Set SearchAlgo Type</item>
-      <item> Get SINR Samples Count</item>
-      <item> Get SINR Threshold</item>
-      <item> Get SinrFirstStage</item>
-      <item> Get RmssiFirstStage</item>
-      <item> Get CF0Th12</item>
-      <item> Get Search Algo Type</item>
-      <item> Set AfJmpRmssi Threshold</item>
-      <item> Set GoodChRmssi Threshold</item>
-      <item> Set AfJmpRmssi Samples count</item>
-      <item> Get AfJmpRmssi Threshold</item>
-      <item> Get GoodChRmssi Threshold</item>
-      <item> Get AfJmpRmssi Samples count</item>
-      <item> Set RXREPEAT Count</item>
-      <item> Set Sig Blend SinrHi</item>
-      <item> Get Sig Blend SinrHi</item>
-      <item> Set Sig Blend RmssiHi</item>
-      <item> Get Sig Blend RmssiHi</item>
-      <item> RF Statistics</item>
-  </string-array>
-
-
-  <string-array name="cfg_rf3">
-      <item> Set SINR Threshold</item>
-      <item> Get SINR Threshold</item>
-      <item> Set RSSI Threshold</item>
-      <item> Get RSSI Threshold</item>
-      <item> Set AFJumpRssi Threshold</item>
-      <item> Get AFJumpRssi Threshold</item>
-      <item> Set RDS FIFO count</item>
-      <item> Get RDS FIFO count</item>
-      <item> Set AfJmpRssi Samples count</item>
-      <item> Get AfJmpRssi Samples count</item>
-      <item> RF Statistics</item>
-  </string-array>
-
-  <string-array name="cfg_rf4">
-      <item> Select Option</item>
-      <item> Set SINR Samples Count</item>
-      <item> Set SINR Threshold</item>
-      <item> Set IntfDetoutLow Threshold</item>
-      <item> Set IntfDetoutHigh Threshold</item>
-      <item> Set SinrFirstStage</item>
-      <item> Set RmssiFirstStage</item>
-      <item> Set CF0Th12</item>
-      <item> Set SearchAlgo Type</item>
-      <item> Get SINR Samples Count</item>
-      <item> Get SINR Threshold</item>
-      <item> Get SinrFirstStage</item>
-      <item> Get RmssiFirstStage</item>
-      <item> Get CF0Th12</item>
-      <item> Get Search Algo Type</item>
-      <item> Set AfJmpRmssi Threshold</item>
-      <item> Set GoodChRmssi Threshold</item>
-      <item> Set AfJmpRmssi Samples count</item>
-      <item> Get AfJmpRmssi Threshold</item>
-      <item> Get GoodChRmssi Threshold</item>
-      <item> Get AfJmpRmssi Samples count</item>
-      <item> Set RXREPEAT Count</item>
-      <item> Set Sig Blend SinrHi</item>
-      <item> Get Sig Blend SinrHi</item>
-      <item> Set Sig Blend RmssiHi</item>
-      <item> Get Sig Blend RmssiHi</item>
-      <item> RF Statistics</item>
-  </string-array>
-
-  <string-array name="stats_options">
-      <item> Select the option</item>
-      <item> Configure Performance parameters</item>
-      <item> RF Statistics</item>
-  </string-array>
-
-  <string-array name="channel_spacing_val">
+  <string-array name="channel_spacing_val" translatable="false">
       <item>2</item>
       <item>1</item>
       <item>0</item>
   </string-array>
 
   <string-array name="channel_spacing_entries">
-      <item>50 Khz</item>
-      <item>100 Khz</item>
-      <item>200 Khz</item>
-  </string-array>
-
-  <string-array name="band_sweep_methods">
-      <item>Manual</item>
-      <item>From File</item>
+      <item>50 KHz</item>
+      <item>100 KHz</item>
+      <item>200 KHz</item>
   </string-array>
 
 </resources>
diff --git a/fmapp2/res/values/debug_arrays.xml b/fmapp2/res/values/debug_arrays.xml
new file mode 100644
index 0000000..d626cf5
--- /dev/null
+++ b/fmapp2/res/values/debug_arrays.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2009, 2011-2014 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2014-2015 The CyanogenMod Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the name of The Linux Foundation nor
+ *      the names of its contributors may be used to endorse or promote
+ *      products derived from this software without specific prior written
+ *      permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources>
+  <string-array name="rf_cfg">
+      <item>Get Current Station Parameters</item>
+      <item>Get Station Parameters Repeat 20 times</item>
+      <item>Get Search  station parameters</item>
+      <item>Get FM Band sweep parameters</item>
+      <item>Configure Performance Parameters</item>
+  </string-array>
+
+  <string-array name="cfg_rf1">
+      <item>Set FM RSSI Delta</item>
+      <item>Set Signal Threshold</item>
+      <item>RF Statistics</item>
+  </string-array>
+
+  <string-array name="cfg_rf2">
+      <item>Set SINR Samples Count</item>
+      <item>Set SINR Threshold</item>
+      <item>Set IntfDetoutLow Threshold</item>
+      <item>Set IntfDetoutHigh Threshold</item>
+      <item>Set SinrFirstStage</item>
+      <item>Set RmssiFirstStage</item>
+      <item>Set CF0Th12</item>
+      <item>Set SearchAlgo Type</item>
+      <item>Get SINR Samples Count</item>
+      <item>Get SINR Threshold</item>
+      <item>Get SinrFirstStage</item>
+      <item>Get RmssiFirstStage</item>
+      <item>Get CF0Th12</item>
+      <item>Get Search Algo Type</item>
+      <item>Set AfJmpRmssi Threshold</item>
+      <item>Set GoodChRmssi Threshold</item>
+      <item>Set AfJmpRmssi Samples count</item>
+      <item>Get AfJmpRmssi Threshold</item>
+      <item>Get GoodChRmssi Threshold</item>
+      <item>Get AfJmpRmssi Samples count</item>
+      <item>Set RXREPEAT Count</item>
+      <item>Set Sig Blend SinrHi</item>
+      <item>Get Sig Blend SinrHi</item>
+      <item>Set Sig Blend RmssiHi</item>
+      <item>Get Sig Blend RmssiHi</item>
+      <item>RF Statistics</item>
+  </string-array>
+
+  <string-array name="cfg_rf3">
+      <item>Set SINR Threshold</item>
+      <item>Get SINR Threshold</item>
+      <item>Set RSSI Threshold</item>
+      <item>Get RSSI Threshold</item>
+      <item>Set AFJumpRssi Threshold</item>
+      <item>Get AFJumpRssi Threshold</item>
+      <item>Set RDS FIFO count</item>
+      <item>Get RDS FIFO count</item>
+      <item>Set AfJmpRssi Samples count</item>
+      <item>Get AfJmpRssi Samples count</item>
+      <item>RF Statistics</item>
+  </string-array>
+
+  <string-array name="cfg_rf4">
+      <item> Select Option</item>
+      <item> Set SINR Samples Count</item>
+      <item> Set SINR Threshold</item>
+      <item> Set IntfDetoutLow Threshold</item>
+      <item> Set IntfDetoutHigh Threshold</item>
+      <item> Set SinrFirstStage</item>
+      <item> Set RmssiFirstStage</item>
+      <item> Set CF0Th12</item>
+      <item> Set SearchAlgo Type</item>
+      <item> Get SINR Samples Count</item>
+      <item> Get SINR Threshold</item>
+      <item> Get SinrFirstStage</item>
+      <item> Get RmssiFirstStage</item>
+      <item> Get CF0Th12</item>
+      <item> Get Search Algo Type</item>
+      <item> Set AfJmpRmssi Threshold</item>
+      <item> Set GoodChRmssi Threshold</item>
+      <item> Set AfJmpRmssi Samples count</item>
+      <item> Get AfJmpRmssi Threshold</item>
+      <item> Get GoodChRmssi Threshold</item>
+      <item> Get AfJmpRmssi Samples count</item>
+      <item> Set RXREPEAT Count</item>
+      <item> Set Sig Blend SinrHi</item>
+      <item> Get Sig Blend SinrHi</item>
+      <item> Set Sig Blend RmssiHi</item>
+      <item> Get Sig Blend RmssiHi</item>
+      <item> RF Statistics</item>
+  </string-array>
+
+  <string-array name="stats_options">
+      <item>Select the option</item>
+      <item>Configure Performance parameters</item>
+      <item>RF Statistics</item>
+  </string-array>
+
+  <string-array name="band_sweep_methods">
+      <item>Manual</item>
+      <item>From File</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values/debug_strings.xml b/fmapp2/res/values/debug_strings.xml
new file mode 100644
index 0000000..04c601f
--- /dev/null
+++ b/fmapp2/res/values/debug_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2009, 2011-2013 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2014-2015 The CyanogenMod Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the name of The Linux Foundation nor
+ *      the names of its contributors may be used to endorse or promote
+ *      products derived from this software without specific prior written
+ *      permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_stats">FM RF stats</string>
+
+    <string name="test_menu">Select Test</string>
+
+    <string name="test_prompt">Choose a test</string>
+    <string name="test_run">Run Test</string>
+    <string name="set_rmmsi_delta">Configure RMSSI Delta</string>
+    <string name="set_sigth">Configure Signal Th</string>
+    <string name="type_rd"></string>
+    <string name="enter_rssi">Enter RMSSI Delta</string>
+    <string name="enter_sigth">Enter Signal Th</string>
+    <string name="enter_SinrSmplsCnt">Enter SINR Samples Count</string>
+    <string name="set_SinrSmplsCnt">Configure SINR Samples</string>
+    <string name="enter_SinrTh">Enter SINR Threshold</string>
+    <string name="set_SinrTh">Configure SINR Threshold</string>
+    <string name="enter_IntfLowTh">Enter Intf Det Low Threshold</string>
+    <string name="set_IntfLowTh">Config Intf Det Low Threshold</string>
+    <string name="enter_IntfHighTh">Enter Intf Det High Threshold</string>
+    <string name="set_IntfHighTh">Config Intf Det High Threshold</string>
+
+    <string name="enter_SinrFirstStage">Enter Sinr First Stage</string>
+    <string name="set_SinrFirstStage">Config Sinr First Stage</string>
+    <string name="enter_RmssiFirstStage">Enter Rmssi First Stage</string>
+    <string name="set_RmssiFirstStage">Config Rmssi First Stage</string>
+    <string name="enter_CF0Th12">Enter CF0 Threshold</string>
+    <string name="set_CF0Th12">Config CF0 Threshold</string>
+    <string name="search_algo_mpx">MPX_DCC Algo</string>
+    <string name="search_algo_sinrint">SINR_INTF Algo</string>
+    <string name="enter_AfJmpRmssiTh">Enter Af Jump Rmssi Threshold</string>
+    <string name="set_AfJmpRmssiTh">Config Af Jump Rmssi Threshold</string>
+    <string name="enter_GdChRmssiTh">Enter Good Channel Rmssi Threshold</string>
+    <string name="set_GdChRmssiTh">Config Good Channel Rmssi Threshold</string>
+    <string name="enter_AfJmpRmssiSmplsCnt">Enter Af Jump Rmssi Samples count</string>
+    <string name="set_AfJmpRmssiSmplsCnt">Config Af Jump Rmssi Samples count</string>
+    <string name="enter_RxRePeatCount">Enter RxRePeat count</string>
+    <string name="set_RxRePeatCount">Config RxRePeat count</string>
+    <string name="enter_BlendSinrHi">Enter Sig Blend SinrHi value</string>
+    <string name="set_BlendSinrHi">Configure Sig Blend SinrHi value</string>
+    <string name="enter_BlendRmssiHi">Enter Sig Blend RmssiHi value</string>
+    <string name="set_BlendRmssiHi">Configure Sig Blend RmssiHi value</string>
+    <string name="enter_RssiTh">Enter RSSI Threshold</string>
+    <string name="set_RssiTh">Config RSSI Threshold</string>
+    <string name="enter_AfJumpRssiTh">Enter AF jump RSSI Threshold</string>
+    <string name="set_AfJumpRssiTh">Config AF jump RSSI Threshold</string>
+    <string name="set_RdsFifoCnt">Config RDS FIFO count</string>
+
+    <string name="band_method_prompt">Select Method</string>
+    <string name="enter_start_delay_time">Start Delay Time</string>
+    <string name="enter_dwell_time">Dwell Time</string>
+    <string name="band_sweep_setting">Sweep Setting</string>
+    <string name="band_sweep_setting_set">Set</string>
+    <string name="band_sweep_setting_cancel">Cancel</string>
+    <string name="band_sweep_choose">Choose Band Sweep Method</string>
+</resources>
diff --git a/fmapp2/res/values/strings.xml b/fmapp2/res/values/strings.xml
index 3d490d0..7ac4355 100644
--- a/fmapp2/res/values/strings.xml
+++ b/fmapp2/res/values/strings.xml
@@ -1,204 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2009, 2011-2013 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2014-2015 The CyanogenMod Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the name of The Linux Foundation nor
+ *      the names of its contributors may be used to endorse or promote
+ *      products derived from this software without specific prior written
+ *      permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">FM Radio</string>
-    <string name="tx_app_name">FM Tx</string>
+    <string name="tx_app_name">FM Transmitter</string>
 
-    <string name="default_sleep"></string>
-    <string name="menu_add_to_preset">Add to Presets</string>
-    <string name="menu_settings">Settings</string>
-    <string name="menu_record_start">Start Recording</string>
-    <string name="menu_record_stop">Stop Recording</string>
-    <string name="menu_all_channels">All Channels</string>
-    <string name="app_label_all_channels">All Channels</string>
-    <string name="button_ok">OK</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="error_sdcard_access">Unable to access SD card</string>
-    <string name="fm_service_started">FM Service</string>
-    <string name="menu_sleep">Sleep</string>
-    <string name="menu_sleep_cancel">Cancel Sleep</string>
-    <string name="menu_wired_headset">Wired Headset</string>
-    <string name="menu_speaker_on">Enable Speaker</string>
-    <string name="menu_display_tags">Show Tags</string>
-    <string name="menu_speaker_off">Disable Speaker</string>
     <string name="menu_scan_start">Scan</string>
-    <string name="menu_scan_stop">Stop Searching</string>
-    <string name="menu_stats">FM RF Stats</string>
+    <string name="menu_scan_stop">Stop searching</string>
+    <string name="menu_record_start">Record</string>
+    <string name="menu_record_stop">Stop recording</string>
+    <string name="menu_settings">Settings</string>
+    <string name="menu_sleep">Sleep</string>
+    <string name="menu_sleep_cancel">Cancel sleep</string>
+    <string name="menu_all_channels">All channels</string>
+    <string name="menu_display_tags">Show tags</string>
+
     <string name="button_text_stop">Stop</string>
-    <string name="msg_seeking">Searching FM Station</string>
-    <string name="msg_scanning">Scanning for all FM Stations</string>
-    <string name="msg_scanning_pty">Scanning for "<xliff:g id="pty_name">%1$s</xliff:g>"</string>
-    <string name="msg_search_title">FM - <xliff:g id="frequency_string">%1$s</xliff:g></string>
-    <string name="msg_searching">Searching for Strong Stations to create a Preset List </string>
-    <string name="msg_searching_title">Auto-Select Presets</string>
-    <string name="msg_weak_searching">Searching for frequencies to transmit</string>
+    <string name="msg_seeking">Searching FM station\u2026</string>
+    <string name="msg_scanning">Scanning for all FM stations\u2026</string>
+    <string name="msg_scanning_pty">Scanning for \'<xliff:g id="pty_name">%1$s</xliff:g>\'\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Auto-selecting presets</string>
+    <string name="msg_searching">Searching for strong stations to create a presets list\u2026</string>
 
-    <string name="msg_noantenna">Please plug in a Headset to use FM
-        Radio </string>
-    <string name="msg_headsetpluggedin">Disconnect all Headsets for using FM Tx</string>
-    <string name="msg_callactive">FM Tx is not supported when there is active voice call</string>
-    <string name="dialog_sleep_title">Select Auto-Off Sleep Time</string>
-        <string name="preset_select_name">Select "<xliff:g id="preset_name">%1$s</xliff:g>"</string>
-        <string name="presetlist_select_name">Select "<xliff:g id="presetlist_name">%1$s</xliff:g>"</string>
-    <string name="presetlist_add_new">Add New List</string>
-    <string name="dialog_presetlist_title">Preset Lists</string>
-        <string name="presetlist_prefix_name">FM - </string>
-        <string name="dialog_presetlist_rename_title">Enter a name </string>
-        <string name="dialog_preset_rename_title">Enter a name </string>
-        <string name="presetlist_delete_name">Delete "<xliff:g id="presetlist_name">%1$s</xliff:g>" and its Stations?</string>
-        <string name="presetlist_autoselect_title">Confirm Auto-Select</string>
-        <string name="presetlist_autoselect_name">Auto-Select will delete all the Presets in the list  "<xliff:g id="presetlist_name">%1$s</xliff:g>", Continue?</string>
-        <string name="fmtx_autoselect_name">Auto-Select will delete all the Presets, Continue?</string>
+    <string name="msg_noantenna">Please plug in a headset to use FM radio</string>
+    <string name="dialog_sleep_title">Auto-off sleep time</string>
+    <string name="presetlist_select_name">Select \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Add new list</string>
+    <string name="dialog_presetlist_rename_title">Enter name</string>
+    <string name="presetlist_autoselect_title">Confirm auto-selection</string>
 
-    <string name="enter_frequency">Tune to Station</string>
-    <string name="enter_new_frequency_title">Enter Frequency </string>
-
-    <string name="preset_now_playing">Now Playing </string>
-        <string name="preset_pref_title">"<xliff:g id="preset_name">%1$s</xliff:g>"
-        (<xliff:g id="preset_freq">%2$s</xliff:g>)</string>
-        <string name="preset_delete_title">Delete Preset</string>
-
-        <string name="preset_delete_name">Delete "<xliff:g id="preset_name">%1$s</xliff:g>"
-        from "<xliff:g id="presetlist_name">%2$s</xliff:g>"</string>
-
-        <string name="preset_confirm_delete_name">Delete "<xliff:g id="preset_name">%1$s</xliff:g>"
-        from "<xliff:g id="presetlist_name">%2$s</xliff:g>" ?</string>
-
-    <string name="preset_name_dialog_title">Enter a name </string>
-    <string name="preset_name_summary">"<xliff:g id="preset_name">%1$s</xliff:g>" </string>
-    <string name="preset_name_title">Rename</string>
-
-    <string name="preset_search_title">Search</string>
-    <string name="preset_search_name">Search for "<xliff:g id="preset_name">%1$s</xliff:g>"</string>
-
-    <string name="preset_preference_title">FM Stations in "<xliff:g id="preset_name">%1$s</xliff:g>" </string>
-
-    <string name="preset_empty_title">No Stations in the List</string>
-    <string name="preset_empty_add_summary">Add Stations</string>
-
-    <string name="preset_add">Add</string>
     <string name="preset_replace">Replace</string>
     <string name="preset_tune">Tune</string>
     <string name="preset_rename">Rename</string>
     <string name="preset_delete">Delete</string>
-    <string name="preset_search">Search for "<xliff:g id="preset_pi">%1$s</xliff:g>"
-        </string>
+    <string name="preset_search">Search for \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
 
-    <string name="stat_notif_frequency">FM Radio Station "<xliff:g id="frequency">%1$s</xliff:g>" MHz</string>
-    <string name="stat_notif_tx_frequency">FM Transmitting at: "<xliff:g id="frequency">%1$s</xliff:g>"</string>
+    <string name="stat_notif_frequency">FM Radio Station \'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
 
+    <string name="regional_band">Regional band</string>
 
-    <string name="sel_band_menu">Select Regional Band</string>
-    <string name="test_menu">Select Test</string>
-
-    <string name="settings_menu">Settings</string>
-    <string name="regional_band">Regional Band</string>
-
-    <string name="aud_output_mode">Audio Output Mode</string>
-    <string name="sel_audio_output">Select Audio Output</string>
-
-    <string name="record_dur">Record Duration</string>
-    <string name="sel_rec_dur">Select Record Duration</string>
-
-    <string name="auto_select_af">Alternate Frequency</string>
-    <string name="auto_select_af_enabled">Auto Select Enabled</string>
-    <string name="auto_select_af_disabled">Auto Select Disabled</string>
-
-    <string name="fac_defaults">Revert to Factory Defaults</string>
-    <string name="revert_to_fac">Revert to Factory Defaults</string>
-    <string name="settings_back">Back</string>
-
-    <string name="settings_revert_confirm_title">Confirm Reset Settings</string>
-    <string name="settings_revert_confirm_msg">This will delete all settings including Presets</string>
-
-    <string name="settings_back_summary">Return to previous view</string>
-    <string name="settings_revert_defaults_title">Revert to Factory Defaults</string>
-    <string name="settings_revert_defaults_summary">Reset all settings</string>
-
+    <string name="aud_output_mode">Audio output mode</string>
     <string name="audio_type_stereo">Stereo</string>
     <string name="audio_type_mono">Mono</string>
 
-    <string name="default_band">United States</string>
-    <string name="default_audio">Stereo</string>
-    <string name="default_record_duration">5 minutes</string>
-    <string name="factory_reset_dialog_title">Confirm Reset</string>
-    <string name="factory_reset_dialog_message">This will delete all settings including Presets</string>
-    <string name="station_move">Move</string>
-    <string name="station_edit">Edit</string>
-    <!-- alert to the user that USB storage must be available before using FM recording  [CHAR LIMIT=NONE] -->
-   <string name="no_storage">Mount SD card before start recording.</string>
-   <!-- alert to the user that the USB storage is being disk-checked [CHAR LIMIT=30] -->
-   <string name="preparing_sd">Preparing SD card</string>
-   <!-- alert to the user that the FM fails to read or write the USB storage. [CHAR LIMIT=NONE] -->
-   <string name="access_sd_fail">Couldn\'t access SD card.</string>
-   <!-- Low-memory dialog message [CHAR LIMT=NONE] -->
-   <string name="spaceIsLow_content">Your SD card storage is running out of space. Change the quality setting or delete some images or other files.</string>
-   <!-- The messsage shown when FM record reaches size limit. -->
-   <string name="FMRecording_reach_size_limit">Size limit reached.</string>
+    <string name="record_dur">Record duration</string>
 
-    <string name="delete_station_title">Delete</string>
-    <string name="find_af_station">Find</string>
-    <string name="menu_add_list">Add List</string>
-    <string name="menu_rename_list">Rename List</string>
-    <string name="menu_reorder_list">Reorder List</string>
-    <string name="menu_scan_for_preset">Scan for Presets</string>
-    <string name="menu_delete_list">Delete List</string>
-    <string name="alert_dialog_ok">Ok</string>
-    <string name="alert_dialog_cancel">Cancel</string>
+    <string name="auto_select_af">Alternative frequency</string>
+
+    <string name="settings_revert_defaults_title">Revert to factory defaults</string>
+    <string name="settings_revert_defaults_summary">Reset all settings</string>
+
+    <string name="settings_revert_confirm_title">Confirm reset</string>
+    <string name="settings_revert_confirm_msg">This will clear all application settings, including saved presets. Continue?</string>
+
+    <!-- alert to the user that USB storage must be available before using FM recording  [CHAR LIMIT=NONE] -->
+    <string name="no_storage">Mount SD card before starting recording.</string>
+    <!-- alert to the user that the USB storage is being disk-checked [CHAR LIMIT=30] -->
+    <string name="preparing_sd">Preparing SD card\u2026</string>
+    <!-- alert to the user that the FM fails to read or write the USB storage. [CHAR LIMIT=NONE] -->
+    <string name="access_sd_fail">Couldn\'t access SD card.</string>
+    <!-- Low-memory dialog message [CHAR LIMT=NONE] -->
+    <string name="spaceIsLow_content">Your SD card storage is running out of space. Change the quality setting or delete some other files to free up space.</string>
+    <!-- The messsage shown when FM record reaches size limit. -->
+    <string name="FMRecording_reach_size_limit">Size limit reached.</string>
+    <string name="menu_scan_for_preset">Scan for presets</string>
+
     <!-- The messsage shown when long pressed on a station. -->
     <string name="alert_dialog_hint">Enter a name</string>
 
-    <string name="search_dialog_title">Scan Stations</string>
+    <string name="search_dialog_title">Scan stations</string>
 
-    <string name="search_category_key">search_category_type</string>
-    <string name="search_category">Select Search Type</string>
-    <string name="search_category_title">Search Type</string>
-    <string name="default_search_category">Seek</string>
-    <string name="search_category_tune">Tune</string>
+    <string name="fm_command_timeout_title">Timeout</string>
+    <string name="fm_tune_timeout_msg">No response received to tune FM station. If the problem persists, please turn off FM and turn it back on.</string>
 
-    <string name="search_category_type_key">search_category_value_type</string>
-    <string name="search_category_type">Select Search by Program Type</string>
-    <string name="search_category_type_title">Search by Program Type</string>
-    <string name="default_search_category_type">All Stations</string>
+    <string name="fm_command_failed_title">FM operation failed</string>
+    <string name="fm_cmd_failed_msg">FM operation failed. If the problem persists, please turn off FM and turn it back on.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM operation failed. FM and HDMI concurrency is not supported.</string>
+    <string name="fm_cmd_failed_call_on">FM operation failed. FM audio is not allowed during call.</string>
 
-    <string name="presets_back">Back</string>
-    <string name="presets_back_summary">Return to previous view</string>
-
-    <string name="nav_mode_presets">Presets</string>
-    <string name="nav_mode_stations">Stations</string>
-
-    <string name="prog_service_string"></string>
-    <string name="radio_text_string">This is the long Radio Text String Message that needs to scroll</string>
-    <string name="eradio_text_string">Extended Radio Text Message</string>
-    <string name="pty_string"></string>
-    <string name="frequency_string"></string>
-    <string name="station_id_string"></string>
-
-
-        <string name="fm_command_timeout_title">Timeout</string>
-        <string name="fm_tune_timeout_msg">No response received to Tune FM
-            Station. If problem persists, please turn off FM and turn it back
-            on.</string>
-
-        <string name="fm_command_failed_title">FM Operation failed</string>
-        <string name="fm_cmd_failed_msg">FM operation failed. If problem
-            persists, please turn off FM and turn it back on.
-        </string>
-        <string name="fm_cmd_failed_msg_hdmi">FM operation failed. FM and HDMI concurrecny is not supported.
-        </string>
-        <string name="fm_cmd_failed_call_on">FM operation failed. FM audio is not allowed during call. </string>
-
-    <skip/>
     <!-- Do not translate. Duration format. -->
-    <string name="durationformat"><xliff:g id="format">%2$d:%5$02d</xliff:g></string>
+    <string name="durationformat" translatable="false"><xliff:g id="format">%2$d:%5$02d</xliff:g></string>
 
-    <string name="default_record"></string>
-    <string name="default_preset_list_name"> FM List </string>
-    <string name="default_station"> FM </string>
-    <string name="default_blank"> </string>
-    <string name="add_station">+</string>
-    <string name="stop_scanning">Stop Scanning</string>
-    <string name="transmit_msg_string">Transmitting at:</string>
     <!-- the name under which recordings will be visible in the media database is formatted like this -->
     <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
     <!-- all recordings will show up in the media database with this 'artist' name -->
@@ -207,73 +116,24 @@
     <string name="audio_db_album_name">FM recordings</string>
     <!-- all recordings will show up in the media database in a playlist with this name -->
     <string name="audio_db_playlist_name">FM recordings</string>
-    <string name="test_prompt">Choose a test</string>
-    <string name="test_run">Run Test</string>
-    <string name="set_rmmsi_delta">Configure RMSSI Delta</string>
-    <string name="set_sigth">Configure Signal Th</string>
-    <string name="type_rd"></string>
-    <string name="srch_params">Configure RMSSI Delta</string>
-    <string name="srch_params_1">Configure Signal Th </string>
-    <string name="enter_rssi">Enter RMSSI Delta</string>
-    <string name="enter_sigth">Enter Signal Th</string>
-    <string name="enter_SinrSmplsCnt">Enter SINR Samples Count</string>
-    <string name="set_SinrSmplsCnt">Configure SINR Samples</string>
-    <string name="enter_SinrTh">Enter SINR Threshold</string>
-    <string name="set_SinrTh">Configure SINR Threshold</string>
-    <string name="enter_IntfLowTh">Enter Intf Det Low Threshold</string>
-    <string name="set_IntfLowTh">Config Intf Det Low Threshold</string>
-    <string name="enter_IntfHighTh">Enter Intf Det High Threshold</string>
-    <string name="set_IntfHighTh">Config Intf Det High Threshold</string>
 
-    <string name="station_name">Station:</string>
+    <string name="default_blank" translatable="false"></string>
+    <string name="add_station" translatable="false">+</string>
+
+    <string name="station_name">Station: <xliff:g id="name">%s</xliff:g></string>
     <string name="station_exists">This frequency already exists!</string>
-    <string name="station_list_delete_station">Delete:<xliff:g id="name">%s</xliff:g></string>
-    <string name="station_list_delete_station_prompt">Are you sure to delete <xliff:g id="name">%s</xliff:g> .</string>
+    <string name="station_list_delete_station">Delete: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Are you sure you want to delete \'<xliff:g id="name">%s</xliff:g>\'?</string>
     <string name="station_name_empty">Station name is empty, please input again.</string>
-    <string name="station_name_exist">There is already a station named \"<xliff:g id="name">%s</xliff:g>\". Please input a different name.</string>
-    <string name="enter_SinrFirstStage">Enter Sinr First Stage</string>
-    <string name="set_SinrFirstStage">Config Sinr First Stage</string>
-    <string name="enter_RmssiFirstStage">Enter Rmssi First Stage</string>
-    <string name="set_RmssiFirstStage">Config Rmssi First Stage</string>
-    <string name="enter_CF0Th12">Enter CF0 Threshold</string>
-    <string name="set_CF0Th12">Config CF0 Threshold</string>
-    <string name="search_algo_mpx">MPX_DCC Algo</string>
-    <string name="search_algo_sinrint">SINR_INTF Algo</string>
-    <string name="enter_AfJmpRmssiTh">Enter Af Jump Rmssi Threshold</string>
-    <string name="set_AfJmpRmssiTh">Config Af Jump Rmssi Threshold</string>
-    <string name="enter_GdChRmssiTh">Enter Good Channel Rmssi Threshold</string>
-    <string name="set_GdChRmssiTh">Config Good Channel Rmssi Threshold</string>
-    <string name="enter_AfJmpRmssiSmplsCnt">Enter Af Jump Rmssi Samples count</string>
-    <string name="set_AfJmpRmssiSmplsCnt">Config Af Jump Rmssi Samples count</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' is already in use, please enter a different name.</string>
+
     <string name="rt_plus_tags">Tags</string>
-    <string name="enter_RxRePeatCount">Enter RxRePeat count</string>
-    <string name="set_RxRePeatCount">Config RxRePeat count</string>
-    <string name="enter_BlendSinrHi">Enter Sig Blend SinrHi value</string>
-    <string name="set_BlendSinrHi">Configure Sig Blend SinrHi value</string>
-    <string name="enter_BlendRmssiHi">Enter Sig Blend RmssiHi value</string>
-    <string name="set_BlendRmssiHi">Configure Sig Blend RmssiHi value</string>
-    <string name="enter_RssiTh">Enter RSSI Threshold</string>
-    <string name="set_RssiTh">Config RSSI Threshold</string>
-    <string name="enter_AfJumpRssiTh">Enter AF jump RSSI Threshold</string>
-    <string name="set_AfJumpRssiTh">Config AF jump RSSI Threshold</string>
-    <string name="enter_RdsFifoCnt">Enter RDS FIFO count</string>
-    <string name="set_RdsFifoCnt">Config RDS FIFO count</string>
 
-    <string name="usr_def_band_min">Lower Freq Limit(In Mhz)</string>
-    <string name="usr_def_band_max">Higher Freq Limit(In Mhz)</string>
-    <string name="sel_chanl_spacing">Select Channel Spacing</string>
-    <string name="chanl_spacing">Channel Spacing</string>
+    <string name="usr_def_band_min">Lowest frequency (MHz)</string>
+    <string name="usr_def_band_max">Highest frequency (MHz)</string>
+    <string name="chanl_spacing">Channel spacing</string>
 
-    <string name="band_method_prompt">Select Method</string>
-    <string name="enter_start_delay_time">Start Delay Time</string>
-    <string name="enter_dwell_time">Dwell Time</string>
-    <string name="band_sweep_setting">Sweep Setting</string>
-    <string name="band_sweep_setting_set">Set</string>
-    <string name="band_sweep_setting_cancel">Cancel</string>
-    <string name="band_sweep_choose">Choose Band Sweep Method</string>
     <string name="set">Set</string>
-    <string name="cancel">Cancel</string>
-    <string name="user_defind_band_msg">Enter Freq from range 76.0 - 108.0, with min 1 channel spacing and 100KHz space between max, min freq</string>
-    <string name="save_record_file">FM Recorded file saved to "<xliff:g id="record_file">%1$s</xliff:g>"</string>
-
+    <string name="user_defind_band_msg">Enter frequency from 76.0 to 108.0 MHz with minimum 1 channel spacing and 100 KHz space between min and max frequency</string>
+    <string name="save_record_file">FM recorded file saved to \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
 </resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values/transmit_strings.xml
similarity index 66%
rename from fmapp2/res/drawable/preset_page_button.xml
rename to fmapp2/res/values/transmit_strings.xml
index cb1457b..e6531b6 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values/transmit_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- * Copyright (c) 2012, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009, 2011-2013 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2014-2015 The CyanogenMod Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -26,10 +27,14 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
- <selector xmlns:android="http://schemas.android.com/apk/res/android">
-     <item android:state_enabled="false"
-           android:drawable="@drawable/ic_btn_forward_dis" /> <!-- disabled -->
-     <item android:state_enabled="true"
-           android:drawable="@drawable/ic_btn_forward" /> <!-- enabled -->
-     <item android:drawable="@drawable/ic_btn_forward" /> <!-- default -->
- </selector>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="msg_weak_searching">Searching for weakest frequencies to transmit\u2026</string>
+
+    <string name="msg_headsetpluggedin">Disconnect all headsets to use FM transmitter</string>
+    <string name="msg_callactive">FM transmit is not supported when there is an active voice call</string>
+    <string name="fmtx_autoselect_name">Auto-select will delete all the presets, continue?</string>
+
+    <string name="stat_notif_tx_frequency">FM Transmitting at: \'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+
+    <string name="transmit_msg_string">Transmitting at:</string>
+</resources>
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 0b66d73..abe4107 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -713,14 +713,12 @@
           item = menu.add(0, MENU_RECORD_START, 0, R.string.menu_record_start)
                               .setIcon(R.drawable.ic_menu_record);
           if (item != null) {
-             item.setVisible(true);
-             item.setEnabled((!recording) && radioOn);
+             item.setVisible((!recording) && radioOn);
           }
           item = menu.add(0, MENU_RECORD_STOP, 0, R.string.menu_record_stop)
                               .setIcon(R.drawable.ic_menu_record);
           if (item != null) {
-             item.setVisible(true);
-             item.setEnabled(recording && radioOn);
+             item.setVisible(recording && radioOn);
           }
       }
       /* Settings can be active */
@@ -1294,7 +1292,7 @@
                                                 R.layout.alert_dialog_text_entry, null);
       dlgBuilder.setTitle(R.string.dialog_presetlist_rename_title);
       dlgBuilder.setView(textEntryView);
-      dlgBuilder.setPositiveButton(R.string.alert_dialog_ok,
+      dlgBuilder.setPositiveButton(android.R.string.ok,
                                    new DialogInterface.OnClickListener() {
                                       public void onClick(DialogInterface dialog, int whichButton) {
                                          //int curList = FmSharedPreferences.getCurrentListIndex();
@@ -1313,7 +1311,7 @@
                                          closeDialog(DIALOG_PRESET_RENAME);
                                       }
                                    });
-      dlgBuilder.setNegativeButton(R.string.alert_dialog_cancel,
+      dlgBuilder.setNegativeButton(android.R.string.cancel,
                                    new DialogInterface.OnClickListener() {
                                       public void onClick(DialogInterface dialog, int whichButton) {
                                          closeDialog(DIALOG_PRESET_RENAME);
@@ -1327,7 +1325,7 @@
          dlgBuilder.setIcon(R.drawable.alert_dialog_icon)
                    .setTitle(R.string.fm_command_timeout_title);
          dlgBuilder.setMessage(R.string.fm_tune_timeout_msg);
-         dlgBuilder.setPositiveButton(R.string.alert_dialog_ok,
+         dlgBuilder.setPositiveButton(android.R.string.ok,
                                       new DialogInterface.OnClickListener() {
                                          public void onClick(DialogInterface dialog,
                                                              int whichButton) {
@@ -1346,7 +1344,7 @@
                 .setTitle(R.string.fm_command_failed_title);
       dlgBuilder.setMessage(R.string.fm_cmd_failed_msg);
 
-      dlgBuilder.setPositiveButton(R.string.alert_dialog_ok,
+      dlgBuilder.setPositiveButton(android.R.string.ok,
                                    new DialogInterface.OnClickListener() {
                                       public void onClick(DialogInterface dialog,
                                                           int whichButton) {
@@ -1364,7 +1362,7 @@
                  .setTitle(R.string.fm_command_failed_title);
        dlgBuilder.setMessage(R.string.fm_cmd_failed_call_on);
 
-       dlgBuilder.setPositiveButton(R.string.alert_dialog_ok,
+       dlgBuilder.setPositiveButton(android.R.string.ok,
                                     new DialogInterface.OnClickListener() {
                                        public void onClick(DialogInterface dialog,
                                                            int whichButton) {
diff --git a/fmapp2/src/com/caf/fmradio/Settings.java b/fmapp2/src/com/caf/fmradio/Settings.java
index bb996e4..47ad5b7 100644
--- a/fmapp2/src/com/caf/fmradio/Settings.java
+++ b/fmapp2/src/com/caf/fmradio/Settings.java
@@ -120,7 +120,7 @@
            mBandPreference = new ListPreference(this);
            mBandPreference.setEntries(R.array.regional_band_entries);
            mBandPreference.setEntryValues(R.array.regional_band_values);
-           mBandPreference.setDialogTitle(R.string.sel_band_menu);
+           mBandPreference.setDialogTitle(R.string.regional_band);
            mBandPreference.setKey(REGIONAL_BAND_KEY);
            mBandPreference.setTitle(R.string.regional_band);
            index = FmSharedPreferences.getCountry();
@@ -135,7 +135,7 @@
            mChannelSpacingPref = new ListPreference(this);
            mChannelSpacingPref.setEntries(R.array.channel_spacing_entries);
            mChannelSpacingPref.setEntryValues(R.array.channel_spacing_val);
-           mChannelSpacingPref.setDialogTitle(R.string.sel_chanl_spacing);
+           mChannelSpacingPref.setDialogTitle(R.string.chanl_spacing);
            mChannelSpacingPref.setTitle(R.string.chanl_spacing);
            mChannelSpacingPref.setKey(CHAN_SPACING_KEY);
 
@@ -181,7 +181,7 @@
                       index = 1;
                    }
                }
-               mAudioPreference.setDialogTitle(R.string.sel_audio_output);
+               mAudioPreference.setDialogTitle(R.string.aud_output_mode);
                mAudioPreference.setKey(AUDIO_OUTPUT_KEY);
                mAudioPreference.setTitle(R.string.aud_output_mode);
 
@@ -194,8 +194,6 @@
                mAfPref = new CheckBoxPreference(this);
                mAfPref.setKey(AUTO_AF);
                mAfPref.setTitle(R.string.auto_select_af);
-               mAfPref.setSummaryOn(R.string.auto_select_af_enabled);
-               mAfPref.setSummaryOff(R.string.auto_select_af_disabled);
                boolean bAFAutoSwitch = FmSharedPreferences.getAutoAFSwitch();
                Log.d(LOGTAG, "createPreferenceHierarchy: bAFAutoSwitch: "
                               + bAFAutoSwitch);
@@ -209,7 +207,7 @@
                 mRecordDurPreference = new ListPreference(this);
                 mRecordDurPreference.setEntries(R.array.record_durations_entries);
                 mRecordDurPreference.setEntryValues(R.array.record_duration_values);
-                mRecordDurPreference.setDialogTitle(R.string.sel_rec_dur);
+                mRecordDurPreference.setDialogTitle(R.string.record_dur);
                 mRecordDurPreference.setKey(RECORD_DURATION_KEY);
                 mRecordDurPreference.setTitle(R.string.record_dur);
                 nRecordDuration = FmSharedPreferences.getRecordDuration();
@@ -467,7 +465,7 @@
                       R.drawable.alert_dialog_icon).setTitle(
                       R.string.settings_revert_confirm_title).setMessage(
                       R.string.settings_revert_confirm_msg).setPositiveButton(
-                      R.string.alert_dialog_ok,
+                      android.R.string.ok,
                       new DialogInterface.OnClickListener() {
                            public void onClick(DialogInterface dialog,
                               int whichButton) {
@@ -477,7 +475,7 @@
                               restoreSettingsDefault();
                               finish();
                            }
-                      }).setNegativeButton(R.string.alert_dialog_cancel,
+                      }).setNegativeButton(android.R.string.cancel,
                               new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog,
                                                        int whichButton) {
diff --git a/fmapp2/src/com/caf/fmradio/StationListActivity.java b/fmapp2/src/com/caf/fmradio/StationListActivity.java
index 643fd57..8707fe2 100644
--- a/fmapp2/src/com/caf/fmradio/StationListActivity.java
+++ b/fmapp2/src/com/caf/fmradio/StationListActivity.java
@@ -165,7 +165,7 @@
         menu.add(0, CONTEXT_MENU_RENAME, 0, getString(R.string.preset_rename));
         menu.add(0, CONTEXT_MENU_DELETE, 0, getString(R.string.preset_delete));
         mItemId = mi.position;
-        menu.setHeaderTitle(getString(R.string.station_name)+getNameFromId(mItemId));
+        menu.setHeaderTitle(getString(R.string.station_name, getNameFromId(mItemId)));
     }
 
     @Override
@@ -192,7 +192,7 @@
         load();
         switch (id) {
         case DIALOG_RENAME_ID:
-            mRenameDialog.setTitle(getString(R.string.station_name)+getNameFromId(mItemId));
+            mRenameDialog.setTitle(getString(R.string.station_name, getNameFromId(mItemId)));
             final EditText editText = (EditText) mRenameDialog
                     .findViewById(R.id.name);
             editText.setText(getNameFromId(mItemId));
diff --git a/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java b/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java
index aca5fba..4f7102b 100644
--- a/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java
+++ b/fmapp2/src/com/caf/hc_utils/FrequencyPickerDialog.java
@@ -100,7 +100,7 @@
         mCallBack = callback;
 
         setButton(context.getString(R.string.set), this);
-        setButton2(context.getString(R.string.cancel),  (OnClickListener) null);
+        setButton2(context.getString(android.R.string.cancel),  (OnClickListener) null);
         setIcon(R.drawable.alert_dialog_icon);
 
         LayoutInflater inflater =
diff --git a/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java b/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java
index 2b0b7b0..ed21966 100644
--- a/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java
+++ b/fmapp2/src/com/caf/utils/FrequencyPickerDialog.java
@@ -100,7 +100,7 @@
         mCallBack = callback;
 
         setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.set), this);
-        setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel),  (OnClickListener) null);
+        setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(android.R.string.cancel),  (OnClickListener) null);
         setIcon(R.drawable.alert_dialog_icon);
 
         LayoutInflater inflater =