diff --git a/.gitupstream b/.gitupstream
new file mode 100644
index 0000000..531f762
--- /dev/null
+++ b/.gitupstream
@@ -0,0 +1 @@
+https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/fm-commonsys
diff --git a/fm_hci/Android.bp b/fm_hci/Android.bp
deleted file mode 100644
index 764b6c4..0000000
--- a/fm_hci/Android.bp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-cc_library_shared {
-    name: "libfm-hci",
-
-    srcs: ["fm_hci.cpp"],
-
-    shared_libs: [
-        "libdl",
-        "libcutils",
-        "libbase",
-        "libhidlbase",
-        "liblog",
-        "libutils",
-        "vendor.qti.hardware.fm@1.0",
-    ],
-
-    cflags: ["-Wno-unused-parameter"],
-
-    include_dirs: [
-        "vendor/qcom/opensource/commonsys/fm/helium",
-    ],
-
-    system_ext_specific: true,
-
-}
diff --git a/fm_hci/fm_hci.c b/fm_hci/fm_hci.c
new file mode 100644
index 0000000..ff932b9
--- /dev/null
+++ b/fm_hci/fm_hci.c
@@ -0,0 +1,808 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#define LOG_TAG "fm_hci_helium"
+
+#include <assert.h>
+#include <utils/Log.h>
+
+#include "bt_hci_bdroid.h"
+#include "bt_vendor_lib.h"
+#include "userial.h"
+#include "fm_hci.h"
+#include "wcnss_hci.h"
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <cutils/sockets.h>
+#include <pthread.h>
+#include <sys/select.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include <cutils/properties.h>
+#include <signal.h>
+
+static int fm_hal_fd =0;
+
+#define FM_VND_SERVICE_START "wc_transport.start_fmhci"
+#define WAIT_TIMEOUT 200000 /* 200*1000us */
+
+static void fm_hci_exit(void *arg);
+static int power(struct fm_hci_t *hci, fm_power_state_t state);
+
+static void event_notification(struct fm_hci_t *hci, uint16_t event)
+{
+    pthread_mutex_lock(&hci->event_lock);
+    ALOGI("%s: Notifying worker thread with event: %d", __func__, event);
+    ready_events |= event;
+    pthread_cond_broadcast(&hci->event_cond);
+    pthread_mutex_unlock(&hci->event_lock);
+}
+
+static void rx_thread_exit_handler(int sig)
+{
+    ALOGD("%s: sig = 0x%x", __func__, sig);
+    if (sig == SIGUSR1) {
+    ALOGE("Got the signal.. exiting");
+    pthread_exit(NULL);
+    }
+}
+
+static int vendor_init(struct fm_hci_t *hci)
+{
+    void *dlhandle = hci->dlhandle = NULL;
+    unsigned char bdaddr[] = {0xaa, 0xbb, 0xcc, 0x11, 0x22, 0x33};
+
+    dlhandle = dlopen("libbt-vendor.so", RTLD_NOW);
+    if (!dlhandle) {
+        ALOGE("!!! Failed to load libbt-vendor.so !!!");
+        goto err;
+    }
+
+    hci->vendor = (bt_vendor_interface_t *) dlsym(dlhandle, "BLUETOOTH_VENDOR_LIB_INTERFACE");
+    if (!hci->vendor) {
+        ALOGE("!!! Failed to get bt vendor interface !!!");
+        goto err;
+    }
+
+    ALOGI("FM-HCI: Registering the WCNSS HAL library by passing CBs and BD addr.");
+    if (hci->vendor->init(&fm_vendor_callbacks, bdaddr) !=
+                FM_HC_STATUS_SUCCESS) {
+        ALOGE("FM vendor interface init failed");
+        goto err;
+    }
+
+    return FM_HC_STATUS_SUCCESS;
+
+err:
+    return FM_HC_STATUS_FAIL;
+}
+
+static void vendor_close(struct fm_hci_t *hci)
+{
+    void *dlhandle = hci->dlhandle;
+
+    if (hci->vendor)
+        hci->vendor->cleanup();
+    if (dlhandle) {
+        dlclose(dlhandle);
+        dlhandle = NULL;
+    }
+    hci->vendor = NULL;
+}
+
+/* De-queues the FM CMD from the struct transmit_queue_t */
+static void dequeue_fm_tx_cmd(struct fm_hci_t *hci)
+{
+    struct transmit_queue_t *temp;
+    uint16_t count = 0, len = 0;
+
+    ALOGD("%s", __func__);
+    while (1) {
+        pthread_mutex_lock(&hci->tx_q_lock);
+        temp = hci->first;
+        if (!temp) {
+            ALOGI("No FM CMD available in the Queue\n");
+            pthread_mutex_unlock(&hci->tx_q_lock);
+            return;
+        } else {
+            hci->first = temp->next;
+        }
+        pthread_mutex_unlock(&hci->tx_q_lock);
+
+        pthread_mutex_lock(&hci->credit_lock);
+wait_for_cmd_credits:
+        while (hci->command_credits == 0) {
+              pthread_cond_wait(&hci->cmd_credits_cond, &hci->credit_lock);
+        }
+
+        /* Check if we really got the command credits */
+        if (hci->command_credits) {
+
+            len = sizeof(struct fm_command_header_t) + temp->hdr->len;
+again:
+            /* Use socket 'fd' to send the command down to WCNSS Filter */
+            count = write(hci->fd, (uint8_t *)temp->hdr + count, len);
+
+            if (count < len) {
+                len -= count;
+                goto again;
+            }
+            count = 0;
+
+            /* Decrement cmd credits by '1' after sending the cmd*/
+            hci->command_credits--;
+            if (temp->hdr)
+                free(temp->hdr);
+            free(temp);
+        } else {
+            if (!lib_running) {
+                pthread_mutex_unlock(&hci->credit_lock);
+                break;
+            }
+            goto wait_for_cmd_credits;
+        }
+        pthread_mutex_unlock(&hci->credit_lock);
+    }
+}
+
+static int read_fm_event(struct fm_hci_t *hci, struct fm_event_header_t *pbuf, int len)
+{
+    fd_set readFds;
+    sigset_t sigmask, emptymask;
+    int n = 0, ret = -1, evt_len = -1,status=0;
+    volatile int fd = hci->fd;
+    struct sigaction action;
+
+    sigemptyset(&sigmask);
+    sigaddset(&sigmask, SIGUSR1);
+    if (sigprocmask(SIG_BLOCK, &sigmask, NULL) == -1) {
+    ALOGE("failed to sigprocmask");
+    }
+    memset(&action, 0, sizeof(struct sigaction));
+    sigemptyset(&action.sa_mask);
+    action.sa_flags = 0;
+    action.sa_handler = rx_thread_exit_handler;
+
+    sigemptyset(&emptymask);
+
+    if (sigaction(SIGUSR1, &action, NULL) < 0) {
+    ALOGE("%s:sigaction failed", __func__);
+    }
+
+    while (lib_running)
+    {
+        FD_ZERO(&readFds);
+        FD_SET(fd, &readFds);
+
+        ALOGV("%s: Waiting for events from WCNSS FILTER...\n", __func__);
+
+        /* Wait for event/data from WCNSS Filter */
+        n = pselect(fd+1, &readFds, NULL, NULL, NULL, &emptymask);
+        if (n > 0)
+        {
+            /* Check if event is available or not */
+            if (FD_ISSET(fd, &readFds)) {
+                ret = read(fd, (uint8_t *)pbuf, (size_t)(sizeof(struct fm_event_header_t) + MAX_FM_EVT_PARAMS));
+                if (0 == ret) {
+                    ALOGV("%s: read() returned '0' bytes\n", __func__);
+                    break;
+                }
+                else {
+                    ALOGV("%s: read() returned %d bytes of FM event/data\n", __func__, ret);
+                    while (ret > 0) {
+                        pthread_mutex_lock(&hci->credit_lock);
+                        if (pbuf->evt_code == FM_CMD_COMPLETE) {
+                            hci->command_credits = pbuf->params[0];
+                            pthread_cond_signal(&hci->cmd_credits_cond);
+                        } else if (pbuf->evt_code == FM_CMD_STATUS) {
+                            hci->command_credits = pbuf->params[1];
+                            pthread_cond_signal(&hci->cmd_credits_cond);
+                        } else if (pbuf->evt_code == FM_HW_ERR_EVENT) {
+                              ALOGI("%s: FM H/w Err Event Recvd. Event Code: 0x%2x", __func__, pbuf->evt_code);
+                         /*  remove until support added */
+                              //hci->vendor->ssr_cleanup(0x22);
+                              status  = power(hci, FM_RADIO_DISABLE);
+                              if (status < 0) {
+                                 ALOGE("power off fm radio failed during SSR ");
+                              }
+                        } else {
+                            ALOGE("%s: Not CS/CC Event: Recvd. Event Code: 0x%2x", __func__, pbuf->evt_code);
+                        }
+                        pthread_mutex_unlock(&hci->credit_lock);
+
+                        evt_len = pbuf->evt_len;
+
+                        /* Notify 'hci_tx_thread' about availability of event or data */
+                        ALOGI("%s: \nNotifying 'hci_tx_thread' availability of FM event or data...\n", __func__);
+                        event_notification(hci, HC_EVENT_RX);
+
+                        if (hci->cb && hci->cb->process_event)
+                            hci->cb->process_event((uint8_t *)pbuf);
+                        else
+                            ALOGE("%s: ASSERT $$$$$$ Callback function NULL $$$$$", __func__);
+
+                        ret = ret - (evt_len + 3);
+                        ALOGD("%s: Length of available bytes @ HCI Layer: %d", __func__, ret);
+                        if (ret > 0) {
+                            ALOGE("%s: Remaining bytes of event/data: %d", __func__, ret);
+                            pbuf = (struct fm_event_header_t *)&pbuf->params[evt_len];
+                        }
+                    }
+                } //end of processing the event
+
+            } else
+                ALOGV("%s: No data available, though select returned!!!\n", __func__);
+        }
+        else if (n < 0) {
+           ALOGE("%s: select() failed with return value: %d", __func__, ret);
+           lib_running =0;
+        }
+        else if (n == 0)
+            ALOGE("%s: select() timeout!!!", __func__);
+    }
+
+    return ret;
+}
+
+static void *hci_read_thread(void *arg)
+{
+    int length = 0;
+    struct fm_hci_t *hci = (struct fm_hci_t *)arg;
+
+    struct fm_event_header_t *evt_buf = (struct fm_event_header_t *) malloc(sizeof(struct fm_event_header_t) + MAX_FM_EVT_PARAMS);
+
+    if (!evt_buf) {
+        ALOGE("%s: Memory allocation failed for evt_buf", __func__);
+        goto cleanup;
+    }
+
+    length = read_fm_event(hci, evt_buf, sizeof(struct fm_event_header_t) + MAX_FM_EVT_PARAMS);
+    ALOGD("length=%d\n",length);
+    if(length <=0) {
+       lib_running =0;
+    }
+    goto exit;
+
+cleanup:
+    lib_running = 0;
+    hci = NULL;
+
+exit:
+    ALOGV("%s: Leaving hci_read_thread()", __func__);
+    if (evt_buf)
+        free(evt_buf);
+    pthread_exit(NULL);
+    return arg;
+}
+
+int connect_to_local_fmsocket(char* name) {
+       socklen_t len; int sk = -1;
+
+       ALOGE("%s: ACCEPT ", __func__);
+       sk  = socket(AF_LOCAL, SOCK_STREAM, 0);
+       if (sk < 0) {
+           ALOGE("Socket creation failure");
+           return -1;
+       }
+
+        if(socket_local_client_connect(sk, name,
+            ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM) < 0)
+        {
+             ALOGE("failed to connect (%s)", strerror(errno));
+             close(sk);
+             sk = -1;
+        } else {
+             ALOGE("%s: Connection succeeded\n", __func__);
+        }
+        return sk;
+}
+
+/*
+ * Reads the FM-CMDs from the struct transmit_queue_t and sends it down to WCNSS Filter
+ * Reads events sent by the WCNSS Filter and copies onto RX_Q
+ */
+static void* hci_tx_thread(void *arg)
+{
+    uint16_t events;
+    struct fm_hci_t *hci = (struct fm_hci_t *)arg;
+
+    while (lib_running) {
+        pthread_mutex_lock(&hci->event_lock);
+        if (!(ready_events & HC_EVENT_TX))
+            pthread_cond_wait(&hci->event_cond, &hci->event_lock);
+        ALOGE("%s: ready_events= %d", __func__, ready_events);
+        events = ready_events;
+        if (ready_events & HC_EVENT_TX)
+            ready_events &= (~HC_EVENT_TX);
+        if (ready_events & HC_EVENT_RX)
+            ready_events &= (~HC_EVENT_RX);
+        pthread_mutex_unlock(&hci->event_lock);
+
+        if (events & HC_EVENT_TX) {
+            dequeue_fm_tx_cmd(hci);
+        }
+        if (events & HC_EVENT_RX) {
+             ALOGI("\n##### FM-HCI Task : EVENT_RX available #####\n");
+        }
+        if (events & HC_EVENT_EXIT) {
+            ALOGE("GOT HC_EVENT_EXIT.. exiting");
+            break;
+        }
+    }
+
+    ALOGV("%s: ##### Exiting hci_tx_thread Worker thread!!! #####", __func__);
+    return NULL;
+}
+
+void stop_fmhal_service() {
+       char value[PROPERTY_VALUE_MAX] = {'\0'};
+       ALOGI("%s: Entry ", __func__);
+       property_get(FM_VND_SERVICE_START, value, "false");
+       if (strcmp(value, "false") == 0) {
+           ALOGI("%s: fmhal service  has been stopped already", __func__);
+//         return;
+       }
+       close(fm_hal_fd);
+       fm_hal_fd = -1;
+       property_set(FM_VND_SERVICE_START, "false");
+       property_set("wc_transport.fm_service_status", "0");
+       ALOGI("%s: Exit ", __func__);
+}
+
+void start_fmhal_service() {
+       ALOGI("%s: Entry ", __func__);
+       int i, init_success = 0;
+       char value[PROPERTY_VALUE_MAX] = {'\0'};
+
+       property_get(FM_VND_SERVICE_START, value, false);
+
+       if (strcmp(value, "true") == 0) {
+           ALOGI("%s: hci_filter has been started already", __func__);
+           return;
+       }
+  //     property_set("wc_transport.fm_service_status", "0");
+       usleep(100 * 1000);	// 100 msecs
+       property_set(FM_VND_SERVICE_START, "true");
+       ALOGI("%s: %s set to true ", __func__, FM_VND_SERVICE_START );
+       for(i=0; i<45; i++) {
+          property_get("wc_transport.fm_service_status", value, "0");
+          if (strcmp(value, "1") == 0) {
+               ALOGI("%s: wc_transport.fm_service_status set to %s", __func__,value);
+               init_success = 1;
+               break;
+           } else {
+               usleep(WAIT_TIMEOUT);
+           }
+        }
+        ALOGI("start_fmhal_service status:%d after %f seconds \n", init_success, 0.2*i);
+
+        ALOGI("%s: Exit ", __func__);
+}
+
+static int start_tx_thread(struct fm_hci_t *hci)
+{
+    struct sched_param param;
+    int policy, result;
+
+    ALOGI("FM-HCI: Creating the FM-HCI TASK...");
+    if (pthread_create(&hci->tx_thread, NULL, hci_tx_thread, hci) != 0)
+    {
+        ALOGE("pthread_create failed!");
+        lib_running = 0;
+        return FM_HC_STATUS_FAIL;
+    }
+
+    if(pthread_getschedparam(hci->tx_thread, &policy, &param)==0)
+    {
+        policy = SCHED_NORMAL;
+#if (BTHC_LINUX_BASE_POLICY!=SCHED_NORMAL)
+        param.sched_priority = BTHC_MAIN_THREAD_PRIORITY;
+#endif
+        result = pthread_setschedparam(hci->tx_thread, policy, &param);
+        if (result != 0)
+        {
+            ALOGW("libbt-hci init: pthread_setschedparam failed (%d)", \
+                  result);
+        }
+    } else
+        ALOGI("FM-HCI: Failed to get the Scheduling parameters!!!");
+
+    return FM_HC_STATUS_SUCCESS;
+}
+
+static void stop_tx_thread(struct fm_hci_t *hci)
+{
+    int ret;
+
+    ALOGV("%s++", __func__);
+    if ((ret = pthread_kill(hci->tx_thread, SIGUSR1))
+            == FM_HC_STATUS_SUCCESS) {
+        ALOGE("%s:pthread_join", __func__);
+         if ((ret = pthread_join(hci->tx_thread, NULL)) != FM_HC_STATUS_SUCCESS)
+             ALOGE("Error joining tx thread, error = %d (%s)",
+                     ret, strerror(ret));
+    } else {
+        ALOGE("Error killing tx thread, error = %d (%s)",
+                ret, strerror(ret));
+    }
+}
+
+static void *hci_mon_thread(void *arg)
+{
+    struct fm_hci_t *hci = (struct fm_hci_t *)arg;
+    uint16_t events;
+    ALOGV("%s", __func__);
+
+    while (lib_running) {
+        pthread_mutex_lock(&hci->event_lock);
+        if (!(ready_events & HC_EVENT_EXIT))
+            pthread_cond_wait(&hci->event_cond, &hci->event_lock);
+        events = ready_events;
+        if (ready_events & HC_EVENT_EXIT)
+            ready_events &= (~HC_EVENT_EXIT);
+        pthread_mutex_unlock(&hci->event_lock);
+
+        ALOGD("events = 0x%x", events);
+        if (events & HC_EVENT_EXIT) {
+            ALOGD("Got Exit event.. Exiting HCI");
+            fm_hci_exit(hci);
+            break;
+        }
+    }
+    ALOGV("%s--", __func__);
+    return NULL;
+}
+
+static int start_mon_thread(struct fm_hci_t *hci)
+{
+    int ret = FM_HC_STATUS_SUCCESS;
+    ALOGD("%s", __func__);
+    if ((ret = pthread_create(&hci->mon_thread, NULL,
+                    hci_mon_thread, hci)) !=0) {
+        ALOGE("pthread_create failed! status = %d (%s)",
+                ret, strerror(ret));
+        lib_running = 0;
+    }
+    return ret;
+}
+
+static void stop_mon_thread(struct fm_hci_t *hci)
+{
+    int ret;
+    ALOGV("%s++", __func__);
+    if ((ret = pthread_kill(hci->mon_thread, SIGUSR1))
+            == FM_HC_STATUS_SUCCESS) {
+        ALOGE("%s:pthread_join", __func__);
+        if ((ret = pthread_join(hci->mon_thread, NULL)) != FM_HC_STATUS_SUCCESS)
+            ALOGE("Error joining mon thread, error = %d (%s)",
+                    ret, strerror(ret));
+    } else {
+        ALOGE("Error killing mon thread, error = %d (%s)",
+                ret, strerror(ret));
+    }
+}
+
+static int start_rx_thread(struct fm_hci_t *hci)
+{
+    int ret = FM_HC_STATUS_SUCCESS;
+    ALOGV("%s++", __func__);
+
+    ALOGD("%s: Starting the userial read thread....", __func__);
+    if ((ret = pthread_create(&hci->rx_thread, NULL, \
+                       hci_read_thread, hci)) != 0) {
+        ALOGE("pthread_create failed! status = %d (%s)",
+                ret, strerror(ret));
+        lib_running = 0;
+    }
+    return ret;
+}
+
+static void stop_rx_thread(struct fm_hci_t *hci)
+{
+    int ret;
+    ALOGV("%s++", __func__);
+    if ((ret = pthread_kill(hci->rx_thread, SIGUSR1))
+            == FM_HC_STATUS_SUCCESS) {
+        ALOGE("%s:pthread_join", __func__);
+        if ((ret = pthread_join(hci->rx_thread, NULL)) != FM_HC_STATUS_SUCCESS)
+            ALOGE("Error joining rx thread, error = %d (%s)",
+                    ret, strerror(ret));
+    } else {
+        ALOGE("Error killing rx thread, error = %d (%s)",
+                ret, strerror(ret));
+    }
+}
+
+static int power(struct fm_hci_t *hci, fm_power_state_t state)
+{
+        int i,opcode,ret;
+        int init_success = 0;
+        char value[PROPERTY_VALUE_MAX] = {'\0'};
+        if (fm_hal_fd)
+        {
+            if (state)
+                opcode = 2;
+            else {
+                opcode = 1;
+            }
+            ALOGI("%s:opcode: %x", LOG_TAG, opcode);
+            ret = write(fm_hal_fd,&opcode, 1);
+            if (ret < 0) {
+                ALOGE("failed to write fm hal socket");
+            } else {
+                ret = FM_HC_STATUS_SUCCESS;
+            }
+        } else {
+            ALOGE("Connect to socket failed ..");
+            ret = -1;
+        }
+        if (state == FM_RADIO_DISABLE) {
+            for (i=0; i<10; i++) {
+                property_get("wc_transport.fm_power_status", value, "0");
+                if (strcmp(value, "0") == 0) {
+                    init_success = 1;
+                    break;
+                } else {
+                    usleep(WAIT_TIMEOUT);
+                }
+            }
+            ALOGI("fm power OFF status:%d after %f seconds \n", init_success, 0.2*i);
+            stop_fmhal_service();
+        }
+        if (state == FM_RADIO_ENABLE) {
+            for (i=0; i<10; i++) {
+                property_get("wc_transport.fm_power_status", value, "0");
+                if (strcmp(value, "1") == 0) {
+                    init_success = 1;
+                    break;
+                } else {
+                    usleep(WAIT_TIMEOUT);
+                }
+            }
+            ALOGI("fm power ON status:%d after %f seconds \n", init_success, 0.2*i);
+        }
+        return ret;
+}
+
+#define CH_MAX 3
+static int serial_port_init(struct fm_hci_t *hci)
+{
+    int i, ret;
+    int fd_array[CH_MAX];
+
+    for (int i = 0; i < CH_MAX; i++)
+        fd_array[i] = -1;
+
+    ALOGI("%s: Opening the TTy Serial port...", __func__);
+    ret = hci->vendor->op(BT_VND_OP_FM_USERIAL_OPEN, &fd_array);
+
+    if (fd_array[0] == -1) {
+        ALOGE("%s unable to open TTY serial port", __func__);
+        goto err;
+    }
+    hci->fd = fd_array[0];
+
+    return FM_HC_STATUS_SUCCESS;
+
+err:
+    return FM_HC_STATUS_FAIL;
+}
+
+static void serial_port_close(struct fm_hci_t *hci)
+{
+    //TODO: what if hci/fm_vnd_if is null.. need to take lock and check
+    ALOGI("%s: Closing the TTy Serial port!!!", __func__);
+    hci->vendor->op(BT_VND_OP_FM_USERIAL_CLOSE, NULL);
+    hci->fd = -1;
+}
+
+static int enqueue_fm_tx_cmd(struct fm_hci_t *hci, struct fm_command_header_t *pbuf)
+{
+    struct transmit_queue_t *element =  (struct transmit_queue_t *) malloc(sizeof(struct transmit_queue_t));
+
+    if (!element) {
+        ALOGI("Failed to allocate memory for element!!\n");
+        return FM_HC_STATUS_NOMEM;
+    }
+    element->hdr = pbuf;
+    element->next = NULL;
+
+    pthread_mutex_lock(&hci->tx_q_lock);
+
+    if (!hci->first) {
+        hci->last = hci->first = element;
+    } else {
+        hci->last->next = element;
+        hci->last = element;
+    }
+    ALOGI("%s: FM-CMD ENQUEUED SUCCESSFULLY", __func__);
+
+    pthread_mutex_unlock(&hci->tx_q_lock);
+
+    return FM_HC_STATUS_SUCCESS;
+}
+
+int fm_hci_transmit(void *hci, struct fm_command_header_t *buf)
+{
+    int status = FM_HC_STATUS_FAIL;
+
+    if (!hci || !buf) {
+        ALOGE("NULL input arguments");
+        return FM_HC_STATUS_NULL_POINTER;
+    }
+
+    if ((status = enqueue_fm_tx_cmd((struct fm_hci_t *)hci, buf))
+            == FM_HC_STATUS_SUCCESS)
+        event_notification(hci, HC_EVENT_TX);
+
+    return status;
+}
+
+void fm_hci_close(void *arg) {
+
+    ALOGV("%s  close fm userial ", __func__);
+
+    struct fm_hci_t *hci = (struct fm_hci_t *)arg;
+    if (!hci) {
+        ALOGE("NULL arguments");
+        return;
+    }
+    event_notification(hci, HC_EVENT_EXIT);
+    pthread_mutex_lock(&hci->event_lock);
+again:
+    pthread_cond_wait(&hci->event_cond, &hci->event_lock);
+    if (!(ready_events & HC_EVENT_EXIT_DONE))
+        goto again;
+    pthread_mutex_unlock(&hci->event_lock);
+}
+
+int fm_hci_init(fm_hci_hal_t *hci_hal)
+{
+    int ret = FM_HC_STATUS_FAIL;
+    struct fm_hci_t *hci = NULL;
+    ALOGV("++%s", __func__);
+
+    if (!hci_hal || !hci_hal->hal) {
+        ALOGE("NULL input argument");
+        return FM_HC_STATUS_NULL_POINTER;
+    }
+
+    hci = malloc(sizeof(struct fm_hci_t));
+    if (!hci) {
+        ALOGE("Failed to malloc hci context");
+        return FM_HC_STATUS_NOMEM;
+    }
+    memset(hci, 0, sizeof(struct fm_hci_t));
+
+    pthread_mutex_init(&hci->tx_q_lock, NULL);
+    pthread_mutex_init(&hci->credit_lock, NULL);
+    pthread_mutex_init(&hci->event_lock, NULL);
+
+    pthread_cond_init(&hci->event_cond, NULL);
+    pthread_cond_init(&hci->cmd_credits_cond, NULL);
+
+    start_fmhal_service();
+    fm_hal_fd = connect_to_local_fmsocket("fmhal_sock");
+    if (fm_hal_fd == -1) {
+        ALOGI("FM hal service socket connect failed..");
+        goto err_socket;
+    }
+    ALOGI("fm_hal_fd = %d", fm_hal_fd);
+
+    lib_running = 1;
+    ready_events = 0;
+    hci->command_credits = 1;
+    hci->fd = -1;
+
+    ret = vendor_init(hci);
+    if (ret)
+        goto err_vendor;
+    ret = power(hci, FM_RADIO_ENABLE);
+    if (ret)
+        goto err_power;
+    ret = serial_port_init(hci);
+    if (ret)
+        goto err_serial;
+    ret = start_mon_thread(hci);
+    if (ret)
+        goto err_thread_mon;
+    ret = start_tx_thread(hci);
+    if (ret)
+        goto err_thread_tx;
+    ret = start_rx_thread(hci);
+    if (ret)
+        goto err_thread_rx;
+
+    hci->cb = hci_hal->cb;
+    hci->private_data = hci_hal->hal;
+    hci_hal->hci = hci;
+    ALOGD("--%s success", __func__);
+    return FM_HC_STATUS_SUCCESS;
+
+err_thread_rx:
+    stop_rx_thread(hci);
+err_thread_tx:
+    stop_tx_thread(hci);
+err_thread_mon:
+    stop_mon_thread(hci);
+err_serial:
+    serial_port_close(hci);
+err_power:
+    power(hci, FM_RADIO_DISABLE);
+err_vendor:
+    vendor_close(hci);
+err_socket:
+    stop_fmhal_service();
+
+    pthread_mutex_destroy(&hci->tx_q_lock);
+    pthread_mutex_destroy(&hci->credit_lock);
+    pthread_mutex_destroy(&hci->event_lock);
+    pthread_cond_destroy(&hci->event_cond);
+    pthread_cond_destroy(&hci->cmd_credits_cond);
+
+    lib_running = 0;
+    ready_events = 0;
+    hci->command_credits = 0;
+    free(hci);
+
+    ALOGE("--%s fail", __func__);
+    return ret;
+}
+
+static void fm_hci_exit(void *arg)
+{
+    struct fm_hci_t *hci = (struct fm_hci_t *)arg;
+    ALOGE("%s", __func__);
+
+    lib_running = 0;
+    ready_events = HC_EVENT_EXIT;
+    hci->command_credits = 0;
+    serial_port_close(hci);
+    power(hci, FM_RADIO_DISABLE);//need to address this
+    vendor_close(hci);
+    pthread_cond_broadcast(&hci->event_cond);
+    pthread_cond_broadcast(&hci->cmd_credits_cond);
+    event_notification(hci, HC_EVENT_EXIT_DONE);
+    stop_rx_thread(hci);
+    stop_tx_thread(hci);
+    ALOGD("Tx, Rx Threads join done");
+    pthread_mutex_destroy(&hci->tx_q_lock);
+    pthread_mutex_destroy(&hci->credit_lock);
+    pthread_mutex_destroy(&hci->event_lock);
+    pthread_cond_destroy(&hci->event_cond);
+    pthread_cond_destroy(&hci->cmd_credits_cond);
+
+    free(hci);
+    hci = NULL;
+}
+
diff --git a/fm_hci/fm_hci.cpp b/fm_hci/fm_hci.cpp
index c08b884..550b8dd 100644
--- a/fm_hci/fm_hci.cpp
+++ b/fm_hci/fm_hci.cpp
@@ -60,7 +60,6 @@
 using ::android::hardware::Return;
 using ::android::hardware::Void;
 using ::android::hardware::hidl_vec;
-using ::android::hardware::hidl_death_recipient;
 
 static struct fm_hci_t hci;
 
@@ -82,31 +81,6 @@
 static bool hci_initialize();
 static void hci_transmit(struct fm_command_header_t *hdr);
 static void hci_close();
-#define HCI_EV_HW_ERR_EVENT             0x1A
-
-void hal_service_died() {
-    struct fm_event_header_t *temp = (struct fm_event_header_t *)
-                       malloc(sizeof(struct fm_event_header_t));
-    if (temp != nullptr) {
-        temp->evt_code = HCI_EV_HW_ERR_EVENT;
-        temp->evt_len = 0;
-        ALOGI("%s: evt_code:  0x%x", __func__, temp->evt_code);
-        enqueue_fm_rx_event(temp);
-    } else {
-        ALOGE("%s: Memory Allocation failed for event buffer ",__func__);
-    }
-}
-
-class FmHciDeathRecipient : public hidl_death_recipient {
-    public:
-       virtual void serviceDied(uint64_t /*cookie*/,
-           const android::wp<::android::hidl::base::V1_0::IBase>& /*who*/) {
-       ALOGE("Fm HAL service died!");
-       hal_service_died();
-   }
-};
-
-android::sp<FmHciDeathRecipient> fmHciDeathRecipient = new FmHciDeathRecipient();
 
 /*******************************************************************************
 **
@@ -511,7 +485,6 @@
     int ret;
     ALOGI("++%s: is_hci_initialize: %d", __func__, is_hci_initialize);
 
-    hci.on_mtx.lock();
     while (is_hci_initialize) {
         ret = start_tx_thread();
         if (ret)
@@ -534,7 +507,6 @@
     }
 
     hci.on_cond.notify_all();
-    hci.on_mtx.unlock();
     ALOGI("--%s: is_hci_initialize: %d", __func__, is_hci_initialize);
 
 }
@@ -602,6 +574,8 @@
     ALOGI("%s: acquiring mutex", __func__);
     std::lock_guard<std::recursive_mutex> lk(mtx);
 
+    fmHci = IFmHci::getService();
+
     if (fmHci != nullptr) {
         hci.state = FM_RADIO_ENABLING;
         android::sp<IFmHciCallbacks> callbacks = new FmHciCallbacks();
@@ -666,10 +640,6 @@
     std::lock_guard<std::recursive_mutex> lk(mtx);
 
     if (fmHci != nullptr) {
-        auto death_unlink = fmHci->unlinkToDeath(fmHciDeathRecipient);
-        if (!death_unlink.isOk()) {
-            ALOGE( "%s: Error unlinking death recipient from the Fm HAL", __func__);
-        }
         auto hidl_daemon_status = fmHci->close();
         if(!hidl_daemon_status.isOk()) {
             ALOGE("%s: HIDL daemon is dead", __func__);
@@ -730,10 +700,10 @@
 
     if (hci_initialize()) {
         //wait for iniialization complete
-        Lock lk(hci.on_mtx);
+        ALOGD("--%s waiting for iniialization complete hci state: %d ",
+                __func__, hci.state);
         if(hci.state == FM_RADIO_ENABLING){
-            ALOGD("--%s waiting for iniialization complete hci state: %d ",
-                    __func__, hci.state);
+            Lock lk(hci.on_mtx);
             std::cv_status status = std::cv_status::no_timeout;
             auto now = std::chrono::system_clock::now();
             status =
@@ -744,7 +714,6 @@
                  kill(getpid(), SIGKILL);
              }
         }
-        hci.on_mtx.unlock();
     }
 
     if (hci.state == FM_RADIO_ENABLED) {
diff --git a/fm_hci/wcnss_hci.h b/fm_hci/wcnss_hci.h
new file mode 100644
index 0000000..95fa9c1
--- /dev/null
+++ b/fm_hci/wcnss_hci.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+#ifndef __WCNSS_HCI__
+#define __WCNSS_HCI__
+static void vendor_fwcfg_cb(bt_vendor_op_result_t result) {
+}
+
+static void vendor_scocfg_cb(bt_vendor_op_result_t result) {
+}
+
+static void vendor_lpm_vnd_cb(bt_vendor_op_result_t result) {
+}
+
+static void sco_audiostate_cb(bt_vendor_op_result_t result) {
+}
+
+static void* vendor_alloc(int size) {
+    return NULL;
+}
+
+static void vendor_dealloc(void *p_buf) {
+}
+
+static uint8_t vendor_xmit_cb(uint16_t opcode, void *p_buf, tINT_CMD_CBACK p_cback) {
+    return 0;
+}
+
+static void vendor_epilog_cb(bt_vendor_op_result_t result) {
+}
+
+
+static const bt_vendor_callbacks_t fm_vendor_callbacks = {
+  sizeof(fm_vendor_callbacks),
+   vendor_fwcfg_cb,
+   vendor_scocfg_cb,
+   vendor_lpm_vnd_cb,
+   sco_audiostate_cb,
+   vendor_alloc,
+   vendor_dealloc,
+   vendor_xmit_cb,
+   vendor_epilog_cb
+};
+#endif
diff --git a/fmapp2/Android.bp b/fmapp2/Android.bp
index a2ef6ab..518e3e6 100755
--- a/fmapp2/Android.bp
+++ b/fmapp2/Android.bp
@@ -3,11 +3,12 @@
 android_app {
     name: "FM2",
 
-    srcs: ["src/com/caf/fmradio/CommaSeparatedFreqFileReader.java"] + ["src/com/caf/fmradio/FMAdapterApp.java"] + ["src/com/caf/fmradio/FMMediaButtonIntentReceiver.java"] + ["src/com/caf/fmradio/FMRadio.java"] + ["src/com/caf/fmradio/FMRadioService.java"] + ["src/com/caf/fmradio/FmSharedPreferences.java"] + ["src/com/caf/fmradio/FMStats.java"] + ["src/com/caf/fmradio/FmTags.java"] + ["src/com/caf/fmradio/GetNextFreqInterface.java"] + ["src/com/caf/fmradio/HorizontalNumberPicker.java"] + ["src/com/caf/fmradio/PresetList.java"] + ["src/com/caf/fmradio/PresetStation.java"] + ["src/com/caf/fmradio/Settings.java"] + ["src/com/caf/fmradio/StationListActivity.java"] + ["src/com/caf/fmradio/IFMRadioService.aidl"] + ["src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl"] + ["src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl"] + ["src/com/caf/hc_utils/**/*.java"],
+    srcs: ["src/com/caf/fmradio/CommaSeparatedFreqFileReader.java"] + ["src/com/caf/fmradio/FMAdapterApp.java"] + ["src/com/caf/fmradio/FMMediaButtonIntentReceiver.java"] + ["src/com/caf/fmradio/FMRadio.java"] + ["src/com/caf/fmradio/FMRadioService.java"] + ["src/com/caf/fmradio/FmSharedPreferences.java"] + ["src/com/caf/fmradio/FMStats.java"] + ["src/com/caf/fmradio/FmTags.java"] + ["src/com/caf/fmradio/GetNextFreqInterface.java"] + ["src/com/caf/fmradio/HorizontalNumberPicker.java"] + ["src/com/caf/fmradio/PresetList.java"] + ["src/com/caf/fmradio/PresetStation.java"] + ["src/com/caf/fmradio/Settings.java"] + ["src/com/caf/fmradio/StationListActivity.java"] + ["src/com/caf/fmradio/IFMRadioService.aidl"] + ["src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl"] + ["src/com/caf/hc_utils/**/*.java"],
     certificate: "platform",
     jni_libs: ["libqcomfm_jni"],
     libs: ["qcom.fmradio"],
     platform_apis: true,
     aaptflags: ["--legacy"],
     system_ext_specific: true,
+    required: ["qcom.fmradio.xml"],
 }
diff --git a/fmapp2/AndroidManifest.xml b/fmapp2/AndroidManifest.xml
index fc55149..7df2172 100644
--- a/fmapp2/AndroidManifest.xml
+++ b/fmapp2/AndroidManifest.xml
@@ -54,19 +54,26 @@
     <uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT" />
     <uses-permission android:name="android.permission.CAPTURE_AUDIO_HOTWORD" />
     <uses-permission android:name="android.permission.MANAGE_USERS"/>
+
     <application
         android:requestLegacyExternalStorage="true"
-        android:icon="@drawable/ic_launcher_fmradio"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:allowTaskReparenting="true"
         android:taskAffinity="com.caf.task.fmradio"
+        android:theme="@style/FMTheme"
         android:name=".FMAdapterApp">
-        <activity android:icon="@drawable/ic_launcher_fmradio"
+
+        <uses-library android:name="qcom.fmradio"
+            android:required="true" />
+
+        <activity android:icon="@mipmap/ic_launcher"
             android:name=".FMRadio"
-            android:label="@string/app_name"
             android:clearTaskOnLaunch="true"
+            android:screenOrientation="portrait"
             android:allowTaskReparenting="true"
             android:launchMode="singleTask"
+            android:theme="@style/FMTheme"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:excludeFromRecents="false"
             android:exported="true" >
@@ -92,7 +99,8 @@
 
         <activity android:name=".Settings"
                   android:exported="true"
-                  android:label="@string/settings_menu">
+                  android:theme="@style/FMTheme"
+                  android:label="@string/menu_settings">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -122,7 +130,7 @@
 
        <activity android:name=".StationListActivity"
             android:exported="true"
-            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-hdpi/bg.png b/fmapp2/res/drawable-hdpi/bg.png
deleted file mode 100644
index fd10f0b..0000000
--- a/fmapp2/res/drawable-hdpi/bg.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png
deleted file mode 100644
index 857fb7a..0000000
--- a/fmapp2/res/drawable-hdpi/btn_arrow_left_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png
deleted file mode 100644
index 438e392..0000000
--- a/fmapp2/res/drawable-hdpi/btn_arrow_left_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png b/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png
deleted file mode 100644
index fab8ee4..0000000
--- a/fmapp2/res/drawable-hdpi/btn_arrow_left_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png
deleted file mode 100644
index 547e505..0000000
--- a/fmapp2/res/drawable-hdpi/btn_arrow_right_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png
deleted file mode 100644
index 96eacae..0000000
--- a/fmapp2/res/drawable-hdpi/btn_arrow_right_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png b/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png
deleted file mode 100644
index 67a86f5..0000000
--- a/fmapp2/res/drawable-hdpi/btn_arrow_right_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_btn_earphone_default.png b/fmapp2/res/drawable-hdpi/ic_btn_earphone_default.png
deleted file mode 100644
index 6a5b8db..0000000
--- a/fmapp2/res/drawable-hdpi/ic_btn_earphone_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_btn_earphone_diable.png b/fmapp2/res/drawable-hdpi/ic_btn_earphone_diable.png
deleted file mode 100644
index f32b96e..0000000
--- a/fmapp2/res/drawable-hdpi/ic_btn_earphone_diable.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_btn_earphone_select.png b/fmapp2/res/drawable-hdpi/ic_btn_earphone_select.png
deleted file mode 100644
index 67afd3e..0000000
--- a/fmapp2/res/drawable-hdpi/ic_btn_earphone_select.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_btn_onoff_default.png b/fmapp2/res/drawable-hdpi/ic_btn_onoff_default.png
deleted file mode 100644
index 1c0f511..0000000
--- a/fmapp2/res/drawable-hdpi/ic_btn_onoff_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_btn_onoff_disable.png b/fmapp2/res/drawable-hdpi/ic_btn_onoff_disable.png
deleted file mode 100644
index 12b2d28..0000000
--- a/fmapp2/res/drawable-hdpi/ic_btn_onoff_disable.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_btn_onoff_press.png b/fmapp2/res/drawable-hdpi/ic_btn_onoff_press.png
deleted file mode 100644
index efeebd3..0000000
--- a/fmapp2/res/drawable-hdpi/ic_btn_onoff_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_btn_spaker.png b/fmapp2/res/drawable-hdpi/ic_btn_spaker.png
index f439e2e..07614df 100644
--- a/fmapp2/res/drawable-hdpi/ic_btn_spaker.png
+++ b/fmapp2/res/drawable-hdpi/ic_btn_spaker.png
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_btn_spaker_select.png b/fmapp2/res/drawable-hdpi/ic_btn_spaker_select.png
deleted file mode 100644
index bd5d57b..0000000
--- a/fmapp2/res/drawable-hdpi/ic_btn_spaker_select.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/ic_launcher_fmradio.png b/fmapp2/res/drawable-hdpi/ic_launcher_fmradio.png
deleted file mode 100644
index 4815bce..0000000
--- a/fmapp2/res/drawable-hdpi/ic_launcher_fmradio.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/recorder_stop.png b/fmapp2/res/drawable-hdpi/recorder_stop.png
index bb8b32b..ff9839b 100644
--- a/fmapp2/res/drawable-hdpi/recorder_stop.png
+++ b/fmapp2/res/drawable-hdpi/recorder_stop.png
Binary files differ
diff --git a/fmapp2/res/drawable-hdpi/stat_notify_fm.png b/fmapp2/res/drawable-hdpi/stat_notify_fm.png
old mode 100755
new mode 100644
index d4668a7..ad804c1
--- a/fmapp2/res/drawable-hdpi/stat_notify_fm.png
+++ b/fmapp2/res/drawable-hdpi/stat_notify_fm.png
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/bg.png b/fmapp2/res/drawable-mdpi/bg.png
deleted file mode 100644
index fd10f0b..0000000
--- a/fmapp2/res/drawable-mdpi/bg.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png
deleted file mode 100644
index da077e6..0000000
--- a/fmapp2/res/drawable-mdpi/btn_arrow_left_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png
deleted file mode 100644
index b18c859..0000000
--- a/fmapp2/res/drawable-mdpi/btn_arrow_left_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png b/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png
deleted file mode 100644
index aa5ebe4..0000000
--- a/fmapp2/res/drawable-mdpi/btn_arrow_left_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png
deleted file mode 100644
index 696f53a..0000000
--- a/fmapp2/res/drawable-mdpi/btn_arrow_right_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png
deleted file mode 100644
index 069df33..0000000
--- a/fmapp2/res/drawable-mdpi/btn_arrow_right_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png b/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png
deleted file mode 100644
index d7d797b..0000000
--- a/fmapp2/res/drawable-mdpi/btn_arrow_right_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_btn_earphone_default.png b/fmapp2/res/drawable-mdpi/ic_btn_earphone_default.png
deleted file mode 100644
index c729ed0..0000000
--- a/fmapp2/res/drawable-mdpi/ic_btn_earphone_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_btn_earphone_diable.png b/fmapp2/res/drawable-mdpi/ic_btn_earphone_diable.png
deleted file mode 100644
index c0929ba..0000000
--- a/fmapp2/res/drawable-mdpi/ic_btn_earphone_diable.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_btn_earphone_select.png b/fmapp2/res/drawable-mdpi/ic_btn_earphone_select.png
deleted file mode 100644
index fb51ce1..0000000
--- a/fmapp2/res/drawable-mdpi/ic_btn_earphone_select.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_btn_onoff_default.png b/fmapp2/res/drawable-mdpi/ic_btn_onoff_default.png
deleted file mode 100644
index 9303cfb..0000000
--- a/fmapp2/res/drawable-mdpi/ic_btn_onoff_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_btn_onoff_disable.png b/fmapp2/res/drawable-mdpi/ic_btn_onoff_disable.png
deleted file mode 100644
index 57e060a..0000000
--- a/fmapp2/res/drawable-mdpi/ic_btn_onoff_disable.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_btn_onoff_press.png b/fmapp2/res/drawable-mdpi/ic_btn_onoff_press.png
deleted file mode 100644
index 1228a66..0000000
--- a/fmapp2/res/drawable-mdpi/ic_btn_onoff_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_btn_spaker.png b/fmapp2/res/drawable-mdpi/ic_btn_spaker.png
index b72fab9..82a6d91 100644
--- a/fmapp2/res/drawable-mdpi/ic_btn_spaker.png
+++ b/fmapp2/res/drawable-mdpi/ic_btn_spaker.png
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_btn_spaker_select.png b/fmapp2/res/drawable-mdpi/ic_btn_spaker_select.png
deleted file mode 100644
index 250baea..0000000
--- a/fmapp2/res/drawable-mdpi/ic_btn_spaker_select.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_launcher_fmradio.png b/fmapp2/res/drawable-mdpi/ic_launcher_fmradio.png
deleted file mode 100644
index 3361ad5..0000000
--- a/fmapp2/res/drawable-mdpi/ic_launcher_fmradio.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/recorder_stop.png b/fmapp2/res/drawable-mdpi/recorder_stop.png
index bb8b32b..ff9839b 100644
--- a/fmapp2/res/drawable-mdpi/recorder_stop.png
+++ b/fmapp2/res/drawable-mdpi/recorder_stop.png
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/stat_notify_fm.png b/fmapp2/res/drawable-mdpi/stat_notify_fm.png
old mode 100755
new mode 100644
index 06c82f3..331abff
--- a/fmapp2/res/drawable-mdpi/stat_notify_fm.png
+++ b/fmapp2/res/drawable-mdpi/stat_notify_fm.png
Binary files differ
diff --git a/fmapp2/res/drawable-xhdpi/ic_btn_spaker.png b/fmapp2/res/drawable-xhdpi/ic_btn_spaker.png
new file mode 100644
index 0000000..e51c03d
--- /dev/null
+++ b/fmapp2/res/drawable-xhdpi/ic_btn_spaker.png
Binary files differ
diff --git a/fmapp2/res/drawable-xhdpi/stat_notify_fm.png b/fmapp2/res/drawable-xhdpi/stat_notify_fm.png
new file mode 100644
index 0000000..51fbe01
--- /dev/null
+++ b/fmapp2/res/drawable-xhdpi/stat_notify_fm.png
Binary files differ
diff --git a/fmapp2/res/drawable-xxhdpi/ic_btn_spaker.png b/fmapp2/res/drawable-xxhdpi/ic_btn_spaker.png
new file mode 100644
index 0000000..870da4d
--- /dev/null
+++ b/fmapp2/res/drawable-xxhdpi/ic_btn_spaker.png
Binary files differ
diff --git a/fmapp2/res/drawable-xxhdpi/stat_notify_fm.png b/fmapp2/res/drawable-xxhdpi/stat_notify_fm.png
new file mode 100644
index 0000000..1be7c37
--- /dev/null
+++ b/fmapp2/res/drawable-xxhdpi/stat_notify_fm.png
Binary files differ
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/bg.png b/fmapp2/res/drawable/bg.png
index fd10f0b..ebd97fd 100644
--- a/fmapp2/res/drawable/bg.png
+++ b/fmapp2/res/drawable/bg.png
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_left.xml b/fmapp2/res/drawable/btn_arrow_left.xml
index e64966c..ea850c4 100644
--- a/fmapp2/res/drawable/btn_arrow_left.xml
+++ b/fmapp2/res/drawable/btn_arrow_left.xml
@@ -31,9 +31,6 @@
     <item android:state_pressed="true"
         android:drawable="@drawable/btn_arrow_left_press" />
 
-    <item android:state_window_focused="true" android:state_focused="true"
-        android:drawable="@drawable/btn_arrow_left_selected" />
-
     <item
         android:drawable="@drawable/btn_arrow_left_default" />
 
diff --git a/fmapp2/res/drawable/btn_arrow_left_default.png b/fmapp2/res/drawable/btn_arrow_left_default.png
deleted file mode 100644
index 2a35952..0000000
--- a/fmapp2/res/drawable/btn_arrow_left_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_left_default.xml b/fmapp2/res/drawable/btn_arrow_left_default.xml
new file mode 100644
index 0000000..e07667c
--- /dev/null
+++ b/fmapp2/res/drawable/btn_arrow_left_default.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fafafa"
+            android:pathData="M15.41 16.09l-4.58-4.59 4.58-4.59-1.41-1.41-6 6 6 6z" />
+        <path
+            android:pathData="M0-.5h24v24h-24z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/btn_arrow_left_press.png b/fmapp2/res/drawable/btn_arrow_left_press.png
deleted file mode 100644
index 8b72f0a..0000000
--- a/fmapp2/res/drawable/btn_arrow_left_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_left_press.xml b/fmapp2/res/drawable/btn_arrow_left_press.xml
new file mode 100644
index 0000000..75b7687
--- /dev/null
+++ b/fmapp2/res/drawable/btn_arrow_left_press.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fefefe"
+            android:pathData="M15.41 16.09l-4.58-4.59 4.58-4.59-1.41-1.41-6 6 6 6z" />
+        <path
+            android:pathData="M0-.5h24v24h-24z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/btn_arrow_left_selected.png b/fmapp2/res/drawable/btn_arrow_left_selected.png
deleted file mode 100644
index 6cd3c9f..0000000
--- a/fmapp2/res/drawable/btn_arrow_left_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_right.xml b/fmapp2/res/drawable/btn_arrow_right.xml
index e4ab6f9..11c8a3c 100644
--- a/fmapp2/res/drawable/btn_arrow_right.xml
+++ b/fmapp2/res/drawable/btn_arrow_right.xml
@@ -32,9 +32,6 @@
     <item android:state_pressed="true"
         android:drawable="@drawable/btn_arrow_right_press" />
 
-    <item android:state_window_focused="true" android:state_focused="true"
-        android:drawable="@drawable/btn_arrow_right_selected" />
-
     <item
         android:drawable="@drawable/btn_arrow_right_default" />
 
diff --git a/fmapp2/res/drawable/btn_arrow_right_default.png b/fmapp2/res/drawable/btn_arrow_right_default.png
deleted file mode 100644
index ae6fd53..0000000
--- a/fmapp2/res/drawable/btn_arrow_right_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_right_default.xml b/fmapp2/res/drawable/btn_arrow_right_default.xml
new file mode 100644
index 0000000..8c782e1
--- /dev/null
+++ b/fmapp2/res/drawable/btn_arrow_right_default.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fafafa"
+            android:pathData="M8.59 16.34l4.58-4.59-4.58-4.59 1.41-1.41 6 6-6 6z" />
+        <path
+            android:pathData="M0-.25h24v24h-24z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/btn_arrow_right_press.png b/fmapp2/res/drawable/btn_arrow_right_press.png
deleted file mode 100644
index a4ae45b..0000000
--- a/fmapp2/res/drawable/btn_arrow_right_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_arrow_right_press.xml b/fmapp2/res/drawable/btn_arrow_right_press.xml
new file mode 100644
index 0000000..9c979c9
--- /dev/null
+++ b/fmapp2/res/drawable/btn_arrow_right_press.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fefefe"
+            android:pathData="M8.59 16.34l4.58-4.59-4.58-4.59 1.41-1.41 6 6-6 6z" />
+        <path
+            android:pathData="M0-.25h24v24h-24z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/btn_arrow_right_selected.png b/fmapp2/res/drawable/btn_arrow_right_selected.png
deleted file mode 100644
index 93bcc77..0000000
--- a/fmapp2/res/drawable/btn_arrow_right_selected.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/btn_recorder.xml b/fmapp2/res/drawable/btn_recorder.xml
deleted file mode 100644
index 88a5302..0000000
--- a/fmapp2/res/drawable/btn_recorder.xml
+++ /dev/null
@@ -1,39 +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/recorder_selected" />
-    <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_speaker.xml b/fmapp2/res/drawable/btn_speaker.xml
index a22e62a..3733fd8 100644
--- a/fmapp2/res/drawable/btn_speaker.xml
+++ b/fmapp2/res/drawable/btn_speaker.xml
@@ -33,5 +33,7 @@
     <item android:state_pressed="true"
         android:drawable="@drawable/ic_btn_spaker_select" />
     <item android:state_enabled="true"
-        android:drawable="@drawable/ic_btn_spaker" />
+        android:drawable="@drawable/ic_btn_spaker_default" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_btn_spaker_diable" />
 </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/ic_btn_earphone_default.png b/fmapp2/res/drawable/ic_btn_earphone_default.png
deleted file mode 100644
index 6a5b8db..0000000
--- a/fmapp2/res/drawable/ic_btn_earphone_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_earphone_default.xml b/fmapp2/res/drawable/ic_btn_earphone_default.xml
new file mode 100644
index 0000000..b7d2a39
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_earphone_default.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillAlpha=".1"
+            android:strokeAlpha=".1"
+            android:pathData="M0 0h24v24h-24z" />
+        <path
+            android:fillColor="#fefefe"
+            android:pathData="M12 1c-4.97 0-9 4.03-9 9v7c0 1.66 1.34 3 3 3h3v-8h-4v-2c0-3.87 3.13-7 7-7s7 3.13
+7 7v2h-4v8h3c1.66 0 3-1.34 3-3v-7c0-4.97-4.03-9-9-9z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_earphone_diable.png b/fmapp2/res/drawable/ic_btn_earphone_diable.png
deleted file mode 100644
index f32b96e..0000000
--- a/fmapp2/res/drawable/ic_btn_earphone_diable.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_earphone_diable.xml b/fmapp2/res/drawable/ic_btn_earphone_diable.xml
new file mode 100644
index 0000000..87a957b
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_earphone_diable.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillAlpha=".1"
+            android:strokeAlpha=".1"
+            android:pathData="M0 0h24v24h-24z" />
+        <path
+            android:fillColor="#003a33"
+            android:pathData="M12 1c-4.97 0-9 4.03-9 9v7c0 1.66 1.34 3 3 3h3v-8h-4v-2c0-3.87 3.13-7 7-7s7 3.13
+7 7v2h-4v8h3c1.66 0 3-1.34 3-3v-7c0-4.97-4.03-9-9-9z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_earphone_select.png b/fmapp2/res/drawable/ic_btn_earphone_select.png
deleted file mode 100644
index 67afd3e..0000000
--- a/fmapp2/res/drawable/ic_btn_earphone_select.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_earphone_select.xml b/fmapp2/res/drawable/ic_btn_earphone_select.xml
new file mode 100644
index 0000000..979cb52
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_earphone_select.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillAlpha=".1"
+            android:strokeAlpha=".1"
+            android:pathData="M0 0h24v24h-24z" />
+        <path
+            android:fillColor="#4db6ac"
+            android:pathData="M12 1c-4.97 0-9 4.03-9 9v7c0 1.66 1.34 3 3 3h3v-8h-4v-2c0-3.87 3.13-7 7-7s7 3.13
+7 7v2h-4v8h3c1.66 0 3-1.34 3-3v-7c0-4.97-4.03-9-9-9z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_onoff_default.png b/fmapp2/res/drawable/ic_btn_onoff_default.png
deleted file mode 100644
index 1c0f511..0000000
--- a/fmapp2/res/drawable/ic_btn_onoff_default.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_onoff_default.xml b/fmapp2/res/drawable/ic_btn_onoff_default.xml
new file mode 100644
index 0000000..78a428b
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_onoff_default.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:pathData="M0 0h24v24h-24z" />
+        <path
+            android:fillColor="#fafafa"
+            android:pathData="M7 24h2v-2h-2v2zm4 0h2v-2h-2v2zm2-22h-2v10h2v-10zm3.56 2.44l-1.45 1.45c1.73 1.05
+2.89 2.94 2.89 5.11 0 3.31-2.69 6-6 6s-6-2.69-6-6c0-2.17 1.16-4.06
+2.88-5.12l-1.44-1.44c-2.08 1.44-3.44 3.84-3.44 6.56 0 4.42 3.58 8 8 8s8-3.58
+8-8c0-2.72-1.36-5.12-3.44-6.56zm-1.56 19.56h2v-2h-2v2z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_onoff_disable.png b/fmapp2/res/drawable/ic_btn_onoff_disable.png
deleted file mode 100644
index 12b2d28..0000000
--- a/fmapp2/res/drawable/ic_btn_onoff_disable.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_onoff_disable.xml b/fmapp2/res/drawable/ic_btn_onoff_disable.xml
new file mode 100644
index 0000000..73f72da
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_onoff_disable.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:pathData="M0 0h24v24h-24z" />
+        <path
+            android:fillColor="#fefefe"
+            android:pathData="M7 24h2v-2h-2v2zm4 0h2v-2h-2v2zm2-22h-2v10h2v-10zm3.56 2.44l-1.45 1.45c1.73 1.05
+2.89 2.94 2.89 5.11 0 3.31-2.69 6-6 6s-6-2.69-6-6c0-2.17 1.16-4.06
+2.88-5.12l-1.44-1.44c-2.08 1.44-3.44 3.84-3.44 6.56 0 4.42 3.58 8 8 8s8-3.58
+8-8c0-2.72-1.36-5.12-3.44-6.56zm-1.56 19.56h2v-2h-2v2z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_onoff_press.png b/fmapp2/res/drawable/ic_btn_onoff_press.png
deleted file mode 100644
index efeebd3..0000000
--- a/fmapp2/res/drawable/ic_btn_onoff_press.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_onoff_press.xml b/fmapp2/res/drawable/ic_btn_onoff_press.xml
new file mode 100644
index 0000000..fc6f74a
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_onoff_press.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:pathData="M0 0h24v24h-24z" />
+        <path
+            android:fillColor="#eeeeee"
+            android:pathData="M7 24h2v-2h-2v2zm4 0h2v-2h-2v2zm2-22h-2v10h2v-10zm3.56 2.44l-1.45 1.45c1.73 1.05
+2.89 2.94 2.89 5.11 0 3.31-2.69 6-6 6s-6-2.69-6-6c0-2.17 1.16-4.06
+2.88-5.12l-1.44-1.44c-2.08 1.44-3.44 3.84-3.44 6.56 0 4.42 3.58 8 8 8s8-3.58
+8-8c0-2.72-1.36-5.12-3.44-6.56zm-1.56 19.56h2v-2h-2v2z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_search.png b/fmapp2/res/drawable/ic_btn_search.png
deleted file mode 100644
index 7eea584..0000000
--- a/fmapp2/res/drawable/ic_btn_search.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_search.xml b/fmapp2/res/drawable/ic_btn_search.xml
new file mode 100644
index 0000000..ba4d4ba
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_search.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fafafa"
+            android:pathData="M15.5 14h-.79l-.28-.27c.98-1.14 1.57-2.62 1.57-4.23 0-3.59-2.91-6.5-6.5-6.5s-6.5
+2.91-6.5 6.5 2.91 6.5 6.5 6.5c1.61 0 3.09-.59 4.23-1.57l.27 .28 v.79l5 4.99
+1.49-1.49-4.99-5zm-6 0c-2.49 0-4.5-2.01-4.5-4.5s2.01-4.5 4.5-4.5 4.5 2.01 4.5
+4.5-2.01 4.5-4.5 4.5z" />
+        <path
+            android:pathData="M0 0h24v24h-24z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_search_stop.png b/fmapp2/res/drawable/ic_btn_search_stop.png
deleted file mode 100644
index 0b8c4e8..0000000
--- a/fmapp2/res/drawable/ic_btn_search_stop.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_search_stop.xml b/fmapp2/res/drawable/ic_btn_search_stop.xml
new file mode 100644
index 0000000..00381de
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_search_stop.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:pathData="M0 0h24v24h-24z" />
+        <path
+            android:fillColor="#fafafa"
+            android:pathData="M12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm-8
+10c0-4.42 3.58-8 8-8 1.85 0 3.55 .63 4.9 1.69l-11.21
+11.21c-1.06-1.35-1.69-3.05-1.69-4.9zm8 8c-1.85
+0-3.55-.63-4.9-1.69l11.21-11.21c1.06 1.35 1.69 3.05 1.69 4.9 0 4.42-3.58 8-8 8z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_spaker.png b/fmapp2/res/drawable/ic_btn_spaker.png
deleted file mode 100644
index f439e2e..0000000
--- a/fmapp2/res/drawable/ic_btn_spaker.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_spaker_default.xml b/fmapp2/res/drawable/ic_btn_spaker_default.xml
new file mode 100644
index 0000000..ba277fb
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_spaker_default.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fefefe"
+            android:pathData="M18.5 12c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02zM5 9v6h4l5
+5V4L9 9H5z" />
+        <path
+            android:pathData="M0 0h24v24H0z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_spaker_diable.xml b/fmapp2/res/drawable/ic_btn_spaker_diable.xml
new file mode 100644
index 0000000..4fb4267
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_spaker_diable.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#003a33"
+            android:pathData="M18.5 12c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02zM5 9v6h4l5
+5V4L9 9H5z" />
+        <path
+            android:pathData="M0 0h24v24H0z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_btn_spaker_select.png b/fmapp2/res/drawable/ic_btn_spaker_select.png
deleted file mode 100644
index bd5d57b..0000000
--- a/fmapp2/res/drawable/ic_btn_spaker_select.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_btn_spaker_select.xml b/fmapp2/res/drawable/ic_btn_spaker_select.xml
new file mode 100644
index 0000000..984677a
--- /dev/null
+++ b/fmapp2/res/drawable/ic_btn_spaker_select.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#4db6ac"
+            android:pathData="M18.5 12c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02zM5 9v6h4l5
+5V4L9 9H5z" />
+        <path
+            android:pathData="M0 0h24v24H0z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_launcher_background.xml b/fmapp2/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..af51f6f
--- /dev/null
+++ b/fmapp2/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h108v108h-108z"
+      android:fillColor="#521E35"/>
+  <path
+      android:pathData="M70,36C70,34.895 70.895,34 72,34C73.105,34 74,34.895 74,36V38C76.209,38 78,39.791 78,42V66C78,68.209 76.209,70 74,70H34C31.791,70 30,68.209 30,66V42C30,39.791 31.791,38 34,38H70V36ZM46,66C52.627,66 58,60.627 58,54C58,47.373 52.627,42 46,42C39.373,42 34,47.373 34,54C34,60.627 39.373,66 46,66Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M70.068,62.883C70.356,62.621 70.631,62.346 70.893,62.057C71.111,61.816 71.321,61.565 71.52,61.305C73.128,59.209 74,56.642 74,54C74,51.359 73.128,48.791 71.52,46.695C70.32,45.131 68.76,43.895 66.986,43.085C65.981,42.626 64.874,43.274 64.588,44.341L63.294,49.171C63.151,49.704 63.477,50.243 63.959,50.513C64.428,50.777 64.841,51.133 65.173,51.565C65.709,52.264 65.999,53.12 65.999,54C65.999,54.881 65.709,55.736 65.173,56.435C64.841,56.867 64.428,57.223 63.959,57.487C63.477,57.757 63.151,58.296 63.294,58.829L64.588,63.659C64.874,64.726 65.981,65.374 66.986,64.915C68.112,64.401 69.152,63.715 70.068,62.883Z"
+      android:fillColor="#521E35"/>
+  <path
+      android:pathData="M72.392,60C73.45,58.168 74,56.097 74,54C74,53.97 74,53.939 74,53.909C73.996,53.417 73.962,52.925 73.897,52.434C73.621,50.336 72.797,48.359 71.52,46.695C71.502,46.671 71.483,46.646 71.464,46.622C71.162,46.235 70.836,45.865 70.485,45.515C69.466,44.496 68.279,43.676 66.986,43.085C65.981,42.626 64.874,43.274 64.588,44.341L63.294,49.171C63.151,49.704 63.477,50.243 63.959,50.513C64.427,50.777 64.841,51.133 65.173,51.565C65.709,52.264 65.999,53.12 65.999,54C65.999,54.705 65.813,55.394 65.464,56L72.392,60Z"
+      android:fillColor="#F73487"/>
+  <path
+      android:pathData="M46,64C51.523,64 56,59.523 56,54C56,48.477 51.523,44 46,44C40.477,44 36,48.477 36,54C36,59.523 40.477,64 46,64ZM46,58C48.209,58 50,56.209 50,54C50,51.791 48.209,50 46,50C43.791,50 42,51.791 42,54C42,56.209 43.791,58 46,58Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/fmapp2/res/drawable/ic_launcher_foreground.xml b/fmapp2/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..5469ada
--- /dev/null
+++ b/fmapp2/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group>
+    <clip-path
+        android:pathData="M0,0h108v108h-108z"/>
+    <path
+        android:pathData="M46,54m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
+        android:fillColor="#F73487"/>
+    <path
+        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
+        android:fillAlpha="0.6">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:gradientRadius="72"
+            android:centerX="28.54"
+            android:centerY="28.54"
+            android:type="radial">
+          <item android:offset="0" android:color="#19FFFFFF"/>
+          <item android:offset="1" android:color="#00FFFFFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_launcher_monochrome.xml b/fmapp2/res/drawable/ic_launcher_monochrome.xml
new file mode 100644
index 0000000..8ea6a45
--- /dev/null
+++ b/fmapp2/res/drawable/ic_launcher_monochrome.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M72,34C70.895,34 70,34.895 70,36V38H34C31.791,38 30,39.791 30,42V66C30,68.209 31.791,70 34,70H74C76.209,70 78,68.209 78,66V42C78,39.791 76.209,38 74,38V36C74,34.895 73.105,34 72,34ZM64.809,64.625C65.095,65.692 66.201,66.339 67.211,65.893C69.197,65.017 70.941,63.653 72.275,61.914C74.018,59.644 74.962,56.862 74.962,54C74.962,51.138 74.018,48.356 72.275,46.086C70.941,44.347 69.197,42.983 67.211,42.107C66.201,41.661 65.095,42.308 64.809,43.375L63.342,48.849C63.199,49.383 63.524,49.921 64.011,50.182C64.549,50.471 65.023,50.872 65.399,51.362C65.98,52.119 66.295,53.046 66.295,54C66.295,54.954 65.98,55.881 65.399,56.638C65.023,57.128 64.549,57.529 64.011,57.818C63.524,58.079 63.199,58.618 63.342,59.151L64.809,64.625ZM46,67C53.18,67 59,61.18 59,54C59,46.82 53.18,41 46,41C38.82,41 33,46.82 33,54C33,61.18 38.82,67 46,67Z"
+      android:fillColor="#ffffffff"
+      android:fillType="evenOdd"/>
+  <group>
+    <clip-path
+        android:pathData="M67.329,62.438C68.309,61.815 69.179,61.021 69.896,60.088C71.236,58.341 71.962,56.201 71.962,54C71.962,51.799 71.236,49.659 69.896,47.912C69.179,46.979 68.309,46.185 67.329,45.562L66.591,48.314C67.031,48.671 67.43,49.081 67.779,49.536C68.762,50.817 69.295,52.386 69.295,54C69.295,55.614 68.762,57.183 67.779,58.464C67.43,58.919 67.031,59.329 66.591,59.686L67.329,62.438Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M62,67C59.138,67 56.356,66.056 54.086,64.314C51.816,62.571 50.184,60.129 49.443,57.365C48.702,54.6 48.894,51.669 49.99,49.025C51.085,46.381 53.022,44.173 55.5,42.742C57.978,41.311 60.86,40.738 63.697,41.111C66.534,41.485 69.169,42.784 71.192,44.808C73.216,46.831 74.515,49.466 74.889,52.303C75.262,55.14 74.689,58.022 73.258,60.5L62,54L62,67Z"
+        android:fillColor="#ffffffff"/>
+  </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_silent_mode.png b/fmapp2/res/drawable/ic_silent_mode.png
deleted file mode 100644
index c89291a..0000000
--- a/fmapp2/res/drawable/ic_silent_mode.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_silent_mode.xml b/fmapp2/res/drawable/ic_silent_mode.xml
new file mode 100644
index 0000000..29ecfdb
--- /dev/null
+++ b/fmapp2/res/drawable/ic_silent_mode.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fafafa"
+            android:pathData="M16.5 12c0-1.77-1.02-3.29-2.5-4.03v2.21l2.45 2.45c.03-.2 .05 -.41 .05 -.63zm2.5
+0c0 .94-.2 1.82-.54 2.64l1.51 1.51C20.63 14.91 21 13.5 21
+12c0-4.28-2.99-7.86-7-8.77v2.06c2.89 .86 5 3.54 5 6.71zM4.27 3L3 4.27 7.73
+9H3v6h4l5 5v-6.73l4.25 4.25c-.67 .52 -1.42 .93 -2.25 1.18v2.06c1.38-.31 2.63-.95
+3.69-1.81L19.73 21 21 19.73l-9-9L4.27 3zM12 4L9.91 6.09 12 8.18V4z" />
+        <path
+            android:pathData="M0 0h24v24H0z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_silent_mode_off.png b/fmapp2/res/drawable/ic_silent_mode_off.png
deleted file mode 100644
index 4748b9e..0000000
--- a/fmapp2/res/drawable/ic_silent_mode_off.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_silent_mode_off.xml b/fmapp2/res/drawable/ic_silent_mode_off.xml
new file mode 100644
index 0000000..5264210
--- /dev/null
+++ b/fmapp2/res/drawable/ic_silent_mode_off.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fafafa"
+            android:pathData="M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25
+2.5-4.02zM14 3.23v2.06c2.89 .86 5 3.54 5 6.71s-2.11 5.85-5 6.71v2.06c4.01-.91
+7-4.49 7-8.77s-2.99-7.86-7-8.77z" />
+        <path
+            android:pathData="M0 0h24v24H0z" />
+    </group>
+</vector>
diff --git a/fmapp2/res/drawable/btn_strip_trans_right.xml b/fmapp2/res/drawable/preset_button_background.xml
similarity index 89%
rename from fmapp2/res/drawable/btn_strip_trans_right.xml
rename to fmapp2/res/drawable/preset_button_background.xml
index 512c963..d6acfa5 100644
--- a/fmapp2/res/drawable/btn_strip_trans_right.xml
+++ b/fmapp2/res/drawable/preset_button_background.xml
@@ -32,12 +32,12 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
-        android:drawable="@drawable/btn_strip_trans_right_pressed" />
+        android:drawable="@color/favorite_button_active" />
 
     <item android:state_focused="true"
-        android:drawable="@drawable/btn_strip_trans_right_selected" />
+        android:drawable="@color/favorite_button_active" />
 
     <item android:state_enabled="true"
-        android:drawable="@drawable/btn_strip_trans_right_normal" />
+        android:drawable="@color/favorite_button_normal" />
 
 </selector>
diff --git a/fmapp2/res/drawable/recorder_stop.png b/fmapp2/res/drawable/recorder_stop.png
index 6017be9..ff9839b 100644
--- a/fmapp2/res/drawable/recorder_stop.png
+++ b/fmapp2/res/drawable/recorder_stop.png
Binary files differ
diff --git a/fmapp2/res/drawable/seeker.png b/fmapp2/res/drawable/seeker.png
new file mode 100644
index 0000000..9babc55
--- /dev/null
+++ b/fmapp2/res/drawable/seeker.png
Binary files differ
diff --git a/fmapp2/res/layout-800x480/fmradio.xml b/fmapp2/res/layout-800x480/fmradio.xml
deleted file mode 100644
index 0b96bc5..0000000
--- a/fmapp2/res/layout-800x480/fmradio.xml
+++ /dev/null
@@ -1,204 +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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fmradio"
-    android:background="@drawable/bg"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <RelativeLayout android:id="@+id/layout_on_off"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="3dp"
-        android:layout_alignParentTop="true">
-
-        <ImageView android:id="@+id/btn_onoff"
-            android:src="@drawable/btn_onoff"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="15dp"
-            android:clickable="true"
-            android:focusable="true"
-            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:drawableLeft="@drawable/count_down"
-            android:layout_toRightOf="@+id/btn_onoff"
-            android:textSize="14sp"
-            android:textColor="@android:color/white"
-            android:layout_marginLeft="5dp"
-            android:textStyle="bold"
-            android:visibility="invisible"
-            android:text="@string/default_sleep" />
-
-        <TextView android:id="@+id/prog_service_tv"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_toLeftOf="@+id/btn_silent"
-            android:layout_toRightOf="@+id/sleep_msg_tv"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:singleLine="true"
-            android:textStyle="bold"
-            android:text="@string/prog_service_string"/>
-
-        <ImageView android:id="@+id/btn_silent"
-            android:src="@drawable/ic_silent_mode_off"
-            android:layout_toLeftOf="@+id/btn_speaker_earphone"
-            android:layout_width="wrap_content"
-            android:layout_marginRight="10dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:layout_height="wrap_content" />
-
-        <ImageView android:id="@+id/btn_speaker_earphone"
-            android:src="@drawable/btn_earphone"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="15dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </RelativeLayout>
-
-    <LinearLayout android:id="@+id/stationinfo_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dp"
-        android:layout_below="@+id/layout_on_off">
-
-        <!-- This included layout contains Station Information to display -->
-        <include layout="@layout/station_info" />
-
-    </LinearLayout>
-
-    <com.caf.fmradio.HorizontalNumberPicker
-        android:id="@+id/fm_picker"
-        android:layout_width="fill_parent"
-        android:layout_height="200dp"
-        android:layout_marginBottom="50dp"
-        android:layout_below="@+id/stationinfo_layout"/>
-
-    <HorizontalScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="60dp"
-        android:layout_alignParentBottom="true"
-        android:scrollbars="none">
-
-        <LinearLayout  android:id="@+id/favorite_list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="horizontal">
-
-            <Button android:id="@+id/presets_button_1"
-                style="@style/ButtonStripLeft"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                android:singleLine="true"
-                android:layout_width="96dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-
-            <Button android:id="@+id/presets_button_2"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                android:singleLine="true"
-                android:layout_width="96dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-
-            <Button android:id="@+id/presets_button_3"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                android:singleLine="true"
-                android:layout_width="96dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-
-            <Button android:id="@+id/presets_button_4"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                android:singleLine="true"
-                android:layout_width="96dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-
-            <Button android:id="@+id/presets_button_5"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                android:singleLine="true"
-                android:layout_width="96dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-
-            <Button android:id="@+id/presets_button_6"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                android:singleLine="true"
-                android:layout_width="96dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-
-            <Button android:id="@+id/presets_button_7"
-                style="@style/ButtonStripRight"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                android:singleLine="true"
-                android:layout_width="96dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-
-        </LinearLayout>
-
-    </HorizontalScrollView>
-
-</RelativeLayout>
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-800x480/station_info.xml b/fmapp2/res/layout-800x480/station_info.xml
deleted file mode 100644
index c96775a..0000000
--- a/fmapp2/res/layout-800x480/station_info.xml
+++ /dev/null
@@ -1,192 +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">
-
-    <LinearLayout android:id="@+id/station_info"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:orientation="vertical"
-        android:gravity="top">
-
-        <RelativeLayout android:id="@+id/top_most"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView android:id="@+id/signal_level"
-                android:src="@drawable/ic_signal_2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="5dp"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:visibility="gone" />
-
-            <TextView android:id="@+id/record_msg_tv"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/recorder_start"
-                android:layout_marginLeft="20dp"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                android:textColor="@android:color/white"
-                android:clickable="true"
-                android:visibility="invisible"
-                android:text="@string/default_record"/>
-
-
-            <TextView android:id="@+id/stereo_text_tv"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingRight="16dp"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignBaseline="@id/signal_level"
-                android:textSize="13sp"
-                android:textColor="@android:color/white"
-                android:text="@string/default_audio"/>
-
-        </RelativeLayout>
-
-        <LinearLayout android:id="@+id/station_frequency_row"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp"
-            android:layout_alignWithParentIfMissing="true"
-            android:gravity="center">
-
-            <TextView android:id="@+id/call_sign_tv"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:textColor="@android:color/white"
-                android:paddingTop="2dp"
-                android:paddingRight="2dp"
-                android:paddingBottom="2dp"
-                android:paddingLeft="2dp"
-                android:text="@string/station_id_string" />
-
-            <TextView android:id="@+id/pty_tv"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:textColor="@android:color/white"
-                android:paddingTop="2dp"
-                android:paddingRight="2dp"
-                android:paddingBottom="2dp"
-                android:paddingLeft="2dp"
-                android:text="@string/pty_string" />
-
-        </LinearLayout>
-
-        <RelativeLayout android:id="@+id/second_layout"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginBottom="1dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp">
-
-                <TextView android:id="@+id/prog_frequency_tv"
-                     android:textAppearance="?android:attr/textAppearanceLarge"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:textSize="25dp"
-                     android:textColor="@android:color/white"
-                     android:gravity="center"
-                     android:clickable="true"
-                     android:focusable="true"
-                     android:layout_toLeftOf="@+id/btn_forward"
-                     android:layout_toRightOf="@+id/btn_back"
-                     android:text="@string/frequency_string"/>
-
-                <ImageView android:id="@+id/btn_back"
-                     android:clickable="true"
-                     android:focusable="true"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:paddingLeft="15dp"
-                     android:layout_alignParentLeft="true"
-                     android:visibility="visible"
-                     android:layout_alignWithParentIfMissing="true"
-                     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="wrap_content"
-                     android:paddingRight="15dp"
-                     android:layout_alignParentRight="true"
-                     android:visibility="visible"
-                     android:layout_alignWithParentIfMissing="true"
-                     android:src="@drawable/btn_arrow_right"/>
-
-         </RelativeLayout>
-
-
-        <!-- 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="15sp"
-            android:singleLine="true"
-            android:textStyle="bold"
-            android:textColor="@android:color/white"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="20dp"
-            android:gravity="center_horizontal"
-            android:text="@string/radio_text_string"/>
-
-        <TextView android:id="@+id/eradio_text_tv"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="15sp"
-            android:textColor="@android:color/white"
-            android:singleLine="true"
-            android:textStyle="bold"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:paddingBottom="5dp"
-            android:gravity="center_horizontal"
-            android:text="@string/eradio_text_string"/>
-
-    </LinearLayout>
-
-</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/action_bar.xml b/fmapp2/res/layout/action_bar.xml
new file mode 100644
index 0000000..7409d06
--- /dev/null
+++ b/fmapp2/res/layout/action_bar.xml
@@ -0,0 +1,48 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:enabled="false"
+    android:gravity="center_vertical"
+    android:orientation="horizontal" >
+
+    <ImageView android:id="@+id/btn_onoff"
+        android:src="@drawable/ic_btn_onoff_default"
+        android:clickable="true"
+        android:focusable="true"
+        android:layout_width="@dimen/min_touch_size"
+        android:layout_height="@dimen/min_touch_size"
+        android:scaleType="centerInside"
+        android:background="?android:attr/selectableItemBackgroundBorderless"/>
+
+    <TextView android:id="@+id/title"
+        android:textSize="18sp"
+        android:textColor="@color/white"
+        android:textAllCaps="true"
+        android:textStyle="bold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"/>
+
+    <ImageView android:id="@+id/btn_silent"
+        android:src="@drawable/ic_silent_mode_off"
+        android:clickable="true"
+        android:focusable="true"
+        android:layout_width="@dimen/min_touch_size"
+        android:layout_height="@dimen/min_touch_size"
+        android:scaleType="centerInside"
+        android:background="?android:attr/selectableItemBackgroundBorderless" />
+
+    <ImageView android:id="@+id/btn_speaker_earphone"
+        android:src="@drawable/btn_earphone"
+        android:clickable="true"
+        android:focusable="true"
+        android:layout_width="@dimen/min_touch_size"
+        android:layout_height="@dimen/min_touch_size"
+        android:scaleType="centerInside"
+        android:background="?android:attr/selectableItemBackgroundBorderless" />
+
+</LinearLayout>
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/fmradio.xml b/fmapp2/res/layout/fmradio.xml
index 4aef544..244a66b 100644
--- a/fmapp2/res/layout/fmradio.xml
+++ b/fmapp2/res/layout/fmradio.xml
@@ -26,98 +26,47 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fmradio"
-    android:background="@drawable/bg"
+    android:background="@color/background_color"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical">
 
-    <RelativeLayout android:id="@+id/layout_on_off"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="3dp"
-        android:layout_alignParentTop="true">
-
-        <ImageView android:id="@+id/btn_onoff"
-            android:src="@drawable/btn_onoff"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="15dp"
-            android:clickable="true"
-            android:focusable="true"
-            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:drawableLeft="@drawable/count_down"
-            android:layout_toRightOf="@+id/btn_onoff"
-            android:textSize="14sp"
-            android:layout_marginLeft="5dp"
-            android:textStyle="bold"
-            android:visibility="invisible"
-            android:text="@string/default_sleep" />
-
-        <TextView android:id="@+id/prog_service_tv"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_toLeftOf="@+id/btn_silent"
-            android:layout_toRightOf="@+id/sleep_msg_tv"
-            android:textSize="16sp"
-            android:singleLine="true"
-            android:textStyle="bold"
-            android:text="@string/prog_service_string"/>
-
-	<ImageView android:id="@+id/btn_silent"
-            android:src="@drawable/ic_silent_mode_off"
-            android:layout_toLeftOf="@+id/btn_speaker_earphone"
-            android:layout_width="wrap_content"
-            android:layout_marginRight="10dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:layout_height="wrap_content" />
-
-        <ImageView android:id="@+id/btn_speaker_earphone"
-            android:src="@drawable/btn_earphone"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="15dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </RelativeLayout>
-
     <LinearLayout android:id="@+id/stationinfo_layout"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:orientation="horizontal"
-        android:layout_marginTop="5dp"
-        android:layout_below="@+id/layout_on_off">
+        android:layout_weight="1">
 
         <!-- This included layout contains Station Information to display -->
         <include layout="@layout/station_info" />
 
     </LinearLayout>
 
-    <com.caf.fmradio.HorizontalNumberPicker
-        android:id="@+id/fm_picker"
-        android:layout_width="fill_parent"
-        android:layout_height="200dp"
-        android:layout_marginBottom="50dp"
-        android:layout_below="@+id/stationinfo_layout"/>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="155dp">
+
+        <com.caf.fmradio.HorizontalNumberPicker
+            android:id="@+id/fm_picker"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/picker_background_color"/>
+
+        <ImageView
+            android:id="@+id/fm_seeker"
+            android:src="@drawable/seeker"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"/>
+
+    </RelativeLayout>
+
 
     <HorizontalScrollView
         android:layout_width="fill_parent"
         android:layout_height="60dp"
-        android:layout_alignParentBottom="true"
         android:scrollbars="none">
 
         <LinearLayout  android:id="@+id/favorite_list"
@@ -126,77 +75,28 @@
             android:orientation="horizontal">
 
             <Button android:id="@+id/presets_button_1"
-                style="@style/ButtonStripLeft"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="15sp"
-                android:singleLine="true"
-                android:layout_width="80dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                style="@style/ButtonStripButtons"/>
 
             <Button android:id="@+id/presets_button_2"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="15sp"
-                android:singleLine="true"
-                android:layout_width="80dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                style="@style/ButtonStripButtons"/>
 
             <Button android:id="@+id/presets_button_3"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="15sp"
-                android:singleLine="true"
-                android:layout_width="80dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                style="@style/ButtonStripButtons"/>
 
             <Button android:id="@+id/presets_button_4"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="15sp"
-                android:singleLine="true"
-                android:layout_width="80dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                style="@style/ButtonStripButtons"/>
 
             <Button android:id="@+id/presets_button_5"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="15sp"
-                android:singleLine="true"
-                android:layout_width="80dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                style="@style/ButtonStripButtons"/>
 
             <Button android:id="@+id/presets_button_6"
-                style="@style/ButtonStripMiddle"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="15sp"
-                android:singleLine="true"
-                android:layout_width="80dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                style="@style/ButtonStripButtons"/>
 
             <Button android:id="@+id/presets_button_7"
-                style="@style/ButtonStripRight"
-                android:text="@string/add_station"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="15sp"
-                android:singleLine="true"
-                android:layout_width="80dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                style="@style/ButtonStripButtons"/>
 
         </LinearLayout>
 
     </HorizontalScrollView>
 
-</RelativeLayout>
+</LinearLayout>
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..d04e237 100644
--- a/fmapp2/res/layout/rename_dialog.xml
+++ b/fmapp2/res/layout/rename_dialog.xml
@@ -44,21 +44,24 @@
         android:maxLength="16">
      <requestFocus />
      </EditText>
+
      <RelativeLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
          android:padding="6dp" >
 
          <Button android:id="@+id/save"
+             style="?android:style/Widget.Material.Light.Button.Borderless.Colored"
              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"
+             style="?android:style/Widget.Material.Light.Button.Borderless.Colored"
              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 fc7d62e..d8e5d4e 100644
--- a/fmapp2/res/layout/station_info.xml
+++ b/fmapp2/res/layout/station_info.xml
@@ -26,166 +26,196 @@
  * 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">
+<merge xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout android:id="@+id/station_info"
+        android:animateLayoutChanges="true"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:orientation="vertical"
+        android:layout_gravity="center"
         android:gravity="top">
 
         <RelativeLayout android:id="@+id/top_most"
+            android:visibility="gone"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            tools:visibility="visible">
 
             <ImageView android:id="@+id/signal_level"
                 android:src="@drawable/ic_signal_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:visibility="gone" />
+                android:layout_alignParentStart="true"
+                android:visibility="gone"
+                tools:visibility="visible"/>
 
-            <TextView android:id="@+id/sleep_msg_tv"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/count_down"
-                android:textSize="14sp"
-                android:layout_marginLeft="25dp"
-                android:textStyle="bold"
-                android:visibility="invisible"
-                android:text="@string/default_sleep" />
-
-            <TextView android:id="@+id/record_msg_tv"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/recorder_start"
-                android:layout_marginLeft="20dp"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                android:clickable="true"
-                android:visibility="invisible"
-                android:text="@string/default_record"/>
 
             <TextView android:id="@+id/stereo_text_tv"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingRight="16dp"
+                android:paddingEnd="16dp"
+                android:visibility="invisible"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_alignBaseline="@id/signal_level"
                 android:textSize="13sp"
-                android:text="@string/default_audio"/>
+                android:text="@string/default_blank"
+                tools:text="@string/audio_type_stereo"
+                tools:visibility="visible"/>
 
         </RelativeLayout>
 
-        <LinearLayout android:id="@+id/station_frequency_row"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp"
-            android:layout_alignWithParentIfMissing="true"
-            android:gravity="center">
-
-            <TextView android:id="@+id/call_sign_tv"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:paddingTop="2dp"
-                android:paddingRight="2dp"
-                android:paddingBottom="2dp"
-                android:paddingLeft="2dp"
-                android:text="@string/station_id_string" />
-
-            <TextView android:id="@+id/pty_tv"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:paddingTop="2dp"
-                android:paddingRight="2dp"
-                android:paddingBottom="2dp"
-                android:paddingLeft="2dp"
-                android:text="@string/pty_string" />
-
-        </LinearLayout>
-
         <RelativeLayout android:id="@+id/second_layout"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp"
+            android:layout_gravity="center"
+            android:gravity="center"
             android:layout_marginLeft="2dp"
             android:layout_marginRight="2dp">
 
             <TextView android:id="@+id/prog_frequency_tv"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="25dp"
-                android:gravity="center"
-                android:layout_toLeftOf="@+id/btn_forward"
-                android:layout_toRightOf="@+id/btn_back"
-                android:text="@string/frequency_string"/>
+                 android:textColor="@android:color/white"
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:textSize="46sp"
+                 android:textStyle="bold"
+                 android:gravity="center"
+                 android:clickable="true"
+                 android:focusable="true"
+                 android:text="@string/default_blank"/>
 
             <ImageView android:id="@+id/btn_back"
-                android:clickable="true"
-                android:focusable="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="15dp"
-                android:layout_alignParentLeft="true"
-                android:visibility="visible"
-                android:layout_alignWithParentIfMissing="true"
-                android:src="@drawable/btn_arrow_left"/>
+                 android:clickable="true"
+                 android:focusable="true"
+                 android:layout_width="@dimen/min_touch_size"
+                 android:layout_height="@dimen/min_touch_size"
+                 android:layout_marginStart="15dp"
+                 android:layout_centerVertical="true"
+                 android:layout_alignParentStart="true"
+                 android:layout_alignWithParentIfMissing="true"
+                 android:src="@drawable/btn_arrow_left_default"
+                 android:scaleType="centerInside"
+                 android:background="?android:attr/selectableItemBackgroundBorderless"/>
 
             <ImageView android:id="@+id/btn_forward"
-                android:clickable="true"
-                android:focusable="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingRight="15dp"
-                android:layout_alignParentRight="true"
-                android:visibility="visible"
-                android:layout_alignWithParentIfMissing="true"
-                android:src="@drawable/btn_arrow_right"/>
+                 android:clickable="true"
+                 android:focusable="true"
+                 android:layout_width="@dimen/min_touch_size"
+                 android:layout_height="@dimen/min_touch_size"
+                 android:layout_marginEnd="15dp"
+                 android:layout_centerVertical="true"
+                 android:layout_alignParentEnd="true"
+                 android:layout_alignWithParentIfMissing="true"
+                 android:src="@drawable/btn_arrow_right_default"
+                 android:scaleType="centerInside"
+                 android:background="?android:attr/selectableItemBackgroundBorderless"/>
 
          </RelativeLayout>
 
+        <LinearLayout android:id="@+id/station_frequency_row"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <TextView android:id="@+id/call_sign_tv"
+                android:textColor="@android:color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textSize="40sp"
+                android:alpha="0.5"
+                android:paddingRight="2dp"
+                android:paddingLeft="2dp"
+                android:text="@string/default_blank"
+                android:gravity="center"
+                tools:text="ABCD"/>
+
+            <TextView android:id="@+id/pty_tv"
+                android:textColor="@android:color/white"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="22sp"
+                android:textAllCaps="true"
+                android:paddingLeft="2dp"
+                android:paddingRight="2dp"
+                android:text="@string/default_blank" />
+
+        </LinearLayout>
+
         <!-- Station Radio Text information display -->
         <TextView android:id="@+id/radio_text_tv"
-            android:layout_width="fill_parent"
+            android:textColor="@android:color/white"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="15sp"
+            android:textSize="16sp"
             android:singleLine="true"
             android:textStyle="bold"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="20dp"
-            android:gravity="center_horizontal"
-            android:text="@string/radio_text_string"/>
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingTop="10dp"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/default_blank"
+            tools:text="@string/fm_off"
+            />
 
         <TextView android:id="@+id/eradio_text_tv"
-            android:layout_width="fill_parent"
+            android:textColor="@android:color/white"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="15sp"
+            android:textSize="16sp"
             android:singleLine="true"
             android:textStyle="bold"
             android:paddingLeft="2dp"
             android:paddingRight="2dp"
-            android:paddingBottom="5dp"
             android:gravity="center_horizontal"
-            android:text="@string/eradio_text_string"/>
+            android:text="@string/default_blank"
+            tools:text="Some example text"/>
+
+        <TextView android:id="@+id/prog_service_tv"
+            android:textColor="@android:color/white"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:textSize="16sp"
+            android:singleLine="true"
+            android:textStyle="bold"
+            android:text="@string/default_blank"/>
+
+        <TextView android:id="@+id/sleep_msg_tv"
+            android:textColor="@android:color/white"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/count_down"
+            android:layout_toEndOf="@+id/btn_onoff"
+            android:textSize="15sp"
+            android:drawablePadding="5dip"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:textStyle="bold"
+            android:visibility="invisible"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/default_blank" />
+
+        <TextView android:id="@+id/record_msg_tv"
+            android:textColor="@android:color/white"
+            android:visibility="invisible"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="15sp"
+            android:singleLine="true"
+            android:textStyle="bold"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:drawablePadding="5dip"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/default_blank"/>
 
     </LinearLayout>
 
diff --git a/fmapp2/res/layout/station_list.xml b/fmapp2/res/layout/station_list.xml
index 18d31f0..4532614 100644
--- a/fmapp2/res/layout/station_list.xml
+++ b/fmapp2/res/layout/station_list.xml
@@ -34,10 +34,10 @@
     android:layout_height="fill_parent"
     android:orientation="vertical">
 
-    <!--Change layout_height value "wrap_content" to "fill_parent" can dispaly last item dividing line -->
     <ListView android:id="@+id/station_list"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
+        android:layout_height="fill_parent"
+        android:divider="@null">
     </ListView>
 
 </LinearLayout>
diff --git a/fmapp2/res/layout/station_list_item.xml b/fmapp2/res/layout/station_list_item.xml
index 40c05d5..c53f815 100644
--- a/fmapp2/res/layout/station_list_item.xml
+++ b/fmapp2/res/layout/station_list_item.xml
@@ -29,48 +29,41 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical">
 
-   <TableLayout
-       android:id="@+id/TableLayout1"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content"
-       android:stretchColumns="1">
+   <TextView
+	   android:id="@+id/fixName"
+	   android:layout_width="wrap_content"
+	   android:layout_height="wrap_content"
+	   android:paddingStart="16dp"
+	   android:paddingEnd="8dp"
+	   android:paddingTop="15dp"
+	   android:text="@string/station_name" />
 
-       <TableRow>
-           <TextView
-               android:id="@+id/fixName"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:paddingLeft="30dp"
-               android:paddingTop="15dp"
-               android:text="@string/station_name" />
+   <TextView
+	   android:id="@+id/name"
+	   android:layout_width="wrap_content"
+	   android:layout_height="wrap_content"
+	   android:paddingTop="15dp"
+	   android:ellipsize="marquee"
+	   android:marqueeRepeatLimit="marquee_forever"
+	   android:layout_toEndOf="@id/fixName"
+	   tools:text="10"/>
 
-           <TextView
-               android:id="@+id/name"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:ellipsize="marquee"
-               android:marqueeRepeatLimit="marquee_forever" />
 
-       </TableRow>
-       <TableRow >
+	<TextView
+		android:id="@+id/freq"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingStart="16dp"
+		android:paddingEnd="16dp"
+		android:paddingBottom="15dp"
+		android:textSize="20sp"
+		android:layout_below="@id/fixName"/>
 
-	    <TextView
-	        android:id="@+id/freq"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:paddingLeft="30dp"
-	        android:paddingBottom="15dp"
-	        android:textSize="20sp"
-	        android:layout_span="2" />
-
-       </TableRow>
-
-    </TableLayout>
-
-</LinearLayout>
+</RelativeLayout>
diff --git a/fmapp2/res/layout/statusbar.xml b/fmapp2/res/layout/statusbar.xml
deleted file mode 100644
index 47e1a91..0000000
--- a/fmapp2/res/layout/statusbar.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 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, Inc. 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.
- */
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal">
-
-    <ImageView android:id="@+id/icon"
-        android:layout_gravity="center_vertical"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </ImageView>
-
-    <TextView android:id="@+id/frequency"
-        android:textAppearance="?android:attr/textAppearanceMediumInverse"
-        android:textColor="@android:color/black"
-        android:focusable="true"
-        android:ellipsize="marquee"
-        android:singleLine="true"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-       android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/fmapp2/res/mipmap-anydpi/ic_launcher.xml b/fmapp2/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 0000000..b58c81f
--- /dev/null
+++ b/fmapp2/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+</adaptive-icon>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-af/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-af/arrays.xml
index cb1457b..82de6a5 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-af/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minute</item>
+    <item>15 minute</item>
+    <item>30 minute</item>
+    <item>Tot gestop</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minute</item>
+    <item>30 minute</item>
+    <item>45 minute</item>
+    <item>1 uur</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-af/strings.xml b/fmapp2/res/values-af/strings.xml
new file mode 100644
index 0000000..1c90f7f
--- /dev/null
+++ b/fmapp2/res/values-af/strings.xml
@@ -0,0 +1,232 @@
+<?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 Nuut</string>
+    <string name="menu_scan_start">Skandeer</string>
+    <string name="menu_scan_stop">Ophou soek</string>
+    <string name="menu_record_start">Begin Opname</string>
+    <string name="menu_record_stop">Stop Opname</string>
+    <string name="menu_settings">Instellings</string>
+    <string name="menu_sleep">Slaap</string>
+    <string name="menu_sleep_cancel">Kanselleer Slaap</string>
+    <string name="menu_all_channels">Alle kanale</string>
+    <string name="menu_display_tags">Wys etikette</string>
+    <string name="button_text_stop">Stop</string>
+    <string name="msg_seeking">Soek na FM Stasie</string>
+    <string name="msg_scanning">Skandering vir al die FM-stasies</string>
+    <string name="msg_scanning_pty">Skandering vir \"<xliff:g id="pty_name">%1$s</xliff:g>\"</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Outo-Kies voorafbepaaldes</string>
+    <string name="msg_searching">Soek vir sterk stasies om \'n voorafbepaalde lys te skep</string>
+    <string name="msg_noantenna">Prop asseblief in oorfone om FM Radio te gebruik</string>
+    <string name="dialog_sleep_title">Kies Outo-af slaap tyd</string>
+    <string name="presetlist_select_name">Kies \"<xliff:g id="presetlist_name">%1$s</xliff:g>\"</string>
+    <string name="presetlist_add_new">Voegby Nuwe Lys</string>
+    <string name="dialog_presetlist_rename_title">Tik \'n naam</string>
+    <string name="presetlist_autoselect_title">Bevestig Outo-kies</string>
+    <string name="preset_replace">Vervang</string>
+    <string name="preset_tune">Instel</string>
+    <string name="preset_rename">Hernoem</string>
+    <string name="preset_delete">Verwyder</string>
+    <string name="preset_search">Soek vir \"<xliff:g id="preset_pi">%1$s</xliff:g>\"</string>
+    <string name="stat_notif_frequency">\"<xliff:g id="frequency">%1$s</xliff:g>\" MHz</string>
+    <string name="regional_band">Streek Band</string>
+    <string name="regional_band_entry_north_america">Noord Amerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (Wyd)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgia</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">Sjina</string>
+    <string name="regional_band_entry_czech_republic">Tsjeggiese Republiek</string>
+    <string name="regional_band_entry_denmark">Denemarke</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">Frankryk</string>
+    <string name="regional_band_entry_germany">Duitsland</string>
+    <string name="regional_band_entry_greece">Griekeland</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Ierland</string>
+    <string name="regional_band_entry_italy">Italië</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Nederland</string>
+    <string name="regional_band_entry_new_zealand">New Seeland</string>
+    <string name="regional_band_entry_norway">Noorweë</string>
+    <string name="regional_band_entry_poland">Poland</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusland</string>
+    <string name="regional_band_entry_singapore">Singapoer</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Spanje</string>
+    <string name="regional_band_entry_switzerland">Switserland</string>
+    <string name="regional_band_entry_sweden">Swede</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkye</string>
+    <string name="regional_band_entry_united_kingdom">Verenigde Koninkryk</string>
+    <string name="regional_band_entry_united_states">Verenigde State van Amerika</string>
+    <string name="regional_band_entry_user_defined">Gebruiker gedefinieerde Band</string>
+    <string name="regional_band_summary_north_america">Noord Amerika (87.5MHz Tot 108.0MHz In 200 khz Stappe)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 tot 90.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_japan_wide">Japan (Wyd) (90.0MHz Tot 108.0MHz In 50 Khz Stappe)</string>
+    <string name="regional_band_summary_australia">Australië (87.7 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_austria">Oostenryk (87.5 tot 108.0 MHz in 50 kHz Stappe)</string>
+    <string name="regional_band_summary_belgium">België (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_brazil">Brasilië (87.5 tot 108.0 MHz in 200 kHz Stappe)</string>
+    <string name="regional_band_summary_china">Sjina (87.0 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_denmark">Denemarke (87.5 tot 108.0 MHz in 50 kHz Stappe)</string>
+    <string name="regional_band_summary_finland">Finland (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_france">Frankryk (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_germany">Duitsland (87.5 tot 108.0 MHz in 50 kHz Stappe)</string>
+    <string name="regional_band_summary_greece">Griekeland (87.5 tot 108.0 MHz in 50 kHz Stappe)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_india">Indië (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_indonesia">Indonesië (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_ireland">Ierland (87.5 tot 108.0 MHz in 50 kHz Stappe)</string>
+    <string name="regional_band_summary_italy">Italië (87.5 tot 108.0 MHz in 50 kHz Stappe)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_mexico">Meksiko (88.1 tot 107.9 MHz in 200 kHz Stappe)</string>
+    <string name="regional_band_summary_netherlands">Nederland (87.5MHz Tot 108.0MHz In 100 kHz Stappe)</string>
+    <string name="regional_band_summary_new_zealand">New Seeland (88.0MHz Tot 107.0MHz In 100 khz Stappe)</string>
+    <string name="regional_band_summary_norway">Noorweë (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_poland">Pole (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 tot 108.0 MHz in 50 kHz Stappe)</string>
+    <string name="regional_band_summary_russia">Rusland (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_singapore">Singapoer (88.0 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_slovakia">Slowakye (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_spain">Spanje (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_switzerland">Switserland (87.5MHz Tot 108.0MHz In 100 kHz Stappe)</string>
+    <string name="regional_band_summary_sweden">Swede (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_turkey">Turkye (87.5 tot 108.0 MHz in 100 kHz Stappe)</string>
+    <string name="regional_band_summary_united_kingdom">Verenigde Koninkryk (87.5MHz Tot 108.0MHz In 100 khz Stappe)</string>
+    <string name="regional_band_summary_united_states">Verenigde State van Amerika (88.1MHz Tot 107.9MHz In 200 Khz Stappe)</string>
+    <string name="regional_band_summary_user_defined">Gebruiker gedefinieerde Band</string>
+    <string name="aud_output_mode">Klank uitvoer Modus</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Opname Tydperk</string>
+    <string name="auto_select_af">Alternatiewe Frekwensie</string>
+    <string name="settings_revert_defaults_title">Terugkeer na fabriek instellings</string>
+    <string name="settings_revert_defaults_summary">Herstel alle instellings</string>
+    <string name="settings_revert_confirm_title">Bevestig herstel</string>
+    <string name="settings_revert_confirm_msg">Dit sal al die program instellings, insluitend jou vooraf ingestelde lys verwyder, gaan voort?</string>
+    <string name="no_storage">Laai SD kaart voor opname begin.</string>
+    <string name="preparing_sd">Berei tans SD-kaart voor…</string>
+    <string name="access_sd_fail">Kon nie toegang tot SD-kaart kry nie.</string>
+    <string name="spaceIsLow_content">Jou SD kaart is besig om uit spasie te hardloop. Verander die kwaliteits instelling of verwyder \'n paar foto of ander lêers.</string>
+    <string name="FMRecording_reach_size_limit">Grootte beperking bereik.</string>
+    <string name="menu_scan_for_preset">Skandeer vir voorafingestelde stasies</string>
+    <string name="fm_off">FM is afgeskakel.</string>
+    <string name="fm_call">FM kan nie gebruik word wanneer jy bel nie.</string>
+    <string name="alert_dialog_hint">Tik \'n naam</string>
+    <string name="search_dialog_title">Skandeer stasies</string>
+    <string name="fm_command_timeout_title">Tyd verstreke</string>
+    <string name="fm_tune_timeout_msg">Geen reaksie ontvang van FM Stasie. As die probleem voortduur, Skakel FM Radio af en aan.</string>
+    <string name="fm_command_failed_title">FM werking het misluk</string>
+    <string name="fm_cmd_failed_msg">FM werking het misluk. As die probleem voortduur, Skakel FM Radio af en aan.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM werking het misluk. FM en HDMI geluiktydige werking word nie ondersteun nie.</string>
+    <string name="fm_cmd_failed_call_on">FM klank word nie toegelaat tydens \'n oproep.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">My FM opnames</string>
+    <string name="audio_db_album_name">FM opnames</string>
+    <string name="audio_db_playlist_name">FM opnames</string>
+    <string name="station_name">Stasie:</string>
+    <string name="station_exists">Hierdie frekwensie bestaan ​​reeds!</string>
+    <string name="station_list_delete_station">Verwyder:<xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Is jy seker jy will <xliff:g id="name">%s</xliff:g> verwyder.</string>
+    <string name="station_name_empty">Stasie se naam is leeg, probeer asseblief weer.</string>
+    <string name="station_name_exist">Daar is reeds \'n stasie met die naam \"<xliff:g id="name">%s</xliff:g>\". Gebruik asseblief \'n ander naam.</string>
+    <string name="rt_plus_tags">Etikette</string>
+    <string name="usr_def_band_min">Laer Freq Limiet(In Mhz)</string>
+    <string name="usr_def_band_max">Hoër Freq Limiet(In Mhz)</string>
+    <string name="chanl_spacing">Kanaal spasie</string>
+    <string name="set">Stel</string>
+    <string name="user_defind_band_msg">Tik frekwensie 76.0 tot 108.0 MHz met \'n minimum 1 kanaal spasiëring en 100 kHz spasie in tussen min en maksimum frekwensie</string>
+    <string name="save_record_file">FM opname lêer gestoor na \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Geen versoenbare stasies was gevind</string>
+    <string name="typ_All_stations">Al die stasies</string>
+    <string name="typ_Culture">Kultuur</string>
+    <string name="typ_Current_affairs">Huidige Sake</string>
+    <string name="typ_Children">Kinder programme</string>
+    <string name="typ_Country">Country musiek</string>
+    <string name="typ_Documentary">Dokumentêre</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Maklike luister musiek</string>
+    <string name="typ_Education">Onderwys</string>
+    <string name="typ_Emergency">Nood</string>
+    <string name="typ_Emergency_test">Noodgeval toets</string>
+    <string name="typ_Finance">Finansies</string>
+    <string name="typ_Folk">Volksmusiek</string>
+    <string name="typ_Information">Inligting</string>
+    <string name="typ_Jazz">Jazz musiek</string>
+    <string name="typ_Light_classical">Ligte klassieke</string>
+    <string name="typ_Leisure">Ontspanning</string>
+    <string name="typ_News">Nuus</string>
+    <string name="typ_National">Nasionale musiek</string>
+    <string name="typ_Other">Ander musiek</string>
+    <string name="typ_Oldies">Oues van dae musiek</string>
+    <string name="typ_Phone_in">Skakel in</string>
+    <string name="typ_Pop">Pop Musiek</string>
+    <string name="typ_Religion">Geloof</string>
+    <string name="typ_Rock">Rock musiek</string>
+    <string name="typ_Science">Wetenskap</string>
+    <string name="typ_Serious_classical">Ernstige klassieke</string>
+    <string name="typ_Social_affairs">Sosiale sake</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Reis</string>
+    <string name="typ_Varied">Gevarieerde</string>
+    <string name="typ_Weather">Weer</string>
+    <string name="typ_Adult_hits">Volwasse treffers</string>
+    <string name="typ_Classical">Klassiek</string>
+    <string name="typ_Classic_Rock">Klassieke Rock</string>
+    <string name="typ_College">Kollege</string>
+    <string name="typ_Foreign_language">Buitelandse taal</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgie</string>
+    <string name="typ_Personality">Persoonlikheid</string>
+    <string name="typ_Public">Publiek</string>
+    <string name="typ_Religious_music">Godsdienstige musiek</string>
+    <string name="typ_Religious_talk">Godsdienstige besprekings</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm en Blues</string>
+    <string name="typ_Spanish_music">Spaanse musiek</string>
+    <string name="typ_Spanish_talk">Praat spaans</string>
+    <string name="typ_Soft">Sagte</string>
+    <string name="typ_Soft_Rock">Sagte Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Sagte Rhythm en Blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Besprekings</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ar/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ar/arrays.xml
index cb1457b..5bb334f 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ar/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>ستريو</item>
+    <item>أُحادي</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 كيلو هرتز</item>
+    <item>100 كيلو هرتز</item>
+    <item>200 كيلوهرتز</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ar/strings.xml b/fmapp2/res/values-ar/strings.xml
new file mode 100644
index 0000000..ef892e8
--- /dev/null
+++ b/fmapp2/res/values-ar/strings.xml
@@ -0,0 +1,233 @@
+<?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</string>
+    <string name="tx_app_name">مرسل FM</string>
+    <string name="menu_scan_start">فحص</string>
+    <string name="menu_scan_stop">إيقاف البحث</string>
+    <string name="menu_record_start">تسجيل</string>
+    <string name="menu_record_stop">إيقاف التسجيل</string>
+    <string name="menu_settings">الإعدادات</string>
+    <string name="menu_sleep">النوم</string>
+    <string name="menu_sleep_cancel">إلغاء النوم</string>
+    <string name="menu_all_channels">كل القنوات</string>
+    <string name="menu_display_tags">إظهار العلامات</string>
+    <string name="button_text_stop">إيقاف</string>
+    <string name="msg_seeking">جاري البحث عن محطة FM\u2026</string>
+    <string name="msg_scanning">جاري البحث عن كل محطات FM\u2026</string>
+    <string name="msg_scanning_pty">جاري البحث عن \'<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> ميجا هرتز</string>
+    <string name="msg_searching_title">الإعدادات المسبقة للتحديد التلقائي</string>
+    <string name="msg_searching">جاري البحث عن محطات قوية لإنشاء قائمة محددة مسبقاً\u2026</string>
+    <string name="msg_noantenna">الرجاء توصيل سماعات الرأس لأستخدام راديو FM</string>
+    <string name="dialog_sleep_title">مهلة الإيقاف التلقائي</string>
+    <string name="presetlist_select_name">حدد \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">إضافة قائمة جديدة</string>
+    <string name="dialog_presetlist_rename_title">أدخل الاسم:</string>
+    <string name="presetlist_autoselect_title">تأكيد التحديد التلقائي</string>
+    <string name="preset_replace">استبدال</string>
+    <string name="preset_tune">لحن</string>
+    <string name="preset_rename">إعادة تسمية</string>
+    <string name="preset_delete">حذف</string>
+    <string name="preset_search">بحث عن \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' ميجا هرتز</string>
+    <string name="regional_band">الفرقة الإقليمية</string>
+    <string name="regional_band_entry_north_america">أمريكا الشّماليّة</string>
+    <string name="regional_band_entry_europe">أوروبا</string>
+    <string name="regional_band_entry_japan">اليابان</string>
+    <string name="regional_band_entry_japan_wide">اليابان (عريض)</string>
+    <string name="regional_band_entry_australia">أستراليا</string>
+    <string name="regional_band_entry_austria">النمسا</string>
+    <string name="regional_band_entry_belgium">بلجيكا</string>
+    <string name="regional_band_entry_brazil">البرازيل</string>
+    <string name="regional_band_entry_china">الصين</string>
+    <string name="regional_band_entry_czech_republic">جمهورية التّشيك</string>
+    <string name="regional_band_entry_denmark">الدانمارك</string>
+    <string name="regional_band_entry_finland">فنلندا</string>
+    <string name="regional_band_entry_france">فرنسا</string>
+    <string name="regional_band_entry_germany">ألمانيا</string>
+    <string name="regional_band_entry_greece">اليونان</string>
+    <string name="regional_band_entry_hong_kong">هونغ كونغ</string>
+    <string name="regional_band_entry_india">الهند</string>
+    <string name="regional_band_entry_indonesia">أندونيسيا</string>
+    <string name="regional_band_entry_ireland">أيرلندا</string>
+    <string name="regional_band_entry_italy">إيطاليا</string>
+    <string name="regional_band_entry_korea">كوريا</string>
+    <string name="regional_band_entry_mexico">المكسيك</string>
+    <string name="regional_band_entry_netherlands">هولندا</string>
+    <string name="regional_band_entry_new_zealand">نيوزيلندا</string>
+    <string name="regional_band_entry_norway">النرويج</string>
+    <string name="regional_band_entry_poland">بولندا</string>
+    <string name="regional_band_entry_portugal">البرتغال</string>
+    <string name="regional_band_entry_russia">روسيا</string>
+    <string name="regional_band_entry_singapore">سنغافورة</string>
+    <string name="regional_band_entry_slovakia">سلوفاكيا</string>
+    <string name="regional_band_entry_spain">إسبانيا</string>
+    <string name="regional_band_entry_switzerland">سويسرا</string>
+    <string name="regional_band_entry_sweden">السويد</string>
+    <string name="regional_band_entry_taiwan">تايوان</string>
+    <string name="regional_band_entry_turkey">تركيا</string>
+    <string name="regional_band_entry_united_kingdom">المملكة المتحدة</string>
+    <string name="regional_band_entry_united_states">الولايات المتحدة</string>
+    <string name="regional_band_entry_user_defined">الفرقة المعرفة من قبل المستخدم</string>
+    <string name="regional_band_summary_north_america">أمريكا الشمالية (من 87.5 إلى 108 ميغاهرتز بخطوات 200 kHz)</string>
+    <string name="regional_band_summary_europe">أوروبا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_japan">اليابان (76.0 ميجاهرتز إلى 90.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_japan_wide">اليابان (عريض) (90.0 ميجاهرتز إلى ميجاهرتز 108.0 في شكل مراحل مكونة من 50 كيلو هرتز)</string>
+    <string name="regional_band_summary_australia">أستراليا (87.7 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_austria">النمسا (87.5 ميغاهرتز إلى 108.0 ميغاهرتز في شكل خطوات مكونة من 50 كيلو هرتز)</string>
+    <string name="regional_band_summary_belgium">بلجيكا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_brazil">البرازيل (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل من 200 كيلوهرتز)</string>
+    <string name="regional_band_summary_china">الصين (87.0 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_czech_republic">جمهورية التشيك (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_denmark">الدنمارك (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل من 50 كيلو هرتز)</string>
+    <string name="regional_band_summary_finland">فنلندا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_france">فرنسا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_germany">ألمانيا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 50 كيلو هرتز)</string>
+    <string name="regional_band_summary_greece">اليونان (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 50 كيلو هرتز)</string>
+    <string name="regional_band_summary_hong_kong">هونغ كونغ (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_india">الهند (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_indonesia">أندونيسيا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز على شكل مراحل مكونة من 100 كيلوهرتز)</string>
+    <string name="regional_band_summary_ireland">أيرلندا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 50 كيلو هرتز)</string>
+    <string name="regional_band_summary_italy">إيطاليا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 50 كيلو هرتز)</string>
+    <string name="regional_band_summary_korea">كوريا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 200 كيلوهرتز)</string>
+    <string name="regional_band_summary_mexico">المكسيك (88.1 ميجاهرتز إلى 107.9 ميجاهرتز على شكل مراحل مكونة من 200 كيلوهرتز)</string>
+    <string name="regional_band_summary_netherlands">هولندا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_new_zealand">نيوزيلندا (88.0 ميجاهرتز إلى 107.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_norway">النرويج (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_poland">بولندا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_portugal">البرتغال (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 50 كيلو هرتز)</string>
+    <string name="regional_band_summary_russia">روسيا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_singapore">سنغافورة (88.0 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_slovakia">سلوفاكيا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_spain">إسبانيا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_switzerland">سويسرا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز في شكل مراحل مكونة من100 كيلو هرتز)</string>
+    <string name="regional_band_summary_sweden">السويد (87.5 ميجاهرتز إلى 108.0ميجاهرتز على شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_taiwan">تايوان (87.5 ميجاهرتز إلى 108.0 ميجاهرتز على شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_turkey">تركيا (87.5 ميجاهرتز إلى 108.0 ميجاهرتز على شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_united_kingdom">المملكة المتحدة (87.5 ميجاهرتز إلى 108.0 ميجاهرتز على شكل مراحل مكونة من 100 كيلو هرتز)</string>
+    <string name="regional_band_summary_united_states">الولايات المتحدة (88.1 ميجاهرتز إلى 107.9 ميجاهرتز على شكل مراحل مكونة من 200 كيلوهرتز)</string>
+    <string name="regional_band_summary_user_defined">النطاق المعرف من قبل المستخدم</string>
+    <string name="aud_output_mode">وضع خرج الصوت</string>
+    <string name="audio_type_stereo">استيريو</string>
+    <string name="audio_type_mono">أُحادي</string>
+    <string name="record_dur">مدة التسجيل</string>
+    <string name="auto_select_af">التردد البديل</string>
+    <string name="settings_revert_defaults_title">العودة إلى إعدادات المصنع الافتراضية</string>
+    <string name="settings_revert_defaults_summary">إعادة تعيين كل الإعدادات</string>
+    <string name="settings_revert_confirm_title">تأكيد إعادة التعيين</string>
+    <string name="settings_revert_confirm_msg">سيترتب على ذلك مسح كل إعدادات التطبيق، بما في ذلك الإعدادات المسبقة المحفوظة. هل تريد الاستمرار؟ </string>
+    <string name="no_storage">تحميل بطاقة SD قبل بدء التسجيل.</string>
+    <string name="preparing_sd">جاري إعداد بطاقة SD\u2026</string>
+    <string name="access_sd_fail">‏تعذر الوصول إلى بطاقة SD.</string>
+    <string name="spaceIsLow_content">نفاد مساحة مخزن بطاقة SD. تغيير إعداد الجودة أو حذف بعض الملفات الأخرى لتحرير مساحة.</string>
+    <string name="FMRecording_reach_size_limit">تم بلوغ حد الحجم.</string>
+    <string name="menu_scan_for_preset">تفحص عن الإعدادات المسبقة</string>
+    <string name="fm_off">FM مغلق.</string>
+    <string name="fm_call">لا يمكن استخدام FM أثناء الاتصال.</string>
+    <string name="alert_dialog_hint">قم بإدخال اسم</string>
+    <string name="search_dialog_title">تفحص المحطات</string>
+    <string name="fm_command_timeout_title">مهلة</string>
+    <string name="fm_tune_timeout_msg">لم يتم استلام رد لضبط محطة FM. إذا استمرت المشكلة، الرجاء إيقاف تشغيل FM وتشغيلها مرة أخرى.</string>
+    <string name="fm_command_failed_title">فشلت عملية FM</string>
+    <string name="fm_cmd_failed_msg">فشلت عملية FM. إذا استمرت المشكلة، الرجاء إيقاف تشغيل FM وتشغيله مرة أخرى.</string>
+    <string name="fm_cmd_failed_msg_hdmi">فشلت عملية FM. التزامن FM و HDMI غير مدعوم.</string>
+    <string name="fm_cmd_failed_call_on">فشلت عملية FM. غير مسموح بالصوت FM أثناء المكالمة.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">تسجيلات FM الخاصة بي</string>
+    <string name="audio_db_album_name">تسجيلات FM</string>
+    <string name="audio_db_playlist_name">تسجيلات FM</string>
+    <string name="station_name">المحطة:</string>
+    <string name="station_exists">هذا التردد موجود بالفعل!</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="station_name_empty">اسم المحطة فارغ، الرجاء إدخال مرة أخرى.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\'قيد الاستخدام بالفعل، يُرجى إدخال اسم مختلف.</string>
+    <string name="rt_plus_tags">العلامات</string>
+    <string name="usr_def_band_min">أدنى تردد (ميجا هرتز)</string>
+    <string name="usr_def_band_max">أعلى تردد (ميجا هرتز)</string>
+    <string name="chanl_spacing">مباعدة بين القنوات</string>
+    <string name="set">تعيين</string>
+    <string name="user_defind_band_msg">أدخل تردد من 76.0 إلى 108.0 ميجاهرتز بحد أدنى مساحة قناة واحدة و100 كيلو هرتز بين الحد الأدنى والحد الأقصى للتردد</string>
+    <string name="save_record_file">تم حفظ الملف FM المسجل على \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">لم يتم العثور على محطات متوافقة</string>
+    <string name="typ_All_stations">جميع المحطات</string>
+    <string name="typ_Culture">ثقافة</string>
+    <string name="typ_Current_affairs">الشؤون الجارية</string>
+    <string name="typ_Children">برامج الأطفال</string>
+    <string name="typ_Country">موسيقى الريف</string>
+    <string name="typ_Documentary">فيلم وثائقي</string>
+    <string name="typ_Drama">دراما</string>
+    <string name="typ_Easy_listening">الاستماع السهل لي الموسيقى</string>
+    <string name="typ_Education">التعليم</string>
+    <string name="typ_Emergency">طوارئ</string>
+    <string name="typ_Emergency_test">اختبار حالات الطوارئ</string>
+    <string name="typ_Finance">الشؤون المالية</string>
+    <string name="typ_Folk">الموسيقى الشعبية</string>
+    <string name="typ_Information">معلومات</string>
+    <string name="typ_Jazz">موسيقى الجاز</string>
+    <string name="typ_Light_classical">الخفيفة الكلاسيكية</string>
+    <string name="typ_Leisure">أوقات الفراغ</string>
+    <string name="typ_News">أخبار</string>
+    <string name="typ_National">الموسيقى الوطنية</string>
+    <string name="typ_Other">موسيقى أخرى</string>
+    <string name="typ_Oldies">الموسيقى القديمة</string>
+    <string name="typ_Phone_in">الهاتف في</string>
+    <string name="typ_Pop">موسيقى البوب</string>
+    <string name="typ_Religion">دين</string>
+    <string name="typ_Rock">موسيقى الروك</string>
+    <string name="typ_Science">علوم</string>
+    <string name="typ_Serious_classical">خطيرة كلاسيكية</string>
+    <string name="typ_Social_affairs">الشؤون الاجتماعية</string>
+    <string name="typ_Sport">رياضة</string>
+    <string name="typ_Travel">السفر</string>
+    <string name="typ_Varied">متفاوت</string>
+    <string name="typ_Weather">طقس</string>
+    <string name="typ_Adult_hits">مشاهدة متنوعة</string>
+    <string name="typ_Classical">كلاسيكي</string>
+    <string name="typ_Classic_Rock">كلاسيك روك</string>
+    <string name="typ_College">كلية</string>
+    <string name="typ_Foreign_language">لغة أجنبية</string>
+    <string name="typ_Hiphop">الهيب هوب</string>
+    <string name="typ_Nostalgia">حنين</string>
+    <string name="typ_Personality">شخصية</string>
+    <string name="typ_Public">العام</string>
+    <string name="typ_Religious_music">الموسيقى الدينية</string>
+    <string name="typ_Religious_talk">حديث ديني</string>
+    <string name="typ_Rhythm_and_Blues">ريذم أند بلوز</string>
+    <string name="typ_Spanish_music">الموسيقى الإسبانية</string>
+    <string name="typ_Spanish_talk">البرامج الإسبانية</string>
+    <string name="typ_Soft">ناعم</string>
+    <string name="typ_Soft_Rock">صاخب ناعم</string>
+    <string name="typ_Soft_Rhythm_and_Blues">ريذم أند بلوز مريح</string>
+    <string name="typ_Sports">رياضات</string>
+    <string name="typ_Talk">الحديث</string>
+    <string name="typ_Top_40">أعلى 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-as/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-as/arrays.xml
index cb1457b..721502a 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-as/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>ষ্টিৰিঅ\'</item>
+    <item>ম’ন’</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-as/strings.xml b/fmapp2/res/values-as/strings.xml
new file mode 100644
index 0000000..5a3c0a4
--- /dev/null
+++ b/fmapp2/res/values-as/strings.xml
@@ -0,0 +1,189 @@
+<?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 ৰেডিঅ’</string>
+    <string name="tx_app_name">FM ট্ৰান্সমিটাৰ</string>
+    <string name="menu_scan_start">স্কেন</string>
+    <string name="menu_scan_stop">অনুসন্ধান ৰোধ কৰক</string>
+    <string name="menu_record_start">ৰেকৰ্ড</string>
+    <string name="menu_record_stop">ৰেকৰ্ডিং আৰম্ভ কৰক</string>
+    <string name="menu_settings">ছেটিংছ</string>
+    <string name="menu_sleep">টোপনি</string>
+    <string name="menu_sleep_cancel">সুপ্ত বাতিল কৰক</string>
+    <string name="menu_all_channels">সকলো চেনেল</string>
+    <string name="menu_display_tags">টেগসমূহ প্ৰদৰ্শন কৰক</string>
+    <string name="button_text_stop">ষ্টপ</string>
+    <string name="msg_seeking">FM ষ্টেচন অনুসন্ধান কৰা আছে\u2026</string>
+    <string name="msg_scanning">সকলো FM ষ্টেচন বিচাৰি আছে\u2026</string>
+    <string name="msg_scanning_pty">\'<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">স্বয়ং-চয়ন প্ৰিছেট</string>
+    <string name="msg_searching">প্ৰিছেট সূচী সৃষ্টি কৰিবলৈ শক্তিশালী ষ্টেচন বিচাৰি আছে\u2026</string>
+    <string name="msg_noantenna">FM ৰেডিঅ\' ব্যৱহাৰ কৰিবলৈ অনুগ্ৰহ কৰি এটা হেডছেট প্লাগ ইন কৰক</string>
+    <string name="dialog_sleep_title">সুপ্ত সময় স্বয়ং-অফ</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' চয়ন কৰক</string>
+    <string name="presetlist_add_new">নতুন সূচী যোগ কৰক</string>
+    <string name="dialog_presetlist_rename_title">নাম প্ৰৱেশ কৰক</string>
+    <string name="presetlist_autoselect_title">স্বয়ং-চয়ন নিশ্চিত কৰক</string>
+    <string name="preset_replace">ৰিপ্লেচ</string>
+    <string name="preset_tune">টিউন কৰক</string>
+    <string name="preset_rename">পুনঃনামাকৰণ</string>
+    <string name="preset_delete">মচি দিয়া</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' বিচাৰক</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">আঞ্চলিক বেণ্ড</string>
+    <string name="regional_band_entry_north_america">উত্তৰ আমেৰিকা</string>
+    <string name="regional_band_entry_europe">ইউৰোপ</string>
+    <string name="regional_band_entry_japan">জাপান</string>
+    <string name="regional_band_entry_japan_wide">জাপান (বিস্তৃত)</string>
+    <string name="regional_band_entry_australia">অষ্ট্ৰেলিয়া</string>
+    <string name="regional_band_entry_austria">অষ্ট্ৰিয়া</string>
+    <string name="regional_band_entry_belgium">বেলজিয়াম</string>
+    <string name="regional_band_entry_brazil">ব্ৰাজিল</string>
+    <string name="regional_band_entry_china">চীন</string>
+    <string name="regional_band_entry_czech_republic">ছেক প্ৰজাতন্ত্ৰ</string>
+    <string name="regional_band_entry_denmark">ডেনমাৰ্ক</string>
+    <string name="regional_band_entry_finland">ফিনলেণ্ড</string>
+    <string name="regional_band_entry_france">ফ্ৰান্স</string>
+    <string name="regional_band_entry_germany">জাৰ্মানী</string>
+    <string name="regional_band_entry_greece">গ্ৰীচ</string>
+    <string name="regional_band_entry_hong_kong">হংকং</string>
+    <string name="regional_band_entry_india">ভাৰত</string>
+    <string name="regional_band_entry_indonesia">ইণ্ডোনেচিয়া</string>
+    <string name="regional_band_entry_ireland">আয়াৰলেণ্ড</string>
+    <string name="regional_band_entry_italy">ইটালী</string>
+    <string name="regional_band_entry_korea">কোৰিয়া</string>
+    <string name="regional_band_entry_mexico">মেক্সিক\'</string>
+    <string name="regional_band_entry_netherlands">নেদাৰলেণ্ডচ</string>
+    <string name="regional_band_entry_new_zealand">নিউজিলেণ্ড</string>
+    <string name="regional_band_entry_norway">ন\'ৰৱে</string>
+    <string name="regional_band_entry_poland">পোলেণ্ড</string>
+    <string name="regional_band_entry_portugal">পর্তুগাল</string>
+    <string name="regional_band_entry_russia">ৰাছিয়া</string>
+    <string name="regional_band_entry_singapore">ছিঙ্গাপুৰ</string>
+    <string name="regional_band_entry_slovakia">শ্লোভেকিয়া</string>
+    <string name="regional_band_entry_spain">স্পেন</string>
+    <string name="regional_band_entry_switzerland">চুইজাৰলেণ্ড</string>
+    <string name="regional_band_entry_sweden">চুইডেন</string>
+    <string name="regional_band_entry_taiwan">টাইৱান</string>
+    <string name="regional_band_entry_turkey">তুৰ্কী</string>
+    <string name="regional_band_entry_united_kingdom">ইউনাইটেড কিংডম</string>
+    <string name="regional_band_entry_united_states">যুক্তৰাষ্ট্ৰ</string>
+    <string name="regional_band_entry_user_defined">ব্যৱহাৰকৰ্তাৰ দ্বাৰা নিৰ্ধাৰিত বেণ্ড</string>
+    <string name="regional_band_summary_user_defined">ব্যৱহাৰকৰ্তাৰ দ্বাৰা নিৰ্ধাৰিত বেণ্ড</string>
+    <string name="aud_output_mode">অডিঅ\' আউটপুট মোড</string>
+    <string name="audio_type_stereo">ষ্টিৰিঅ\'</string>
+    <string name="audio_type_mono">ম’ন’</string>
+    <string name="record_dur">ৰেকৰ্ড অৱধি</string>
+    <string name="auto_select_af">বৈকল্পিক ফ্ৰিকুৱেঞ্চি</string>
+    <string name="settings_revert_defaults_title">ফেক্টৰী ডিফ\'ল্টলৈ ঘূৰাই নিয়ক</string>
+    <string name="settings_revert_defaults_summary">সকলো ছেটিংচ ৰিছেট কৰক</string>
+    <string name="settings_revert_confirm_title">ৰিছেট নিশ্চিত কৰক</string>
+    <string name="settings_revert_confirm_msg">ই সংৰক্ষণ কৰা প্ৰিছেটসহ সকলো এপ্লিকেচন ছেটিং পৰিষ্কাৰ কৰিব। অব্যাহত ৰাখিবনে?</string>
+    <string name="no_storage">ৰেকৰ্ডিং আৰম্ভ কৰা আগতে SD কাৰ্ড মাউণ্ট কৰক।</string>
+    <string name="preparing_sd">SD কাৰ্ড প্ৰস্তুত কৰি তোলা হৈছে\u2026</string>
+    <string name="access_sd_fail">SD কাৰ্ড আহৰণ কৰিব নোৱাৰে।</string>
+    <string name="spaceIsLow_content">আপোনাৰ SD কাৰ্ডৰ স্থান কমি গৈছে। স্থান মুকলি কৰিবলৈ গুণমান ছেটিং পৰিৱৰ্তন কৰক বা আন কিছুমান ফাইল বিলোপ কৰক।</string>
+    <string name="menu_scan_for_preset">প্ৰিছেটৰ বাবে স্কেন কৰক</string>
+    <string name="fm_off">FM অফ কৰা হৈছে।</string>
+    <string name="fm_call">কল কৰি থাকোতে FM ব্যৱহাৰ কৰিব নোৱাৰি।</string>
+    <string name="alert_dialog_hint">এটা নাম প্ৰৱেশ কৰক</string>
+    <string name="search_dialog_title">ষ্টেচন স্কেন কৰক</string>
+    <string name="fm_command_timeout_title">টাইম আউট</string>
+    <string name="fm_tune_timeout_msg">FM ষ্টেচন টিউনলৈ কোনো সঁহাৰি পোৱা নাই। যদি সমস্যাটো চলি থাকে, অনুগ্ৰহ কৰি FM অফ কৰক আৰু পুনৰ অন কৰক।</string>
+    <string name="fm_command_failed_title">FM অপাৰেচন ব্যৰ্থ হৈছে</string>
+    <string name="fm_cmd_failed_msg">FM অপাৰেচন ব্যৰ্থ হৈছে। যদি সমস্যাটো চলি থাকে, অনুগ্ৰহ কৰি FM অফ কৰক আৰু পুনৰ অন কৰক।</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM অপাৰেচন ব্যৰ্থ হৈছে। FM আৰু HDMI একেলগে সমৰ্থন নকৰে।</string>
+    <string name="fm_cmd_failed_call_on">FM অপাৰেচন ব্যৰ্থ হৈছে। কল চলি থকা সময়ত FM অডিঅ\'ৰ অনুমতি দিয়া নহয়।</string>
+    <string name="station_name">ষ্টেচন:</string>
+    <string name="station_exists">এই ফ্ৰিকোৱেন্সী ইতিমধ্যে বিদ্যমান!</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="station_name_empty">ষ্টেচনৰ নাম খালি আছে, অনুগ্ৰহ কৰি পুনৰ প্ৰবিষ্ট কৰক।</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' টো ইতিমধ্যে ব্যৱহাৰ হৈ আছে, অনুগ্ৰহ কৰি আন এটা নাম প্ৰৱেশ কৰক।</string>
+    <string name="rt_plus_tags">টেগসমূহ</string>
+    <string name="usr_def_band_min">সৰ্বনিম্ন ফ্ৰিকোৱেন্সী (MHz)</string>
+    <string name="usr_def_band_max">সৰ্বাধিক ফ্ৰিকোৱেন্সী (MHz)</string>
+    <string name="chanl_spacing">চেনেল স্পেচিং</string>
+    <string name="set">ছেট</string>
+    <string name="fm_search_no_results">কোনো সুসংগত ষ্টেচন পোৱা নগ\'ল</string>
+    <string name="typ_All_stations">সকলো ষ্টেচন</string>
+    <string name="typ_Culture">সংস্কৃতি</string>
+    <string name="typ_Current_affairs">চলিত ঘটনাপ্ৰৱাহ</string>
+    <string name="typ_Children">শিশুসকলৰ প্ৰ\'গ্ৰাম্চ</string>
+    <string name="typ_Country">দেশীয় সংগীত</string>
+    <string name="typ_Documentary">তথ্যচিত্ৰ</string>
+    <string name="typ_Drama">নাটক</string>
+    <string name="typ_Easy_listening">সহজে শুনিব পৰা সংগীত</string>
+    <string name="typ_Education">শিক্ষা</string>
+    <string name="typ_Emergency">জৰুৰীকালীন</string>
+    <string name="typ_Emergency_test">জৰুৰীঅৱস্থা পৰীক্ষা</string>
+    <string name="typ_Finance">বিত্ত</string>
+    <string name="typ_Folk">লোকসংগীত</string>
+    <string name="typ_Information">তথ্য</string>
+    <string name="typ_Jazz">জাজ সংগীত</string>
+    <string name="typ_Light_classical">লঘূ শাস্ত্ৰীয়</string>
+    <string name="typ_Leisure">অৱসৰ</string>
+    <string name="typ_News">সংবাদ</string>
+    <string name="typ_National">ৰাষ্ট্ৰীয় সংগীত</string>
+    <string name="typ_Other">আন সংগীত</string>
+    <string name="typ_Oldies">পুৰণি সংগীত</string>
+    <string name="typ_Phone_in">ফোন ইন</string>
+    <string name="typ_Pop">পপ সংগীত</string>
+    <string name="typ_Religion">ধৰ্ম</string>
+    <string name="typ_Rock">ৰক সংগীত</string>
+    <string name="typ_Science">বিজ্ঞান</string>
+    <string name="typ_Serious_classical">গুৰু শাস্ত্ৰীয়</string>
+    <string name="typ_Social_affairs">সামাজিক পৰিক্ৰমা</string>
+    <string name="typ_Sport">খেল</string>
+    <string name="typ_Travel">ভ্ৰমণ</string>
+    <string name="typ_Varied">বিভিন্ন</string>
+    <string name="typ_Weather">বতৰ</string>
+    <string name="typ_Adult_hits">প্ৰাপ্তবয়স্কৰ হিটবোৰ</string>
+    <string name="typ_Classical">ধ্ৰুপদী</string>
+    <string name="typ_Classic_Rock">ক্লাছিক ৰক</string>
+    <string name="typ_College">কলেজ</string>
+    <string name="typ_Foreign_language">বিদেশী ভাষা</string>
+    <string name="typ_Hiphop">হিপ হপ</string>
+    <string name="typ_Nostalgia">নষ্টালজিয়া</string>
+    <string name="typ_Personality">ব্যক্তিত্ব</string>
+    <string name="typ_Public">ৰাইজ</string>
+    <string name="typ_Religious_music">ধৰ্মীয় সংগীত</string>
+    <string name="typ_Religious_talk">ধৰ্মীয় আলোচনা</string>
+    <string name="typ_Rhythm_and_Blues">ৰিডম আৰু ব্লু</string>
+    <string name="typ_Spanish_music">স্পেনিশ্ব সংগীত</string>
+    <string name="typ_Spanish_talk">স্পেনিশ্ব আলোচনা</string>
+    <string name="typ_Soft">চফ্ট</string>
+    <string name="typ_Soft_Rock">চফ্ট ৰক</string>
+    <string name="typ_Soft_Rhythm_and_Blues">চফ্ট ৰিডম আৰু ব্লু</string>
+    <string name="typ_Sports">খেল</string>
+    <string name="typ_Talk">আলোচনা</string>
+    <string name="typ_Top_40">শীৰ্ষ 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ast-rES/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ast-rES/arrays.xml
index cb1457b..9f9d6fd 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ast-rES/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Estéreu</item>
+    <item>Monu</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Estéreu</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>Hasta que pare</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>45 minutos</item>
+    <item>1 hora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ast-rES/strings.xml b/fmapp2/res/values-ast-rES/strings.xml
new file mode 100644
index 0000000..6c32770
--- /dev/null
+++ b/fmapp2/res/values-ast-rES/strings.xml
@@ -0,0 +1,210 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Tresmisor FM</string>
+    <string name="menu_scan_start">Buscar</string>
+    <string name="menu_scan_stop">Dexar de buscar</string>
+    <string name="menu_record_start">Grabar</string>
+    <string name="menu_record_stop">Dexar de grabar</string>
+    <string name="menu_settings">Configuración</string>
+    <string name="menu_sleep">Dormir</string>
+    <string name="menu_sleep_cancel">Encaboxar la dormición</string>
+    <string name="menu_all_channels">Toles canales</string>
+    <string name="menu_display_tags">Amosar les etiquetes</string>
+    <string name="button_text_stop">Parar</string>
+    <string name="msg_seeking">Buscando una emisora FM\u2026</string>
+    <string name="msg_scanning">Buscando toles emisores FM\u2026</string>
+    <string name="msg_scanning_pty">Buscando «<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_noantenna">Conecta unos cascos pa usar la radio FM</string>
+    <string name="dialog_presetlist_rename_title">Introducción d\'un nome</string>
+    <string name="preset_replace">Trocar</string>
+    <string name="preset_tune">Sintonizar</string>
+    <string name="preset_rename">Renomar</string>
+    <string name="preset_delete">Desaniciar</string>
+    <string name="stat_notif_frequency">«<xliff:g id="frequency">%1$s</xliff:g>» MHz</string>
+    <string name="regional_band">Banda rexonal</string>
+    <string name="regional_band_entry_north_america">América del Norte</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Xapón</string>
+    <string name="regional_band_entry_japan_wide">Xapón (con amplitú)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Bélxica</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Chequia</string>
+    <string name="regional_band_entry_denmark">Dinamarca</string>
+    <string name="regional_band_entry_finland">Finlandia</string>
+    <string name="regional_band_entry_france">Francia</string>
+    <string name="regional_band_entry_germany">Alemaña</string>
+    <string name="regional_band_entry_greece">Grecia</string>
+    <string name="regional_band_entry_hong_kong">Ḥong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Corea</string>
+    <string name="regional_band_entry_mexico">Méxicu</string>
+    <string name="regional_band_entry_netherlands">Países Baxos</string>
+    <string name="regional_band_entry_new_zealand">Nueva Zelanda</string>
+    <string name="regional_band_entry_norway">Noruega</string>
+    <string name="regional_band_entry_poland">Polonia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusia</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Eslovaquia</string>
+    <string name="regional_band_entry_spain">España</string>
+    <string name="regional_band_entry_switzerland">Suiza</string>
+    <string name="regional_band_entry_sweden">Suecia</string>
+    <string name="regional_band_entry_taiwan">Taiwán</string>
+    <string name="regional_band_entry_turkey">Turquía</string>
+    <string name="regional_band_entry_united_kingdom">Reinu Xuníu</string>
+    <string name="regional_band_entry_united_states">Estaos Xuníos</string>
+    <string name="regional_band_entry_user_defined">Banda definida pol usuariu</string>
+    <string name="regional_band_summary_north_america">América del Norte (de 87,5 hasta 108,0 MHz en pasos de 200 KHz)</string>
+    <string name="regional_band_summary_europe">Europa (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_japan">Xapón (de 76,0 hasta 90,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_japan_wide">Xapón (con amplitú) (de 90,0 hasta 108,0 MHz en pasos de 50 KHz)</string>
+    <string name="regional_band_summary_australia">Australia (de 87,7 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_austria">Australia (de 87,5 hasta 108,0 MHz en pasos de 50 KHz)</string>
+    <string name="regional_band_summary_belgium">Bélxica (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (de 87,5 hasta 108,0 MHz en pasos de 200 KHz)</string>
+    <string name="regional_band_summary_china">China (de 87,0 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_czech_republic">Chequia (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_denmark">Dinamarca (de 87,5 hasta 108,0 MHz en pasos de 50 KHz)</string>
+    <string name="regional_band_summary_finland">Finlandia (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_france">Francia (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_germany">Alemaña (de 87,5 hasta 108,0 MHz en pasos de 50 KHz)</string>
+    <string name="regional_band_summary_greece">Grecia (de 87,5 hasta 108,0 MHz en pasos de 50 KHz)</string>
+    <string name="regional_band_summary_hong_kong">Ḥong Kong (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_india">India (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (de 87,5 hasta 108,0 MHz en pasos de 50 KHz)</string>
+    <string name="regional_band_summary_italy">Italia (de 87,5 hasta 108,0 MHz en pasos de 50 KHz)</string>
+    <string name="regional_band_summary_korea">Corea (de 87,5 hasta 108,0 MHz en pasos de 200 KHz)</string>
+    <string name="regional_band_summary_mexico">Méxicu (de 88,1 hasta 107,9 MHz en pasos de 200 KHz)</string>
+    <string name="regional_band_summary_netherlands">Países Baxos (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_new_zealand">Nueva Zelanda (de 88,0 hasta 107,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_norway">Noruega (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_poland">Polonia (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (de 87,5 hasta 108,0 MHz en pasos de 50 KHz)</string>
+    <string name="regional_band_summary_russia">Rusia (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_singapore">Singapur (de 88,0 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_slovakia">Eslovaquia (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_spain">España (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_switzerland">Suiza (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_sweden">Suecia (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwán (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_turkey">Turquía (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_united_kingdom">Reinu Xuníu (de 87,5 hasta 108,0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_united_states">Estaos Xuníos (de 88,1 hasta 107,9 MHz en pasos de 200 KHz)</string>
+    <string name="regional_band_summary_user_defined">Banda definida pol usuariu</string>
+    <string name="aud_output_mode">Mou de la salida del audiu</string>
+    <string name="audio_type_stereo">Estéreu</string>
+    <string name="audio_type_mono">Monu</string>
+    <string name="record_dur">Duración de les grabaciones</string>
+    <string name="auto_select_af">Frecuencia alternativa</string>
+    <string name="settings_revert_defaults_title">Reafitar la configuración</string>
+    <string name="settings_revert_defaults_summary">Reafita tola configuración</string>
+    <string name="settings_revert_confirm_msg">Esta aición va borrar tola configuración de l\'aplicación, incluyíos los preaxustes guardaos. ¿Quies siguir?</string>
+    <string name="no_storage">Monta la tarxeta SD enantes d\'aniciar la grabación.</string>
+    <string name="preparing_sd">Tresnando la tarxeta SD\u2026</string>
+    <string name="access_sd_fail">Nun se pudo acceder a la tarxeta SD.</string>
+    <string name="fm_off">La radio FM ta apagada.</string>
+    <string name="fm_call">La radio FM nun se pue usar nes llamaes telefóniques.</string>
+    <string name="alert_dialog_hint">Introduz un nome</string>
+    <string name="search_dialog_title">Busca d\'emisores</string>
+    <string name="fm_tune_timeout_msg">Nun se recibió nenguna rempuesta pa sintonizar la emisora FM. Si\'l problema sigue, desactiva la radio FM y volvi activala.</string>
+    <string name="fm_command_failed_title">Operación FM fallida</string>
+    <string name="fm_cmd_failed_msg">La operación FM falló. Si sigue\'l problema, apaga la radio ya volvi prendela.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Falló la operación FM. Usar la radio ya\'l HDMI nun ye téunicamente compatible.</string>
+    <string name="fm_cmd_failed_call_on">La operación FM falló. Nun se permite l\'audiu FM demientres les llamaes.</string>
+    <string name="audio_db_artist_name">Les mios grabaciones FM</string>
+    <string name="audio_db_album_name">Grabaciones FM</string>
+    <string name="audio_db_playlist_name">Grabaciones FM</string>
+    <string name="station_name">Emisora:</string>
+    <string name="station_exists">¡Esta frecuencia yá esiste!</string>
+    <string name="station_list_delete_station_prompt">¿De xuru que quies desaniciar «<xliff:g id="name">%s</xliff:g>»?</string>
+    <string name="station_name_empty">El nome de la emisora ta baleru. Introduz unu.</string>
+    <string name="station_name_exist">«<xliff:g id="name">%s</xliff:g>» yá ta n\'usu. Introduz otru nome.</string>
+    <string name="rt_plus_tags">Etiquetes</string>
+    <string name="usr_def_band_min">La frecuencia más baxa (MHz)</string>
+    <string name="usr_def_band_max">La frecuencia más alta (MHz)</string>
+    <string name="chanl_spacing">Esparu de canales</string>
+    <string name="set">Afitar</string>
+    <string name="save_record_file">La grabación de la radio FM guardóse en «<xliff:g id="record_file">%1$s</xliff:g>»</string>
+    <string name="fm_search_no_results">Nun s\'atopó nenguna emisora compatible</string>
+    <string name="typ_All_stations">Toles emisores</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Actualidá</string>
+    <string name="typ_Children">Programes pa neños</string>
+    <string name="typ_Country">Música country</string>
+    <string name="typ_Documentary">Documentales</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Música agradable</string>
+    <string name="typ_Education">Educación</string>
+    <string name="typ_Emergency">Emerxencia</string>
+    <string name="typ_Emergency_test">Prueba d\'emerxencia</string>
+    <string name="typ_Finance">Finances</string>
+    <string name="typ_Folk">Música folk</string>
+    <string name="typ_Information">Información</string>
+    <string name="typ_Jazz">Música jazz</string>
+    <string name="typ_Light_classical">Música clásica llixera</string>
+    <string name="typ_Leisure">Ociu</string>
+    <string name="typ_News">Noticies</string>
+    <string name="typ_National">Música nacional</string>
+    <string name="typ_Other">Otra música</string>
+    <string name="typ_Oldies">Música antigua</string>
+    <string name="typ_Pop">Música pop</string>
+    <string name="typ_Religion">Relixón</string>
+    <string name="typ_Rock">Música rock</string>
+    <string name="typ_Science">Ciencia</string>
+    <string name="typ_Social_affairs">Temes sociales</string>
+    <string name="typ_Sport">Deportes</string>
+    <string name="typ_Travel">Viaxes</string>
+    <string name="typ_Weather">Clima</string>
+    <string name="typ_Classical">Música clásica</string>
+    <string name="typ_Classic_Rock">Música rock clásica</string>
+    <string name="typ_Hiphop">Música hip hop</string>
+    <string name="typ_Nostalgia">Señaldá</string>
+    <string name="typ_Personality">Personalidaes</string>
+    <string name="typ_Religious_music">Música relixosa</string>
+    <string name="typ_Religious_talk">Charres relixoses</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and blues</string>
+    <string name="typ_Spanish_music">Música española</string>
+    <string name="typ_Spanish_talk">Conversación en castellán</string>
+    <string name="typ_Soft">Música soft</string>
+    <string name="typ_Soft_Rock">Música soft rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Música rhythm and blues soft</string>
+    <string name="typ_Sports">Deportes</string>
+    <string name="typ_Talk">Charres</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-az/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-az/arrays.xml
index cb1457b..0e44421 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-az/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 dəqiqə</item>
+    <item>15 dəqiqə</item>
+    <item>30 dəqiqə</item>
+    <item>Dayanana qədər</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 dəqiqə</item>
+    <item>30 dəqiqə</item>
+    <item>45 dəqiqə</item>
+    <item>1 saat</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-az/strings.xml b/fmapp2/res/values-az/strings.xml
new file mode 100644
index 0000000..9be268b
--- /dev/null
+++ b/fmapp2/res/values-az/strings.xml
@@ -0,0 +1,233 @@
+<?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 Ötürücü</string>
+    <string name="menu_scan_start">Tədqiq et</string>
+    <string name="menu_scan_stop">Axtarışı dayandır</string>
+    <string name="menu_record_start">Səsyazma</string>
+    <string name="menu_record_stop">Səsyazmanı dayandır</string>
+    <string name="menu_settings">Ayarlar</string>
+    <string name="menu_sleep">Yuxu</string>
+    <string name="menu_sleep_cancel">Yuxudan çıx</string>
+    <string name="menu_all_channels">Bütün kanallar</string>
+    <string name="menu_display_tags">Etiketləri göstər</string>
+    <string name="button_text_stop">Dayandır</string>
+    <string name="msg_seeking">FM stansiya axtarılır\u2026</string>
+    <string name="msg_scanning">Bütün FM stansiyalar tədqiq edilir\u2026</string>
+    <string name="msg_scanning_pty">\'<xliff:g id="pty_name">%1$s</xliff:g>\' üçün tədqiq edilir\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Siyahıları avtomatik seç</string>
+    <string name="msg_searching">Öntərtibli siyahı yaratmaq üçün güclü stansiyalar axtarılır\u2026</string>
+    <string name="msg_noantenna">FM radiodan istifadə etmək üçün lütfən qulaqlığı taxın</string>
+    <string name="dialog_sleep_title">Avtomatik sönmə yuxu müddəti</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' seçin</string>
+    <string name="presetlist_add_new">Yeni siyahı əlavə et</string>
+    <string name="dialog_presetlist_rename_title">Ad daxil edin</string>
+    <string name="presetlist_autoselect_title">Avto-seçimi təsdiqlə</string>
+    <string name="preset_replace">Dəyişdir</string>
+    <string name="preset_tune">Köklə</string>
+    <string name="preset_rename">Yenidən adlandır</string>
+    <string name="preset_delete">Sil</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' axtar</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regional zolaq</string>
+    <string name="regional_band_entry_north_america">Şimali Amerika</string>
+    <string name="regional_band_entry_europe">Avropa</string>
+    <string name="regional_band_entry_japan">Yaponiya</string>
+    <string name="regional_band_entry_japan_wide">Yaponiya (geniş)</string>
+    <string name="regional_band_entry_australia">Avstraliya</string>
+    <string name="regional_band_entry_austria">Avstriya</string>
+    <string name="regional_band_entry_belgium">Belçika</string>
+    <string name="regional_band_entry_brazil">Braziliya</string>
+    <string name="regional_band_entry_china">Çin</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Danimarka</string>
+    <string name="regional_band_entry_finland">Finlandiya</string>
+    <string name="regional_band_entry_france">Fransa</string>
+    <string name="regional_band_entry_germany">Almaniya</string>
+    <string name="regional_band_entry_greece">Yunanıstan</string>
+    <string name="regional_band_entry_hong_kong">Honq Konq</string>
+    <string name="regional_band_entry_india">Hindistan</string>
+    <string name="regional_band_entry_indonesia">İndoneziya</string>
+    <string name="regional_band_entry_ireland">İrlandiya</string>
+    <string name="regional_band_entry_italy">İtaliya</string>
+    <string name="regional_band_entry_korea">Koreya</string>
+    <string name="regional_band_entry_mexico">Meksika</string>
+    <string name="regional_band_entry_netherlands">Hollandiya</string>
+    <string name="regional_band_entry_new_zealand">Yeni Zelandiya</string>
+    <string name="regional_band_entry_norway">Norveç</string>
+    <string name="regional_band_entry_poland">Polşa</string>
+    <string name="regional_band_entry_portugal">Portuqaliya</string>
+    <string name="regional_band_entry_russia">Rusiya</string>
+    <string name="regional_band_entry_singapore">Sinqapur</string>
+    <string name="regional_band_entry_slovakia">Slovakiya</string>
+    <string name="regional_band_entry_spain">İspaniya</string>
+    <string name="regional_band_entry_switzerland">İsveçrə</string>
+    <string name="regional_band_entry_sweden">İsveç</string>
+    <string name="regional_band_entry_taiwan">Tayvan</string>
+    <string name="regional_band_entry_turkey">Türkiyə</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">ABŞ</string>
+    <string name="regional_band_entry_user_defined">İstifadəçi təyin edən zolaq</string>
+    <string name="regional_band_summary_north_america">Şimali Amerika (87.5 MHz - 108.0 MHz arası 200 kHz dalğasında)</string>
+    <string name="regional_band_summary_europe">Avropa (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_japan">Yaponiya (76.0 MHz - 90.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_japan_wide">Yaponiya (geniş) (90.0 MHz - 108.0 MHz arası 50 kHz dalğasında)</string>
+    <string name="regional_band_summary_australia">Avstraliya (87.7 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_austria">Avstriya (87.5 MHz - 108.0 MHz arası 50 kHz dalğasında)</string>
+    <string name="regional_band_summary_belgium">Belçika (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_brazil">Braziliya (87.5 MHz - 108.0 MHz arası 200 kHz dalğasında)</string>
+    <string name="regional_band_summary_china">Çin (87.0 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_czech_republic">Çexiya Respublikası (87.5 - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_denmark">Danimarka (87.5 MHz - 108.0 MHz arası 50 kHz dalğasında)</string>
+    <string name="regional_band_summary_finland">Finlandiya (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_france">Fransa (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_germany">Almaniya (87.5 MHz - 108.0 MHz arası 50 kHz dalğasında)</string>
+    <string name="regional_band_summary_greece">Yunanıstan (87.5 MHz - 108.0 MHz arası 50 kHz dalğasında)</string>
+    <string name="regional_band_summary_hong_kong">Honq Konq (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_india">Hindistan (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_indonesia">İndoneziya (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_ireland">İrlandiya (87.5 MHz - 108.0 MHz arası 50 kHz dalğasında)</string>
+    <string name="regional_band_summary_italy">İtaliya (87.5 MHz - 108.0 MHz arası 50 kHz dalğasında)</string>
+    <string name="regional_band_summary_korea">Koreya (87.5 MHz - 108.0 MHz arası 200 kHz dalğasında)</string>
+    <string name="regional_band_summary_mexico">Meksika (88.1 MHz - 107.9 MHz arası 200 kHz dalğasında)</string>
+    <string name="regional_band_summary_netherlands">Hollandiya (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_new_zealand">Yeni Zelandiya (88.0 MHz - 107.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_norway">Norveç (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_poland">Polşa (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_portugal">Portuqaliya (87.5 MHz - 108.0 MHz arası 50 kHz dalğasında)</string>
+    <string name="regional_band_summary_russia">Rusiya (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_singapore">Sinqapur (88.0 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_slovakia">Slovakiya (87.5 MHz - 108.0 MHz arası 100 kiHz dalğasında)</string>
+    <string name="regional_band_summary_spain">İspaniya (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_switzerland">İsveçrə (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_sweden">İsveç (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_taiwan">Tayvan (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_turkey">Türkiyə (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_united_kingdom">Birləşmiş Krallıq (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_united_states">ABŞ (87.5 MHz - 108.0 MHz arası 100 kHz dalğasında)</string>
+    <string name="regional_band_summary_user_defined">İstifadəçi təyin edən zolaq</string>
+    <string name="aud_output_mode">Səs çıxışı rejimi</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Səsyazma müddəti</string>
+    <string name="auto_select_af">Alternativ tezlik</string>
+    <string name="settings_revert_defaults_title">Fabrik ilkin dəyərlərinə qayıt</string>
+    <string name="settings_revert_defaults_summary">Bütün ayarları sıfırla</string>
+    <string name="settings_revert_confirm_title">Sıfırlamanı təsdiqlə</string>
+    <string name="settings_revert_confirm_msg">Bu, saxlanılmış ön ayarlar daxil olmaqla bütün tətbiq ayarlarını təmizləyəcək. Davam edilsin?</string>
+    <string name="no_storage">Səsyazmaya başlamamışdan əvvəl SD kartı taxın.</string>
+    <string name="preparing_sd">SD kart hazırlanır\u2026</string>
+    <string name="access_sd_fail">SD karta müraciət edə bilmədi.</string>
+    <string name="spaceIsLow_content">SD kart anbar sahəsində yer azalır. Keyfiyyət ayarlarını dəyişdirin və ya yer açmaq üçün bəzi faylları silin.</string>
+    <string name="FMRecording_reach_size_limit">Ölçü limitinə çatdınız.</string>
+    <string name="menu_scan_for_preset">Öntərtibli siyahıları tədqiq et</string>
+    <string name="fm_off">FM söndürüldü.</string>
+    <string name="fm_call">FM zəng zamanı istifadə edilə bilməz.</string>
+    <string name="alert_dialog_hint">Ad daxil edin</string>
+    <string name="search_dialog_title">Stansiyaları tədqiq et</string>
+    <string name="fm_command_timeout_title">Bitmə vaxtı</string>
+    <string name="fm_tune_timeout_msg">FM stansiyasını kökləmək üçün cavab alınmadı. Əgər problem davam etsə, lütfən FM-i söndürüb yenidən işə salın.</string>
+    <string name="fm_command_failed_title">FM əməliyyatı uğursuz oldu</string>
+    <string name="fm_cmd_failed_msg">FM əməliyyatı baş tutmadı. Əgər problem davam edərsə, lütfən FM-i söndürüb yenidən işə salın.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM əməliyyatı baş tutmadı. FM və HDMI\'ın eyni vaxtda işləməsi dəstəklənmir.</string>
+    <string name="fm_cmd_failed_call_on">FM əməliyyatı baş tutmadı. FM səsinə zəng vaxtı icazə verilmir.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">FM səsyazmalarım</string>
+    <string name="audio_db_album_name">FM səsyazmaları</string>
+    <string name="audio_db_playlist_name">FM səsyazmaları</string>
+    <string name="station_name">Stansiya:</string>
+    <string name="station_exists">Bu tezlik artıq mövcuddur!</string>
+    <string name="station_list_delete_station">Sil: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">\'<xliff:g id="name">%s</xliff:g>\' stansiyasını silmək istədiyinizə əminsiniz?</string>
+    <string name="station_name_empty">Stansiya adı boşdur, lütfən yenidən daxil edin.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' adı artıq istifadə olunur, lütfən başqa ad daxil edin.</string>
+    <string name="rt_plus_tags">Etiketlər</string>
+    <string name="usr_def_band_min">Ən aşağı tezlik (MHz)</string>
+    <string name="usr_def_band_max">Ən yuxarı tezlik (MHz)</string>
+    <string name="chanl_spacing">Kanal aralığı</string>
+    <string name="set">Ayarla</string>
+    <string name="user_defind_band_msg">Ən az 1 kanal aralığı ilə və minimum və maksimum tezlik arasında 100 kHz aralığa sahib 76.0-108.0 MHz arası tezlik daxil edin</string>
+    <string name="save_record_file">FM səsyazma faylı \'<xliff:g id="record_file">%1$s</xliff:g>\' yolunda saxlanıldı</string>
+    <string name="fm_search_no_results">Uyumlu stansiyalar tapılmadı</string>
+    <string name="typ_All_stations">Bütün kanallar</string>
+    <string name="typ_Culture">Mədəniyyət</string>
+    <string name="typ_Current_affairs">Hazırki hadisələr</string>
+    <string name="typ_Children">Uşaq proqramları</string>
+    <string name="typ_Country">Country musiqi</string>
+    <string name="typ_Documentary">Sənədli</string>
+    <string name="typ_Drama">Dram</string>
+    <string name="typ_Easy_listening">Asan dinlənən musiqi</string>
+    <string name="typ_Education">Təhsil</string>
+    <string name="typ_Emergency">Fövqəladə hal</string>
+    <string name="typ_Emergency_test">Fövqəladə hal testi</string>
+    <string name="typ_Finance">Maliyyə</string>
+    <string name="typ_Folk">Xalq musiqisi</string>
+    <string name="typ_Information">İnformasiya</string>
+    <string name="typ_Jazz">Jazz musiqisi</string>
+    <string name="typ_Light_classical">Light klassik</string>
+    <string name="typ_Leisure">Leisure</string>
+    <string name="typ_News">Xəbərlər</string>
+    <string name="typ_National">Milli musiqi</string>
+    <string name="typ_Other">Digər musiqi</string>
+    <string name="typ_Oldies">Köhnə musiqi</string>
+    <string name="typ_Phone_in">Telefondan</string>
+    <string name="typ_Pop">Pop musiqisi</string>
+    <string name="typ_Religion">Dini</string>
+    <string name="typ_Rock">Rok musiqisi</string>
+    <string name="typ_Science">Elm</string>
+    <string name="typ_Serious_classical">Ciddi klassik</string>
+    <string name="typ_Social_affairs">Sosial hadisələr</string>
+    <string name="typ_Sport">İdman</string>
+    <string name="typ_Travel">Səyahət</string>
+    <string name="typ_Varied">Müxtəlif</string>
+    <string name="typ_Weather">Hava</string>
+    <string name="typ_Adult_hits">Yetkin hit</string>
+    <string name="typ_Classical">Klassik</string>
+    <string name="typ_Classic_Rock">Klassik Rok</string>
+    <string name="typ_College">Kollec</string>
+    <string name="typ_Foreign_language">Xarici dil</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalji</string>
+    <string name="typ_Personality">Şəxsiyyət</string>
+    <string name="typ_Public">İctimai</string>
+    <string name="typ_Religious_music">Dini musiqi</string>
+    <string name="typ_Religious_talk">Dini söhbət</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm və Blues</string>
+    <string name="typ_Spanish_music">İspan musiqisi</string>
+    <string name="typ_Spanish_talk">İspan danışığı</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">İdman</string>
+    <string name="typ_Talk">Söhbət</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-be/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-be/arrays.xml
index cb1457b..9561367 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-be/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Стэрэа</item>
+    <item>Мона</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Стэрэа</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 хвілін</item>
+    <item>15 хвілін</item>
+    <item>30 хвілін</item>
+    <item>Until stopped</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="channel_spacing_entries">
+    <item>50 кГц</item>
+    <item>100 кГц</item>
+    <item>200 кГц</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-be/strings.xml b/fmapp2/res/values-be/strings.xml
new file mode 100644
index 0000000..645158d
--- /dev/null
+++ b/fmapp2/res/values-be/strings.xml
@@ -0,0 +1,192 @@
+<?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-радыё</string>
+    <string name="tx_app_name">FM-перадатчык</string>
+    <string name="menu_scan_stop">Спыніць пошук</string>
+    <string name="menu_record_start">Запіс</string>
+    <string name="menu_record_stop">Спыніць запіс</string>
+    <string name="menu_sleep">Рэжым сну</string>
+    <string name="menu_sleep_cancel">Скасаваць рэжым сну</string>
+    <string name="menu_all_channels">Усе каналы</string>
+    <string name="msg_scanning_pty">Пошук \'<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> МГц</string>
+    <string name="msg_searching_title">Аўтапошук станцый</string>
+    <string name="dialog_sleep_title">Час аўтавыключэння</string>
+    <string name="presetlist_add_new">Дадаць новы спіс</string>
+    <string name="dialog_presetlist_rename_title">Увядзіце назву</string>
+    <string name="presetlist_autoselect_title">Пацвердзіць аўтаматычны выбар</string>
+    <string name="preset_tune">Наладзіць</string>
+    <string name="preset_rename">Перайменаваць</string>
+    <string name="preset_delete">Выдалiць</string>
+    <string name="preset_search">Пошук \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' МГц</string>
+    <string name="regional_band">Рэгіянальны дыяпазон</string>
+    <string name="regional_band_entry_north_america">Паўночная Амерыка</string>
+    <string name="regional_band_entry_europe">Еўропа</string>
+    <string name="regional_band_entry_japan">Японія</string>
+    <string name="regional_band_entry_japan_wide">Японія (шырокі дыяпазон)</string>
+    <string name="regional_band_entry_australia">Аўстралія</string>
+    <string name="regional_band_entry_austria">Аўстрыя</string>
+    <string name="regional_band_entry_belgium">Бельгія</string>
+    <string name="regional_band_entry_brazil">Бразілія</string>
+    <string name="regional_band_entry_china">Кітай</string>
+    <string name="regional_band_entry_czech_republic">Рэспубліка Чэхія</string>
+    <string name="regional_band_entry_denmark">Данія</string>
+    <string name="regional_band_entry_finland">Фінляндыя</string>
+    <string name="regional_band_entry_france">Францыя</string>
+    <string name="regional_band_entry_germany">Германія</string>
+    <string name="regional_band_entry_greece">Грэцыя</string>
+    <string name="regional_band_entry_hong_kong">Ганконг</string>
+    <string name="regional_band_entry_india">Індыя</string>
+    <string name="regional_band_entry_indonesia">Інданезія</string>
+    <string name="regional_band_entry_ireland">Ірландыя</string>
+    <string name="regional_band_entry_italy">Італія</string>
+    <string name="regional_band_entry_korea">Карэя</string>
+    <string name="regional_band_entry_mexico">Мексіка</string>
+    <string name="regional_band_entry_netherlands">Нідэрланды</string>
+    <string name="regional_band_entry_new_zealand">Новая Зеландыя</string>
+    <string name="regional_band_entry_norway">Нарвегія</string>
+    <string name="regional_band_entry_poland">Польшча</string>
+    <string name="regional_band_entry_portugal">Партугалія</string>
+    <string name="regional_band_entry_russia">Расія</string>
+    <string name="regional_band_entry_singapore">Сінгапур</string>
+    <string name="regional_band_entry_slovakia">Славакія</string>
+    <string name="regional_band_entry_spain">Іспанія</string>
+    <string name="regional_band_entry_sweden">Швецыя</string>
+    <string name="regional_band_entry_taiwan">Тайвань</string>
+    <string name="regional_band_entry_turkey">Турцыя</string>
+    <string name="regional_band_entry_united_kingdom">Вялікабрытанія</string>
+    <string name="regional_band_entry_united_states">ЗША</string>
+    <string name="regional_band_entry_user_defined">Вызначаны карыстальнікам дыяпазон</string>
+    <string name="regional_band_summary_north_america">Паўночная Амерыка (ад 87,5 МГц да 108,0 МГц з крокам у 200 кГц)</string>
+    <string name="regional_band_summary_europe">Еўропа (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_japan">Японія (ад 76,0 МГц да 90,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_japan_wide">Японія (шырокі дыяпазон) (ад 90,0 МГц да 108,0 МГц з крокам у 50 кГц)</string>
+    <string name="regional_band_summary_australia">Аўстралія (ад 87,7 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_austria">Аўстрыя (ад 87,5 МГц да 108,0 МГц з крокам у 50 кГц)</string>
+    <string name="regional_band_summary_belgium">Бельгія (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_brazil">Бразілія (ад 87,5 МГц да 108,0 МГц з крокам у 200 кГц)</string>
+    <string name="regional_band_summary_china">Кітай (ад 87,0 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_czech_republic">Рэспубліка Чэхія (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_denmark">Данія (ад 87,5 МГц да 108,0 МГц з крокам у 50 кГц)</string>
+    <string name="regional_band_summary_finland">Фінляндыя (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_france">Францыя (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_germany">Германія (ад 87,5 МГц да 108,0 МГц з крокам у 50 кГц)</string>
+    <string name="regional_band_summary_greece">Грэцыя (ад 87,5 МГц да 108,0 МГц з крокам у 50 кГц)</string>
+    <string name="regional_band_summary_hong_kong">Ганконг (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_india">Індыя (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_indonesia">Інданезія (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_ireland">Ірландыя (ад 87,5 МГц да 108,0 МГц з крокам у 50 кГц)</string>
+    <string name="regional_band_summary_italy">Італія (ад 87,5 МГц да 108,0 МГц з крокам у 50 кГц)</string>
+    <string name="regional_band_summary_korea">Рэспубліка Карэя (ад 87,5 МГц да 108,0 МГц з крокам у 200 кГц)</string>
+    <string name="regional_band_summary_mexico">Мексіка (ад 88,1 МГц да 107,9 МГц з крокам у 200 кГц)</string>
+    <string name="regional_band_summary_netherlands">Нідэрланды (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_new_zealand">Новая Зеландыя (ад 88,0 МГц да 107,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_norway">Нарвегія (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_poland">Польшча (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_portugal">Партугалія (ад 87,5 МГц да 108,0 МГц з крокам у 50 кГц)</string>
+    <string name="regional_band_summary_russia">Расія (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_singapore">Сінгапур (ад 88,0 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_slovakia">Славакія (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_spain">Іспанія (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_switzerland">Швейцарыя (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_sweden">Швецыя (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_taiwan">Тайвань (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_turkey">Турцыя (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_united_kingdom">Вялікабрытанія (ад 87,5 МГц да 108,0 МГц з крокам у 100 кГц)</string>
+    <string name="regional_band_summary_united_states">ЗША (ад 88,1 МГц да 107,9 МГц з крокам у 200 кГц)</string>
+    <string name="regional_band_summary_user_defined">Вызначаны карыстальнікам дыяпазон</string>
+    <string name="aud_output_mode">Рэжым вываду аўдыя</string>
+    <string name="audio_type_stereo">Стэрэа</string>
+    <string name="record_dur">Працягласць запісу</string>
+    <string name="auto_select_af">Альтэрнатыўная частата</string>
+    <string name="settings_revert_defaults_summary">Скінуць усе налады</string>
+    <string name="settings_revert_confirm_title">Пацвердзіць скід</string>
+    <string name="no_storage">Для пачатку запісу далучыце SD-картку.</string>
+    <string name="preparing_sd">Падрыхтоўка SD-карткі\u2026</string>
+    <string name="access_sd_fail">Немагчыма атрымаць доступ да SD-карткі.</string>
+    <string name="FMRecording_reach_size_limit">Дасягнута абмежаванне памеру.</string>
+    <string name="menu_scan_for_preset">Шукаць захаваныя станцыі</string>
+    <string name="alert_dialog_hint">Увядзіце назву</string>
+    <string name="search_dialog_title">Шукаць станцыі</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_album_name">Запісы з FM</string>
+    <string name="audio_db_playlist_name">Запісы з FM</string>
+    <string name="station_name">Станцыя:</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="usr_def_band_max">Максімальная частата (МГц)</string>
+    <string name="chanl_spacing">Крок каналаў</string>
+    <string name="set">Задаць</string>
+    <string name="save_record_file">Файл запісу радыё захаваны ў \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="typ_All_stations">Усе станцыі</string>
+    <string name="typ_Culture">Культура</string>
+    <string name="typ_Current_affairs">Бягучыя справы</string>
+    <string name="typ_Children">Дзіцячыя праграмы</string>
+    <string name="typ_Country">Музыка кантры</string>
+    <string name="typ_Documentary">Дакументальны</string>
+    <string name="typ_Drama">Драма</string>
+    <string name="typ_Easy_listening">Лёгкая музыка</string>
+    <string name="typ_Education">Адукацыя</string>
+    <string name="typ_Emergency">Экстранны</string>
+    <string name="typ_Emergency_test">Экстранны тэст</string>
+    <string name="typ_Finance">Фінансы</string>
+    <string name="typ_Folk">Народная музыка</string>
+    <string name="typ_Information">Інфармацыя</string>
+    <string name="typ_Jazz">Джазавая музыка</string>
+    <string name="typ_Light_classical">Лёгкая класічная</string>
+    <string name="typ_Leisure">Вольны час</string>
+    <string name="typ_News">Навіны</string>
+    <string name="typ_National">Нацыянальная музыка</string>
+    <string name="typ_Other">Іншая музыка</string>
+    <string name="typ_Phone_in">Тэлефон у</string>
+    <string name="typ_Religion">Рэлігія</string>
+    <string name="typ_Science">Навука</string>
+    <string name="typ_Serious_classical">Сур\'ёзная класіка</string>
+    <string name="typ_Social_affairs">Сацыяльныя пытанні</string>
+    <string name="typ_Sport">Спорт</string>
+    <string name="typ_Travel">Падарожжа</string>
+    <string name="typ_Weather">Надвор\'е</string>
+    <string name="typ_Adult_hits">Хіты даўніх гадоў</string>
+    <string name="typ_Classical">Класіка</string>
+    <string name="typ_Classic_Rock">Класічны рок</string>
+    <string name="typ_College">Каледж</string>
+    <string name="typ_Foreign_language">Замежная мова</string>
+    <string name="typ_Hiphop">Хіп-хоп</string>
+    <string name="typ_Nostalgia">Настальгія</string>
+    <string name="typ_Religious_music">Рэлігійная музыка</string>
+    <string name="typ_Religious_talk">Рэлігійныя размовы</string>
+    <string name="typ_Rhythm_and_Blues">Рытм і блюз</string>
+    <string name="typ_Soft_Rock">Лёгкі рок</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Лёгкі рытм і блюз</string>
+    <string name="typ_Sports">Спорт</string>
+    <string name="typ_Talk">Размовы</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-bg/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-bg/arrays.xml
index cb1457b..1780902 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-bg/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Стерео</item>
+    <item>Моно</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-bg/strings.xml b/fmapp2/res/values-bg/strings.xml
new file mode 100644
index 0000000..010b2f2
--- /dev/null
+++ b/fmapp2/res/values-bg/strings.xml
@@ -0,0 +1,225 @@
+<?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">Радио</string>
+    <string name="tx_app_name">Радио предавател</string>
+    <string name="menu_scan_start">Сканирай</string>
+    <string name="menu_scan_stop">Спри търсенето</string>
+    <string name="menu_record_start">Запиши</string>
+    <string name="menu_record_stop">Спри записването</string>
+    <string name="menu_settings">Настройки</string>
+    <string name="menu_sleep">Таймер</string>
+    <string name="menu_sleep_cancel">Отмени таймера</string>
+    <string name="menu_all_channels">Всички канали</string>
+    <string name="menu_display_tags">Показване на етикетите</string>
+    <string name="button_text_stop">Спри</string>
+    <string name="msg_seeking">Търсене на ръдиостанции\u2026</string>
+    <string name="msg_scanning">Сканиране за всички радиостанции\u2026</string>
+    <string name="msg_searching_title">Автоматично избиране на станции</string>
+    <string name="msg_searching">Търсене на станции със силен сигнал, за създаване на списък\u2026</string>
+    <string name="msg_noantenna">Моля включете слушалките, за да използвате радиото</string>
+    <string name="dialog_sleep_title">Време до самоизключване</string>
+    <string name="presetlist_add_new">Добавяне на нов списък</string>
+    <string name="dialog_presetlist_rename_title">Въведете име</string>
+    <string name="presetlist_autoselect_title">Потвърдете автоматично избиране</string>
+    <string name="preset_replace">Замени</string>
+    <string name="preset_tune">Настрой</string>
+    <string name="preset_rename">Преименуване</string>
+    <string name="preset_delete">Изтрий</string>
+    <string name="regional_band">Регионален обхват</string>
+    <string name="regional_band_entry_north_america">Северна Америка</string>
+    <string name="regional_band_entry_europe">Европа</string>
+    <string name="regional_band_entry_japan">Япония</string>
+    <string name="regional_band_entry_japan_wide">Япония (широк)</string>
+    <string name="regional_band_entry_australia">Австралия</string>
+    <string name="regional_band_entry_austria">Австрия</string>
+    <string name="regional_band_entry_belgium">Белгия</string>
+    <string name="regional_band_entry_brazil">Бразилия</string>
+    <string name="regional_band_entry_china">Китай</string>
+    <string name="regional_band_entry_czech_republic">Чешка република</string>
+    <string name="regional_band_entry_denmark">Дания</string>
+    <string name="regional_band_entry_finland">Финландия</string>
+    <string name="regional_band_entry_france">Франция</string>
+    <string name="regional_band_entry_germany">Германия</string>
+    <string name="regional_band_entry_greece">Гърция</string>
+    <string name="regional_band_entry_hong_kong">Хонг Конг</string>
+    <string name="regional_band_entry_india">Индия</string>
+    <string name="regional_band_entry_indonesia">Индонезия</string>
+    <string name="regional_band_entry_ireland">Ирландия</string>
+    <string name="regional_band_entry_italy">Италия</string>
+    <string name="regional_band_entry_korea">Корея</string>
+    <string name="regional_band_entry_mexico">Мексико</string>
+    <string name="regional_band_entry_netherlands">Холандия</string>
+    <string name="regional_band_entry_new_zealand">Нова Зеландия</string>
+    <string name="regional_band_entry_norway">Норвегия</string>
+    <string name="regional_band_entry_poland">Полша</string>
+    <string name="regional_band_entry_portugal">Португалия</string>
+    <string name="regional_band_entry_russia">Русия</string>
+    <string name="regional_band_entry_singapore">Сингапур</string>
+    <string name="regional_band_entry_slovakia">Словакия</string>
+    <string name="regional_band_entry_spain">Испания</string>
+    <string name="regional_band_entry_switzerland">Швейцария</string>
+    <string name="regional_band_entry_sweden">Швеция</string>
+    <string name="regional_band_entry_taiwan">Тайван</string>
+    <string name="regional_band_entry_turkey">Турция</string>
+    <string name="regional_band_entry_united_kingdom">Обединено кралство</string>
+    <string name="regional_band_entry_united_states">САЩ</string>
+    <string name="regional_band_entry_user_defined">Дефинирани от потребителя радио вълни</string>
+    <string name="regional_band_summary_north_america">Северна Америка (87.5 MHz до 108.0 MHz в 200 KHz стъпки)</string>
+    <string name="regional_band_summary_europe">Европа (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_japan">Япония (76.0 до 90.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Япония (широк) (90.0 MHz до 108.0 MHz в 50 KHz стъпки)</string>
+    <string name="regional_band_summary_australia">Австралия (87.7 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_austria">Австрия (87.5 до 108.0 MHz в 50 kHz стъпки)</string>
+    <string name="regional_band_summary_belgium">Белгия (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Бразилия (87.5 до 108.0 MHz в 200 kHz стъпки)</string>
+    <string name="regional_band_summary_china">Китай (87.0 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Чешка Република (87.5 MHz до 108.0 MHz в 100 KHz стъпки)</string>
+    <string name="regional_band_summary_denmark">Дания (87.5 до 108.0 MHz в 50 kHz стъпки)</string>
+    <string name="regional_band_summary_finland">Финландия (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_france">Франция (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_germany">Германия (87.5 до 108.0 MHz в 50 kHz стъпки)</string>
+    <string name="regional_band_summary_greece">Гърция (87.5 до 108.0 MHz в 50 kHz стъпки)</string>
+    <string name="regional_band_summary_hong_kong">Хонг Конг (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_india">Индия (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Индонезия (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Ирландия (87.5 до 108.0 MHz в 50 kHz стъпки)</string>
+    <string name="regional_band_summary_italy">Италия (87.5 до 108.0 MHz в 50 kHz стъпки)</string>
+    <string name="regional_band_summary_korea">Корея (87.5 до 108.0 MHz в 200 kHz стъпки)</string>
+    <string name="regional_band_summary_mexico">Мексико (88.1 до 107.9 MHz в 200 kHz стъпки)</string>
+    <string name="regional_band_summary_netherlands">Холандия (87.5 MHz до 108.0 MHz в 100 KHz стъпки)</string>
+    <string name="regional_band_summary_new_zealand">Нова Зеландия (88.0 MHz до 107.0 MHz в 100 KHz стъпки)</string>
+    <string name="regional_band_summary_norway">Норвегия (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_poland">Полша (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Португалия (87.5 до 108.0 MHz в 50 kHz стъпки)</string>
+    <string name="regional_band_summary_russia">Русия (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Сингапур (88.0 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Словакия (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_spain">Испания (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Швейцария (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Швеция (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Тайван (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Турция (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Обединеното кралство (87.5 до 108.0 MHz в стъпки от 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Съединените щати (88.1 до 107.9 MHz в 200 kHz стъпки)</string>
+    <string name="regional_band_summary_user_defined">Дефинирани от потребителя честоти</string>
+    <string name="aud_output_mode">Режим аудио изход</string>
+    <string name="audio_type_stereo">Стерео</string>
+    <string name="audio_type_mono">Моно</string>
+    <string name="record_dur">Продължителност на запис</string>
+    <string name="auto_select_af">Алтернативна честота</string>
+    <string name="settings_revert_defaults_title">Върни към фабричните настройки</string>
+    <string name="settings_revert_defaults_summary">Нулиране на всички настройки</string>
+    <string name="settings_revert_confirm_title">Потвърдете нулиране</string>
+    <string name="settings_revert_confirm_msg">Това ще изчисти всички настройките на приложението, включително запазени предварителни настройки. Ще продължите ли?</string>
+    <string name="no_storage">Монтирайте карта памет преди да започнете записа.</string>
+    <string name="preparing_sd">Картата памет се подготвя</string>
+    <string name="access_sd_fail">Няма достъп до картата памет.</string>
+    <string name="spaceIsLow_content">Паметта на вашата карта памет е на изчерпване. Променете настройката за качество или изтрийте някои други файлове за да освободите място.</string>
+    <string name="FMRecording_reach_size_limit">Достигнат е максималният размер.</string>
+    <string name="menu_scan_for_preset">Сканирай запаметените станции</string>
+    <string name="fm_off">Радиото е изключено.</string>
+    <string name="fm_call">Радиото не може да се използва при повикване.</string>
+    <string name="alert_dialog_hint">Въведете име</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">FM радио грешка. Системата не разрешава едновременното позване на FM и HDMI.</string>
+    <string name="fm_cmd_failed_call_on">Използването на радио по време на телефонен разговор е невъзможно.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Моите радиозаписи</string>
+    <string name="audio_db_album_name">Радиозаписи</string>
+    <string name="audio_db_playlist_name">Радиозаписи</string>
+    <string name="station_name">Станция:</string>
+    <string name="station_exists">Тази честота вече съществува!</string>
+    <string name="station_name_empty">Името на станцията е празно, моля, въведете отново.</string>
+    <string name="rt_plus_tags">Етикети</string>
+    <string name="usr_def_band_min">Най-ниска честота (MHz)</string>
+    <string name="usr_def_band_max">Най-високата честота (MHz)</string>
+    <string name="chanl_spacing">Канално отстояние</string>
+    <string name="set">Задай</string>
+    <string name="user_defind_band_msg">Въведете честота между 76.0 и 108.0 MHz с поне един канал и 100KHz разстояние между минималната и максималната честота</string>
+    <string name="save_record_file">Радио записът е съхранен в \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Не са намерени съвместими станции</string>
+    <string name="typ_All_stations">Всички станции</string>
+    <string name="typ_Culture">Култура</string>
+    <string name="typ_Current_affairs">Актуални събития</string>
+    <string name="typ_Children">Детски програми</string>
+    <string name="typ_Country">Кънтри музика</string>
+    <string name="typ_Documentary">Документални</string>
+    <string name="typ_Drama">Драма</string>
+    <string name="typ_Easy_listening">Мелодична музика</string>
+    <string name="typ_Education">Образование</string>
+    <string name="typ_Emergency">Извънредна ситуация</string>
+    <string name="typ_Emergency_test">Авариен тест</string>
+    <string name="typ_Finance">Финанси</string>
+    <string name="typ_Folk">Народна музика</string>
+    <string name="typ_Information">Информация</string>
+    <string name="typ_Jazz">Джаз музика</string>
+    <string name="typ_Light_classical">Лека Класическа</string>
+    <string name="typ_Leisure">Развлекателна Музика</string>
+    <string name="typ_News">Новини</string>
+    <string name="typ_National">Национална музика</string>
+    <string name="typ_Other">Друга музика</string>
+    <string name="typ_Oldies">Ретро музика</string>
+    <string name="typ_Phone_in">Обаждане</string>
+    <string name="typ_Pop">Поп музика</string>
+    <string name="typ_Religion">Религия</string>
+    <string name="typ_Rock">Рок музика</string>
+    <string name="typ_Science">Наука</string>
+    <string name="typ_Serious_classical">Сериозна класичесическа музика</string>
+    <string name="typ_Social_affairs">Социални въпроси</string>
+    <string name="typ_Sport">Спорт</string>
+    <string name="typ_Travel">Пътуване</string>
+    <string name="typ_Varied">Разнообразни</string>
+    <string name="typ_Weather">Прогноза на времето</string>
+    <string name="typ_Adult_hits">Стари хитове</string>
+    <string name="typ_Classical">Класическа</string>
+    <string name="typ_Classic_Rock">Класически рок</string>
+    <string name="typ_College">Колежански</string>
+    <string name="typ_Foreign_language">Чужд език</string>
+    <string name="typ_Hiphop">Хип-хоп</string>
+    <string name="typ_Nostalgia">Носталгични</string>
+    <string name="typ_Personality">Персонални</string>
+    <string name="typ_Public">Публични</string>
+    <string name="typ_Religious_music">Религиозна музика</string>
+    <string name="typ_Religious_talk">Религиозни разговори</string>
+    <string name="typ_Rhythm_and_Blues">Ритъм и блус</string>
+    <string name="typ_Spanish_music">Испанска музика</string>
+    <string name="typ_Spanish_talk">Испанска беседа</string>
+    <string name="typ_Soft">Нежна</string>
+    <string name="typ_Soft_Rock">Нежен рок</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Нежен ритъм и блус</string>
+    <string name="typ_Sports">Спорт</string>
+    <string name="typ_Talk">Беседа</string>
+    <string name="typ_Top_40">Топ 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-bn/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-bn/arrays.xml
index cb1457b..fa44f5b 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-bn/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>স্টেরিও</item>
+    <item>মোনো</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>স্টেরিও</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>৫ মিনিট</item>
+    <item>১৫ মিনিট</item>
+    <item>৩০ মিনিট</item>
+    <item>বন্ধ না করা পর্যন্ত</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>১৫ মিনিট</item>
+    <item>৩০ মিনিট</item>
+    <item>৪৫ মিনিট</item>
+    <item>১ ঘণ্টা</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-bn/strings.xml b/fmapp2/res/values-bn/strings.xml
new file mode 100644
index 0000000..ecd4660
--- /dev/null
+++ b/fmapp2/res/values-bn/strings.xml
@@ -0,0 +1,108 @@
+<?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">এফএম বেতার</string>
+    <string name="tx_app_name">এফএম প্রেরকযন্ত্র</string>
+    <string name="menu_scan_start">স্ক্যান</string>
+    <string name="menu_scan_stop">অনুসন্ধান বন্ধ</string>
+    <string name="menu_record_stop">রেকর্ডিং বন্ধ করুন</string>
+    <string name="menu_sleep">স্লিপ</string>
+    <string name="menu_sleep_cancel">স্লিপ বাতিল</string>
+    <string name="menu_all_channels">সমস্ত চ্যানেল</string>
+    <string name="menu_display_tags">ট্যাগ প্রদর্শন</string>
+    <string name="msg_noantenna">এফএম বেতার ব্যবহার করতে অনুগ্রহ করে হেডসেট যুক্ত করুন</string>
+    <string name="presetlist_add_new">নতুন তালিকায় যুক্ত</string>
+    <string name="preset_tune">টিউন</string>
+    <string name="preset_rename">পুনঃনামকরণ</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' এর জন্যে অনুসন্ধান</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' মেগাহার্টজ</string>
+    <string name="regional_band">আঞ্চলিক ব্যান্ড</string>
+    <string name="regional_band_entry_north_america">উত্তর আমেরিকা</string>
+    <string name="regional_band_entry_europe">ইউরোপ</string>
+    <string name="regional_band_entry_japan">জাপান</string>
+    <string name="regional_band_entry_japan_wide">জাপান (ওয়াইড)</string>
+    <string name="regional_band_entry_australia">অস্ট্রেলিয়া</string>
+    <string name="regional_band_entry_austria">অস্ট্রিয়া</string>
+    <string name="regional_band_entry_belgium">বেলজিয়াম</string>
+    <string name="regional_band_entry_brazil">ব্রাজিল</string>
+    <string name="regional_band_entry_china">চীন</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">ডেনমার্ক</string>
+    <string name="regional_band_entry_finland">ফিনল্যান্ড</string>
+    <string name="regional_band_entry_france">ফ্রান্স</string>
+    <string name="regional_band_entry_germany">জার্মানি</string>
+    <string name="regional_band_entry_greece">গ্রিস</string>
+    <string name="regional_band_entry_hong_kong">হংকং</string>
+    <string name="regional_band_entry_india">ভারত</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">আয়ারল্যান্ড</string>
+    <string name="regional_band_entry_italy">ইতালি</string>
+    <string name="regional_band_entry_korea">কোরিয়া</string>
+    <string name="regional_band_entry_mexico">মেক্সিকো</string>
+    <string name="regional_band_entry_netherlands">নেদারল্যান্ড</string>
+    <string name="regional_band_entry_new_zealand">নিউজিল্যান্ড</string>
+    <string name="regional_band_entry_norway">নরওয়ে</string>
+    <string name="regional_band_entry_poland">পোল্যান্ড</string>
+    <string name="regional_band_entry_portugal">পর্তুগাল</string>
+    <string name="regional_band_entry_russia">রাশিয়া</string>
+    <string name="regional_band_entry_singapore">সিঙ্গাপুর</string>
+    <string name="regional_band_entry_slovakia">স্লোভাকিয়া</string>
+    <string name="regional_band_entry_spain">স্পেন</string>
+    <string name="regional_band_entry_switzerland">সুইজারল্যান্ড</string>
+    <string name="regional_band_entry_sweden">সুইডেন</string>
+    <string name="regional_band_entry_taiwan">তাইওয়ান</string>
+    <string name="regional_band_entry_turkey">তুরস্ক</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">মার্কিন যুক্তরাষ্ট্র</string>
+    <string name="regional_band_entry_user_defined">ব্যবহারকারী নির্ধারিত ব্যান্ড</string>
+    <string name="regional_band_summary_user_defined">ব্যবহারকারী নির্ধারিত ব্যান্ড</string>
+    <string name="aud_output_mode">অডিও আউটপুট মোড</string>
+    <string name="audio_type_stereo">স্টেরিও</string>
+    <string name="audio_type_mono">মোনো</string>
+    <string name="record_dur">রেকর্ড সময়কাল</string>
+    <string name="settings_revert_defaults_title">কারখানা পূর্ব-নির্ধারিত অবস্থায় প্রত্যাবর্তন</string>
+    <string name="settings_revert_defaults_summary">সকল রুপান্তর নির্ধারণ পুন:স্থাপন</string>
+    <string name="no_storage">রেকর্ডিং শুরু করার আগে এসডি কার্ড মাউন্ট করুন।</string>
+    <string name="access_sd_fail">এসডি কার্ডে প্রবেশ করা যাচ্ছে না।</string>
+    <string name="spaceIsLow_content">আপনার এসডি কার্ডে স্থান স্বল্পতা আছে। যায়গার রুপান্তর নির্ধারণ করুন অথবা জায়গা খালি করতে কিছু অন্যান্য ফাইল মুছে ফেলুন।</string>
+    <string name="menu_scan_for_preset">প্রিসেটের জন্য স্ক্যান</string>
+    <string name="alert_dialog_hint">একটি নাম লিখুন</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">এফএম অপারেশন ব্যর্থ হয়েছে। এফএম এবং এইচডিএমআই সহঅবস্থান সমর্থিত নয়।</string>
+    <string name="fm_cmd_failed_call_on">এফএম কার্যক্রমটি ব্যর্থ হয়েছে। কল চলাকালীন সময়ে এফএম অডিও অনুমোদিত নয়।</string>
+    <string name="station_exists">এই ফ্রিকোয়েন্সি ইতিমধ্যেই বিদ্যমান!</string>
+    <string name="station_name_empty">কেন্দ্রের নাম খালি, দয়া করে আবার নামটি লিখুন।</string>
+    <string name="rt_plus_tags">ট্যাগস</string>
+    <string name="chanl_spacing">চ্যানেল ব্যবধান</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-bs/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-bs/arrays.xml
index cb1457b..ccdba8e 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-bs/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuta</item>
+    <item>15 minuta</item>
+    <item>30 minuta</item>
+    <item>Dok ne bude zaustavljeno</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuta</item>
+    <item>30 minuta</item>
+    <item>45 minuta</item>
+    <item>1 sat</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-bs/strings.xml b/fmapp2/res/values-bs/strings.xml
new file mode 100644
index 0000000..59cb4a3
--- /dev/null
+++ b/fmapp2/res/values-bs/strings.xml
@@ -0,0 +1,45 @@
+<?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="menu_record_start">Snimi</string>
+    <string name="menu_record_stop">Zaustavi snimanje</string>
+    <string name="menu_settings">Postavke</string>
+    <string name="menu_all_channels">Svi kanali</string>
+    <string name="menu_display_tags">Prikaži oznake</string>
+    <string name="button_text_stop">Zaustavi</string>
+    <string name="regional_band_summary_north_america">Sjeverna Amerika (87.5 do 108.0 MHz u pomacima od 200 kHz)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 do 90.0 MHz u pomacima od 100 kHz)</string>
+    <string name="regional_band_summary_australia">Australija (87.7 do 108.0 MHz u pomacima od 100 kHz)</string>
+    <string name="regional_band_summary_austria">Austrija (87.5 do 108.0 MHz u pomacima od 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Belgija (87.5 do 108.0 MHz u pomacima od 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5 do 108.0 MHz u pomacima od 200 kHz)</string>
+    <string name="regional_band_summary_china">Kina (87.0 do 108.0 MHz u pomacima od 100 kHz)</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ca/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ca/arrays.xml
index cb1457b..dd11ce3 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ca/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Estèreo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Estèreo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuts</item>
+    <item>15 minuts</item>
+    <item>30 minuts</item>
+    <item>Fins que pari</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuts</item>
+    <item>30 minuts</item>
+    <item>45 minuts</item>
+    <item>1 hora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ca/strings.xml b/fmapp2/res/values-ca/strings.xml
new file mode 100644
index 0000000..76411e9
--- /dev/null
+++ b/fmapp2/res/values-ca/strings.xml
@@ -0,0 +1,233 @@
+<?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">Ràdio FM</string>
+    <string name="tx_app_name">FM Tx Nou</string>
+    <string name="menu_scan_start">Cerca</string>
+    <string name="menu_scan_stop">Para de cercar</string>
+    <string name="menu_record_start">Grava</string>
+    <string name="menu_record_stop">Para de gravar</string>
+    <string name="menu_settings">Configuració</string>
+    <string name="menu_sleep">Dorm</string>
+    <string name="menu_sleep_cancel">Cancel·la el mode repòs</string>
+    <string name="menu_all_channels">Tots els canals</string>
+    <string name="menu_display_tags">Mostra les etiquetes</string>
+    <string name="button_text_stop">Para</string>
+    <string name="msg_seeking">S\'està buscant l\'emissora FM\u2026</string>
+    <string name="msg_scanning">S\'estan buscant totes les emissores FM\u2026</string>
+    <string name="msg_scanning_pty">S\'està buscant \'<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">S\'estan auto-seleccionant les presintonies</string>
+    <string name="msg_searching">S\'estan buscant les emissores més potents per crear una llista de presintonies\u2026</string>
+    <string name="msg_noantenna">Si us plau connecta els auriculars\nper utilitzar la Radio FM</string>
+    <string name="dialog_sleep_title">Temps d\'apagat automàtic</string>
+    <string name="presetlist_select_name">Selecciona \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Afegeix Nova Llista</string>
+    <string name="dialog_presetlist_rename_title">Introdueix el nom</string>
+    <string name="presetlist_autoselect_title">Confirma l\'auto-selecció</string>
+    <string name="preset_replace">Substitueix</string>
+    <string name="preset_tune">Sintonitza</string>
+    <string name="preset_rename">Reanomena</string>
+    <string name="preset_delete">Esborra</string>
+    <string name="preset_search">Cerca \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Banda Regional</string>
+    <string name="regional_band_entry_north_america">Nord Amèrica</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japó</string>
+    <string name="regional_band_entry_japan_wide">Japó (Ample)</string>
+    <string name="regional_band_entry_australia">Austràlia</string>
+    <string name="regional_band_entry_austria">Àustria</string>
+    <string name="regional_band_entry_belgium">Bèlgica</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">Xina</string>
+    <string name="regional_band_entry_czech_republic">República Txeca</string>
+    <string name="regional_band_entry_denmark">Dinamarca</string>
+    <string name="regional_band_entry_finland">Finlàndia</string>
+    <string name="regional_band_entry_france">França</string>
+    <string name="regional_band_entry_germany">Alemanya</string>
+    <string name="regional_band_entry_greece">Grècia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Índia</string>
+    <string name="regional_band_entry_indonesia">Indonèsia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Itàlia</string>
+    <string name="regional_band_entry_korea">Corea</string>
+    <string name="regional_band_entry_mexico">Mèxic</string>
+    <string name="regional_band_entry_netherlands">Holanda</string>
+    <string name="regional_band_entry_new_zealand">Nova Zelanda</string>
+    <string name="regional_band_entry_norway">Noruega</string>
+    <string name="regional_band_entry_poland">Polònia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rússia</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Eslovàquia</string>
+    <string name="regional_band_entry_spain">Espanya</string>
+    <string name="regional_band_entry_switzerland">Suïssa</string>
+    <string name="regional_band_entry_sweden">Suècia</string>
+    <string name="regional_band_entry_taiwan">Taïwan</string>
+    <string name="regional_band_entry_turkey">Turquia</string>
+    <string name="regional_band_entry_united_kingdom">Regne Unit</string>
+    <string name="regional_band_entry_united_states">Estats Units</string>
+    <string name="regional_band_entry_user_defined">Banda Definida per l\'Usuari</string>
+    <string name="regional_band_summary_north_america">Amèrica del Nord (87.5 MHz a 108.0 MHz en passos de 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japó (76.0 MHz a 90.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japó (ample) (90.0 MHz a 108.0 MHz en passos de 50 kHz)</string>
+    <string name="regional_band_summary_australia">Austràlia (87.7 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_austria">Àustria (87.5 MHz a 108.0 MHz en passos de 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Bèlgica (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (87.5 MHz a 108.0 MHz en passos de 200 kHz)</string>
+    <string name="regional_band_summary_china">Xina (87.0 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">República Txeca (87.5 a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Dinamarca (87.5 MHz a 108.0 MHz en passos de 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlàndia (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_france">França (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_germany">Alemanya (87.5 MHz a 108.0 MHz en passos de 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grècia (87.5 MHz a 108.0 MHz en passos de 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_india">Índia (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonèsia (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (87.5 MHz a 108.0 MHz en passos de 50 kHz)</string>
+    <string name="regional_band_summary_italy">Itàlia (87.5 MHz a 108.0 MHz en passos de 50 kHz)</string>
+    <string name="regional_band_summary_korea">Corea (87.5 MHz a 108.0 MHz en passos de 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Mèxic (88.1 MHz a 107.9 MHz en passos de 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Països Baixos (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Nova Zelanda (88.0 MHz a 107.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_norway">Noruega (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polònia (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 MHz a 108.0 MHz en passos de 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rússia (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapur (88.0 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Eslovàquia (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_spain">Espanya (87.5 MHz a 108.0 MHz en passos de 100 khz)</string>
+    <string name="regional_band_summary_switzerland">Suïssa (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Suècia (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turquia (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Regne Unit (87.5 MHz a 108.0 MHz en passos de 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Estats Units (88.1 MHz a 107.9 MHz en passos de 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Banda Definida per l\'Usuari</string>
+    <string name="aud_output_mode">Mode de sortida de so</string>
+    <string name="audio_type_stereo">Estèreo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Durada de la gravació</string>
+    <string name="auto_select_af">Freqüència alternativa</string>
+    <string name="settings_revert_defaults_title">Torna als valors predefinits de fàbrica</string>
+    <string name="settings_revert_defaults_summary">Restableix totes les configuracions</string>
+    <string name="settings_revert_confirm_title">Confirma el restabliment</string>
+    <string name="settings_revert_confirm_msg">Això esborrarà totes les configuracions de l\'aplicació, incloent-hi les presintonies desades. Vols continuar?</string>
+    <string name="no_storage">Munta la targeta SD abans de començar a enregistrar.</string>
+    <string name="preparing_sd">S\'està preparant la targeta SD\u2026</string>
+    <string name="access_sd_fail">No s\'ha pogut accedir a la targeta SD.</string>
+    <string name="spaceIsLow_content">S\'està acabant l\'espai a la teva targeta SD. Canvia la configuració de qualitat o esborra algunes imatges o altres fitxers.</string>
+    <string name="FMRecording_reach_size_limit">S\'ha arribat al límit de mida.</string>
+    <string name="menu_scan_for_preset">Cerca les Presintonies</string>
+    <string name="fm_off">La FM està apagada.</string>
+    <string name="fm_call">La FM no es pot utilitzar durant una trucada.</string>
+    <string name="alert_dialog_hint">Introdueix un nom</string>
+    <string name="search_dialog_title">Cerca Emissores</string>
+    <string name="fm_command_timeout_title">Compte enrera</string>
+    <string name="fm_tune_timeout_msg">No s\'ha rebut resposta de l\'emissora Tune FM. Si el problema continua,\nsi us plau apaga la ràdio FM i torna-la a engegar.</string>
+    <string name="fm_command_failed_title">L\'operació FM ha fallat</string>
+    <string name="fm_cmd_failed_msg">L\'operació FM ha fallat. Si el problema continua, si us plau apaga la ràdio FM i torna-la a engegar.</string>
+    <string name="fm_cmd_failed_msg_hdmi">L\'operació FM ha fallat. No ha esta suportada la simultaneïtat FM i HDMI.</string>
+    <string name="fm_cmd_failed_call_on">L\'operació FM ha fallat. El so FM no està permès durant una trucada.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Les meves gravacions FM</string>
+    <string name="audio_db_album_name">Gravacions FM</string>
+    <string name="audio_db_playlist_name">Gravacions FM</string>
+    <string name="station_name">Emissora:</string>
+    <string name="station_exists">Aquesta freqüència ja existeix!</string>
+    <string name="station_list_delete_station">Esborra:<xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Estàs segur que vols esborrar \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">El nom de l\'emissora està buit, si us plau introdueix-lo de nou.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' ja està en ús, si us plau introdueix un nom diferent.</string>
+    <string name="rt_plus_tags">Etiquetes</string>
+    <string name="usr_def_band_min">Freqüència més baixa (MHz)</string>
+    <string name="usr_def_band_max">Freqüència més alta (MHz)</string>
+    <string name="chanl_spacing">Separació entre canals</string>
+    <string name="set">Estableix</string>
+    <string name="user_defind_band_msg">Introdueix la freqüència des de 76.0 fins a 108.0 MHz amb un espai de canal mínim d\'1 kHz i 100kHz d\'espai entre la freqüència mínima i màxima</string>
+    <string name="save_record_file">El fitxer enregistrat FM s\'ha desat a \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">No s\'han trobat emissores compatibles</string>
+    <string name="typ_All_stations">Totes les emissores</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Actualitat</string>
+    <string name="typ_Children">Programes Infantils</string>
+    <string name="typ_Country">Música Country</string>
+    <string name="typ_Documentary">Documentals</string>
+    <string name="typ_Drama">Drames</string>
+    <string name="typ_Easy_listening">Música agradable</string>
+    <string name="typ_Education">Educació</string>
+    <string name="typ_Emergency">Emergència</string>
+    <string name="typ_Emergency_test">Prova d\'Emergència</string>
+    <string name="typ_Finance">Finances</string>
+    <string name="typ_Folk">Música Folk</string>
+    <string name="typ_Information">Informació</string>
+    <string name="typ_Jazz">Música Jazz</string>
+    <string name="typ_Light_classical">Clàssica Lleugera</string>
+    <string name="typ_Leisure">Lleure</string>
+    <string name="typ_News">Notícies</string>
+    <string name="typ_National">Música nacional</string>
+    <string name="typ_Other">Altres músiques</string>
+    <string name="typ_Oldies">Música oldies</string>
+    <string name="typ_Phone_in">Entrada Telèfon</string>
+    <string name="typ_Pop">Música Pop</string>
+    <string name="typ_Religion">Religiosa</string>
+    <string name="typ_Rock">Música Rock</string>
+    <string name="typ_Science">Ciència</string>
+    <string name="typ_Serious_classical">Clàssica seriosa</string>
+    <string name="typ_Social_affairs">Temes socials</string>
+    <string name="typ_Sport">Esports</string>
+    <string name="typ_Travel">Viatges</string>
+    <string name="typ_Varied">Variada</string>
+    <string name="typ_Weather">El temps</string>
+    <string name="typ_Adult_hits">Èxits de sempre</string>
+    <string name="typ_Classical">Clàssica</string>
+    <string name="typ_Classic_Rock">Rock clàssic</string>
+    <string name="typ_College">Escola</string>
+    <string name="typ_Foreign_language">Llengües extrangeres</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostàlgia</string>
+    <string name="typ_Personality">Personalitats</string>
+    <string name="typ_Public">Públiques</string>
+    <string name="typ_Religious_music">Música Religiosa</string>
+    <string name="typ_Religious_talk">Converses Religioses</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Música espanyola</string>
+    <string name="typ_Spanish_talk">Converses en castellà</string>
+    <string name="typ_Soft">Suau</string>
+    <string name="typ_Soft_Rock">Rock suau</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm and Blues suau</string>
+    <string name="typ_Sports">Esports</string>
+    <string name="typ_Talk">Converses</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-cs/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-cs/arrays.xml
index cb1457b..4ec241b 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-cs/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minut</item>
+    <item>15 minut</item>
+    <item>30 minut</item>
+    <item>Dokud není zastaveno</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minut</item>
+    <item>30 minut</item>
+    <item>45 minut</item>
+    <item>1 hodina</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-cs/strings.xml b/fmapp2/res/values-cs/strings.xml
new file mode 100644
index 0000000..016cc62
--- /dev/null
+++ b/fmapp2/res/values-cs/strings.xml
@@ -0,0 +1,233 @@
+<?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 rádio</string>
+    <string name="tx_app_name">FM vysílač</string>
+    <string name="menu_scan_start">Prohledat</string>
+    <string name="menu_scan_stop">Ukončit hledání</string>
+    <string name="menu_record_start">Nahrát</string>
+    <string name="menu_record_stop">Zastavit nahrávání</string>
+    <string name="menu_settings">Nastavení</string>
+    <string name="menu_sleep">Uspat</string>
+    <string name="menu_sleep_cancel">Zrušit spánek</string>
+    <string name="menu_all_channels">Všechny kanály</string>
+    <string name="menu_display_tags">Zobrazit značky</string>
+    <string name="button_text_stop">Stop</string>
+    <string name="msg_seeking">Vyhledávání FM stanic\u2026</string>
+    <string name="msg_scanning">Vyhledávání všech FM stanic\u2026</string>
+    <string name="msg_scanning_pty">Vyhledávání „<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">Automatické přednastavení</string>
+    <string name="msg_searching">Vyhledávání silných stanic pro vytvoření seznamu přednastavení\u2026</string>
+    <string name="msg_noantenna">Pro poslech FM rádia připojte prosím sluchátka</string>
+    <string name="dialog_sleep_title">Doba automatického uspání</string>
+    <string name="presetlist_select_name">Zvolte \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Přidat nový seznam</string>
+    <string name="dialog_presetlist_rename_title">Zadejte název</string>
+    <string name="presetlist_autoselect_title">Potvrďte automatický výběr</string>
+    <string name="preset_replace">Nahradit</string>
+    <string name="preset_tune">Ladit</string>
+    <string name="preset_rename">Přejmenovat</string>
+    <string name="preset_delete">Smazat</string>
+    <string name="preset_search">Vyhledávat \u201a<xliff:g id="preset_pi">%1$s</xliff:g>\u2018</string>
+    <string name="stat_notif_frequency">\u201a<xliff:g id="frequency">%1$s</xliff:g>\u2018 MHz</string>
+    <string name="regional_band">Pásmo</string>
+    <string name="regional_band_entry_north_america">Severní Amerika</string>
+    <string name="regional_band_entry_europe">Evropa</string>
+    <string name="regional_band_entry_japan">Japonsko</string>
+    <string name="regional_band_entry_japan_wide">Japonsko (široký)</string>
+    <string name="regional_band_entry_australia">Austrálie</string>
+    <string name="regional_band_entry_austria">Rakousko</string>
+    <string name="regional_band_entry_belgium">Belgie</string>
+    <string name="regional_band_entry_brazil">Brazílie</string>
+    <string name="regional_band_entry_china">Čína</string>
+    <string name="regional_band_entry_czech_republic">Česká republika</string>
+    <string name="regional_band_entry_denmark">Dánsko</string>
+    <string name="regional_band_entry_finland">Finsko</string>
+    <string name="regional_band_entry_france">Francie</string>
+    <string name="regional_band_entry_germany">Německo</string>
+    <string name="regional_band_entry_greece">Řecko</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indie</string>
+    <string name="regional_band_entry_indonesia">Indonésie</string>
+    <string name="regional_band_entry_ireland">Irsko</string>
+    <string name="regional_band_entry_italy">Ilálie</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexiko</string>
+    <string name="regional_band_entry_netherlands">Nizozemí</string>
+    <string name="regional_band_entry_new_zealand">Nový Zéland</string>
+    <string name="regional_band_entry_norway">Norsko</string>
+    <string name="regional_band_entry_poland">Polsko</string>
+    <string name="regional_band_entry_portugal">Portugalsko</string>
+    <string name="regional_band_entry_russia">Rusko</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Slovensko</string>
+    <string name="regional_band_entry_spain">Španělsko</string>
+    <string name="regional_band_entry_switzerland">Švýcarsko</string>
+    <string name="regional_band_entry_sweden">Švédsko</string>
+    <string name="regional_band_entry_taiwan">Tchaj-wan</string>
+    <string name="regional_band_entry_turkey">Turecko</string>
+    <string name="regional_band_entry_united_kingdom">Spojené království</string>
+    <string name="regional_band_entry_united_states">Spojené státy</string>
+    <string name="regional_band_entry_user_defined">Uživatelem definované pásmo</string>
+    <string name="regional_band_summary_north_america">Severní Amerika (87,5 až 108,0 MHz v 200 kHz krocích)</string>
+    <string name="regional_band_summary_europe">Evropa (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_japan">Japonsko (76,0 až 90,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_japan_wide">Japonsko (široký) (90,0 až 108,0 MHz v 50 kHz krocích)</string>
+    <string name="regional_band_summary_australia">Austrálie (87,7 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_austria">Rakousko (87,5 až 108,0 MHz v 50 kHz krocích)</string>
+    <string name="regional_band_summary_belgium">Belgie (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_brazil">Brazílie (87,5 až 108,0 MHz v 200 kHz krocích)</string>
+    <string name="regional_band_summary_china">Čína (87,0 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_czech_republic">Česká republika (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_denmark">Dánsko (87,5 až 108,0 MHz v 50 kHz krocích)</string>
+    <string name="regional_band_summary_finland">Finsko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_france">Francie (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_germany">Německo (87,5 až 108,0 MHz v 50 kHz krocích)</string>
+    <string name="regional_band_summary_greece">Řecko (87,5 až 108,0 MHz v 50 kHz krocích)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_india">Indie (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_indonesia">Indonésie (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_ireland">Irsko (87,5 až 108,0 MHz v 50 kHz krocích)</string>
+    <string name="regional_band_summary_italy">Itálie (87,5 až 108,0 MHz v 50 kHz krocích)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 až 108,0 MHz v 200 kHz krocích)</string>
+    <string name="regional_band_summary_mexico">Mexiko (88,1 až 107,9 MHz v 200 kHz krocích)</string>
+    <string name="regional_band_summary_netherlands">Nizozemsko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_new_zealand">Nový Zéland (88,0 až 107,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_norway">Norsko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_poland">Polsko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_portugal">Portugalsko (87,5 až 108,0 MHz v 50 kHz krocích)</string>
+    <string name="regional_band_summary_russia">Rusko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_singapore">Singapur (88,0 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_slovakia">Slovensko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_spain">Španělsko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_switzerland">Švýcarsko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_sweden">Švédsko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_taiwan">Tchaj-wan (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_turkey">Turecko (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_united_kingdom">Velká Británie (87,5 až 108,0 MHz ve 100 kHz krocích)</string>
+    <string name="regional_band_summary_united_states">Spojené státy (88,1 až 107,9 MHz v 200 kHz krocích)</string>
+    <string name="regional_band_summary_user_defined">Uživatelem definované pásmo</string>
+    <string name="aud_output_mode">Režim zvukového výstupu</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Doba trvání záznamu</string>
+    <string name="auto_select_af">Alternativní frekvence</string>
+    <string name="settings_revert_defaults_title">Obnovit výchozí nastavení</string>
+    <string name="settings_revert_defaults_summary">Obnovit všechna nastavení</string>
+    <string name="settings_revert_confirm_title">Potvrďte obnovení</string>
+    <string name="settings_revert_confirm_msg">Toto smaže všechna nastavení v aplikaci včetně přednastavení. Přejete si pokračovat?</string>
+    <string name="no_storage">Připojte SD kartu před začátkem nahrávání.</string>
+    <string name="preparing_sd">Příprava karty SD…</string>
+    <string name="access_sd_fail">Nelze získat přístup ke kartě SD.</string>
+    <string name="spaceIsLow_content">Na SD kartě dochází místo. Změňte nastavení kvality nebo smažte některé soubory.</string>
+    <string name="FMRecording_reach_size_limit">Bylo dosaženo limitu velikosti.</string>
+    <string name="menu_scan_for_preset">Vyhledat předvolby</string>
+    <string name="fm_off">FM je vypnuto.</string>
+    <string name="fm_call">FM nelze použít při volání.</string>
+    <string name="alert_dialog_hint">Zadejte název</string>
+    <string name="search_dialog_title">Vyhledat stanice</string>
+    <string name="fm_command_timeout_title">Časový limit</string>
+    <string name="fm_tune_timeout_msg">Není možné naladit FM stanici. Pokud problém přetrvává, prosím vypněte a opět zapněte FM rádio.</string>
+    <string name="fm_command_failed_title">Operace FM rádia selhala</string>
+    <string name="fm_cmd_failed_msg">Operace FM rádia selhala. Pokud problém přetrvává, vypněte a opět zapněte prosím FM rádio.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Operace FM rádia selhala. Nelze společně provozovat FM rádio a zároveň HDMI připojení.</string>
+    <string name="fm_cmd_failed_call_on">Operace FM rádia selhala. Nelze současně mít zapnuté FM rádio a volat.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">dd. MM. yyyy HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Mé nahrávky FM</string>
+    <string name="audio_db_album_name">Nahrávky FM</string>
+    <string name="audio_db_playlist_name">Nahrávky FM</string>
+    <string name="station_name">Stanice:</string>
+    <string name="station_exists">Tato frekvence již existuje!</string>
+    <string name="station_list_delete_station">Smazat: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Opravdu chcete smazat „<xliff:g id="name">%s</xliff:g>“?</string>
+    <string name="station_name_empty">Název stanice je prázdný, zadejte znovu.</string>
+    <string name="station_name_exist">Stanice „<xliff:g id="name">%s</xliff:g>“ už existuje, prosím zadejte jiný název.</string>
+    <string name="rt_plus_tags">Štítky</string>
+    <string name="usr_def_band_min">Nejnižší frekvence (MHz)</string>
+    <string name="usr_def_band_max">Nejvyšší frekvence (MHz)</string>
+    <string name="chanl_spacing">Odstup kanálů</string>
+    <string name="set">Nastavit</string>
+    <string name="user_defind_band_msg">Zadejte frekvenci od 76,0 do 108,0 MHz s minimální mezerou 1 kanál a 100kHz mezerou mezi minimální a maximální frekvencí</string>
+    <string name="save_record_file">Záznam FM uložen do souboru „<xliff:g id="record_file">%1$s</xliff:g>“</string>
+    <string name="fm_search_no_results">Nebyly nalezeny žádné použitelné stanice</string>
+    <string name="typ_All_stations">Všechny stanice</string>
+    <string name="typ_Culture">Kultura</string>
+    <string name="typ_Current_affairs">Publicistika</string>
+    <string name="typ_Children">Program pro děti</string>
+    <string name="typ_Country">Country</string>
+    <string name="typ_Documentary">Dokumentární</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Poslechová hudba</string>
+    <string name="typ_Education">Vzdělávání</string>
+    <string name="typ_Emergency">Pohotovost</string>
+    <string name="typ_Emergency_test">Pohotovost - test</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Folková hudba</string>
+    <string name="typ_Information">Informace</string>
+    <string name="typ_Jazz">Jazzová hudba</string>
+    <string name="typ_Light_classical">Lehká klasika</string>
+    <string name="typ_Leisure">Volný čas</string>
+    <string name="typ_News">Zpravodajství</string>
+    <string name="typ_National">Národní hudba</string>
+    <string name="typ_Other">Ostatní hudba</string>
+    <string name="typ_Oldies">Oldies</string>
+    <string name="typ_Phone_in">Stažené</string>
+    <string name="typ_Pop">Pop-music</string>
+    <string name="typ_Religion">Náboženství</string>
+    <string name="typ_Rock">Rocková hudba</string>
+    <string name="typ_Science">Věda</string>
+    <string name="typ_Serious_classical">Seriózní klasika</string>
+    <string name="typ_Social_affairs">Sociální věci</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Cestování</string>
+    <string name="typ_Varied">Různé</string>
+    <string name="typ_Weather">Počasí</string>
+    <string name="typ_Adult_hits">Hity pro dospělé</string>
+    <string name="typ_Classical">Klasická hudba</string>
+    <string name="typ_Classic_Rock">Klasický Rock</string>
+    <string name="typ_College">Školní</string>
+    <string name="typ_Foreign_language">Cizí jazyk</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgie</string>
+    <string name="typ_Personality">Osobnosti</string>
+    <string name="typ_Public">Veřejné</string>
+    <string name="typ_Religious_music">Náboženská hudba</string>
+    <string name="typ_Religious_talk">Náboženské mluvené slovo</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Španělská hudba</string>
+    <string name="typ_Spanish_talk">Španělština</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sporty</string>
+    <string name="typ_Talk">Mluvené slovo</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-cy/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-cy/arrays.xml
index cb1457b..8a33e7e 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-cy/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 munud</item>
+    <item>15 munud</item>
+    <item>30 munud</item>
+    <item>Nes wedi\'i stopio</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 munud</item>
+    <item>30 munud</item>
+    <item>45 munud</item>
+    <item>1 awr</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-cy/strings.xml b/fmapp2/res/values-cy/strings.xml
new file mode 100644
index 0000000..dc724b3
--- /dev/null
+++ b/fmapp2/res/values-cy/strings.xml
@@ -0,0 +1,232 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Trosglwyddydd FM</string>
+    <string name="menu_scan_start">Sganio</string>
+    <string name="menu_scan_stop">Stopio chwilio</string>
+    <string name="menu_record_start">Recordio</string>
+    <string name="menu_record_stop">Stopio recordio</string>
+    <string name="menu_settings">Gosodiadau</string>
+    <string name="menu_sleep">Cysgu</string>
+    <string name="menu_sleep_cancel">Diddymu cysgu</string>
+    <string name="menu_all_channels">Pob sianel</string>
+    <string name="menu_display_tags">Dangos tagiau</string>
+    <string name="button_text_stop">Stopio</string>
+    <string name="msg_seeking">Yn chwilio gorsaf FM\u2026</string>
+    <string name="msg_scanning">Yn sganio holl orsafoedd FM\u2026</string>
+    <string name="msg_scanning_pty">Yn sganio am \'<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">Rhagosodiadau awto-ddewis</string>
+    <string name="msg_searching">Yn chwilio am orsafoedd cryf i greu rhestr o orsafoedd rhagosodedig\u2026</string>
+    <string name="msg_noantenna">Rhaid cysylltu clustffonau i ddefnyddio radio FM</string>
+    <string name="dialog_sleep_title">Amser cysgu cyn troi i ffwrdd yn awtomatig</string>
+    <string name="presetlist_select_name">Dewis \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Ychwanegu rhestr newydd</string>
+    <string name="dialog_presetlist_rename_title">Rho enw</string>
+    <string name="presetlist_autoselect_title">Cadarnhau awto-ddewis</string>
+    <string name="preset_replace">Disodli</string>
+    <string name="preset_tune">Tiwnio</string>
+    <string name="preset_rename">Ailenwi</string>
+    <string name="preset_delete">Dileu</string>
+    <string name="preset_search">Chwilio am \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Band rhanbarthol</string>
+    <string name="regional_band_entry_north_america">Gogledd America</string>
+    <string name="regional_band_entry_europe">Ewrop</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (llydan)</string>
+    <string name="regional_band_entry_australia">Awstralia</string>
+    <string name="regional_band_entry_austria">Awstria</string>
+    <string name="regional_band_entry_belgium">Gwlad Belg</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">Tsieina</string>
+    <string name="regional_band_entry_czech_republic">Gweriniaeth Tsiec</string>
+    <string name="regional_band_entry_denmark">Denmarc</string>
+    <string name="regional_band_entry_finland">Y Ffindir</string>
+    <string name="regional_band_entry_france">Ffrainc</string>
+    <string name="regional_band_entry_germany">Yr Almaen</string>
+    <string name="regional_band_entry_greece">Groeg</string>
+    <string name="regional_band_entry_hong_kong">Hong Cong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Iwerddon</string>
+    <string name="regional_band_entry_italy">Yr Eidal</string>
+    <string name="regional_band_entry_korea">Corea</string>
+    <string name="regional_band_entry_mexico">Mecsico</string>
+    <string name="regional_band_entry_netherlands">Yr Iseldiroedd</string>
+    <string name="regional_band_entry_new_zealand">Seland Newydd</string>
+    <string name="regional_band_entry_norway">Norwy</string>
+    <string name="regional_band_entry_poland">Gwlad Pwyl</string>
+    <string name="regional_band_entry_portugal">Portiwgal</string>
+    <string name="regional_band_entry_russia">Rwsia</string>
+    <string name="regional_band_entry_singapore">Singapôr</string>
+    <string name="regional_band_entry_slovakia">Slofacia</string>
+    <string name="regional_band_entry_spain">Sbaen</string>
+    <string name="regional_band_entry_switzerland">Y Swistir</string>
+    <string name="regional_band_entry_sweden">Sweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Twrci</string>
+    <string name="regional_band_entry_united_kingdom">Y Deyrnas Gyfunol</string>
+    <string name="regional_band_entry_united_states">Unol Daleithiau</string>
+    <string name="regional_band_entry_user_defined">Band a ddiffinnir gan ddefnyddiwr</string>
+    <string name="regional_band_summary_north_america">Gogledd America (87.5 i 108.0 MHz mewn camau 200 kHz)</string>
+    <string name="regional_band_summary_europe">Ewrop (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 i 90.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japan (llydan) (90.0 i 108.0 MHz mewn camau 50 kHz)</string>
+    <string name="regional_band_summary_australia">Awstralia (87.7 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_austria">Awstria (87.5 i 108.0 MHz mewn camau 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Gwlad Belg (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (87.5 i 108.0 MHz mewn camau 200 kHz)</string>
+    <string name="regional_band_summary_china">Tsieina (87.0 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Y Gweriniaeth Tsiec (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Denmarc (87.5 i 108.0 MHz mewn camau 50 kHz)</string>
+    <string name="regional_band_summary_finland">Y Ffindir (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_france">Ffrainc (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_germany">Yr Almaen (87.5 i 108.0 MHz mewn camau 50 kHz)</string>
+    <string name="regional_band_summary_greece">Groeg (87.5 i 108.0 MHz mewn camau 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Cong (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_india">India (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Iwerddon (87.5 i 108.0 MHz mewn camau 50 kHz)</string>
+    <string name="regional_band_summary_italy">Yr Eidal (87.5 i 108.0 MHz mewn camau 50 kHz)</string>
+    <string name="regional_band_summary_korea">Corea (87.5 i 108.0 MHz mewn camau 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Mecsico (88.1 i 107.9 MHz mewn camau 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Yr Iseldiroedd (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Seland Newydd (88.0 i 107.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norwy (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_poland">Gwlad Pwyl (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portiwgal (87.5 i 108.0 MHz mewn camau 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rwsia (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapôr (88.0 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Slofacia (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_spain">Sbaen (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Y Swistir (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Sweden (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Twrci (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Y Deyrnas Gyfunol (87.5 i 108.0 MHz mewn camau 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Unol Daleithiau (88.1 i 107.9 MHz mewn camau 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Band a ddiffinnir gan ddefnyddiwr</string>
+    <string name="aud_output_mode">Modd allbwn sain</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Hyd recordio</string>
+    <string name="auto_select_af">Amledd amgen</string>
+    <string name="settings_revert_defaults_title">Ailosod nôl i\'r gosodiadau o\'r ffatri</string>
+    <string name="settings_revert_defaults_summary">Ailosod yr holl osodiadau</string>
+    <string name="settings_revert_confirm_title">Cadarnhau ailosod</string>
+    <string name="settings_revert_confirm_msg">Bydd hyn yn clirio holl osodiadau apiau, gan gynnwys y rhagosodiadau wedi\'u cadw. Parhau?</string>
+    <string name="no_storage">Mowntio cerdyn SD cyn dechrau recordio.</string>
+    <string name="preparing_sd">Yn paratoi\'r cerdyn SD\u2026</string>
+    <string name="access_sd_fail">Methwyd â chael at y cerdyn SD.</string>
+    <string name="spaceIsLow_content">Mae dy storfa cerdyn SD yn rhedeg yn brin o le. Newidia\'r gosodiad ansawdd neu ddileu rhai lluniau neu ffeiliau eraill i ryddhau lle.</string>
+    <string name="FMRecording_reach_size_limit">Wedi cyrraedd y terfyn maint.</string>
+    <string name="menu_scan_for_preset">Sganio am ragosodiadau</string>
+    <string name="fm_off">Mae FM wedi\'i droi i ffwrdd.</string>
+    <string name="fm_call">Ni ellir defnyddio FM tra mewn galwad.</string>
+    <string name="alert_dialog_hint">Rho enw</string>
+    <string name="search_dialog_title">Sganio gorsafoedd</string>
+    <string name="fm_command_timeout_title">Terfyn amser</string>
+    <string name="fm_tune_timeout_msg">Ni chafwyd ymateb i diwnio\'r orsaf FM. Os yw\'r broblem yn parhau, tro FM i ffwrdd a nôl ymlaen eto.</string>
+    <string name="fm_command_failed_title">Methodd y weithred FM</string>
+    <string name="fm_cmd_failed_msg">Methodd y weithred FM. Os yw\'r broblem yn parhau, tro FM i ffwrdd a nôl ymlaen eto.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Methodd y weithred FM. Nid yw eto\'n bosib defnyddio FM a HDMI ar yr un pryd.</string>
+    <string name="fm_cmd_failed_call_on">Methodd y weithred FM. Ni chaniateir sain FM yn ystod galwad.</string>
+    <string name="audio_db_artist_name">Fy recordiadau FM</string>
+    <string name="audio_db_album_name">Recordiadau FM</string>
+    <string name="audio_db_playlist_name">Recordiadau FM</string>
+    <string name="station_name">Gorsaf:</string>
+    <string name="station_exists">Mae\'r amledd hwn yn bodoli eisoes!</string>
+    <string name="station_list_delete_station">Dileu: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Wyt ti\'n bendant am ddileu \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Mae enw\'r orsaf yn wag. Rho fo eto, plîs.</string>
+    <string name="station_name_exist">Mae \'<xliff:g id="name">%s</xliff:g>\' eisoes yn cael ei ddefnyddio. Rho enw gwahanol.</string>
+    <string name="rt_plus_tags">Tagiau</string>
+    <string name="usr_def_band_min">Amledd isaf (MHz)</string>
+    <string name="usr_def_band_max">Amledd uchaf (MHz)</string>
+    <string name="chanl_spacing">Bylchiad gorsafoedd</string>
+    <string name="set">Gosod</string>
+    <string name="user_defind_band_msg">Rho amledd o 76.0 i 108.0 MHz gyda bylchu o leiaf 1 sianel a bwlch 100 kHz rhwng yr amledd isaf ac uchaf.</string>
+    <string name="save_record_file">Cadwyd y ffeil recordiad FM i \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Ni chanfuwyd unrhyw orsafoedd cytûn</string>
+    <string name="typ_All_stations">Pob orsaf</string>
+    <string name="typ_Culture">Diwylliant</string>
+    <string name="typ_Current_affairs">Materion cyfoes</string>
+    <string name="typ_Children">Rhaglenni plant</string>
+    <string name="typ_Country">Cerddoriaeth gwlad</string>
+    <string name="typ_Documentary">Dogfen</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Cerddoriaeth ysgafn</string>
+    <string name="typ_Education">Addysg</string>
+    <string name="typ_Emergency">Argyfwng</string>
+    <string name="typ_Emergency_test">Prawf argyfwng</string>
+    <string name="typ_Finance">Cyllid</string>
+    <string name="typ_Folk">Cerddoriaeth gwerin</string>
+    <string name="typ_Information">Gwybodaeth</string>
+    <string name="typ_Jazz">Cerddoriaeth jas</string>
+    <string name="typ_Light_classical">Clasurol ysgafn</string>
+    <string name="typ_Leisure">Hamdden</string>
+    <string name="typ_News">Newyddion</string>
+    <string name="typ_National">Cerddoriaeth cenedlaethol</string>
+    <string name="typ_Other">Cerddoriaeth arall</string>
+    <string name="typ_Oldies">Hen gerddoriaeth</string>
+    <string name="typ_Phone_in">Galw mewn</string>
+    <string name="typ_Pop">Cerddoriaeth pop</string>
+    <string name="typ_Religion">Crefydd</string>
+    <string name="typ_Rock">Cerddoriaeth roc</string>
+    <string name="typ_Science">Gwyddoniaeth</string>
+    <string name="typ_Serious_classical">Clasurol</string>
+    <string name="typ_Social_affairs">Materion cymdeithasol</string>
+    <string name="typ_Sport">Chwaraeon</string>
+    <string name="typ_Travel">Teithio</string>
+    <string name="typ_Varied">Amrywiol</string>
+    <string name="typ_Weather">Tywydd</string>
+    <string name="typ_Adult_hits">Poblogaidd</string>
+    <string name="typ_Classical">Clasurol</string>
+    <string name="typ_Classic_Rock">Roc Clasurol</string>
+    <string name="typ_College">Coleg</string>
+    <string name="typ_Foreign_language">Iaith dramor</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Hiraeth</string>
+    <string name="typ_Personality">Personoliaeth</string>
+    <string name="typ_Public">Cyhoeddus</string>
+    <string name="typ_Religious_music">Cerddoriaeth crefyddol</string>
+    <string name="typ_Religious_talk">Sgwrsio crefyddol</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm a Blues</string>
+    <string name="typ_Spanish_music">Cerddoriaeth Sbaeneg</string>
+    <string name="typ_Spanish_talk">Sgwrsio Sbaeneg</string>
+    <string name="typ_Soft">Meddal</string>
+    <string name="typ_Soft_Rock">Roc Meddal</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm a Blues Meddal</string>
+    <string name="typ_Sports">Chwaraeon</string>
+    <string name="typ_Talk">Siarad</string>
+    <string name="typ_Top_40">40 Uchaf</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-da/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-da/arrays.xml
index cb1457b..34bcb3c 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-da/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutter</item>
+    <item>15 minutter</item>
+    <item>30 minutter</item>
+    <item>Indtil stoppet</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutter</item>
+    <item>30 minutter</item>
+    <item>45 minutter</item>
+    <item>1 time</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-da/strings.xml b/fmapp2/res/values-da/strings.xml
new file mode 100644
index 0000000..283bef1
--- /dev/null
+++ b/fmapp2/res/values-da/strings.xml
@@ -0,0 +1,232 @@
+<?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-Sender</string>
+    <string name="menu_scan_start">Skan</string>
+    <string name="menu_scan_stop">Stop søgning</string>
+    <string name="menu_record_start">Optag</string>
+    <string name="menu_record_stop">Stop optagelse</string>
+    <string name="menu_settings">Indstillinger</string>
+    <string name="menu_sleep">Slumring</string>
+    <string name="menu_sleep_cancel">Afbryd slumring</string>
+    <string name="menu_all_channels">Alle kanaler</string>
+    <string name="menu_display_tags">Vis etiketter</string>
+    <string name="button_text_stop">Stop</string>
+    <string name="msg_seeking">Søger efter FM-station\u2026</string>
+    <string name="msg_scanning">Skanner efter alle FM-stationer\u2026</string>
+    <string name="msg_scanning_pty">Skanner efter \'<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-valgte forudindstillinger</string>
+    <string name="msg_searching">Søger efter stærke stationer, for at oprette en forudstillingsliste\u2026</string>
+    <string name="msg_noantenna">Tilslut venligst et headset, for at benytte FM-radio</string>
+    <string name="dialog_sleep_title">Auto-sluk slumretid</string>
+    <string name="presetlist_select_name">Vælg \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Tilføj ny liste</string>
+    <string name="dialog_presetlist_rename_title">Indtast navn</string>
+    <string name="presetlist_autoselect_title">Bekræft auto-valg</string>
+    <string name="preset_replace">Erstat</string>
+    <string name="preset_tune">Stil ind</string>
+    <string name="preset_rename">Omdøb</string>
+    <string name="preset_delete">Slet</string>
+    <string name="preset_search">Søg efter \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regionalt bånd</string>
+    <string name="regional_band_entry_north_america">Nordamerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (bred)</string>
+    <string name="regional_band_entry_australia">Australien</string>
+    <string name="regional_band_entry_austria">Østrig</string>
+    <string name="regional_band_entry_belgium">Belgien</string>
+    <string name="regional_band_entry_brazil">Brasilien</string>
+    <string name="regional_band_entry_china">Kina</string>
+    <string name="regional_band_entry_czech_republic">Tjekkiet</string>
+    <string name="regional_band_entry_denmark">Danmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">Frankrig</string>
+    <string name="regional_band_entry_germany">Tyskland</string>
+    <string name="regional_band_entry_greece">Grækenland</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indien</string>
+    <string name="regional_band_entry_indonesia">Indonesien</string>
+    <string name="regional_band_entry_ireland">Irland</string>
+    <string name="regional_band_entry_italy">Italien</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Holland</string>
+    <string name="regional_band_entry_new_zealand">New Zealand</string>
+    <string name="regional_band_entry_norway">Norge</string>
+    <string name="regional_band_entry_poland">Polen</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusland</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakiet</string>
+    <string name="regional_band_entry_spain">Spanien</string>
+    <string name="regional_band_entry_switzerland">Schweiz</string>
+    <string name="regional_band_entry_sweden">Sverige</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Tyrkiet</string>
+    <string name="regional_band_entry_united_kingdom">Storbritannien</string>
+    <string name="regional_band_entry_united_states">Forenede Stater (USA)</string>
+    <string name="regional_band_entry_user_defined">Brugerdefineret bånd</string>
+    <string name="regional_band_summary_north_america">Nordamerika (87,5 til 108,0 MHz i 200 kHz-trin)</string>
+    <string name="regional_band_summary_europe">Europa (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_japan">Japan (76,0 til 90,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_japan_wide">Japan (dækkende) (90,0 til 108,0 MHz i 50 kHz-trin)</string>
+    <string name="regional_band_summary_australia">Australien (87,7 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_austria">Australien (87,5 til 108,0 MHz i 50 kHz-trin)</string>
+    <string name="regional_band_summary_belgium">Belgien (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_brazil">Brasilien (87,5 til 108,0 MHz i 200 kHz-trin)</string>
+    <string name="regional_band_summary_china">Kina (87,0 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_czech_republic">Tjekkiet (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_denmark">Danmark (87,5 til 108,0 MHz i 50 kHz-trin)</string>
+    <string name="regional_band_summary_finland">Finland (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_france">Frankrig (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_germany">Tyskland (87,5 til 108,0 MHz i 50 kHz-trin)</string>
+    <string name="regional_band_summary_greece">Grækenland (87,5 til 108,0 MHz i 50 kHz-trin)</string>
+    <string name="regional_band_summary_hong_kong">Hongkong (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_india">Indien (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_indonesia">Indonesien (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_ireland">Irland (87,5 til 108,0 MHz i 50 kHz-trin)</string>
+    <string name="regional_band_summary_italy">Italien (87,5 til 108,0 MHz i 50 kHz-trin)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 til 108,0 MHz i 200 kHz-trin)</string>
+    <string name="regional_band_summary_mexico">Mexico (88,1 til 107,9 MHz i 200 kHz-trin)</string>
+    <string name="regional_band_summary_netherlands">Holland (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_new_zealand">New Zealand (88,0 til 107,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_norway">Norge (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_poland">Polen (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 til 108,0 MHz i 50 kHz-trin)</string>
+    <string name="regional_band_summary_russia">Rusland (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_singapore">Singapore (88,0 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_slovakia">Slovakiet (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_spain">Spanien (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_switzerland">Schweiz (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_sweden">Sverige (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_turkey">Tyrkiet (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_united_kingdom">Storbritannien (87,5 til 108,0 MHz i 100 kHz-trin)</string>
+    <string name="regional_band_summary_united_states">USA (88,1 til 107,9 MHz i 200 kHz-trin)</string>
+    <string name="regional_band_summary_user_defined">Brugerdefineret bånd</string>
+    <string name="aud_output_mode">Lydudgangstilstand</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Optagelsesvarighed</string>
+    <string name="auto_select_af">Alternativ frekvens</string>
+    <string name="settings_revert_defaults_title">Tilbagefør til fabriksstandarder</string>
+    <string name="settings_revert_defaults_summary">Nulstil alle indstillinger</string>
+    <string name="settings_revert_confirm_title">Bekræft nulstilling</string>
+    <string name="settings_revert_confirm_msg">Dette vil rydde alle applikationsindstillinger, inklusive gemte forudindstillinger. Fortsæt?</string>
+    <string name="no_storage">Montér SD-kort, før start på optagelse.</string>
+    <string name="preparing_sd">Forbereder SD-kort\u2026</string>
+    <string name="access_sd_fail">Kunne ikke tilgå SD-kort.</string>
+    <string name="spaceIsLow_content">Dit SD-kort lager er ved at løbe før for plads. Skift kvalitetsindstillingen, eller slet nogle andre filer, for at frigøre plads.</string>
+    <string name="FMRecording_reach_size_limit">Størrelsesgrænse nået.</string>
+    <string name="menu_scan_for_preset">Skan efter forudindstillinger</string>
+    <string name="fm_off">FM er slået fra.</string>
+    <string name="fm_call">FM kan ikke bruges under opkald.</string>
+    <string name="alert_dialog_hint">Indtast et navn</string>
+    <string name="search_dialog_title">Skan stationer</string>
+    <string name="fm_command_timeout_title">Tidsudløb</string>
+    <string name="fm_tune_timeout_msg">Intet svar modtaget til at indstille FM-station. Hvis problemet vedbliver, så slå venligst FM fra og til igen.</string>
+    <string name="fm_command_failed_title">FM-opgave fejlede</string>
+    <string name="fm_cmd_failed_msg">FM-opgave fejlede. Hvis problemet vedbliver, så slå venligst FM fra og til igen.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-opgave fejlede. Samtidig brug af FM og HDMI er ikke understøttet.</string>
+    <string name="fm_cmd_failed_call_on">FM-opgave fejlede. FM-lyd er ikke tilladt under opkald.</string>
+    <string name="audio_db_artist_name">Mine FM-optagelser</string>
+    <string name="audio_db_album_name">FM-optagelser</string>
+    <string name="audio_db_playlist_name">FM-optagelser</string>
+    <string name="station_name">Station:</string>
+    <string name="station_exists">Denne frekvens eksisterer allerede!</string>
+    <string name="station_list_delete_station">Slet: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Er du sikker på, at du vil slette \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Stationsnavn er tomt, indtast venligst igen.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' er allerede i brug, indtast venligst et andet navn.</string>
+    <string name="rt_plus_tags">Etiketter</string>
+    <string name="usr_def_band_min">Laveste frekvens (MHz)</string>
+    <string name="usr_def_band_max">Højeste frekvens (MHz)</string>
+    <string name="chanl_spacing">Kanalafstand</string>
+    <string name="set">Angiv</string>
+    <string name="user_defind_band_msg">Angiv frekvens fra 76,0 til 108,0 MHz med minimum 1 kanals afstand og 100 kHz afstand mellem min. og maks. frekvens</string>
+    <string name="save_record_file">FM-optaget fil gemt til \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Ingen kompatible stationer fundet</string>
+    <string name="typ_All_stations">Alle stationer</string>
+    <string name="typ_Culture">Kultur</string>
+    <string name="typ_Current_affairs">Aktuelle sager</string>
+    <string name="typ_Children">Børneprogrammer</string>
+    <string name="typ_Country">Country-musik</string>
+    <string name="typ_Documentary">Dokumentar</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy listening-musik</string>
+    <string name="typ_Education">Uddannelse</string>
+    <string name="typ_Emergency">Nødmeddelelser</string>
+    <string name="typ_Emergency_test">Nødmeddelelsesprøve</string>
+    <string name="typ_Finance">Finans</string>
+    <string name="typ_Folk">Folkemusik</string>
+    <string name="typ_Information">Information</string>
+    <string name="typ_Jazz">Jazz-musik</string>
+    <string name="typ_Light_classical">Let klassisk</string>
+    <string name="typ_Leisure">Afslapning</string>
+    <string name="typ_News">Nyheder</string>
+    <string name="typ_National">Nationalmusik</string>
+    <string name="typ_Other">Andet musik</string>
+    <string name="typ_Oldies">Gammel musik</string>
+    <string name="typ_Phone_in">Ring ind</string>
+    <string name="typ_Pop">Pop-musik</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rock-musik</string>
+    <string name="typ_Science">Videnskab</string>
+    <string name="typ_Serious_classical">Seriøs klassisk</string>
+    <string name="typ_Social_affairs">Sociale anliggender</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Rejse</string>
+    <string name="typ_Varied">Varieret</string>
+    <string name="typ_Weather">Vejr</string>
+    <string name="typ_Adult_hits">Voksen-hits</string>
+    <string name="typ_Classical">Klassisk</string>
+    <string name="typ_Classic_Rock">Klassisk rock</string>
+    <string name="typ_College">Gymnasie</string>
+    <string name="typ_Foreign_language">Fremmedsprog</string>
+    <string name="typ_Hiphop">Hip-Hop</string>
+    <string name="typ_Nostalgia">Nostalgi</string>
+    <string name="typ_Personality">Personlighed</string>
+    <string name="typ_Public">Offentlige</string>
+    <string name="typ_Religious_music">Religiøs musik</string>
+    <string name="typ_Religious_talk">Religiøs tale</string>
+    <string name="typ_Rhythm_and_Blues">R\'n\'B</string>
+    <string name="typ_Spanish_music">Spansk musik</string>
+    <string name="typ_Spanish_talk">Spansk tale</string>
+    <string name="typ_Soft">Blød</string>
+    <string name="typ_Soft_Rock">Blød Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Blød R\'n\'B</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Tale</string>
+    <string name="typ_Top_40">Top-40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-de/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-de/arrays.xml
index cb1457b..0409246 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-de/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 Minuten</item>
+    <item>15 Minuten</item>
+    <item>30 Minuten</item>
+    <item>Bis gestoppt wird</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 Minuten</item>
+    <item>30 Minuten</item>
+    <item>45 Minuten</item>
+    <item>1 Stunde</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-de/strings.xml b/fmapp2/res/values-de/strings.xml
new file mode 100644
index 0000000..5cdfd2a
--- /dev/null
+++ b/fmapp2/res/values-de/strings.xml
@@ -0,0 +1,233 @@
+<?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-Sender</string>
+    <string name="menu_scan_start">Suchen</string>
+    <string name="menu_scan_stop">Suche anhalten</string>
+    <string name="menu_record_start">Aufzeichnen</string>
+    <string name="menu_record_stop">Aufzeichnung beenden</string>
+    <string name="menu_settings">Einstellungen</string>
+    <string name="menu_sleep">Ruhezustand</string>
+    <string name="menu_sleep_cancel">Aufwecken</string>
+    <string name="menu_all_channels">Alle Kanäle</string>
+    <string name="menu_display_tags">Schlagworte anzeigen</string>
+    <string name="button_text_stop">Anhalten</string>
+    <string name="msg_seeking">FM-Radiosender suchen\u2026</string>
+    <string name="msg_scanning">Suche nach allen FM-Radiosendern\u2026</string>
+    <string name="msg_scanning_pty">Suche nach \"<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">Senderliste automatisch erstellen</string>
+    <string name="msg_searching">Suche nach Radiosendern mit starkem Signal, um eine Senderliste zu erstellen\u2026</string>
+    <string name="msg_noantenna">Bitte schließe ein Headset an, um das FM-Radio nutzen zu können</string>
+    <string name="dialog_sleep_title">Zeit bis zum automatischen Ausschalten</string>
+    <string name="presetlist_select_name">\"<xliff:g id="presetlist_name">%1$s</xliff:g>\" auswählen</string>
+    <string name="presetlist_add_new">Neue Liste hinzufügen</string>
+    <string name="dialog_presetlist_rename_title">Name eingeben</string>
+    <string name="presetlist_autoselect_title">Auto-Auswahl bestätigen</string>
+    <string name="preset_replace">Ersetzen</string>
+    <string name="preset_tune">Sendersuchlauf</string>
+    <string name="preset_rename">Umbenennen</string>
+    <string name="preset_delete">Löschen</string>
+    <string name="preset_search">Suche nach \"<xliff:g id="preset_pi">%1$s</xliff:g>\"</string>
+    <string name="stat_notif_frequency">\"<xliff:g id="frequency">%1$s</xliff:g>\" MHz</string>
+    <string name="regional_band">Frequenzband</string>
+    <string name="regional_band_entry_north_america">Nordamerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (Breitband)</string>
+    <string name="regional_band_entry_australia">Australien</string>
+    <string name="regional_band_entry_austria">Österreich</string>
+    <string name="regional_band_entry_belgium">Belgien</string>
+    <string name="regional_band_entry_brazil">Brasilien</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Tschechien</string>
+    <string name="regional_band_entry_denmark">Dänemark</string>
+    <string name="regional_band_entry_finland">Finnland</string>
+    <string name="regional_band_entry_france">Frankreich</string>
+    <string name="regional_band_entry_germany">Deutschland</string>
+    <string name="regional_band_entry_greece">Griechenland</string>
+    <string name="regional_band_entry_hong_kong">Hongkong</string>
+    <string name="regional_band_entry_india">Indien</string>
+    <string name="regional_band_entry_indonesia">Indonesien</string>
+    <string name="regional_band_entry_ireland">Irland</string>
+    <string name="regional_band_entry_italy">Italien</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexiko</string>
+    <string name="regional_band_entry_netherlands">Niederlande</string>
+    <string name="regional_band_entry_new_zealand">Neuseeland</string>
+    <string name="regional_band_entry_norway">Norwegen</string>
+    <string name="regional_band_entry_poland">Polen</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russland</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Slowakei</string>
+    <string name="regional_band_entry_spain">Spanien</string>
+    <string name="regional_band_entry_switzerland">Schweiz</string>
+    <string name="regional_band_entry_sweden">Schweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Türkei</string>
+    <string name="regional_band_entry_united_kingdom">Vereinigtes Königreich</string>
+    <string name="regional_band_entry_united_states">USA</string>
+    <string name="regional_band_entry_user_defined">Benutzerdefiniertes Frequenzband</string>
+    <string name="regional_band_summary_north_america">Nordamerika (87,5 bis 108,0 MHz, Schrittweite 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japan (76,0 bis 90,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japan (Breitband) (90,0 bis 108,0 MHz, Schrittweite 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australien (87,7 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_austria">Österreich (87,5 bis 108,0 MHz, Schrittweite 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Belgien (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasilien (87,5 bis 108,0 MHz, Schrittweite 200 kHz)</string>
+    <string name="regional_band_summary_china">China (87,0 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Tschechien (87,5 bis 108,0 MHz, in 100 kHz Schritten)</string>
+    <string name="regional_band_summary_denmark">Dänemark (87,5 bis 108,0 MHz, Schrittweite 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finnland (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_france">Frankreich (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_germany">Deutschland (87,5 bis 108,0 MHz, Schrittweite 50 kHz)</string>
+    <string name="regional_band_summary_greece">Griechenland (87,5 bis 108,0 MHz, Schrittweite 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hongkong (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_india">Indien (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesien (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irland (87,5 bis 108,0 MHz, Schrittweite 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italien (87,5 bis 108,0 MHz, Schrittweite 50 kHz)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 bis 108,0 MHz, Schrittweite 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Mexiko (88,1 bis 107,9 MHz, Schrittweite 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Niederlande (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Neuseeland (88,0 bis 107,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norwegen (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polen (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 bis 108,0 MHz, Schrittweite 50 kHz)</string>
+    <string name="regional_band_summary_russia">Russland (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapur (88,0 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Slowakei (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_spain">Spanien (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Schweiz (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Schweden (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Türkei (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Vereinigtes Königreich (87,5 bis 108,0 MHz, Schrittweite 100 kHz)</string>
+    <string name="regional_band_summary_united_states">USA (88,1 bis 107,9 MHz, Schrittweite 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Benutzerdefiniertes Frequenzband</string>
+    <string name="aud_output_mode">Audio-Ausgabemodus</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Aufzeichnungsdauer</string>
+    <string name="auto_select_af">Alternative Frequenz</string>
+    <string name="settings_revert_defaults_title">Auf Werkseinstellungen zurücksetzen</string>
+    <string name="settings_revert_defaults_summary">Alle Einstellungen zurücksetzen</string>
+    <string name="settings_revert_confirm_title">Zurücksetzen bestätigen</string>
+    <string name="settings_revert_confirm_msg">Diese Aktion löscht die App-Einstellungen und die Senderlisten. Fortfahren?</string>
+    <string name="no_storage">Mounte die SD-Karte vor Aufnahmebeginn.</string>
+    <string name="preparing_sd">SD-Karte wird vorbereitet\u2026</string>
+    <string name="access_sd_fail">Auf die SD-Karte konnte nicht zugegriffen werden.</string>
+    <string name="spaceIsLow_content">Auf deiner SD-Karte ist nicht mehr genügend Speicherplatz vorhanden. Bitte reduziere die Aufnahmequalität oder lösche einige Daten, um Speicher frei zu machen.</string>
+    <string name="FMRecording_reach_size_limit">Maximale Größe erreicht.</string>
+    <string name="menu_scan_for_preset">Nach Senderlisten suchen</string>
+    <string name="fm_off">FM ist ausgeschaltet.</string>
+    <string name="fm_call">FM kann nicht während eines Anrufs verwendet werden.</string>
+    <string name="alert_dialog_hint">Gib einen Namen ein</string>
+    <string name="search_dialog_title">Sendersuche</string>
+    <string name="fm_command_timeout_title">Zeitüberschreitung</string>
+    <string name="fm_tune_timeout_msg">Kein Empfang des gewünschten FM-Senders. Wenn das Problem weiterhin besteht, bitte Radio aus- und einschalten.</string>
+    <string name="fm_command_failed_title">Vorgang fehlgeschlagen</string>
+    <string name="fm_cmd_failed_msg">Vorgang fehlgeschlagen. Wenn das Problem weiterhin besteht, bitte FM aus- und einschalten.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Vorgang fehlgeschlagen. FM und HDMI parallel wird nicht unterstützt.</string>
+    <string name="fm_cmd_failed_call_on">Vorgang fehlgeschlagen. FM ist während eines Anrufes nicht möglich.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Meine Radioaufnahmen</string>
+    <string name="audio_db_album_name">Radioaufnahmen</string>
+    <string name="audio_db_playlist_name">Radioaufnahmen</string>
+    <string name="station_name">Sender:</string>
+    <string name="station_exists">Diese Frequenz ist bereits vorhanden!</string>
+    <string name="station_list_delete_station">Löschen: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Bist du sicher, dass du \"<xliff:g id="name">%s</xliff:g>\"  löschen willst?</string>
+    <string name="station_name_empty">Der Sendername ist leer. Bitte gib einen Namen ein.</string>
+    <string name="station_name_exist">\"<xliff:g id="name">%s</xliff:g>\" wird bereits verwendet. Bitte gib einen anderen Namen ein.</string>
+    <string name="rt_plus_tags">Schlagworte</string>
+    <string name="usr_def_band_min">Niedrigste Frequenz (MHz)</string>
+    <string name="usr_def_band_max">Höchste Frequenz (MHz)</string>
+    <string name="chanl_spacing">Kanalabstand</string>
+    <string name="set">Übernehmen</string>
+    <string name="user_defind_band_msg">Gib einen Frequenzbereich zwischen 76,0 und 108,0 MHz mit mindestens einem Kanal und 100 kHz Abstand zwischen minimaler und maximaler Frequenz ein</string>
+    <string name="save_record_file">Radioaufnahme wurde unter \"<xliff:g id="record_file">%1$s</xliff:g>\" gespeichert</string>
+    <string name="fm_search_no_results">Keine kompatiblen Sender gefunden</string>
+    <string name="typ_All_stations">Alle Sender</string>
+    <string name="typ_Culture">Kultur</string>
+    <string name="typ_Current_affairs">Aktuelle Ereignisse</string>
+    <string name="typ_Children">Kinder-Programme</string>
+    <string name="typ_Country">Country-Musik</string>
+    <string name="typ_Documentary">Dokumentationen</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy Listening Musik</string>
+    <string name="typ_Education">Bildung</string>
+    <string name="typ_Emergency">Katastrophenalarm</string>
+    <string name="typ_Emergency_test">Katastrophenalarm (Test)</string>
+    <string name="typ_Finance">Finanzen</string>
+    <string name="typ_Folk">Volksmusik</string>
+    <string name="typ_Information">Informationen</string>
+    <string name="typ_Jazz">Jazzmusik</string>
+    <string name="typ_Light_classical">Klassik leicht</string>
+    <string name="typ_Leisure">Freizeit</string>
+    <string name="typ_News">Nachrichten</string>
+    <string name="typ_National">Nationale Musik</string>
+    <string name="typ_Other">Andere Musik</string>
+    <string name="typ_Oldies">Oldies</string>
+    <string name="typ_Phone_in">Gespräche</string>
+    <string name="typ_Pop">Popmusik</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rockmusik</string>
+    <string name="typ_Science">Wissenschaft</string>
+    <string name="typ_Serious_classical">Klassik</string>
+    <string name="typ_Social_affairs">Soziales</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Reisen</string>
+    <string name="typ_Varied">Verschiedenes</string>
+    <string name="typ_Weather">Wetter</string>
+    <string name="typ_Adult_hits">Für Erwachsene</string>
+    <string name="typ_Classical">Klassik</string>
+    <string name="typ_Classic_Rock">Classic Rock</string>
+    <string name="typ_College">Campusradio</string>
+    <string name="typ_Foreign_language">Fremdsprache</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgie</string>
+    <string name="typ_Personality">Persönlichkeit</string>
+    <string name="typ_Public">Öffentlich</string>
+    <string name="typ_Religious_music">Geistliche Musik</string>
+    <string name="typ_Religious_talk">Religiöse Gespräche</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm und Blues</string>
+    <string name="typ_Spanish_music">Spanische Musik</string>
+    <string name="typ_Spanish_talk">Spanische Gespräche</string>
+    <string name="typ_Soft">Leichte Musik</string>
+    <string name="typ_Soft_Rock">Softrock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm und Blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Gespräche</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-el/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-el/arrays.xml
index cb1457b..0e31093 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-el/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Στερεοφωνικό</item>
+    <item>Μονοφωνικό</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-el/strings.xml b/fmapp2/res/values-el/strings.xml
new file mode 100644
index 0000000..908b9d7
--- /dev/null
+++ b/fmapp2/res/values-el/strings.xml
@@ -0,0 +1,233 @@
+<?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</string>
+    <string name="tx_app_name">Πομπός FM</string>
+    <string name="menu_scan_start">Σάρωση</string>
+    <string name="menu_scan_stop">Διακοπή αναζήτησης</string>
+    <string name="menu_record_start">Ηχογράφηση</string>
+    <string name="menu_record_stop">Διακοπή ηχογράφησης</string>
+    <string name="menu_settings">Ρυθμίσεις</string>
+    <string name="menu_sleep">Αναστολή</string>
+    <string name="menu_sleep_cancel">Ακύρωση αναστολής</string>
+    <string name="menu_all_channels">Όλα τα κανάλια</string>
+    <string name="menu_display_tags">Εμφάνιση ετικετών</string>
+    <string name="button_text_stop">Διακοπή</string>
+    <string name="msg_seeking">Αναζήτηση σταθμού FM\u2026</string>
+    <string name="msg_scanning">Αναζήτηση όλων των σταθμών FM\u2026</string>
+    <string name="msg_scanning_pty">Αναζήτηση για \'<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">Αυτόματη επιλογή προκαθορισμένων</string>
+    <string name="msg_searching">Αναζήτηση για σταθμούς με ισχυρό σήμα για δημιουργία μιας λίστας προκαθορισμένων\u2026</string>
+    <string name="msg_noantenna">Παρακαλώ συνδέστε ακουστικά για να χρησιμοποιήσετε το ραδιόφωνο FM</string>
+    <string name="dialog_sleep_title">Χρόνος αυτόματης αναστολής</string>
+    <string name="presetlist_select_name">Επιλογή \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Προσθήκη νέας λίστας</string>
+    <string name="dialog_presetlist_rename_title">Εισάγετε όνομα</string>
+    <string name="presetlist_autoselect_title">Επιβεβαίωση αυτόματης επιλογής</string>
+    <string name="preset_replace">Αντικατάσταση</string>
+    <string name="preset_tune">Συντονισμός</string>
+    <string name="preset_rename">Μετονομασία</string>
+    <string name="preset_delete">Διαγραφή</string>
+    <string name="preset_search">Αναζήτηση για \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Ζώνη περιφέρειας</string>
+    <string name="regional_band_entry_north_america">Βόρεια Αμερική</string>
+    <string name="regional_band_entry_europe">Ευρώπη</string>
+    <string name="regional_band_entry_japan">Ιαπωνία</string>
+    <string name="regional_band_entry_japan_wide">Ιαπωνία (πλατιά)</string>
+    <string name="regional_band_entry_australia">Αυστραλία</string>
+    <string name="regional_band_entry_austria">Αυστρία</string>
+    <string name="regional_band_entry_belgium">Βέλγιο</string>
+    <string name="regional_band_entry_brazil">Βραζιλία</string>
+    <string name="regional_band_entry_china">Κίνα</string>
+    <string name="regional_band_entry_czech_republic">Τσεχική Δημοκρατία</string>
+    <string name="regional_band_entry_denmark">Δανία</string>
+    <string name="regional_band_entry_finland">Φινλανδία</string>
+    <string name="regional_band_entry_france">Γαλλία</string>
+    <string name="regional_band_entry_germany">Γερμανία</string>
+    <string name="regional_band_entry_greece">Ελλάδα</string>
+    <string name="regional_band_entry_hong_kong">Χονγκ Κονγκ</string>
+    <string name="regional_band_entry_india">Ινδία</string>
+    <string name="regional_band_entry_indonesia">Ινδονησία</string>
+    <string name="regional_band_entry_ireland">Ιρλανδία</string>
+    <string name="regional_band_entry_italy">Ιταλία</string>
+    <string name="regional_band_entry_korea">Κορέα</string>
+    <string name="regional_band_entry_mexico">Μεξικό</string>
+    <string name="regional_band_entry_netherlands">Ολλανδία</string>
+    <string name="regional_band_entry_new_zealand">Νέα Ζηλανδία</string>
+    <string name="regional_band_entry_norway">Νορβηγία</string>
+    <string name="regional_band_entry_poland">Πολωνία</string>
+    <string name="regional_band_entry_portugal">Πορτογαλία</string>
+    <string name="regional_band_entry_russia">Ρωσία</string>
+    <string name="regional_band_entry_singapore">Σιγκαπούρη</string>
+    <string name="regional_band_entry_slovakia">Σλοβακία</string>
+    <string name="regional_band_entry_spain">Ισπανία</string>
+    <string name="regional_band_entry_switzerland">Ελβετία</string>
+    <string name="regional_band_entry_sweden">Σουηδία</string>
+    <string name="regional_band_entry_taiwan">Ταϊβάν</string>
+    <string name="regional_band_entry_turkey">Τουρκία</string>
+    <string name="regional_band_entry_united_kingdom">Ηνωμένο Βασίλειο</string>
+    <string name="regional_band_entry_united_states">Ηνωμένες Πολιτείες</string>
+    <string name="regional_band_entry_user_defined">Προσαρμοσμένη μπάντα</string>
+    <string name="regional_band_summary_north_america">Βόρεια Αμερική (87.5 έως 108.0 MHz με βήματα 200 kHz)</string>
+    <string name="regional_band_summary_europe">Ευρώπη (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_japan">Ιαπωνία (76.0 έως 90.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Ιαπωνία (πλατιά) (90.0 έως 108.0 MHz με βήματα 50 kHz)</string>
+    <string name="regional_band_summary_australia">Αυστραλία (87,7 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_austria">Αυστρία (87.5 έως 108.0 MHz με βήματα 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Βέλγιο (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Βραζιλία (87.5 έως 108.0 MHz με βήματα 200 kHz)</string>
+    <string name="regional_band_summary_china">Κίνα (87.0 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Τσεχία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Δανία (87.5 έως 108.0 MHz με βήματα 50 kHz)</string>
+    <string name="regional_band_summary_finland">Φινλανδία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_france">Γαλλία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_germany">Γερμανία (87.5 έως 108.0 MHz με βήματα 50 kHz)</string>
+    <string name="regional_band_summary_greece">Ελλάδα (87.5 έως 108.0 MHz με βήματα 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Χονγκ Κονγκ (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_india">Ινδία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Ινδονησία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Ιρλανδία (87.5 έως 108.0 MHz με βήματα 50 kHz)</string>
+    <string name="regional_band_summary_italy">Ιταλία (87.5 έως 108.0 MHz με βήματα 50 kHz)</string>
+    <string name="regional_band_summary_korea">Κορέα (87.5 έως 108.0 MHz με βήματα 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Μεξικό (88.1 έως 107.9 MHz με βήματα 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Ολλανδία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Νέα Ζηλανδία (88,0 έως 107.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_norway">Νορβηγία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_poland">Πολωνία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Πορτογαλία (87.5 έως 108.0 MHz με βήματα 50 kHz)</string>
+    <string name="regional_band_summary_russia">Ρωσία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Σιγκαπούρη (88,0 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Σλοβακία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_spain">Ισπανία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Ελβετία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Σουηδία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Ταϊβάν (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Τουρκία (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Ηνωμένο Βασίλειο (87.5 έως 108.0 MHz με βήματα 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Ηνωμένες Πολιτείες (88.1 έως 107.9 MHz με βήματα 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Προσαρμοσμένη μπάντα</string>
+    <string name="aud_output_mode">Λειτουργία εξόδου ήχου</string>
+    <string name="audio_type_stereo">Στερεοφωνικό</string>
+    <string name="audio_type_mono">Μονοφωνικό</string>
+    <string name="record_dur">Διάρκεια ηχογράφησης</string>
+    <string name="auto_select_af">Εναλλακτική συχνότητα</string>
+    <string name="settings_revert_defaults_title">Επαναφορά στις εργοστασιακές προεπιλογές</string>
+    <string name="settings_revert_defaults_summary">Επαναφορά όλων των ρυθμίσεων</string>
+    <string name="settings_revert_confirm_title">Επιβεβαίωση επαναφοράς</string>
+    <string name="settings_revert_confirm_msg">Αυτό θα διαγράψει όλες τις ρυθμίσεις εφαρμογής, συμπεριλαμβανομένων των αποθηκευμένων προκαθορισμένων. Συνέχεια;</string>
+    <string name="no_storage">Τοποθετήστε την κάρτα SD πριν την έναρξη της εγγραφής.</string>
+    <string name="preparing_sd">Προετοιμασία κάρτας SD\u2026</string>
+    <string name="access_sd_fail">Δεν ήταν δυνατή η πρόσβαση στην κάρτα SD.</string>
+    <string name="spaceIsLow_content">Ο αποθηκευτικός χώρος της κάρτας SD σας εξαντλείται. Αλλάξτε τη ρύθμιση ποιότητας ή διαγράψτε κάποια άλλα αρχεία για να ελευθερώσετε χώρο.</string>
+    <string name="FMRecording_reach_size_limit">Συμπληρώθηκε το όριο μεγέθους.</string>
+    <string name="menu_scan_for_preset">Σάρωση για προκαθορισμένα</string>
+    <string name="fm_off">Το FM είναι απενεργοποιημένο.</string>
+    <string name="fm_call">Το FM δεν μπορεί να χρησιμοποιηθεί κατά τη διάρκεια μιας κλήσης.</string>
+    <string name="alert_dialog_hint">Πληκτρολογήστε ένα όνομα</string>
+    <string name="search_dialog_title">Σάρωση σταθμών</string>
+    <string name="fm_command_timeout_title">Χρονικό όριο</string>
+    <string name="fm_tune_timeout_msg">Δεν ελήφθη καμία απάντηση για τον συντονισμό του σταθμού FM. Εάν το πρόβλημα παραμένει, παρακαλούμε απενεργοποιήστε το FM και ενεργοποιήστε το ξανά.</string>
+    <string name="fm_command_failed_title">Η λειτουργία FM απέτυχε</string>
+    <string name="fm_cmd_failed_msg">Η λειτουργία FM απέτυχε. Εάν το πρόβλημα παραμένει, παρακαλούμε απενεργοποιήστε το FM και ενεργοποιήστε το ξανά.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Η λειτουργία FM απέτυχε. Δεν υποστηρίζονται ταυτόχρονα FM και HDMI.</string>
+    <string name="fm_cmd_failed_call_on">Η λειτουργία FM απέτυχε. Ο ήχος από FM δεν επιτρέπεται κατά τη διάρκεια κλήσης.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">dd-MM-yyyy HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Οι ηχογραφήσεις FM μου</string>
+    <string name="audio_db_album_name">Ηχογραφήσεις FM</string>
+    <string name="audio_db_playlist_name">Ηχογραφήσεις FM</string>
+    <string name="station_name">Σταθμός:</string>
+    <string name="station_exists">Αυτή η συχνότητα υπάρχει ήδη!</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="station_name_empty">Το όνομα του σταθμού είναι άδειο, πληκτρολογήστε ξανά.</string>
+    <string name="station_name_exist">Το \'<xliff:g id="name">%s</xliff:g>\' είναι ήδη σε χρήση, παρακαλώ εισάγετε ένα διαφορετικό όνομα.</string>
+    <string name="rt_plus_tags">Ετικέτες</string>
+    <string name="usr_def_band_min">Χαμηλότερη συχνότητα (MHz)</string>
+    <string name="usr_def_band_max">Υψηλότερη συχνότητα (MHz)</string>
+    <string name="chanl_spacing">Διάστημα καναλιών</string>
+    <string name="set">Ορισμός</string>
+    <string name="user_defind_band_msg">Εισάγετε συχνότητα από 76,0 έως 108.0 MHz με ελάχιστη απόσταση 1 κανάλι και 100 kHz απόσταση μεταξύ ελάχιστης και μέγιστης συχνότητας</string>
+    <string name="save_record_file">Το αρχείο FM που ηχογραφήθηκε αποθηκεύτηκε στο \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Δε βρέθηκαν συμβατοί σταθμοί</string>
+    <string name="typ_All_stations">Όλοι οι σταθμοί</string>
+    <string name="typ_Culture">Πολιτισμός</string>
+    <string name="typ_Current_affairs">Επικαιρότητα</string>
+    <string name="typ_Children">Παιδικά προγράμματα</string>
+    <string name="typ_Country">Κάντρι</string>
+    <string name="typ_Documentary">Ντοκιμαντέρ</string>
+    <string name="typ_Drama">Δράμα</string>
+    <string name="typ_Easy_listening">Μουσική που ακούγεται εύκολα</string>
+    <string name="typ_Education">Εκπαίδευση</string>
+    <string name="typ_Emergency">Έκτακτη ανάγκη</string>
+    <string name="typ_Emergency_test">Δοκιμή έκτακτης ανάγκης</string>
+    <string name="typ_Finance">Οικονομικά</string>
+    <string name="typ_Folk">Παραδοσιακή μουσική</string>
+    <string name="typ_Information">Πληροφορίες</string>
+    <string name="typ_Jazz">Τζαζ μουσική</string>
+    <string name="typ_Light_classical">Ελαφριά κλασική</string>
+    <string name="typ_Leisure">Αναψυχή</string>
+    <string name="typ_News">Ειδήσεις</string>
+    <string name="typ_National">Εθνική μουσική</string>
+    <string name="typ_Other">Άλλη μουσική</string>
+    <string name="typ_Oldies">Oldies μουσική</string>
+    <string name="typ_Phone_in">Τηλέφωνο</string>
+    <string name="typ_Pop">Ποπ μουσική</string>
+    <string name="typ_Religion">Θρησκεία</string>
+    <string name="typ_Rock">Ροκ μουσική</string>
+    <string name="typ_Science">Επιστήμη</string>
+    <string name="typ_Serious_classical">Σοβαρή κλασική</string>
+    <string name="typ_Social_affairs">Κοινωνικές υποθέσεις</string>
+    <string name="typ_Sport">Αθλητισμός</string>
+    <string name="typ_Travel">Ταξίδια</string>
+    <string name="typ_Varied">Ποικίλη</string>
+    <string name="typ_Weather">Καιρός</string>
+    <string name="typ_Adult_hits">Hits ενηλίκων</string>
+    <string name="typ_Classical">Κλασική</string>
+    <string name="typ_Classic_Rock">Κλασικό ροκ</string>
+    <string name="typ_College">Κολλέγιο</string>
+    <string name="typ_Foreign_language">Ξενόγλωσσα</string>
+    <string name="typ_Hiphop">Χιπ χοπ</string>
+    <string name="typ_Nostalgia">Νοσταλγία</string>
+    <string name="typ_Personality">Προσωπικότητα</string>
+    <string name="typ_Public">Δημόσια</string>
+    <string name="typ_Religious_music">Θρησκευτική μουσική</string>
+    <string name="typ_Religious_talk">Θρησκευτική ομιλία</string>
+    <string name="typ_Rhythm_and_Blues">RnB</string>
+    <string name="typ_Spanish_music">Ισπανική μουσική</string>
+    <string name="typ_Spanish_talk">Ισπανική ομιλία</string>
+    <string name="typ_Soft">Απαλή</string>
+    <string name="typ_Soft_Rock">Απαλό rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Απαλό RnB</string>
+    <string name="typ_Sports">Αθλήματα</string>
+    <string name="typ_Talk">Συζήτηση</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-en-rAU/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-en-rAU/arrays.xml
index cb1457b..351670d 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-en-rAU/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutes</item>
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>Until stopped</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>45 minutes</item>
+    <item>1 hour</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-en-rAU/strings.xml b/fmapp2/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..6f5000d
--- /dev/null
+++ b/fmapp2/res/values-en-rAU/strings.xml
@@ -0,0 +1,233 @@
+<?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 Transmitter</string>
+    <string name="menu_scan_start">Scan</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\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="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="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="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regional band</string>
+    <string name="regional_band_entry_north_america">North America</string>
+    <string name="regional_band_entry_europe">Europe</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (wide)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgium</string>
+    <string name="regional_band_entry_brazil">Brazil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Denmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">France</string>
+    <string name="regional_band_entry_germany">Germany</string>
+    <string name="regional_band_entry_greece">Greece</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Ireland</string>
+    <string name="regional_band_entry_italy">Italy</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Netherlands</string>
+    <string name="regional_band_entry_new_zealand">New Zealand</string>
+    <string name="regional_band_entry_norway">Norway</string>
+    <string name="regional_band_entry_poland">Poland</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russia</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Spain</string>
+    <string name="regional_band_entry_switzerland">Switzerland</string>
+    <string name="regional_band_entry_sweden">Sweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkey</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">United States</string>
+    <string name="regional_band_entry_user_defined">User defined band</string>
+    <string name="regional_band_summary_north_america">North America (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_europe">Europe (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 to 90.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan_wide">Japan (wide) (90.0 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_austria">Austria (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_belgium">Belgium (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_china">China (87.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_czech_republic">Czech Republic (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_denmark">Denmark (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_finland">Finland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_france">France (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_germany">Germany (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_greece">Greece (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_india">India (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_ireland">Ireland (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_italy">Italy (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_mexico">Mexico (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_netherlands">Netherlands (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_new_zealand">New Zealand (88.0 to 107.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_norway">Norway (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_poland">Poland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_russia">Russia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_slovakia">Slovakia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_spain">Spain (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_switzerland">Switzerland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_sweden">Sweden (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_turkey">Turkey (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_kingdom">United Kingdom (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_states">United States (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_user_defined">User defined band</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="record_dur">Record duration</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>
+    <string name="no_storage">Mount SD card before starting recording.</string>
+    <string name="preparing_sd">Preparing SD card\u2026</string>
+    <string name="access_sd_fail">Couldn\'t access SD card.</string>
+    <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>
+    <string name="FMRecording_reach_size_limit">Size limit reached.</string>
+    <string name="menu_scan_for_preset">Scan for presets</string>
+    <string name="fm_off">FM is turned off.</string>
+    <string name="fm_call">FM can\'t be used while calling.</string>
+    <string name="alert_dialog_hint">Enter a name</string>
+    <string name="search_dialog_title">Scan stations</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="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="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">My FM recordings</string>
+    <string name="audio_db_album_name">FM recordings</string>
+    <string name="audio_db_playlist_name">FM recordings</string>
+    <string name="station_name">Station:</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 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">\'<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="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="set">Set</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>
+    <string name="fm_search_no_results">No compatible stations found</string>
+    <string name="typ_All_stations">All Stations</string>
+    <string name="typ_Culture">Culture</string>
+    <string name="typ_Current_affairs">Current Affairs</string>
+    <string name="typ_Children">Children\'s Programs</string>
+    <string name="typ_Country">Country Music</string>
+    <string name="typ_Documentary">Documentary</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy listening music</string>
+    <string name="typ_Education">Education</string>
+    <string name="typ_Emergency">Emergency</string>
+    <string name="typ_Emergency_test">Emergency test</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Folk Music</string>
+    <string name="typ_Information">Information</string>
+    <string name="typ_Jazz">Jazz Music</string>
+    <string name="typ_Light_classical">Light Classical</string>
+    <string name="typ_Leisure">Leisure</string>
+    <string name="typ_News">News</string>
+    <string name="typ_National">National music</string>
+    <string name="typ_Other">Other music</string>
+    <string name="typ_Oldies">Oldies Music</string>
+    <string name="typ_Phone_in">Phone in</string>
+    <string name="typ_Pop">Pop music</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rock music</string>
+    <string name="typ_Science">Science</string>
+    <string name="typ_Serious_classical">Serious classical</string>
+    <string name="typ_Social_affairs">Social affairs</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Travel</string>
+    <string name="typ_Varied">Varied</string>
+    <string name="typ_Weather">Weather</string>
+    <string name="typ_Adult_hits">Adult Hits</string>
+    <string name="typ_Classical">Classical</string>
+    <string name="typ_Classic_Rock">Classic Rock</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Foreign Language</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personality</string>
+    <string name="typ_Public">Public</string>
+    <string name="typ_Religious_music">Religious music</string>
+    <string name="typ_Religious_talk">Religious talk</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Spanish music</string>
+    <string name="typ_Spanish_talk">Spanish talk</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sports</string>
+    <string name="typ_Talk">Talk</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-en-rCA/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-en-rCA/arrays.xml
index cb1457b..351670d 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-en-rCA/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutes</item>
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>Until stopped</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>45 minutes</item>
+    <item>1 hour</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-en-rCA/strings.xml b/fmapp2/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..7844510
--- /dev/null
+++ b/fmapp2/res/values-en-rCA/strings.xml
@@ -0,0 +1,233 @@
+<?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 Transmitter</string>
+    <string name="menu_scan_start">Scan</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\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="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="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="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regional band</string>
+    <string name="regional_band_entry_north_america">North America</string>
+    <string name="regional_band_entry_europe">Europe</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (wide)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgium</string>
+    <string name="regional_band_entry_brazil">Brazil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Denmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">France</string>
+    <string name="regional_band_entry_germany">Germany</string>
+    <string name="regional_band_entry_greece">Greece</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Ireland</string>
+    <string name="regional_band_entry_italy">Italy</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Netherlands</string>
+    <string name="regional_band_entry_new_zealand">New Zealand</string>
+    <string name="regional_band_entry_norway">Norway</string>
+    <string name="regional_band_entry_poland">Poland</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russia</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Spain</string>
+    <string name="regional_band_entry_switzerland">Switzerland</string>
+    <string name="regional_band_entry_sweden">Sweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkey</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">United States</string>
+    <string name="regional_band_entry_user_defined">User defined band</string>
+    <string name="regional_band_summary_north_america">North America (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_europe">Europe (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 to 90.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan_wide">Japan (wide) (90.0 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_austria">Austria (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_belgium">Belgium (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_china">China (87.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_czech_republic">Czech Republic (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_denmark">Denmark (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_finland">Finland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_france">France (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_germany">Germany (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_greece">Greece (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_india">India (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_ireland">Ireland (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_italy">Italy (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_mexico">Mexico (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_netherlands">Netherlands (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_new_zealand">New Zealand (88.0 to 107.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_norway">Norway (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_poland">Poland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_russia">Russia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_slovakia">Slovakia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_spain">Spain (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_switzerland">Switzerland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_sweden">Sweden (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_turkey">Turkey (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_kingdom">United Kingdom (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_states">United States (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_user_defined">User defined band</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="record_dur">Record duration</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>
+    <string name="no_storage">Mount SD card before starting recording.</string>
+    <string name="preparing_sd">Preparing SD card\u2026</string>
+    <string name="access_sd_fail">Couldn\'t access SD card.</string>
+    <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>
+    <string name="FMRecording_reach_size_limit">Size limit reached.</string>
+    <string name="menu_scan_for_preset">Scan for presets</string>
+    <string name="fm_off">FM is turned off.</string>
+    <string name="fm_call">FM can\'t be used while calling.</string>
+    <string name="alert_dialog_hint">Enter a name</string>
+    <string name="search_dialog_title">Scan stations</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="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="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">My FM recordings</string>
+    <string name="audio_db_album_name">FM recordings</string>
+    <string name="audio_db_playlist_name">FM recordings</string>
+    <string name="station_name">Station:</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 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">\'<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="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="set">Set</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>
+    <string name="fm_search_no_results">No compatible stations found</string>
+    <string name="typ_All_stations">All stations</string>
+    <string name="typ_Culture">Culture</string>
+    <string name="typ_Current_affairs">Current affairs</string>
+    <string name="typ_Children">Children programs</string>
+    <string name="typ_Country">Country music</string>
+    <string name="typ_Documentary">Documentary</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy listening music</string>
+    <string name="typ_Education">Education</string>
+    <string name="typ_Emergency">Emergency</string>
+    <string name="typ_Emergency_test">Emergency test</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Folk music</string>
+    <string name="typ_Information">Information</string>
+    <string name="typ_Jazz">Jazz music</string>
+    <string name="typ_Light_classical">Light classical</string>
+    <string name="typ_Leisure">Leisure</string>
+    <string name="typ_News">News</string>
+    <string name="typ_National">National music</string>
+    <string name="typ_Other">Other music</string>
+    <string name="typ_Oldies">Oldies music</string>
+    <string name="typ_Phone_in">Phone in</string>
+    <string name="typ_Pop">Pop music</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rock music</string>
+    <string name="typ_Science">Science</string>
+    <string name="typ_Serious_classical">Serious classical</string>
+    <string name="typ_Social_affairs">Social affairs</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Travel</string>
+    <string name="typ_Varied">Varied</string>
+    <string name="typ_Weather">Weather</string>
+    <string name="typ_Adult_hits">Adult hits</string>
+    <string name="typ_Classical">Classical</string>
+    <string name="typ_Classic_Rock">Classic Rock</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Foreign language</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personality</string>
+    <string name="typ_Public">Public</string>
+    <string name="typ_Religious_music">Religious music</string>
+    <string name="typ_Religious_talk">Religious talk</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Spanish music</string>
+    <string name="typ_Spanish_talk">Spanish talk</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sports</string>
+    <string name="typ_Talk">Talk</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-en-rGB/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-en-rGB/arrays.xml
index cb1457b..351670d 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-en-rGB/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutes</item>
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>Until stopped</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>45 minutes</item>
+    <item>1 hour</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-en-rGB/strings.xml b/fmapp2/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..65fef74
--- /dev/null
+++ b/fmapp2/res/values-en-rGB/strings.xml
@@ -0,0 +1,233 @@
+<?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 Transmitter</string>
+    <string name="menu_scan_start">Scan</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\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="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="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="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regional band</string>
+    <string name="regional_band_entry_north_america">North America</string>
+    <string name="regional_band_entry_europe">Europe</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (wide)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgium</string>
+    <string name="regional_band_entry_brazil">Brazil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Denmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">France</string>
+    <string name="regional_band_entry_germany">Germany</string>
+    <string name="regional_band_entry_greece">Greece</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Ireland</string>
+    <string name="regional_band_entry_italy">Italy</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Netherlands</string>
+    <string name="regional_band_entry_new_zealand">New Zealand</string>
+    <string name="regional_band_entry_norway">Norway</string>
+    <string name="regional_band_entry_poland">Poland</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russia</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Spain</string>
+    <string name="regional_band_entry_switzerland">Switzerland</string>
+    <string name="regional_band_entry_sweden">Sweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkey</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">United States</string>
+    <string name="regional_band_entry_user_defined">User defined band</string>
+    <string name="regional_band_summary_north_america">North America (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_europe">Europe (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 to 90.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan_wide">Japan (wide) (90.0 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_austria">Austria (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_belgium">Belgium (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_china">China (87.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_czech_republic">Czech Republic (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_denmark">Denmark (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_finland">Finland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_france">France (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_germany">Germany (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_greece">Greece (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_india">India (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_ireland">Ireland (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_italy">Italy (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_mexico">Mexico (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_netherlands">Netherlands (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_new_zealand">New Zealand (88.0 to 107.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_norway">Norway (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_poland">Poland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_russia">Russia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_slovakia">Slovakia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_spain">Spain (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_switzerland">Switzerland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_sweden">Sweden (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_turkey">Turkey (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_kingdom">United Kingdom (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_states">United States (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_user_defined">User defined band</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="record_dur">Record duration</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>
+    <string name="no_storage">Mount SD card before starting recording.</string>
+    <string name="preparing_sd">Preparing SD card\u2026</string>
+    <string name="access_sd_fail">Couldn\'t access SD card.</string>
+    <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>
+    <string name="FMRecording_reach_size_limit">Size limit reached.</string>
+    <string name="menu_scan_for_preset">Scan for presets</string>
+    <string name="fm_off">FM is turned off.</string>
+    <string name="fm_call">FM can\'t be used while calling.</string>
+    <string name="alert_dialog_hint">Enter a name</string>
+    <string name="search_dialog_title">Scan stations</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="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="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">My FM recordings</string>
+    <string name="audio_db_album_name">FM recordings</string>
+    <string name="audio_db_playlist_name">FM recordings</string>
+    <string name="station_name">Station:</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 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">\'<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="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="set">Set</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>
+    <string name="fm_search_no_results">No compatible stations found</string>
+    <string name="typ_All_stations">All stations</string>
+    <string name="typ_Culture">Culture</string>
+    <string name="typ_Current_affairs">Current affairs</string>
+    <string name="typ_Children">Children\'s programs</string>
+    <string name="typ_Country">Country music</string>
+    <string name="typ_Documentary">Documentary</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy listening music</string>
+    <string name="typ_Education">Education</string>
+    <string name="typ_Emergency">Emergency</string>
+    <string name="typ_Emergency_test">Emergency test</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Folk music</string>
+    <string name="typ_Information">Information</string>
+    <string name="typ_Jazz">Jazz music</string>
+    <string name="typ_Light_classical">Light classical</string>
+    <string name="typ_Leisure">Leisure</string>
+    <string name="typ_News">News</string>
+    <string name="typ_National">National music</string>
+    <string name="typ_Other">Other music</string>
+    <string name="typ_Oldies">Oldies music</string>
+    <string name="typ_Phone_in">Phone in</string>
+    <string name="typ_Pop">Pop music</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rock music</string>
+    <string name="typ_Science">Science</string>
+    <string name="typ_Serious_classical">Serious classical</string>
+    <string name="typ_Social_affairs">Social affairs</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Travel</string>
+    <string name="typ_Varied">Varied</string>
+    <string name="typ_Weather">Weather</string>
+    <string name="typ_Adult_hits">Adult hits</string>
+    <string name="typ_Classical">Classical</string>
+    <string name="typ_Classic_Rock">Classic Rock</string>
+    <string name="typ_College">University</string>
+    <string name="typ_Foreign_language">Foreign language</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personality</string>
+    <string name="typ_Public">Public</string>
+    <string name="typ_Religious_music">Religious music</string>
+    <string name="typ_Religious_talk">Religious talk</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Spanish music</string>
+    <string name="typ_Spanish_talk">Spanish talk</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sports</string>
+    <string name="typ_Talk">Talk</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-en-rIN/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-en-rIN/arrays.xml
index cb1457b..351670d 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-en-rIN/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutes</item>
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>Until stopped</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>45 minutes</item>
+    <item>1 hour</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-en-rIN/strings.xml b/fmapp2/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..7844510
--- /dev/null
+++ b/fmapp2/res/values-en-rIN/strings.xml
@@ -0,0 +1,233 @@
+<?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 Transmitter</string>
+    <string name="menu_scan_start">Scan</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\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="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="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="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regional band</string>
+    <string name="regional_band_entry_north_america">North America</string>
+    <string name="regional_band_entry_europe">Europe</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (wide)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgium</string>
+    <string name="regional_band_entry_brazil">Brazil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Denmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">France</string>
+    <string name="regional_band_entry_germany">Germany</string>
+    <string name="regional_band_entry_greece">Greece</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Ireland</string>
+    <string name="regional_band_entry_italy">Italy</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Netherlands</string>
+    <string name="regional_band_entry_new_zealand">New Zealand</string>
+    <string name="regional_band_entry_norway">Norway</string>
+    <string name="regional_band_entry_poland">Poland</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russia</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Spain</string>
+    <string name="regional_band_entry_switzerland">Switzerland</string>
+    <string name="regional_band_entry_sweden">Sweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkey</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">United States</string>
+    <string name="regional_band_entry_user_defined">User defined band</string>
+    <string name="regional_band_summary_north_america">North America (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_europe">Europe (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 to 90.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan_wide">Japan (wide) (90.0 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_austria">Austria (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_belgium">Belgium (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_china">China (87.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_czech_republic">Czech Republic (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_denmark">Denmark (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_finland">Finland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_france">France (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_germany">Germany (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_greece">Greece (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_india">India (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_ireland">Ireland (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_italy">Italy (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_mexico">Mexico (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_netherlands">Netherlands (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_new_zealand">New Zealand (88.0 to 107.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_norway">Norway (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_poland">Poland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_russia">Russia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_slovakia">Slovakia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_spain">Spain (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_switzerland">Switzerland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_sweden">Sweden (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_turkey">Turkey (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_kingdom">United Kingdom (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_states">United States (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_user_defined">User defined band</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="record_dur">Record duration</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>
+    <string name="no_storage">Mount SD card before starting recording.</string>
+    <string name="preparing_sd">Preparing SD card\u2026</string>
+    <string name="access_sd_fail">Couldn\'t access SD card.</string>
+    <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>
+    <string name="FMRecording_reach_size_limit">Size limit reached.</string>
+    <string name="menu_scan_for_preset">Scan for presets</string>
+    <string name="fm_off">FM is turned off.</string>
+    <string name="fm_call">FM can\'t be used while calling.</string>
+    <string name="alert_dialog_hint">Enter a name</string>
+    <string name="search_dialog_title">Scan stations</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="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="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">My FM recordings</string>
+    <string name="audio_db_album_name">FM recordings</string>
+    <string name="audio_db_playlist_name">FM recordings</string>
+    <string name="station_name">Station:</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 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">\'<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="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="set">Set</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>
+    <string name="fm_search_no_results">No compatible stations found</string>
+    <string name="typ_All_stations">All stations</string>
+    <string name="typ_Culture">Culture</string>
+    <string name="typ_Current_affairs">Current affairs</string>
+    <string name="typ_Children">Children programs</string>
+    <string name="typ_Country">Country music</string>
+    <string name="typ_Documentary">Documentary</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy listening music</string>
+    <string name="typ_Education">Education</string>
+    <string name="typ_Emergency">Emergency</string>
+    <string name="typ_Emergency_test">Emergency test</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Folk music</string>
+    <string name="typ_Information">Information</string>
+    <string name="typ_Jazz">Jazz music</string>
+    <string name="typ_Light_classical">Light classical</string>
+    <string name="typ_Leisure">Leisure</string>
+    <string name="typ_News">News</string>
+    <string name="typ_National">National music</string>
+    <string name="typ_Other">Other music</string>
+    <string name="typ_Oldies">Oldies music</string>
+    <string name="typ_Phone_in">Phone in</string>
+    <string name="typ_Pop">Pop music</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rock music</string>
+    <string name="typ_Science">Science</string>
+    <string name="typ_Serious_classical">Serious classical</string>
+    <string name="typ_Social_affairs">Social affairs</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Travel</string>
+    <string name="typ_Varied">Varied</string>
+    <string name="typ_Weather">Weather</string>
+    <string name="typ_Adult_hits">Adult hits</string>
+    <string name="typ_Classical">Classical</string>
+    <string name="typ_Classic_Rock">Classic Rock</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Foreign language</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personality</string>
+    <string name="typ_Public">Public</string>
+    <string name="typ_Religious_music">Religious music</string>
+    <string name="typ_Religious_talk">Religious talk</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Spanish music</string>
+    <string name="typ_Spanish_talk">Spanish talk</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sports</string>
+    <string name="typ_Talk">Talk</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-eo/arrays.xml
similarity index 75%
rename from fmapp2/res/drawable/preset_page_button.xml
rename to fmapp2/res/values-eo/arrays.xml
index cb1457b..4702479 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-eo/arrays.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-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:
@@ -26,10 +27,17 @@
  * 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>
+  <string-array name="record_durations_entries">
+    <item>5 minutoj</item>
+    <item>15 minutoj</item>
+    <item>30 minutoj</item>
+    <item>Until stopped</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutoj</item>
+    <item>30 minutoj</item>
+    <item>45  minutoj</item>
+    <item>1 horo</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-eo/strings.xml b/fmapp2/res/values-eo/strings.xml
new file mode 100644
index 0000000..4db5bde
--- /dev/null
+++ b/fmapp2/res/values-eo/strings.xml
@@ -0,0 +1,67 @@
+<?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_settings">Agordoj</string>
+    <string name="preset_delete">Forigi</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band_entry_europe">Eŭropo</string>
+    <string name="regional_band_entry_japan">Japanujo</string>
+    <string name="regional_band_entry_australia">Aŭstralio</string>
+    <string name="regional_band_entry_austria">Aŭstrujo</string>
+    <string name="regional_band_entry_belgium">Belgujo</string>
+    <string name="regional_band_entry_brazil">Brazilo</string>
+    <string name="regional_band_entry_china">Ĉinujo</string>
+    <string name="regional_band_entry_czech_republic">Ĉeĥujo</string>
+    <string name="regional_band_entry_denmark">Danujo</string>
+    <string name="regional_band_entry_finland">Finnlando</string>
+    <string name="regional_band_entry_france">Francujo</string>
+    <string name="regional_band_entry_germany">Germanujo</string>
+    <string name="regional_band_entry_greece">Grekujo</string>
+    <string name="regional_band_entry_hong_kong">Honkongo</string>
+    <string name="regional_band_entry_india">Barato</string>
+    <string name="regional_band_entry_indonesia">Indonezio</string>
+    <string name="regional_band_entry_ireland">Irlando</string>
+    <string name="regional_band_entry_italy">Italujo</string>
+    <string name="regional_band_entry_korea">Koreujo</string>
+    <string name="regional_band_entry_mexico">Meksiko</string>
+    <string name="regional_band_entry_netherlands">Nederlando</string>
+    <string name="regional_band_entry_new_zealand">Nov-Zelando</string>
+    <string name="regional_band_entry_norway">Norvegujo</string>
+    <string name="regional_band_entry_poland">Pollando</string>
+    <string name="regional_band_entry_portugal">Portugalujo</string>
+    <string name="regional_band_entry_russia">Rusujo</string>
+    <string name="regional_band_entry_singapore">Singapuro</string>
+    <string name="regional_band_entry_slovakia">Slovakujo</string>
+    <string name="regional_band_entry_spain">Hispanujo</string>
+    <string name="regional_band_entry_switzerland">Svislando</string>
+    <string name="regional_band_entry_sweden">Svedujo</string>
+    <string name="regional_band_entry_taiwan">Tajvano</string>
+    <string name="regional_band_entry_turkey">Turkujo</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-es-rMX/strings.xml
similarity index 68%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-es-rMX/strings.xml
index cb1457b..44193e9 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-es-rMX/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,11 @@
  * 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="FMRecording_reach_size_limit">Se alcanzó el límite del tamaño.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Mis grabaciones FM</string>
+    <string name="audio_db_album_name">Grabaciones FM</string>
+    <string name="audio_db_playlist_name">Grabaciones FM</string>
+    <string name="save_record_file">Archivo de grabación de FM guardado en \'<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-es-rUS/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-es-rUS/arrays.xml
index cb1457b..029a508 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-es-rUS/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Estéreo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Estéreo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>Indefinidamente</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>45 minutos</item>
+    <item>1 hora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-es-rUS/strings.xml b/fmapp2/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..7a04646
--- /dev/null
+++ b/fmapp2/res/values-es-rUS/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Transmisor FM</string>
+    <string name="menu_scan_start">Explorar</string>
+    <string name="menu_scan_stop">Detener búsqueda</string>
+    <string name="menu_record_start">Grabar</string>
+    <string name="menu_record_stop">Detener grabación</string>
+    <string name="menu_settings">Ajustes</string>
+    <string name="menu_sleep">Suspender</string>
+    <string name="menu_sleep_cancel">Cancelar suspensión</string>
+    <string name="menu_all_channels">Todos los canales</string>
+    <string name="menu_display_tags">Mostrar etiquetas</string>
+    <string name="button_text_stop">Detener</string>
+    <string name="msg_seeking">Buscando estación FM\u2026</string>
+    <string name="msg_scanning">Explorando todas las estaciones FM\u2026</string>
+    <string name="msg_scanning_pty">Explorando «<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">Selección automática de estaciones</string>
+    <string name="msg_searching">Buscando las estaciones con mejor señal para crear una lista de predefinidas\u2026</string>
+    <string name="msg_noantenna">Conectar auriculares para usar la radio FM</string>
+    <string name="dialog_sleep_title">Tiempo de suspensión automática</string>
+    <string name="presetlist_select_name">Seleccionar «<xliff:g id="presetlist_name">%1$s</xliff:g>»</string>
+    <string name="presetlist_add_new">Añadir nueva lista</string>
+    <string name="dialog_presetlist_rename_title">Ingresar nombre</string>
+    <string name="presetlist_autoselect_title">Confirmar selección automática</string>
+    <string name="preset_replace">Reemplazar</string>
+    <string name="preset_tune">Sintonizar</string>
+    <string name="preset_rename">Renombrar</string>
+    <string name="preset_delete">Borrar</string>
+    <string name="preset_search">Buscar «<xliff:g id="preset_pi">%1$s</xliff:g>»</string>
+    <string name="stat_notif_frequency">«<xliff:g id="frequency">%1$s</xliff:g>» MHz</string>
+    <string name="regional_band">Banda regional</string>
+    <string name="regional_band_entry_north_america">América del Norte</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japón</string>
+    <string name="regional_band_entry_japan_wide">Japón (todo)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Bélgica</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">República Checa</string>
+    <string name="regional_band_entry_denmark">Dinamarca</string>
+    <string name="regional_band_entry_finland">Finlandia</string>
+    <string name="regional_band_entry_france">Francia</string>
+    <string name="regional_band_entry_germany">Alemania</string>
+    <string name="regional_band_entry_greece">Grecia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Corea</string>
+    <string name="regional_band_entry_mexico">México</string>
+    <string name="regional_band_entry_netherlands">Países Bajos</string>
+    <string name="regional_band_entry_new_zealand">Nueva Zelanda</string>
+    <string name="regional_band_entry_norway">Noruega</string>
+    <string name="regional_band_entry_poland">Polonia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusia</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Eslovaquia</string>
+    <string name="regional_band_entry_spain">España</string>
+    <string name="regional_band_entry_switzerland">Suiza</string>
+    <string name="regional_band_entry_sweden">Suecia</string>
+    <string name="regional_band_entry_taiwan">Taiwán</string>
+    <string name="regional_band_entry_turkey">Turquía</string>
+    <string name="regional_band_entry_united_kingdom">Reino Unido</string>
+    <string name="regional_band_entry_united_states">Estados Unidos</string>
+    <string name="regional_band_entry_user_defined">Banda definida por el usuario</string>
+    <string name="regional_band_summary_north_america">Norteamérica (87.5 MHz a 108.0 MHz en intervalos de 200 KHz)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_japan">Japón (76.0 MHz a 90.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_japan_wide">Japón (amplio) (90.0 MHz a 108.0 MHz en intervalos de 50 KHz)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_austria">Austria (87.5 MHz a 108.0 MHz en intervalos de 50 KHz)</string>
+    <string name="regional_band_summary_belgium">Bélgica (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (87.5 MHz a 108.0 MHz en intervalos de 200 KHz)</string>
+    <string name="regional_band_summary_china">China (87.0 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_czech_republic">República Checa (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_denmark">Dinamarca (87.5 MHz a 108.0 MHz en intervalos de 50 KHz)</string>
+    <string name="regional_band_summary_finland">Finlandia (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_france">Francia (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_germany">Alemania (87.5 MHz a 108.0 MHz en intervalos de 50 KHz)</string>
+    <string name="regional_band_summary_greece">Grecia (87.5 MHz a 108.0 MHz en intervalos de 50 KHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_india">India (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (87.5 MHz a 108.0 MHz en intervalos de 50 KHz)</string>
+    <string name="regional_band_summary_italy">Italia (87.5 MHz a 108.0 MHz en intervalos de 50 KHz)</string>
+    <string name="regional_band_summary_korea">Corea (87.5 MHz a 108.0 MHz en intervalos de 200 KHz)</string>
+    <string name="regional_band_summary_mexico">México (88.1 MHz a 107.9 MHz en intervalos de 200 KHz)</string>
+    <string name="regional_band_summary_netherlands">Países Bajos (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_new_zealand">Nueva Zelanda (88.0 MHz a 107.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_norway">Noruega (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_poland">Polonia (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 MHz a 108.0 MHz en intervalos de 50 KHz)</string>
+    <string name="regional_band_summary_russia">Rusia (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_singapore">Singapur (88.0 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_slovakia">Eslovaquia (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_spain">España (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_switzerland">Suiza (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_sweden">Suecia (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwán (87.5 MHz a 108.0 MHz en segmentos de 100 KHz)</string>
+    <string name="regional_band_summary_turkey">Turquía (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_united_kingdom">Reino Unido (87.5 MHz a 108.0 MHz en intervalos de 100 KHz)</string>
+    <string name="regional_band_summary_united_states">Estados Unidos (88.1 MHz a 107.9 MHz en intervalos de 200 KHz)</string>
+    <string name="regional_band_summary_user_defined">Banda definida por el usuario</string>
+    <string name="aud_output_mode">Modo de salida de audio</string>
+    <string name="audio_type_stereo">Estéreo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Duración de grabación</string>
+    <string name="auto_select_af">Frecuencia alternativa</string>
+    <string name="settings_revert_defaults_title">Restablecer ajustes de fábrica</string>
+    <string name="settings_revert_defaults_summary">Restablecer todos los ajustes</string>
+    <string name="settings_revert_confirm_title">Confirmar restablecimiento</string>
+    <string name="settings_revert_confirm_msg">Esta acción borrará todos los ajustes de la aplicación, incluidas las emisoras almacenadas. ¿Continuar?</string>
+    <string name="no_storage">Montar la tarjeta SD antes de iniciar la grabación.</string>
+    <string name="preparing_sd">Preparando tarjeta SD…</string>
+    <string name="access_sd_fail">No se pudo acceder a la tarjeta SD.</string>
+    <string name="spaceIsLow_content">La tarjeta SD se está quedando sin espacio. Cambiar el ajuste de calidad o borrar algunas imágenes o archivos.</string>
+    <string name="FMRecording_reach_size_limit">Se alcanzó el límite de tamaño.</string>
+    <string name="menu_scan_for_preset">Explorar preseleccionadas</string>
+    <string name="fm_off">La radio FM está apagada.</string>
+    <string name="fm_call">La radio FM no se puede utilizar durante una llamada.</string>
+    <string name="alert_dialog_hint">Ingresa un nombre</string>
+    <string name="search_dialog_title">Explorar estaciones</string>
+    <string name="fm_command_timeout_title">Tiempo de espera</string>
+    <string name="fm_tune_timeout_msg">No se ha recibido respuesta de la emisora FM. Si el problema persiste, apaga la radio y vuelve a encenderla.</string>
+    <string name="fm_command_failed_title">Error en la operación FM</string>
+    <string name="fm_cmd_failed_msg">Error en la operación FM. Si el problema persiste, apaga la radio y vuelve a encenderla.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Error en la operación FM. No se soporta el uso de la radio y el HDMI simultáneamente.</string>
+    <string name="fm_cmd_failed_call_on">Error en la operación FM. El audio FM no está permitido durante una llamada.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Mis grabaciones FM</string>
+    <string name="audio_db_album_name">Grabaciones FM</string>
+    <string name="audio_db_playlist_name">Grabaciones FM</string>
+    <string name="station_name">Emisora:</string>
+    <string name="station_exists">¡Esta frecuencia ya existe!</string>
+    <string name="station_list_delete_station">Eliminar:<xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">¿Quieres borrar «<xliff:g id="name">%s</xliff:g>»?</string>
+    <string name="station_name_empty">Nombre de estación vacío. Escribe uno de nuevo.</string>
+    <string name="station_name_exist">«<xliff:g id="name">%s</xliff:g>» ya está en uso. Ingresa un nombre distinto.</string>
+    <string name="rt_plus_tags">Etiquetas</string>
+    <string name="usr_def_band_min">Frecuencia más baja (MHz)</string>
+    <string name="usr_def_band_max">Frecuencia más alta (MHz)</string>
+    <string name="chanl_spacing">Espaciado de canales</string>
+    <string name="set">Establecer</string>
+    <string name="user_defind_band_msg">Ingresa una frecuencia entre 76.0 MHz y 108.0 MHz con al menos 1 canal de espacio y 100KHz entre la frecuencia mínima y máxima</string>
+    <string name="save_record_file">Archivo de grabación de FM guardado en «<xliff:g id="record_file">%1$s</xliff:g>»</string>
+    <string name="fm_search_no_results">No se encontraron emisoras compatibles</string>
+    <string name="typ_All_stations">Todas las estaciones</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Temas de actualidad</string>
+    <string name="typ_Children">Programas infantiles</string>
+    <string name="typ_Country">Música country</string>
+    <string name="typ_Documentary">Documental</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Música ligera</string>
+    <string name="typ_Education">Educación</string>
+    <string name="typ_Emergency">Emergencia</string>
+    <string name="typ_Emergency_test">Prueba de emergencia</string>
+    <string name="typ_Finance">Finanzas</string>
+    <string name="typ_Folk">Música folklórica</string>
+    <string name="typ_Information">Información</string>
+    <string name="typ_Jazz">Música jazz</string>
+    <string name="typ_Light_classical">Clásica ligera</string>
+    <string name="typ_Leisure">Ocio</string>
+    <string name="typ_News">Noticias</string>
+    <string name="typ_National">Música nacional</string>
+    <string name="typ_Other">Otra música</string>
+    <string name="typ_Oldies">Éxitos musicales</string>
+    <string name="typ_Phone_in">Por teléfono</string>
+    <string name="typ_Pop">Música pop</string>
+    <string name="typ_Religion">Religión</string>
+    <string name="typ_Rock">Música rock</string>
+    <string name="typ_Science">Ciencia</string>
+    <string name="typ_Serious_classical">Clásica tradicional</string>
+    <string name="typ_Social_affairs">Temas sociales</string>
+    <string name="typ_Sport">Deporte</string>
+    <string name="typ_Travel">Viajes</string>
+    <string name="typ_Varied">Variado</string>
+    <string name="typ_Weather">Clima</string>
+    <string name="typ_Adult_hits">Éxitos de siempre</string>
+    <string name="typ_Classical">Clásica</string>
+    <string name="typ_Classic_Rock">Rock clásico</string>
+    <string name="typ_College">Estudiantil</string>
+    <string name="typ_Foreign_language">Idioma extranjero</string>
+    <string name="typ_Hiphop">Hip-Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personalidades</string>
+    <string name="typ_Public">Público</string>
+    <string name="typ_Religious_music">Música religiosa</string>
+    <string name="typ_Religious_talk">Conversaciones religiosas</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Música en español</string>
+    <string name="typ_Spanish_talk">Tertulia en español</string>
+    <string name="typ_Soft">Ligera</string>
+    <string name="typ_Soft_Rock">Rock ligero</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm and Blues ligero</string>
+    <string name="typ_Sports">Deportes</string>
+    <string name="typ_Talk">Conversaciones</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-es/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-es/arrays.xml
index cb1457b..202c76f 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-es/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Estéreo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Estéreo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>Hasta ser detenido</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>45 minutos</item>
+    <item>1 hora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-es/strings.xml b/fmapp2/res/values-es/strings.xml
new file mode 100644
index 0000000..78f9dab
--- /dev/null
+++ b/fmapp2/res/values-es/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Transmisor FM</string>
+    <string name="menu_scan_start">Buscar</string>
+    <string name="menu_scan_stop">Detener búsqueda</string>
+    <string name="menu_record_start">Grabar</string>
+    <string name="menu_record_stop">Detener grabación</string>
+    <string name="menu_settings">Ajustes</string>
+    <string name="menu_sleep">Apagado automático</string>
+    <string name="menu_sleep_cancel">Cancelar apagado automático</string>
+    <string name="menu_all_channels">Todos los canales</string>
+    <string name="menu_display_tags">Mostrar etiquetas</string>
+    <string name="button_text_stop">Detener</string>
+    <string name="msg_seeking">Buscando emisora de FM\u2026</string>
+    <string name="msg_scanning">Buscando todas las emisoras FM\u2026</string>
+    <string name="msg_scanning_pty">Buscando a «<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">Selección automática de emisoras</string>
+    <string name="msg_searching">Buscando las emisoras con mejor señal para crear una lista\u2026</string>
+    <string name="msg_noantenna">Por favor conecta unos auriculares para usar la radio FM</string>
+    <string name="dialog_sleep_title">Tiempo de apagado automático</string>
+    <string name="presetlist_select_name">Seleccionar «<xliff:g id="presetlist_name">%1$s</xliff:g>»</string>
+    <string name="presetlist_add_new">Añadir nueva lista</string>
+    <string name="dialog_presetlist_rename_title">Introducir nombre</string>
+    <string name="presetlist_autoselect_title">Confirmar selección automática</string>
+    <string name="preset_replace">Reemplazar</string>
+    <string name="preset_tune">Sintonizar</string>
+    <string name="preset_rename">Cambiar el nombre</string>
+    <string name="preset_delete">Eliminar</string>
+    <string name="preset_search">Buscar a «<xliff:g id="preset_pi">%1$s</xliff:g>»</string>
+    <string name="stat_notif_frequency">«<xliff:g id="frequency">%1$s</xliff:g>» MHz</string>
+    <string name="regional_band">Banda regional</string>
+    <string name="regional_band_entry_north_america">Norteamérica</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japón</string>
+    <string name="regional_band_entry_japan_wide">Japón (amplia)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Bélgica</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">República Checa</string>
+    <string name="regional_band_entry_denmark">Dinamarca</string>
+    <string name="regional_band_entry_finland">Finlandia</string>
+    <string name="regional_band_entry_france">Francia</string>
+    <string name="regional_band_entry_germany">Alemania</string>
+    <string name="regional_band_entry_greece">Grecia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Corea</string>
+    <string name="regional_band_entry_mexico">México</string>
+    <string name="regional_band_entry_netherlands">Países Bajos</string>
+    <string name="regional_band_entry_new_zealand">Nueva Zelanda</string>
+    <string name="regional_band_entry_norway">Noruega</string>
+    <string name="regional_band_entry_poland">Polonia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusia</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Eslovaquia</string>
+    <string name="regional_band_entry_spain">España</string>
+    <string name="regional_band_entry_switzerland">Suiza</string>
+    <string name="regional_band_entry_sweden">Suecia</string>
+    <string name="regional_band_entry_taiwan">Taiwán</string>
+    <string name="regional_band_entry_turkey">Turquía</string>
+    <string name="regional_band_entry_united_kingdom">Reino Unido</string>
+    <string name="regional_band_entry_united_states">Estados Unidos</string>
+    <string name="regional_band_entry_user_defined">Banda personalizada</string>
+    <string name="regional_band_summary_north_america">Norte América (87,5 a 108,0 MHz en pasos de 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japón (76,0 a 90,0 MHz en pasos de 200 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japón (amplio) (90,0 a 108,0 MHz en pasos de 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australia (87,7 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_austria">Austria (87,5 a 108,0 MHz en pasos de 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Bélgica (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (87,5 a 108,0 MHz en pasos de 200 kHz)</string>
+    <string name="regional_band_summary_china">China (87,0 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">República Checa (87.5 MHz a 108.0 MHz en pasos de 100 KHz)</string>
+    <string name="regional_band_summary_denmark">Dinamarca (87,5 a 108,0 MHz en pasos de 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlandia (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_france">Francia (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_germany">Alemania (87,5 a 108,0 MHz en pasos de 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grecia (87,5 a 108,0 MHz en pasos de 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_india">India (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlandia (87,5 a 108,0 MHz en pasos de 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italia (87,5 a 108,0 MHz en pasos de 50 kHz)</string>
+    <string name="regional_band_summary_korea">Corea (87,5 a 108,0 MHz en pasos de 200 kHz)</string>
+    <string name="regional_band_summary_mexico">México (88,1 a 107,9 MHz en pasos de 200kHz)</string>
+    <string name="regional_band_summary_netherlands">Países Bajos (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Nueva Zelanda (88,0 a 107,0 MHz en pasos de 100kHz)</string>
+    <string name="regional_band_summary_norway">Noruega (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polonia (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 a 108,0 MHz en pasos de 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rusia (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapur (88,0 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Eslovaquia (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_spain">España (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Suiza (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Suecia (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwán (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turquía (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Reino Unido (87,5 a 108,0 MHz en pasos de 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Estados Unidos (88,1 a 107,9 MHz en pasos de 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Banda personalizada</string>
+    <string name="aud_output_mode">Modo de salida de audio</string>
+    <string name="audio_type_stereo">Estéreo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Duración de grabación</string>
+    <string name="auto_select_af">Frecuencia alternativa</string>
+    <string name="settings_revert_defaults_title">Restablecer configuración de fábrica</string>
+    <string name="settings_revert_defaults_summary">Restablece todos los ajustes</string>
+    <string name="settings_revert_confirm_title">Confirmar restablecimiento</string>
+    <string name="settings_revert_confirm_msg">Esta acción borrará todos los ajustes de la aplicación, incluyendo las emisoras almacenadas. ¿Continuar?</string>
+    <string name="no_storage">Montar la tarjeta SD antes de iniciar la grabación.</string>
+    <string name="preparing_sd">Preparando tarjeta SD...</string>
+    <string name="access_sd_fail">No se puede acceder a la tarjeta SD.</string>
+    <string name="spaceIsLow_content">La tarjeta SD se está quedando sin espacio. Cambia el ajuste de calidad o elimina algunas imágenes o archivos.</string>
+    <string name="FMRecording_reach_size_limit">Se ha alcanzado el límite de tamaño.</string>
+    <string name="menu_scan_for_preset">Buscar preseleccionadas</string>
+    <string name="fm_off">La radio FM está apagada.</string>
+    <string name="fm_call">La radio FM no se puede utilizar durante una llamada.</string>
+    <string name="alert_dialog_hint">Introducir un nombre</string>
+    <string name="search_dialog_title">Buscar emisoras</string>
+    <string name="fm_command_timeout_title">Tiempo de espera</string>
+    <string name="fm_tune_timeout_msg">No se ha recibido respuesta de la emisora FM. Si el problema persiste, apaga la radio y vuelve a encenderla.</string>
+    <string name="fm_command_failed_title">Error en la operación FM</string>
+    <string name="fm_cmd_failed_msg">Eror para operar la radio FM. Si el problema persiste, apaga la radio y vuelve a encenderla.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Falló la operación FM. Es imposible utilizar la radio y el HDMI simultáneamente.</string>
+    <string name="fm_cmd_failed_call_on">Falló la operación FM. El audio FM no está permitido durante una llamada.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Mis grabaciones de FM</string>
+    <string name="audio_db_album_name">Grabaciones de FM</string>
+    <string name="audio_db_playlist_name">Grabaciones de FM</string>
+    <string name="station_name">Emisora:</string>
+    <string name="station_exists">¡Esta frecuencia ya existe!</string>
+    <string name="station_list_delete_station">Eliminar:<xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">¿Estás seguro de que quieres eliminar a «<xliff:g id="name">%s</xliff:g>»?</string>
+    <string name="station_name_empty">Nombre de emisora vacío. Por favor, escribe uno.</string>
+    <string name="station_name_exist">«<xliff:g id="name">%s</xliff:g>» ya está en uso. Por favor, escribe un nuevo nombre.</string>
+    <string name="rt_plus_tags">Etiquetas</string>
+    <string name="usr_def_band_min">Frecuencia más baja (MHz)</string>
+    <string name="usr_def_band_max">Frecuencia más alta (MHz)</string>
+    <string name="chanl_spacing">Espaciado de canales</string>
+    <string name="set">Establecer</string>
+    <string name="user_defind_band_msg">Introduce una frecuencia entre 76,0 y 108,0 MHz con al menos 1 canal de espacio y 100KHz entre la frecuencia mínima y máxima</string>
+    <string name="save_record_file">Archivo de grabación de FM guardado en «<xliff:g id="record_file">%1$s</xliff:g>»</string>
+    <string name="fm_search_no_results">No se han encontrado emisoras compatibles</string>
+    <string name="typ_All_stations">Todas las emisoras</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Actualidad</string>
+    <string name="typ_Children">Programas infantiles</string>
+    <string name="typ_Country">Música country</string>
+    <string name="typ_Documentary">Documental</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Música agradable</string>
+    <string name="typ_Education">Educación</string>
+    <string name="typ_Emergency">Emergencia</string>
+    <string name="typ_Emergency_test">Prueba de emergencia</string>
+    <string name="typ_Finance">Finanzas</string>
+    <string name="typ_Folk">Música folk</string>
+    <string name="typ_Information">Información</string>
+    <string name="typ_Jazz">Música jazz</string>
+    <string name="typ_Light_classical">Clásica ligera</string>
+    <string name="typ_Leisure">Ocio</string>
+    <string name="typ_News">Noticias</string>
+    <string name="typ_National">Música nacional</string>
+    <string name="typ_Other">Otra música</string>
+    <string name="typ_Oldies">Éxitos musicales</string>
+    <string name="typ_Phone_in">Por teléfono</string>
+    <string name="typ_Pop">Música pop</string>
+    <string name="typ_Religion">Religión</string>
+    <string name="typ_Rock">Música rock</string>
+    <string name="typ_Science">Ciencia</string>
+    <string name="typ_Serious_classical">Clásica rigurosa</string>
+    <string name="typ_Social_affairs">Asuntos sociales</string>
+    <string name="typ_Sport">Deportes</string>
+    <string name="typ_Travel">Viajes</string>
+    <string name="typ_Varied">Variado</string>
+    <string name="typ_Weather">Clima</string>
+    <string name="typ_Adult_hits">Éxitos de siempre</string>
+    <string name="typ_Classical">Clásica</string>
+    <string name="typ_Classic_Rock">Rock clásico</string>
+    <string name="typ_College">Escuela</string>
+    <string name="typ_Foreign_language">Lengua extranjera</string>
+    <string name="typ_Hiphop">Hip-Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personalidad</string>
+    <string name="typ_Public">Pública</string>
+    <string name="typ_Religious_music">Música religiosa</string>
+    <string name="typ_Religious_talk">Temas religiosos</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Música española</string>
+    <string name="typ_Spanish_talk">Conversación en español</string>
+    <string name="typ_Soft">Suave</string>
+    <string name="typ_Soft_Rock">Rock suave</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm and Blues suave</string>
+    <string name="typ_Sports">Deportes</string>
+    <string name="typ_Talk">Tertulias</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-et/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-et/arrays.xml
index cb1457b..59871d9 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-et/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutit</item>
+    <item>15 minutit</item>
+    <item>30 minutit</item>
+    <item>Kuni seisatamiseni</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutit</item>
+    <item>30 minutit</item>
+    <item>45 minutit</item>
+    <item>1 tund</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-et/strings.xml b/fmapp2/res/values-et/strings.xml
new file mode 100644
index 0000000..c360580
--- /dev/null
+++ b/fmapp2/res/values-et/strings.xml
@@ -0,0 +1,230 @@
+<?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-raadio</string>
+    <string name="tx_app_name">FM-edastaja</string>
+    <string name="menu_scan_start">Otsi</string>
+    <string name="menu_scan_stop">Lõpeta otsimine</string>
+    <string name="menu_record_start">Lindista</string>
+    <string name="menu_record_stop">Lõpeta salvestus</string>
+    <string name="menu_settings">Seaded</string>
+    <string name="menu_sleep">Maga</string>
+    <string name="menu_sleep_cancel">Loobu magamisest</string>
+    <string name="menu_all_channels">Kõik kanalid</string>
+    <string name="menu_display_tags">Kuva sildid</string>
+    <string name="button_text_stop">Peata</string>
+    <string name="msg_seeking">Otsin FM jaama\u2026</string>
+    <string name="msg_scanning">Otsin kõiki FM jaamu\u2026</string>
+    <string name="msg_scanning_pty">Otsin \'<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">Automaatvalin valmissätteid</string>
+    <string name="msg_searching">Otsin tugevaid jaamu et luua valmissätete nimekiri\u2026</string>
+    <string name="msg_noantenna">Palun sisesta peakomplekt et kasutada FM raadiot</string>
+    <string name="dialog_sleep_title">Automaatne uneaeg</string>
+    <string name="presetlist_add_new">Lisa uus loend</string>
+    <string name="dialog_presetlist_rename_title">Sisesta nimi</string>
+    <string name="presetlist_autoselect_title">Kinnitage automaatvalik</string>
+    <string name="preset_replace">Asenda</string>
+    <string name="preset_tune">Häälesta</string>
+    <string name="preset_rename">Nimeta ümber</string>
+    <string name="preset_delete">Kustuta</string>
+    <string name="preset_search">Otsi \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Kohalik sagedusala</string>
+    <string name="regional_band_entry_north_america">Põhja-Ameerika</string>
+    <string name="regional_band_entry_europe">Euroopa</string>
+    <string name="regional_band_entry_japan">Jaapan</string>
+    <string name="regional_band_entry_japan_wide">Jaapan (kogu)</string>
+    <string name="regional_band_entry_australia">Austraalia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgia</string>
+    <string name="regional_band_entry_brazil">Brasiilia</string>
+    <string name="regional_band_entry_china">Hiina</string>
+    <string name="regional_band_entry_czech_republic">Tšehhi Vabariik</string>
+    <string name="regional_band_entry_denmark">Taani</string>
+    <string name="regional_band_entry_finland">Soome</string>
+    <string name="regional_band_entry_france">Prantsusmaa</string>
+    <string name="regional_band_entry_germany">Saksamaa</string>
+    <string name="regional_band_entry_greece">Kreeka</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indoneesia</string>
+    <string name="regional_band_entry_ireland">Iirimaa</string>
+    <string name="regional_band_entry_italy">Itaalia</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mehhiko</string>
+    <string name="regional_band_entry_netherlands">Holland</string>
+    <string name="regional_band_entry_new_zealand">Uus-Meremaa</string>
+    <string name="regional_band_entry_norway">Norra</string>
+    <string name="regional_band_entry_poland">Poola</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Venemaa</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Slovakkia</string>
+    <string name="regional_band_entry_spain">Hispaania</string>
+    <string name="regional_band_entry_switzerland">Šveits</string>
+    <string name="regional_band_entry_sweden">Rootsi</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Türgi</string>
+    <string name="regional_band_entry_united_kingdom">Suurbritannia</string>
+    <string name="regional_band_entry_united_states">Ameerika Ühendriigid</string>
+    <string name="regional_band_entry_user_defined">Kasutaja määratud sagedusala</string>
+    <string name="regional_band_summary_north_america">Põhja-Ameerika (87,5-108,0 MHz, 200 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_europe">Euroopa (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_japan">Jaapan (76,0-90,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_japan_wide">Jaapan (lai) (90,0-108,0 MHz, 50 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_australia">Austraalia (87,7-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_austria">Austria (87,5-108,0 MHz, 50 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_belgium">Belgia (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_brazil">Brasiilia (87,5-108,0 MHz, 200 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_china">Hiina (87,0-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_czech_republic">Tšehhi Vabariik (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_denmark">Taani (87,5-108,0 MHz, 50 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_finland">Soome (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_france">Prantsusmaa (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_germany">Saksamaa (87,5-108,0 MHz, 50 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_greece">Kreeka (87,5-108,0 MHz, 50 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_india">India (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_indonesia">Indoneesia (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_ireland">Iirimaa (87,5-108,0 MHz, 50 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_italy">Itaalia (87,5-108,0 MHz, 50 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_korea">Korea (87,5-108,0 MHz, 200 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_mexico">Mehhiko (88,1-107,9 MHz, 200 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_netherlands">Holland (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_new_zealand">Uus-Meremaa (88,0-107,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_norway">Norra (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_poland">Poola (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5-108,0 MHz, 50 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_russia">Venemaa (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_singapore">Singapur (88,0-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_slovakia">Slovakkia (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_spain">Hispaania (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_switzerland">Šveits (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_sweden">Rootsi (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_turkey">Türgi (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_united_kingdom">Suurbritannia (87,5-108,0 MHz, 100 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_united_states">Ameerika Ühendriigid (88,1-107,9 MHz, 200 kHz sammu kaupa)</string>
+    <string name="regional_band_summary_user_defined">Kasutaja määratud sagedusala</string>
+    <string name="aud_output_mode">Heliväljundi režiim</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Salvestise kestus</string>
+    <string name="auto_select_af">Teine sagedus</string>
+    <string name="settings_revert_defaults_title">Ennista tehaseseaded</string>
+    <string name="settings_revert_defaults_summary">Nulli kõik seaded</string>
+    <string name="settings_revert_confirm_title">Kinnita nullimine</string>
+    <string name="settings_revert_confirm_msg">See toiming kustutab kõik rakenduse seaded, sealhulgas salvestatud valmissätted. Kas soovite jätkata?</string>
+    <string name="no_storage">Paigalda SD kaart enne salvestamise alustamist.</string>
+    <string name="preparing_sd">SD-kaardi ettevalmistamine ...</string>
+    <string name="access_sd_fail">Ei pääsenud SD-kaardile ligi.</string>
+    <string name="spaceIsLow_content">Teie SD-kaardi vaba ruum on otsakorral. Muutke kvaliteediseadeid või kustutage mõni fail ruumi vabastamiseks.</string>
+    <string name="FMRecording_reach_size_limit">Suurus saavutatud.</string>
+    <string name="menu_scan_for_preset">Näita eelmääratuid</string>
+    <string name="fm_off">FM on välja lülitatud.</string>
+    <string name="fm_call">FM ei saa kasutada helistades.</string>
+    <string name="alert_dialog_hint">Sisestage nimi</string>
+    <string name="search_dialog_title">Otsi jaamu</string>
+    <string name="fm_command_timeout_title">Ajalõpp</string>
+    <string name="fm_tune_timeout_msg">Ei saanud vastust üheltki FM-jaamalt. Probleemi jätkumisel lülitage FM-raadio välja ja uuesti sisse.</string>
+    <string name="fm_command_failed_title">FM toiming nurjus</string>
+    <string name="fm_cmd_failed_msg">FM toiming nurjus. Probleemi jätkumisel lülitage FM-raadio välja ja uuesti sisse.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM toiming nurjus. FM ja HDMI ühilduvus ei ole toetatud.</string>
+    <string name="fm_cmd_failed_call_on">FM toiming nurjus. FM audio pole saadaval kõne ajal.</string>
+    <string name="audio_db_artist_name">Minu FM-salvestised</string>
+    <string name="audio_db_album_name">FM-salvestised</string>
+    <string name="audio_db_playlist_name">FM-salvestised</string>
+    <string name="station_name">Jaam:</string>
+    <string name="station_exists">See sagedus on juba olemas!</string>
+    <string name="station_list_delete_station_prompt">Kas soovite kindlasti kustutada \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Jaama nimeväli on tühi, sisestage uus nimi.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' on juba kasutusel, palun vali teine nimi.</string>
+    <string name="rt_plus_tags">Sildid</string>
+    <string name="usr_def_band_min">Madalaim sagedus (MHz)</string>
+    <string name="usr_def_band_max">Kõrgeim sagedus (MHz)</string>
+    <string name="chanl_spacing">Kanalisamm</string>
+    <string name="set">Määra</string>
+    <string name="user_defind_band_msg">Sisesta sagedus 76,0-108,0 MHz vahel, millel on minimaalselt 1 kanali laius ja 100 kHz laius minimaalse ja maksimaalse sageduse vahel</string>
+    <string name="save_record_file">FM salvestus talletatud \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Ei leitud ühtegi ühilduvat jaama</string>
+    <string name="typ_All_stations">Kõik jaamad</string>
+    <string name="typ_Culture">Kultuur</string>
+    <string name="typ_Current_affairs">Päevakajaline</string>
+    <string name="typ_Children">Laste programmid</string>
+    <string name="typ_Country">Kantrimuusika</string>
+    <string name="typ_Documentary">Dokumentaal</string>
+    <string name="typ_Drama">Draama</string>
+    <string name="typ_Easy_listening">Rahulik muusika</string>
+    <string name="typ_Education">Haridus</string>
+    <string name="typ_Emergency">Hädaabi</string>
+    <string name="typ_Emergency_test">Hädaabi test</string>
+    <string name="typ_Finance">Rahandus</string>
+    <string name="typ_Folk">Rahvamuusika</string>
+    <string name="typ_Information">Teave</string>
+    <string name="typ_Jazz">Jazz muusika</string>
+    <string name="typ_Light_classical">Kerge klassika</string>
+    <string name="typ_Leisure">Vaba aeg</string>
+    <string name="typ_News">Uudised</string>
+    <string name="typ_National">Rahvusmuusika</string>
+    <string name="typ_Other">Muu muusika</string>
+    <string name="typ_Oldies">Vanamuusika</string>
+    <string name="typ_Phone_in">Telefon</string>
+    <string name="typ_Pop">Popmuusika</string>
+    <string name="typ_Religion">Religioon</string>
+    <string name="typ_Rock">Rockmuusika</string>
+    <string name="typ_Science">Teadus</string>
+    <string name="typ_Serious_classical">Tõsine klassikaline</string>
+    <string name="typ_Social_affairs">Sotsiaalküsimused</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Reis</string>
+    <string name="typ_Varied">Mitmekesine</string>
+    <string name="typ_Weather">Ilm</string>
+    <string name="typ_Adult_hits">Täiskasvanute hitid</string>
+    <string name="typ_Classical">Klassika</string>
+    <string name="typ_Classic_Rock">Klassikaline Rokk</string>
+    <string name="typ_College">Kolledž</string>
+    <string name="typ_Foreign_language">Võõrkeel</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Isikupärane</string>
+    <string name="typ_Public">Avalik</string>
+    <string name="typ_Religious_music">Vaimulik muusika</string>
+    <string name="typ_Religious_talk">Religioosne arutelu</string>
+    <string name="typ_Rhythm_and_Blues">Rütm ja Bluus</string>
+    <string name="typ_Spanish_music">Hispaania muusika</string>
+    <string name="typ_Spanish_talk">Hispaania jutt</string>
+    <string name="typ_Soft">Mahemuusika</string>
+    <string name="typ_Soft_Rock">Pehme Rokk</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Pehme Rütm ja Bluus</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Jutt</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-eu/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-eu/arrays.xml
index cb1457b..6992e23 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-eu/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Estereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Estereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutu</item>
+    <item>15 minutu</item>
+    <item>30 minutu</item>
+    <item>Zehaztugabea</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutu</item>
+    <item>30 minutu</item>
+    <item>45 minutu</item>
+    <item>Ordu 1</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-eu/strings.xml b/fmapp2/res/values-eu/strings.xml
new file mode 100644
index 0000000..7b91be3
--- /dev/null
+++ b/fmapp2/res/values-eu/strings.xml
@@ -0,0 +1,233 @@
+<?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 irratia</string>
+    <string name="tx_app_name">FM Igorgailua</string>
+    <string name="menu_scan_start">Bilatu</string>
+    <string name="menu_scan_stop">Eten bilaketa</string>
+    <string name="menu_record_start">Grabatu</string>
+    <string name="menu_record_stop">Gelditu grabaketa</string>
+    <string name="menu_settings">Ezarpenak</string>
+    <string name="menu_sleep">Atzera-kontaketa</string>
+    <string name="menu_sleep_cancel">Utzi atzera-kontaketa</string>
+    <string name="menu_all_channels">Kanal guztiak</string>
+    <string name="menu_display_tags">Erakutsi etiketak</string>
+    <string name="button_text_stop">Gelditu</string>
+    <string name="msg_seeking">FM irratia bilatzen\u2026</string>
+    <string name="msg_scanning">FM irrati guztien bila\u2016</string>
+    <string name="msg_scanning_pty">\'<xliff:g id="pty_name">%1$s</xliff:g>(r)en bila\'\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Automatikoki hautatzen irratiak</string>
+    <string name="msg_searching">Seinale ona duten irratiak bilatzen irratien zerrenda bat sortzeko\u2026</string>
+    <string name="msg_noantenna">Konektatu aurikularrak FM irratia erabili ahal izateko</string>
+    <string name="dialog_sleep_title">Automatikoki amatatzeko denbora</string>
+    <string name="presetlist_select_name">Hautatu \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Gehitu zerrenda berria</string>
+    <string name="dialog_presetlist_rename_title">Sartu izena</string>
+    <string name="presetlist_autoselect_title">Berretsi hautapen automatikoa</string>
+    <string name="preset_replace">Ordezkatu</string>
+    <string name="preset_tune">Sintonizatu</string>
+    <string name="preset_rename">Aldatu izena</string>
+    <string name="preset_delete">Ezabatu</string>
+    <string name="preset_search">Bilatu \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Lurralde banda</string>
+    <string name="regional_band_entry_north_america">Ipar Amerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japonia</string>
+    <string name="regional_band_entry_japan_wide">Japonia (zabala)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgika</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">Txina</string>
+    <string name="regional_band_entry_czech_republic">Txekia</string>
+    <string name="regional_band_entry_denmark">Danimarka</string>
+    <string name="regional_band_entry_finland">Finlandia</string>
+    <string name="regional_band_entry_france">Frantzia</string>
+    <string name="regional_band_entry_germany">Alemania</string>
+    <string name="regional_band_entry_greece">Grezia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexiko</string>
+    <string name="regional_band_entry_netherlands">Herbehereak</string>
+    <string name="regional_band_entry_new_zealand">Zelanda Berria</string>
+    <string name="regional_band_entry_norway">Norvegia</string>
+    <string name="regional_band_entry_poland">Polonia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Errusia</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Eslovakia</string>
+    <string name="regional_band_entry_spain">Espainia</string>
+    <string name="regional_band_entry_switzerland">Suitza</string>
+    <string name="regional_band_entry_sweden">Suedia</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkia</string>
+    <string name="regional_band_entry_united_kingdom">Erresuma Batua</string>
+    <string name="regional_band_entry_united_states">Estatu Batuak</string>
+    <string name="regional_band_entry_user_defined">Pertsonalizatua</string>
+    <string name="regional_band_summary_north_america">Ipar Amerika (87,5 MHz-tik 108,0 MHz-ra 200 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_europe">Europa (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_japan">Japonia (76,0 MHz-tik 90,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_japan_wide">Japonia (zabala) (90,0 MHz-tik 108,0 MHz-ra 50 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_australia">Australia (87,7 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_austria">Australia (87,7 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_belgium">Belgika (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_brazil">Brasil (87,5 MHz-tik 108,0 MHz-ra 200 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_china">Txina (87,0 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_czech_republic">Txekiar errepublika (87.5 MHz-tik 108.0 MHz-tara in 100 KHz-ko jauzietan)</string>
+    <string name="regional_band_summary_denmark">Danimarka (87,5 MHz-tik 108,0 MHz-ra 50 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_finland">Finlandia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_france">Frantzia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_germany">Alemania (87,5 MHz-tik 108,0 MHz-ra 50 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_greece">Grezia (87,5 MHz-tik 108,0 MHz-ra 50 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_india">India (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_ireland">Irlanda (87,5 MHz-tik 108,0 MHz-ra 50 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_italy">Italia (87,5 MHz-tik 108,0 MHz-ra 50 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 MHz-tik 108,0 MHz-ra 200 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_mexico">Mexiko (88,1 MHz-tik 107,9 MHz-ra 200 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_netherlands">Herbehereak (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_new_zealand">Zelanda berria (88,0 MHz-tik 107,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_norway">Norvegia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_poland">Polonia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 MHz-tik 108,0 MHz-ra 50 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_russia">Errusia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_singapore">Singapur (88,0 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_slovakia">Eslovakia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_spain">Espainia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_switzerland">Suitza (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_sweden">Suedia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_turkey">Turkia (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_united_kingdom">Erresuma Batua (87,5 MHz-tik 108,0 MHz-ra 100 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_united_states">Estatu Batuak (88,1 MHz-tik 107,9 MHz-ra 200 KHz-tako urratsetan)</string>
+    <string name="regional_band_summary_user_defined">Banda pertsonalizatua</string>
+    <string name="aud_output_mode">Audio irteera modua</string>
+    <string name="audio_type_stereo">Estereoa</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Grabazio iraupena</string>
+    <string name="auto_select_af">Frekuentzia alternatiboa</string>
+    <string name="settings_revert_defaults_title">Leheneratu lantegiko balioetara</string>
+    <string name="settings_revert_defaults_summary">Leheneratu ezarpen guztiak</string>
+    <string name="settings_revert_confirm_title">Berretsi leheneratzea</string>
+    <string name="settings_revert_confirm_msg">Honek aplikazioaren ezarpen guztiak garbituko ditu, gordetako irratiak barne. Jarraitu?</string>
+    <string name="no_storage">Muntatu SD txartela grabazioa hasi baino lehen.</string>
+    <string name="preparing_sd">SD txartela prestatzen\u2026</string>
+    <string name="access_sd_fail">Ezin izan da SD txartela atzitu.</string>
+    <string name="spaceIsLow_content">SD biltegiratze txartela lekurik gabe gelditzen ari da. Aldatu kalitate ezarpenak edo ezabatu fitxategiren bat lekua egiteko.</string>
+    <string name="FMRecording_reach_size_limit">Tamaina mugara heldu da.</string>
+    <string name="menu_scan_for_preset">Bilatu irratiak</string>
+    <string name="fm_off">FM itzalita dago.</string>
+    <string name="fm_call">Ezin da FM erabili dei baten bitartean.</string>
+    <string name="alert_dialog_hint">Sartu izen bat</string>
+    <string name="search_dialog_title">Bilatu irratiak</string>
+    <string name="fm_command_timeout_title">Denbora-muga</string>
+    <string name="fm_tune_timeout_msg">Ez da erantzunik jaso FM irratitik. Arazoak jarraitzen badu, itzali eta berriro piztu FM.</string>
+    <string name="fm_command_failed_title">FM eragiketak huts egin du</string>
+    <string name="fm_cmd_failed_msg">FM eragiketak huts egin du. Arazoak jarraitzen badu, irratia itzali eta berriro piztu.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM eragiketak huts egin du. Ezin dira FM eta HDMI batera erabili.</string>
+    <string name="fm_cmd_failed_call_on">FM eragiketak huts egin du. FM audioa ez da onartzen dei batean zehar.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Nire FM grabazioak</string>
+    <string name="audio_db_album_name">FM grabazioak</string>
+    <string name="audio_db_playlist_name">FM grabazioak</string>
+    <string name="station_name">Irratia:</string>
+    <string name="station_exists">Frekuentzia hau badago aurretik!</string>
+    <string name="station_list_delete_station">Ezabatu: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Ziur \'<xliff:g id="name">%s</xliff:g>\' ezabatu nahi duzula?</string>
+    <string name="station_name_empty">Irrati izena hutsik dago. Idatzi ezazu bat mesedez.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' erabiltzen ari zara jada, sartu beste izen bat.</string>
+    <string name="rt_plus_tags">Etiketak</string>
+    <string name="usr_def_band_min">Gutxieneko frekuentzia (MHz)</string>
+    <string name="usr_def_band_max">Gehieneko frekuentzia (MHz)</string>
+    <string name="chanl_spacing">Kanalen zabalera</string>
+    <string name="set">Ezarri</string>
+    <string name="user_defind_band_msg">Sartu 76.0 eta 108.0 MHz bitarteko frekuentzia bat, gutxienez kanal bateko espazioarekin eta 100 KHz gutxieneko eta gehieneko frekuentzien artean</string>
+    <string name="save_record_file">FM grabazioaren fitxategia \'<xliff:g id="record_file">%1$s</xliff:g>\' helbidean gorde da</string>
+    <string name="fm_search_no_results">Ez da bateragarria den irratirik aurkitu</string>
+    <string name="typ_All_stations">Irrati guztiak</string>
+    <string name="typ_Culture">Kultura</string>
+    <string name="typ_Current_affairs">Gaur egungo gertaerak</string>
+    <string name="typ_Children">Umeentzako programak</string>
+    <string name="typ_Country">Country musika</string>
+    <string name="typ_Documentary">Dokumentala</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Erraz entzuteko musika</string>
+    <string name="typ_Education">Hezkuntza</string>
+    <string name="typ_Emergency">Larrialdia</string>
+    <string name="typ_Emergency_test">Larrialdi froga</string>
+    <string name="typ_Finance">Finantzak</string>
+    <string name="typ_Folk">Folk musika</string>
+    <string name="typ_Information">Informazioa</string>
+    <string name="typ_Jazz">Jazz musika</string>
+    <string name="typ_Light_classical">Klasiko arina</string>
+    <string name="typ_Leisure">Aisia</string>
+    <string name="typ_News">Berriak</string>
+    <string name="typ_National">Musika nazionala</string>
+    <string name="typ_Other">Beste musikak</string>
+    <string name="typ_Oldies">Musika zaharra</string>
+    <string name="typ_Phone_in">Telefonotik</string>
+    <string name="typ_Pop">Pop musika</string>
+    <string name="typ_Religion">Erlijioa</string>
+    <string name="typ_Rock">Rock musika</string>
+    <string name="typ_Science">Zientzia</string>
+    <string name="typ_Serious_classical">Klasiko zorrotza</string>
+    <string name="typ_Social_affairs">Gai sozialak</string>
+    <string name="typ_Sport">Kirolak</string>
+    <string name="typ_Travel">Bidaiak</string>
+    <string name="typ_Varied">Askotarikoak</string>
+    <string name="typ_Weather">Eguraldia</string>
+    <string name="typ_Adult_hits">Betiko arrakastak</string>
+    <string name="typ_Classical">Klasikoa</string>
+    <string name="typ_Classic_Rock">Rock klasikoa</string>
+    <string name="typ_College">Unibertsitarioa</string>
+    <string name="typ_Foreign_language">Atzerriko hizkuntza</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Pertsona famatuak</string>
+    <string name="typ_Public">Publikoa</string>
+    <string name="typ_Religious_music">Erlijio musika</string>
+    <string name="typ_Religious_talk">Erlijio hitzaldiak</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Espainiar musika</string>
+    <string name="typ_Spanish_talk">Espainiar hitzaldia</string>
+    <string name="typ_Soft">Leuna</string>
+    <string name="typ_Soft_Rock">Rock leuna</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm and Blues leuna</string>
+    <string name="typ_Sports">Kirolak</string>
+    <string name="typ_Talk">Solasaldiak</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-fa/arrays.xml
similarity index 67%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-fa/arrays.xml
index cb1457b..9fd26c3 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-fa/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>استریو</item>
+    <item>مونو</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>استریو</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>۵ دقیقه</item>
+    <item>۱۵ دقیقه</item>
+    <item>۳۰ دقیقه</item>
+    <item>تا زمانی که متوقف شود</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>۱۵ دقیقه</item>
+    <item>۳۰ دقیقه</item>
+    <item>۴۵ دقیقه</item>
+    <item>۱ ساعت</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-fa/strings.xml b/fmapp2/res/values-fa/strings.xml
new file mode 100644
index 0000000..3a2dce4
--- /dev/null
+++ b/fmapp2/res/values-fa/strings.xml
@@ -0,0 +1,183 @@
+<?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</string>
+    <string name="tx_app_name">فرستنده FM</string>
+    <string name="menu_scan_start">اسکن</string>
+    <string name="menu_scan_stop">توقف جستجو</string>
+    <string name="menu_record_start">ضبط</string>
+    <string name="menu_record_stop">توقف ضبط</string>
+    <string name="menu_settings">تنظیمات</string>
+    <string name="menu_sleep">خواب</string>
+    <string name="menu_sleep_cancel">لغو خواب</string>
+    <string name="menu_all_channels">تمام کانال‌ها</string>
+    <string name="menu_display_tags">نمایش برچسب‌ها</string>
+    <string name="button_text_stop">توقف</string>
+    <string name="msg_seeking">جستجوی ایستگاه FM\u2026</string>
+    <string name="msg_scanning">جستجوی تمام ایستگاه‌های FM\u2026</string>
+    <string name="msg_searching_title">انتخاب خودکار پیش تنظیم</string>
+    <string name="msg_searching">جستجوی برای ایستگاه‌های قوی برای ایجاد لیست پیش تنظیم\u2026</string>
+    <string name="msg_noantenna">لطفا هدستی را برای استفاده از رایو FM متصل کنید</string>
+    <string name="dialog_sleep_title">زمان خواب خاموشی خودکار</string>
+    <string name="presetlist_select_name">انتخاب \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">افزودن لیست جدید</string>
+    <string name="dialog_presetlist_rename_title">نام را وارد کنید</string>
+    <string name="presetlist_autoselect_title">تایید انتخاب خودکار</string>
+    <string name="preset_replace">جایگزین کردن</string>
+    <string name="preset_tune">تنظیم</string>
+    <string name="preset_rename">تغییرنام</string>
+    <string name="preset_delete">حذف</string>
+    <string name="regional_band">باند منطقه‌ای</string>
+    <string name="regional_band_entry_north_america">آمریکای شمالی</string>
+    <string name="regional_band_entry_europe">اروپا</string>
+    <string name="regional_band_entry_japan">ژاپن</string>
+    <string name="regional_band_entry_japan_wide">ژاپن (گسترده)</string>
+    <string name="regional_band_entry_australia">استرالیا</string>
+    <string name="regional_band_entry_austria">اتریش</string>
+    <string name="regional_band_entry_belgium">بلژیک</string>
+    <string name="regional_band_entry_brazil">برزیل</string>
+    <string name="regional_band_entry_china">چین</string>
+    <string name="regional_band_entry_czech_republic">جمهوری چک</string>
+    <string name="regional_band_entry_denmark">دانمارک</string>
+    <string name="regional_band_entry_finland">فنلاند</string>
+    <string name="regional_band_entry_france">فرانسه</string>
+    <string name="regional_band_entry_germany">آلمان</string>
+    <string name="regional_band_entry_greece">یونان</string>
+    <string name="regional_band_entry_hong_kong">هنگ کنگ</string>
+    <string name="regional_band_entry_india">هند</string>
+    <string name="regional_band_entry_indonesia">اندونزی</string>
+    <string name="regional_band_entry_ireland">ایرلند</string>
+    <string name="regional_band_entry_italy">ایتالیا</string>
+    <string name="regional_band_entry_korea">کره جنوبی</string>
+    <string name="regional_band_entry_mexico">مکزیک</string>
+    <string name="regional_band_entry_netherlands">هلند</string>
+    <string name="regional_band_entry_new_zealand">نيوزلند</string>
+    <string name="regional_band_entry_norway">نروژ</string>
+    <string name="regional_band_entry_poland">لهستان</string>
+    <string name="regional_band_entry_portugal">پرتقال</string>
+    <string name="regional_band_entry_russia">روسیه</string>
+    <string name="regional_band_entry_singapore">سنگاپور</string>
+    <string name="regional_band_entry_slovakia">اسلواکی</string>
+    <string name="regional_band_entry_spain">اسپانیا</string>
+    <string name="regional_band_entry_switzerland">سوئیس</string>
+    <string name="regional_band_entry_sweden">سوئد</string>
+    <string name="regional_band_entry_taiwan">تایوان</string>
+    <string name="regional_band_entry_turkey">ترکیه</string>
+    <string name="regional_band_entry_united_kingdom">انگلستان</string>
+    <string name="regional_band_entry_united_states">ایالات متحده آمریکا</string>
+    <string name="regional_band_entry_user_defined">گروه تعریف شده توسط کاربر</string>
+    <string name="regional_band_summary_user_defined">باند تعریف شده توسط کاربر</string>
+    <string name="aud_output_mode">حالت خروجی صدا</string>
+    <string name="audio_type_stereo">استریو</string>
+    <string name="audio_type_mono">مونو</string>
+    <string name="record_dur">مدت زمان ضبط</string>
+    <string name="auto_select_af">فرکانس‌های جایگزین</string>
+    <string name="settings_revert_defaults_title">بازنشانی به پیش‌فرض کارخانه</string>
+    <string name="settings_revert_defaults_summary">تنظیم مجدد تمام تنظیمات</string>
+    <string name="settings_revert_confirm_title">تایید تنظیم مجدد</string>
+    <string name="settings_revert_confirm_msg">تمام تنظیمات برنامه از جمله پیش تنظیم‌های ذخیره شده حذف خواهند شد. ادامه می دهید؟</string>
+    <string name="no_storage">قبل از شروع ضبط کارت حافظه را اضافه کنید.</string>
+    <string name="preparing_sd">آماده کردن کارت حافظه\u2026</string>
+    <string name="access_sd_fail">نمی‌توان به کارت حافظه دسترسی پیدا کرد.</string>
+    <string name="spaceIsLow_content">فضای کارت حافظه شما در حال اتمام است. تنظیمات کیفیت را تغییر دهید یا تعدادی از تصاویر و اطلاعات را برای فضای بیشتر حذف کنید.</string>
+    <string name="menu_scan_for_preset">اسکن برای ایستگاه تنظیم شده</string>
+    <string name="fm_off">FM خاموش است.</string>
+    <string name="fm_call">در طول تماس نمی‌توان از FM استفاده کرد.</string>
+    <string name="alert_dialog_hint">نام را وارد کنید</string>
+    <string name="search_dialog_title">اسکن ایستگاه‌ها</string>
+    <string name="fm_command_timeout_title">زمان پایان</string>
+    <string name="fm_tune_timeout_msg">هیچ پاسخی برای تنظیم ایستگاه FM دریافت نشد. اگر مشکل باقی ماند لطفا FM را خاموش و روشن کنید.</string>
+    <string name="fm_command_failed_title">عملیات FM ناموفق بود</string>
+    <string name="fm_cmd_failed_msg">عملیات FM ناموفق بود. در صورت ادامه مشکل لطفا FM را خاموش و روشن کنید.</string>
+    <string name="fm_cmd_failed_msg_hdmi">عملیات FM ناموفق بود. FM و HDMI همزمان پشتیبانی نمی‌شود.</string>
+    <string name="fm_cmd_failed_call_on">عملیات FM ناموفق بود. استفاده از FM در طول تماس مجاز نمی‌باشد.</string>
+    <string name="station_name">ایستگاه:</string>
+    <string name="station_exists">این فرکانس از قبل وجود دارد!</string>
+    <string name="station_list_delete_station_prompt">از حذف \'<xliff:g id="name">%s</xliff:g>\' اطمینان دارید؟</string>
+    <string name="station_name_empty">نام ایستگاه خالی است، لطفا دوباره وارد کنید.</string>
+    <string name="rt_plus_tags">برچسب‌ها</string>
+    <string name="usr_def_band_min">پایین‌ترین فرکانس (مگاهرتز)</string>
+    <string name="usr_def_band_max">بالاترین فرکانس (مگاهرتز)</string>
+    <string name="chanl_spacing">فاصله کانال</string>
+    <string name="set">تنظیم</string>
+    <string name="fm_search_no_results">ایستگاه سازگاری پیدا نشد</string>
+    <string name="typ_All_stations">تمام ایستگاه‌ها</string>
+    <string name="typ_Culture">فرهنگ</string>
+    <string name="typ_Current_affairs">امور جاری</string>
+    <string name="typ_Children">برنامه‌های کودکان</string>
+    <string name="typ_Country">موسیقی کانتری</string>
+    <string name="typ_Documentary">مستند</string>
+    <string name="typ_Drama">درام</string>
+    <string name="typ_Easy_listening">موسیقی آرام</string>
+    <string name="typ_Education">تحصیلات</string>
+    <string name="typ_Emergency">اضطراری</string>
+    <string name="typ_Emergency_test">تست اضطراری</string>
+    <string name="typ_Finance">امور مالی</string>
+    <string name="typ_Folk">موسیقی محلی</string>
+    <string name="typ_Information">اطلاعات</string>
+    <string name="typ_Jazz">موسیقی جاز</string>
+    <string name="typ_Light_classical">کلاسیک آرام</string>
+    <string name="typ_Leisure">اوقات فراغت</string>
+    <string name="typ_News">خبر</string>
+    <string name="typ_National">موسیقی ملی</string>
+    <string name="typ_Other">موسیقی‌های دیگر</string>
+    <string name="typ_Oldies">موسیقی‌های قدیمی</string>
+    <string name="typ_Phone_in">در گوشی</string>
+    <string name="typ_Pop">موسیقی پاپ</string>
+    <string name="typ_Religion">دین</string>
+    <string name="typ_Rock">موسیقی راک</string>
+    <string name="typ_Science">علم</string>
+    <string name="typ_Serious_classical">کلاسیک جدی</string>
+    <string name="typ_Social_affairs">امور اجتماعی</string>
+    <string name="typ_Sport">ورزش</string>
+    <string name="typ_Travel">سفر</string>
+    <string name="typ_Varied">متنوع</string>
+    <string name="typ_Weather">آب و هوا</string>
+    <string name="typ_Adult_hits">بیشترین بازدید</string>
+    <string name="typ_Classical">کلاسیک</string>
+    <string name="typ_Classic_Rock">راک کلاسیک</string>
+    <string name="typ_College">کالج</string>
+    <string name="typ_Foreign_language">زبان خارجی</string>
+    <string name="typ_Hiphop">هیپ هاپ</string>
+    <string name="typ_Nostalgia">نوستالژی</string>
+    <string name="typ_Personality">شخصیت</string>
+    <string name="typ_Public">عمومی</string>
+    <string name="typ_Religious_music">موسیقی مذهبی</string>
+    <string name="typ_Religious_talk">بحث مذهبی</string>
+    <string name="typ_Rhythm_and_Blues">ریتم و بلوز</string>
+    <string name="typ_Spanish_music">موسیقی اسپانیایی</string>
+    <string name="typ_Spanish_talk">گفتگوی اسپانیایی</string>
+    <string name="typ_Soft">سافت</string>
+    <string name="typ_Soft_Rock">سافت‌راک</string>
+    <string name="typ_Soft_Rhythm_and_Blues">ریتم و بلوز سافت</string>
+    <string name="typ_Sports">ورزشی</string>
+    <string name="typ_Talk">بحث</string>
+    <string name="typ_Top_40">۴۰ تای برتر</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-fi/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-fi/arrays.xml
index cb1457b..5b8e975 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-fi/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuuttia</item>
+    <item>15 minuuttia</item>
+    <item>30 minuuttia</item>
+    <item>Kunnes pysäytetään</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuuttia</item>
+    <item>30 minuuttia</item>
+    <item>45 minuuttia</item>
+    <item>1 tunti</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-fi/strings.xml b/fmapp2/res/values-fi/strings.xml
new file mode 100644
index 0000000..8822dd4
--- /dev/null
+++ b/fmapp2/res/values-fi/strings.xml
@@ -0,0 +1,232 @@
+<?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-lähetin</string>
+    <string name="menu_scan_start">Hae kanavia</string>
+    <string name="menu_scan_stop">Lopeta haku</string>
+    <string name="menu_record_start">Nauhoita</string>
+    <string name="menu_record_stop">Lopeta tallennus</string>
+    <string name="menu_settings">Asetukset</string>
+    <string name="menu_sleep">Uni</string>
+    <string name="menu_sleep_cancel">Peru uni</string>
+    <string name="menu_all_channels">Kaikki kanavat</string>
+    <string name="menu_display_tags">Näytä tunnisteet</string>
+    <string name="button_text_stop">Lopeta</string>
+    <string name="msg_seeking">Haetaan FM-asemia\u2026</string>
+    <string name="msg_scanning">Haetaan kaikki FM-asemat\u2026</string>
+    <string name="msg_scanning_pty">Haetaan kanavaa \'<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">Esiasetusten automaattinen valinta</string>
+    <string name="msg_searching">Etsitään vahvoja taajuuksia esiasetusten määrittämiseksi\u2026</string>
+    <string name="msg_noantenna">Kytke kuulokkeet käyttääksesi FM-radiota</string>
+    <string name="dialog_sleep_title">Automaattisen sulkemisen aika</string>
+    <string name="presetlist_select_name">Valitse \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Lisää uusi lista</string>
+    <string name="dialog_presetlist_rename_title">Anna nimi</string>
+    <string name="presetlist_autoselect_title">Vahvista automaattinen valinta</string>
+    <string name="preset_replace">Korvaa</string>
+    <string name="preset_tune">Viritä</string>
+    <string name="preset_rename">Nimeä uudelleen</string>
+    <string name="preset_delete">Poista</string>
+    <string name="preset_search">Etsi \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Alueen taajuusalue</string>
+    <string name="regional_band_entry_north_america">Pohjois-Amerikka</string>
+    <string name="regional_band_entry_europe">Eurooppa</string>
+    <string name="regional_band_entry_japan">Japani</string>
+    <string name="regional_band_entry_japan_wide">Japani (laaja)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Itävalta</string>
+    <string name="regional_band_entry_belgium">Belgia</string>
+    <string name="regional_band_entry_brazil">Brasilia</string>
+    <string name="regional_band_entry_china">Kiina</string>
+    <string name="regional_band_entry_czech_republic">Tšekki</string>
+    <string name="regional_band_entry_denmark">Tanska</string>
+    <string name="regional_band_entry_finland">Suomi</string>
+    <string name="regional_band_entry_france">Ranska</string>
+    <string name="regional_band_entry_germany">Saksa</string>
+    <string name="regional_band_entry_greece">Kreikka</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Intia</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irlanti</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Meksiko</string>
+    <string name="regional_band_entry_netherlands">Alankomaat</string>
+    <string name="regional_band_entry_new_zealand">Uusi-Seelanti</string>
+    <string name="regional_band_entry_norway">Norja</string>
+    <string name="regional_band_entry_poland">Puola</string>
+    <string name="regional_band_entry_portugal">Portugali</string>
+    <string name="regional_band_entry_russia">Venäjä</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Espanja</string>
+    <string name="regional_band_entry_switzerland">Sveitsi</string>
+    <string name="regional_band_entry_sweden">Ruotsi</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkki</string>
+    <string name="regional_band_entry_united_kingdom">Iso-Britannia</string>
+    <string name="regional_band_entry_united_states">Yhdysvallat</string>
+    <string name="regional_band_entry_user_defined">Käyttäjän määrittämä taajuusalue</string>
+    <string name="regional_band_summary_north_america">Pohjois-Amerikka (87.5 - 108.0 MHz, 200 kHz välein)</string>
+    <string name="regional_band_summary_europe">Eurooppa (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_japan">Japani (76.0 - 90.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_japan_wide">Japani (laaja) (90.0 - 108.0MHz, 50 kHz välein)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_austria">Itävalta (87.5 - 108.0 MHz, 50 kHz välein)</string>
+    <string name="regional_band_summary_belgium">Belgia (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_brazil">Brasilia (87.5 - 108.0 MHz, 200 kHz välein)</string>
+    <string name="regional_band_summary_china">Kiina (87.0 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_czech_republic">Tšekki (87.5MHz - 108.0MHz, 100KHz välein)</string>
+    <string name="regional_band_summary_denmark">Tanska (87.5 - 108.0 MHz, 50 kHz välein)</string>
+    <string name="regional_band_summary_finland">Suomi (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_france">Ranska (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_germany">Saksa (87.5 - 108.0 MHz, 50 kHz välein)</string>
+    <string name="regional_band_summary_greece">Kreikka (87.5 - 108.0 MHz, 50 kHz välein)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_india">Intia (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_ireland">Irlanti (87.5 - 108.0 MHz, 50 kHz välein)</string>
+    <string name="regional_band_summary_italy">Italia (87.5 - 108.0 MHz, 50 kHz välein)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 - 108.0 MHz, 200 kHz välein)</string>
+    <string name="regional_band_summary_mexico">Meksiko (88.1 - 107.9 MHz, 200 kHz välein)</string>
+    <string name="regional_band_summary_netherlands">Alankomaat (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_new_zealand">Uusi-Seelanti (88.0 - 107.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_norway">Norja (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_poland">Puola (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_portugal">Portugali (87.5 - 108.0 MHz, 50 kHz välein)</string>
+    <string name="regional_band_summary_russia">Venäjä (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_slovakia">Slovakia (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_spain">Espanja (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_switzerland">Sveitsi (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_sweden">Ruotsi (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_turkey">Turkki (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_united_kingdom">Iso-Britannia (87.5 - 108.0 MHz, 100 kHz välein)</string>
+    <string name="regional_band_summary_united_states">Yhdysvallat (88.1 - 107.9 MHz, 200 kHz välein)</string>
+    <string name="regional_band_summary_user_defined">Käyttäjän määrittämä taajuusalue</string>
+    <string name="aud_output_mode">Äänen ulostulo</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Äänityksen kesto</string>
+    <string name="auto_select_af">Vaihtoehtoinen taajuus (AF)</string>
+    <string name="settings_revert_defaults_title">Palauta tehdasasetukset</string>
+    <string name="settings_revert_defaults_summary">Palauta kaikki asetukset</string>
+    <string name="settings_revert_confirm_title">Vahvista palautus</string>
+    <string name="settings_revert_confirm_msg">Tämä tyhjentää kaikki sovelluksen asetukset, mukaan lukien tallennetut esiasetukset. Haluatko jatkaa?</string>
+    <string name="no_storage">Liitä SD-kortti ennen tallennuksen aloittamista.</string>
+    <string name="preparing_sd">Valmistellaan SD-korttia\u2026</string>
+    <string name="access_sd_fail">SD-korttia ei voi käyttää.</string>
+    <string name="spaceIsLow_content">Tallennustila on loppumassa SD-kortilta. Vaihda laatu-asetus tai poista tiedostoja vapauttaaksesi tilaa.</string>
+    <string name="FMRecording_reach_size_limit">Kokorajoitus saavutettu.</string>
+    <string name="menu_scan_for_preset">Skannaa kanavia</string>
+    <string name="fm_off">FM on poistettu käytöstä.</string>
+    <string name="fm_call">FM:ää ei voi käyttää puhelun aikana.</string>
+    <string name="alert_dialog_hint">Anna nimi</string>
+    <string name="search_dialog_title">Skannaa asemat</string>
+    <string name="fm_command_timeout_title">Aikakatkaisu</string>
+    <string name="fm_tune_timeout_msg">Ei saatu vastausta virittääksesi FM-asemalle. Jos ongelma jatkuu, poista FM käytöstä ja laita takaisin päälle.</string>
+    <string name="fm_command_failed_title">FM-toiminto epäonnistui</string>
+    <string name="fm_cmd_failed_msg">FM-toiminto epäonnistui. Jos ongelma jatkuu, poista FM käytöstä ja laita takaisin päälle.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-toiminto epäonnistui. FM ja HDMI ei voi olla samanaikaisesti päällä.</string>
+    <string name="fm_cmd_failed_call_on">FM-toiminto epäonnistui. FM-ääni ei sallittu puhelun aikana.</string>
+    <string name="audio_db_artist_name">Omat FM-tallennukset</string>
+    <string name="audio_db_album_name">FM-tallennukset</string>
+    <string name="audio_db_playlist_name">FM-tallennukset</string>
+    <string name="station_name">Asema:</string>
+    <string name="station_exists">Taajuus on jo käytössä!</string>
+    <string name="station_list_delete_station">Poista :<xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Haluatko varmasti poistaa aseman \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Aseman nimi on tyhjä, kirjoita uudelleen.</string>
+    <string name="station_name_exist"><xliff:g id="name">%s</xliff:g> on jo käytössä, anna toinen nimi.</string>
+    <string name="rt_plus_tags">Tagit</string>
+    <string name="usr_def_band_min">Matalin taajuus (MHz)</string>
+    <string name="usr_def_band_max">Korkein taajuus (MHz)</string>
+    <string name="chanl_spacing">Taajuusväli</string>
+    <string name="set">Aseta</string>
+    <string name="user_defind_band_msg">Syötä taajuus väliltä 76.0-108.0 MHz vähintään yhden kanavan välein ja 100 kHz minimi- ja maksimitaajuuden välillä</string>
+    <string name="save_record_file">FM-tallennukset tallennettu \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Yhteensopivia asemia ei löytynyt</string>
+    <string name="typ_All_stations">Kaikki asemat</string>
+    <string name="typ_Culture">Kulttuuri</string>
+    <string name="typ_Current_affairs">Ajankohtainen</string>
+    <string name="typ_Children">Lastenohjelmat</string>
+    <string name="typ_Country">Kantri</string>
+    <string name="typ_Documentary">Dokumentti</string>
+    <string name="typ_Drama">Draama</string>
+    <string name="typ_Easy_listening">Kevyt musiikki</string>
+    <string name="typ_Education">Opetus</string>
+    <string name="typ_Emergency">Hätätila</string>
+    <string name="typ_Emergency_test">Hätätesti</string>
+    <string name="typ_Finance">Talous</string>
+    <string name="typ_Folk">Folk-musiikki</string>
+    <string name="typ_Information">Informaatio</string>
+    <string name="typ_Jazz">Jazz-musiikki</string>
+    <string name="typ_Light_classical">Kevyt klassinen</string>
+    <string name="typ_Leisure">Vapaa-aika</string>
+    <string name="typ_News">Uutiset</string>
+    <string name="typ_National">Kansallismusiikki</string>
+    <string name="typ_Other">Muu musiikki</string>
+    <string name="typ_Oldies">Ikivihreät</string>
+    <string name="typ_Phone_in">Puhelin</string>
+    <string name="typ_Pop">Pop-musiikki</string>
+    <string name="typ_Religion">Uskonto</string>
+    <string name="typ_Rock">Rock-musiikki</string>
+    <string name="typ_Science">Tiede</string>
+    <string name="typ_Serious_classical">Oikea klassinen</string>
+    <string name="typ_Social_affairs">Sosiaalisuus</string>
+    <string name="typ_Sport">Urheilu</string>
+    <string name="typ_Travel">Matkailu</string>
+    <string name="typ_Varied">Monipuolinen</string>
+    <string name="typ_Weather">Sää</string>
+    <string name="typ_Adult_hits">Vanhemmat hitit</string>
+    <string name="typ_Classical">Klassinen</string>
+    <string name="typ_Classic_Rock">Klassinen Rock</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Vieras kieli</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Persoonallinen</string>
+    <string name="typ_Public">Julkinen</string>
+    <string name="typ_Religious_music">Uskonnollinen musiikki</string>
+    <string name="typ_Religious_talk">Uskonnollinen puhe</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Espanjalainen musiikki</string>
+    <string name="typ_Spanish_talk">Espanjalainen puhe</string>
+    <string name="typ_Soft">Pehmeä</string>
+    <string name="typ_Soft_Rock">Pehmeä rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Pehmeä Rhythm and Blues</string>
+    <string name="typ_Sports">Urheilu</string>
+    <string name="typ_Talk">Puhe</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-fr/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-fr/arrays.xml
index cb1457b..26c2471 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-fr/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stéréo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stéréo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutes</item>
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>Jusqu\'à l\'arrêt</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>45 minutes</item>
+    <item>1 heure</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-fr/strings.xml b/fmapp2/res/values-fr/strings.xml
new file mode 100644
index 0000000..80a9401
--- /dev/null
+++ b/fmapp2/res/values-fr/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Émetteur FM</string>
+    <string name="menu_scan_start">Rechercher</string>
+    <string name="menu_scan_stop">Arrêter la recherche</string>
+    <string name="menu_record_start">Enregistrer</string>
+    <string name="menu_record_stop">Arrêter l\'enregistrement</string>
+    <string name="menu_settings">Paramètres</string>
+    <string name="menu_sleep">Veille</string>
+    <string name="menu_sleep_cancel">Annuler la veille</string>
+    <string name="menu_all_channels">Tous les canaux</string>
+    <string name="menu_display_tags">Afficher les tags</string>
+    <string name="button_text_stop">Arrêter</string>
+    <string name="msg_seeking">Recherche de station FM\u2026</string>
+    <string name="msg_scanning">Recherche de toutes les stations FM\u2026</string>
+    <string name="msg_scanning_pty">Balayage pour  \'<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">Préréglages auto-sélection</string>
+    <string name="msg_searching">Recherche des stations de bonne qualité pour établir la liste de présélections\u2026</string>
+    <string name="msg_noantenna">Veuillez brancher un casque pour utiliser la radio FM</string>
+    <string name="dialog_sleep_title">Durée arrêt automatique</string>
+    <string name="presetlist_select_name">Sélectionner \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Ajouter une nouvelle liste</string>
+    <string name="dialog_presetlist_rename_title">Entrez un nom</string>
+    <string name="presetlist_autoselect_title">Confirmer l\'auto-sélection</string>
+    <string name="preset_replace">Remplacer</string>
+    <string name="preset_tune">Ajuster</string>
+    <string name="preset_rename">Renommer</string>
+    <string name="preset_delete">Supprimer</string>
+    <string name="preset_search">Recherche de \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Bande régionale</string>
+    <string name="regional_band_entry_north_america">Amérique du Nord</string>
+    <string name="regional_band_entry_europe">Europe</string>
+    <string name="regional_band_entry_japan">Japon</string>
+    <string name="regional_band_entry_japan_wide">Japon (large)</string>
+    <string name="regional_band_entry_australia">Australie</string>
+    <string name="regional_band_entry_austria">Autriche</string>
+    <string name="regional_band_entry_belgium">Belgique</string>
+    <string name="regional_band_entry_brazil">Brésil</string>
+    <string name="regional_band_entry_china">Chine</string>
+    <string name="regional_band_entry_czech_republic">République tchèque</string>
+    <string name="regional_band_entry_denmark">Danemark</string>
+    <string name="regional_band_entry_finland">Finlande</string>
+    <string name="regional_band_entry_france">France</string>
+    <string name="regional_band_entry_germany">Allemagne</string>
+    <string name="regional_band_entry_greece">Grèce</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Inde</string>
+    <string name="regional_band_entry_indonesia">Indonésie</string>
+    <string name="regional_band_entry_ireland">Irlande</string>
+    <string name="regional_band_entry_italy">Italie</string>
+    <string name="regional_band_entry_korea">Corée</string>
+    <string name="regional_band_entry_mexico">Mexique</string>
+    <string name="regional_band_entry_netherlands">Pays-Bas</string>
+    <string name="regional_band_entry_new_zealand">Nouvelle-Zélande</string>
+    <string name="regional_band_entry_norway">Norvège</string>
+    <string name="regional_band_entry_poland">Pologne</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russie</string>
+    <string name="regional_band_entry_singapore">Singapour</string>
+    <string name="regional_band_entry_slovakia">Slovaquie</string>
+    <string name="regional_band_entry_spain">Espagne</string>
+    <string name="regional_band_entry_switzerland">Suisse</string>
+    <string name="regional_band_entry_sweden">Suède</string>
+    <string name="regional_band_entry_taiwan">Taïwan</string>
+    <string name="regional_band_entry_turkey">Turquie</string>
+    <string name="regional_band_entry_united_kingdom">Royaume-Uni</string>
+    <string name="regional_band_entry_united_states">États-Unis</string>
+    <string name="regional_band_entry_user_defined">Bande définie par l\'utilisateur</string>
+    <string name="regional_band_summary_north_america">Amérique du Nord (87,5 MHz à 108,0 MHz par pas de 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europe (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japon (76,0 MHz à 90,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japon (large) (90.0 MHz à 108,0 MHz par paliers de 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australie (87,7 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_austria">Autriche (87,5 MHz à 108,0 MHz par pas de 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Belgique (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brésil (87,5 MHz à 108,0 MHz par pas de 200 kHz)</string>
+    <string name="regional_band_summary_china">Chine (87.0 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">République tchèque (87,5 à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Danemark (87,5 MHz à 108,0 MHz par pas de 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlande (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_france">France (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_germany">Allemagne (87,5 MHz à 108,0 MHz par pas de 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grèce (87,5 MHz à 108,0 MHz par pas de 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_india">Inde (87,5 MHz à 108,0 MHz par pas de 100 KHz)</string>
+    <string name="regional_band_summary_indonesia">Indonésie (87,5 MHz à 108,0 MHz par pas de 100 KHz)</string>
+    <string name="regional_band_summary_ireland">Irlande (87,5 MHz à 108,0 MHz par pas de 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italie (87,5 MHz à 108,0 MHz par pas de 50 kHz)</string>
+    <string name="regional_band_summary_korea">Corée (87,5 MHz à 108,0 MHz par pas de 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Mexique (88,1 MHz à 107,9 MHz par pas de 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Pays-Bas (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Nouvelle-Zélande (88.0 MHz à 107,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norvège (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_poland">Pologne (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 MHz à 108,0 MHz par pas de 50 kHz)</string>
+    <string name="regional_band_summary_russia">Russie (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapour (88.0 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Slovaquie (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_spain">Espagne (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Suisse (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Suède (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taïwan (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turquie (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Royaume-Uni (87,5 MHz à 108,0 MHz par pas de 100 kHz)</string>
+    <string name="regional_band_summary_united_states">États-Unis (88,1 MHz à 107,9 MHz par pas de 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Bande définie par l\'utilisateur</string>
+    <string name="aud_output_mode">Mode de sortie audio</string>
+    <string name="audio_type_stereo">Stéréo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Durée d\'enregistrement</string>
+    <string name="auto_select_af">Fréquence alternative</string>
+    <string name="settings_revert_defaults_title">Revenir aux paramètres par défaut</string>
+    <string name="settings_revert_defaults_summary">Réinitialiser tous les paramètres</string>
+    <string name="settings_revert_confirm_title">Confirmer la réinitialisation</string>
+    <string name="settings_revert_confirm_msg">Ceci va effacer tous les paramètres de l\'application, y compris les paramètres prédéfinis enregistrés. Continuer ?</string>
+    <string name="no_storage">Monter la carte SD avant de commencer les enregistrements.</string>
+    <string name="preparing_sd">Préparation de la carte SD\u2026</string>
+    <string name="access_sd_fail">Impossible d\'accéder à la carte SD.</string>
+    <string name="spaceIsLow_content">Votre carte SD est à court d\'espace. Modifiez le paramètre de qualité ou supprimer des fichiers pour libérer de l\'espace.</string>
+    <string name="FMRecording_reach_size_limit">Taille maximale atteinte.</string>
+    <string name="menu_scan_for_preset">Recherche de présélections</string>
+    <string name="fm_off">La radio FM est éteinte.</string>
+    <string name="fm_call">La radio FM ne peut pas être utilisée pendant un appel.</string>
+    <string name="alert_dialog_hint">Entrez un nom</string>
+    <string name="search_dialog_title">Recherche des Stations</string>
+    <string name="fm_command_timeout_title">Temps expiré</string>
+    <string name="fm_tune_timeout_msg">Aucune réponse reçue pour régler la station FM. Si le problème persiste, veuillez éteindre la radio FM et la rallumer.</string>
+    <string name="fm_command_failed_title">Échec de l\'opération FM</string>
+    <string name="fm_cmd_failed_msg">Échec de l\'opération radio FM. Si le problème persiste, veuillez éteindre la radio FM et la rallumer.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Opération FM échouée. FM et HDMI ne sont pas supportés simultanément.</string>
+    <string name="fm_cmd_failed_call_on">Opération FM échouée. La FM n\'est pas autorisée pendant un appel.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Mes enregistrements FM</string>
+    <string name="audio_db_album_name">Enregistrements FM</string>
+    <string name="audio_db_playlist_name">Enregistrements FM</string>
+    <string name="station_name">Station :</string>
+    <string name="station_exists">Cette fréquence existe déjà !</string>
+    <string name="station_list_delete_station">Supprimer : <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Êtes-vous sûr de vouloir supprimer \'<xliff:g id="name">%s</xliff:g>\' ?</string>
+    <string name="station_name_empty">Le nom de la station est vide, veuillez réessayer.</string>
+    <string name="station_name_exist">« <xliff:g id="name">%s</xliff:g> » est déjà utilisé, veuillez entrer un nom différent.</string>
+    <string name="rt_plus_tags">Tags</string>
+    <string name="usr_def_band_min">Fréquence minimale (MHz)</string>
+    <string name="usr_def_band_max">Fréquence maximale (MHz)</string>
+    <string name="chanl_spacing">Espacement entre les canaux</string>
+    <string name="set">Définir</string>
+    <string name="user_defind_band_msg">Saisir une fréquence comprise entre 76,0 et 108,0 MHz avec un espacement canal minimum de 1 et 100 kHz d\'espace entre la fréquence minimale et maximale</string>
+    <string name="save_record_file">Fichier d\'enregistrement FM enregistré dans \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Aucune station compatible trouvée</string>
+    <string name="typ_All_stations">Toutes les stations</string>
+    <string name="typ_Culture">Culture</string>
+    <string name="typ_Current_affairs">Affaires actuelles</string>
+    <string name="typ_Children">Programmes pour enfants</string>
+    <string name="typ_Country">Musique country</string>
+    <string name="typ_Documentary">Documentaire</string>
+    <string name="typ_Drama">Drame</string>
+    <string name="typ_Easy_listening">Musique de détente</string>
+    <string name="typ_Education">Éducation</string>
+    <string name="typ_Emergency">Urgence</string>
+    <string name="typ_Emergency_test">Essai d\'urgence</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Musique Folk</string>
+    <string name="typ_Information">Information</string>
+    <string name="typ_Jazz">Musique jazz</string>
+    <string name="typ_Light_classical">Musique classique</string>
+    <string name="typ_Leisure">Loisirs</string>
+    <string name="typ_News">Actualités</string>
+    <string name="typ_National">Musique nationale</string>
+    <string name="typ_Other">Autres musiques</string>
+    <string name="typ_Oldies">Musique rétro</string>
+    <string name="typ_Phone_in">Dans le téléphone</string>
+    <string name="typ_Pop">Musique pop</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Musique rock</string>
+    <string name="typ_Science">Sciences</string>
+    <string name="typ_Serious_classical">Grande musique</string>
+    <string name="typ_Social_affairs">Affaires sociales</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Voyage</string>
+    <string name="typ_Varied">Varié</string>
+    <string name="typ_Weather">Météo</string>
+    <string name="typ_Adult_hits">Hits pour adultes</string>
+    <string name="typ_Classical">Classique</string>
+    <string name="typ_Classic_Rock">Rock classique</string>
+    <string name="typ_College">Collège</string>
+    <string name="typ_Foreign_language">Langue étrangère</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgie</string>
+    <string name="typ_Personality">Personnalité</string>
+    <string name="typ_Public">Publique</string>
+    <string name="typ_Religious_music">Musique religieuse</string>
+    <string name="typ_Religious_talk">Discours religieux</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Musique espagnole</string>
+    <string name="typ_Spanish_talk">Discussions en espagnol</string>
+    <string name="typ_Soft">Doux</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sports</string>
+    <string name="typ_Talk">Talk</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-fur-rIT/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-fur-rIT/arrays.xml
index cb1457b..2b2bc8d 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-fur-rIT/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minûts</item>
+    <item>15 minûts</item>
+    <item>30 minûts</item>
+    <item>Fin ae fermade</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minûts</item>
+    <item>30 minûts</item>
+    <item>45 minûts</item>
+    <item>1 ore</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-fur-rIT/strings.xml b/fmapp2/res/values-fur-rIT/strings.xml
new file mode 100644
index 0000000..468e2e0
--- /dev/null
+++ b/fmapp2/res/values-fur-rIT/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Trasmetidôr FM</string>
+    <string name="menu_scan_start">Scansion</string>
+    <string name="menu_scan_stop">Ferme la ricercje</string>
+    <string name="menu_record_start">Regjistre</string>
+    <string name="menu_record_stop">Ferme di regjistrâ</string>
+    <string name="menu_settings">Impostazions</string>
+    <string name="menu_sleep">Sospint</string>
+    <string name="menu_sleep_cancel">Anule sospension</string>
+    <string name="menu_all_channels">Ducj i canâi</string>
+    <string name="menu_display_tags">Mostre etichetis</string>
+    <string name="button_text_stop">Ferme</string>
+    <string name="msg_seeking">Daûr a cirî la stazion FM\u2026</string>
+    <string name="msg_scanning">Scansion di dutis lis stazions FM\u2026</string>
+    <string name="msg_scanning_pty">Scansion di \'<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-selezione preconfigurazios</string>
+    <string name="msg_searching">Ricercje di stazions cuntun bon segnâl par creâ une liste preconfigurade\u2026</string>
+    <string name="msg_noantenna">Tache lis scufis/auricolârs par doprâ la radio FM</string>
+    <string name="dialog_sleep_title">Timp di distudament automatic</string>
+    <string name="presetlist_select_name">Selezione \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Zonte une gnove liste</string>
+    <string name="dialog_presetlist_rename_title">Inserìs un non</string>
+    <string name="presetlist_autoselect_title">Conferme la selezion automatiche</string>
+    <string name="preset_replace">Sostituìs</string>
+    <string name="preset_tune">Sintonize</string>
+    <string name="preset_rename">Cambie non</string>
+    <string name="preset_delete">Elimine</string>
+    <string name="preset_search">Ricercje di \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Bande regjonâl</string>
+    <string name="regional_band_entry_north_america">Americhe dal Nord</string>
+    <string name="regional_band_entry_europe">Europe</string>
+    <string name="regional_band_entry_japan">Gjapon</string>
+    <string name="regional_band_entry_japan_wide">Gjapon (ample)</string>
+    <string name="regional_band_entry_australia">Australie</string>
+    <string name="regional_band_entry_austria">Austrie</string>
+    <string name="regional_band_entry_belgium">Belgjiche</string>
+    <string name="regional_band_entry_brazil">Brasîl</string>
+    <string name="regional_band_entry_china">Cine</string>
+    <string name="regional_band_entry_czech_republic">Republiche Ceche</string>
+    <string name="regional_band_entry_denmark">Danimarche</string>
+    <string name="regional_band_entry_finland">Finlandie</string>
+    <string name="regional_band_entry_france">France</string>
+    <string name="regional_band_entry_germany">Gjermanie</string>
+    <string name="regional_band_entry_greece">Grecie</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indie</string>
+    <string name="regional_band_entry_indonesia">Indonesie</string>
+    <string name="regional_band_entry_ireland">Irlande</string>
+    <string name="regional_band_entry_italy">Italie</string>
+    <string name="regional_band_entry_korea">Coree</string>
+    <string name="regional_band_entry_mexico">Messic</string>
+    <string name="regional_band_entry_netherlands">Paîs Bas</string>
+    <string name="regional_band_entry_new_zealand">Gnove Zelande</string>
+    <string name="regional_band_entry_norway">Norvegje</string>
+    <string name="regional_band_entry_poland">Polonie</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russie</string>
+    <string name="regional_band_entry_singapore">Singapôr</string>
+    <string name="regional_band_entry_slovakia">Slovachie</string>
+    <string name="regional_band_entry_spain">Spagne</string>
+    <string name="regional_band_entry_switzerland">Svuizare</string>
+    <string name="regional_band_entry_sweden">Svezie</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turchie</string>
+    <string name="regional_band_entry_united_kingdom">Ream Unît</string>
+    <string name="regional_band_entry_united_states">Stâts Unîts</string>
+    <string name="regional_band_entry_user_defined">Bande definide dal utent</string>
+    <string name="regional_band_summary_north_america">Nord Americhe (di 87.5MHz a 108.0MHz cun fasis di 200 KHz)</string>
+    <string name="regional_band_summary_europe">Europe (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_japan">Gjapon (di 76.0MHz a 90.0MHz cun fasis di 100KHz)</string>
+    <string name="regional_band_summary_japan_wide">Gjapon (ample) (di 90.0MHz a 108.0MHz cun fasis di 50KHz)</string>
+    <string name="regional_band_summary_australia">Australie (di 87.7 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_austria">Austrie (di 87.5 a 108.0 MHz cun fasis di 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Belgjiche (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasîl (di 87.5 a 108.0 MHz cun fasis di 200 kHz)</string>
+    <string name="regional_band_summary_china">Cine (di 87.0 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Republiche Ceche (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Danimarche (di 87.5 a 108.0 MHz cun fasis di 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlandie (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_france">France (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_germany">Gjermanie (di 87.5 a 108.0 MHz cun fasis di 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grecie (di 87.5 a 108.0 MHz cun fasis di 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_india">Indie (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesie (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlande (di 87.5 a 108.0 MHz cun fasis di 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italie (di 87.5 a 108.0 MHz cun fasis di 50 kHz)</string>
+    <string name="regional_band_summary_korea">Coree (di 87.5 a 108.0 MHz cun fasis di 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Messic (di 88.1 a 107.9 MHz cun fasis di 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Paîs Bas (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Gnove Zelande (di 88.0 a 107.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norvegje (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polonie (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (di 87.5 a 108.0 MHz cun fasis di 50 kHz)</string>
+    <string name="regional_band_summary_russia">Russie (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapôr (di 88.0 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Slovachie (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_spain">Spagne (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Svuizare (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Svezie (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turchie (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Ream Unît (di 87.5 a 108.0 MHz cun fasis di 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Stâts Unîts (di 88.1 a 107.9 MHz cun fasis di 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Bande definide dal utent</string>
+    <string name="aud_output_mode">Modalitât di jessude audio</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Durade regjistrazion</string>
+    <string name="auto_select_af">Frecuence alternative</string>
+    <string name="settings_revert_defaults_title">Ripristine ai valôrs predefinîts di fabriche</string>
+    <string name="settings_revert_defaults_summary">Ripristine dutis lis impostazions</string>
+    <string name="settings_revert_confirm_title">Conferme ripristinament</string>
+    <string name="settings_revert_confirm_msg">Chest al netarà dutis lis impostazions des aplicazions, includudis lis preconfigurazions salvadis. Continuâ?</string>
+    <string name="no_storage">Monte la schede SD prime di scomençâ a regjistrâ.</string>
+    <string name="preparing_sd">Daûr a prontâ la schede SD\u2026</string>
+    <string name="access_sd_fail">Impussibil acedi ae schede SD.</string>
+    <string name="spaceIsLow_content">Il spazi di archiviazion de schede SD al sta par finî. Cambie la impostazion de cualitât o elimine cualchi altri file par liberâ spazi.</string>
+    <string name="FMRecording_reach_size_limit">Rivâts al limit de dimension.</string>
+    <string name="menu_scan_for_preset">Scansione pai predefinîts</string>
+    <string name="fm_off">la radio FM e je distudade.</string>
+    <string name="fm_call">Nol è pussibil doprâ la radio FM intant che tu telefonis.</string>
+    <string name="alert_dialog_hint">Inserìs un non</string>
+    <string name="search_dialog_title">Ricercje stazions</string>
+    <string name="fm_command_timeout_title">Timp scjadût</string>
+    <string name="fm_tune_timeout_msg">Nissune rispueste ricevude te sintonie de stazion FM. Se il probleme al persist , distude e torne impie la radio FM.</string>
+    <string name="fm_command_failed_title">Operazion FM falide</string>
+    <string name="fm_cmd_failed_msg">Operazion FM falide. Se il probleme al persist, distude la radio FM e torne impiile.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Operazion FM falide. FM e HDMI no son supuartâts in mût simultani.</string>
+    <string name="fm_cmd_failed_call_on">Operazion FM falide. L\'audio FM nol è ametût intant des clamadis.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Lis mês regjistrazions FM</string>
+    <string name="audio_db_album_name">Regjistrazions FM</string>
+    <string name="audio_db_playlist_name">Regjistrazions FM</string>
+    <string name="station_name">Stazion:</string>
+    <string name="station_exists">Cheste frecuence e esist za!</string>
+    <string name="station_list_delete_station">Elimine: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Eliminâ pardabon \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Il non de stazion al è vueit, scrivilu di gnûf.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' al è za doprât, met un altri non.</string>
+    <string name="rt_plus_tags">Etichetis</string>
+    <string name="usr_def_band_min">Frecuence minime (MHz)</string>
+    <string name="usr_def_band_max">Frecuence massime (MHz)</string>
+    <string name="chanl_spacing">Spaziadure tra i canâi</string>
+    <string name="set">Stabilìs</string>
+    <string name="user_defind_band_msg">Inserìs une frecuence tra 76.0 e 108.0 MHz cun almancul 1 canâl di spaziadure e cun 100kHz di diference tra la frecuence minime e chê massime</string>
+    <string name="save_record_file">File di regjistrazion FM salvât su \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nissune stazion compatibile cjatade</string>
+    <string name="typ_All_stations">Dutis lis stazions</string>
+    <string name="typ_Culture">Culture</string>
+    <string name="typ_Current_affairs">Atualitât</string>
+    <string name="typ_Children">Programs par fruts</string>
+    <string name="typ_Country">Musiche country</string>
+    <string name="typ_Documentary">Documentari</string>
+    <string name="typ_Drama">Recitazion</string>
+    <string name="typ_Easy_listening">Musiche di intratigniment</string>
+    <string name="typ_Education">Educazion</string>
+    <string name="typ_Emergency">Emergjence</string>
+    <string name="typ_Emergency_test">Prove di emergjence</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Musiche folk</string>
+    <string name="typ_Information">Informazion</string>
+    <string name="typ_Jazz">Musiche jazz</string>
+    <string name="typ_Light_classical">Musiche classiche lizere</string>
+    <string name="typ_Leisure">Timp libar</string>
+    <string name="typ_News">Notiziis</string>
+    <string name="typ_National">Musiche nazionâl</string>
+    <string name="typ_Other">Altre musiche</string>
+    <string name="typ_Oldies">Cjançons vecjis</string>
+    <string name="typ_Phone_in">Cun telefonadis</string>
+    <string name="typ_Pop">Musiche pop</string>
+    <string name="typ_Religion">Religjon</string>
+    <string name="typ_Rock">Musiche rock</string>
+    <string name="typ_Science">Sience</string>
+    <string name="typ_Serious_classical">Musiche classiche</string>
+    <string name="typ_Social_affairs">Cuistions sociâls</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Viaçs</string>
+    <string name="typ_Varied">Variis</string>
+    <string name="typ_Weather">Meteorologjie</string>
+    <string name="typ_Adult_hits">Sucès par adults</string>
+    <string name="typ_Classical">Classiche</string>
+    <string name="typ_Classic_Rock">Rock classic</string>
+    <string name="typ_College">Universitarie</string>
+    <string name="typ_Foreign_language">Lenghe foreste</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgjie</string>
+    <string name="typ_Personality">Personalitât</string>
+    <string name="typ_Public">Publiche</string>
+    <string name="typ_Religious_music">Musiche religjose</string>
+    <string name="typ_Religious_talk">Discors religjôs</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Musiche spagnole</string>
+    <string name="typ_Spanish_talk">Conversazion spagnole</string>
+    <string name="typ_Soft">Rilassant</string>
+    <string name="typ_Soft_Rock">Soft rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sports</string>
+    <string name="typ_Talk">Conversazion</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-fy-rNL/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-fy-rNL/arrays.xml
index cb1457b..e6e986b 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-fy-rNL/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuten</item>
+    <item>15 minuten</item>
+    <item>30 minuten</item>
+    <item>Until stopped</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuten</item>
+    <item>30 minuten</item>
+    <item>45 minuten</item>
+    <item>1 oere</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-fy-rNL/strings.xml b/fmapp2/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..cf52683
--- /dev/null
+++ b/fmapp2/res/values-fy-rNL/strings.xml
@@ -0,0 +1,232 @@
+<?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-stjoerder</string>
+    <string name="menu_scan_start">Sykje</string>
+    <string name="menu_scan_stop">Sykjen annulearje</string>
+    <string name="menu_record_start">Opnimme</string>
+    <string name="menu_record_stop">Opnimmen stopje</string>
+    <string name="menu_settings">Ynstellingen</string>
+    <string name="menu_sleep">Sliepstân</string>
+    <string name="menu_sleep_cancel">Sliepstân annulearje</string>
+    <string name="menu_all_channels">Alle kanalen</string>
+    <string name="menu_display_tags">Labels toane</string>
+    <string name="button_text_stop">Stopje</string>
+    <string name="msg_seeking">FM-stjoerder sykje\u2026</string>
+    <string name="msg_scanning">Alle FM-stjoerders sykje\u2026</string>
+    <string name="msg_scanning_pty">\'<xliff:g id="pty_name">%1$s</xliff:g>\' sykje\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Automatysk favoriten selektearje</string>
+    <string name="msg_searching">Sykje nei goed berikbere stjoerders foar favoritelist\u2026</string>
+    <string name="msg_noantenna">Slút in koptelefoan oan om de FM-radio te brûken</string>
+    <string name="dialog_sleep_title">Slaaptiid</string>
+    <string name="presetlist_select_name">‘<xliff:g id="presetlist_name">%1$s</xliff:g>’ selektearje</string>
+    <string name="presetlist_add_new">Nije list tafoegje</string>
+    <string name="dialog_presetlist_rename_title">Namme ynfiere</string>
+    <string name="presetlist_autoselect_title">Automatyske seleksje befêstigje</string>
+    <string name="preset_replace">Ferfange</string>
+    <string name="preset_tune">Ofstimme</string>
+    <string name="preset_rename">Omneame</string>
+    <string name="preset_delete">Fuortsmite</string>
+    <string name="preset_search">‘<xliff:g id="preset_pi">%1$s</xliff:g>’ sykje</string>
+    <string name="stat_notif_frequency">‘<xliff:g id="frequency">%1$s</xliff:g>’ MHz</string>
+    <string name="regional_band">Regionale bân</string>
+    <string name="regional_band_entry_north_america">Noard-Amearika</string>
+    <string name="regional_band_entry_europe">Jeropa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (wide)</string>
+    <string name="regional_band_entry_australia">Austraalje</string>
+    <string name="regional_band_entry_austria">Eastenryk</string>
+    <string name="regional_band_entry_belgium">Belgje</string>
+    <string name="regional_band_entry_brazil">Brazylje</string>
+    <string name="regional_band_entry_china">Sina</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Denemark</string>
+    <string name="regional_band_entry_finland">Finlân</string>
+    <string name="regional_band_entry_france">Frankryk</string>
+    <string name="regional_band_entry_germany">Dútslân</string>
+    <string name="regional_band_entry_greece">Grikelân</string>
+    <string name="regional_band_entry_hong_kong">Hongkong</string>
+    <string name="regional_band_entry_india">Yndia</string>
+    <string name="regional_band_entry_indonesia">Yndoneezje</string>
+    <string name="regional_band_entry_ireland">Ierlân</string>
+    <string name="regional_band_entry_italy">Itaalje</string>
+    <string name="regional_band_entry_korea">Koreä</string>
+    <string name="regional_band_entry_mexico">Meksiko</string>
+    <string name="regional_band_entry_netherlands">Nederlân</string>
+    <string name="regional_band_entry_new_zealand">Nij-Seelân</string>
+    <string name="regional_band_entry_norway">Noarwegen</string>
+    <string name="regional_band_entry_poland">Poalen</string>
+    <string name="regional_band_entry_portugal">Portegal</string>
+    <string name="regional_band_entry_russia">Ruslân</string>
+    <string name="regional_band_entry_singapore">Singapoer</string>
+    <string name="regional_band_entry_slovakia">Slowakije</string>
+    <string name="regional_band_entry_spain">Spanje</string>
+    <string name="regional_band_entry_switzerland">Switserlân</string>
+    <string name="regional_band_entry_sweden">Sweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkije</string>
+    <string name="regional_band_entry_united_kingdom">Feriene Keninkryk</string>
+    <string name="regional_band_entry_united_states">Feriene Steaten</string>
+    <string name="regional_band_entry_user_defined">User defined band</string>
+    <string name="regional_band_summary_north_america">Noard-Amearika (87,5 MHz oant 108,0 MHz yn stappen fan 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japan (76,0 MHz oant 90,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japan (breed) (90,0 MHz oant 108,0 MHz yn stappen fan 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australië (87,7 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_austria">Eastenryk (87,5 MHz oant 108,0 MHz yn stappen fan 50 kHz)</string>
+    <string name="regional_band_summary_belgium">België (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brazilië (87,5 MHz oant 108,0 MHz yn stappen fan 200 kHz)</string>
+    <string name="regional_band_summary_china">Sina (87,0 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Tsjechië (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Denemarken (87,5 MHz oant 108,0 MHz yn stappen fan 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlân (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_france">Frankryk (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_germany">Dútslân (87,5 MHz oant 108,0 MHz yn stappen fan 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grikelân (87,5 MHz oant 108,0 MHz yn stappen fan 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_india">Yndia (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Yndonezië (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Ierlân (87,5 MHz oant 108,0 MHz yn stappen fan 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italië (87,5 MHz oant 108,0 MHz yn stappen fan 50 kHz)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 MHz oant 108,0 MHz yn stappen fan 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Meksiko (88,1 MHz oant 107,9 MHz yn stappen fan 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Nederlân (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Nij Seelân (88,0 MHz oant 107,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_norway">Noarwegen (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_poland">Poalen (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 MHz oant 108,0 MHz yn stappen fan 50 kHz)</string>
+    <string name="regional_band_summary_russia">Ruslân (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapoer (88,0 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Slowakije (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_spain">Spanje (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Switserlân (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Sweden (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turkije (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Ferienige Keninkryk (87,5 MHz oant 108,0 MHz yn stappen fan 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Ferienige Steaten (88,1 MHz oant 107,9 MHz yn stappen fan 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Oanpaste bân</string>
+    <string name="aud_output_mode">Audio-útfiermodus</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Opnamedoer</string>
+    <string name="auto_select_af">Alternative frekwinsje</string>
+    <string name="settings_revert_defaults_title">Fabryksynstellingen opnij ynstelle</string>
+    <string name="settings_revert_defaults_summary">Alles opnij ynstelle</string>
+    <string name="settings_revert_confirm_title">Opnij ynstelle befêstigje</string>
+    <string name="settings_revert_confirm_msg">Dit sil alle ynstellingen fuortsmite ynklusyf bewarre favoriten. Trochgean?</string>
+    <string name="no_storage">Pleats SD-kaart om opnimme te kinnen.</string>
+    <string name="preparing_sd">SD-kaart tariede\u2026</string>
+    <string name="access_sd_fail">Gjin tagong ta SD-kaart.</string>
+    <string name="spaceIsLow_content">Jo SD-kaart is hast fol. Ferminderje de opnamekwaliteit of smyt bestannen fuort om romte frij te meitsjen.</string>
+    <string name="FMRecording_reach_size_limit">Opnamelimyt berikke.</string>
+    <string name="menu_scan_for_preset">Favoriten sykje</string>
+    <string name="fm_off">FM is útskeakele.</string>
+    <string name="fm_call">FM kin net brûkt wurde wylst it bellen.</string>
+    <string name="alert_dialog_hint">Namme ynfiere</string>
+    <string name="search_dialog_title">Stjoerders sykje</string>
+    <string name="fm_command_timeout_title">Time-out</string>
+    <string name="fm_tune_timeout_msg">Gjin FM-stjoerders ûntfongen. As it probleem bestean bliuwt, skeakel FM-radio út en oan.</string>
+    <string name="fm_command_failed_title">FM-bewurking mislearre</string>
+    <string name="fm_cmd_failed_msg">FM-bewurking mislearre. As it probleem bestean bliuwt, skeakel FM-radio út en oan.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-bewurking mislearre. FM en HDMI tagelyk wurdt net stipe.</string>
+    <string name="fm_cmd_failed_call_on">FM-bewurking mislearre. FM audio net tastien wylst in telefoanpetear.</string>
+    <string name="audio_db_artist_name">Myn FM-opnamen</string>
+    <string name="audio_db_album_name">FM-opnamen</string>
+    <string name="audio_db_playlist_name">FM-opnamen</string>
+    <string name="station_name">Stjoerder:</string>
+    <string name="station_exists">Dizze frekwinsje bestiet al!</string>
+    <string name="station_list_delete_station">Fuortsmite: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Binne jo wis dat jo ‘<xliff:g id="name">%s</xliff:g>’ fuortsmite wolle?</string>
+    <string name="station_name_empty">Stjoerdernamme is leech, opnij ynfiere.</string>
+    <string name="station_name_exist">‘<xliff:g id="name">%s</xliff:g>’ is al yn gebrûk, fier in oare namme yn.</string>
+    <string name="rt_plus_tags">Labels</string>
+    <string name="usr_def_band_min">Leechste frekwinsje (MHz)</string>
+    <string name="usr_def_band_max">Heechste frekwinsje (MHz)</string>
+    <string name="chanl_spacing">Kanaalôfstân</string>
+    <string name="set">Ynstelle</string>
+    <string name="user_defind_band_msg">Fier in frekwinsje yn tusken 76.0 en 108.0 MHz mei in tuskenromte fan in kanaal en 100 KHz romte tusken minimale en maksimale frekwinsje</string>
+    <string name="save_record_file">FM-opname bewarre yn ‘<xliff:g id="record_file">%1$s</xliff:g>’</string>
+    <string name="fm_search_no_results">Gjin stjoerders fûn</string>
+    <string name="typ_All_stations">Alle stjoerders</string>
+    <string name="typ_Culture">Kultuer</string>
+    <string name="typ_Current_affairs">Aktualiteiten</string>
+    <string name="typ_Children">Berneprogramma\'s</string>
+    <string name="typ_Country">Countrymuzyk</string>
+    <string name="typ_Documentary">Dokumintêre</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy listening</string>
+    <string name="typ_Education">Edukatyf</string>
+    <string name="typ_Emergency">Needgefal</string>
+    <string name="typ_Emergency_test">Needgefallentest</string>
+    <string name="typ_Finance">Finansjeel</string>
+    <string name="typ_Folk">Folksmuzyk</string>
+    <string name="typ_Information">Ynformaasje</string>
+    <string name="typ_Jazz">Jazz</string>
+    <string name="typ_Light_classical">Ljocht klassyk</string>
+    <string name="typ_Leisure">Untspanning</string>
+    <string name="typ_News">Nijs</string>
+    <string name="typ_National">Nasjonale muzyk</string>
+    <string name="typ_Other">Oare muzyk</string>
+    <string name="typ_Oldies">Oldies</string>
+    <string name="typ_Phone_in">Ynbelle</string>
+    <string name="typ_Pop">Popmuzyk</string>
+    <string name="typ_Religion">Religieus</string>
+    <string name="typ_Rock">Rock</string>
+    <string name="typ_Science">Wittenskiplik</string>
+    <string name="typ_Serious_classical">Serieus klassyk</string>
+    <string name="typ_Social_affairs">Sosjale saken</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Reizigje</string>
+    <string name="typ_Varied">Fariearre</string>
+    <string name="typ_Weather">Waar</string>
+    <string name="typ_Adult_hits">Hits</string>
+    <string name="typ_Classical">Klassyk</string>
+    <string name="typ_Classic_Rock">Klassike rock</string>
+    <string name="typ_College">Kampusradio</string>
+    <string name="typ_Foreign_language">Frjemde talen</string>
+    <string name="typ_Hiphop">Hiphop</string>
+    <string name="typ_Nostalgia">Nostalgysk</string>
+    <string name="typ_Personality">Persoanlikheid</string>
+    <string name="typ_Public">Iepenbier</string>
+    <string name="typ_Religious_music">Religieus</string>
+    <string name="typ_Religious_talk">Religieus sprutsen</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm en blues</string>
+    <string name="typ_Spanish_music">Spaanske muzyk</string>
+    <string name="typ_Spanish_talk">Spaansktalich</string>
+    <string name="typ_Soft">Ljochte muzyk</string>
+    <string name="typ_Soft_Rock">Softrock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm en blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Sprutsen</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-gd/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-gd/arrays.xml
index cb1457b..aedd0bf 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-gd/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 mionaidean</item>
+    <item>Cairteal na h-uarach</item>
+    <item>Leth-uair a thìde</item>
+    <item>Gus an stadar e</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>Cairteal na h-uarach</item>
+    <item>Leth-uair a thìde</item>
+    <item>Trì cairteal na h-uarach</item>
+    <item>1 uair a thìde</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-gd/strings.xml b/fmapp2/res/values-gd/strings.xml
new file mode 100644
index 0000000..163a6c6
--- /dev/null
+++ b/fmapp2/res/values-gd/strings.xml
@@ -0,0 +1,233 @@
+<?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">Rèidio FM</string>
+    <string name="tx_app_name">Craoladair FM</string>
+    <string name="menu_scan_start">Sganaich</string>
+    <string name="menu_scan_stop">Sguir dhen lorg</string>
+    <string name="menu_record_start">Clàraich</string>
+    <string name="menu_record_stop">Sguir dhen chlàradh</string>
+    <string name="menu_settings">Roghainnean</string>
+    <string name="menu_sleep">Cadal</string>
+    <string name="menu_sleep_cancel">Sguir dhen chadal</string>
+    <string name="menu_all_channels">A h-uile seanail</string>
+    <string name="menu_display_tags">Seall na tagaichean</string>
+    <string name="button_text_stop">Cuir stad air</string>
+    <string name="msg_seeking">A’ lorg an stèisein FM\u2026</string>
+    <string name="msg_scanning">A’ lorg gach stèisean FM\u2026</string>
+    <string name="msg_scanning_pty">A’ sganadh airson “<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">A’ fèin-taghadh nan ro-sheata</string>
+    <string name="msg_searching">A’ lorg stèiseanan le siognail làidir airson liosta ro-sheataichean a chruthachadh\u2026</string>
+    <string name="msg_noantenna">Cuir a-steach seata-cinn airson èisteachd ri rèidio FM</string>
+    <string name="dialog_sleep_title">Ùine cadail a’ chuir dheth fhèin-obrachail</string>
+    <string name="presetlist_select_name">Tagh “<xliff:g id="presetlist_name">%1$s</xliff:g>”</string>
+    <string name="presetlist_add_new">Cuir liosta ùr ris</string>
+    <string name="dialog_presetlist_rename_title">Cuir a-steach ainm</string>
+    <string name="presetlist_autoselect_title">Dearbh am fèin-taghadh</string>
+    <string name="preset_replace">Cuir ’na àite</string>
+    <string name="preset_tune">Lorg stèiseanan</string>
+    <string name="preset_rename">Thoir ainm ùr air</string>
+    <string name="preset_delete">Sguab às</string>
+    <string name="preset_search">Lorg “<xliff:g id="preset_pi">%1$s</xliff:g>”</string>
+    <string name="stat_notif_frequency">“<xliff:g id="frequency">%1$s</xliff:g>” MHz</string>
+    <string name="regional_band">Bann ionadail</string>
+    <string name="regional_band_entry_north_america">Aimeireaga a Tuath</string>
+    <string name="regional_band_entry_europe">An Roinn-Eòrpa</string>
+    <string name="regional_band_entry_japan">An t-Seapan</string>
+    <string name="regional_band_entry_japan_wide">An t-Seapan (leathann)</string>
+    <string name="regional_band_entry_australia">Astràilia</string>
+    <string name="regional_band_entry_austria">An Ostair</string>
+    <string name="regional_band_entry_belgium">A’ Bheilg</string>
+    <string name="regional_band_entry_brazil">A’ Bhraisil</string>
+    <string name="regional_band_entry_china">An t-Sìn</string>
+    <string name="regional_band_entry_czech_republic">Poblachd na Seice</string>
+    <string name="regional_band_entry_denmark">An Danmhairg</string>
+    <string name="regional_band_entry_finland">An Fhionnlann</string>
+    <string name="regional_band_entry_france">An Fhraing</string>
+    <string name="regional_band_entry_germany">A’ Ghearmailt</string>
+    <string name="regional_band_entry_greece">A’ Ghreug</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Na h-Innseachan</string>
+    <string name="regional_band_entry_indonesia">An Innd-Innse</string>
+    <string name="regional_band_entry_ireland">Èirinn</string>
+    <string name="regional_band_entry_italy">An Eadailt</string>
+    <string name="regional_band_entry_korea">Coirèa</string>
+    <string name="regional_band_entry_mexico">Meagsago</string>
+    <string name="regional_band_entry_netherlands">Na Tìrean Ìsle</string>
+    <string name="regional_band_entry_new_zealand">Sealainn Nuadh</string>
+    <string name="regional_band_entry_norway">Nirribhidh</string>
+    <string name="regional_band_entry_poland">A’ Phòlainn</string>
+    <string name="regional_band_entry_portugal">A’ Phortagail</string>
+    <string name="regional_band_entry_russia">An Ruis</string>
+    <string name="regional_band_entry_singapore">Singeapòr</string>
+    <string name="regional_band_entry_slovakia">An t-Slòbhac</string>
+    <string name="regional_band_entry_spain">An Spàinnt</string>
+    <string name="regional_band_entry_switzerland">An Eilbheis</string>
+    <string name="regional_band_entry_sweden">An t-Suain</string>
+    <string name="regional_band_entry_taiwan">Taidh-Bhàn</string>
+    <string name="regional_band_entry_turkey">An Tuirc</string>
+    <string name="regional_band_entry_united_kingdom">An Rìoghachd Aonaichte</string>
+    <string name="regional_band_entry_united_states">Na Stàitean Aonaichte</string>
+    <string name="regional_band_entry_user_defined">Bann air a shònrachadh leis a’ chleachdaiche</string>
+    <string name="regional_band_summary_north_america">Aimeireaga a Tuath (87.5 gu 108.0 MHz ann an ceuman 200 kHz)</string>
+    <string name="regional_band_summary_europe">An Roinn-Eòrpa (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_japan">An t-Seapan (76.0 gu 90.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">An t-Seapan (leathann) (90.0 gu 108.0 MHz ann an ceuman 50 kHz)</string>
+    <string name="regional_band_summary_australia">Astràilia (87.7 gu 108.0MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_austria">An Ostair (87.5 gu 108.0 MHz ann an ceuman 50 kHz)</string>
+    <string name="regional_band_summary_belgium">A’ Bheilg (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Braisil (87.5 gu 108.0 MHz ann an ceuman 200 kHz)</string>
+    <string name="regional_band_summary_china">An t-Sìn (87.0 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Poblachd na Seice (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_denmark">An Danmhairg (87.5 gu 108.0 MHz ann an ceuman 50 kHz)</string>
+    <string name="regional_band_summary_finland">Fionnlann (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_france">An Fhraing (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_germany">A’ Ghearmailt (87.5 gu 108.0 MHz ann an ceuman 50 kHz)</string>
+    <string name="regional_band_summary_greece">A’ Ghreug (87.5 gu 108.0 MHz ann an ceuman 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 gu 108.0MHz ann an ceuman 100KHz)</string>
+    <string name="regional_band_summary_india">Na h-Innseachan (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Na h-Innd-Innse (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Èirinn (87.5 gu 108.0 MHz ann an ceuman 50 kHz)</string>
+    <string name="regional_band_summary_italy">An Eadailt (87.5 gu 108.0 MHz ann an ceuman 50 kHz)</string>
+    <string name="regional_band_summary_korea">Coirèa (87.5 gu 108.0 MHz ann an ceuman 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Meagsago (88.1 gu 107.9 MHz ann an ceuman 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Na Tìrean Ìsle (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Sealainn Nuadh (88.0 gu 107.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_norway">Nirribhidh (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_poland">A’ Phòlainn (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_portugal">A’ Phortagail (87.5 gu 108.0 MHz ann an ceuman 50 kHz)</string>
+    <string name="regional_band_summary_russia">An Ruis (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singeapòr (88.0 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">An t-Slòbhac (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_spain">An Spàinnt (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">An Eilbheis (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_sweden">An t-Suain (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taidh-Bhàn (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_turkey">An Tuirc (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">An Rìoghachd Aonaichte (87.5 gu 108.0 MHz ann an ceuman 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Na Stàitean Aonaichte (88.1 gu 107.9 MHz ann an ceuman 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Bann gnàthaichte a’ chleachdaiche</string>
+    <string name="aud_output_mode">Modh às-chur fuaime</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Faid a’ chlàraidh</string>
+    <string name="auto_select_af">Tricead eile</string>
+    <string name="settings_revert_defaults_title">Till gu bun-roghainnean an fhactaraidh</string>
+    <string name="settings_revert_defaults_summary">Ath-shuidhich a h-uile roghainn</string>
+    <string name="settings_revert_confirm_title">Dearbh an t-ath-shuidheachadh</string>
+    <string name="settings_revert_confirm_msg">Falamhaichidh seo gach roghainn na h-aplacaid, a’ gabhail a-staigh ro-sheataichean a chaidh a shàbhaladh. A bheil thu airson leantainn air adhart?</string>
+    <string name="no_storage">Munntaich cairt SD mus tòisich thu air a’ chlàradh.</string>
+    <string name="preparing_sd">Ag ullachadh a’ chairt SD…</string>
+    <string name="access_sd_fail">Cha b’ urrainn dhuinn a’ chairt SD inntrigeadh.</string>
+    <string name="spaceIsLow_content">Tha an stòras gu bhith a’ ruith air a’ chairt SD agad. Atharraich roghainn na càileachd no sguab às faidhle no dhà eile a shaoradh àite.</string>
+    <string name="FMRecording_reach_size_limit">Ràinig thu crìoch a’ mheud.</string>
+    <string name="menu_scan_for_preset">Sganaich airson ro-sheataichean</string>
+    <string name="fm_off">Chaidh FM a chur dheth.</string>
+    <string name="fm_call">Chan urrainn dhut FM a chleachdadh rè gairme.</string>
+    <string name="alert_dialog_hint">Cuir ainm a-steach</string>
+    <string name="search_dialog_title">Sganaich airson stèiseanan</string>
+    <string name="fm_command_timeout_title">Crìoch-ùine</string>
+    <string name="fm_tune_timeout_msg">Cha d’ fhuair sinn freagairt airson stèisean FM a lorg. Ma mhaireas an duilgheadas, cuir FM dheth is air a-rithist.</string>
+    <string name="fm_command_failed_title">Dh’fhàillig le obrachadh FM</string>
+    <string name="fm_cmd_failed_msg">Dh’fhàillig le obrachadh FM. Ma mhaireas an duilgheadas, cuir FM dheth is air a-rithist.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Dh’fhàillig le obrachadh FM. Cha chuir sinn taic ri FM ’s HDMI aig an aon àm.</string>
+    <string name="fm_cmd_failed_call_on">Dh’fhàillig le obrachadh FM. Chan eil fuaim FM ceadaichte rè gairme.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Na clàraidhean FM agam</string>
+    <string name="audio_db_album_name">Clàraidhean FM</string>
+    <string name="audio_db_playlist_name">Clàraidhean FM</string>
+    <string name="station_name">Stèisean:</string>
+    <string name="station_exists">Tha an tricead seo ann mu thràth!</string>
+    <string name="station_list_delete_station">Sguab às: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">A bheil thu cinnteach gu bheil thu airson “<xliff:g id="name">%s</xliff:g>” a sguabadh às?</string>
+    <string name="station_name_empty">Tha ainm an stèisean bàn, an cuir thu a-steach e a-rithist?</string>
+    <string name="station_name_exist">Tha “<xliff:g id="name">%s</xliff:g>” ’ga chleachdadh mu thràth, cuir a-steach ainm eile.</string>
+    <string name="rt_plus_tags">Tagaichean</string>
+    <string name="usr_def_band_min">An tricead as ìsle (MHz)</string>
+    <string name="usr_def_band_max">An tricead as àirde (MHz)</string>
+    <string name="chanl_spacing">Beàrnan eadar seanailean</string>
+    <string name="set">Suidhich</string>
+    <string name="user_defind_band_msg">Cuir a-steach tricead eadar 76.0 ’s 108.0 MHz le beàrnadh sheanailean dhe 1 air a char as lugha agus 100 kHz a bheàrn eadar an tricead as lugha is as motha</string>
+    <string name="save_record_file">Chaidh faidhle clàradh FM a shàbhaladh gu “<xliff:g id="record_file">%1$s</xliff:g>”</string>
+    <string name="fm_search_no_results">Cha deach stèisean co-chòrdail a lorg</string>
+    <string name="typ_All_stations">A h‑uile stèisean</string>
+    <string name="typ_Culture">Cultar</string>
+    <string name="typ_Current_affairs">Cùisean làitheil</string>
+    <string name="typ_Children">Prògraman cloinne</string>
+    <string name="typ_Country">Tuath-cheòl</string>
+    <string name="typ_Documentary">Aithriseach</string>
+    <string name="typ_Drama">Dràma</string>
+    <string name="typ_Easy_listening">Ceòl aotrom</string>
+    <string name="typ_Education">Foghlam</string>
+    <string name="typ_Emergency">Èiginn</string>
+    <string name="typ_Emergency_test">Deuchainn-èiginn</string>
+    <string name="typ_Finance">Ionmhas</string>
+    <string name="typ_Folk">Ceòl-dùthcha</string>
+    <string name="typ_Information">Fiosrachadh</string>
+    <string name="typ_Jazz">Ceòl jazz</string>
+    <string name="typ_Light_classical">Ceòl clasaigeach aotrom</string>
+    <string name="typ_Leisure">Cur-seachad</string>
+    <string name="typ_News">Naidheachdan</string>
+    <string name="typ_National">Ceòl nàiseanta</string>
+    <string name="typ_Other">Ceòl eile</string>
+    <string name="typ_Oldies">Oldies</string>
+    <string name="typ_Phone_in">Fònadh a-steach</string>
+    <string name="typ_Pop">Ceòl pop</string>
+    <string name="typ_Religion">Creideamh</string>
+    <string name="typ_Rock">Ceòl ròc</string>
+    <string name="typ_Science">Saidheans</string>
+    <string name="typ_Serious_classical">Ceòl clasaigeach trom-chùiseach</string>
+    <string name="typ_Social_affairs">Cùisean sòisealta</string>
+    <string name="typ_Sport">Spòrs</string>
+    <string name="typ_Travel">Siubhal</string>
+    <string name="typ_Varied">Measgaichte</string>
+    <string name="typ_Weather">An aimsir</string>
+    <string name="typ_Adult_hits">Hits do dh’inbhich</string>
+    <string name="typ_Classical">Clasaigeach</string>
+    <string name="typ_Classic_Rock">Ròc clasaigeach</string>
+    <string name="typ_College">Colaiste</string>
+    <string name="typ_Foreign_language">Cànan cèin</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">An uair a bha siud</string>
+    <string name="typ_Personality">Pearsantachd</string>
+    <string name="typ_Public">Poblach</string>
+    <string name="typ_Religious_music">Ceòl cràbhach</string>
+    <string name="typ_Religious_talk">Deasbaireachd chràbhach</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm ⁊ Blues</string>
+    <string name="typ_Spanish_music">Ceòl san Spàinntis</string>
+    <string name="typ_Spanish_talk">Deasbaireachd san Spàinntis</string>
+    <string name="typ_Soft">Bog</string>
+    <string name="typ_Soft_Rock">Ròc bog</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm ⁊ Blues bog</string>
+    <string name="typ_Sports">Spòrs</string>
+    <string name="typ_Talk">Deasbaireachd</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-gl/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-gl/arrays.xml
index cb1457b..d80e961 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-gl/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Estéreo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Estéreo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>Ata que o pare</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>45 minutos</item>
+    <item>1 hora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-gl/strings.xml b/fmapp2/res/values-gl/strings.xml
new file mode 100644
index 0000000..88b4bdf
--- /dev/null
+++ b/fmapp2/res/values-gl/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Transistor de FM</string>
+    <string name="menu_scan_start">Escanear</string>
+    <string name="menu_scan_stop">Deter a busca</string>
+    <string name="menu_record_start">Gravar</string>
+    <string name="menu_record_stop">Deter a gravación</string>
+    <string name="menu_settings">Configuración</string>
+    <string name="menu_sleep">Durmir</string>
+    <string name="menu_sleep_cancel">Cancelar a suspensión</string>
+    <string name="menu_all_channels">Todas as canles</string>
+    <string name="menu_display_tags">Amosar etiquetas</string>
+    <string name="button_text_stop">Deter</string>
+    <string name="msg_seeking">Buscando emisora FM\u2026</string>
+    <string name="msg_scanning">Buscando todas as emisoras FM\u2026</string>
+    <string name="msg_scanning_pty">Buscando \'<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">Seleccionando predefinidas automaticamente</string>
+    <string name="msg_searching">Buscando emisoras con boa recepción para crear a lista de predefinidas\u2026</string>
+    <string name="msg_noantenna">Por favor enchufe uns auriculares para usar a radio FM</string>
+    <string name="dialog_sleep_title">Desactivación da hora de suspensión automática</string>
+    <string name="presetlist_select_name">Seleccionar «<xliff:g id="presetlist_name">%1$s</xliff:g>»</string>
+    <string name="presetlist_add_new">Engadir unha nova lista</string>
+    <string name="dialog_presetlist_rename_title">Escriba un nome</string>
+    <string name="presetlist_autoselect_title">Confirmar selección automática</string>
+    <string name="preset_replace">Substituír</string>
+    <string name="preset_tune">Sintonizar</string>
+    <string name="preset_rename">Renomear</string>
+    <string name="preset_delete">Eliminar</string>
+    <string name="preset_search">Buscar «<xliff:g id="preset_pi">%1$s</xliff:g>»</string>
+    <string name="stat_notif_frequency">«<xliff:g id="frequency">%1$s</xliff:g>» MHz</string>
+    <string name="regional_band">Banda rexional</string>
+    <string name="regional_band_entry_north_america">América do Norte</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Xapón</string>
+    <string name="regional_band_entry_japan_wide">Xapón (completo)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Bélxica</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">República Checa</string>
+    <string name="regional_band_entry_denmark">Dinamarca</string>
+    <string name="regional_band_entry_finland">Finlandia</string>
+    <string name="regional_band_entry_france">Francia</string>
+    <string name="regional_band_entry_germany">A Alemaña</string>
+    <string name="regional_band_entry_greece">Grecia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Corea</string>
+    <string name="regional_band_entry_mexico">México</string>
+    <string name="regional_band_entry_netherlands">Países Baixos</string>
+    <string name="regional_band_entry_new_zealand">Nova Zelandia</string>
+    <string name="regional_band_entry_norway">Noruega</string>
+    <string name="regional_band_entry_poland">Polonia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusia</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Eslovaquia</string>
+    <string name="regional_band_entry_spain">España</string>
+    <string name="regional_band_entry_switzerland">Suíza</string>
+    <string name="regional_band_entry_sweden">Suecia</string>
+    <string name="regional_band_entry_taiwan">Taiwán</string>
+    <string name="regional_band_entry_turkey">Turquía</string>
+    <string name="regional_band_entry_united_kingdom">Reino Unido </string>
+    <string name="regional_band_entry_united_states">Estados Unidos de Norteamérica</string>
+    <string name="regional_band_entry_user_defined">Faixa definida polo usuario</string>
+    <string name="regional_band_summary_north_america">América do Norte (87.5 a 108.0 MHz en intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_japan">Xapón (76.0 a 90.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Xapón (completo) (90,0 a 108,0 MHz en intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_austria">Austria (87.5 a 108.0 MHz en intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Bélxica (87.5 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (87.5 a 108.0 MHz en intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_china">China (87.0 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">República checa (87.5 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Dinamarca (87.5 a 108.0 MHz en intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlandia (87.5 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_france">Francia (87.5 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_germany">Alemaña (87.5 a 108.0 MHz en intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grecia (87.5 a 108.0 MHz en intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_india">India (de 87.5 a 108.0M Hz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 a 108.0 MHz en intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (87.5 a 108.0 MHz en intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italia (87.5 MHz a 108.0 MHz en intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_korea">Corea (87.5 MHz a 108.0 MHz en intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_mexico">México (88.1 MHz a 107.9 MHz en intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Países Baixos (87.5 MHz a 108.0 MHz en intervalos de 100 kHzv)</string>
+    <string name="regional_band_summary_new_zealand">Nova Zelandia (88.0 MHz 107.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_norway">Noruega (87.5 MHz a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polonia (87.5 MHz a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 a 108.0 MHz en intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rusia (87.5 MHz a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapur (88.0 MHz a108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Eslovaquia (87.5 MHz a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_spain">España (87.5 a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Suíza (87.5 MHz a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Suecia (87.5 MHz a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwán (87.5 MHz a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turquía (87.5 MHz a 108.0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Reino Unido (87,5 MHz a 108,0 MHz en intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Estados Unidos (88.1 MHz a 107.9 MHz en intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Faixa definida polo usuario</string>
+    <string name="aud_output_mode">Modo de saída do son</string>
+    <string name="audio_type_stereo">Estéreo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Duración da gravación</string>
+    <string name="auto_select_af">Frecuencia alternativa</string>
+    <string name="settings_revert_defaults_title">Volver aos predeterminados pola fábrica</string>
+    <string name="settings_revert_defaults_summary">Restabelecer todos os axustes</string>
+    <string name="settings_revert_confirm_title">Confirmar o restabelecemento</string>
+    <string name="settings_revert_confirm_msg">Esta acción borrará todos os axustes da aplicación, incluso os predefinidos que teña gardados. Quere continuar?</string>
+    <string name="no_storage">Montar tarxeta SD antes de iniciar gravación.</string>
+    <string name="preparing_sd">Preparando a tarxeta SD\u2026</string>
+    <string name="access_sd_fail">Imposíbel acceder á tarxeta SD.</string>
+    <string name="spaceIsLow_content">A súa tarxeta de almacenaxe SD xa non ten espazo. Cambie o axuste de calidade ou elimine algúns ficheiros para liberar espazo.</string>
+    <string name="FMRecording_reach_size_limit">Acadouse o límite de tamaño.</string>
+    <string name="menu_scan_for_preset">Buscar predefinidas</string>
+    <string name="fm_off">O transmisor de FM está apagado.</string>
+    <string name="fm_call">Non se pode utilizar o FM en medio dunha chamada.</string>
+    <string name="alert_dialog_hint">Escriba un nome</string>
+    <string name="search_dialog_title">Buscar emisoras</string>
+    <string name="fm_command_timeout_title">Tempo esgotado</string>
+    <string name="fm_tune_timeout_msg">Non se recibiu resposta para sintonizar a estación de FM. De persistir o problema, apague a FM e volva acendela.</string>
+    <string name="fm_command_failed_title">Fallou a operación de FM</string>
+    <string name="fm_cmd_failed_msg">Fallou a operación de FM. Se o problema persiste, apague a FM e volva acendela.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Fallou a operación de FM. Non é compatíbel a concorrencia de FM con HDMI.</string>
+    <string name="fm_cmd_failed_call_on">Fallou a operación de FM. Non se permite que soe o transmisor de FM durante unha chamada.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">As miñas gravacións de radio</string>
+    <string name="audio_db_album_name">Gravacións de radio</string>
+    <string name="audio_db_playlist_name">Gravacións de radio</string>
+    <string name="station_name">Emisora:</string>
+    <string name="station_exists">Esta frecuencia xa existe!</string>
+    <string name="station_list_delete_station">Eliminar: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Confirma que quere eliminar «<xliff:g id="name">%s</xliff:g>»?</string>
+    <string name="station_name_empty">O nome da emisora está baleiro, escríbao outra vez.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' xa está en uso. Escriba outro nome.</string>
+    <string name="rt_plus_tags">Etiquetas</string>
+    <string name="usr_def_band_min">Frecuencia máis baixa (MHz)</string>
+    <string name="usr_def_band_max">Frecuencia máis alta (MHz)</string>
+    <string name="chanl_spacing">Espazamento da canle</string>
+    <string name="set">Estabelecer</string>
+    <string name="user_defind_band_msg">Inserir unha frecuencia entre 76.0 e 108.0 MHz polo menos cunha canle de espazo e 100 kHz entre a frecuencia mínima e a máxima</string>
+    <string name="save_record_file">Gravación de radio gardada en \"<xliff:g id="record_file">%1$s</xliff:g>\"</string>
+    <string name="fm_search_no_results">Non se atopou ningunha emisora compatíbel.</string>
+    <string name="typ_All_stations">Todas as emisoras</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Actualidade</string>
+    <string name="typ_Children">Programas infantís</string>
+    <string name="typ_Country">Música country</string>
+    <string name="typ_Documentary">Documental</string>
+    <string name="typ_Drama">Teatro</string>
+    <string name="typ_Easy_listening">Música lixeira</string>
+    <string name="typ_Education">Educación</string>
+    <string name="typ_Emergency">Emerxencia</string>
+    <string name="typ_Emergency_test">Proba de emerxencia</string>
+    <string name="typ_Finance">Economía</string>
+    <string name="typ_Folk">Música folk</string>
+    <string name="typ_Information">Información</string>
+    <string name="typ_Jazz">Música jazz</string>
+    <string name="typ_Light_classical">Clásica lixeira</string>
+    <string name="typ_Leisure">Lecer</string>
+    <string name="typ_News">Novas</string>
+    <string name="typ_National">Música nacional</string>
+    <string name="typ_Other">Outra música</string>
+    <string name="typ_Oldies">Música antiga</string>
+    <string name="typ_Phone_in">Por teléfono</string>
+    <string name="typ_Pop">Música pop</string>
+    <string name="typ_Religion">Relixión</string>
+    <string name="typ_Rock">Música rock</string>
+    <string name="typ_Science">Ciencia</string>
+    <string name="typ_Serious_classical">Clásica seria</string>
+    <string name="typ_Social_affairs">Temas sociais</string>
+    <string name="typ_Sport">Deportes</string>
+    <string name="typ_Travel">Viaxes</string>
+    <string name="typ_Varied">Variado</string>
+    <string name="typ_Weather">Tempo</string>
+    <string name="typ_Adult_hits">Éxitos de sempre</string>
+    <string name="typ_Classical">Clásica</string>
+    <string name="typ_Classic_Rock">Rock clásico</string>
+    <string name="typ_College">Universidade</string>
+    <string name="typ_Foreign_language">Lingua estranxeira</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalxia</string>
+    <string name="typ_Personality">Personalidade</string>
+    <string name="typ_Public">Público</string>
+    <string name="typ_Religious_music">Música relixiosa</string>
+    <string name="typ_Religious_talk">Conversa relixiosa</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Música española</string>
+    <string name="typ_Spanish_talk">Conversa en español</string>
+    <string name="typ_Soft">Suave</string>
+    <string name="typ_Soft_Rock">Rock suave</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rythm and Blues suave</string>
+    <string name="typ_Sports">Deportes</string>
+    <string name="typ_Talk">Tertulias</string>
+    <string name="typ_Top_40">Corenta principais</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-gu/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-gu/arrays.xml
index cb1457b..64c9dfa 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-gu/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>સ્ટીરિઓ</item>
+    <item>મોનો</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-gu/strings.xml b/fmapp2/res/values-gu/strings.xml
new file mode 100644
index 0000000..565d46c
--- /dev/null
+++ b/fmapp2/res/values-gu/strings.xml
@@ -0,0 +1,195 @@
+<?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 રેડીયો</string>
+    <string name="tx_app_name">FM ટ્રાન્સમિટર</string>
+    <string name="menu_scan_start">સ્કેન</string>
+    <string name="menu_scan_stop">સર્ચ કરવાનું બંધ કરો</string>
+    <string name="menu_record_start">રેકોર્ડ</string>
+    <string name="menu_record_stop">રેકોર્ડીંગ અટકાવો</string>
+    <string name="menu_settings">સેટિંગ્સ</string>
+    <string name="menu_sleep">સ્લીપ</string>
+    <string name="menu_sleep_cancel">સ્લીપ રદ કરો</string>
+    <string name="menu_all_channels">તમામ ચૅનલો</string>
+    <string name="menu_display_tags">ટૅગ દર્શાવો</string>
+    <string name="button_text_stop">રોકો</string>
+    <string name="msg_seeking">FM સ્ટેશન સર્ચ કરી રહ્યા છીએ\u2026</string>
+    <string name="msg_scanning">તમામ FM સ્ટેશનો માટે સ્કૅન થઈ રહ્યું છે\u2026</string>
+    <string name="msg_scanning_pty">\'<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">પ્રિસેટ્સ ઑટો-પસંદગી થઈ રહી છે</string>
+    <string name="msg_searching">પ્રિસેટ્સ સૂચી બનાવવા માટે શક્તિશાળી સ્ટેશનોની શોધ ચાલુ છે\u2026</string>
+    <string name="msg_noantenna">FM રેડિયો વાપરવા માટે કૃપા કરી હેડસેટ પ્લગ ઇન કરો</string>
+    <string name="dialog_sleep_title">ઑટો-ઓફ સ્લિપ ટાઇમ</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' પસંદ કરો</string>
+    <string name="presetlist_add_new">નવી સૂચી ઍડ કરો</string>
+    <string name="dialog_presetlist_rename_title">નામ દાખલ કરો</string>
+    <string name="presetlist_autoselect_title">સ્વતઃ-પસંદગીની પુષ્ટિ કરો</string>
+    <string name="preset_replace">બદલાવવું</string>
+    <string name="preset_tune">ટ્યૂન</string>
+    <string name="preset_rename">નામ બદલો</string>
+    <string name="preset_delete">હટાવો</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' માટે સર્ચ કરો</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">પ્રાદેશિક બૅન્ડ</string>
+    <string name="regional_band_entry_north_america">ઉત્તર અમેરિકા</string>
+    <string name="regional_band_entry_europe">યુરોપ</string>
+    <string name="regional_band_entry_japan">જાપાન</string>
+    <string name="regional_band_entry_japan_wide">જાપાન (ફરતે)</string>
+    <string name="regional_band_entry_australia">ઓસ્ટ્રેલિયા</string>
+    <string name="regional_band_entry_austria">ઑસ્ટ્રિયા</string>
+    <string name="regional_band_entry_belgium">બેલ્જીયમ</string>
+    <string name="regional_band_entry_brazil">બ્રાઝીલ</string>
+    <string name="regional_band_entry_china">ચીન</string>
+    <string name="regional_band_entry_czech_republic">ઝેક રિપબ્લિક</string>
+    <string name="regional_band_entry_denmark">ડેનમાર્ક</string>
+    <string name="regional_band_entry_finland">ફિનલૅન્ડ</string>
+    <string name="regional_band_entry_france">ફ્રાન્સ</string>
+    <string name="regional_band_entry_germany">જર્મની</string>
+    <string name="regional_band_entry_greece">ગ્રીસ</string>
+    <string name="regional_band_entry_hong_kong">હોંગ કોંગ</string>
+    <string name="regional_band_entry_india">ભારત</string>
+    <string name="regional_band_entry_indonesia">ઇન્ડોનેશિયા</string>
+    <string name="regional_band_entry_ireland">આયર્લેન્ડ</string>
+    <string name="regional_band_entry_italy">ઇટાલી</string>
+    <string name="regional_band_entry_korea">કોરિયા</string>
+    <string name="regional_band_entry_mexico">મેક્સિકો</string>
+    <string name="regional_band_entry_netherlands">નેદરલેન્ડઝ</string>
+    <string name="regional_band_entry_new_zealand">ન્યૂઝીલેન્ડ</string>
+    <string name="regional_band_entry_norway">નોર્વે</string>
+    <string name="regional_band_entry_poland">પોલેન્ડ</string>
+    <string name="regional_band_entry_portugal">પોર્ટુગલ</string>
+    <string name="regional_band_entry_russia">રશિયા</string>
+    <string name="regional_band_entry_singapore">સિંગાપોર</string>
+    <string name="regional_band_entry_slovakia">સ્લોવાકિયા</string>
+    <string name="regional_band_entry_spain">સ્પેઇન</string>
+    <string name="regional_band_entry_switzerland">સ્વિત્ઝરલૅન્ડ</string>
+    <string name="regional_band_entry_sweden">સ્વીડન</string>
+    <string name="regional_band_entry_taiwan">તાઇવાન</string>
+    <string name="regional_band_entry_turkey">તુર્કી</string>
+    <string name="regional_band_entry_united_kingdom">યુનાઇટેડ કિંગડમ</string>
+    <string name="regional_band_entry_united_states">યુનાઇટેડ સ્ટેટ્સ</string>
+    <string name="regional_band_entry_user_defined">ઉપયોગકર્તા વ્યાખ્યાયીત બેન્ડ</string>
+    <string name="regional_band_summary_user_defined">ઉપયોગકર્તા વ્યાખ્યાયીત બેન્ડ</string>
+    <string name="aud_output_mode">ઑડિયો આઉટપુટ મોડ</string>
+    <string name="audio_type_stereo">સ્ટીરિઓ</string>
+    <string name="audio_type_mono">મોનો</string>
+    <string name="record_dur">રેકોર્ડ સમયગાળો</string>
+    <string name="auto_select_af">વૈકલ્પિક ફ્રિકવન્સી</string>
+    <string name="settings_revert_defaults_title">ફેક્ટરી ડિફૉલ્ટ પર પાછા જાવ</string>
+    <string name="settings_revert_defaults_summary">તમામ સેટિંગ્સ રિસેટ કરો</string>
+    <string name="settings_revert_confirm_title">રિસેટની પુષ્ટિ કરો</string>
+    <string name="settings_revert_confirm_msg">આનાથી સેવ કરેલ પ્રિસેટ્સ સહિત તમામ ઍપ્લિકેશન સેટિંગ્સ સાફ થશે. ચાલુ રહેવા માંગો છો?</string>
+    <string name="no_storage">રેકૉર્ડિંગ શરૂ કરતા પહેલાં SD કાર્ડ માઉન્ટ કરો.</string>
+    <string name="preparing_sd">SD કાર્ડ તૈયાર કરવું\u2026</string>
+    <string name="access_sd_fail">SD કાર્ડનો વપરાશ કરી શકાયો નથી.</string>
+    <string name="spaceIsLow_content">તમારા SD કાર્ડ સંગ્રહમાં જગ્યા સમાપ્ત થવાના આરે છે. જગ્યા છૂટી કરવા ગુણવત્તા સેટિંગ પરિવર્તન કરો અથવા અમુક અન્ય ફાઇલ રદ કરો.</string>
+    <string name="FMRecording_reach_size_limit">કદ મર્યાદા પહોંચી ગયા.</string>
+    <string name="menu_scan_for_preset">પ્રિસેટ માટે સ્કૅન કરો</string>
+    <string name="fm_off">FM બંધ કરાયું છે.</string>
+    <string name="fm_call">કૉલિંગ કરતી વખતે FMનો ઉપયોગ થઈ શકે નહીં.</string>
+    <string name="alert_dialog_hint">નામ દાખલ કરો</string>
+    <string name="search_dialog_title">સ્ટેશનો સ્કૅન કરો</string>
+    <string name="fm_command_timeout_title">સમય સમાપ્ત</string>
+    <string name="fm_tune_timeout_msg">FM સ્ટેશન ટ્યૂન કરવા કોઇ પ્રતિભાવ પ્રાપ્ત ન થયો. જો સમસ્યા ચાલુ રહે તો કૃપા કરી FM બંધ કરી ફરી ચાલુ કરો.</string>
+    <string name="fm_command_failed_title">FM ઑપરેશન નિષ્ફળ</string>
+    <string name="fm_cmd_failed_msg">FM ઑપરેશન નિષ્ફળ. જો સમસ્યા ચાલુ રહે તો કૃપા કરી FM બંધ કરી ફરી ચાલુ કરો.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM ઑપરેશન નિષ્ફળ. FM અને HDMI સમરૂપતાને સમર્થન નથી.</string>
+    <string name="fm_cmd_failed_call_on">FM ઑપરેશન નિષ્ફળ. કૉલ દરમિયાન FM ઑડિયોની છૂટ નથી.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">મારા FM રેકોર્ડિંગ્સ</string>
+    <string name="audio_db_album_name">FM રેકોર્ડિંગ્સ</string>
+    <string name="audio_db_playlist_name">FM રેકોર્ડિંગ્સ</string>
+    <string name="station_name">સ્ટેશન:</string>
+    <string name="station_exists">આ ફ્રીકવન્સિ અગાઉથી હાજર છે!</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="station_name_empty">સ્ટેશન નામ ખાલી છે, કૃપા કરી ફરી ઇનપુટ કરો.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' અગાઉથી વપરાશમાં છે કૃપા કરી અલગ નામ દાખલ કરો.</string>
+    <string name="rt_plus_tags">ટેગ</string>
+    <string name="usr_def_band_min">સૌથી નિમ્ન ફ્રિકવન્સિ (MHz)</string>
+    <string name="usr_def_band_max">ઉચ્ચતમ ફ્રિકવન્સિ (MHz)</string>
+    <string name="chanl_spacing">ચૅનલ સ્પેસિંગ</string>
+    <string name="set">સેટ કરો</string>
+    <string name="save_record_file">FM દ્વારા રેકૉર્ડ કરેલ ફાઇલ \'<xliff:g id="record_file">%1$s</xliff:g>\' પર સેવ થઈ</string>
+    <string name="fm_search_no_results">કોઇ સુસંગત સ્ટેશનો મળ્યાં નહીં</string>
+    <string name="typ_All_stations">તમામ સ્ટેશનો</string>
+    <string name="typ_Culture">સંસ્કારિતામાં એકરૂપ કરીને</string>
+    <string name="typ_Current_affairs">આજની ખબરો</string>
+    <string name="typ_Children">બાળ કાર્યક્રમો</string>
+    <string name="typ_Country">ગામઠી સંગીત</string>
+    <string name="typ_Documentary">ડોક્યુમેન્ટ્રી</string>
+    <string name="typ_Drama">ડ્રામા</string>
+    <string name="typ_Easy_listening">સરળ સંગીત શ્રવણ</string>
+    <string name="typ_Education">કેળવણી</string>
+    <string name="typ_Emergency">કટોકટી</string>
+    <string name="typ_Emergency_test">કટોકટી તપાસ</string>
+    <string name="typ_Finance">ફાઇનાન્સ</string>
+    <string name="typ_Folk">લોક સંગીત</string>
+    <string name="typ_Information">માહિતી</string>
+    <string name="typ_Jazz">જૅઝ મ્યુઝિક</string>
+    <string name="typ_Light_classical">હળવું શાસ્ત્રીય</string>
+    <string name="typ_Leisure">નવરાશ</string>
+    <string name="typ_News">સમાચાર</string>
+    <string name="typ_National">રાષ્ટ્રીય સંગીત</string>
+    <string name="typ_Other">અન્ય સંગીત</string>
+    <string name="typ_Oldies">ઑલ્ડીઝ મ્યુઝિક</string>
+    <string name="typ_Phone_in">ફોન ઇન</string>
+    <string name="typ_Pop">પૉપ મ્યુ્ઝિક</string>
+    <string name="typ_Religion">ધર્મ</string>
+    <string name="typ_Rock">રૉક મ્યુઝિક</string>
+    <string name="typ_Science">વિજ્ઞાન</string>
+    <string name="typ_Serious_classical">ગંભીર શાસ્ત્રીય</string>
+    <string name="typ_Social_affairs">સામાજિક બાબતો</string>
+    <string name="typ_Sport">રમતગમત</string>
+    <string name="typ_Travel">મુસાફરી</string>
+    <string name="typ_Varied">વિવિધ</string>
+    <string name="typ_Weather">હવામાન</string>
+    <string name="typ_Adult_hits">એડલ્ટ હિટ્સ</string>
+    <string name="typ_Classical">શાસ્ત્રીય</string>
+    <string name="typ_Classic_Rock">ક્લાસિક રૉક</string>
+    <string name="typ_College">કૉલેજ</string>
+    <string name="typ_Foreign_language">વિદેશી ભાષા</string>
+    <string name="typ_Hiphop">હિપ હોપ</string>
+    <string name="typ_Nostalgia">પુરાની યાદે</string>
+    <string name="typ_Personality">પર્સનાલિટી</string>
+    <string name="typ_Public">જાહેર</string>
+    <string name="typ_Religious_music">ધાર્મિક સંગીત</string>
+    <string name="typ_Religious_talk">ધાર્મિક પ્રવચનો</string>
+    <string name="typ_Rhythm_and_Blues">રિધમ એન્ડ બ્લૂઝ</string>
+    <string name="typ_Spanish_music">સ્પૅનિશ મ્યુઝિક</string>
+    <string name="typ_Spanish_talk">સ્પૅનિશ ટૉક</string>
+    <string name="typ_Soft">સૉફ્ટ</string>
+    <string name="typ_Soft_Rock">સૉફ્ટ રૉક</string>
+    <string name="typ_Soft_Rhythm_and_Blues">સૉફ્ટ રિધમ એન્ડ બ્લૂઝ</string>
+    <string name="typ_Sports">રમતગમતો</string>
+    <string name="typ_Talk">ટૉક</string>
+    <string name="typ_Top_40">ટોચના 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-hi/arrays.xml
similarity index 66%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-hi/arrays.xml
index cb1457b..c92daa1 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-hi/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>स्टीरियो</item>
+    <item>मोनो</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-hi/strings.xml b/fmapp2/res/values-hi/strings.xml
new file mode 100644
index 0000000..b8cf6c2
--- /dev/null
+++ b/fmapp2/res/values-hi/strings.xml
@@ -0,0 +1,133 @@
+<?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">एफएम रेडियो</string>
+    <string name="tx_app_name">एफएम ट्रांसमिटर</string>
+    <string name="menu_scan_start">स्कैन करें</string>
+    <string name="menu_scan_stop">खोजना बंद करें</string>
+    <string name="menu_record_start">रिकॉर्ड करें</string>
+    <string name="menu_settings">सेटिंग</string>
+    <string name="menu_sleep">नींद</string>
+    <string name="menu_sleep_cancel">नींद रद्द करें</string>
+    <string name="menu_all_channels">सभी चैनल</string>
+    <string name="menu_display_tags">टैग दिखाएँ</string>
+    <string name="button_text_stop">रुकें</string>
+    <string name="msg_seeking">एफएम स्टेशन खोजें\u2026</string>
+    <string name="msg_scanning">सभी एफएम स्टेशनों के लिए स्कैन कर रहे हैं\u2026</string>
+    <string name="msg_scanning_pty">\'<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">पूर्व-सेटों को अपने आप चयनित कर रहे हैं</string>
+    <string name="msg_searching">पूर्व-सेट सूची निर्मित करने के लिए प्रबल स्टेशनों को खोज रहे हैं\u2026</string>
+    <string name="msg_noantenna">एफएम रेडियो का उपयोग करने के लिए हैडसेट लगाएँ</string>
+    <string name="dialog_sleep_title">स्वतः बंद नींद समय</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' चुनें</string>
+    <string name="presetlist_add_new">नई सूची जोड़ें</string>
+    <string name="dialog_presetlist_rename_title">नाम दर्ज करें</string>
+    <string name="presetlist_autoselect_title">स्वतः चयन की पुष्टि करें</string>
+    <string name="preset_replace">बदलें</string>
+    <string name="preset_tune">ट्यून करें</string>
+    <string name="preset_delete">हटाएँ</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' के लिए खोजें</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">स्थानीय पट्टी</string>
+    <string name="regional_band_entry_north_america">उत्तर अमरीका</string>
+    <string name="regional_band_entry_europe">यूरोप</string>
+    <string name="regional_band_entry_japan">जापान</string>
+    <string name="regional_band_entry_japan_wide">जापान (विस्तृत)</string>
+    <string name="regional_band_entry_australia">ऑस्ट्रेलिया</string>
+    <string name="regional_band_entry_austria">ऑस्ट्रिया</string>
+    <string name="regional_band_entry_belgium">बेल्जियम</string>
+    <string name="regional_band_entry_brazil">ब्राज़ील</string>
+    <string name="regional_band_entry_china">चीन</string>
+    <string name="regional_band_entry_czech_republic">चेक गणराज्य</string>
+    <string name="regional_band_entry_denmark">डेनमार्क</string>
+    <string name="regional_band_entry_finland">फिनलैंड</string>
+    <string name="regional_band_entry_france">फ्रांस</string>
+    <string name="regional_band_entry_germany">जर्मनी</string>
+    <string name="regional_band_entry_greece">यूनान</string>
+    <string name="regional_band_entry_hong_kong">हांगकांग</string>
+    <string name="regional_band_entry_india">भारत</string>
+    <string name="regional_band_entry_indonesia">इंडोनेशिया</string>
+    <string name="regional_band_entry_ireland">आयरलैंड</string>
+    <string name="regional_band_entry_italy">इटली</string>
+    <string name="regional_band_entry_korea">कोरिया</string>
+    <string name="regional_band_entry_mexico">मेक्सिको</string>
+    <string name="regional_band_entry_netherlands">नेदरलैंड</string>
+    <string name="regional_band_entry_new_zealand">न्यूज़ीलैंड</string>
+    <string name="regional_band_entry_norway">नोर्वे</string>
+    <string name="regional_band_entry_poland">पोलैंड</string>
+    <string name="regional_band_entry_portugal">पुर्तगाल</string>
+    <string name="regional_band_entry_russia">रूस</string>
+    <string name="regional_band_entry_singapore">सिंगापुर</string>
+    <string name="regional_band_entry_slovakia">स्लोवाकिया</string>
+    <string name="regional_band_entry_spain">स्पेन</string>
+    <string name="regional_band_entry_switzerland">स्विट्ज़रलैंड</string>
+    <string name="regional_band_entry_sweden">स्वीडन</string>
+    <string name="regional_band_entry_taiwan">ताईवान</string>
+    <string name="regional_band_entry_turkey">तुर्की</string>
+    <string name="regional_band_entry_united_kingdom">युनाइटेड किंगडम</string>
+    <string name="regional_band_entry_united_states">युनाइटेड स्टेट्स</string>
+    <string name="regional_band_entry_user_defined">उपयोगकर्ता द्वारा परिभाषित पट्टी</string>
+    <string name="regional_band_summary_user_defined">उपयोगकर्ता द्वारा परिभाषित पट्टी</string>
+    <string name="aud_output_mode">ऑडियो आउटपुट मोड</string>
+    <string name="audio_type_stereo">स्टीरियो</string>
+    <string name="audio_type_mono">मोनो</string>
+    <string name="record_dur">रिकॉर्ड की अवधि</string>
+    <string name="auto_select_af">वैकल्पिक आवृत्ति</string>
+    <string name="settings_revert_defaults_title">कारखाना डिफ़ॉल्ट बहाल करें</string>
+    <string name="settings_revert_defaults_summary">सभी सेटिंग को रीसेट करें</string>
+    <string name="settings_revert_confirm_title">रीसेट की पुष्टि करें</string>
+    <string name="settings_revert_confirm_msg">इससे सभी अनुप्रयोग सेटिंग साफ़ हो जाएँगे, जिनमें सहेजे गए पूर्व-सेट भी शामिल हैं। आगे बढ़ें?</string>
+    <string name="no_storage">रिकॉर्ड करना शुरू करने से पहले एसडी कार्ड को माउंट करें।</string>
+    <string name="spaceIsLow_content">आपका एसडी कार्ड भरता जा रहा है। उसमें जगह बनाने के लिए गुणवत्ता सेटिंग को बदलें या कुछ फ़ाइलों को हटाएँ।</string>
+    <string name="menu_scan_for_preset">पूर्व-सेटों के लिए स्कैन करें</string>
+    <string name="fm_off">एफएम को बंद किया गया है।</string>
+    <string name="fm_call">कॉल करते समय एफएम का उपयोग नहीं किया जा सकता है।</string>
+    <string name="alert_dialog_hint">नाम दर्ज करें</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">एफएम प्रचालन विफल हुआ। एफएम और एचडीएमआई का एक साथ होना समर्थित नहीं है।</string>
+    <string name="fm_cmd_failed_call_on">एफएम प्रचालन विफल हुआ। कॉल के दौरान एफएम ऑडियो की अनुमति नहीं है।</string>
+    <string name="station_name">स्टेशन:</string>
+    <string name="station_exists">यह आवृत्ति पहले से ही मौजूद है।</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="station_name_empty">स्टेशन नाम खाली है, कृपया फिर से दर्ज करें।</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' पहले से ही उपयोग में है, कृपया कोई दूसरा नाम दर्ज करें।</string>
+    <string name="rt_plus_tags">टैग</string>
+    <string name="usr_def_band_min">न्यूनतम आवृत्ति (MHz)</string>
+    <string name="usr_def_band_max">उच्चतम आवृत्ति (MHz)</string>
+    <string name="chanl_spacing">चैनल रिक्ति</string>
+    <string name="set">सेट करें</string>
+    <string name="fm_search_no_results">कोई संगत स्टेशन नहीं मिले</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-hr/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-hr/arrays.xml
index cb1457b..255ca4b 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-hr/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuta</item>
+    <item>15 minuta</item>
+    <item>30 minuta</item>
+    <item>Dok se ne zaustavi</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuta</item>
+    <item>30 minuta</item>
+    <item>45 minuta</item>
+    <item>1 sat</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-hr/strings.xml b/fmapp2/res/values-hr/strings.xml
new file mode 100644
index 0000000..075374b
--- /dev/null
+++ b/fmapp2/res/values-hr/strings.xml
@@ -0,0 +1,233 @@
+<?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 odašiljač</string>
+    <string name="menu_scan_start">Skeniraj</string>
+    <string name="menu_scan_stop">Zaustavi pretragu</string>
+    <string name="menu_record_start">Snimi</string>
+    <string name="menu_record_stop">Zaustavi snimanje</string>
+    <string name="menu_settings">Postavke</string>
+    <string name="menu_sleep">Spavaj</string>
+    <string name="menu_sleep_cancel">Zaustavi spavanje</string>
+    <string name="menu_all_channels">Svi kanali</string>
+    <string name="menu_display_tags">Prikaži oznake</string>
+    <string name="button_text_stop">Zaustavi</string>
+    <string name="msg_seeking">Traženje FM postaje\u2026</string>
+    <string name="msg_scanning">Pretraživanje svih FM postaja\u2026</string>
+    <string name="msg_scanning_pty">Traženje \"<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">Automatski odabir postave</string>
+    <string name="msg_searching">Traženje jakih postaja da stvorimo popis postava\u2026</string>
+    <string name="msg_noantenna">Priključite slušalice da biste mogli upotrebljavati FM radio</string>
+    <string name="dialog_sleep_title">Vrijeme do automatskog isključivanja</string>
+    <string name="presetlist_select_name">Odaberi \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Dodaj novi popis</string>
+    <string name="dialog_presetlist_rename_title">Upišite naziv</string>
+    <string name="presetlist_autoselect_title">Potvrdi automatski odabir</string>
+    <string name="preset_replace">Zamijeni</string>
+    <string name="preset_tune">Podesi</string>
+    <string name="preset_rename">Preimenuj</string>
+    <string name="preset_delete">Izbriši</string>
+    <string name="preset_search">Traži \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regionalni pojas</string>
+    <string name="regional_band_entry_north_america">Sjeverna Amerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (širokopojasno)</string>
+    <string name="regional_band_entry_australia">Australija</string>
+    <string name="regional_band_entry_austria">Austrija</string>
+    <string name="regional_band_entry_belgium">Belgija</string>
+    <string name="regional_band_entry_brazil">Brazil</string>
+    <string name="regional_band_entry_china">Kina</string>
+    <string name="regional_band_entry_czech_republic">Republika Češka</string>
+    <string name="regional_band_entry_denmark">Danska</string>
+    <string name="regional_band_entry_finland">Finska</string>
+    <string name="regional_band_entry_france">Francuska</string>
+    <string name="regional_band_entry_germany">Njemačka</string>
+    <string name="regional_band_entry_greece">Grčka</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indija</string>
+    <string name="regional_band_entry_indonesia">Indonezija</string>
+    <string name="regional_band_entry_ireland">Irska</string>
+    <string name="regional_band_entry_italy">Italija</string>
+    <string name="regional_band_entry_korea">Koreja</string>
+    <string name="regional_band_entry_mexico">Meksiko</string>
+    <string name="regional_band_entry_netherlands">Nizozemska</string>
+    <string name="regional_band_entry_new_zealand">Novi Zeland</string>
+    <string name="regional_band_entry_norway">Norveška</string>
+    <string name="regional_band_entry_poland">Poljska</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusija</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Slovačka</string>
+    <string name="regional_band_entry_spain">Španjolska</string>
+    <string name="regional_band_entry_switzerland">Švicarska</string>
+    <string name="regional_band_entry_sweden">Švedska</string>
+    <string name="regional_band_entry_taiwan">Tajvan</string>
+    <string name="regional_band_entry_turkey">Turska</string>
+    <string name="regional_band_entry_united_kingdom">Ujedinjeno Kraljevstvo</string>
+    <string name="regional_band_entry_united_states">Sjedinjene Američke Države</string>
+    <string name="regional_band_entry_user_defined">Korisnička frekvencija</string>
+    <string name="regional_band_summary_north_america">Sjeverna Amerika (87.5 MHz do 108.0 MHz u 200 kHz koracima)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 do 90.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_japan_wide">Japan (širokopojasno) (90.0 do 108.0 MHz u 50 kHz koracima)</string>
+    <string name="regional_band_summary_australia">Australija (87.7 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_austria">Austrija (87.5 do 108.0 MHz u 50 kHz koracima)</string>
+    <string name="regional_band_summary_belgium">Belgija (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5 do 108.0 MHz u 200 kHz koracima)</string>
+    <string name="regional_band_summary_china">Kina (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_czech_republic">Češka Republika (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_denmark">Danska (87.5 do 108.0 MHz u 50 kHz koracima)</string>
+    <string name="regional_band_summary_finland">Finska (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_france">Francuska (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_germany">Njemačka (87.5 do 108.0 MHz u 50 kHz koracima)</string>
+    <string name="regional_band_summary_greece">Grčka (87.5 do 108.0 MHz u 50 kHz koracima)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_india">Indija (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_indonesia">Indonezija (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_ireland">Irska (87.5 do 108.0 MHz u 50 kHz koracima)</string>
+    <string name="regional_band_summary_italy">Italija (87.5 do 108.0 MHz u 50 kHz koracima)</string>
+    <string name="regional_band_summary_korea">Koreja (87.5 do 108.0 MHz u 200 kHz koracima)</string>
+    <string name="regional_band_summary_mexico">Meksiko (88.1 do 107.9 MHz u 200 kHz koracima)</string>
+    <string name="regional_band_summary_netherlands">Nizozemska (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_new_zealand">Novi Zeland (88.0 do 107.0 MHz u 100 KHz koracima)</string>
+    <string name="regional_band_summary_norway">Norveška (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_poland">Poljska (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 do 108.0 MHz u 50 kHz koracima)</string>
+    <string name="regional_band_summary_russia">Rusija (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_singapore">Singapur (88.0 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_slovakia">Slovačka (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_spain">Španjolska (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_switzerland">Švicarska (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_sweden">Švedska (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_taiwan">Tajvan (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_turkey">Turska (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_united_kingdom">Ujedinjeno Kraljevstvo (87.5 do 108.0 MHz u 100 kHz koracima)</string>
+    <string name="regional_band_summary_united_states">SAD (88.1 do 107.9 MHz u 200 kHz koracima)</string>
+    <string name="regional_band_summary_user_defined">Korisnička frekvencija</string>
+    <string name="aud_output_mode">Način izlaza zvuka</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Trajanje snimke</string>
+    <string name="auto_select_af">Alternativna frekvencija</string>
+    <string name="settings_revert_defaults_title">Vrati na tvorničke postavke</string>
+    <string name="settings_revert_defaults_summary">Vraćanje svih postavki</string>
+    <string name="settings_revert_confirm_title">Potvrdite resetiranje</string>
+    <string name="settings_revert_confirm_msg">Ovo će obrisati sve postavke aplikacije uključujući i spremjene početne vrijednosti. Želite li nastaviti?</string>
+    <string name="no_storage">Montiraj SD karticu prije početka snimanja.</string>
+    <string name="preparing_sd">Priprema SD kartice\u2026</string>
+    <string name="access_sd_fail">Pristup SD kartici nije moguć.</string>
+    <string name="spaceIsLow_content">Ponestaje prostora na SD kartici. Promijenite postavke kvalitete ili obrišite neke druge datoteke kako biste oslobodili prostor.</string>
+    <string name="FMRecording_reach_size_limit">Postignuto je ograničenje veličine.</string>
+    <string name="menu_scan_for_preset">Pretraži pretkonfigurirane stavke</string>
+    <string name="fm_off">FM je isključen.</string>
+    <string name="fm_call">Nije moguće koristiti FM za vijeme poziva.</string>
+    <string name="alert_dialog_hint">Unesite naziv</string>
+    <string name="search_dialog_title">Pretraži stanice</string>
+    <string name="fm_command_timeout_title">Vremenski istek</string>
+    <string name="fm_tune_timeout_msg">Nema odgovora na podešavanje FM postaje. Ukoliko se ovaj problem ponovi molim vas da isključite FM i ponovno ga uključite.</string>
+    <string name="fm_command_failed_title">FM operacija neuspješna</string>
+    <string name="fm_cmd_failed_msg">FM operacija nije uspjela. Ako se problem nastavi pojavljivati, isključite FM i ponovno ga uključite.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM operacija nije uspjela. FM i HDMI nisu podržani istovremeno.</string>
+    <string name="fm_cmd_failed_call_on">FM operacija nije uspjela. FM zvuk nije dopušten tijekom poziva.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Moje FM snimke</string>
+    <string name="audio_db_album_name">FM snimke</string>
+    <string name="audio_db_playlist_name">FM snimke</string>
+    <string name="station_name">Stanica:</string>
+    <string name="station_exists">Ova frekvencija već postoji!</string>
+    <string name="station_list_delete_station">Izbriši: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Jeste li sigurni da želite izbrisati \"<xliff:g id="name">%s</xliff:g>\"?</string>
+    <string name="station_name_empty">Naziv stanice je prazan, molimo unesite ponovno.</string>
+    <string name="station_name_exist">\"<xliff:g id="name">%s</xliff:g>\" se već koristi, unesite neki drugi naziv.</string>
+    <string name="rt_plus_tags">Oznake</string>
+    <string name="usr_def_band_min">Najniža frekvencija (MHz)</string>
+    <string name="usr_def_band_max">Najviša frekvencija (MHz)</string>
+    <string name="chanl_spacing">Razmak između kanala</string>
+    <string name="set">Postavi</string>
+    <string name="user_defind_band_msg">Unesite frekvenciju od 76.0 do 108.0 MHz sa minimalno 1 kanalom razmaka i 100 kHz razmaka između min. i maks. frekvencije</string>
+    <string name="save_record_file">FM snimljena datoteka spremljena u \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nije pronađena nijedna kompatibilna postaja</string>
+    <string name="typ_All_stations">Sve stanice</string>
+    <string name="typ_Culture">Kultura</string>
+    <string name="typ_Current_affairs">Aktualno</string>
+    <string name="typ_Children">Dječji program</string>
+    <string name="typ_Country">Seoska glazba</string>
+    <string name="typ_Documentary">Dokumentarno</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Lako slušljiva glazba</string>
+    <string name="typ_Education">Edukacija</string>
+    <string name="typ_Emergency">Hitno</string>
+    <string name="typ_Emergency_test">Hitni test</string>
+    <string name="typ_Finance">Financije</string>
+    <string name="typ_Folk">Narodna glazba</string>
+    <string name="typ_Information">Informacije</string>
+    <string name="typ_Jazz">Jazz glazba</string>
+    <string name="typ_Light_classical">Blaga klasika</string>
+    <string name="typ_Leisure">Slobodno vrijeme</string>
+    <string name="typ_News">Novosti</string>
+    <string name="typ_National">Nacionalna glazba</string>
+    <string name="typ_Other">Ostala glazba</string>
+    <string name="typ_Oldies">Stara glazba</string>
+    <string name="typ_Phone_in">Telefonski ulaz</string>
+    <string name="typ_Pop">Pop glazba</string>
+    <string name="typ_Religion">Religija</string>
+    <string name="typ_Rock">Rock glazba</string>
+    <string name="typ_Science">Znanost</string>
+    <string name="typ_Serious_classical">Ozbiljna klasika</string>
+    <string name="typ_Social_affairs">Socijalne stvari</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Putovanje</string>
+    <string name="typ_Varied">Raznoliko</string>
+    <string name="typ_Weather">Vrijeme</string>
+    <string name="typ_Adult_hits">Stari hitovi</string>
+    <string name="typ_Classical">Klasika</string>
+    <string name="typ_Classic_Rock">Klasični rock</string>
+    <string name="typ_College">Koledž</string>
+    <string name="typ_Foreign_language">Strani jezik</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgija</string>
+    <string name="typ_Personality">Osobnost</string>
+    <string name="typ_Public">Javne</string>
+    <string name="typ_Religious_music">Religiozna glazba</string>
+    <string name="typ_Religious_talk">Religiozni govor</string>
+    <string name="typ_Rhythm_and_Blues">Ritam i Blues</string>
+    <string name="typ_Spanish_music">Španjolska glazba</string>
+    <string name="typ_Spanish_talk">Španjolski govor</string>
+    <string name="typ_Soft">Lagano</string>
+    <string name="typ_Soft_Rock">Lagani Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Lagani Ritam i Blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Govor</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-hu/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-hu/arrays.xml
index cb1457b..e21c636 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-hu/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Sztereó</item>
+    <item>Monó</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Sztereó</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 perc</item>
+    <item>15 perc</item>
+    <item>30 perc</item>
+    <item>Leállításig</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 perc</item>
+    <item>30 perc</item>
+    <item>45 perc</item>
+    <item>1 óra</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-hu/strings.xml b/fmapp2/res/values-hu/strings.xml
new file mode 100644
index 0000000..88f0c11
--- /dev/null
+++ b/fmapp2/res/values-hu/strings.xml
@@ -0,0 +1,232 @@
+<?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 Rádió</string>
+    <string name="tx_app_name">FM Transzmitter</string>
+    <string name="menu_scan_start">Keresés</string>
+    <string name="menu_scan_stop">Keresés leállítása</string>
+    <string name="menu_record_start">Felvétel</string>
+    <string name="menu_record_stop">Felvétel leállítása</string>
+    <string name="menu_settings">Beállítások</string>
+    <string name="menu_sleep">Alvás</string>
+    <string name="menu_sleep_cancel">Alvás megszakítása</string>
+    <string name="menu_all_channels">Minden csatorna</string>
+    <string name="menu_display_tags">Cimkék megjelenítése</string>
+    <string name="button_text_stop">Leállítás</string>
+    <string name="msg_seeking">FM állomások keresése\u2026</string>
+    <string name="msg_scanning">Minden FM állomás keresése\u2026</string>
+    <string name="msg_scanning_pty">Keresés erre: \"<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">Automatikus csatornahangolás</string>
+    <string name="msg_searching">Erős állomásjelek keresése az állomáslista létrehozásához\u2026</string>
+    <string name="msg_noantenna">Kérjük csatlakoztasson fülhallgatót az FM-rádió használatához</string>
+    <string name="dialog_sleep_title">Automatikus alvás ideje</string>
+    <string name="presetlist_select_name">Válassza ki \"<xliff:g id="presetlist_name">%1$s</xliff:g>\"</string>
+    <string name="presetlist_add_new">Új lista hozzáadása</string>
+    <string name="dialog_presetlist_rename_title">Név megadása</string>
+    <string name="presetlist_autoselect_title">Automatikus keresés jóváhagyása</string>
+    <string name="preset_replace">Cserél</string>
+    <string name="preset_tune">Hangolás</string>
+    <string name="preset_rename">Átnevezés</string>
+    <string name="preset_delete">Törlés</string>
+    <string name="stat_notif_frequency">\"<xliff:g id="frequency">%1$s</xliff:g>\" MHz</string>
+    <string name="regional_band">Helyi sáv</string>
+    <string name="regional_band_entry_north_america">Észak-Amerika</string>
+    <string name="regional_band_entry_europe">Európa</string>
+    <string name="regional_band_entry_japan">Japán</string>
+    <string name="regional_band_entry_japan_wide">Japán (széles)</string>
+    <string name="regional_band_entry_australia">Ausztrália</string>
+    <string name="regional_band_entry_austria">Ausztria</string>
+    <string name="regional_band_entry_belgium">Belgium</string>
+    <string name="regional_band_entry_brazil">Brazília</string>
+    <string name="regional_band_entry_china">Kína</string>
+    <string name="regional_band_entry_czech_republic">Cseh Köztársaság</string>
+    <string name="regional_band_entry_denmark">Dánia</string>
+    <string name="regional_band_entry_finland">Finnország</string>
+    <string name="regional_band_entry_france">Franciaország</string>
+    <string name="regional_band_entry_germany">Németország</string>
+    <string name="regional_band_entry_greece">Görögország</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonézia</string>
+    <string name="regional_band_entry_ireland">Írország</string>
+    <string name="regional_band_entry_italy">Olaszország</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexikó</string>
+    <string name="regional_band_entry_netherlands">Hollandia</string>
+    <string name="regional_band_entry_new_zealand">Új-Zéland</string>
+    <string name="regional_band_entry_norway">Norvégia</string>
+    <string name="regional_band_entry_poland">Lengyelország</string>
+    <string name="regional_band_entry_portugal">Portugália</string>
+    <string name="regional_band_entry_russia">Oroszország</string>
+    <string name="regional_band_entry_singapore">Szingapúr</string>
+    <string name="regional_band_entry_slovakia">Szlovákia</string>
+    <string name="regional_band_entry_spain">Spanyolország</string>
+    <string name="regional_band_entry_switzerland">Svájc</string>
+    <string name="regional_band_entry_sweden">Svédország</string>
+    <string name="regional_band_entry_taiwan">Tajvan</string>
+    <string name="regional_band_entry_turkey">Törökország</string>
+    <string name="regional_band_entry_united_kingdom">Egyesült Királyság</string>
+    <string name="regional_band_entry_united_states">Egyesült Államok</string>
+    <string name="regional_band_entry_user_defined">Felhasználó által meghatározott sáv</string>
+    <string name="regional_band_summary_north_america">Észak-Amerika (87,5 MHz-től 108,0 MHz-ig 200 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_europe">Európa (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_japan">Japán (76,0 MHz-től 90,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_japan_wide">Japán (széles) (90,0 MHz-től 108,0 MHz-ig 50 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_australia">Ausztrália (87,7 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_austria">Ausztrália (87,7 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_belgium">Belgium (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_brazil">Brazília (87,5 MHz-től 108,0 MHz-ig 200 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_china">Kína (87,0 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_czech_republic">Cseh Köztársaság (87,5 MHz-től 108,0 MHz-ig 100 kHz-es lépésekben)</string>
+    <string name="regional_band_summary_denmark">Dánia (87,5 MHz-től 108,0 MHz-ig 50 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_finland">Finnország (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_france">Franciaország (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_germany">Dánia (87,5 MHz-től 108,0 MHz-ig 50 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_greece">Görögország (87,5 MHz-től 108,0 MHz-ig 50 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_india">India (87,5 MHz és 108,0 MHz 100 KHz lépésekben)</string>
+    <string name="regional_band_summary_indonesia">Indonézia (87,5 MHz és 108,0 MHz 100 KHz lépésekben)</string>
+    <string name="regional_band_summary_ireland">Írország (87,5 MHz-től 108,0 MHz-ig 50 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_italy">Olaszország (87,5 MHz-től 108,0 MHz-ig 50 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 MHz-től 108,0 MHz-ig 200 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_mexico">Mexikó (88,1 MHz-től 107,9 MHz-ig 200 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_netherlands">Hollandia (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_new_zealand">Új-Zéland (88,0 MHz-től 107,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_norway">Norvégia (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_poland">Lengyelország (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_portugal">Portugália (87,5 MHz-től 108,0 MHz-ig 50 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_russia">Oroszország (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_singapore">Szingapúr (88,0 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_slovakia">Szlovákia (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_spain">Spanyolország (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_switzerland">Svájc (87,5 MHz-től és 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_sweden">Svédország (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_taiwan">Tajvan (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_turkey">Törökország (87,5 MHz-tól 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_united_kingdom">Egyesült Királyság (87,5 MHz-től 108,0 MHz-ig 100 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_united_states">Egyesült Államok (88,1 MHz-től 107,9 MHz-ig 200 KHz-es lépésekben)</string>
+    <string name="regional_band_summary_user_defined">Felhasználó által meghatározott sáv</string>
+    <string name="aud_output_mode">Audio kimeneti mód</string>
+    <string name="audio_type_stereo">Sztereó</string>
+    <string name="audio_type_mono">Fekete-fehér</string>
+    <string name="record_dur">Felvétel időtartama</string>
+    <string name="auto_select_af">Alternatív frekvencia</string>
+    <string name="settings_revert_defaults_title">Alapértelmezések visszaállítása</string>
+    <string name="settings_revert_defaults_summary">Minden beállítás visszaállítása</string>
+    <string name="settings_revert_confirm_title">Visszaállítás megerősítése</string>
+    <string name="settings_revert_confirm_msg">Ez törli az összes alkalmazás beállítást, beleértve a mentett állomásokat. Folytatja?</string>
+    <string name="no_storage">Felvétel indítása előtt csatlakoztasson SD kártyát.</string>
+    <string name="preparing_sd">SD-kártya előkészítése\u2026</string>
+    <string name="access_sd_fail">Nem lehet hozzáférni az SD-kártyához.</string>
+    <string name="spaceIsLow_content">Az SD kártyán kevés a hely. Változtassa meg a felvétel minőségét vagy töröljön néhány fájlt, hogy helyet szabadítson fel.</string>
+    <string name="FMRecording_reach_size_limit">Méretkorlát elérve.</string>
+    <string name="menu_scan_for_preset">Állomások keresése</string>
+    <string name="fm_off">FM kikapcsolva.</string>
+    <string name="fm_call">FM hívás közben nem használható.</string>
+    <string name="alert_dialog_hint">Adjon meg egy nevet</string>
+    <string name="search_dialog_title">Állomások keresése</string>
+    <string name="fm_command_timeout_title">Időtúllépés</string>
+    <string name="fm_tune_timeout_msg">Nem hangolható az FM állomás. Ha a probléma továbbra is fennáll, kapcsolja ki az FM rádiót majd vissza.</string>
+    <string name="fm_command_failed_title">FM-művelet sikertelen</string>
+    <string name="fm_cmd_failed_msg">FM-művelet sikertelen. Ha a probléma továbbra is fennáll, kapcsolja ki az FM rádiót majd vissza.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-művelet sikertelen. Az FM-rádió és a HDMI egyszerre nem támogatott.</string>
+    <string name="fm_cmd_failed_call_on">FM-művelet sikertelen. Az FM rádió telefonhívás közben nem megengedett.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Saját FM felvételek</string>
+    <string name="audio_db_album_name">FM felvételek</string>
+    <string name="audio_db_playlist_name">FM felvételek</string>
+    <string name="station_name">Állomás:</string>
+    <string name="station_exists">Ez a frekvencia már létezik!</string>
+    <string name="station_list_delete_station">Törlés: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Biztos benne, hogy törli a következőt: \"<xliff:g id="name">%s</xliff:g>\"?</string>
+    <string name="station_name_empty">Az állomás neve üres, írja be újra.</string>
+    <string name="station_name_exist">\"<xliff:g id="name">%s</xliff:g>\" már használatban van, kérjük, adjon meg egy másik nevet.</string>
+    <string name="rt_plus_tags">Címkék</string>
+    <string name="usr_def_band_min">Legalacsonyabb frekvencia (MHz)</string>
+    <string name="usr_def_band_max">Legmagasabb frekvencia (MHz)</string>
+    <string name="chanl_spacing">Csatornatérközök</string>
+    <string name="set">Beállítás</string>
+    <string name="user_defind_band_msg">Adjon meg egy frekvenciát 76,0 és 108.0 MHz között, minimum 1 csatornatávolsággal, 100 kHz-es szünettel a min és max frekvencia között</string>
+    <string name="save_record_file">\"<xliff:g id="record_file">%1$s</xliff:g>\" FM felvétel elmentve</string>
+    <string name="fm_search_no_results">Nem található kompatibilis állomás</string>
+    <string name="typ_All_stations">Minden állomás</string>
+    <string name="typ_Culture">Kultúra</string>
+    <string name="typ_Current_affairs">Aktuális ügyek</string>
+    <string name="typ_Children">Gyerekprogramok</string>
+    <string name="typ_Country">Country zene</string>
+    <string name="typ_Documentary">Dokumentumfilm</string>
+    <string name="typ_Drama">Dráma</string>
+    <string name="typ_Easy_listening">Könnyed zenehallgatás</string>
+    <string name="typ_Education">Oktatás</string>
+    <string name="typ_Emergency">Vészhelyzeti</string>
+    <string name="typ_Emergency_test">Vészhelyzeti teszt</string>
+    <string name="typ_Finance">Pénzügy</string>
+    <string name="typ_Folk">Népzene</string>
+    <string name="typ_Information">Információ</string>
+    <string name="typ_Jazz">Jazz zene</string>
+    <string name="typ_Light_classical">Könnyű klasszikus</string>
+    <string name="typ_Leisure">Szabadidő</string>
+    <string name="typ_News">Hírek</string>
+    <string name="typ_National">Nemzeti zene</string>
+    <string name="typ_Other">Egyéb zene</string>
+    <string name="typ_Oldies">Örökzöld slágerek</string>
+    <string name="typ_Phone_in">Telefonban</string>
+    <string name="typ_Pop">Popzene</string>
+    <string name="typ_Religion">Vallás</string>
+    <string name="typ_Rock">Rock zene</string>
+    <string name="typ_Science">Tudomány</string>
+    <string name="typ_Serious_classical">Komoly klasszikus</string>
+    <string name="typ_Social_affairs">Szociális ügyek</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Utazás</string>
+    <string name="typ_Varied">Változatos</string>
+    <string name="typ_Weather">Időjárás</string>
+    <string name="typ_Adult_hits">Felnőtt találatok</string>
+    <string name="typ_Classical">Klasszikus</string>
+    <string name="typ_Classic_Rock">Klasszikus Rock</string>
+    <string name="typ_College">Főiskola</string>
+    <string name="typ_Foreign_language">Idegen nyelvű</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nosztalgia</string>
+    <string name="typ_Personality">Személyiség</string>
+    <string name="typ_Public">Publikus</string>
+    <string name="typ_Religious_music">Vallásos zene</string>
+    <string name="typ_Religious_talk">Vallási beszéd</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm és Blues</string>
+    <string name="typ_Spanish_music">Spanyol zene</string>
+    <string name="typ_Spanish_talk">Spanyol beszéd</string>
+    <string name="typ_Soft">Lágy</string>
+    <string name="typ_Soft_Rock">Lágy Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Lágy Rhythm és Blues</string>
+    <string name="typ_Sports">Sport esemény</string>
+    <string name="typ_Talk">Beszélgetés</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-in/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-in/arrays.xml
index cb1457b..8ec92f6 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-in/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 menit</item>
+    <item>15 menit</item>
+    <item>30 menit</item>
+    <item>Sampai berhenti</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 menit</item>
+    <item>30 menit</item>
+    <item>45 menit</item>
+    <item>1 jam</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-in/strings.xml b/fmapp2/res/values-in/strings.xml
new file mode 100644
index 0000000..ed29e78
--- /dev/null
+++ b/fmapp2/res/values-in/strings.xml
@@ -0,0 +1,231 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Pemancar FM</string>
+    <string name="menu_scan_start">Cari</string>
+    <string name="menu_scan_stop">Hentikan pencarian</string>
+    <string name="menu_record_start">Rekam</string>
+    <string name="menu_record_stop">Hentikan merekam</string>
+    <string name="menu_settings">Pengaturan</string>
+    <string name="menu_sleep">Tidur</string>
+    <string name="menu_sleep_cancel">Batalkan tidur</string>
+    <string name="menu_all_channels">Semua saluran</string>
+    <string name="menu_display_tags">Tampilkan tag</string>
+    <string name="button_text_stop">Hentikan</string>
+    <string name="msg_seeking">Mencari stasiun FM\u2026</string>
+    <string name="msg_scanning">Mencari semua stasiun FM\u2026</string>
+    <string name="msg_scanning_pty">Mencari untuk \'<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">Otomatis-memilih preset</string>
+    <string name="msg_searching">Mencari stasiun yang kuat untuk membuat daftar preset\u2026</string>
+    <string name="msg_noantenna">Silakan hubungkan headset untuk menggunakan radio FM</string>
+    <string name="dialog_sleep_title">Waktu tidur mati-otomatis</string>
+    <string name="presetlist_select_name">Pilih \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Tambah daftar baru</string>
+    <string name="dialog_presetlist_rename_title">Masukkan nama</string>
+    <string name="presetlist_autoselect_title">Konfirmasi seleksi-otomatis</string>
+    <string name="preset_replace">Ganti</string>
+    <string name="preset_tune">Putar</string>
+    <string name="preset_rename">Ubah Nama</string>
+    <string name="preset_delete">Hapus</string>
+    <string name="preset_search">Mencari \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Pita regional</string>
+    <string name="regional_band_entry_north_america">Amerika Utara</string>
+    <string name="regional_band_entry_europe">Eropa</string>
+    <string name="regional_band_entry_japan">Jepang</string>
+    <string name="regional_band_entry_japan_wide">Jepang (luas)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgia</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">Tiongkok</string>
+    <string name="regional_band_entry_czech_republic">Republik Ceko</string>
+    <string name="regional_band_entry_denmark">Denmark</string>
+    <string name="regional_band_entry_finland">Finlandia</string>
+    <string name="regional_band_entry_france">Perancis</string>
+    <string name="regional_band_entry_germany">Jerman</string>
+    <string name="regional_band_entry_greece">Yunani</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irlandia</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Meksiko</string>
+    <string name="regional_band_entry_netherlands">Belanda</string>
+    <string name="regional_band_entry_new_zealand">Selandia Baru</string>
+    <string name="regional_band_entry_norway">Norwegia</string>
+    <string name="regional_band_entry_poland">Polandia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusia</string>
+    <string name="regional_band_entry_singapore">Singapura</string>
+    <string name="regional_band_entry_slovakia">Slowakia</string>
+    <string name="regional_band_entry_spain">Sepanyol</string>
+    <string name="regional_band_entry_switzerland">Swiss</string>
+    <string name="regional_band_entry_sweden">Swedia</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turki</string>
+    <string name="regional_band_entry_united_kingdom">Inggris</string>
+    <string name="regional_band_entry_united_states">Amerika Serikat</string>
+    <string name="regional_band_entry_user_defined">Pita disesuikan pengguna</string>
+    <string name="regional_band_summary_north_america">Amerika Utara (87.5 sampai 108.0. MHz di 200 kHz)</string>
+    <string name="regional_band_summary_europe">Eropa (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_japan">Jepang (76.0 sampai 90.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Jepang (luas) (90,0 sampai 108.0 MHz di 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_austria">Austria (87.5 sampai 108.0 MHz di 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Belgia (87,5 sampai 108,0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (87.5 sampai 108.0 MHz di 200 kHz)</string>
+    <string name="regional_band_summary_china">Tiongkok (87,0 sampai 108,0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Republik Ceko (87,5 sampai 108,0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Denmark (87.5 sampai 108.0 MHz di 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlandia (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_france">Prancis (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_germany">Jerman (87.5 sampai 108.0 MHz di 50 kHz)</string>
+    <string name="regional_band_summary_greece">Yunani (87.5 sampai 108.0 MHz di 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_india">India (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlandia (87.5 sampai 108.0 MHz di 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italia (87.5 sampai 108.0 MHz di 50 kHz)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 sampai 108.0 MHz di 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Meksiko (88,1 sampai 107,9 di 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Belanda (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Selandia Baru (88.0 sampai 107.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norwegia (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polandia (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 sampai 108.0 MHz di 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rusia (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapura (88.0 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Slowakia (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_spain">Spanyol (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Swiss (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Swedia (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turki (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Inggris (87.5 sampai 108.0 MHz di 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Amerika Serikat (88,1 sampai 107,9 MHz di 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Pita disesuikan pengguna</string>
+    <string name="aud_output_mode">Modus output audio</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Durasi rekaman</string>
+    <string name="auto_select_af">Frekuensi alternatif</string>
+    <string name="settings_revert_defaults_title">Kembalikan ke pengaturan pabrik</string>
+    <string name="settings_revert_defaults_summary">Kembalikan semua pengaturan</string>
+    <string name="settings_revert_confirm_title">Konfirmasi pratayang</string>
+    <string name="settings_revert_confirm_msg">Ini akan menghapus semua pengaturan aplikasi, termasuk preset yang tersimpan. Lanjutkan?</string>
+    <string name="no_storage">Pasang kartu SD sebelum memulai rekaman.</string>
+    <string name="preparing_sd">Menyiapkan kartu SD</string>
+    <string name="access_sd_fail">Tidak dapat mengakses kartu SD.</string>
+    <string name="spaceIsLow_content">Kartu SD Anda kehabisan ruang penyimpanan. Ubah pengaturan kualitas atau hapus beberapa berkas lain untuk membebaskan ruang penyimpanan.</string>
+    <string name="FMRecording_reach_size_limit">Batas ukuran tercapai.</string>
+    <string name="menu_scan_for_preset">Cari preset</string>
+    <string name="fm_off">FM dimatikan.</string>
+    <string name="fm_call">FM tidak dapat digunakan saat melakukan panggilan.</string>
+    <string name="alert_dialog_hint">Masukkan nama</string>
+    <string name="search_dialog_title">Cari stasiun</string>
+    <string name="fm_command_timeout_title">Batas waktu</string>
+    <string name="fm_tune_timeout_msg">Tidak ada tanggapan diterima saat mencari stasiun FM. Jika masalah berlanjut, silahkan matikan FM dan menghidupkannya kembali.</string>
+    <string name="fm_command_failed_title">Pengoperasian FM gagal</string>
+    <string name="fm_cmd_failed_msg">Pengoperasian FM gagal. Jika masalah berlanjut, silahkan matikan FM dan menghidupkannya kembali.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Pengoperasian FM gagal. Pengoperasian FM dan HDMI secara bersamaan tidak didukung.</string>
+    <string name="fm_cmd_failed_call_on">Pengoperasian FM gagal. Audio FM tidak diizinkan selama panggilan.</string>
+    <string name="audio_db_artist_name">Rekaman FM saya</string>
+    <string name="audio_db_album_name">Rekaman FM</string>
+    <string name="audio_db_playlist_name">Rekaman FM</string>
+    <string name="station_name">Stasiun:</string>
+    <string name="station_exists">Frekuensi ini sudah ada!</string>
+    <string name="station_list_delete_station">Hapus: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Yakin akan menghapus \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Nama stasiun kosong, silakan masukkan kembali.</string>
+    <string name="rt_plus_tags">Tag</string>
+    <string name="usr_def_band_min">Frekuensi terendah (MHz)</string>
+    <string name="usr_def_band_max">Frekuensi tertinggi (MHz)</string>
+    <string name="chanl_spacing">Lebar saluran</string>
+    <string name="set">Atur</string>
+    <string name="user_defind_band_msg">Masukkan frekuensi di antara 76,0 dan 108,0 MHz, dengan minimum 1 spasi kanal (channel spacing) dan jarak di antara frekuensi minimal dan maksimal sebesar 100 kHz</string>
+    <string name="save_record_file">Berkas rekaman FM disimpan di \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Tidak ada stasiun kompatibel yang ditemukan</string>
+    <string name="typ_All_stations">Semua stasiun</string>
+    <string name="typ_Culture">Budaya</string>
+    <string name="typ_Current_affairs">Berita terkini</string>
+    <string name="typ_Children">Program anak</string>
+    <string name="typ_Country">Musik country</string>
+    <string name="typ_Documentary">Dokumenter</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Enak didengar</string>
+    <string name="typ_Education">Edukasi</string>
+    <string name="typ_Emergency">Darurat</string>
+    <string name="typ_Emergency_test">Tes darurat</string>
+    <string name="typ_Finance">Keuangan</string>
+    <string name="typ_Folk">Musik rakyat</string>
+    <string name="typ_Information">Informasi</string>
+    <string name="typ_Jazz">Musik jazz</string>
+    <string name="typ_Light_classical">Klasik ringan</string>
+    <string name="typ_Leisure">Rekreasi</string>
+    <string name="typ_News">Berita</string>
+    <string name="typ_National">Musik nasional</string>
+    <string name="typ_Other">Musik yang lainnya</string>
+    <string name="typ_Oldies">Musik lawas</string>
+    <string name="typ_Phone_in">Telepon masuk</string>
+    <string name="typ_Pop">Musik pop</string>
+    <string name="typ_Religion">Religi</string>
+    <string name="typ_Rock">Musik rock</string>
+    <string name="typ_Science">Ilmu pengetahuan</string>
+    <string name="typ_Serious_classical">Klasik serius</string>
+    <string name="typ_Social_affairs">Urusan sosial</string>
+    <string name="typ_Sport">Olahraga</string>
+    <string name="typ_Travel">Perjalanan</string>
+    <string name="typ_Varied">Bervariasi</string>
+    <string name="typ_Weather">Cuaca</string>
+    <string name="typ_Adult_hits">Hit dewasa</string>
+    <string name="typ_Classical">Klasik</string>
+    <string name="typ_Classic_Rock">Rock klasik</string>
+    <string name="typ_College">Perguruan tinggi</string>
+    <string name="typ_Foreign_language">Bahasa asing</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Kepribadian</string>
+    <string name="typ_Public">Umum</string>
+    <string name="typ_Religious_music">Musik religi</string>
+    <string name="typ_Religious_talk">Bincang religi</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm dan Blues</string>
+    <string name="typ_Spanish_music">Musik Spanyol</string>
+    <string name="typ_Spanish_talk">Obrolan Spanyol</string>
+    <string name="typ_Soft">Santai</string>
+    <string name="typ_Soft_Rock">Rock santai</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm santai dan Blues santai</string>
+    <string name="typ_Sports">Olahraga</string>
+    <string name="typ_Talk">Perbincangan</string>
+    <string name="typ_Top_40">40 teratas</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-is/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-is/arrays.xml
index cb1457b..0c8f162 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-is/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Víðóma</item>
+    <item>Einóma</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Víðóma</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 mínútur</item>
+    <item>15 mínútur</item>
+    <item>30 mínútur</item>
+    <item>Þar til stöðvað</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 mínútur</item>
+    <item>30 mínútur</item>
+    <item>45 mínútur</item>
+    <item>1 klukkustund</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-is/strings.xml b/fmapp2/res/values-is/strings.xml
new file mode 100644
index 0000000..6c60df1
--- /dev/null
+++ b/fmapp2/res/values-is/strings.xml
@@ -0,0 +1,233 @@
+<?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-útvarp</string>
+    <string name="tx_app_name">FM-sendir</string>
+    <string name="menu_scan_start">Skanna</string>
+    <string name="menu_scan_stop">Hætta leit</string>
+    <string name="menu_record_start">Taka upp</string>
+    <string name="menu_record_stop">Stöðva upptöku</string>
+    <string name="menu_settings">Stillingar</string>
+    <string name="menu_sleep">Svæfa</string>
+    <string name="menu_sleep_cancel">Hætta við svæfingu</string>
+    <string name="menu_all_channels">Allar rásir</string>
+    <string name="menu_display_tags">Birta merki</string>
+    <string name="button_text_stop">Stöðva</string>
+    <string name="msg_seeking">Leita að FM-útvarpsstöð\u2026</string>
+    <string name="msg_scanning">Leita að öllum FM-útvarpsstöðvum\u2026</string>
+    <string name="msg_scanning_pty">Leita að \'<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">Sjálfvirkt val forstillinga</string>
+    <string name="msg_searching">Leita að stöðvum með sterk útsendingamerki til að útbúa forstillingalista\u2026</string>
+    <string name="msg_noantenna">Tengdu heyrnartól til að geta notað FM útvarp</string>
+    <string name="dialog_sleep_title">Sjálfvirkur tími svæfingar</string>
+    <string name="presetlist_select_name">Veldu \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Bæta við nýjum lista</string>
+    <string name="dialog_presetlist_rename_title">Settu inn nafn</string>
+    <string name="presetlist_autoselect_title">Staðfestu sjálfvirkt val</string>
+    <string name="preset_replace">Skipta út</string>
+    <string name="preset_tune">Stilla</string>
+    <string name="preset_rename">Endurnefna</string>
+    <string name="preset_delete">Eyða</string>
+    <string name="preset_search">Leita að \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Svæðisbundin tíðnisvið</string>
+    <string name="regional_band_entry_north_america">Norður Ameríka</string>
+    <string name="regional_band_entry_europe">Evrópa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (breitt tíðnisvið)</string>
+    <string name="regional_band_entry_australia">Ástralía</string>
+    <string name="regional_band_entry_austria">Austurríki</string>
+    <string name="regional_band_entry_belgium">Belgía</string>
+    <string name="regional_band_entry_brazil">Brasilía</string>
+    <string name="regional_band_entry_china">Kína</string>
+    <string name="regional_band_entry_czech_republic">Tékkland</string>
+    <string name="regional_band_entry_denmark">Danmörk</string>
+    <string name="regional_band_entry_finland">Finnland</string>
+    <string name="regional_band_entry_france">Frakkland</string>
+    <string name="regional_band_entry_germany">Þýskaland</string>
+    <string name="regional_band_entry_greece">Grikkland</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indland</string>
+    <string name="regional_band_entry_indonesia">Indónesía</string>
+    <string name="regional_band_entry_ireland">Írland</string>
+    <string name="regional_band_entry_italy">Ítalía</string>
+    <string name="regional_band_entry_korea">Kórea</string>
+    <string name="regional_band_entry_mexico">Mexíkó</string>
+    <string name="regional_band_entry_netherlands">Holland</string>
+    <string name="regional_band_entry_new_zealand">Nýja Sjáland</string>
+    <string name="regional_band_entry_norway">Noregur</string>
+    <string name="regional_band_entry_poland">Pólland</string>
+    <string name="regional_band_entry_portugal">Portúgal</string>
+    <string name="regional_band_entry_russia">Rússland</string>
+    <string name="regional_band_entry_singapore">Singapúr</string>
+    <string name="regional_band_entry_slovakia">Slóvakía</string>
+    <string name="regional_band_entry_spain">Spánn</string>
+    <string name="regional_band_entry_switzerland">Sviss</string>
+    <string name="regional_band_entry_sweden">Svíþjóð</string>
+    <string name="regional_band_entry_taiwan">Tævan</string>
+    <string name="regional_band_entry_turkey">Tyrkland</string>
+    <string name="regional_band_entry_united_kingdom">Bretland</string>
+    <string name="regional_band_entry_united_states">Bandaríkin</string>
+    <string name="regional_band_entry_user_defined">Tíðnisvið skilgreint af notanda</string>
+    <string name="regional_band_summary_north_america">Norður-Ameríka (87.5 til 108.0 MHz í 200 kHz þrepum)</string>
+    <string name="regional_band_summary_europe">Evrópa (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_japan">Japan (87.5 til 90.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_japan_wide">Japan (breitt tíðnisvið) (90.0 til 108.0 MHz í 50 kHz þrepum)</string>
+    <string name="regional_band_summary_australia">Ástralía (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_austria">Austurríki (87.5 til 108.0 MHz í 50 kHz þrepum)</string>
+    <string name="regional_band_summary_belgium">Belgía (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_brazil">Brasilía (87.5 til 108.0 MHz í 200 kHz þrepum)</string>
+    <string name="regional_band_summary_china">Kína (87.0 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_czech_republic">Tékkland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_denmark">Danmörk (87.5 til 108.0 MHz í 50 kHz þrepum)</string>
+    <string name="regional_band_summary_finland">Finnland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_france">Frakkland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_germany">Þýskaland (87.5 til 108.0 MHz í 50 kHz þrepum)</string>
+    <string name="regional_band_summary_greece">Grikkland (87.5 til 108.0 MHz í 50 kHz þrepum)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_india">Indland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_indonesia">Indónesía (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_ireland">Írland (87.5 til 108.0 MHz í 50 kHz þrepum)</string>
+    <string name="regional_band_summary_italy">Ítalía (87.5 til 108.0 MHz í 50 kHz þrepum)</string>
+    <string name="regional_band_summary_korea">Kórea (87.5 til 108.0 MHz í 200 kHz þrepum)</string>
+    <string name="regional_band_summary_mexico">Mexíkó (88.1 til 107.9 MHz í 200 kHz þrepum)</string>
+    <string name="regional_band_summary_netherlands">Holland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_new_zealand">Nýjasjáland (87.0 til 107.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_norway">Noregur (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_poland">Pólland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_portugal">Portúgal (87.5 til 108.0 MHz í 50 kHz þrepum)</string>
+    <string name="regional_band_summary_russia">Rússland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_singapore">Singapúr (88.0 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_slovakia">Slóvakía (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_spain">Spánn (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_switzerland">Sviss (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_sweden">Svíþjóð (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_taiwan">Tævan (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_turkey">Tyrkland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_united_kingdom">Bretland (87.5 til 108.0 MHz í 100 kHz þrepum)</string>
+    <string name="regional_band_summary_united_states">Bandaríkin (88.1 til 107.9 MHz í 200 kHz þrepum)</string>
+    <string name="regional_band_summary_user_defined">Tíðnisvið skilgreint af notanda</string>
+    <string name="aud_output_mode">Úttakshamur hljóðs</string>
+    <string name="audio_type_stereo">Víðóma</string>
+    <string name="audio_type_mono">Einóma</string>
+    <string name="record_dur">Tímalengd upptöku</string>
+    <string name="auto_select_af">Önnur tíðni</string>
+    <string name="settings_revert_defaults_title">Frumstilla á sjálfgefin gildi</string>
+    <string name="settings_revert_defaults_summary">Frumstilla allar stillingar</string>
+    <string name="settings_revert_confirm_title">Staðfestu endurstillingu</string>
+    <string name="settings_revert_confirm_msg">Þetta mun hreinsa út allar forritastillingar, þar með taldar vistaðar forstillingar. Halda áfram?</string>
+    <string name="no_storage">Tengdu SD-kortið áður en upptaka er sett í gang.</string>
+    <string name="preparing_sd">Undirbý SD-minniskort\u2026</string>
+    <string name="access_sd_fail">Gat ekki skoðað SD-kort.</string>
+    <string name="spaceIsLow_content">SD-kortið þitt er að verða fullt. Breyttu gæðastillingunum eða eyddu einhverjum öðrum skrám til að losa um pláss.</string>
+    <string name="FMRecording_reach_size_limit">Stærðarmörkum er náð.</string>
+    <string name="menu_scan_for_preset">Leita að forstillingum</string>
+    <string name="fm_off">Slökkt er á FM.</string>
+    <string name="fm_call">Ekki er hægt að nota FM-útvarp á meðan símtali stendur.</string>
+    <string name="alert_dialog_hint">Settu inn nafn</string>
+    <string name="search_dialog_title">Skanna útvarpsstöðvar</string>
+    <string name="fm_command_timeout_title">Tímamörk</string>
+    <string name="fm_tune_timeout_msg">Ekkert svar barst svo hægt væri að stilla FM-útvarpsstöð. Ef vandamálið er viðvarandi, slökktu þá á FM-útvarpinu og kveiktu svo aftur á því.</string>
+    <string name="fm_command_failed_title">FM-aðgerðin tókst ekki</string>
+    <string name="fm_cmd_failed_msg">FM-aðgerðin tókst ekki. Ef vandamálið er viðvarandi, slökktu þá á FM-útvarpinu og kveiktu svo aftur á því.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-aðgerðin tókst ekki. Samhliða notkun FM og HDMI er ekki studd.</string>
+    <string name="fm_cmd_failed_call_on">FM-aðgerðin tókst ekki. Ekki er hægt að nota FM-hljóð á meðan símtali stendur.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">FM-upptökurnar mínar</string>
+    <string name="audio_db_album_name">FM-upptökur</string>
+    <string name="audio_db_playlist_name">FM-upptökur</string>
+    <string name="station_name">Útvarpsstöð:</string>
+    <string name="station_exists">Þessi tíðni er þegar til!</string>
+    <string name="station_list_delete_station">Eyða: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Ertu viss um að þú viljir eyða \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Nafn útvarpsstöðvarinnar er autt, settu það aftur inn.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' er þegar í notkun, veldu eitthvað annað nafn.</string>
+    <string name="rt_plus_tags">Merki</string>
+    <string name="usr_def_band_min">Lægsta tíðni (MHz)</string>
+    <string name="usr_def_band_max">Hæsta tíðni (MHz)</string>
+    <string name="chanl_spacing">Bil milli rása</string>
+    <string name="set">Stilla</string>
+    <string name="user_defind_band_msg">Settu inn tíðni frá 76.0 til 108.0 MHz með lágmarksmillibilinu 1 og 100 kHz bili milli lágmarks- og hámarkstíðna</string>
+    <string name="save_record_file">Upptaka í FM-skrá vistuð í \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Engar sambærilegar stöðvar fundust</string>
+    <string name="typ_All_stations">Allar útvarpsstöðvar</string>
+    <string name="typ_Culture">Menning</string>
+    <string name="typ_Current_affairs">Á líðandi stundu</string>
+    <string name="typ_Children">Barnaþættir</string>
+    <string name="typ_Country">Sveitatónlist</string>
+    <string name="typ_Documentary">Heimildaþættir</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Auðmeltanleg tónlist</string>
+    <string name="typ_Education">Menntun</string>
+    <string name="typ_Emergency">Neyðartilfelli</string>
+    <string name="typ_Emergency_test">Neyðarrás til prófunar</string>
+    <string name="typ_Finance">Fjármál</string>
+    <string name="typ_Folk">Þjóðlagatónlist</string>
+    <string name="typ_Information">Upplýsingar</string>
+    <string name="typ_Jazz">Djasstónlist</string>
+    <string name="typ_Light_classical">Léttklassík</string>
+    <string name="typ_Leisure">Afþreying</string>
+    <string name="typ_News">Fréttir</string>
+    <string name="typ_National">Þjóðleg tónlist</string>
+    <string name="typ_Other">Önnur tónlist</string>
+    <string name="typ_Oldies">Ellismellir</string>
+    <string name="typ_Phone_in">Símatímar</string>
+    <string name="typ_Pop">Popptónlist</string>
+    <string name="typ_Religion">Trúarbrögð</string>
+    <string name="typ_Rock">Rokktónlist</string>
+    <string name="typ_Science">Vísindi</string>
+    <string name="typ_Serious_classical">Alvarleg klassísk tónlist</string>
+    <string name="typ_Social_affairs">Samfélagslegt</string>
+    <string name="typ_Sport">Íþróttir</string>
+    <string name="typ_Travel">Ferðalög</string>
+    <string name="typ_Varied">Ýmislegt</string>
+    <string name="typ_Weather">Veður</string>
+    <string name="typ_Adult_hits">Fyrir fullorðna</string>
+    <string name="typ_Classical">Klassísk tónlist</string>
+    <string name="typ_Classic_Rock">Klassískt rokk</string>
+    <string name="typ_College">Framhaldskóla</string>
+    <string name="typ_Foreign_language">Erlend tungumál</string>
+    <string name="typ_Hiphop">Hipphopp</string>
+    <string name="typ_Nostalgia">Fortíðarþrá</string>
+    <string name="typ_Personality">Þekkt fólk</string>
+    <string name="typ_Public">Opinbert</string>
+    <string name="typ_Religious_music">Trúarleg tónlist</string>
+    <string name="typ_Religious_talk">Trúarlegar umræður</string>
+    <string name="typ_Rhythm_and_Blues">Taktur og tregi</string>
+    <string name="typ_Spanish_music">Spænsk tónlist</string>
+    <string name="typ_Spanish_talk">Spjall á spænsku</string>
+    <string name="typ_Soft">Mjúkt</string>
+    <string name="typ_Soft_Rock">Mjúkt rokk</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Mjúkur taktur og tregi</string>
+    <string name="typ_Sports">Íþróttir</string>
+    <string name="typ_Talk">Spjall</string>
+    <string name="typ_Top_40">Vinsælustu 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-it/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-it/arrays.xml
index cb1457b..66c2f52 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-it/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuti</item>
+    <item>15 minuti</item>
+    <item>30 minuti</item>
+    <item>Fino all\'arresto</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuti</item>
+    <item>30 minuti</item>
+    <item>45 minuti</item>
+    <item>1 ora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-it/strings.xml b/fmapp2/res/values-it/strings.xml
new file mode 100644
index 0000000..1a5cbce
--- /dev/null
+++ b/fmapp2/res/values-it/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Trasmettitore FM</string>
+    <string name="menu_scan_start">Scansione</string>
+    <string name="menu_scan_stop">Interrompi la ricerca</string>
+    <string name="menu_record_start">Registra</string>
+    <string name="menu_record_stop">Interrompi la registrazione</string>
+    <string name="menu_settings">Impostazioni</string>
+    <string name="menu_sleep">Sospendi</string>
+    <string name="menu_sleep_cancel">Annulla sospensione</string>
+    <string name="menu_all_channels">Tutti i canali</string>
+    <string name="menu_display_tags">Visualizza Tag</string>
+    <string name="button_text_stop">Stop</string>
+    <string name="msg_seeking">Ricerca stazione FM\u2026</string>
+    <string name="msg_scanning">Scansione di tutte le stazioni FM\u2026</string>
+    <string name="msg_scanning_pty">Scansione di \'<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-selezione preimpostazioni</string>
+    <string name="msg_searching">Ricerca di stazioni forti per le preimpostazioni\u2026</string>
+    <string name="msg_noantenna">Inserire un auricolare per utilizzare la radio FM</string>
+    <string name="dialog_sleep_title">Tempo di spegnimento automatico</string>
+    <string name="presetlist_select_name">Seleziona \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Aggiungi nuovo elenco</string>
+    <string name="dialog_presetlist_rename_title">Inserisci nome</string>
+    <string name="presetlist_autoselect_title">Conferma la selezione automatica</string>
+    <string name="preset_replace">Sostituisci</string>
+    <string name="preset_tune">Regola</string>
+    <string name="preset_rename">Rinomina</string>
+    <string name="preset_delete">Elimina</string>
+    <string name="preset_search">Ricerca di \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Banda regionale</string>
+    <string name="regional_band_entry_north_america">Nord America</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Giappone</string>
+    <string name="regional_band_entry_japan_wide">Giappone (banda larga)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgio</string>
+    <string name="regional_band_entry_brazil">Brasile</string>
+    <string name="regional_band_entry_china">Cina</string>
+    <string name="regional_band_entry_czech_republic">Repubblica Ceca</string>
+    <string name="regional_band_entry_denmark">Danimarca</string>
+    <string name="regional_band_entry_finland">Finlandia</string>
+    <string name="regional_band_entry_france">Francia</string>
+    <string name="regional_band_entry_germany">Germania</string>
+    <string name="regional_band_entry_greece">Grecia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Corea</string>
+    <string name="regional_band_entry_mexico">Messico</string>
+    <string name="regional_band_entry_netherlands">Olanda</string>
+    <string name="regional_band_entry_new_zealand">Nuova Zelanda</string>
+    <string name="regional_band_entry_norway">Norvegia</string>
+    <string name="regional_band_entry_poland">Polonia</string>
+    <string name="regional_band_entry_portugal">Portogallo</string>
+    <string name="regional_band_entry_russia">Russia</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovacchia</string>
+    <string name="regional_band_entry_spain">Spagna</string>
+    <string name="regional_band_entry_switzerland">Svizzera</string>
+    <string name="regional_band_entry_sweden">Svezia</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turchia</string>
+    <string name="regional_band_entry_united_kingdom">Regno Unito</string>
+    <string name="regional_band_entry_united_states">Stati Uniti</string>
+    <string name="regional_band_entry_user_defined">Banda definita dall\'utente</string>
+    <string name="regional_band_summary_north_america">Nord America (da 87.5MHz a 108.0MHz in fasi da 200 KHz)</string>
+    <string name="regional_band_summary_europe">Europa (da 87.5MHz a 108.0MHz in fasi da 100KHz)</string>
+    <string name="regional_band_summary_japan">Giappone (da 76.0MHz a 90.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_japan_wide">Giappone (ampia) (da 90.0MHz a 108.0MHz con fasi da 50KHz)</string>
+    <string name="regional_band_summary_australia">Australia (da 87.7MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_austria">Australia (da 87.7MHz a 108.0MHz con fasi da 50KHz)</string>
+    <string name="regional_band_summary_belgium">Belgio (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_brazil">Brasile (da 87.5MHz a 108.0MHz con fasi da 200KHz)</string>
+    <string name="regional_band_summary_china">Cina (da 87.0MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_czech_republic">Repubblica Ceca (da 87.5 a 108.0 MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_denmark">Danimarca (da 87.5MHz a 108.0MHz con fasi da 50KHz)</string>
+    <string name="regional_band_summary_finland">Finlandia (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_france">Francia (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_germany">Danimarca (da 87.5MHz a 108.0MHz con fasi da 50KHz)</string>
+    <string name="regional_band_summary_greece">Grecia (da 87.5MHz a 108.0MHz con fasi da 50KHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_india">India (87,5MHz a 108,0MHz con fasi da 100 KHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87,5MHz a 108,0MHz con fasi da 100 KHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (da 87.5MHz a 108.0MHz con fasi da 50KHz)</string>
+    <string name="regional_band_summary_italy">Italia (da 87.5MHz a 108.0MHz con fasi da 50KHz)</string>
+    <string name="regional_band_summary_korea">Corea (da 87.5MHz a 108.0MHz con fasi da 200KHz)</string>
+    <string name="regional_band_summary_mexico">Messico (da 88.1MHz a 107.9MHz con fasi da 200KHz)</string>
+    <string name="regional_band_summary_netherlands">Paesi Bassi (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_new_zealand">Nuova Zelanda (da 88.0MHz a 107.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_norway">Norvegia (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_poland">Polonia (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_portugal">Portogallo (da 87.5MHz a 108.0MHz con fasi da 50KHz)</string>
+    <string name="regional_band_summary_russia">Russia (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_singapore">Singapore (da 88.0MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_slovakia">Slovacchia (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_spain">Spagna (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_switzerland">Svizzera (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_sweden">Svezia (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_turkey">Turchia (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_united_kingdom">Regno Unito (da 87.5MHz a 108.0MHz con fasi da 100KHz)</string>
+    <string name="regional_band_summary_united_states">Stati Uniti (da 88.1MHz a 107.9MHz con fasi da 200KHz)</string>
+    <string name="regional_band_summary_user_defined">Banda definita dall\'utente</string>
+    <string name="aud_output_mode">Modalità di uscita audio</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Durata registrazione</string>
+    <string name="auto_select_af">Frequenza alternativa</string>
+    <string name="settings_revert_defaults_title">Ripristina impostazioni predefinite di fabbrica</string>
+    <string name="settings_revert_defaults_summary">Ripristina tutte le impostazioni</string>
+    <string name="settings_revert_confirm_title">Conferma ripristino</string>
+    <string name="settings_revert_confirm_msg">Questo cancellerà tutte le impostazioni dell\'app, incluse le preimpostazioni salvate. Continuare?</string>
+    <string name="no_storage">Inserisci la scheda SD prima di iniziare a registrare.</string>
+    <string name="preparing_sd">Preparazione scheda SD\u2026</string>
+    <string name="access_sd_fail">Impossibile accedere alla scheda SD.</string>
+    <string name="spaceIsLow_content">Lo spazio sulla scheda SD si sta esaurendo. Cambia il settaggio della qualità o elimina alcune immagini o altri file.</string>
+    <string name="FMRecording_reach_size_limit">Raggiunto il limite di registrazione.</string>
+    <string name="menu_scan_for_preset">Scansione per predefiniti</string>
+    <string name="fm_off">FM spenta.</string>
+    <string name="fm_call">FM non può essere utilizzata durante una chiamata.</string>
+    <string name="alert_dialog_hint">Immettere un nome</string>
+    <string name="search_dialog_title">Ricerca stazioni</string>
+    <string name="fm_command_timeout_title">Timeout</string>
+    <string name="fm_tune_timeout_msg">Nessuna risposta ricevuta nella sintonia della stazione FM. Se il problema persiste, si prega di spegnere e riaccendere FM.</string>
+    <string name="fm_command_failed_title">Operazione FM non riuscita</string>
+    <string name="fm_cmd_failed_msg">Operazione FM non riuscita. Se il problema persiste, si prega di spegnere e riaccendere FM.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Operazione FM non riuscita. La concorrenza di FM e HDMI non è supportata.</string>
+    <string name="fm_cmd_failed_call_on">Operazione FM non riuscita. L\'audio FM non è consentito durante una chiamata.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Le mie registrazioni FM</string>
+    <string name="audio_db_album_name">Registrazioni FM</string>
+    <string name="audio_db_playlist_name">Registrazioni FM</string>
+    <string name="station_name">Stazione:</string>
+    <string name="station_exists">Questa frequenza esiste già!</string>
+    <string name="station_list_delete_station">Elimina: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Sicuro di voler eliminare \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Il nome della stazione è vuoto, immettere nuovamente.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' è già in uso, immettere un nome diverso.</string>
+    <string name="rt_plus_tags">Tag</string>
+    <string name="usr_def_band_min">Frequenza minima (MHz)</string>
+    <string name="usr_def_band_max">Frequenza massima (MHz)</string>
+    <string name="chanl_spacing">Spaziatura tra i canali</string>
+    <string name="set">Imposta</string>
+    <string name="user_defind_band_msg">Inserisci una frequenza fra 76.0 e 108.0 MHz con almeno un canale e con 100 kHz di differenza fra la frequenza minima e quella massima</string>
+    <string name="save_record_file">File di registrazione FM salvato in \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nessuna stazione compatibile trovata</string>
+    <string name="typ_All_stations">Tutte le stazioni</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Attualità</string>
+    <string name="typ_Children">Programmi per bambini</string>
+    <string name="typ_Country">Musica country</string>
+    <string name="typ_Documentary">Documentario</string>
+    <string name="typ_Drama">Recitazione</string>
+    <string name="typ_Easy_listening">Musica da intrattenimento</string>
+    <string name="typ_Education">Educazione</string>
+    <string name="typ_Emergency">Emergenza</string>
+    <string name="typ_Emergency_test">Test di emergenza</string>
+    <string name="typ_Finance">Finanza</string>
+    <string name="typ_Folk">Musica folk</string>
+    <string name="typ_Information">Informazione</string>
+    <string name="typ_Jazz">Musica jazz</string>
+    <string name="typ_Light_classical">Musica classica leggera</string>
+    <string name="typ_Leisure">Tempo libero</string>
+    <string name="typ_News">Notizie</string>
+    <string name="typ_National">Musica nazionale</string>
+    <string name="typ_Other">Altra musica</string>
+    <string name="typ_Oldies">Vecchie canzoni</string>
+    <string name="typ_Phone_in">Con telefonate</string>
+    <string name="typ_Pop">Musica pop</string>
+    <string name="typ_Religion">Religione</string>
+    <string name="typ_Rock">Musica rock</string>
+    <string name="typ_Science">Scienza</string>
+    <string name="typ_Serious_classical">Musica classica</string>
+    <string name="typ_Social_affairs">Questioni sociali</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Viaggi</string>
+    <string name="typ_Varied">Varie</string>
+    <string name="typ_Weather">Tempo</string>
+    <string name="typ_Adult_hits">Hits adulti</string>
+    <string name="typ_Classical">Classica</string>
+    <string name="typ_Classic_Rock">Rock classico</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Lingua straniera</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personalità</string>
+    <string name="typ_Public">Pubblica</string>
+    <string name="typ_Religious_music">Musica religiosa</string>
+    <string name="typ_Religious_talk">Discussione religiosa</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm e Blues</string>
+    <string name="typ_Spanish_music">Musica spagnola</string>
+    <string name="typ_Spanish_talk">Conversazione spagnola</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm e Blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Conversazione</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-iw/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-iw/arrays.xml
index cb1457b..3a55220 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-iw/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>סטריאו</item>
+    <item>מונו</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>שעה אחת</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50KHz</item>
+    <item>100KHz</item>
+    <item>200KHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-iw/strings.xml b/fmapp2/res/values-iw/strings.xml
new file mode 100644
index 0000000..308b1bf
--- /dev/null
+++ b/fmapp2/res/values-iw/strings.xml
@@ -0,0 +1,233 @@
+<?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</string>
+    <string name="tx_app_name">משדר FM</string>
+    <string name="menu_scan_start">סריקה</string>
+    <string name="menu_scan_stop">הפסקת חיפוש</string>
+    <string name="menu_record_start">הקלטה</string>
+    <string name="menu_record_stop">הפסקת הקלטה</string>
+    <string name="menu_settings">הגדרות</string>
+    <string name="menu_sleep">שינה</string>
+    <string name="menu_sleep_cancel">בטל שינה</string>
+    <string name="menu_all_channels">כל הערוצים</string>
+    <string name="menu_display_tags">הצג תגיות</string>
+    <string name="button_text_stop">עצור</string>
+    <string name="msg_seeking">מחפש תחנת FM\u2026</string>
+    <string name="msg_scanning">סורק את כל תחנות ה-FM\u2026</string>
+    <string name="msg_scanning_pty">מחפש את \"<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">בוחר אוטומטית תחנות קבועות מראש</string>
+    <string name="msg_searching">מחפש תחנות בעלות קליטה טובה על מנת לבנות רשימת תחנות קבועות מראש\u2026</string>
+    <string name="msg_noantenna">נא לחבר אוזניות כדי להשתמש ברדיו FM</string>
+    <string name="dialog_sleep_title">זמן שינה לפני כיבוי אוטומטי</string>
+    <string name="presetlist_select_name">בחירת \"<xliff:g id="presetlist_name">%1$s</xliff:g>\"</string>
+    <string name="presetlist_add_new">הוספת רשימה חדשה</string>
+    <string name="dialog_presetlist_rename_title">הזנת שם</string>
+    <string name="presetlist_autoselect_title">אישור בחירה אוטומטית</string>
+    <string name="preset_replace">החלפה</string>
+    <string name="preset_tune">כיוון ידני</string>
+    <string name="preset_rename">שינוי שם</string>
+    <string name="preset_delete">מחיקה</string>
+    <string name="preset_search">חיפוש עבור \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\"<xliff:g id="frequency">%1$s</xliff:g>\" MHz</string>
+    <string name="regional_band">טווח אזורי</string>
+    <string name="regional_band_entry_north_america">צפון אמריקה</string>
+    <string name="regional_band_entry_europe">אירופה</string>
+    <string name="regional_band_entry_japan">יפן</string>
+    <string name="regional_band_entry_japan_wide">יפן (רחב)</string>
+    <string name="regional_band_entry_australia">אוסטרליה</string>
+    <string name="regional_band_entry_austria">אוסטריה</string>
+    <string name="regional_band_entry_belgium">בלגיה</string>
+    <string name="regional_band_entry_brazil">ברזיל</string>
+    <string name="regional_band_entry_china">סין</string>
+    <string name="regional_band_entry_czech_republic">צ\'כיה</string>
+    <string name="regional_band_entry_denmark">דנמרק</string>
+    <string name="regional_band_entry_finland">פינלנד</string>
+    <string name="regional_band_entry_france">צרפת</string>
+    <string name="regional_band_entry_germany">גרמניה</string>
+    <string name="regional_band_entry_greece">יוון</string>
+    <string name="regional_band_entry_hong_kong">הונג קונג</string>
+    <string name="regional_band_entry_india">הודו</string>
+    <string name="regional_band_entry_indonesia">אינדונזיה</string>
+    <string name="regional_band_entry_ireland">אירלנד</string>
+    <string name="regional_band_entry_italy">איטליה</string>
+    <string name="regional_band_entry_korea">קוריאה</string>
+    <string name="regional_band_entry_mexico">מקסיקו</string>
+    <string name="regional_band_entry_netherlands">הולנד</string>
+    <string name="regional_band_entry_new_zealand">ניו זילנד</string>
+    <string name="regional_band_entry_norway">נורווגיה</string>
+    <string name="regional_band_entry_poland">פולין</string>
+    <string name="regional_band_entry_portugal">פורטוגל</string>
+    <string name="regional_band_entry_russia">רוסיה</string>
+    <string name="regional_band_entry_singapore">סינגפור</string>
+    <string name="regional_band_entry_slovakia">סלובקיה</string>
+    <string name="regional_band_entry_spain">ספרד</string>
+    <string name="regional_band_entry_switzerland">שוויץ</string>
+    <string name="regional_band_entry_sweden">שוודיה</string>
+    <string name="regional_band_entry_taiwan">טייוואן</string>
+    <string name="regional_band_entry_turkey">טורקיה</string>
+    <string name="regional_band_entry_united_kingdom">בריטניה</string>
+    <string name="regional_band_entry_united_states">ארצות הברית</string>
+    <string name="regional_band_entry_user_defined">טווח מותאם אישית</string>
+    <string name="regional_band_summary_north_america">צפון אמריקה (87.5MHz עד 108.0MHz בקפיצות של 200kHz)</string>
+    <string name="regional_band_summary_europe">אירופה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_japan">יפן (76.0MHz עד 90.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_japan_wide">יפן (רחב) (90.0MHz עד 108.0MHz בקפיצות של 50kHz)</string>
+    <string name="regional_band_summary_australia">אוסטרליה (87.7MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_austria">אוסטריה (87.5MHz עד 108.0MHz בקפיצות של 50kHz)</string>
+    <string name="regional_band_summary_belgium">בלגיה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_brazil">ברזיל (87.5MHz עד 108.0MHz בקפיצות של 200kHz)</string>
+    <string name="regional_band_summary_china">סין (87.0MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_czech_republic">צ\'כיה (87.5MHz עד 108.0MHz בקפיצות של 100KHz)</string>
+    <string name="regional_band_summary_denmark">דנמרק (87.5MHz עד 108.0MHz בקפיצות של 50kHz)</string>
+    <string name="regional_band_summary_finland">פינלנד (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_france">צרפת (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_germany">גרמניה (87.5MHz עד 108.0MHz בקפיצות של 50kHz)</string>
+    <string name="regional_band_summary_greece">יוון (87.5MHz עד 108.0MHz בקפיצות של 50kHz)</string>
+    <string name="regional_band_summary_hong_kong">הונג קונג (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_india">הודו (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_indonesia">אינדונזיה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_ireland">אירלנד (87.5MHz עד 108.0MHz בקפיצות של 50kHz)</string>
+    <string name="regional_band_summary_italy">איטליה (87.5MHz עד 108.0MHz בקפיצות של 50kHz)</string>
+    <string name="regional_band_summary_korea">קוריאה (87.5MHz עד 108.0MHz בקפיצות של 200kHz)</string>
+    <string name="regional_band_summary_mexico">מקסיקו (88.1MHz עד 107.9MHz בקפיצות של 200kHz)</string>
+    <string name="regional_band_summary_netherlands">הולנד (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_new_zealand">ניו זילנד (88.0MHz עד 107.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_norway">נורבגיה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_poland">פולין (87.5MHz עד 108.0MHz בקפיצות של 100KHz)</string>
+    <string name="regional_band_summary_portugal">פורטוגל (87.5MHz עד 108.0MHz בקפיצות של 50kHz)</string>
+    <string name="regional_band_summary_russia">רוסיה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_singapore">סינגפור (88.0MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_slovakia">סלובקיה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_spain">ספרד (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_switzerland">שוויץ (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_sweden">שבדיה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_taiwan">טייוואן (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_turkey">טורקיה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_united_kingdom">בריטניה (87.5MHz עד 108.0MHz בקפיצות של 100kHz)</string>
+    <string name="regional_band_summary_united_states">ארצות הברית (88.1MHz עד 107.9MHz בקפיצות של 200kHz)</string>
+    <string name="regional_band_summary_user_defined">טווח מותאם אישית</string>
+    <string name="aud_output_mode">מצב פלט שמע</string>
+    <string name="audio_type_stereo">סטריאו</string>
+    <string name="audio_type_mono">מונו</string>
+    <string name="record_dur">משך הקלטה</string>
+    <string name="auto_select_af">תדר חלופי</string>
+    <string name="settings_revert_defaults_title">שחזור להגדרות ברירת מחדל</string>
+    <string name="settings_revert_defaults_summary">איפוס כל ההגדרות</string>
+    <string name="settings_revert_confirm_title">אישור לאיפוס</string>
+    <string name="settings_revert_confirm_msg">פעולה זו תמחק את כל הגדרות היישום, כולל תחנות קבועות מראש שנשמרו. האם להמשיך?</string>
+    <string name="no_storage">עיגון כרטיס זיכרון לפי תחילת ההקלטה.</string>
+    <string name="preparing_sd">הכנת כרטיס זיכרון\u2026</string>
+    <string name="access_sd_fail">אין אפשרות לגשת לכרטיס הזיכרון.</string>
+    <string name="spaceIsLow_content">שטח האחסון בכרטיס הזיכרון שלך אוזל. שנה את הגדרות האיכות או מחק קבצים אחרים כדי לפנות מקום.</string>
+    <string name="FMRecording_reach_size_limit">הגעת למגבלת הגודל.</string>
+    <string name="menu_scan_for_preset">סרוק למציאת תחנות קבועות מראש</string>
+    <string name="fm_off">FM כבוי.</string>
+    <string name="fm_call">לא ניתן להשתמש ב-FM במהלך ביצוע שיחה.</string>
+    <string name="alert_dialog_hint">הזנת שם</string>
+    <string name="search_dialog_title">סריקת תחנות</string>
+    <string name="fm_command_timeout_title">זמן קצוב לתפוגה</string>
+    <string name="fm_tune_timeout_msg">אין קליטה מהתחנה הנבחרת. אם הבעיה חוזרת על עצמה, כבה את מקלט ה-FM והפעל אותו שנית.</string>
+    <string name="fm_command_failed_title">פעולת FM נכשלה</string>
+    <string name="fm_cmd_failed_msg">פעולת FM נכשלה. אם הבעיה חוזרת על עצמה, כבה את מקלט ה-FM והפעל אותו שנית.</string>
+    <string name="fm_cmd_failed_msg_hdmi">פעולת FM נכשלה. התרחשות בו זמנית של FM ו-HDMI אינה נתמכת.</string>
+    <string name="fm_cmd_failed_call_on">כשל בהפעלת רדיו FM. רדיו FM אינו מאושר לשימוש במהלך שיחה.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">הקלטות ה- FM שלי</string>
+    <string name="audio_db_album_name">הקלטות FM</string>
+    <string name="audio_db_playlist_name">הקלטות FM</string>
+    <string name="station_name">תחנה:</string>
+    <string name="station_exists">תדר זה כבר קיים!</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="station_name_empty">שם התחנה ריק, נא להזין שוב.</string>
+    <string name="station_name_exist">\"<xliff:g id="name">%s</xliff:g>\" כבר נמצא בשימוש, נא להזין שם אחר.</string>
+    <string name="rt_plus_tags">תגיות</string>
+    <string name="usr_def_band_min">התדר הנמוך ביותר (MHz)</string>
+    <string name="usr_def_band_max">התדר הגבוה ביותר (MHz)</string>
+    <string name="chanl_spacing">מרווח ערוץ</string>
+    <string name="set">הגדרה</string>
+    <string name="user_defind_band_msg">הזן תדר בין 76.0 ל־108.0 מגה-הרץ עם מרווח ערוץ אחד לפחות ו־100 קילו-הרץ מרווח בין התדר הנמוך לגבוה</string>
+    <string name="save_record_file">קובץ ההקלטה נשמר אל \"<xliff:g id="record_file">%1$s</xliff:g>\"</string>
+    <string name="fm_search_no_results">לא נמצאו תחנות תואמות</string>
+    <string name="typ_All_stations">כל התחנות</string>
+    <string name="typ_Culture">תרבות</string>
+    <string name="typ_Current_affairs">אקטואליה</string>
+    <string name="typ_Children">תוכניות ילדים</string>
+    <string name="typ_Country">מוזיקת קאנטרי</string>
+    <string name="typ_Documentary">תיעודי</string>
+    <string name="typ_Drama">דרמה</string>
+    <string name="typ_Easy_listening">מוזיקה קלה להאזנה</string>
+    <string name="typ_Education">חינוך</string>
+    <string name="typ_Emergency">חירום</string>
+    <string name="typ_Emergency_test">בדיקת חירום</string>
+    <string name="typ_Finance">כלכלה</string>
+    <string name="typ_Folk">מוזיקת פולק</string>
+    <string name="typ_Information">מידע</string>
+    <string name="typ_Jazz">מוזיקת ג\'אז</string>
+    <string name="typ_Light_classical">קלאסי קל</string>
+    <string name="typ_Leisure">פנאי</string>
+    <string name="typ_News">חדשות</string>
+    <string name="typ_National">מוזיקה לאומית</string>
+    <string name="typ_Other">מוזיקה אחרת</string>
+    <string name="typ_Oldies">מוזיקת אולדיז</string>
+    <string name="typ_Phone_in">בטלפון</string>
+    <string name="typ_Pop">מוזיקת פופ</string>
+    <string name="typ_Religion">דת</string>
+    <string name="typ_Rock">מוזיקת רוק</string>
+    <string name="typ_Science">מדע</string>
+    <string name="typ_Serious_classical">קלאסי רציני</string>
+    <string name="typ_Social_affairs">רווחה</string>
+    <string name="typ_Sport">ספורט</string>
+    <string name="typ_Travel">תיירות</string>
+    <string name="typ_Varied">מגוון</string>
+    <string name="typ_Weather">מזג אוויר</string>
+    <string name="typ_Adult_hits">להיטים למבוגרים</string>
+    <string name="typ_Classical">קלאסי</string>
+    <string name="typ_Classic_Rock">רוק קלאסי</string>
+    <string name="typ_College">מכללות</string>
+    <string name="typ_Foreign_language">שפה זרה</string>
+    <string name="typ_Hiphop">היפ הופ</string>
+    <string name="typ_Nostalgia">נוסטלגיה</string>
+    <string name="typ_Personality">אישיות</string>
+    <string name="typ_Public">ציבורי</string>
+    <string name="typ_Religious_music">מוזיקה דתית</string>
+    <string name="typ_Religious_talk">שיחות על דת</string>
+    <string name="typ_Rhythm_and_Blues">רית\'ם אנד בלוז</string>
+    <string name="typ_Spanish_music">מוזיקה ספרדית</string>
+    <string name="typ_Spanish_talk">שיחות בספרדית</string>
+    <string name="typ_Soft">רך</string>
+    <string name="typ_Soft_Rock">רוק רך</string>
+    <string name="typ_Soft_Rhythm_and_Blues">רית\'ם אנד בלוז רך</string>
+    <string name="typ_Sports">ספורט</string>
+    <string name="typ_Talk">שיחות</string>
+    <string name="typ_Top_40">ה- 40 המובילים</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ja/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ja/arrays.xml
index cb1457b..412e5ba 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ja/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>ステレオ</item>
+    <item>モノラル</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50kHz</item>
+    <item>100kHz</item>
+    <item>200kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ja/strings.xml b/fmapp2/res/values-ja/strings.xml
new file mode 100644
index 0000000..6a7c4f4
--- /dev/null
+++ b/fmapp2/res/values-ja/strings.xml
@@ -0,0 +1,232 @@
+<?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ラジオ</string>
+    <string name="tx_app_name">FMトランスミッター</string>
+    <string name="menu_scan_start">スキャン</string>
+    <string name="menu_scan_stop">検索を中止</string>
+    <string name="menu_record_start">録音</string>
+    <string name="menu_record_stop">録音停止</string>
+    <string name="menu_settings">設定</string>
+    <string name="menu_sleep">スリープ</string>
+    <string name="menu_sleep_cancel">スリープをキャンセル</string>
+    <string name="menu_all_channels">すべてのチャンネル</string>
+    <string name="menu_display_tags">タグを表示</string>
+    <string name="button_text_stop">停止</string>
+    <string name="msg_seeking">FM局を検索中...</string>
+    <string name="msg_scanning">すべてのFM局をスキャン中...</string>
+    <string name="msg_scanning_pty">[<xliff:g id="pty_name">%1$s</xliff:g>]をスキャン中...</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">自動選択プリセット</string>
+    <string name="msg_searching">プリセットリストを作成するために電波の強い局を検索中...</string>
+    <string name="msg_noantenna">FMラジオを使用するにはヘッドセットを接続してください</string>
+    <string name="dialog_sleep_title">自動終了スリープ時間</string>
+    <string name="presetlist_add_new">新しいリストを追加</string>
+    <string name="dialog_presetlist_rename_title">名前を入力:</string>
+    <string name="presetlist_autoselect_title">自動選択を確認</string>
+    <string name="preset_replace">置き換える</string>
+    <string name="preset_tune">チューニング</string>
+    <string name="preset_rename">名前の変更</string>
+    <string name="preset_delete">削除</string>
+    <string name="preset_search">｢<xliff:g id="preset_pi">%1$s</xliff:g>｣を検索</string>
+    <string name="stat_notif_frequency">｢<xliff:g id="frequency">%1$s</xliff:g>｣MHz</string>
+    <string name="regional_band">地域帯域</string>
+    <string name="regional_band_entry_north_america">北アメリカ</string>
+    <string name="regional_band_entry_europe">ヨーロッパ</string>
+    <string name="regional_band_entry_japan">日本</string>
+    <string name="regional_band_entry_japan_wide">日本（ワイド）</string>
+    <string name="regional_band_entry_australia">オーストラリア</string>
+    <string name="regional_band_entry_austria">オーストリア</string>
+    <string name="regional_band_entry_belgium">ベルギー</string>
+    <string name="regional_band_entry_brazil">ブラジル</string>
+    <string name="regional_band_entry_china">中国</string>
+    <string name="regional_band_entry_czech_republic">チェコ共和国</string>
+    <string name="regional_band_entry_denmark">デンマーク</string>
+    <string name="regional_band_entry_finland">フィンランド</string>
+    <string name="regional_band_entry_france">フランス</string>
+    <string name="regional_band_entry_germany">ドイツ</string>
+    <string name="regional_band_entry_greece">ギリシャ</string>
+    <string name="regional_band_entry_hong_kong">香港</string>
+    <string name="regional_band_entry_india">インド</string>
+    <string name="regional_band_entry_indonesia">インドネシア</string>
+    <string name="regional_band_entry_ireland">アイルランド</string>
+    <string name="regional_band_entry_italy">イタリア</string>
+    <string name="regional_band_entry_korea">韓国</string>
+    <string name="regional_band_entry_mexico">メキシコ</string>
+    <string name="regional_band_entry_netherlands">オランダ</string>
+    <string name="regional_band_entry_new_zealand">ニュージーランド</string>
+    <string name="regional_band_entry_norway">ノルウェー</string>
+    <string name="regional_band_entry_poland">ポーランド</string>
+    <string name="regional_band_entry_portugal">ポルトガル</string>
+    <string name="regional_band_entry_russia">ロシア</string>
+    <string name="regional_band_entry_singapore">シンガポール</string>
+    <string name="regional_band_entry_slovakia">スロバキア</string>
+    <string name="regional_band_entry_spain">スペイン</string>
+    <string name="regional_band_entry_switzerland">スイス</string>
+    <string name="regional_band_entry_sweden">スウェーデン</string>
+    <string name="regional_band_entry_taiwan">台湾</string>
+    <string name="regional_band_entry_turkey">トルコ</string>
+    <string name="regional_band_entry_united_kingdom">イギリス</string>
+    <string name="regional_band_entry_united_states">アメリカ合衆国</string>
+    <string name="regional_band_entry_user_defined">ユーザー定義バンド</string>
+    <string name="regional_band_summary_north_america">北アメリカ（87.5MHz～108.0MHz 200kHzステップ）</string>
+    <string name="regional_band_summary_europe">ヨーロッパ（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_japan">日本（76.0MHz～90.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_japan_wide">日本（ワイド）（90.0MHz～108.0MHz 50kHzステップ）</string>
+    <string name="regional_band_summary_australia">オーストラリア（87.7MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_austria">オーストリア（87.5MHz～108.0MHz 50kHzステップ）</string>
+    <string name="regional_band_summary_belgium">ベルギー（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_brazil">ブラジル（87.5MHz～108.0MHz 200kHzステップ）</string>
+    <string name="regional_band_summary_china">中国（87.0MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_czech_republic">チェコ共和国（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_denmark">デンマーク（87.5MHz～108.0MHz 50kHzステップ）</string>
+    <string name="regional_band_summary_finland">フィンランド（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_france">フランス（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_germany">ドイツ（87.5MHz～108.0MHz 50kHzステップ）</string>
+    <string name="regional_band_summary_greece">ギリシャ（87.5MHz～108.0MHz 50kHzステップ）</string>
+    <string name="regional_band_summary_hong_kong">香港（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_india">インド（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_indonesia">インドネシア（87.5MHz～108.0MHz 100kHzステップ)</string>
+    <string name="regional_band_summary_ireland">アイルランド（87.5MHz～108.0MHz 50kHzステップ）</string>
+    <string name="regional_band_summary_italy">イタリア（87.5MHz～108.0MHz 50kHzステップ）</string>
+    <string name="regional_band_summary_korea">韓国（87.5MHz～108.0MHz 200kHzステップ）</string>
+    <string name="regional_band_summary_mexico">メキシコ（88.1MHz～107.9MHz 200kHzステップ）</string>
+    <string name="regional_band_summary_netherlands">オランダ（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_new_zealand">ニュージーランド（88.0MHz～107.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_norway">ノルウェー（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_poland">ポーランド（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_portugal">ポルトガル（87.5MHz～108.0MHz 50kHzステップ）</string>
+    <string name="regional_band_summary_russia">ロシア（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_singapore">シンガポール（88.0MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_slovakia">スロバキア（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_spain">スペイン（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_switzerland">スイス（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_sweden">スウェーデン（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_taiwan">台湾（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_turkey">トルコ（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_united_kingdom">イギリス（87.5MHz～108.0MHz 100kHzステップ）</string>
+    <string name="regional_band_summary_united_states">アメリカ合衆国（88.1MHz～107.9MHz 200kHzステップ）</string>
+    <string name="regional_band_summary_user_defined">ユーザー定義バンド</string>
+    <string name="aud_output_mode">オーディオ出力モード</string>
+    <string name="audio_type_stereo">ステレオ</string>
+    <string name="audio_type_mono">モノラル</string>
+    <string name="record_dur">録音時間</string>
+    <string name="auto_select_af">代用周波数</string>
+    <string name="settings_revert_defaults_title">出荷時のデフォルトに戻す</string>
+    <string name="settings_revert_defaults_summary">すべての設定をリセットする</string>
+    <string name="settings_revert_confirm_title">リセットを確認</string>
+    <string name="settings_revert_confirm_msg">保存したプリセットを含むすべてのアプリケーションの設定を消去します。続けますか？</string>
+    <string name="no_storage">録音を開始する前にSDカードをマウントしてください。</string>
+    <string name="preparing_sd">SDカードを準備中...</string>
+    <string name="access_sd_fail">SDカードにアクセスできませんでした。</string>
+    <string name="spaceIsLow_content">SDカードのストレージの容量が少なくなっています。音質の設定を変更するか、容量を空けるために他のファイルを一部削除してください。</string>
+    <string name="FMRecording_reach_size_limit">サイズの上限に達しました。</string>
+    <string name="menu_scan_for_preset">プリセットをスキャン</string>
+    <string name="fm_off">FMはOFFになっています。</string>
+    <string name="fm_call">通話中にFMは使用できません。</string>
+    <string name="alert_dialog_hint">名前を入力</string>
+    <string name="search_dialog_title">局をスキャン</string>
+    <string name="fm_command_timeout_title">タイムアウト</string>
+    <string name="fm_tune_timeout_msg">FM局のチューニングに対して応答がありません。問題が解決しなければFMをOFFにして、ONに戻してみてください。</string>
+    <string name="fm_command_failed_title">FMを操作できませんでした。</string>
+    <string name="fm_cmd_failed_msg">FMを操作できませんでした。問題が解決しなければFMをOFFにして、ONに戻してみてください。</string>
+    <string name="fm_cmd_failed_msg_hdmi">FMを操作できませんでした。FMとHDMIの同時実行はサポートされていません。</string>
+    <string name="fm_cmd_failed_call_on">FMを操作できませんでした。通話中のFMオーディオは許可されていません。</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">FM録音</string>
+    <string name="audio_db_album_name">FM録音</string>
+    <string name="audio_db_playlist_name">FM録音</string>
+    <string name="station_name">局:</string>
+    <string name="station_exists">この周波数は既に存在しています。</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="station_name_empty">局の名前が空です。もう一度入力してください。</string>
+    <string name="station_name_exist">[<xliff:g id="name">%s</xliff:g>]は既に使用されています。別の名前を入力してください。</string>
+    <string name="rt_plus_tags">タグ</string>
+    <string name="usr_def_band_min">最小周波数（MHz）</string>
+    <string name="usr_def_band_max">最大周波数（MHz）</string>
+    <string name="chanl_spacing">チャネル間隔</string>
+    <string name="set">設定</string>
+    <string name="user_defind_band_msg">76.0MHzから108.0MHzまでの間で最低周波数と最高周波数の間が100kHzになるように最小1チャネル間隔で周波数を入力してください。</string>
+    <string name="save_record_file">FM録音は[<xliff:g id="record_file">%1$s</xliff:g>]に保存されました。</string>
+    <string name="fm_search_no_results">互換性のある局が見つかりませんでした</string>
+    <string name="typ_All_stations">すべての局</string>
+    <string name="typ_Culture">文化</string>
+    <string name="typ_Current_affairs">時事問題</string>
+    <string name="typ_Children">子供向け番組</string>
+    <string name="typ_Country">カントリーミュージック</string>
+    <string name="typ_Documentary">ドキュメンタリー</string>
+    <string name="typ_Drama">ドラマ</string>
+    <string name="typ_Easy_listening">イージーリスニング音楽</string>
+    <string name="typ_Education">教育</string>
+    <string name="typ_Emergency">緊急</string>
+    <string name="typ_Emergency_test">緊急試験</string>
+    <string name="typ_Finance">ファイナンス</string>
+    <string name="typ_Folk">フォークミュージック</string>
+    <string name="typ_Information">情報</string>
+    <string name="typ_Jazz">ジャズ音楽</string>
+    <string name="typ_Light_classical">ライトクラシック</string>
+    <string name="typ_Leisure">レジャー</string>
+    <string name="typ_News">ニュース</string>
+    <string name="typ_National">ナショナル音楽</string>
+    <string name="typ_Other">その他の音楽</string>
+    <string name="typ_Oldies">オールディーズ音楽</string>
+    <string name="typ_Phone_in">視聴者参加型番組</string>
+    <string name="typ_Pop">ポップ音楽</string>
+    <string name="typ_Religion">宗教</string>
+    <string name="typ_Rock">ロック音楽</string>
+    <string name="typ_Science">科学</string>
+    <string name="typ_Serious_classical">シリアスクラシック</string>
+    <string name="typ_Social_affairs">社会問題</string>
+    <string name="typ_Sport">スポーツ</string>
+    <string name="typ_Travel">旅行</string>
+    <string name="typ_Varied">さまざまなカテゴリ</string>
+    <string name="typ_Weather">天気</string>
+    <string name="typ_Adult_hits">アダルトヒット</string>
+    <string name="typ_Classical">クラシック</string>
+    <string name="typ_Classic_Rock">クラシックロック</string>
+    <string name="typ_College">大学</string>
+    <string name="typ_Foreign_language">外国語</string>
+    <string name="typ_Hiphop">ヒップホップ</string>
+    <string name="typ_Nostalgia">ノスタルジア</string>
+    <string name="typ_Personality">パーソナリティ</string>
+    <string name="typ_Public">パブリック</string>
+    <string name="typ_Religious_music">宗教音楽</string>
+    <string name="typ_Religious_talk">宗教トーク</string>
+    <string name="typ_Rhythm_and_Blues">リズムとブルース</string>
+    <string name="typ_Spanish_music">スペイン音楽</string>
+    <string name="typ_Spanish_talk">スペイン語会話</string>
+    <string name="typ_Soft">ソフト</string>
+    <string name="typ_Soft_Rock">ソフトロック</string>
+    <string name="typ_Soft_Rhythm_and_Blues">ソフトリズムとブルース</string>
+    <string name="typ_Sports">スポーツ</string>
+    <string name="typ_Talk">トーク</string>
+    <string name="typ_Top_40">トップ40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ka/arrays.xml
similarity index 62%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ka/arrays.xml
index cb1457b..9883613 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ka/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>სტერეო</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 კჰც</item>
+    <item>100 კჰც</item>
+    <item>200 კჰც</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ka/strings.xml b/fmapp2/res/values-ka/strings.xml
new file mode 100644
index 0000000..b96f929
--- /dev/null
+++ b/fmapp2/res/values-ka/strings.xml
@@ -0,0 +1,233 @@
+<?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-რადიო</string>
+    <string name="tx_app_name">FM-გადამცემი</string>
+    <string name="menu_scan_start">მოძიება</string>
+    <string name="menu_scan_stop">ძიების შეწყვეტა</string>
+    <string name="menu_record_start">ჩაწერა</string>
+    <string name="menu_record_stop">ჩაწერის შეწყვეტა</string>
+    <string name="menu_settings">პარამეტრები</string>
+    <string name="menu_sleep">უქმი რეჟიმი</string>
+    <string name="menu_sleep_cancel">უქმი რეჟიმიდან გამოსვლა</string>
+    <string name="menu_all_channels">ყველა არხი</string>
+    <string name="menu_display_tags">ჭდეების ჩვენება</string>
+    <string name="button_text_stop">შეწყვეტა</string>
+    <string name="msg_seeking">მოძიება FM-სადგურის\u2026</string>
+    <string name="msg_scanning">მოძიება ყველა FM-სადგურის\u2026</string>
+    <string name="msg_scanning_pty">იძებნება „<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> მჰც</string>
+    <string name="msg_searching_title">მზა პარამეტრების თვითშერჩევა</string>
+    <string name="msg_searching">იძებნება მძლავრი სადგურები მზა პარამეტრების სიის შესადგენად\u2026</string>
+    <string name="msg_noantenna">გთხოვთ, შეაერთოთ ყურსასმენები FM-რადიოს გამოსაყენებლად</string>
+    <string name="dialog_sleep_title">თვითგამორთვის დრო</string>
+    <string name="presetlist_select_name">აირჩიეთ „\'<xliff:g id="presetlist_name">%1$s</xliff:g>“</string>
+    <string name="presetlist_add_new">ახალი სიის დამატება</string>
+    <string name="dialog_presetlist_rename_title">შეიყვანეთ სახელი</string>
+    <string name="presetlist_autoselect_title">თვითშერჩევის დამოწმება</string>
+    <string name="preset_replace">ჩანაცვლება</string>
+    <string name="preset_tune">მომართვა</string>
+    <string name="preset_rename">გადარქმევა</string>
+    <string name="preset_delete">წაშლა</string>
+    <string name="preset_search">მოიძიოს „<xliff:g id="preset_pi">%1$s</xliff:g>“</string>
+    <string name="stat_notif_frequency">„<xliff:g id="frequency">%1$s</xliff:g>“ მჰც</string>
+    <string name="regional_band">სამხარეო დიაპაზონი</string>
+    <string name="regional_band_entry_north_america">ჩრდილოეთი ამერიკა</string>
+    <string name="regional_band_entry_europe">ევროპა</string>
+    <string name="regional_band_entry_japan">იაპონია</string>
+    <string name="regional_band_entry_japan_wide">იაპონია (ფართო)</string>
+    <string name="regional_band_entry_australia">ავსტრალია</string>
+    <string name="regional_band_entry_austria">ავსტრია</string>
+    <string name="regional_band_entry_belgium">ბელგია</string>
+    <string name="regional_band_entry_brazil">ბრაზილია</string>
+    <string name="regional_band_entry_china">ჩინეთი</string>
+    <string name="regional_band_entry_czech_republic">ჩეხეთი</string>
+    <string name="regional_band_entry_denmark">დანია</string>
+    <string name="regional_band_entry_finland">ფინეთი</string>
+    <string name="regional_band_entry_france">საფრანგეთი</string>
+    <string name="regional_band_entry_germany">გერმანია</string>
+    <string name="regional_band_entry_greece">საბერძნეთი</string>
+    <string name="regional_band_entry_hong_kong">ჰონგკონგი</string>
+    <string name="regional_band_entry_india">ინდოეთი</string>
+    <string name="regional_band_entry_indonesia">ინდონეზია</string>
+    <string name="regional_band_entry_ireland">ირლანდია</string>
+    <string name="regional_band_entry_italy">იტალია</string>
+    <string name="regional_band_entry_korea">კორეა</string>
+    <string name="regional_band_entry_mexico">მექსიკა</string>
+    <string name="regional_band_entry_netherlands">ნიდერლანდი</string>
+    <string name="regional_band_entry_new_zealand">ახალი ზელანდია</string>
+    <string name="regional_band_entry_norway">ნორვეგია</string>
+    <string name="regional_band_entry_poland">პოლონეთი</string>
+    <string name="regional_band_entry_portugal">პორტუგალია</string>
+    <string name="regional_band_entry_russia">რუსეთი</string>
+    <string name="regional_band_entry_singapore">სინგაპური</string>
+    <string name="regional_band_entry_slovakia">სლოვაკეთი</string>
+    <string name="regional_band_entry_spain">ესპანეთი</string>
+    <string name="regional_band_entry_switzerland">შვეიცარია</string>
+    <string name="regional_band_entry_sweden">შვედეთი</string>
+    <string name="regional_band_entry_taiwan">ტაივანი</string>
+    <string name="regional_band_entry_turkey">თურქეთი</string>
+    <string name="regional_band_entry_united_kingdom">გაერთიანებული სამეფო</string>
+    <string name="regional_band_entry_united_states">შეერთებული შტატები</string>
+    <string name="regional_band_entry_user_defined">მითითებული დიაპაზონი</string>
+    <string name="regional_band_summary_north_america">ჩრდილოეთ ამერიკა (87.5 მჰც-დან 108.0 მჰც-მდე 200 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_europe">ევროპა (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_japan">იაპონია (76.0 მჰც-დან 90.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_japan_wide">იაპონია (ფართო) (90.0 მჰც-დან 108.0 მჰც-მდე 50 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_australia">ავსტრალია (87.7 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_austria">ავსტრია (87.5 მჰც-დან 108.0 მჰც-მდე 50 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_belgium">ბელგია (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_brazil">ბრაზილია (87.5 მჰც-დან 108.0 მჰც-მდე 200 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_china">ჩინეთი (87.0 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_czech_republic">ჩეხეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_denmark">დანია (87.5 მჰც-დან 108.0 მჰც-მდე 50 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_finland">ფინეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_france">საფრანგეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_germany">გერმანია (87.5 მჰც-დან 108.0 მჰც-მდე 50 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_greece">საბერძნეთი (87.5 მჰც-დან 108.0 მჰც-მდე 50 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_hong_kong">ჰონგ-კონგი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_india">ინდოეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_indonesia">ინდონეზია (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_ireland">ირლანდია (87.5 მჰც-დან 108.0 მჰც-მდე 50 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_italy">იტალია (87.5 მჰც-დან 108.0 მჰც-მდე 50 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_korea">კორეა (87.5 მჰც-დან 108.0 მჰც-მდე 200 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_mexico">მექსიკა (88.1 მჰც-დან 107.9 მჰც-მდე 200 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_netherlands">ნიდერლანდი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ნაბიჯით)</string>
+    <string name="regional_band_summary_new_zealand">ახალი ზელანდია (88.0 მჰც-დან 107.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_norway">ნორვეგია (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_poland">პოლონეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_portugal">პორტუგალია (87.5 მჰც-დან 108.0 მჰც-მდე 50 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_russia">რუსეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_singapore">სინგაპური (88.0 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_slovakia">სლოვაკეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_spain">ესპანეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_switzerland">შვეიცარია (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_sweden">შვედეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_taiwan">ტაივანი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_turkey">თურქეთი (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_united_kingdom">გაერთიანებული სამეფო (87.5 მჰც-დან 108.0 მჰც-მდე 100 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_united_states">შეერთებული შტატები (88.1 მჰც-დან 107.9 მჰც-მდე 200 კჰც ბიჯით)</string>
+    <string name="regional_band_summary_user_defined">მითითებული დიაპაზონი</string>
+    <string name="aud_output_mode">ხმის გამოტანის რეჟიმი</string>
+    <string name="audio_type_stereo">სტერეო</string>
+    <string name="audio_type_mono">მონო</string>
+    <string name="record_dur">ჩანაწერის ხანგრძლივობა</string>
+    <string name="auto_select_af">შემნაცვლებელი სიხშირე</string>
+    <string name="settings_revert_defaults_title">ნაგულისხმევზე დაბრუნება</string>
+    <string name="settings_revert_defaults_summary">ყველა პარამეტრის ჩამოყრა</string>
+    <string name="settings_revert_confirm_title">ჩამოყრის დასტური</string>
+    <string name="settings_revert_confirm_msg">შედეგად წაიშლება პროგრამის ყველა მონაცემი, მათ შორის მზა პარამეტრებიც. გსურთ, განაგრძოთ?</string>
+    <string name="no_storage">მიაერთეთ SD-ბარათი, ჩაწერის დაწყებამდე.</string>
+    <string name="preparing_sd">მზადდება SD-ბარათი\u2026</string>
+    <string name="access_sd_fail">SD-ბარათი მიუწვდომელია.</string>
+    <string name="spaceIsLow_content">თქვენი SD-ბარათის თავისუფალი სივრცე იწურება. შეცვალეთ ხარისხის პარამეტრი ან წაშალეთ ზოგიერთი ფაილი ადგილის გამოსათავისუფლებლად.</string>
+    <string name="FMRecording_reach_size_limit">ზომის ზღვარი მიღწეულია.</string>
+    <string name="menu_scan_for_preset">მზა პარამეტრების მონახვა</string>
+    <string name="fm_off">FM გამორთულია.</string>
+    <string name="fm_call">FM ვერ იმუშავებს ზარისას.</string>
+    <string name="alert_dialog_hint">შეიყვანეთ სახელი</string>
+    <string name="search_dialog_title">სადგურების მოძიება</string>
+    <string name="fm_command_timeout_title">ამოწურვის დრო</string>
+    <string name="fm_tune_timeout_msg">პასუხი არ მიღებულა FM-სადგურის გასამართად. ხარვეზის არსებობის შემთხვევაში, გთხოვთ გამორთოთ FM და ხელახლა ჩართოთ.</string>
+    <string name="fm_command_failed_title">FM-მოქმდება ვერ შესრულდა</string>
+    <string name="fm_cmd_failed_msg">FM-მოქმედება ვერ შესრულდა. ხარვეზის არსებობის შემთხვევაში, გთხოვთ გამორთოთ FM და ხელახლა ჩართოთ.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-მოქმედება ვერ შესრულდა. FM და HDMI ერთდროულად მხარდაუჭერელია.</string>
+    <string name="fm_cmd_failed_call_on">FM-მოქმედება ვერ შესრულდა. FM-სიგნალი მიუღებელია ზარისას.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">ჩემი FM-ჩანაწერები</string>
+    <string name="audio_db_album_name">FM-ჩანაწერები</string>
+    <string name="audio_db_playlist_name">FM-ჩანაწერები</string>
+    <string name="station_name">სადგური:</string>
+    <string name="station_exists">ეს სიხშირე უკვე არსებობს!</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="station_name_empty">სადგურის სახელი ცარიელია, გთხოვთ, შეიყვანოთ ხელახლა.</string>
+    <string name="station_name_exist">„<xliff:g id="name">%s</xliff:g>“ უკვე გამოიყენება, გთხოვთ, შეიყვანოთ სხვა სახელი.</string>
+    <string name="rt_plus_tags">ჭდეები</string>
+    <string name="usr_def_band_min">უდაბლესი სიხშირე (მჰც)</string>
+    <string name="usr_def_band_max">უმაღლესი სიხშირე (მჰც)</string>
+    <string name="chanl_spacing">არხის ბიჯი</string>
+    <string name="set">დაყენება</string>
+    <string name="user_defind_band_msg">შეიყვანეთ სიხშირე შუალედით 76.0 და 108.0 მჰც სულ მცირე 1 არხისა და 100 კჰც დაშორებით უმცირესსა და უმაღლეს სიხშირეთა შორის.</string>
+    <string name="save_record_file">FM-ჩანაწერის შენახვის ადგილია „<xliff:g id="record_file">%1$s</xliff:g>“</string>
+    <string name="fm_search_no_results">თავსებადი სადგურები ვერ მოიძებნა</string>
+    <string name="typ_All_stations">ყველა სადგური</string>
+    <string name="typ_Culture">კულტურა</string>
+    <string name="typ_Current_affairs">მიმდინარე მოვლენები</string>
+    <string name="typ_Children">საბავშვო</string>
+    <string name="typ_Country">ქანთრი</string>
+    <string name="typ_Documentary">შემეცნებითი</string>
+    <string name="typ_Drama">ამაღელვებელი</string>
+    <string name="typ_Easy_listening">ადვილი მოსასმენი</string>
+    <string name="typ_Education">საგანმანათლებლო</string>
+    <string name="typ_Emergency">საგანგებო</string>
+    <string name="typ_Emergency_test">საგანგებო (შემოწმება)</string>
+    <string name="typ_Finance">ფულადი სახსრები</string>
+    <string name="typ_Folk">ხალხური</string>
+    <string name="typ_Information">ამბები</string>
+    <string name="typ_Jazz">ჯაზი</string>
+    <string name="typ_Light_classical">მსუბუქი კლასიკა</string>
+    <string name="typ_Leisure">გასართობი</string>
+    <string name="typ_News">ახალი ამბები</string>
+    <string name="typ_National">ეროვნული</string>
+    <string name="typ_Other">სხვა</string>
+    <string name="typ_Oldies">ძველებური</string>
+    <string name="typ_Phone_in">სასაუბრო</string>
+    <string name="typ_Pop">პოპულარული</string>
+    <string name="typ_Religion">რწმენა</string>
+    <string name="typ_Rock">როკ-მუსიკა</string>
+    <string name="typ_Science">მეცნიერება</string>
+    <string name="typ_Serious_classical">მკაცრად კლასიკური</string>
+    <string name="typ_Social_affairs">საზოგადოებრივი</string>
+    <string name="typ_Sport">სპორტი</string>
+    <string name="typ_Travel">მოგზაურობა</string>
+    <string name="typ_Varied">სხვადასხვა</string>
+    <string name="typ_Weather">ამინდი</string>
+    <string name="typ_Adult_hits">ზრდასრულთათვის</string>
+    <string name="typ_Classical">კლასიკური</string>
+    <string name="typ_Classic_Rock">კლასიკური როკი</string>
+    <string name="typ_College">სასწავლებლის</string>
+    <string name="typ_Foreign_language">უცხო ენა</string>
+    <string name="typ_Hiphop">ჰიპ-ჰოპი</string>
+    <string name="typ_Nostalgia">მგრძნობიარე</string>
+    <string name="typ_Personality">პირადი</string>
+    <string name="typ_Public">საჯარო</string>
+    <string name="typ_Religious_music">მრწამსი</string>
+    <string name="typ_Religious_talk">საუბრები მრწამსზე</string>
+    <string name="typ_Rhythm_and_Blues">რიტმ-ენდ-ბლუზი</string>
+    <string name="typ_Spanish_music">ესპანური</string>
+    <string name="typ_Spanish_talk">ესპანური საუბრები</string>
+    <string name="typ_Soft">მსუბუქი</string>
+    <string name="typ_Soft_Rock">მსუბუქი როკი</string>
+    <string name="typ_Soft_Rhythm_and_Blues">მსუბუქი რიტმ-ენდ-ბლუზი</string>
+    <string name="typ_Sports">სპორტული</string>
+    <string name="typ_Talk">ლაპარაკი</string>
+    <string name="typ_Top_40">რჩეული 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-kab-rDZ/arrays.xml
similarity index 74%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-kab-rDZ/arrays.xml
index cb1457b..d3d179f 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-kab-rDZ/arrays.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-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:
@@ -26,10 +27,17 @@
  * 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>
+  <string-array name="record_durations_entries">
+    <item>5 n tisdatin</item>
+    <item>15 n tisdatin</item>
+    <item>30 n tisdatin</item>
+    <item>Arma yeḥbes</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 n tisdatin</item>
+    <item>30 n tisdatin</item>
+    <item>45 n tisdatin</item>
+    <item>1 asrag</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-kab-rDZ/strings.xml b/fmapp2/res/values-kab-rDZ/strings.xml
new file mode 100644
index 0000000..bd11043
--- /dev/null
+++ b/fmapp2/res/values-kab-rDZ/strings.xml
@@ -0,0 +1,223 @@
+<?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">Ṛṛadyu FM</string>
+    <string name="tx_app_name">Amesgal FM</string>
+    <string name="menu_scan_start">Smiḍen</string>
+    <string name="menu_scan_stop">Seḥbes anadi</string>
+    <string name="menu_record_start">Kles</string>
+    <string name="menu_record_stop">Seḥbes asekles</string>
+    <string name="menu_settings">Iɣewwaṛen</string>
+    <string name="menu_sleep">Taguni </string>
+    <string name="menu_sleep_cancel">Sefsex taguni</string>
+    <string name="menu_all_channels">Akk tizririn</string>
+    <string name="menu_display_tags">Sken-d tibzimin</string>
+    <string name="button_text_stop">Seḥbes</string>
+    <string name="msg_seeking">Anadi n teɣsert FM\u2026</string>
+    <string name="msg_scanning">Anadi n teɣsar FM meṛṛa\u2026</string>
+    <string name="msg_scanning_pty">Anadi ɣef \'<xliff:g id="pty_name">%1$s</xliff:g>\'\u2026</string>
+    <string name="msg_searching_title">Aqeɛɛed uzwir i ufran awurman</string>
+    <string name="msg_searching">Anadi n teɣsar i yelhan akken ad tettusbedd tebdart n yifranen\u2026</string>
+    <string name="msg_noantenna">Ttxil senfel amsigdal i useqdec n ṛṛadyu FM</string>
+    <string name="dialog_sleep_title">Tanzagt n uxsay awurman</string>
+    <string name="presetlist_select_name">Fren \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Rnu tabdart tamaynut</string>
+    <string name="dialog_presetlist_rename_title">Sekcem isem</string>
+    <string name="presetlist_autoselect_title">Sentem tafrant tawurmant</string>
+    <string name="preset_replace">Semselsi</string>
+    <string name="preset_tune">Gerrez</string>
+    <string name="preset_rename">Snifel isem</string>
+    <string name="preset_delete">Kkes</string>
+    <string name="preset_search">Nadi ɣef \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHZ</string>
+    <string name="regional_band">Tarbaɛt n temnaḍt</string>
+    <string name="regional_band_entry_north_america">Tamrikt n ugafa</string>
+    <string name="regional_band_entry_europe">Turuft</string>
+    <string name="regional_band_entry_japan">Japun</string>
+    <string name="regional_band_entry_japan_wide">Japun (ahrawan)</string>
+    <string name="regional_band_entry_australia">Ustṛalya</string>
+    <string name="regional_band_entry_austria">Ustriya</string>
+    <string name="regional_band_entry_belgium">Biljik</string>
+    <string name="regional_band_entry_brazil">Brizil</string>
+    <string name="regional_band_entry_china">Ccinwa</string>
+    <string name="regional_band_entry_czech_republic">Tagduda Tačikit</string>
+    <string name="regional_band_entry_denmark">Danmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">Fransa</string>
+    <string name="regional_band_entry_germany">Lalman</string>
+    <string name="regional_band_entry_greece">Legrig</string>
+    <string name="regional_band_entry_india">Lhend</string>
+    <string name="regional_band_entry_indonesia">Indunisya</string>
+    <string name="regional_band_entry_ireland">Irland</string>
+    <string name="regional_band_entry_italy">Ṭelyan</string>
+    <string name="regional_band_entry_korea">Kurya</string>
+    <string name="regional_band_entry_mexico">Miksik</string>
+    <string name="regional_band_entry_netherlands">Timura n Wadda</string>
+    <string name="regional_band_entry_new_zealand">Ziland Tamaynut</string>
+    <string name="regional_band_entry_norway">Nuṛwij</string>
+    <string name="regional_band_entry_poland">Pulunya</string>
+    <string name="regional_band_entry_portugal">Puṛtugal</string>
+    <string name="regional_band_entry_russia">Rruss</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Sluvakya</string>
+    <string name="regional_band_entry_spain">Spenyul</string>
+    <string name="regional_band_entry_switzerland">Sswis</string>
+    <string name="regional_band_entry_sweden">Sswid</string>
+    <string name="regional_band_entry_turkey">Ṭṭerk</string>
+    <string name="regional_band_entry_united_kingdom">Tagelda Yeddukklen</string>
+    <string name="regional_band_entry_united_states">Iwanaken-Yeddukklen-N-Temrikt</string>
+    <string name="regional_band_entry_user_defined">Tarbaɛt yettusbadun sɣur useqdac</string>
+    <string name="regional_band_summary_north_america">Tamrikt n Ugafa (87.5M γer 108.0 MHz deg tṣeddarin n 200 KHz)</string>
+    <string name="regional_band_summary_europe">Tuṛuft (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_japan">Japun (76.0 γer 90.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_japan_wide">Japun (ahrawan) (90.0 γer 108.0 MHz deg tṣeddarin n 50 KHz)</string>
+    <string name="regional_band_summary_australia">Ustṛalya (87.7 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_austria">Tutrict (87.5 γer 108.0 MHz deg tṣeddarin n 50 KHz)</string>
+    <string name="regional_band_summary_belgium">Biljik (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_brazil">Brizil (87.5 γer 108.0 MHz deg tṣeddarin n 200 KHz)</string>
+    <string name="regional_band_summary_china">Ccinwa (87.0 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_czech_republic">Tagduda n čik (87.5 ɣer 108.0 MHz s tseddarin n 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Danmaṛk (87.5 γer 108.0 MHz deg tṣeddarin n 50 KHz)</string>
+    <string name="regional_band_summary_finland">Finland (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_france">Fransa (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_germany">Lalman (87.5 γer 108.0 MHz deg tṣeddarin n 50 KHz)</string>
+    <string name="regional_band_summary_greece">Legrig (87.5 γer 108.0 MHz deg tṣeddarin n 50 KHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_india">Lhend (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_indonesia">Indunisya (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_ireland">Irland (87.5 γer 108.0 MHz deg tṣeddarin n 50 KHz)</string>
+    <string name="regional_band_summary_italy">Ṭelyan (87.5 γer 108.0 MHz deg tṣeddarin n 50 KHz)</string>
+    <string name="regional_band_summary_korea">Kurya (87.5 γer 108.0 MHz deg tṣeddarin n 200 KHz)</string>
+    <string name="regional_band_summary_mexico">Miksik (88.1 γer 107.9 MHz deg tṣeddarin n 200 KHz)</string>
+    <string name="regional_band_summary_netherlands">Timura n Wadda (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_new_zealand">Ziland Tamaynut (88.0 γer 107.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_norway">Nuṛwij (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_poland">Pulunya (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_portugal">Puṛtugal (87.5 γer 108.0 MHz deg tṣeddarin n 50 KHz)</string>
+    <string name="regional_band_summary_russia">Rruss (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_singapore">Singapur (88.0 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_slovakia">Sluvakya (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_spain">Spenyul (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_switzerland">Sswis (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_sweden">Sswid (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_turkey">Ṭṭerk (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_united_kingdom">Tagelda Yeddukklen (87.5 γer 108.0 MHz deg tṣeddarin n 100 KHz)</string>
+    <string name="regional_band_summary_united_states">Iwanaken-Yeddukklen-N-Temrikt (88.1 γer 107.9 MHz deg tṣeddarin n 200 KHz)</string>
+    <string name="regional_band_summary_user_defined">Tarbaɛt yettusbadun sɣur useqdac</string>
+    <string name="aud_output_mode">Askar n tufγa ameslaw</string>
+    <string name="record_dur">Teɣzi n usekles</string>
+    <string name="auto_select_af">Asnagar</string>
+    <string name="settings_revert_defaults_title">Uγal γer iγewwaṛen imezwar</string>
+    <string name="settings_revert_defaults_summary">Ales awennez iγewwaṛen meṛṛa</string>
+    <string name="settings_revert_confirm_title">Sentem awennez</string>
+    <string name="settings_revert_confirm_msg">Aya ad yesfeḍ akk iɣewwaṛen n usnas, ad yeglu ula s iɣewwaṛen yellan ttwaskelsen. Kemmel?</string>
+    <string name="no_storage">Sali takarḍa SD send bdu n usekles.</string>
+    <string name="preparing_sd">Aheggi n tkarḍa SD\u2026</string>
+    <string name="access_sd_fail">Ur izmir ara ad-ikcem ar tkarḍa SD.</string>
+    <string name="spaceIsLow_content">Tfuk tallunt n tkarḍa SD. Beddel iɣewwaṛen n tɣara neɣ kkes kra ifuyla-nniḍen iwakken ad tiwsiɛ tallunt.</string>
+    <string name="FMRecording_reach_size_limit">Talast n tiddi tewweḍ.</string>
+    <string name="menu_scan_for_preset">Nadi izwirfranen</string>
+    <string name="fm_off">FM yensa.</string>
+    <string name="fm_call">Ulac ṛadyu FM lawan n usiwel. </string>
+    <string name="alert_dialog_hint">Sekcem isem</string>
+    <string name="search_dialog_title">Anadi n tiɣsar</string>
+    <string name="fm_command_timeout_title">Amenḍar</string>
+    <string name="fm_tune_timeout_msg">Ulac tiririt id-yuɣalen  i uṣeggem n umaṭṭaf FM. Ma ur yefra ara wugur, sens ṛṛadyu FM sakin cɛel-itt tikelt-nniḍen.</string>
+    <string name="fm_command_failed_title">Tamhelt FM ur teddara akken iwata</string>
+    <string name="fm_cmd_failed_msg">Afsax n temhelt ṛṛady FM. Ma ur yefra ara wugur, sens ṛṛadyu FM sakin cɛel-itt tikelt-nniḍen.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Tamhelt FM ur tedda ara. FM akked HDMI ur mtawan ara ad ddun ɣef tikelt.</string>
+    <string name="fm_cmd_failed_call_on">Tamhelt FM ur tedda ara. Timesliwt i FM ur yettwaqbal lawan n usiwel.</string>
+    <string name="audio_db_artist_name">Asekles-iw FM</string>
+    <string name="audio_db_album_name">Asekles FM</string>
+    <string name="audio_db_playlist_name">Asekles FM</string>
+    <string name="station_name">Taɣsert:</string>
+    <string name="station_exists">Asnagar agi yella yakan!</string>
+    <string name="station_list_delete_station">Kkes <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Tḥeqqeḍ tebɣiḍ ad-tekkseḍ \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Isem n tɣsert dilem, sekcem-it tikelt nniḍen.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' yettwaseqdec yakan, sekcem isem nniḍen.</string>
+    <string name="rt_plus_tags">Tiṛekkizin</string>
+    <string name="usr_def_band_min">Lmuja tameẓyant (MHz)</string>
+    <string name="usr_def_band_max">Lmuja tameqṛant (MHz)</string>
+    <string name="chanl_spacing">Litteɛ ger ibuda</string>
+    <string name="set">Initialiser</string>
+    <string name="user_defind_band_msg">Sekcem uṭun n lemwaji yellan ger 76.0 akked 108.0 MHz s tallunt n ubadu taddayt n 1 akked 100 kHz n litteɛ ger uṭun n lemwaji adday akked ufellay</string>
+    <string name="save_record_file">Ifuyla n usekles FM ttwaḥerzen deg \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="typ_All_stations">Tiɣsar meṛṛa</string>
+    <string name="typ_Culture">Idles</string>
+    <string name="typ_Children">Ahilen igerdan</string>
+    <string name="typ_Country">Aẓawan Country</string>
+    <string name="typ_Documentary">Afetraw</string>
+    <string name="typ_Drama">Tamuggit</string>
+    <string name="typ_Easy_listening">Aẓawan afessas i tmesliwt</string>
+    <string name="typ_Education">Aselmed</string>
+    <string name="typ_Emergency">Amerwas</string>
+    <string name="typ_Emergency_test">Aɛraḍ uɛjil</string>
+    <string name="typ_Finance">Tadrimt</string>
+    <string name="typ_Folk">Aẓawan Folk</string>
+    <string name="typ_Information">Talɣut</string>
+    <string name="typ_Jazz">Aẓawan Jazz</string>
+    <string name="typ_Light_classical">Aẓawan aklasiki</string>
+    <string name="typ_Leisure">Isedha</string>
+    <string name="typ_News">Timirin</string>
+    <string name="typ_National">Aẓawan aɣelnaw</string>
+    <string name="typ_Other">Iẓawanen nniḍen</string>
+    <string name="typ_Oldies">Iẓawanen n zik</string>
+    <string name="typ_Phone_in">Deg tiliγri</string>
+    <string name="typ_Pop">Aẓawan Pop</string>
+    <string name="typ_Religion">Asγan</string>
+    <string name="typ_Rock">Aẓawan Rock</string>
+    <string name="typ_Science">Tussniwin</string>
+    <string name="typ_Serious_classical">Aẓawan aɛlayan</string>
+    <string name="typ_Social_affairs">Lecɣal inmettiyen</string>
+    <string name="typ_Sport">Addal</string>
+    <string name="typ_Travel">Assikel</string>
+    <string name="typ_Weather">Tagnawit</string>
+    <string name="typ_Adult_hits">Tizlatin ifazen i imeqṛanen</string>
+    <string name="typ_Classical">Aklasiki</string>
+    <string name="typ_Classic_Rock">Rock aklasiki</string>
+    <string name="typ_College">Tasnawit</string>
+    <string name="typ_Foreign_language">Tutlayin tibeṛṛaniyin</string>
+    <string name="typ_Nostalgia">Tamdanit</string>
+    <string name="typ_Personality">Udem</string>
+    <string name="typ_Public">Azayez</string>
+    <string name="typ_Religious_music">Aẓawan n ddin</string>
+    <string name="typ_Religious_talk">Ameslay n ddin</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm akked Blues</string>
+    <string name="typ_Spanish_music">Aẓawan aspenyuli</string>
+    <string name="typ_Spanish_talk">Ameslay s tespanit</string>
+    <string name="typ_Soft">Fessus</string>
+    <string name="typ_Soft_Rock">Rock Fessusen</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm akked Blues ifessasen</string>
+    <string name="typ_Sports">Addalen</string>
+    <string name="typ_Talk">Ameslay</string>
+    <string name="typ_Top_40">40 imenza</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-kn/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-kn/arrays.xml
index cb1457b..3c31983 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-kn/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>ಸ್ಟೀರಿಯೋ</item>
+    <item>ಮೊನೊ</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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 hour</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-kn/strings.xml b/fmapp2/res/values-kn/strings.xml
new file mode 100644
index 0000000..675f6f1
--- /dev/null
+++ b/fmapp2/res/values-kn/strings.xml
@@ -0,0 +1,188 @@
+<?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">ಎಫ್ಎಂ ರೇಡಿಯೋ</string>
+    <string name="tx_app_name">ಎಫ್ಎಂ ಪ್ರಸಾರಕ</string>
+    <string name="menu_scan_start">ಸ್ಕ್ಯಾನ್</string>
+    <string name="menu_scan_stop">ಹುಡುಕುವುದನ್ನು ನಿಲ್ಲಿಸಿ</string>
+    <string name="menu_record_start">ರಿಕಾರ್ಡ್</string>
+    <string name="menu_record_stop">ರಿಕಾರ್ಡಿಂಗ್ ನಿಲ್ಲಿಸಿ</string>
+    <string name="menu_settings">ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
+    <string name="menu_sleep">ಸ್ಲೀಪ್</string>
+    <string name="menu_sleep_cancel">ಸ್ಲೀಪ್ ರದ್ದುಮಾಡಿ</string>
+    <string name="menu_all_channels">ಎಲ್ಲಾ ಚಾನೆಲ್ಸ್</string>
+    <string name="menu_display_tags">ಟ್ಯಾಗ್ಸ್ ಪ್ರದರ್ಶಿಸು</string>
+    <string name="button_text_stop">ನಿಲ್ಲಿಸಿ</string>
+    <string name="msg_seeking">ಎಫ್ಎಂ ಕೇಂದ್ರಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ\u2026</string>
+    <string name="msg_scanning">ಎಲ್ಲಾ ಎಫ್ಎಂ ಕೇದ್ರಗಳಿಗಾಗಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ\u2026</string>
+    <string name="msg_scanning_pty">\'<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">ಪೂರ್ವನಿಗದಿಗಳನ್ನು ಸ್ವಯಂ-ಆಯ್ಕೆಮಾಡುತ್ತಿದೆ</string>
+    <string name="msg_searching">ಪೂರ್ವನಿಗದಿಗಳ ಪಟ್ಟಿ ರಚಿಸಲು ಪ್ರಬಲ ಕೇಂದ್ರಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ\u2026</string>
+    <string name="msg_noantenna">ಎಫ್ಎಂ ರೇಡಿಯೋ ಉಪಯೋಗಿಸಲು ದಯವಿಟ್ಟು ಹೆಡ್‍ಸೆಟ್ ಪ್ಲಗ್ ಇನ್ ಮಾಡಿ</string>
+    <string name="dialog_sleep_title">ಸ್ವಯಂ-ಆಫ್ ಸ್ಲೀಪ್ ಅವಧಿ</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' ಆಯ್ಕೆಮಾಡಿ</string>
+    <string name="presetlist_add_new">ಹೊಸ ಪಟ್ಟಿಯನ್ನು ಸೇರಿಸಿ</string>
+    <string name="dialog_presetlist_rename_title">ಹೆಸರು ಬರೆಯಿರಿ</string>
+    <string name="presetlist_autoselect_title">ಸ್ವಯಂ-ಆಯ್ಕೆ ಖಚಿತಪಡಿಸಿ</string>
+    <string name="preset_replace">ಬದಲಾಯಿಸಿ</string>
+    <string name="preset_tune">ಟ್ಯೂನ್</string>
+    <string name="preset_rename">ಮರುಹೆಸರಿಸಿ</string>
+    <string name="preset_delete">ಅಳಿಸಿ</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\'ಗಾಗಿ ಹುಡುಕು</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">ಪ್ರಾದೇಶಿಕ ಬ್ಯಾಂಡ್</string>
+    <string name="regional_band_entry_north_america">ಉತ್ತರ ಅಮೇರಿಕಾ</string>
+    <string name="regional_band_entry_europe">ಯುರೋಪ್</string>
+    <string name="regional_band_entry_japan">ಜಪಾನ್</string>
+    <string name="regional_band_entry_japan_wide">ಜಪಾನ್ (ವ್ಯಾಪಕ)</string>
+    <string name="regional_band_entry_australia">ಆಸ್ಟ್ರೇಲಿಯಾ</string>
+    <string name="regional_band_entry_austria">ಆಸ್ಟ್ರಿಯಾ</string>
+    <string name="regional_band_entry_belgium">ಬೆಲ್ಜಿಯಂ</string>
+    <string name="regional_band_entry_brazil">ಬ್ರೆಜಿಲ್</string>
+    <string name="regional_band_entry_china">ಚೀನಾ</string>
+    <string name="regional_band_entry_czech_republic">ಜೆಕ್ ಗಣರಾಜ್ಯ</string>
+    <string name="regional_band_entry_denmark">ಡೆನ್ಮಾರ್ಕ್</string>
+    <string name="regional_band_entry_finland">ಫಿನ್ಲ್ಯಾಂಡ್</string>
+    <string name="regional_band_entry_france">ಫ್ರಾನ್ಸ್</string>
+    <string name="regional_band_entry_germany">ಜರ್ಮನಿ</string>
+    <string name="regional_band_entry_greece">ಗ್ರೀಸ್</string>
+    <string name="regional_band_entry_hong_kong">ಹಾಂಗ್ ಕಾಂಗ್</string>
+    <string name="regional_band_entry_india">ಭಾರತ</string>
+    <string name="regional_band_entry_indonesia">ಇಂಡೋನೇಷ್ಯಾ</string>
+    <string name="regional_band_entry_ireland">ಐರ್ಲೆಂಡ್</string>
+    <string name="regional_band_entry_italy">ಇಟಲಿ</string>
+    <string name="regional_band_entry_korea">ಕೋರಿಯಾ</string>
+    <string name="regional_band_entry_mexico">ಮೆಕ್ಸಿಕೋ</string>
+    <string name="regional_band_entry_netherlands">ನೆದರ್ಲ್ಯಾಂಡ್ಸ್</string>
+    <string name="regional_band_entry_new_zealand">ನ್ಯೂಜಿಲ್ಯಾಂಡ್</string>
+    <string name="regional_band_entry_norway">ನಾರ್ವೆ</string>
+    <string name="regional_band_entry_poland">ಪೋಲೆಂಡ್</string>
+    <string name="regional_band_entry_portugal">ಪೋರ್ಚುಗಲ್</string>
+    <string name="regional_band_entry_russia">ರಷ್ಯಾ</string>
+    <string name="regional_band_entry_singapore">ಸಿಂಗಾಪೂರ್</string>
+    <string name="regional_band_entry_slovakia">ಸ್ಲೊವಾಕಿಯಾ</string>
+    <string name="regional_band_entry_spain">ಸ್ಪೇನ್</string>
+    <string name="regional_band_entry_switzerland">ಸ್ವಿಜರ್ಲ್ಯಾಂಡ್</string>
+    <string name="regional_band_entry_sweden">ಸ್ವೀಡನ್</string>
+    <string name="regional_band_entry_taiwan">ತೈವಾನ್</string>
+    <string name="regional_band_entry_turkey">ಟರ್ಕಿ</string>
+    <string name="regional_band_entry_united_kingdom">ಯುನೈಟೆಡ್ ಕಿಂಗ್ಡಮ್</string>
+    <string name="regional_band_entry_united_states">ಯುನೈಟೆಡ್ ಸ್ಟೇಟ್ಸ್</string>
+    <string name="regional_band_entry_user_defined">ಬಳಕೆದಾರ ವ್ಯಾಕ್ಯಾನಿಸಿದ ಬ್ಯಾಂಡ್</string>
+    <string name="regional_band_summary_switzerland">ಸ್ವಿಜರ್ಲ್ಯಾಂಡ್ (೮೭.೫ - ೧೦೮.೦ MHz, ೧೦೦ kHz ಹಂತಗಳಲ್ಲಿ)</string>
+    <string name="regional_band_summary_user_defined">ಬಳಕೆದಾರ ವ್ಯಾಖ್ಯಾನಿಸಿದ ಬ್ಯಾಂಡ್</string>
+    <string name="aud_output_mode">ಆಡಿಯೋ ಔಟ್‍ಪುಟ್ ಮೋಡ್</string>
+    <string name="audio_type_stereo">ಸ್ಟಿರಿಯೋ</string>
+    <string name="audio_type_mono">ಮೊನೊ</string>
+    <string name="record_dur">ರಿಕಾರ್ಡ್ ಅವಧಿ</string>
+    <string name="auto_select_af">ಪರ್ಯಾಯ ಆವರ್ತನ</string>
+    <string name="settings_revert_defaults_title">ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಸ್ ಗೆ ಹಿಂತಿರುಗಿಸು</string>
+    <string name="settings_revert_defaults_summary">ಎಲ್ಲಾ ಸೆಟ್ಟಿಂಗ್ಸ್ ಮರುಹೊಂದಿಸಿ</string>
+    <string name="settings_revert_confirm_title">ಮರುಹೊಂದಿಕೆ ಖಚಿತಪಡಿಸಿ</string>
+    <string name="settings_revert_confirm_msg">ಇದು ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ತೆರವುಗೊಳಿಸುತ್ತದೆ, ಉಳಿಸಿದ ಪೂರ್ವನಿಗದಿಗಳನ್ನೂ ಓಳಗೊಂಡು. ಮುಂದುವರೆ?</string>
+    <string name="no_storage">ರಿಕಾರ್ಡಿಂಗ್ ಪ್ರಾರಂಭಿಸುವ ಮುನ್ನ SD ಕಾರ್ಡ್ ಮೌಂಟ್ ಮಾಡಿ.</string>
+    <string name="preparing_sd">SD ಕಾರ್ಡನ್ನು ಸಿದ್ಧಗೊಳಿಸುತ್ತಿದೆ\u2026</string>
+    <string name="access_sd_fail">SD ಕಾರ್ಡನ್ನು ಪ್ರವೇಶಿಸಲಾಗಲಿಲ್ಲ.</string>
+    <string name="spaceIsLow_content">ನಿಮ್ಮ SD ಕಾರ್ಡ್ ಸಂಗ್ರಹಣೆಯಲ್ಲಿ ಹೆಚ್ಚು ಖಾಲಿಜಾಗ ಇಲ್ಲ. ಜಾಗ ಮಾಡಲು ಗುಣಮಟ್ಟ ಸೆಟ್ಟಿಂಗ್ ಬದಲಾಯಿಸಿ ಅಥವ ಇತರೆ ಕಡತಗಳನ್ನು ಅಳಿಸಿ.</string>
+    <string name="menu_scan_for_preset">ಪೂರ್ವನಿಗದಿಗಳಿಗಾಗಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
+    <string name="fm_off">ಎಫ್ಎಂ ಆಫ್ ಆಗಿದೆ.</string>
+    <string name="fm_call">ಕರೆ ಮಾಡುವಾಗ ಎಫ್ಎಂ ಬಳಸುವಂತಿಲ್ಲ.</string>
+    <string name="alert_dialog_hint">ಒಂದು ಹೆಸರನ್ನು ಬರೆಯಿರಿ</string>
+    <string name="search_dialog_title">ಕೇಂದ್ರಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
+    <string name="fm_command_timeout_title">ಅವಧಿಮುಗಿದಿದೆ</string>
+    <string name="fm_tune_timeout_msg">FM ಕೇಂದ್ರವನ್ನು ಟ್ಯೂನ್ ಮಾಡಲು ಯಾವುದೇ ಪ್ರತಿಕ್ರಿಯೆ ಸ್ವೀಕರಿಸಲಿಲ್ಲ. ತೊಂದರೆಯು ಹಾಗೇ ಇದ್ದಲ್ಲಿ, ದಯವಿಟ್ಟು 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="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="station_name_empty">ಕೇಂದ್ರದ ಹೆಸರು ಖಾಲಿಯಾಗಿದೆ, ದಯವಿಟ್ಟು ಇನ್ನೊಮ್ಮೆ ಬರೆಯಿರಿ.</string>
+    <string name="rt_plus_tags">ಟ್ಯಾಗ್ಸ್</string>
+    <string name="usr_def_band_min">ಕನಿಷ್ಠ ಆವರ್ತನ (MHz)</string>
+    <string name="usr_def_band_max">ಗರಿಷ್ಠ ಆವರ್ತನ (MHz)</string>
+    <string name="chanl_spacing">ಚಾನೆಲ್ ಸ್ಪೇಸಿಂಗ್</string>
+    <string name="set">ಹೊಂದಿಸಿ</string>
+    <string name="fm_search_no_results">ಯಾವುದೇ ಹೊಂದಾಣಿಕೆಯಾಗುವ ಕೇಂದ್ರಗಳು ಪತ್ತೆಯಾಗಲಿಲ್ಲ</string>
+    <string name="typ_All_stations">ಎಲ್ಲಾ ಕೇಂದ್ರಗಳು</string>
+    <string name="typ_Culture">ಸಂಸ್ಕೃತಿ</string>
+    <string name="typ_Current_affairs">ಪ್ರಸಕ್ತ ವಿದ್ಯಮಾನಗಳು</string>
+    <string name="typ_Children">ಮಕ್ಕಳ ಕಾರ್ಯಕ್ರಮಗಳು</string>
+    <string name="typ_Country">ದೇಶ ಸಂಗೀತ</string>
+    <string name="typ_Documentary">ಡಾಕ್ಯುಮೆಂಟರಿ</string>
+    <string name="typ_Drama">ನಾಟಕ</string>
+    <string name="typ_Easy_listening">ಸುಲಭವಾಗಿ ಕೇಳುವ ಸಂಗೀತ</string>
+    <string name="typ_Education">ಶಿಕ್ಷಣ</string>
+    <string name="typ_Emergency_test">ತುರ್ತುಪರೀಸ್ಥಿತಿ ಪರೀಕ್ಷೆ</string>
+    <string name="typ_Finance">ಹಣಕಾಸು</string>
+    <string name="typ_Folk">ಜಾನಪದ ಸಂಗೀತ</string>
+    <string name="typ_Information">ಮಾಹಿತಿ</string>
+    <string name="typ_Jazz">ಜಾಝ್ ಸಂಗೀತ</string>
+    <string name="typ_Light_classical">ಲಘು ಶಾಸ್ತ್ರೀಯ</string>
+    <string name="typ_Leisure">ಆರಾಮ</string>
+    <string name="typ_News">ವಾರ್ತೆ</string>
+    <string name="typ_National">ರಾಷ್ಟ್ರೀಯ ಸಂಗೀತ</string>
+    <string name="typ_Other">ಇತರೆ ಸಂಗೀತ</string>
+    <string name="typ_Oldies">ಓಲ್ಡೀಸ್ ಸಂಗೀತ</string>
+    <string name="typ_Phone_in">ಫೋನ್ ಇನ್</string>
+    <string name="typ_Pop">ಪಾಪ್ ಸಂಗೀತ</string>
+    <string name="typ_Religion">ಧಾರ್ಮಿಕ</string>
+    <string name="typ_Rock">ರಾಕ್ ಸಂಗೀತ</string>
+    <string name="typ_Science">ವಿಜ್ಞಾನ</string>
+    <string name="typ_Serious_classical">ಗಂಭೀರ ಶಾಸ್ತ್ರೀಯ</string>
+    <string name="typ_Social_affairs">ಸಮಾಜ ಕಲ್ಯಾಣ</string>
+    <string name="typ_Sport">ಕ್ರೀಡೆ</string>
+    <string name="typ_Travel">ಪ್ರವಾಸ</string>
+    <string name="typ_Varied">ವೈವಿಧ್ಯ</string>
+    <string name="typ_Weather">ಹವಾಮಾನ</string>
+    <string name="typ_Adult_hits">ವಯಸ್ಕರ ಹಿಟ್ಸ್</string>
+    <string name="typ_Classical">ಶಾಸ್ತ್ರೀಯ</string>
+    <string name="typ_Classic_Rock">ಕ್ಲಾಸಿಕ್ ರಾಕ್</string>
+    <string name="typ_College">ಕಾಲೇಜು</string>
+    <string name="typ_Foreign_language">ವಿದೇಶೀ ಭಾಷೆ</string>
+    <string name="typ_Hiphop">ಹಿಪ್ ಹಾಪ್</string>
+    <string name="typ_Nostalgia">ವಿರಹ</string>
+    <string name="typ_Personality">ವ್ಯಕ್ತಿತ್ವ</string>
+    <string name="typ_Public">ಸಾರ್ವಜನಿಕ</string>
+    <string name="typ_Religious_music">ಧಾರ್ಮಿಕ ಸಂಗೀತ</string>
+    <string name="typ_Religious_talk">ಧಾರ್ಮಿಕ ಚರ್ಚೆ</string>
+    <string name="typ_Rhythm_and_Blues">ರಿದಮ್ ಮತ್ತು ಬ್ಲೂಸ್</string>
+    <string name="typ_Spanish_music">ಸ್ಪ್ಯಾನಿಷ್ ಸಂಗೀತ</string>
+    <string name="typ_Spanish_talk">ಸ್ಪ್ಯಾನಿಷ್ ಚರ್ಚೆ</string>
+    <string name="typ_Soft">ಮೃದು</string>
+    <string name="typ_Soft_Rock">ಮೃದು ರಾಕ್</string>
+    <string name="typ_Soft_Rhythm_and_Blues">ಮೃದು ರಿದಮ್ ಹಾಗು ಬ್ಲೂಸ್</string>
+    <string name="typ_Sports">ಕ್ರೀಡೆ</string>
+    <string name="typ_Talk">ಚರ್ಚೆ</string>
+    <string name="typ_Top_40">ಟಾಪ್ 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ko/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ko/arrays.xml
index cb1457b..55f595a 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ko/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>스테레오</item>
+    <item>모노</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ko/strings.xml b/fmapp2/res/values-ko/strings.xml
new file mode 100644
index 0000000..a296f71
--- /dev/null
+++ b/fmapp2/res/values-ko/strings.xml
@@ -0,0 +1,233 @@
+<?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 라디오</string>
+    <string name="tx_app_name">FM 송신기</string>
+    <string name="menu_scan_start">탐색</string>
+    <string name="menu_scan_stop">스캔 중지</string>
+    <string name="menu_record_start">녹음</string>
+    <string name="menu_record_stop">녹음 중단</string>
+    <string name="menu_settings">설정</string>
+    <string name="menu_sleep">잠자기</string>
+    <string name="menu_sleep_cancel">잠자기 취소</string>
+    <string name="menu_all_channels">모든 채널</string>
+    <string name="menu_display_tags">태그 보기</string>
+    <string name="button_text_stop">중지</string>
+    <string name="msg_seeking">FM 방송국 탐색 중\u2026</string>
+    <string name="msg_scanning">모든 FM 방송국 탐색 중\u2026</string>
+    <string name="msg_scanning_pty">\'<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">프리셋 자동 선택</string>
+    <string name="msg_searching">프리셋 목록을 만들기 위해 신호가 강한 방송국 탐색 중\u2026</string>
+    <string name="msg_noantenna">FM 라디오를 사용하려면 유선 헤드셋이나 이어폰을 연결하여 주십시오</string>
+    <string name="dialog_sleep_title">자동 종료 타이머</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' 선택</string>
+    <string name="presetlist_add_new">새 목록 추가</string>
+    <string name="dialog_presetlist_rename_title">이름 입력</string>
+    <string name="presetlist_autoselect_title">자동 선택 확인</string>
+    <string name="preset_replace">바꾸기</string>
+    <string name="preset_tune">조정</string>
+    <string name="preset_rename">이름 바꾸기</string>
+    <string name="preset_delete">삭제</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' 검색</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">지역 밴드</string>
+    <string name="regional_band_entry_north_america">북미 지역</string>
+    <string name="regional_band_entry_europe">유럽</string>
+    <string name="regional_band_entry_japan">일본</string>
+    <string name="regional_band_entry_japan_wide">일본 (와이드)</string>
+    <string name="regional_band_entry_australia">호주</string>
+    <string name="regional_band_entry_austria">오스트리아</string>
+    <string name="regional_band_entry_belgium">벨기에</string>
+    <string name="regional_band_entry_brazil">브라질</string>
+    <string name="regional_band_entry_china">중국</string>
+    <string name="regional_band_entry_czech_republic">체코 공화국</string>
+    <string name="regional_band_entry_denmark">덴마크</string>
+    <string name="regional_band_entry_finland">핀란드</string>
+    <string name="regional_band_entry_france">프랑스</string>
+    <string name="regional_band_entry_germany">독일</string>
+    <string name="regional_band_entry_greece">그리스</string>
+    <string name="regional_band_entry_hong_kong">홍콩</string>
+    <string name="regional_band_entry_india">인도</string>
+    <string name="regional_band_entry_indonesia">인도네시아</string>
+    <string name="regional_band_entry_ireland">아일랜드</string>
+    <string name="regional_band_entry_italy">이탈리아</string>
+    <string name="regional_band_entry_korea">대한민국</string>
+    <string name="regional_band_entry_mexico">멕시코</string>
+    <string name="regional_band_entry_netherlands">네덜란드</string>
+    <string name="regional_band_entry_new_zealand">뉴질랜드</string>
+    <string name="regional_band_entry_norway">노르웨이</string>
+    <string name="regional_band_entry_poland">폴란드</string>
+    <string name="regional_band_entry_portugal">포르투갈</string>
+    <string name="regional_band_entry_russia">러시아</string>
+    <string name="regional_band_entry_singapore">싱가포르</string>
+    <string name="regional_band_entry_slovakia">슬로바키아</string>
+    <string name="regional_band_entry_spain">스페인</string>
+    <string name="regional_band_entry_switzerland">스위스</string>
+    <string name="regional_band_entry_sweden">스웨덴</string>
+    <string name="regional_band_entry_taiwan">대만</string>
+    <string name="regional_band_entry_turkey">터키</string>
+    <string name="regional_band_entry_united_kingdom">영국</string>
+    <string name="regional_band_entry_united_states">미국</string>
+    <string name="regional_band_entry_user_defined">사용자 정의 밴드</string>
+    <string name="regional_band_summary_north_america">북미 (87.5 MHz ~ 108.0 MHz, 200 kHz 단위)</string>
+    <string name="regional_band_summary_europe">유럽 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_japan">일본 (76.0 MHz ~ 90.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_japan_wide">일본 (와이드) (90.0 MHz ~ 108.0 MHz, 50 kHz 단위)</string>
+    <string name="regional_band_summary_australia">호주 (87.7 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_austria">오스트리아 (87.5 MHz ~ 108.0 MHz, 50 kHz 단위)</string>
+    <string name="regional_band_summary_belgium">벨기에 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_brazil">브라질 (87.5 MHz ~ 108.0 MHz, 200 kHz 단위)</string>
+    <string name="regional_band_summary_china">중국 (87.0 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_czech_republic">체코 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_denmark">덴마크 (87.5 MHz ~ 108.0 MHz, 50 kHz 단위)</string>
+    <string name="regional_band_summary_finland">핀란드 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_france">프랑스 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_germany">독일 (87.5 MHz ~ 108.0 MHz, 50 kHz 단위)</string>
+    <string name="regional_band_summary_greece">그리스 (87.5 MHz ~ 108.0 MHz, 50 kHz 단위)</string>
+    <string name="regional_band_summary_hong_kong">홍콩 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_india">인도 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_indonesia">인도네시아 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_ireland">아일랜드 (87.5 MHz ~ 108.0 MHz, 50 kHz 단위)</string>
+    <string name="regional_band_summary_italy">이탈리아 (87.5 MHz ~ 108.0 MHz, 50 kHz 단위)</string>
+    <string name="regional_band_summary_korea">대한민국 (87.5 MHz ~ 108.0 MHz, 200 kHz 단위)</string>
+    <string name="regional_band_summary_mexico">멕시코 (88.1 MHz ~ 107.9 MHz, 200 kHz 단위)</string>
+    <string name="regional_band_summary_netherlands">네덜란드 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_new_zealand">뉴질랜드 (88.0 MHz ~ 107.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_norway">노르웨이 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_poland">폴란드 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_portugal">포르투갈 (87.5 MHz ~ 108.0 MHz, 50 kHz 단위)</string>
+    <string name="regional_band_summary_russia">러시아 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_singapore">싱가포르 (88.0 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_slovakia">슬로바키아 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_spain">스페인 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_switzerland">스위스 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_sweden">스웨덴 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_taiwan">대만 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_turkey">터키 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_united_kingdom">영국 (87.5 MHz ~ 108.0 MHz, 100 kHz 단위)</string>
+    <string name="regional_band_summary_united_states">미국 (88.1 MHz ~ 107.9 MHz, 200 kHz 단위)</string>
+    <string name="regional_band_summary_user_defined">사용자 정의 밴드</string>
+    <string name="aud_output_mode">소리 출력 모드</string>
+    <string name="audio_type_stereo">스테레오</string>
+    <string name="audio_type_mono">모노</string>
+    <string name="record_dur">녹음 길이</string>
+    <string name="auto_select_af">다른 주파수</string>
+    <string name="settings_revert_defaults_title">초기 설정으로 복원</string>
+    <string name="settings_revert_defaults_summary">모든 설정 초기화</string>
+    <string name="settings_revert_confirm_title">초기화 확인</string>
+    <string name="settings_revert_confirm_msg">저장된 프리셋을 포함한 모든 앱 설정이 삭제됩니다. 계속하시겠습니까?</string>
+    <string name="no_storage">녹음하기 전에 SD 카드를 마운트해주십시오.</string>
+    <string name="preparing_sd">SD 카드 준비 중\u2026</string>
+    <string name="access_sd_fail">SD 카드에 액세스할 수 없습니다.</string>
+    <string name="spaceIsLow_content">SD 카드에 여유 공간이 부족합니다. 음질 설정을 변경하거나 여유 공간 확보를 위해 다른 파일을 삭제해 주십시오.</string>
+    <string name="FMRecording_reach_size_limit">파일 크기 제한에 도달하였습니다.</string>
+    <string name="menu_scan_for_preset">프리셋 검색</string>
+    <string name="fm_off">FM이 꺼져 있습니다.</string>
+    <string name="fm_call">통화 중에는 FM을 사용할 수 없습니다.</string>
+    <string name="alert_dialog_hint">이름 입력</string>
+    <string name="search_dialog_title">방송국 탐색</string>
+    <string name="fm_command_timeout_title">시간 제한</string>
+    <string name="fm_tune_timeout_msg">FM 방송국의 반응이 없습니다. 문제가 지속되면, FM을 껐다 다시 켜 주십시오.</string>
+    <string name="fm_command_failed_title">FM 실행 실패</string>
+    <string name="fm_cmd_failed_msg">FM 실행이 실패했습니다. 문제가 지속되면 FM을 껐다 다시 켜 보십시오.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM 실행이 실패했습니다. FM과 HDMI는 동시에 사용할 수 없습니다.</string>
+    <string name="fm_cmd_failed_call_on">FM 실행이 실패했습니다. 통화 중에는 FM 오디오를 사용할 수 없습니다.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">내 FM 녹음</string>
+    <string name="audio_db_album_name">FM 녹음</string>
+    <string name="audio_db_playlist_name">FM 녹음</string>
+    <string name="station_name">방송국:</string>
+    <string name="station_exists">이 주파수는 이미 존재합니다!</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="station_name_empty">방송국 이름이 비어있습니다. 다시 입력해주세요.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\'은(는) 이미 사용 중입니다. 다른 이름을 입력하십시오.</string>
+    <string name="rt_plus_tags">태그</string>
+    <string name="usr_def_band_min">가장 낮은 주파수 (MHz)</string>
+    <string name="usr_def_band_max">가장 높은 주파수 (MHz)</string>
+    <string name="chanl_spacing">채널 간격</string>
+    <string name="set">설정</string>
+    <string name="user_defind_band_msg">76.0에서 108.0 MHz 사이에서 최소 1개의 채널 간격을 두고 최대-최소 주파수 사이에 100 kHz 간격을 가진 주파수를 입력하세요.</string>
+    <string name="save_record_file">FM 녹음이 \'<xliff:g id="record_file">%1$s</xliff:g>\'에 저장되었습니다</string>
+    <string name="fm_search_no_results">호환되는 방송국 없음</string>
+    <string name="typ_All_stations">모든 방송국</string>
+    <string name="typ_Culture">문화</string>
+    <string name="typ_Current_affairs">시사</string>
+    <string name="typ_Children">아동용 프로그램</string>
+    <string name="typ_Country">컨트리 음악</string>
+    <string name="typ_Documentary">다큐멘터리</string>
+    <string name="typ_Drama">드라마</string>
+    <string name="typ_Easy_listening">편안한 음악</string>
+    <string name="typ_Education">교육</string>
+    <string name="typ_Emergency">비상</string>
+    <string name="typ_Emergency_test">긴급 시험</string>
+    <string name="typ_Finance">금융</string>
+    <string name="typ_Folk">민속 음악</string>
+    <string name="typ_Information">정보</string>
+    <string name="typ_Jazz">재즈 음악</string>
+    <string name="typ_Light_classical">가벼운 클래식</string>
+    <string name="typ_Leisure">레저</string>
+    <string name="typ_News">뉴스</string>
+    <string name="typ_National">민족 음악</string>
+    <string name="typ_Other">기타 음악</string>
+    <string name="typ_Oldies">고전 음악</string>
+    <string name="typ_Phone_in">전화</string>
+    <string name="typ_Pop">팝 음악</string>
+    <string name="typ_Religion">종교</string>
+    <string name="typ_Rock">락 음악</string>
+    <string name="typ_Science">과학</string>
+    <string name="typ_Serious_classical">고전 클래식</string>
+    <string name="typ_Social_affairs">사회</string>
+    <string name="typ_Sport">스포츠</string>
+    <string name="typ_Travel">여행</string>
+    <string name="typ_Varied">여러가지</string>
+    <string name="typ_Weather">날씨</string>
+    <string name="typ_Adult_hits">성인 인기</string>
+    <string name="typ_Classical">클래식</string>
+    <string name="typ_Classic_Rock">클래식 락</string>
+    <string name="typ_College">대학</string>
+    <string name="typ_Foreign_language">외국어</string>
+    <string name="typ_Hiphop">힙합</string>
+    <string name="typ_Nostalgia">향수</string>
+    <string name="typ_Personality">성격</string>
+    <string name="typ_Public">공공</string>
+    <string name="typ_Religious_music">종교 음악</string>
+    <string name="typ_Religious_talk">종교 대화</string>
+    <string name="typ_Rhythm_and_Blues">리듬 앤 블루스</string>
+    <string name="typ_Spanish_music">스페인 음악</string>
+    <string name="typ_Spanish_talk">스페인어 대화</string>
+    <string name="typ_Soft">소프트</string>
+    <string name="typ_Soft_Rock">소프트 락</string>
+    <string name="typ_Soft_Rhythm_and_Blues">소프트 리듬 앤 블루스</string>
+    <string name="typ_Sports">스포츠</string>
+    <string name="typ_Talk">토크</string>
+    <string name="typ_Top_40">상위 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ku/arrays.xml
similarity index 67%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ku/arrays.xml
index cb1457b..af7f94a 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ku/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>stereo</item>
+    <item>مۆنۆ</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>stereo</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>
+</resources>
diff --git a/fmapp2/res/values-ku/strings.xml b/fmapp2/res/values-ku/strings.xml
new file mode 100644
index 0000000..6325aa3
--- /dev/null
+++ b/fmapp2/res/values-ku/strings.xml
@@ -0,0 +1,123 @@
+<?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</string>
+    <string name="tx_app_name">په‌خشکه‌ری FM</string>
+    <string name="menu_scan_start">گه‌ڕان</string>
+    <string name="menu_scan_stop">وه‌ستاندنی گه‌ڕان</string>
+    <string name="menu_record_start">تۆمار</string>
+    <string name="menu_record_stop">وه‌ستانی تۆمارکردن</string>
+    <string name="menu_sleep">نوستن</string>
+    <string name="menu_sleep_cancel">لابردنی باری نوستن</string>
+    <string name="menu_all_channels">هه‌موو که‌ناڵه‌کان</string>
+    <string name="menu_display_tags">پیشاندانی پێشنیاره‌کان</string>
+    <string name="msg_seeking">گەڕان FM وێستگە \u2026</string>
+    <string name="msg_scanning">گەڕان بۆ هەموو FM وێستگەکان\u2026</string>
+    <string name="msg_scanning_pty">گەڕان بۆ \'<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">گەڕانی-خۆکارانە پێشوو</string>
+    <string name="msg_searching">گەڕان بۆ بەهێزکردنی وێستگەکان بۆ دروستکردنی لیست\u2026</string>
+    <string name="msg_noantenna">تکایه‌ هێدفۆنێکی پێوه‌بکه‌ بۆ به‌کارهێنانی FM</string>
+    <string name="dialog_sleep_title">خۆکارانە کاتی کوژانەوەی کات خەو</string>
+    <string name="presetlist_select_name">ده‌ستنیشانکردنی  \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">زیادکردنی لیستێکی نوێ</string>
+    <string name="dialog_presetlist_rename_title">ناو بنوسە</string>
+    <string name="presetlist_autoselect_title">دڵنیاکردنەوەی دیاریکردنی-خۆکارانە</string>
+    <string name="preset_tune">بادان</string>
+    <string name="preset_search">گه‌ڕان بۆ  \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\'  مێگاهێرتز</string>
+    <string name="regional_band">ده‌سته‌ی هه‌رێمایه‌تی</string>
+    <string name="regional_band_entry_north_america">باکوری ئه‌مریکا</string>
+    <string name="regional_band_entry_europe">ئه‌وروپا</string>
+    <string name="regional_band_entry_japan">ژاپۆن</string>
+    <string name="regional_band_entry_japan_wide">ژاپۆن (پانی)</string>
+    <string name="regional_band_entry_australia">ئوسترالیا</string>
+    <string name="regional_band_entry_austria">ئوستریا</string>
+    <string name="regional_band_entry_belgium">به‌لجیکا</string>
+    <string name="regional_band_entry_brazil">به‌ڕازیل</string>
+    <string name="regional_band_entry_china">چین</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">دانیمارک</string>
+    <string name="regional_band_entry_finland">فینله‌ندا</string>
+    <string name="regional_band_entry_france">فه‌ڕه‌نسا</string>
+    <string name="regional_band_entry_germany">ئه‌ڵمانیا</string>
+    <string name="regional_band_entry_greece">یۆنان</string>
+    <string name="regional_band_entry_hong_kong">هۆنگ کۆنگ</string>
+    <string name="regional_band_entry_india">هیندستان</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">ئایرله‌ندا</string>
+    <string name="regional_band_entry_italy">ئیتاڵیا</string>
+    <string name="regional_band_entry_korea">کۆریا</string>
+    <string name="regional_band_entry_mexico">مه‌کسیک</string>
+    <string name="regional_band_entry_netherlands">هۆڵه‌ندا</string>
+    <string name="regional_band_entry_new_zealand">نیوزیله‌ندا</string>
+    <string name="regional_band_entry_norway">نه‌رویج</string>
+    <string name="regional_band_entry_poland">پۆڵه‌ندا</string>
+    <string name="regional_band_entry_portugal">پورتوگال</string>
+    <string name="regional_band_entry_russia">ڕوسیا</string>
+    <string name="regional_band_entry_singapore">سینگاپوور</string>
+    <string name="regional_band_entry_slovakia">سلۆڤاکیا</string>
+    <string name="regional_band_entry_spain">ئیسپانیا</string>
+    <string name="regional_band_entry_switzerland">سویزه‌رلاندا</string>
+    <string name="regional_band_entry_sweden">سوید</string>
+    <string name="regional_band_entry_taiwan">تایوان</string>
+    <string name="regional_band_entry_turkey">تورکیا</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">ئه‌مریکا</string>
+    <string name="regional_band_entry_user_defined">به‌کارهێنه‌ر پێناسه‌ی باندێکی کرد</string>
+    <string name="regional_band_summary_user_defined">به‌کارهێنه‌ر پێناسه‌ی ده‌سته‌یه‌کی کرد</string>
+    <string name="aud_output_mode">باری ده‌نگی ده‌ره‌وه‌</string>
+    <string name="audio_type_stereo">ستیریۆ</string>
+    <string name="audio_type_mono">مۆنۆ</string>
+    <string name="record_dur">ماوه‌ی تۆمارکردن</string>
+    <string name="settings_revert_defaults_title">گه‌ڕانه‌وه‌ بۆ باری سه‌ره‌تایی</string>
+    <string name="settings_revert_defaults_summary">گه‌ڕانه‌وه‌ی سه‌ره‌تایی بۆ هه‌موو ڕێکخستنه‌کان</string>
+    <string name="settings_revert_confirm_title">ڕازیبوون به‌ ڕێکخستنه‌وه‌</string>
+    <string name="settings_revert_confirm_msg">ئەمە هەموو ڕێکخستنەکانی بەرنامەکان پاکەکاتەوە، وە ئەوانەی پێشوش دەگرێتەوە. بەردەوام?</string>
+    <string name="spaceIsLow_content">بیرگەی ده‌ره‌کیت پڕبووه‌،جۆرایه‌تی ڕێکخستن بگۆڕه‌ یاخود چه‌ند په‌ڕگه‌یه‌ک بسڕه‌وه‌ بۆ زیادکردنی قه‌باره‌که‌ی.</string>
+    <string name="menu_scan_for_preset">گه‌ڕان به‌دوای ئاماده‌کراو</string>
+    <string name="fm_off">ئێف ئێم کوژایەوە.</string>
+    <string name="fm_call">ئێف ئێم ناتوانرێت بەکاربهێنرێت لەکاتی تەلەفۆنکردن.</string>
+    <string name="alert_dialog_hint">ناوێک بنووسه‌</string>
+    <string name="search_dialog_title">گه‌ڕان به‌دوای وێستگه‌</string>
+    <string name="fm_tune_timeout_msg">هیچ وه‌ڵامێک نه‌بوو بۆ وه‌رگرتنی ڕادیۆ و ویستگه‌ی FM ، ئه‌گه‌ر کێشه‌یه‌ک هه‌یه‌ ، دوباره‌ بیکوژێنه‌وه‌ و دایگیسێنه‌وه‌.</string>
+    <string name="fm_command_failed_title">هه‌ڵه‌ له‌ فرمانی FM</string>
+    <string name="fm_cmd_failed_msg">هه‌ڵه‌ له‌ فرمانی FM ، ئه‌گه‌ر به‌رده‌وامبوو ئه‌وه‌ بیکوژێنه‌وه‌ و دایگیرسێنه‌وه‌.</string>
+    <string name="fm_cmd_failed_msg_hdmi">هه‌ڵه‌ له‌ فرمانی FM ، ڕادیۆی FM و HDMI کارناکه‌ن .</string>
+    <string name="fm_cmd_failed_call_on">هه‌ڵه‌ له‌ فرمانی FM ، ڕادیۆی FM ڕێگه‌پیدراو نییه‌ له‌ کاتی په‌یوه‌ندی.</string>
+    <string name="station_name">وێستگه‌:</string>
+    <string name="station_exists">ئه‌م فریکوێنسه‌ پێشتر هه‌یه‌!</string>
+    <string name="station_list_delete_station">سڕینه‌وه‌ی  <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_name_empty">ناوی وێستگه‌که‌ به‌تاڵه‌ ، تکایه‌ بینوسه‌ره‌وه‌.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' پێشتر لەکارە، تکایە ناوی جیاواز بنوسە.</string>
+    <string name="rt_plus_tags">پێشنیاره‌کان</string>
+    <string name="chanl_spacing">بۆشایی که‌ناڵ</string>
+    <string name="fm_search_no_results">هیچ وێستگەیەکی گونجاو نەدۆزرایەوە</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-lt/arrays.xml
similarity index 69%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-lt/arrays.xml
index cb1457b..654768e 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-lt/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 min.</item>
+    <item>15 min.</item>
+    <item>30 min.</item>
+    <item>Iki sustabdymo</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 min.</item>
+    <item>30 min.</item>
+    <item>45 min.</item>
+    <item>1 val.</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-lt/strings.xml b/fmapp2/res/values-lt/strings.xml
new file mode 100644
index 0000000..8af4d06
--- /dev/null
+++ b/fmapp2/res/values-lt/strings.xml
@@ -0,0 +1,189 @@
+<?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 radijas</string>
+    <string name="tx_app_name">FM siųstuvas</string>
+    <string name="menu_scan_start">Nuskaityti</string>
+    <string name="menu_scan_stop">Sustabdyti paiešką</string>
+    <string name="menu_record_start">Įrašyti</string>
+    <string name="menu_record_stop">Sustabdyti įrašymą</string>
+    <string name="menu_settings">Nustatymai</string>
+    <string name="menu_sleep">Miegoti</string>
+    <string name="menu_sleep_cancel">Atšaukti miegą</string>
+    <string name="menu_all_channels">Visi kanalai</string>
+    <string name="menu_display_tags">Rodyti žymes</string>
+    <string name="button_text_stop">Sustabdyti</string>
+    <string name="msg_seeking">Ieškoma radijo stočių\u2026</string>
+    <string name="msg_scanning">Ieškoma visų radijo stočių\u2026</string>
+    <string name="msg_scanning_pty">Ieškoma „<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">Automatiškai parenkami išankstiniai nustatymai</string>
+    <string name="msg_searching">Ieškoma stabilių stočių, kad sukurti išankstinį sąrašą\u2026</string>
+    <string name="msg_noantenna">Prašome prijungti ausines, kad naudotumėtes FM radiją</string>
+    <string name="dialog_sleep_title">Automatinio išjungimo miego laikas</string>
+    <string name="presetlist_select_name">Pasirinkite „<xliff:g id="presetlist_name">%1$s</xliff:g>“</string>
+    <string name="presetlist_add_new">Pridėti naują sąrašą</string>
+    <string name="dialog_presetlist_rename_title">Įveskite pavadinimą</string>
+    <string name="presetlist_autoselect_title">Patvirtinkite automatinį pasirinkimą</string>
+    <string name="preset_replace">Pakeisti</string>
+    <string name="preset_tune">Koreguoti</string>
+    <string name="preset_rename">Pervadinti</string>
+    <string name="preset_delete">Ištrinti</string>
+    <string name="preset_search">Ieškoti „<xliff:g id="preset_pi">%1$s</xliff:g>“</string>
+    <string name="stat_notif_frequency">„<xliff:g id="frequency">%1$s</xliff:g>“ MHz</string>
+    <string name="regional_band">Regionai</string>
+    <string name="regional_band_entry_north_america">Šiaurės Amerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japonija</string>
+    <string name="regional_band_entry_japan_wide">Japonija (visos)</string>
+    <string name="regional_band_entry_australia">Australija</string>
+    <string name="regional_band_entry_austria">Austrija</string>
+    <string name="regional_band_entry_belgium">Belgija</string>
+    <string name="regional_band_entry_brazil">Brazilija</string>
+    <string name="regional_band_entry_china">Kinija</string>
+    <string name="regional_band_entry_czech_republic">Čekijos Respublika</string>
+    <string name="regional_band_entry_denmark">Danija</string>
+    <string name="regional_band_entry_finland">Suomija</string>
+    <string name="regional_band_entry_france">Prancūzija</string>
+    <string name="regional_band_entry_germany">Vokietija</string>
+    <string name="regional_band_entry_greece">Graikija</string>
+    <string name="regional_band_entry_hong_kong">Hong Kongas</string>
+    <string name="regional_band_entry_india">Indija</string>
+    <string name="regional_band_entry_indonesia">Indonezija</string>
+    <string name="regional_band_entry_ireland">Airija</string>
+    <string name="regional_band_entry_italy">Italija</string>
+    <string name="regional_band_entry_korea">Korėja</string>
+    <string name="regional_band_entry_mexico">Meksika</string>
+    <string name="regional_band_entry_netherlands">Nyderlandai</string>
+    <string name="regional_band_entry_new_zealand">Naujoji Zelandija</string>
+    <string name="regional_band_entry_norway">Norvegija</string>
+    <string name="regional_band_entry_poland">Lenkija</string>
+    <string name="regional_band_entry_portugal">Portugalija</string>
+    <string name="regional_band_entry_russia">Rusija</string>
+    <string name="regional_band_entry_singapore">Singapūras</string>
+    <string name="regional_band_entry_slovakia">Slovakija</string>
+    <string name="regional_band_entry_spain">Ispanija</string>
+    <string name="regional_band_entry_switzerland">Šveicarija</string>
+    <string name="regional_band_entry_sweden">Švedija</string>
+    <string name="regional_band_entry_taiwan">Taivanas</string>
+    <string name="regional_band_entry_turkey">Turkija</string>
+    <string name="regional_band_entry_united_kingdom">Jungtinė Karalystė</string>
+    <string name="regional_band_entry_united_states">Jungtinės Amerikos Valstijos</string>
+    <string name="regional_band_entry_user_defined">Vartotojo apibrėžta grupė</string>
+    <string name="regional_band_summary_user_defined">Vartotojo apibrėžtas diapazonas</string>
+    <string name="aud_output_mode">Garso išvesties režimas</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Įrašo trukmė</string>
+    <string name="auto_select_af">Alternatyvus dažnis</string>
+    <string name="settings_revert_defaults_title">Atkurti gamyklinius nustatymus</string>
+    <string name="settings_revert_defaults_summary">Nustatyti iš naujo visus nustatymus</string>
+    <string name="settings_revert_confirm_title">Patvirtinkite atstatymą</string>
+    <string name="settings_revert_confirm_msg">Tai išvalis visus programos nustatymus, įskaitant išsaugotus išankstinius nustatymus. Tęsti?</string>
+    <string name="no_storage">Prijunkite SD kortelę prieš pradedant įrašymą.</string>
+    <string name="preparing_sd">Ruošiama SD kortelė\u2026</string>
+    <string name="access_sd_fail">Nepavyko pasiekti SD kortelės.</string>
+    <string name="spaceIsLow_content">Jūsų SD kortelėje liko mažai laisvos vietos. Pakeiskite kokybės nustatymus arba ištrinkite kai kuriuos atvaizdus ar kitus failus.</string>
+    <string name="menu_scan_for_preset">Nuskaityti išankstinius sąrašus</string>
+    <string name="fm_off">FM yra išjungtas.</string>
+    <string name="fm_call">FM negali būti naudojamas skambinant.</string>
+    <string name="alert_dialog_hint">Įveskite pavadinimą</string>
+    <string name="search_dialog_title">Nuskaityti stotis</string>
+    <string name="fm_command_timeout_title">Skirtasis laikas</string>
+    <string name="fm_tune_timeout_msg">Nėra jokio atsakymo iš FM stoties. Jei problema kartojasi prašome išjungti ir vėl įjungti FM.</string>
+    <string name="fm_command_failed_title">FM operacija nepavyko</string>
+    <string name="fm_cmd_failed_msg">FM operacija nepavyko. Jei problema kartojasi, prašome išjungti ir vėl įjungti FM.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM operacija nepavyko. FM ir HDMI  vienu metu nepalaikomas.</string>
+    <string name="fm_cmd_failed_call_on">FM operacija nepavyko. FM neleidžiama skambučio metu.</string>
+    <string name="station_name">Stotis:</string>
+    <string name="station_exists">Šis dažnis jau yra!</string>
+    <string name="station_list_delete_station">Ištrinti: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Ar tikrai norite ištrinti „<xliff:g id="name">%s</xliff:g>“?</string>
+    <string name="station_name_empty">Stoties pavadinimas yra tuščias, prašome įvesti dar kartą.</string>
+    <string name="station_name_exist">„<xliff:g id="name">%s</xliff:g>“ jau naudojamas, prašome įvesti kitą pavadinimą.</string>
+    <string name="rt_plus_tags">Žymos</string>
+    <string name="usr_def_band_min">Žemiausias dažnis (MHz)</string>
+    <string name="usr_def_band_max">Aukščiausias dažnis (MHz)</string>
+    <string name="chanl_spacing">Kanalų atskyrimai</string>
+    <string name="set">Nustatyti</string>
+    <string name="fm_search_no_results">Nerasta suderinamų stočių</string>
+    <string name="typ_All_stations">Visos stotys</string>
+    <string name="typ_Culture">Kultūra</string>
+    <string name="typ_Current_affairs">Aktualijos</string>
+    <string name="typ_Children">Vaikų programos</string>
+    <string name="typ_Country">Kantri muzika</string>
+    <string name="typ_Documentary">Dokumentika</string>
+    <string name="typ_Drama">Dramos</string>
+    <string name="typ_Easy_listening">Lengva muzika</string>
+    <string name="typ_Education">Švietimas</string>
+    <string name="typ_Emergency">Avarinis</string>
+    <string name="typ_Emergency_test">Avarinis testas</string>
+    <string name="typ_Finance">Finansai</string>
+    <string name="typ_Folk">Liaudies muzika</string>
+    <string name="typ_Information">Informacija</string>
+    <string name="typ_Jazz">Džiazo muzika</string>
+    <string name="typ_Light_classical">Lengva klasika</string>
+    <string name="typ_Leisure">Laisvalaikis</string>
+    <string name="typ_News">Naujienos</string>
+    <string name="typ_National">Nacionalinė muzika</string>
+    <string name="typ_Other">Kita muzika</string>
+    <string name="typ_Oldies">Senovinė muzika</string>
+    <string name="typ_Phone_in">Tiesioginis</string>
+    <string name="typ_Pop">Pop muzika</string>
+    <string name="typ_Religion">Religija</string>
+    <string name="typ_Rock">Roko muzika</string>
+    <string name="typ_Science">Mokslas</string>
+    <string name="typ_Serious_classical">Rimta klasika</string>
+    <string name="typ_Social_affairs">Socialiniai reikalai</string>
+    <string name="typ_Sport">Sportas</string>
+    <string name="typ_Travel">Kelionės</string>
+    <string name="typ_Varied">Įvairi</string>
+    <string name="typ_Weather">Orai</string>
+    <string name="typ_Adult_hits">Suaugusiųjų hitai</string>
+    <string name="typ_Classical">Klasikinis</string>
+    <string name="typ_Classic_Rock">Klasikinis rokas</string>
+    <string name="typ_College">Kolegijos</string>
+    <string name="typ_Foreign_language">Užsienio kalba</string>
+    <string name="typ_Hiphop">Hiphopas</string>
+    <string name="typ_Nostalgia">Nostalgija</string>
+    <string name="typ_Personality">Asmenybė</string>
+    <string name="typ_Public">Viešas</string>
+    <string name="typ_Religious_music">Religinė muzika</string>
+    <string name="typ_Religious_talk">Religiniai pokalbiai</string>
+    <string name="typ_Rhythm_and_Blues">Ritmas ir bliuzas</string>
+    <string name="typ_Spanish_music">Ispaniška muzika</string>
+    <string name="typ_Spanish_talk">Ispaniški pokalbiai</string>
+    <string name="typ_Soft">Švelni</string>
+    <string name="typ_Soft_Rock">Lengvasis rokas</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Lengvi ritmai ir bliuzas</string>
+    <string name="typ_Sports">Sportas</string>
+    <string name="typ_Talk">Pokalbiai</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-lu/arrays.xml
similarity index 68%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-lu/arrays.xml
index cb1457b..9755824 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-lu/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 Minutten</item>
+    <item>15 Minutten</item>
+    <item>30 Minutten</item>
+    <item>Bis et gestoppt gëtt</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 Minutten</item>
+    <item>30 Minutten</item>
+    <item>45 Minutten</item>
+    <item>1 Stonn</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-lu/strings.xml b/fmapp2/res/values-lu/strings.xml
new file mode 100644
index 0000000..6ddd681
--- /dev/null
+++ b/fmapp2/res/values-lu/strings.xml
@@ -0,0 +1,194 @@
+<?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-Sender</string>
+    <string name="menu_scan_start">Sichen</string>
+    <string name="menu_scan_stop">Ophale mat Sichen</string>
+    <string name="menu_record_start">Ophuelen</string>
+    <string name="menu_record_stop">Opnam stoppen</string>
+    <string name="menu_settings">Astellungen</string>
+    <string name="menu_sleep">Rouzoustand</string>
+    <string name="menu_sleep_cancel">Schlof ofbriechen</string>
+    <string name="menu_all_channels">All d\'Kanäl</string>
+    <string name="menu_display_tags">Tags uweisen</string>
+    <string name="button_text_stop">Stopp</string>
+    <string name="msg_seeking">FM-Radiosstatioun gëtt gesicht\u2026</string>
+    <string name="msg_scanning">Et gëtt no allen FM-Radiosstatioune gesicht\u2026</string>
+    <string name="msg_scanning_pty">Et gëtt no \'<xliff:g id="pty_name">%1$s</xliff:g>\' gesicht\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Automatesch Kanalsich</string>
+    <string name="msg_searching">Et gëtt no staarkë Statioune gesicht fir eng Frequenzlëscht z\'erstellen\u2026</string>
+    <string name="msg_noantenna">Schléiss w.e.g. Kopfhörer u fir FM-Radio ze lauschteren</string>
+    <string name="dialog_sleep_title">Auto-Ausschaltzäit</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' auswielen</string>
+    <string name="presetlist_add_new">Nei Lëscht dobäisetzen</string>
+    <string name="dialog_presetlist_rename_title">Numm aginn</string>
+    <string name="presetlist_autoselect_title">Automatesch Auswiel bestätegen</string>
+    <string name="preset_replace">Ersetzen</string>
+    <string name="preset_tune">Sendersich</string>
+    <string name="preset_rename">Ëmbenennen</string>
+    <string name="preset_delete">Läschen</string>
+    <string name="preset_search">No \'<xliff:g id="preset_pi">%1$s</xliff:g>\' sichen</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regional Frequenz</string>
+    <string name="regional_band_entry_north_america">Nordamerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (breet)</string>
+    <string name="regional_band_entry_australia">Australien</string>
+    <string name="regional_band_entry_austria">Éisterräich</string>
+    <string name="regional_band_entry_belgium">Belsch</string>
+    <string name="regional_band_entry_brazil">Brasilien</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Tschechesch Republik</string>
+    <string name="regional_band_entry_denmark">Dänemark</string>
+    <string name="regional_band_entry_finland">Finnland</string>
+    <string name="regional_band_entry_france">Frankräich</string>
+    <string name="regional_band_entry_germany">Däitschland</string>
+    <string name="regional_band_entry_greece">Griecheland</string>
+    <string name="regional_band_entry_hong_kong">Hongkong</string>
+    <string name="regional_band_entry_india">Indien</string>
+    <string name="regional_band_entry_indonesia">Indonesien</string>
+    <string name="regional_band_entry_ireland">Irland</string>
+    <string name="regional_band_entry_italy">Italien</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexiko</string>
+    <string name="regional_band_entry_netherlands">Nidderlanden</string>
+    <string name="regional_band_entry_new_zealand">Neiséiland</string>
+    <string name="regional_band_entry_norway">Norwegen</string>
+    <string name="regional_band_entry_poland">Polen</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russland</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Slovakei</string>
+    <string name="regional_band_entry_spain">Spuenien</string>
+    <string name="regional_band_entry_switzerland">Schwäiz</string>
+    <string name="regional_band_entry_sweden">Schweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Türkei</string>
+    <string name="regional_band_entry_united_kingdom">Groussbritannien</string>
+    <string name="regional_band_entry_united_states">USA</string>
+    <string name="regional_band_entry_user_defined">Benotzerdefinéiert Frequenzband</string>
+    <string name="regional_band_summary_user_defined">Benotzerdefinéiert Frequenzband</string>
+    <string name="aud_output_mode">Toun-Ausganks-Modus</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Dauer vu der Opnam</string>
+    <string name="auto_select_af">Alternativ Frequenz</string>
+    <string name="settings_revert_defaults_title">Op d\'Wierksastellungen zrécksetzen</string>
+    <string name="settings_revert_defaults_summary">All d\'Astellungen zrécksetzen</string>
+    <string name="settings_revert_confirm_title">Zrécksetze bestätegen</string>
+    <string name="settings_revert_confirm_msg">All d\'Astellunge vun der App, inklusiv d\'gespäichert Kanäl, ginn eidel gemaach. Weidermaachen?</string>
+    <string name="no_storage">Bann d\'SD-Kaart an ier s de d\'Opnam starts.</string>
+    <string name="preparing_sd">SD-Kaart gëtt preparéiert\u2026</string>
+    <string name="access_sd_fail">Keen Zougrëff op d\'SD-Kaart méiglech.</string>
+    <string name="spaceIsLow_content">Deng SD-Kaart huet geschwë kee fräie Späicher méi. Änner d\'Qualitéitsastellung oder läsch e puer Fichiere fir Plaz fräizemaachen.</string>
+    <string name="FMRecording_reach_size_limit">Gréisstelimitt ass erreecht.</string>
+    <string name="menu_scan_for_preset">No Sendere sichen</string>
+    <string name="fm_off">FM ass ausgeschalt.</string>
+    <string name="fm_call">FM ka während Uriff net benotzt ginn.</string>
+    <string name="alert_dialog_hint">Gëff en Numm an</string>
+    <string name="search_dialog_title">Statioune sichen</string>
+    <string name="fm_command_timeout_title">Timeout</string>
+    <string name="fm_tune_timeout_msg">Keen Empfang um gewënschten FM-Sender. Probéier de Radio aus- an nees unzeschalten, wann de Probleem weierhi besteet.</string>
+    <string name="fm_command_failed_title">Radio-Operatioun feelgeschloen</string>
+    <string name="fm_cmd_failed_msg">Radio-Operatioun feelgeschloen. Falls de Problem bestoe bleift, schalt de Radio aus an nees un.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Radio-Operatioun feelgeschloen. Radio an HDMI funktionnéieren net gläichzäiteg.</string>
+    <string name="fm_cmd_failed_call_on">Radio-Operatioun feelgeschloen. Während engem Uruff ka kee Radio gelauschtert ginn.</string>
+    <string name="audio_db_artist_name">Meng Radioopnamen</string>
+    <string name="audio_db_album_name">Radioopnamen</string>
+    <string name="audio_db_playlist_name">Radioopnamen</string>
+    <string name="station_name">Statioun:</string>
+    <string name="station_exists">Dës Frequenz existéiert schon!</string>
+    <string name="station_list_delete_station">Läschen: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Wëlls du \'<xliff:g id="name">%s</xliff:g>\' sécher läschen?</string>
+    <string name="station_name_empty">De Statiounsnumm ass eidel, w.e.g. eppes aginn.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' gëtt scho benotzt, gëff w.e.g. en aneren Numm an.</string>
+    <string name="rt_plus_tags">Tags</string>
+    <string name="usr_def_band_min">Niddregst Frequenz (Mhz)</string>
+    <string name="usr_def_band_max">Héchst Frequenz (Mhz)</string>
+    <string name="chanl_spacing">Kanalofstand</string>
+    <string name="set">Setzen</string>
+    <string name="save_record_file">Fichier vun der Radioopnam ënner \'<xliff:g id="record_file">%1$s</xliff:g>\' gespäichert</string>
+    <string name="fm_search_no_results">Keng kompatibel Statioune fonnt</string>
+    <string name="typ_All_stations">All d\'Senderen</string>
+    <string name="typ_Culture">Kultur</string>
+    <string name="typ_Current_affairs">Aktuell Ereegnesser</string>
+    <string name="typ_Children">Kannerprogrammer</string>
+    <string name="typ_Country">Country-Musek</string>
+    <string name="typ_Documentary">Dokumentarfilm</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Entspannungsmusek</string>
+    <string name="typ_Education">Educatioun</string>
+    <string name="typ_Emergency">Noutfall</string>
+    <string name="typ_Emergency_test">Noutfalltest</string>
+    <string name="typ_Finance">Finanzen</string>
+    <string name="typ_Folk">Volleksmusek</string>
+    <string name="typ_Information">Informatioun</string>
+    <string name="typ_Jazz">Jazzmusek</string>
+    <string name="typ_Light_classical">Liicht Klassik</string>
+    <string name="typ_Leisure">Fräizäit</string>
+    <string name="typ_News">Neiegkeeten</string>
+    <string name="typ_National">National Musek</string>
+    <string name="typ_Other">Aner Musek</string>
+    <string name="typ_Oldies">Oldie-Musek</string>
+    <string name="typ_Phone_in">Telefonsagank</string>
+    <string name="typ_Pop">Popmusek</string>
+    <string name="typ_Religion">Relioun</string>
+    <string name="typ_Rock">Rockmusek</string>
+    <string name="typ_Science">Wëssenschaft</string>
+    <string name="typ_Serious_classical">Eescht Klassik</string>
+    <string name="typ_Social_affairs">Sozial Affären</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Reesen</string>
+    <string name="typ_Varied">Villfälteg</string>
+    <string name="typ_Weather">Wieder</string>
+    <string name="typ_Adult_hits">Erwuessenen Hitten</string>
+    <string name="typ_Classical">Klassik</string>
+    <string name="typ_Classic_Rock">Klassesche Rock</string>
+    <string name="typ_College">Héichschoul</string>
+    <string name="typ_Foreign_language">Friemsprooch</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgie</string>
+    <string name="typ_Personality">Personalitéiten</string>
+    <string name="typ_Public">Ëffentlech</string>
+    <string name="typ_Religious_music">Reliéis Musek</string>
+    <string name="typ_Religious_talk">Reliéis Talkshowen</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm a Blues</string>
+    <string name="typ_Spanish_music">Spuenesch Musek</string>
+    <string name="typ_Spanish_talk">Spuenesch Gespréicher</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm a Blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Talkshowen</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-lv/arrays.xml
similarity index 69%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-lv/arrays.xml
index cb1457b..6fd4a24 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-lv/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minūtes</item>
+    <item>15 minūtes</item>
+    <item>30 minūtes</item>
+    <item>Līdz beigām</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minūtes</item>
+    <item>30 minūtes</item>
+    <item>45 minūtes</item>
+    <item>1 stunda</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-lv/strings.xml b/fmapp2/res/values-lv/strings.xml
new file mode 100644
index 0000000..eec799b
--- /dev/null
+++ b/fmapp2/res/values-lv/strings.xml
@@ -0,0 +1,124 @@
+<?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 raidītājs</string>
+    <string name="menu_scan_start">Skenēt</string>
+    <string name="menu_scan_stop">Apturēt meklēšanu</string>
+    <string name="menu_record_start">Ierakstīt</string>
+    <string name="menu_record_stop">Apturēt ierakstīšanu</string>
+    <string name="menu_settings">Iestatījumi</string>
+    <string name="menu_sleep">Iemidzināt</string>
+    <string name="menu_sleep_cancel">Atcelt iemigšanu</string>
+    <string name="menu_all_channels">Visi kanāli</string>
+    <string name="menu_display_tags">Rādīt atzīmes</string>
+    <string name="button_text_stop">Apturēt</string>
+    <string name="msg_seeking">Meklē FM staciju\u2026</string>
+    <string name="msg_scanning">Meklēšana visām FM stacijām\u2026</string>
+    <string name="msg_noantenna">Lūdzu, pievienojiet austiņas, lai izmantotu FM radio</string>
+    <string name="dialog_sleep_title">Auto-izslēgšanas laiks</string>
+    <string name="presetlist_add_new">Pievienot jaunu sarakstu</string>
+    <string name="dialog_presetlist_rename_title">Ievadiet nosaukumu</string>
+    <string name="presetlist_autoselect_title">Apstipriniet automātisko atlasi</string>
+    <string name="preset_replace">Aizstāt</string>
+    <string name="preset_tune">Noskaņot</string>
+    <string name="preset_rename">Pārsaukt</string>
+    <string name="preset_delete">Dzēst</string>
+    <string name="preset_search">Meklēt \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Reģionālā josla</string>
+    <string name="regional_band_entry_north_america">Ziemeļamerika</string>
+    <string name="regional_band_entry_europe">Eiropa</string>
+    <string name="regional_band_entry_japan">Japāna</string>
+    <string name="regional_band_entry_japan_wide">Japāna (wide)</string>
+    <string name="regional_band_entry_australia">Austrālija</string>
+    <string name="regional_band_entry_austria">Austrija</string>
+    <string name="regional_band_entry_belgium">Beļģija</string>
+    <string name="regional_band_entry_brazil">Brazīlija</string>
+    <string name="regional_band_entry_china">Ķīna</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Dānija</string>
+    <string name="regional_band_entry_finland">Somija</string>
+    <string name="regional_band_entry_france">Francija</string>
+    <string name="regional_band_entry_germany">Vācija</string>
+    <string name="regional_band_entry_greece">Grieķija</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indija</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Īrija</string>
+    <string name="regional_band_entry_italy">Itālija</string>
+    <string name="regional_band_entry_korea">Koreja</string>
+    <string name="regional_band_entry_mexico">Meksika</string>
+    <string name="regional_band_entry_netherlands">Nīderlande</string>
+    <string name="regional_band_entry_new_zealand">Jaunzēlande</string>
+    <string name="regional_band_entry_norway">Norvēģija</string>
+    <string name="regional_band_entry_poland">Polija</string>
+    <string name="regional_band_entry_portugal">Portugāle</string>
+    <string name="regional_band_entry_russia">Krievija</string>
+    <string name="regional_band_entry_singapore">Singapūra</string>
+    <string name="regional_band_entry_slovakia">Slovākija</string>
+    <string name="regional_band_entry_spain">Spānija</string>
+    <string name="regional_band_entry_switzerland">Šveice</string>
+    <string name="regional_band_entry_sweden">Zviedrija</string>
+    <string name="regional_band_entry_taiwan">Taivāna</string>
+    <string name="regional_band_entry_turkey">Turcija</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">Amerikas Savienotās Valstis</string>
+    <string name="regional_band_entry_user_defined">Lietotāja definētā grupa</string>
+    <string name="regional_band_summary_user_defined">Lietotāja definētā josla</string>
+    <string name="aud_output_mode">Audio izvades režīms</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Ieraksta ilgums</string>
+    <string name="auto_select_af">Alternatīvā frekvence</string>
+    <string name="settings_revert_defaults_title">Noklusēto iestatījumu atjaunošana</string>
+    <string name="settings_revert_defaults_summary">Atstata visus iestatījumus</string>
+    <string name="settings_revert_confirm_title">Atiestatījumu apstiprināšana</string>
+    <string name="settings_revert_confirm_msg">Tiks notīrīti lietotnes iestatījumi, ieskaitot saglabātos priekšiestatījumus. Vai turpināt?</string>
+    <string name="no_storage">Pirms sākt ierakstīšanu, uzmontējiet SD karti.</string>
+    <string name="spaceIsLow_content">SD kartes krātuvē trūkst vietas. Nomainiet kvalitātes iestatījumus vai izdzēsiet failus, lai atbrīvotu vietu.</string>
+    <string name="menu_scan_for_preset">Skenēt pirmstatījumus</string>
+    <string name="alert_dialog_hint">Ievadiet nosaukumu</string>
+    <string name="search_dialog_title">Skenēt stacijas</string>
+    <string name="fm_command_timeout_title">Noildze</string>
+    <string name="fm_tune_timeout_msg">Skaņojot FM staciju, netika saņemta atbilde. Ja kļūda nepazūd, izslēdziet un atkal ieslēdziet FM.</string>
+    <string name="fm_command_failed_title">FM darbība neizdevās</string>
+    <string name="fm_cmd_failed_msg">FM darbība neizdevās. Ja kļūda nepazūd, lūdzu, izslēdziet un atkal ieslēdziet FM.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM darbība neizdevās. FM un HDMI nav vienlaicīgi atbalstīti.</string>
+    <string name="fm_cmd_failed_call_on">FM darbība neizdevās. Zvana laikā FM audio nav atļauts.</string>
+    <string name="station_exists">Šī frekvence jau pastāv!</string>
+    <string name="station_list_delete_station">Dzēst: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Vai tiešām vēlaties dzēst \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Stacijas nosaukums ir tukšs, lūdzu, ievadiet vēlreiz.</string>
+    <string name="rt_plus_tags">Tagi</string>
+    <string name="usr_def_band_min">Zemākā frekvence (MHz)</string>
+    <string name="usr_def_band_max">Augstākā frekvence (MHz)</string>
+    <string name="chanl_spacing">Kanālu attālums</string>
+</resources>
diff --git a/fmapp2/res/drawable/station_border.xml b/fmapp2/res/values-mk/arrays.xml
similarity index 81%
rename from fmapp2/res/drawable/station_border.xml
rename to fmapp2/res/values-mk/arrays.xml
index 2aee777..446450c 100644
--- a/fmapp2/res/drawable/station_border.xml
+++ b/fmapp2/res/values-mk/arrays.xml
@@ -1,5 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
- * Copyright (c) 2009, The Linux Foundation. All rights reserved.
+ * 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:
@@ -25,9 +27,10 @@
  * 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>
+<resources>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-mk/strings.xml b/fmapp2/res/values-mk/strings.xml
new file mode 100644
index 0000000..0dff4c2
--- /dev/null
+++ b/fmapp2/res/values-mk/strings.xml
@@ -0,0 +1,69 @@
+<?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="regional_band_summary_north_america">Северна Америка (87,5 до 108,0 MHz во 200 kHz во чекори)</string>
+    <string name="regional_band_summary_europe">Европа (87.5 до 108.0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_japan">Јапонија (76.0 до 90.0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_japan_wide">Јапонија (широко) (90,0 до 108,0 MHz во 50 kHz во чекори)</string>
+    <string name="regional_band_summary_australia">Австралија (87,7 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_austria">Австрија (87,5 до 108,0 MHz во 50 kHz во чекори)</string>
+    <string name="regional_band_summary_belgium">Белгија (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_brazil">Бразил (87.5 до 108.0 MHz во 200 kHz во чекори)</string>
+    <string name="regional_band_summary_china">Кина (87.0 до 108.0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_czech_republic">Чешка (87,5 до 108,0 MHz во 100 kHz чекори)</string>
+    <string name="regional_band_summary_denmark">Данска (87,5 до 108,0 MHz во 50 kHz чекори)</string>
+    <string name="regional_band_summary_finland">Финска (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_france">Франција (87.5 до 108.0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_germany">Германија (87,5 до 108,0 MHz во чекори 50 kHz во чекори)</string>
+    <string name="regional_band_summary_greece">Грција (87,5 до 108,0 MHz во 50 kHz во чекори)</string>
+    <string name="regional_band_summary_hong_kong">Хонг Конг (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_india">Индија (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_indonesia">Индонезија (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_ireland">Ирска (87,5 до 108,0 MHz во 50 kHz во чекори)</string>
+    <string name="regional_band_summary_italy">Италија (87,5 до 108,0 MHz во 50 kHz во чекори)</string>
+    <string name="regional_band_summary_korea">Кореја (87,5 до 108,0 MHz во 200 kHz во чекори)</string>
+    <string name="regional_band_summary_mexico">Мексико (88,1 до 107,9 MHz во 200 kHz во чекори)</string>
+    <string name="regional_band_summary_netherlands">Холандија (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_new_zealand">Нов Зеланд (88,0 до 107,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_norway">Норвешка (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_poland">Полска (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_portugal">Португалија (87,5 до 108,0 MHz во 50 kHz во чекори)</string>
+    <string name="regional_band_summary_russia">Русија (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_singapore">Сингапур (88,0 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_slovakia">Словачка (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_spain">Шпанија (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_switzerland">Швајцарија (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_sweden">Шведска (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_taiwan">Тајван (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_turkey">Турција (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_united_kingdom">Обединето Кралство (87,5 до 108,0 MHz во 100 kHz во чекори)</string>
+    <string name="regional_band_summary_united_states">САД (88.1 до 107.9 MHz во 200 kHz во чекори)</string>
+    <string name="user_defind_band_msg">Внесете фреквенција од 76,0 до 108,0 MHz со минимум 1 канал простор и 100 kHz простор помеѓу мин и максимална фреквенција</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ml/arrays.xml
similarity index 62%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ml/arrays.xml
index cb1457b..456624f 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ml/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>സ്റ്റീരിയോ</item>
+    <item>മോണോ</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>ഒരു മണിക്കൂർ</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ml/strings.xml b/fmapp2/res/values-ml/strings.xml
new file mode 100644
index 0000000..858e838
--- /dev/null
+++ b/fmapp2/res/values-ml/strings.xml
@@ -0,0 +1,189 @@
+<?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 റേഡിയോ</string>
+    <string name="tx_app_name">FM ട്രാൻസ്‌മിറ്റർ</string>
+    <string name="menu_scan_start">സ്‌കാൻ ചെയ്യുക</string>
+    <string name="menu_scan_stop">തിരയുന്നത് നിർത്തുക</string>
+    <string name="menu_record_start">റെക്കോര്ഡ്</string>
+    <string name="menu_record_stop">റെക്കോർഡിംഗ് നിർത്തുക</string>
+    <string name="menu_settings">ക്രമീകരണം</string>
+    <string name="menu_sleep">സുഷുപ്തിയിലാക്കുക</string>
+    <string name="menu_sleep_cancel">സ്‌ലീപ്പ് റദ്ദാക്കുക</string>
+    <string name="menu_all_channels">എല്ലാ ചാനലുകളും</string>
+    <string name="menu_display_tags">ടാഗുകൾ ദൃശ്യമാക്കുക</string>
+    <string name="button_text_stop">നിര്‍ത്തുക</string>
+    <string name="msg_seeking">FM സ്റ്റേഷൻ തിരയുന്നു.......</string>
+    <string name="msg_scanning">എല്ലാ FM സ്റ്റേഷനുകൾക്കായും സ്കാൻ ചെയ്യുന്നു.......</string>
+    <string name="msg_scanning_pty">\’<xliff:g id="pty_name">%1$s</xliff:g>\' ന് വേണ്ടി സ്കാന്‍ ചെയ്യുന്നു\......</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">ഓട്ടോ-തിരഞ്ഞെടുത്ത പ്രീസെറ്റുകൾ</string>
+    <string name="msg_searching">ഒരു പ്രീസെറ്റ് ലിസ്റ്റ് തയ്യാറാക്കുന്നതിനായി ശക്തമായ സ്റ്റേഷനുകൾക്കായി തിരയുന്നു.......</string>
+    <string name="msg_noantenna">FM റേഡിയോ ഉപയോഗിക്കാൻ ഒരു ഹെഡ്സെറ്റ് ദയവായി ഘടിപ്പിക്കുക</string>
+    <string name="dialog_sleep_title">ഓട്ടോ-ഓഫ് സ്‌ലീപ്പ് സമയം</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' തിരഞ്ഞെടുക്കുക</string>
+    <string name="presetlist_add_new">പുതിയ ലിസ്റ്റ് ചേർക്കുക</string>
+    <string name="dialog_presetlist_rename_title">പേര് രേഖപ്പെടുത്തുക</string>
+    <string name="presetlist_autoselect_title">ആട്ടോ-തിരഞ്ഞെടുക്കൽ സ്ഥിരീകരിക്കുക</string>
+    <string name="preset_replace">മാറ്റി പകരം വയ്ക്കുക</string>
+    <string name="preset_tune">ട്യൂണ്‍</string>
+    <string name="preset_rename">പേരുമാറ്റുക</string>
+    <string name="preset_delete">ഇല്ലാതാക്കുക</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' തിരയുക</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">റീജിയണൽ ബാൻഡ്</string>
+    <string name="regional_band_entry_north_america">ഉത്തര അമേരിക്ക</string>
+    <string name="regional_band_entry_europe">യൂറോപ്പ്</string>
+    <string name="regional_band_entry_japan">ജപ്പാൻ</string>
+    <string name="regional_band_entry_japan_wide">ജപ്പാൻ</string>
+    <string name="regional_band_entry_australia">ഓസ്ട്രേലിയ</string>
+    <string name="regional_band_entry_austria">ഓസ്ട്രിയ</string>
+    <string name="regional_band_entry_belgium">ബെൽജിയം</string>
+    <string name="regional_band_entry_brazil">ബ്രസീൽ</string>
+    <string name="regional_band_entry_china">ചൈന</string>
+    <string name="regional_band_entry_czech_republic">ചെക്ക് റിപ്പബ്ലിക്</string>
+    <string name="regional_band_entry_denmark">ഡെന്മാർക്ക്</string>
+    <string name="regional_band_entry_finland">ഫിൻലാൻഡ്</string>
+    <string name="regional_band_entry_france">ഫ്രാൻസ്</string>
+    <string name="regional_band_entry_germany">ജർമ്മനി</string>
+    <string name="regional_band_entry_greece">ഗ്രീസ്</string>
+    <string name="regional_band_entry_hong_kong">ഹോംഗ് കോങ്ങ്</string>
+    <string name="regional_band_entry_india">ഇന്ത്യ</string>
+    <string name="regional_band_entry_indonesia">ഇന്തോനേഷ്യ</string>
+    <string name="regional_band_entry_ireland">അയർലൻഡ്</string>
+    <string name="regional_band_entry_italy">ഇറ്റലി</string>
+    <string name="regional_band_entry_korea">കൊറിയ</string>
+    <string name="regional_band_entry_mexico">മെക്സിക്കോ</string>
+    <string name="regional_band_entry_netherlands">നെതർലാൻഡ്സ്</string>
+    <string name="regional_band_entry_new_zealand">ന്യൂസിലാന്റ്</string>
+    <string name="regional_band_entry_norway">നോർവേ</string>
+    <string name="regional_band_entry_poland">പോളണ്ട്</string>
+    <string name="regional_band_entry_portugal">പോർച്ചുഗൽ</string>
+    <string name="regional_band_entry_russia">റഷ്യ</string>
+    <string name="regional_band_entry_singapore">സിംഗപ്പുർ</string>
+    <string name="regional_band_entry_slovakia">സ്ലൊവാക്യ</string>
+    <string name="regional_band_entry_spain">സ്പെയിൻ</string>
+    <string name="regional_band_entry_switzerland">സ്വിറ്റ്സർലൻഡ്</string>
+    <string name="regional_band_entry_sweden">സ്വെടെൻ</string>
+    <string name="regional_band_entry_taiwan">തായ്വാൻ</string>
+    <string name="regional_band_entry_turkey">തുര്ക്കി</string>
+    <string name="regional_band_entry_united_kingdom">യുണൈറ്റഡ് കിംഗ്ഡം</string>
+    <string name="regional_band_entry_united_states">അമേരിക്ക</string>
+    <string name="regional_band_entry_user_defined">ഉപയോക്താവ് ബാന്റ്</string>
+    <string name="regional_band_summary_user_defined">ഉപയോക്താവ് ബാന്റ്</string>
+    <string name="aud_output_mode">ഓഡിയോ ഔട്ട്പുട്ട് മോഡ്</string>
+    <string name="audio_type_stereo">സ്റ്റീരിയോ</string>
+    <string name="audio_type_mono">മോണോ</string>
+    <string name="record_dur">റെക്കോർഡ് ദൈർഘ്യം</string>
+    <string name="auto_select_af">പകരമുള്ള ആവൃത്തി</string>
+    <string name="settings_revert_defaults_title">ഫാക്ടറി ഡീഫോള്‍ട്ടിലേക്ക് തിരിച്ചുപോകുക</string>
+    <string name="settings_revert_defaults_summary">എല്ലാ ക്രമീകരണങ്ങളും പുനസജ്ജമാക്കുക</string>
+    <string name="settings_revert_confirm_title">പുനഃസജ്ജമാക്കൽ സ്ഥിരീകരിക്കുക</string>
+    <string name="settings_revert_confirm_msg">സേവ് ചെയ്ത പ്രീസെറ്റുകൾ ഉൾപ്പെടെയുള്ള എല്ലാ ആപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളും മായ്ക്കുന്നതാണ്. തുടരണോ?</string>
+    <string name="no_storage">റെക്കോർഡിംഗ് ആരംഭിക്കുന്നതിന് മുമ്പ് SD കാർഡ് മൌണ്ട് ചെയ്യുക.</string>
+    <string name="preparing_sd">SD കാർഡ് തയ്യാറാക്കുന്നു.......</string>
+    <string name="access_sd_fail">SD കാർഡ് ആക്സസ് ചെയ്യാന്‍ കഴിഞ്ഞില്ല.</string>
+    <string name="spaceIsLow_content">നിങ്ങളുടെ SD കാർഡ് സംഭരണത്തില്‍ സ്ഥലം കുറവാണ്. ഗുണമേന്മ ക്രമീകരണം മാറ്റുക അല്ലെങ്കിൽ സ്ഥലം ലഭ്യമാക്കുന്നതിന് മറ്റുചില ഫയലുകൾ ഇല്ലാതാക്കുക.</string>
+    <string name="menu_scan_for_preset">പ്രീസെറ്റുകൾക്കായി സ്കാൻ ചെയ്യുക</string>
+    <string name="fm_off">FM ഓഫ് ചെയ്തു.</string>
+    <string name="fm_call">കോള്‍ ചെയ്യുന്ന സമയത്ത് FM ഉപയോഗിക്കാന്‍ കഴിയില്ല.</string>
+    <string name="alert_dialog_hint">ഒരു പേര് രേഖപ്പെടുത്തുക</string>
+    <string name="search_dialog_title">സ്റ്റേഷനുകൾ സ്കാൻ ചെയ്യുക</string>
+    <string name="fm_command_timeout_title">കാലഹരണപ്പെട്ടു</string>
+    <string name="fm_tune_timeout_msg">FM സ്റ്റേഷന്‍ ട്യൂണ്‍ ചെയ്യുന്നതിന് പ്രതികരണം ലഭിച്ചില്ല. പ്രശ്നം നിലനിൽക്കുകയാണെങ്കിൽ, FM ഓഫ് ചെയ്തശേഷം അത് തിരികെ ഓൺ ചെയ്യുക.</string>
+    <string name="fm_command_failed_title">FM പ്രവർത്തനം പരാജയപ്പെട്ടു</string>
+    <string name="fm_cmd_failed_msg">FM പ്രവർത്തനം പരാജയപ്പെട്ടു. പ്രശ്നം നിലനിൽക്കുകയാണെങ്കിൽ, FM ഓഫ് ചെയ്തശേഷം അത് തിരികെ ഓൺ ചെയ്യുക.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM പ്രവർത്തനം പരാജയപ്പെട്ടു. FM, HDMI യുടെ ഒരുമിച്ചുള്ള പ്രവര്‍ത്തനം പിന്തുണയ്ക്കുന്നില്ല.</string>
+    <string name="fm_cmd_failed_call_on">FM പ്രവർത്തനം പരാജയപ്പെട്ടു. കോൾ ചെയ്യുമ്പോള്‍ FM ഓഡിയോ അനുവദനീയമല്ല.</string>
+    <string name="station_name">സ്റ്റേഷൻ:</string>
+    <string name="station_exists">ഈ ആവൃത്തി ഇതിനകം നിലവിലുണ്ട്!</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="station_name_empty">സ്റ്റേഷൻ നാമം ശൂന്യമാണ്, ദയവായി വീണ്ടും ഇന്‍പുട്ട് ചെയ്യുക.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' ഇതിനകം തന്നെ ഉപയോഗത്തിലുണ്ട്, ദയവായി മറ്റൊരു പേര് രേഖപ്പെടുത്തുക.</string>
+    <string name="rt_plus_tags">ടാഗുകൾ</string>
+    <string name="usr_def_band_min">താഴ്ന്ന ആവൃത്തി (MHz)</string>
+    <string name="usr_def_band_max">ഉയര്‍ന്ന ആവൃത്തി (MHz)</string>
+    <string name="chanl_spacing">ചാനൽ സ്പെയ്സിംഗ്</string>
+    <string name="set">സജ്ജമാക്കുക</string>
+    <string name="fm_search_no_results">അനുയോജ്യമായ സ്റ്റേഷനുകൾ കണ്ടെത്തിയില്ല</string>
+    <string name="typ_All_stations">എല്ലാ സ്റ്റേഷനുകളും</string>
+    <string name="typ_Culture">കള്‍ച്ചര്‍</string>
+    <string name="typ_Current_affairs">ആനുകാലികം</string>
+    <string name="typ_Children">കുട്ടികളുടെ പരിപാടികൾ</string>
+    <string name="typ_Country">രാജ്യം സംഗീതം</string>
+    <string name="typ_Documentary">ഡോക്യുമെന്ററി</string>
+    <string name="typ_Drama">നാടകം</string>
+    <string name="typ_Easy_listening">എളുപ്പത്തിൽ കേൾക്കാവുന്ന സംഗീതം</string>
+    <string name="typ_Education">വിദ്യാഭ്യാസം</string>
+    <string name="typ_Emergency">എമർജൻസി</string>
+    <string name="typ_Emergency_test">അടിയന്തര പരിശോധന</string>
+    <string name="typ_Finance">ധനകാര്യം</string>
+    <string name="typ_Folk">നാടോടി സംഗീതം</string>
+    <string name="typ_Information">വിവരം</string>
+    <string name="typ_Jazz">ജാസ് സംഗീതം</string>
+    <string name="typ_Light_classical">ലൈറ്റ് ക്ലാസിക്കൽ</string>
+    <string name="typ_Leisure">ഒഴിവ്‌സമയം</string>
+    <string name="typ_News">വാര്‍ത്ത</string>
+    <string name="typ_National">ദേശീയ സംഗീതം</string>
+    <string name="typ_Other">മറ്റ് സംഗീതം</string>
+    <string name="typ_Oldies">പഴയകാലത്തെ സംഗീതം</string>
+    <string name="typ_Phone_in">ഫോൺ ഇന്‍</string>
+    <string name="typ_Pop">പോപ് സംഗീതം</string>
+    <string name="typ_Religion">മതം</string>
+    <string name="typ_Rock">റോക്ക് സംഗീതം</string>
+    <string name="typ_Science">ശാസ്ത്രം</string>
+    <string name="typ_Serious_classical">സീരിയസ് ക്ലാസിക്കൽ</string>
+    <string name="typ_Social_affairs">സാമൂഹികകാര്യം</string>
+    <string name="typ_Sport">കായികം</string>
+    <string name="typ_Travel">യാത്ര</string>
+    <string name="typ_Varied">വ്യത്യസ്‌തമായ</string>
+    <string name="typ_Weather">കാലാവസ്ഥ</string>
+    <string name="typ_Adult_hits">മുതിര്‍ന്നവര്‍ക്കുള്ള ഹിറ്റുകൾ</string>
+    <string name="typ_Classical">ക്ലാസിക്കൽ</string>
+    <string name="typ_Classic_Rock">ക്ലാസിക് റോക്ക്</string>
+    <string name="typ_College">കോളേജ്</string>
+    <string name="typ_Foreign_language">വിദേശ ഭാഷ</string>
+    <string name="typ_Hiphop">ഹിപ്പ് ഹോപ്പ്</string>
+    <string name="typ_Nostalgia">ഗൃഹാതുരത്വം</string>
+    <string name="typ_Personality">വ്യക്തിത്വം</string>
+    <string name="typ_Public">പൊതുവായത്</string>
+    <string name="typ_Religious_music">മതപരമായ സംഗീതം</string>
+    <string name="typ_Religious_talk">മതപരമായ സംവാദം</string>
+    <string name="typ_Rhythm_and_Blues">റിഥവും ബ്ലൂസും</string>
+    <string name="typ_Spanish_music">സ്പാനിഷ് സംഗീതം</string>
+    <string name="typ_Spanish_talk">സ്പാനിഷ് സംവാദം</string>
+    <string name="typ_Soft">സോഫ്റ്റ്‌</string>
+    <string name="typ_Soft_Rock">സോഫ്റ്റ് റോക്ക്</string>
+    <string name="typ_Soft_Rhythm_and_Blues">സോഫ്റ്റ് റിഥവും ബ്ലൂസും</string>
+    <string name="typ_Sports">കായികം</string>
+    <string name="typ_Talk">സംവാദം</string>
+    <string name="typ_Top_40">ടോപ്പ് 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-mr/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-mr/arrays.xml
index cb1457b..a836624 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-mr/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>स्टिरिओ</item>
+    <item>मोनो</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-mr/strings.xml b/fmapp2/res/values-mr/strings.xml
new file mode 100644
index 0000000..f4860fd
--- /dev/null
+++ b/fmapp2/res/values-mr/strings.xml
@@ -0,0 +1,195 @@
+<?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 रेडिओ</string>
+    <string name="tx_app_name">FM ट्रान्समीटर</string>
+    <string name="menu_scan_start">स्कॅन करा</string>
+    <string name="menu_scan_stop">शोध थांबवा</string>
+    <string name="menu_record_start">रेकॉर्ड करा</string>
+    <string name="menu_record_stop">रेकॉर्डिंग थांबवा</string>
+    <string name="menu_settings">सेटिंग्ज</string>
+    <string name="menu_sleep">निष्क्रिय</string>
+    <string name="menu_sleep_cancel">झोप रद्द करा</string>
+    <string name="menu_all_channels">सर्व चॅनेल्स</string>
+    <string name="menu_display_tags">टॅग्ज दर्शवा</string>
+    <string name="button_text_stop">थांबा</string>
+    <string name="msg_seeking">FM स्टेशन्स शोधत आहे\u2026</string>
+    <string name="msg_scanning">सर्व FM स्टेशन्स स्कॅन करत आहे\u2026</string>
+    <string name="msg_scanning_pty">\'<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">प्रीसेट ऑटो-निवाडा</string>
+    <string name="msg_searching">प्रीसेट लिस्ट तयार करण्यासाठी भक्कम स्टेशन्स शोधत आहे\u2026</string>
+    <string name="msg_noantenna">FM रेडिओ वापरण्यासाठी कृपया हेडसेट प्लग करा</string>
+    <string name="dialog_sleep_title">झोप वेळ ऑटो-बंद</string>
+    <string name="presetlist_select_name">निवडा \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">नवीन यादी जोडा</string>
+    <string name="dialog_presetlist_rename_title">नाव टाका.</string>
+    <string name="presetlist_autoselect_title">ऑटो-निवडची पुष्टी करा</string>
+    <string name="preset_replace">पुनर्स्थित करा</string>
+    <string name="preset_tune">ट्युन करा</string>
+    <string name="preset_rename">पुनर्नामित करा</string>
+    <string name="preset_delete">हटवायचे?</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' साठी शोधा</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">प्रादेशिक बँड</string>
+    <string name="regional_band_entry_north_america">उत्तर अमेरिका</string>
+    <string name="regional_band_entry_europe">युरोप</string>
+    <string name="regional_band_entry_japan">जपान</string>
+    <string name="regional_band_entry_japan_wide">जपान (विस्तृत)</string>
+    <string name="regional_band_entry_australia">ऑस्ट्रेलिया</string>
+    <string name="regional_band_entry_austria">ऑस्ट्रिया</string>
+    <string name="regional_band_entry_belgium">बेल्जियम</string>
+    <string name="regional_band_entry_brazil">ब्राझिल</string>
+    <string name="regional_band_entry_china">चीन</string>
+    <string name="regional_band_entry_czech_republic">चेक प्रजासत्ताक</string>
+    <string name="regional_band_entry_denmark">डेन्मार्क</string>
+    <string name="regional_band_entry_finland">फिनलँड</string>
+    <string name="regional_band_entry_france">फ्रान्स</string>
+    <string name="regional_band_entry_germany">जर्मनी</string>
+    <string name="regional_band_entry_greece">ग्रीस</string>
+    <string name="regional_band_entry_hong_kong">हाँगकाँग</string>
+    <string name="regional_band_entry_india">भारत</string>
+    <string name="regional_band_entry_indonesia">इंडोनेशिया</string>
+    <string name="regional_band_entry_ireland">आयर्लंड</string>
+    <string name="regional_band_entry_italy">इटली</string>
+    <string name="regional_band_entry_korea">कोरिया</string>
+    <string name="regional_band_entry_mexico">मेक्सिको</string>
+    <string name="regional_band_entry_netherlands">नेदरलँड्स</string>
+    <string name="regional_band_entry_new_zealand">न्यूझीलँड</string>
+    <string name="regional_band_entry_norway">नॉर्वे</string>
+    <string name="regional_band_entry_poland">पोलंड</string>
+    <string name="regional_band_entry_portugal">पोर्तुगाल</string>
+    <string name="regional_band_entry_russia">रशिया</string>
+    <string name="regional_band_entry_singapore">सिंगापूर</string>
+    <string name="regional_band_entry_slovakia">स्लोव्हाकिया</string>
+    <string name="regional_band_entry_spain">स्पेन</string>
+    <string name="regional_band_entry_switzerland">स्वित्झर्लंड</string>
+    <string name="regional_band_entry_sweden">स्वीडन</string>
+    <string name="regional_band_entry_taiwan">तैवान</string>
+    <string name="regional_band_entry_turkey">तुर्की</string>
+    <string name="regional_band_entry_united_kingdom">युनायटेड किंगडम</string>
+    <string name="regional_band_entry_united_states">युनायटेड स्टेट्स</string>
+    <string name="regional_band_entry_user_defined">प्रयोक्ता परिभाषित बँड</string>
+    <string name="regional_band_summary_user_defined">प्रयोक्ता परिभाषित बँड</string>
+    <string name="aud_output_mode">ऑडिओ आऊटपुट मोड</string>
+    <string name="audio_type_stereo">स्टिरिओ</string>
+    <string name="audio_type_mono">मोनो</string>
+    <string name="record_dur">रेकॉर्ड कालावधी</string>
+    <string name="auto_select_af">पर्यायी फ्रिक्वेन्सी</string>
+    <string name="settings_revert_defaults_title">फॅक्टरी डिफॉल्ट्सना उलटवा</string>
+    <string name="settings_revert_defaults_summary">सर्व सेटिंग्ज रीसेट करा</string>
+    <string name="settings_revert_confirm_title">रीसेटची पुष्टी करा</string>
+    <string name="settings_revert_confirm_msg">हे जतन केलेल्या प्रीसेट्ससह सर्व अनुप्रयोग सेटिंग्ज साफ करेल. सुरू ठेवायचे?</string>
+    <string name="no_storage">रेकॉर्डिंग सुरू करण्यापूर्वी SD कार्ड माउंट करा.</string>
+    <string name="preparing_sd">SD कार्ड तयार करीत आहे...</string>
+    <string name="access_sd_fail">SD कार्ड ऍक्सेस करू शकलो नाही.</string>
+    <string name="spaceIsLow_content">तुमच्या SD कार्ड संग्रहाची स्थान संपत आली आहे. गुणवत्ता सेटिंग बदला किंवा स्थान मोकळी करण्यासाठी काही फाइल्स हटवा.</string>
+    <string name="FMRecording_reach_size_limit">आकार मर्यादा गाठली आहे.</string>
+    <string name="menu_scan_for_preset">प्रीसेट्ससाठी स्कॅन करा</string>
+    <string name="fm_off">FM बंद केले आहे.</string>
+    <string name="fm_call">कॉल करताना FM वापरता येत नाही.</string>
+    <string name="alert_dialog_hint">नाव प्रविष्ठ करा</string>
+    <string name="search_dialog_title">स्टेशन्स स्कॅन करा</string>
+    <string name="fm_command_timeout_title">कालबाह्य</string>
+    <string name="fm_tune_timeout_msg">FM स्टेशन ट्युन करण्यासाठी कोणताही प्रतिसाद प्राप्त झाला नाही. जर समस्या टिकून राहिली तर, कृपया FM बंद करा आणि पुन्हा चालू करा.</string>
+    <string name="fm_command_failed_title">FM ऑपरेशन अपयशी झाले</string>
+    <string name="fm_cmd_failed_msg">FM ऑपरेशन अपयशी झाले. जर समस्या टिकून राहिली तर, कृपया FM बंद करा आणि पुन्हा चालू करा.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM ऑपरेशन अपयशी झाले. FM आणि HDMI एकमतता समर्थित नाही.</string>
+    <string name="fm_cmd_failed_call_on">FM ऑपरेशन अपयशी झाले. कॉल दरम्यान FM ऑडिओला परवानगी नाही.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">माझी FM रेकॉर्डिंग्स</string>
+    <string name="audio_db_album_name">FM रेकॉर्डिंग्ज</string>
+    <string name="audio_db_playlist_name">FM रेकॉर्डिंग्ज</string>
+    <string name="station_name">स्टेशन:</string>
+    <string name="station_exists">ही फ्रिक्वेन्सी आधीच अस्तित्वात आहे!</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="station_name_empty">स्टेशन नाव रिक्त आहे, कृपया पुन्हा इनपुट करा.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' आधीच वापरात आहे, कृपया एक भिन्न नाव प्रविष्ठ करा.</string>
+    <string name="rt_plus_tags">टॅग</string>
+    <string name="usr_def_band_min">सर्वात कमी फ्रिक्वेन्सी (MHz)</string>
+    <string name="usr_def_band_max">सर्वोच्च फ्रिक्वेन्सी (MHz)</string>
+    <string name="chanl_spacing">चॅनेल स्थानिंग</string>
+    <string name="set">सेट करा</string>
+    <string name="save_record_file">FM रेकॉर्डेड फाइल \'<xliff:g id="record_file">%1$s</xliff:g>\' मध्ये जतन केली</string>
+    <string name="fm_search_no_results">अनुरूप स्टेशन्स आढळली नाहीत</string>
+    <string name="typ_All_stations">सर्व स्टेशन्स</string>
+    <string name="typ_Culture">संस्कृती</string>
+    <string name="typ_Current_affairs">चालू घडामोडी</string>
+    <string name="typ_Children">लहान मुलांचे कार्यक्रम</string>
+    <string name="typ_Country">देश संगीत</string>
+    <string name="typ_Documentary">माहितीपट</string>
+    <string name="typ_Drama">नाटक</string>
+    <string name="typ_Easy_listening">हलके फुलके संगीत</string>
+    <string name="typ_Education">शिक्षण</string>
+    <string name="typ_Emergency">आणीबाणी</string>
+    <string name="typ_Emergency_test">आणीबाणी चाचणी</string>
+    <string name="typ_Finance">वित्तपुरवठा</string>
+    <string name="typ_Folk">लोक संगीत</string>
+    <string name="typ_Information">माहिती</string>
+    <string name="typ_Jazz">जॅझ संगीत</string>
+    <string name="typ_Light_classical">सौम्य शास्त्रीय</string>
+    <string name="typ_Leisure">रिकामपण</string>
+    <string name="typ_News">बातम्या</string>
+    <string name="typ_National">राष्ट्रीय संगीत</string>
+    <string name="typ_Other">इतर संगीत</string>
+    <string name="typ_Oldies">जुने संगीत</string>
+    <string name="typ_Phone_in">फोन इन</string>
+    <string name="typ_Pop">पॉप संगीत</string>
+    <string name="typ_Religion">धर्म</string>
+    <string name="typ_Rock">रॉक संगीत</string>
+    <string name="typ_Science">विज्ञान</string>
+    <string name="typ_Serious_classical">गंभीर शास्त्रीय</string>
+    <string name="typ_Social_affairs">सामाजिक घडामोडी</string>
+    <string name="typ_Sport">खेळ</string>
+    <string name="typ_Travel">प्रवास</string>
+    <string name="typ_Varied">बहुरंगी</string>
+    <string name="typ_Weather">हवामान</string>
+    <string name="typ_Adult_hits">प्रौढ हिट्स</string>
+    <string name="typ_Classical">शास्त्रीय</string>
+    <string name="typ_Classic_Rock">क्लासिक रॉक</string>
+    <string name="typ_College">कॉलेज</string>
+    <string name="typ_Foreign_language">परदेशी भाषा</string>
+    <string name="typ_Hiphop">हिप हॉप</string>
+    <string name="typ_Nostalgia">नॉस्टॅल्जिया</string>
+    <string name="typ_Personality">व्यक्तिमत्व</string>
+    <string name="typ_Public">सार्वजनिक</string>
+    <string name="typ_Religious_music">धार्मिक संगीत</string>
+    <string name="typ_Religious_talk">धार्मिक व्याख्यान</string>
+    <string name="typ_Rhythm_and_Blues">रिदम अँड ब्लूज</string>
+    <string name="typ_Spanish_music">स्पॅनिश संगीत</string>
+    <string name="typ_Spanish_talk">स्पॅनिश व्याख्यान</string>
+    <string name="typ_Soft">सौम्य</string>
+    <string name="typ_Soft_Rock">सौम्य रॉक</string>
+    <string name="typ_Soft_Rhythm_and_Blues">सौम्य रिदम अँड ब्लूज</string>
+    <string name="typ_Sports">क्रिडा</string>
+    <string name="typ_Talk">व्याख्यान</string>
+    <string name="typ_Top_40">सर्वोच्च 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-nb/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-nb/arrays.xml
index cb1457b..2343624 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-nb/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutter</item>
+    <item>15 minutter</item>
+    <item>30 minutter</item>
+    <item>Til stoppet</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutter</item>
+    <item>30 minutter</item>
+    <item>45 minutter</item>
+    <item>1 time</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-nb/strings.xml b/fmapp2/res/values-nb/strings.xml
new file mode 100644
index 0000000..41782da
--- /dev/null
+++ b/fmapp2/res/values-nb/strings.xml
@@ -0,0 +1,232 @@
+<?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-sender</string>
+    <string name="menu_scan_start">Søk</string>
+    <string name="menu_scan_stop">Slutt å søke</string>
+    <string name="menu_record_start">Ta opp</string>
+    <string name="menu_record_stop">Stopp Opptak</string>
+    <string name="menu_settings">Innstillinger</string>
+    <string name="menu_sleep">Søvn</string>
+    <string name="menu_sleep_cancel">Avbryte søvn</string>
+    <string name="menu_all_channels">Alle kanaler</string>
+    <string name="menu_display_tags">Vis koder</string>
+    <string name="button_text_stop">Stopp</string>
+    <string name="msg_seeking">Søker FM stasjon\u2026</string>
+    <string name="msg_scanning">Søker etter alle FM-stasjoner\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Auto-velg forhåndsprogrammerte stasjoner</string>
+    <string name="msg_searching">Søker etter sterke stasjoner for å lage en oversiktsliste\u2026</string>
+    <string name="msg_noantenna">Koble til et headset for å bruke FM radio</string>
+    <string name="dialog_sleep_title">Auto-av sove tid</string>
+    <string name="presetlist_select_name">Velg \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Legge til ny liste</string>
+    <string name="dialog_presetlist_rename_title">Angi navn</string>
+    <string name="presetlist_autoselect_title">Bekreft automatisk valg</string>
+    <string name="preset_replace">Erstatt</string>
+    <string name="preset_tune">Tune</string>
+    <string name="preset_rename">Gi nytt navn</string>
+    <string name="preset_delete">Slette</string>
+    <string name="preset_search">Søk etter \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regionale bånd</string>
+    <string name="regional_band_entry_north_america">Nord-Amerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (bredt)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Østerrike</string>
+    <string name="regional_band_entry_belgium">Belgia</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">Kina</string>
+    <string name="regional_band_entry_czech_republic">Tsjekkia</string>
+    <string name="regional_band_entry_denmark">Danmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">Frankrike</string>
+    <string name="regional_band_entry_germany">Tyskland</string>
+    <string name="regional_band_entry_greece">Hellas</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irland</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Nederland</string>
+    <string name="regional_band_entry_new_zealand">New Zealand</string>
+    <string name="regional_band_entry_norway">Norge</string>
+    <string name="regional_band_entry_poland">Polen</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russland</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Spania</string>
+    <string name="regional_band_entry_switzerland">Sveits</string>
+    <string name="regional_band_entry_sweden">Sverige</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Tyrkia</string>
+    <string name="regional_band_entry_united_kingdom">Storbritannia</string>
+    <string name="regional_band_entry_united_states">USA</string>
+    <string name="regional_band_entry_user_defined">Brukerdefinerte bånd</string>
+    <string name="regional_band_summary_north_america">Nord-Amerika (87.5 til 108.0 MHz i 200 kHz trinn)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 til 90.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_japan_wide">Japan (bredt) (90.0 til 108.0 MHz i 50 kHz trinn)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_austria">Østerrike (87.5 til 108.0 MHz i 50 kHz trinn)</string>
+    <string name="regional_band_summary_belgium">Belgia (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_brazil">Brasil (87.5 til 108.0 MHz i 200 kHz trinn)</string>
+    <string name="regional_band_summary_china">Kina (87.0 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_czech_republic">Tsjekkia (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_denmark">Danmark (87.5 til 108.0 MHz i 50 kHz trinn)</string>
+    <string name="regional_band_summary_finland">Finland (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_france">Frankrike (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_germany">Tyskland (87.5 til 108.0 MHz i 50 kHz trinn)</string>
+    <string name="regional_band_summary_greece">Hellas (87.5 til 108.0 MHz i 50 kHz trinn)</string>
+    <string name="regional_band_summary_hong_kong">Hongkong (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_india">India (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_ireland">Irland (87.5 til 108.0 MHz i 50 kHz trinn)</string>
+    <string name="regional_band_summary_italy">Italia (87.5 til 108.0 MHz i 50 kHz trinn)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 til 108.0 MHz i 200 kHz trinn)</string>
+    <string name="regional_band_summary_mexico">Mexico (88.1 til 107.9 MHz i 200 kHz trinn)</string>
+    <string name="regional_band_summary_netherlands">Nederland (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_new_zealand">New Zealand (88.0 til 107.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_norway">Norge (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_poland">Polen (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 til 108.0 MHz i 50 kHz trinn)</string>
+    <string name="regional_band_summary_russia">Russland (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_slovakia">Slovakia (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_spain">Spania (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_switzerland">Sveits (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_sweden">Sverige (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_taiwan">Republikken Kina (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_turkey">Tyrkia (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_united_kingdom">Storbritannia (87.5 til 108.0 MHz i 100 kHz trinn)</string>
+    <string name="regional_band_summary_united_states">USA (88.1 til 107.9 MHz i 200 kHz trinn)</string>
+    <string name="regional_band_summary_user_defined">Brukerdefinerte bånd</string>
+    <string name="aud_output_mode">Lydutgangsmodus</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Opptaksvarighet</string>
+    <string name="auto_select_af">Alternativ frekvens</string>
+    <string name="settings_revert_defaults_title">Gå tilbake til fabrikkinnstillingene</string>
+    <string name="settings_revert_defaults_summary">Tilbakestill alle innstillinger</string>
+    <string name="settings_revert_confirm_title">Bekreft tilbakestilling</string>
+    <string name="settings_revert_confirm_msg">Dette fjerner alle programinnstillinger, inkludert lagrede forhåndsinnstillinger. Vil du fortsette?</string>
+    <string name="no_storage">Monter SDkortet før du starter opptak.</string>
+    <string name="preparing_sd">Forbereder SD-kort …</string>
+    <string name="access_sd_fail">Får ikke tilgang til SD-kort.</string>
+    <string name="spaceIsLow_content">SDkortet er i ferd med å bli fullt. Endre kvaliteten eller slett noen filer som opptar plass.</string>
+    <string name="FMRecording_reach_size_limit">Størrelsegrense nådd.</string>
+    <string name="menu_scan_for_preset">Skanning for forhåndsinnstillinger</string>
+    <string name="fm_off">FM er deaktivert.</string>
+    <string name="fm_call">FM kan ikke brukes under samtaler.</string>
+    <string name="alert_dialog_hint">Angi et navn</string>
+    <string name="search_dialog_title">Skanne stasjoner</string>
+    <string name="fm_command_timeout_title">Tidsavbrudd</string>
+    <string name="fm_tune_timeout_msg">Ingen svar mottatt for å finjustere FM-stasjon. Hvis problemet vedvarer, kan du slå av FM og slå den på igjen.</string>
+    <string name="fm_command_failed_title">FM mislyktes</string>
+    <string name="fm_cmd_failed_msg">FM-operasjonen mislyktes. Hvis problemet vedvarer, kan du slå av FM og slå den på igjen.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-operasjonen mislyktes. FM og HDMI samtidighet støttes ikke.</string>
+    <string name="fm_cmd_failed_call_on">FM-operasjonen mislyktes. FM lyd er ikke tillatt under samtale.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Mine FM opptak</string>
+    <string name="audio_db_album_name">FM opptak</string>
+    <string name="audio_db_playlist_name">FM opptak</string>
+    <string name="station_name">Stasjon:</string>
+    <string name="station_exists">Denne frekvensen finnes allerede!</string>
+    <string name="station_list_delete_station">Slett: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Er du sikker på at du vil slette \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Stasjonsnavn er tom, Skriv inn igjen.</string>
+    <string name="station_name_exist">\' <xliff:g id="name">%s</xliff:g>\' er allerede i bruk, inn Skriv et annet navn.</string>
+    <string name="rt_plus_tags">Tags</string>
+    <string name="usr_def_band_min">Laveste frekvens (MHz)</string>
+    <string name="usr_def_band_max">Høyeste frekvens (MHz)</string>
+    <string name="chanl_spacing">Kanal avstand</string>
+    <string name="set">Sett</string>
+    <string name="user_defind_band_msg">Angi frekvens mellom 76.0 og 108.0 MHz med minimum 1 kanals avstand og 100 kHz avstand mellom minste og største frekvens</string>
+    <string name="save_record_file">FM opptaksfil lagret til \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Finner ingen kompatible stasjoner</string>
+    <string name="typ_All_stations">Alle stasjoner</string>
+    <string name="typ_Culture">Kultur</string>
+    <string name="typ_Current_affairs">Aktuelle saker</string>
+    <string name="typ_Children">Barneprogrammer</string>
+    <string name="typ_Country">Countrymusikk</string>
+    <string name="typ_Documentary">Dokumentar</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Lett musikk</string>
+    <string name="typ_Education">Utdanning</string>
+    <string name="typ_Emergency">Nødsituasjon</string>
+    <string name="typ_Emergency_test">Nødtest</string>
+    <string name="typ_Finance">Økonomi</string>
+    <string name="typ_Folk">Folkemusikk</string>
+    <string name="typ_Information">Informasjon</string>
+    <string name="typ_Jazz">Jazzmusikk</string>
+    <string name="typ_Light_classical">Lett klassisk</string>
+    <string name="typ_Leisure">Fritid</string>
+    <string name="typ_News">Nyheter</string>
+    <string name="typ_National">Nasjonal musikk</string>
+    <string name="typ_Other">Annen musikk</string>
+    <string name="typ_Oldies">Slagermusikk</string>
+    <string name="typ_Phone_in">Telefon inn</string>
+    <string name="typ_Pop">Popmusikk</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rockemusikk</string>
+    <string name="typ_Science">Vitenskap</string>
+    <string name="typ_Serious_classical">Alvorlig klassisk</string>
+    <string name="typ_Social_affairs">Sosiale spørsmål</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Reise</string>
+    <string name="typ_Varied">Variert</string>
+    <string name="typ_Weather">Vær</string>
+    <string name="typ_Adult_hits">Voksen treff</string>
+    <string name="typ_Classical">Klassisk</string>
+    <string name="typ_Classic_Rock">Classic Rock</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Fremmedspråk</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgi</string>
+    <string name="typ_Personality">Personlighet</string>
+    <string name="typ_Public">Offentlig</string>
+    <string name="typ_Religious_music">Religiøs musikk</string>
+    <string name="typ_Religious_talk">Religiøs snakk</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Spansk musikk</string>
+    <string name="typ_Spanish_talk">Spansk tale</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Snakk</string>
+    <string name="typ_Top_40">Topp 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-nl/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-nl/arrays.xml
index cb1457b..4bde9f4 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-nl/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuten</item>
+    <item>15 minuten</item>
+    <item>30 minuten</item>
+    <item>Handmatig</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuten</item>
+    <item>30 minuten</item>
+    <item>45 minuten</item>
+    <item>1 uur</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-nl/strings.xml b/fmapp2/res/values-nl/strings.xml
new file mode 100644
index 0000000..6c2c9b6
--- /dev/null
+++ b/fmapp2/res/values-nl/strings.xml
@@ -0,0 +1,232 @@
+<?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-zender</string>
+    <string name="menu_scan_start">Zoeken</string>
+    <string name="menu_scan_stop">Zoeken annuleren</string>
+    <string name="menu_record_start">Opnemen</string>
+    <string name="menu_record_stop">Opnemen stoppen</string>
+    <string name="menu_settings">Instellingen</string>
+    <string name="menu_sleep">Slaapstand</string>
+    <string name="menu_sleep_cancel">Slaapstand annuleren</string>
+    <string name="menu_all_channels">Alle kanalen</string>
+    <string name="menu_display_tags">Labels tonen</string>
+    <string name="button_text_stop">Stoppen</string>
+    <string name="msg_seeking">FM-zender zoeken\u2026</string>
+    <string name="msg_scanning">Alle FM-zenders zoeken\u2026</string>
+    <string name="msg_scanning_pty">\'<xliff:g id="pty_name">%1$s</xliff:g>\' zoeken\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Automatisch favorieten selecteren</string>
+    <string name="msg_searching">Zoeken naar goed bereikbare zenders voor favorietenlijst\u2026</string>
+    <string name="msg_noantenna">Sluit een koptelefoon aan om de FM-radio te gebruiken</string>
+    <string name="dialog_sleep_title">Slaaptijd</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' selecteren</string>
+    <string name="presetlist_add_new">Nieuwe lijst toevoegen</string>
+    <string name="dialog_presetlist_rename_title">Naam invoeren</string>
+    <string name="presetlist_autoselect_title">Automatische selectie bevestigen</string>
+    <string name="preset_replace">Vervangen</string>
+    <string name="preset_tune">Afstemmen</string>
+    <string name="preset_rename">Naam wijzigen</string>
+    <string name="preset_delete">Verwijderen</string>
+    <string name="preset_search">Zoeken naar \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regionale band</string>
+    <string name="regional_band_entry_north_america">Noord-Amerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (breed)</string>
+    <string name="regional_band_entry_australia">Australië</string>
+    <string name="regional_band_entry_austria">Oostenrijk</string>
+    <string name="regional_band_entry_belgium">België</string>
+    <string name="regional_band_entry_brazil">Brazilië</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Tsjechië</string>
+    <string name="regional_band_entry_denmark">Denemarken</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">Frankrijk</string>
+    <string name="regional_band_entry_germany">Duitsland</string>
+    <string name="regional_band_entry_greece">Griekenland</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesië</string>
+    <string name="regional_band_entry_ireland">Ierland</string>
+    <string name="regional_band_entry_italy">Italië</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Nederland</string>
+    <string name="regional_band_entry_new_zealand">Nieuw-Zeeland</string>
+    <string name="regional_band_entry_norway">Noorwegen</string>
+    <string name="regional_band_entry_poland">Polen</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rusland</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakije</string>
+    <string name="regional_band_entry_spain">Spanje</string>
+    <string name="regional_band_entry_switzerland">Zwitserland</string>
+    <string name="regional_band_entry_sweden">Zweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkije</string>
+    <string name="regional_band_entry_united_kingdom">Verenigd Koninkrijk</string>
+    <string name="regional_band_entry_united_states">Verenigde Staten</string>
+    <string name="regional_band_entry_user_defined">Aangepast</string>
+    <string name="regional_band_summary_north_america">Noord-Amerika (87,5 MHz tot 108,0 MHz in stappen van 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japan (76,0 MHz tot 90,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japan (breed) (90,0 MHz tot 108,0 MHz in stappen van 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australië (87,7 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_austria">Oostenrijk (87,5 MHz tot 108,0 MHz in stappen van 50 kHz)</string>
+    <string name="regional_band_summary_belgium">België (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brazilië (87,5 MHz tot 108,0 MHz in stappen van 200 kHz)</string>
+    <string name="regional_band_summary_china">China (87,0 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Tsjechië (87,5 MHz tot 108,0 MHz in stappen van 200 kHz)</string>
+    <string name="regional_band_summary_denmark">Denemarken (87,5 MHz tot 108,0 MHz in stappen van 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finland (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_france">Frankrijk (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_germany">Duitsland (87,5 MHz tot 108,0 MHz in stappen van 50 kHz)</string>
+    <string name="regional_band_summary_greece">Griekenland (87,5 MHz tot 108,0 MHz in stappen van 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_india">India (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesië (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Ierland (87,5 MHz tot 108,0 MHz in stappen van 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italië (87,5 MHz tot 108,0 MHz in stappen van 50 kHz)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 MHz tot 108,0 MHz in stappen van 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Mexico (88,1 MHz tot 107,9 MHz in stappen van 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Nederland (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Nieuw-Zeeland (88,0 MHz tot 107,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_norway">Noorwegen (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polen (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 MHz tot 108,0 MHz in stappen van 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rusland (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapore (88,0 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Slovakije (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_spain">Spanje (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Zwitserland (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Zweden (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turkije (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Verenigd Koninkrijk (87,5 MHz tot 108,0 MHz in stappen van 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Verenigde Staten (88,1 MHz tot 107,9 MHz in stappen van 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Aangepast</string>
+    <string name="aud_output_mode">Audio-uitvoer modus</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Opnameduur</string>
+    <string name="auto_select_af">Alternatieve frequentie</string>
+    <string name="settings_revert_defaults_title">Fabrieksinstellingen herstellen</string>
+    <string name="settings_revert_defaults_summary">Alles opnieuw instellen</string>
+    <string name="settings_revert_confirm_title">Opnieuw instellen bevestigen</string>
+    <string name="settings_revert_confirm_msg">Dit zal alle instellingen verwijderen inclusief opgeslagen favorieten. Doorgaan?</string>
+    <string name="no_storage">Plaats SD-kaart om te kunnen opnemen.</string>
+    <string name="preparing_sd">SD-kaart voorbereiden\u2026</string>
+    <string name="access_sd_fail">Geen toegang tot SD-kaart.</string>
+    <string name="spaceIsLow_content">Uw SD-kaart is bijna vol. Verminder de opnamekwaliteit of verwijder bestanden.</string>
+    <string name="FMRecording_reach_size_limit">Maximale grootte bereikt.</string>
+    <string name="menu_scan_for_preset">Favorieten zoeken</string>
+    <string name="fm_off">FM is uitgeschakeld.</string>
+    <string name="fm_call">FM kan niet worden gebruikt tijdens het bellen.</string>
+    <string name="alert_dialog_hint">Naam invoeren</string>
+    <string name="search_dialog_title">Zenders zoeken</string>
+    <string name="fm_command_timeout_title">Time-out</string>
+    <string name="fm_tune_timeout_msg">Geen FM-zenders ontvangen. Als het probleem blijft bestaan schakel FM-radio uit en aan.</string>
+    <string name="fm_command_failed_title">FM-bewerking mislukt</string>
+    <string name="fm_cmd_failed_msg">FM-bewerking mislukt. Als het probleem blijft bestaan schakel FM-radio uit en aan.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-bewerking mislukt. FM en HDMI tegelijk wordt niet ondersteund.</string>
+    <string name="fm_cmd_failed_call_on">FM-bewerking mislukt. FM audio niet toegestaan tijdens een telefoongesprek.</string>
+    <string name="audio_db_artist_name">Mijn FM-opnamen</string>
+    <string name="audio_db_album_name">FM-opnamen</string>
+    <string name="audio_db_playlist_name">FM-opnamen</string>
+    <string name="station_name">Zender:</string>
+    <string name="station_exists">Deze frequentie bestaat al</string>
+    <string name="station_list_delete_station">Verwijderen: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Weet u zeker dat u \'<xliff:g id="name">%s</xliff:g>\' wilt verwijderen?</string>
+    <string name="station_name_empty">Zendernaam is leeg, opnieuw invoeren.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' is al in gebruik, voer een andere naam in.</string>
+    <string name="rt_plus_tags">Labels</string>
+    <string name="usr_def_band_min">Laagste frequentie (MHz)</string>
+    <string name="usr_def_band_max">Hoogste frequentie (MHz)</string>
+    <string name="chanl_spacing">Kanaalafstand</string>
+    <string name="set">Instellen</string>
+    <string name="user_defind_band_msg">Voer een frequentie in tussen 76.0 en 108.0 MHz met een tussenruimte van minimaal een kanaal en 100 KHz ruimte tussen minimale en maximale frequentie</string>
+    <string name="save_record_file">FM-opname opgeslagen in \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Geen zenders gevonden</string>
+    <string name="typ_All_stations">Alle zenders</string>
+    <string name="typ_Culture">Cultuur</string>
+    <string name="typ_Current_affairs">Actualiteiten</string>
+    <string name="typ_Children">Kinderprogramma\'s</string>
+    <string name="typ_Country">Country</string>
+    <string name="typ_Documentary">Documentaire</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy listening</string>
+    <string name="typ_Education">Educatief</string>
+    <string name="typ_Emergency">Noodgeval</string>
+    <string name="typ_Emergency_test">Noodgevallentest</string>
+    <string name="typ_Finance">Financiën</string>
+    <string name="typ_Folk">Volksmuziek</string>
+    <string name="typ_Information">Informatie</string>
+    <string name="typ_Jazz">Jazz</string>
+    <string name="typ_Light_classical">Licht klassiek</string>
+    <string name="typ_Leisure">Ontspanning</string>
+    <string name="typ_News">Nieuws</string>
+    <string name="typ_National">Nationale muziek</string>
+    <string name="typ_Other">Andere muziek</string>
+    <string name="typ_Oldies">Oldies</string>
+    <string name="typ_Phone_in">Inbellen</string>
+    <string name="typ_Pop">Pop</string>
+    <string name="typ_Religion">Religieus</string>
+    <string name="typ_Rock">Rock</string>
+    <string name="typ_Science">Wetenschappelijk</string>
+    <string name="typ_Serious_classical">Serieus klassiek</string>
+    <string name="typ_Social_affairs">Sociale zaken</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Reizen</string>
+    <string name="typ_Varied">Gevarieërd</string>
+    <string name="typ_Weather">Weer</string>
+    <string name="typ_Adult_hits">Hits</string>
+    <string name="typ_Classical">Klassiek</string>
+    <string name="typ_Classic_Rock">Classic Rock</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Vreemde talen</string>
+    <string name="typ_Hiphop">Hiphop</string>
+    <string name="typ_Nostalgia">Nostalgisch</string>
+    <string name="typ_Personality">Persoonlijkheid</string>
+    <string name="typ_Public">Publiek</string>
+    <string name="typ_Religious_music">Religieus</string>
+    <string name="typ_Religious_talk">Religieus gesproken</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Spaanse muziek</string>
+    <string name="typ_Spanish_talk">Spaans gesproken</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Gesproken</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-or/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-or/arrays.xml
index cb1457b..455be67 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-or/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>ଷ୍ଟେରିଓ</item>
+    <item>ମୋନୋ</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-or/strings.xml b/fmapp2/res/values-or/strings.xml
new file mode 100644
index 0000000..85fbb91
--- /dev/null
+++ b/fmapp2/res/values-or/strings.xml
@@ -0,0 +1,189 @@
+<?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 ରେଡିଓ</string>
+    <string name="tx_app_name">FM ଟ୍ରାନ୍ସମିଟର୍</string>
+    <string name="menu_scan_start">ସ୍କାନ୍</string>
+    <string name="menu_scan_stop">ସନ୍ଧାନ ସ୍ଥଗିତ କରନ୍ତୁ</string>
+    <string name="menu_record_start">ରେକର୍ଡ</string>
+    <string name="menu_record_stop">ରେକର୍ଡିଂ ସ୍ଥଗିତ କରିବା</string>
+    <string name="menu_settings">ସେଟିଂସ୍</string>
+    <string name="menu_sleep">ଶୟନ</string>
+    <string name="menu_sleep_cancel">ଶୟନ ବାତିଲ୍‍ କରନ୍ତୁ</string>
+    <string name="menu_all_channels">ସମସ୍ତ ଚ୍ୟାନେଲ୍‍</string>
+    <string name="menu_display_tags">ଟ୍ୟାଗ୍‍ ଦେଖାନ୍ତୁ</string>
+    <string name="button_text_stop">ସ୍ଥଗିତ</string>
+    <string name="msg_seeking">FM ଷ୍ଟେସନ୍‍ ସନ୍ଧାନ କରୁଛି\u2026</string>
+    <string name="msg_scanning">ସମସ୍ତ FM ଷ୍ଟେସନ୍‍ ପାଇଁ ସନ୍ଧାନ କରୁଛି\u2026</string>
+    <string name="msg_scanning_pty">ଏହା ପାଇଁ ସ୍କାନ୍‍ କରୁଛି\'<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">ସ୍ୱତଃ-ସନ୍ଧାନ ପ୍ରିସେଟ୍‍ସ୍‍</string>
+    <string name="msg_searching">ପ୍ରିସେଟ୍‍ ତାଲିକା ସୃଷ୍ଟି କରିବା ପାଇଁ ଷ୍ଟ୍ର୍ଙ୍ଗ୍‍ ଷ୍ଟେସନ୍‍ ପାଇଁ ସନ୍ଧାନ କରାଯାଉଛି\u2026</string>
+    <string name="msg_noantenna">FM ରେଡିଓ ବ୍ୟବହାର କରିବା ପାଇଁ ଦୟାକରି ଏକ ହେଡ୍‍ସେଟ୍‍ ପ୍ଲଗ୍‍ ଇନ୍‍ କ୍ରନ୍ତୁ</string>
+    <string name="dialog_sleep_title">ଶୟନ ସମୟ ସ୍ୱତଃ ଅଫ୍‍ କରନ୍ତୁ</string>
+    <string name="presetlist_select_name">ଚୟନ କରନ୍ତୁ \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">ନୂତନ ତାଲିକା ଯୋଗ କରନ୍ତୁ</string>
+    <string name="dialog_presetlist_rename_title">ନାମ ପ୍ରବେଶ କରନ୍ତୁ:</string>
+    <string name="presetlist_autoselect_title">ସ୍ୱତଃ-ଚୟନ ସୁନିଶ୍ଚିତ କରନ୍ତୁ</string>
+    <string name="preset_replace">ବିସ୍ଥାପନ</string>
+    <string name="preset_tune">ଟ୍ୟୁନ୍‍</string>
+    <string name="preset_rename">ପୁନଃନାମ</string>
+    <string name="preset_delete">ବିଲୋପ କରନ୍ତୁ</string>
+    <string name="preset_search">ଏହା ପାଇଁ ସନ୍ଧାନ କରନ୍ତୁ \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">ଆଞ୍ଚଳିକ ବ୍ୟାଣ୍ଡ</string>
+    <string name="regional_band_entry_north_america">ଉତ୍ତର ଆମେରିକା</string>
+    <string name="regional_band_entry_europe">ଇଉରୋପ</string>
+    <string name="regional_band_entry_japan">ଜାପାନ</string>
+    <string name="regional_band_entry_japan_wide">ଜାପାନ୍‍ (ପ୍ର‍ସ୍ଥ)</string>
+    <string name="regional_band_entry_australia">ଅଷ୍ଟ୍ରେଲିଆ</string>
+    <string name="regional_band_entry_austria">ଅଷ୍ଟ୍ରିଆ</string>
+    <string name="regional_band_entry_belgium">ବେଲ୍‍ଜିୟମ୍‍</string>
+    <string name="regional_band_entry_brazil">ବ୍ରାଜିଲ୍‍</string>
+    <string name="regional_band_entry_china">ଚୀନ୍‍</string>
+    <string name="regional_band_entry_czech_republic">ସିଜେକ୍‍ ରିପବ୍ଲିକ୍‍</string>
+    <string name="regional_band_entry_denmark">ଡେନ୍‍ମାର୍କ୍‍</string>
+    <string name="regional_band_entry_finland">ଫିନ୍‍ଲାଣ୍ଡ</string>
+    <string name="regional_band_entry_france">ଫ୍ରାନ୍ସ</string>
+    <string name="regional_band_entry_germany">ଜର୍‍ମାନୀ</string>
+    <string name="regional_band_entry_greece">ଗ୍ରୀସ୍‍</string>
+    <string name="regional_band_entry_hong_kong">ହଂ କଂ</string>
+    <string name="regional_band_entry_india">ଭାରତ</string>
+    <string name="regional_band_entry_indonesia">ଇଣ୍ଡୋନେସିଆ</string>
+    <string name="regional_band_entry_ireland">ଆୟରଲ୍ୟାଣ୍ଡ</string>
+    <string name="regional_band_entry_italy">ଇଟାଲୀ</string>
+    <string name="regional_band_entry_korea">କୋରିଆ</string>
+    <string name="regional_band_entry_mexico">ମେକ୍ସିକୋ</string>
+    <string name="regional_band_entry_netherlands">ନେଦର୍‍ଲ୍ୟାଣ୍ଡ</string>
+    <string name="regional_band_entry_new_zealand">ନ୍ୟୁଜିଲ୍ୟାଣ୍ଡ</string>
+    <string name="regional_band_entry_norway">ନରୱେ</string>
+    <string name="regional_band_entry_poland">ପୋଲାଣ୍ଡ</string>
+    <string name="regional_band_entry_portugal">ପର୍ତ୍ତୁଗାଲ୍</string>
+    <string name="regional_band_entry_russia">ରୁଷିଆ</string>
+    <string name="regional_band_entry_singapore">ସିଙ୍ଗାପୁର୍</string>
+    <string name="regional_band_entry_slovakia">ସ୍ଲୋଭାକିଆ</string>
+    <string name="regional_band_entry_spain">ସ୍ପେନ୍</string>
+    <string name="regional_band_entry_switzerland">ସ୍ୱିଜର୍‍ଲାଣ୍ଡ</string>
+    <string name="regional_band_entry_sweden">ସ୍ୱିଡେନ୍‍</string>
+    <string name="regional_band_entry_taiwan">ତାଇୱାନ୍</string>
+    <string name="regional_band_entry_turkey">ତୁର୍କୀ</string>
+    <string name="regional_band_entry_united_kingdom">ଯୁକ୍ତ ରାଜ୍ୟ</string>
+    <string name="regional_band_entry_united_states">ଯୁକ୍ତରାଷ୍ଟ୍ର ଆମେରିକା</string>
+    <string name="regional_band_entry_user_defined">ଉପଭ୍କ୍ତା ବର୍ଣ୍ଣିତ ବ୍ୟାଣ୍ଡ</string>
+    <string name="regional_band_summary_user_defined">ଉପଭ୍କ୍ତା ବର୍ଣ୍ଣିତ ବ୍ୟାଣ୍ଡ</string>
+    <string name="aud_output_mode">ଅ୍ଡିଓ ଆଉଟ୍‍ପୁଟ‍ ମୋଡ୍‍</string>
+    <string name="audio_type_stereo">ଷ୍ଟେରିଓ</string>
+    <string name="audio_type_mono">ମୋନୋ</string>
+    <string name="record_dur">ରେକର୍ଡ ଅବଧି</string>
+    <string name="auto_select_af">ବୈକଳ୍ପିକ ବାରମ୍ଵାରତା</string>
+    <string name="settings_revert_defaults_title">ଫ୍ୟାକ୍ଟରି ଡିଫଲ୍ଟ୍କୁ ରିଭର୍ଟ କରନ୍ତୁ</string>
+    <string name="settings_revert_defaults_summary">ସମସ୍ତ ସେଟିଂସ୍‍ ରିସେଟ୍‍ କରନ୍ତୁ</string>
+    <string name="settings_revert_confirm_title">ରିସେଟ୍‍ ସୁନିଶ୍ଚିତ କରନ୍ତୁ</string>
+    <string name="settings_revert_confirm_msg">ଏହା ସଞ୍ଚିତ ହୋ‍ଇଥିବା ପ୍ରିସେଟ୍‍କୁ ଅନ୍ତଭୁକ୍ତ କରି ସମସ୍ତ ଆପ୍ଲିକେସନ୍‍ ସେଟିଂସ୍‍ ହଟାଇଦେବ। ଜାରି ରଖିବେ?</string>
+    <string name="no_storage">ରେକର୍ଡ କରିବା ଆରଂଭ କରିବା ପୂର୍ବରୁ SD କାର୍ଡ ମାଉଣ୍ଟ କରନ୍ତୁ</string>
+    <string name="preparing_sd">SD କାର୍ଡ ପ୍ରସ୍ତୁତ କରୁଛି\u2026</string>
+    <string name="access_sd_fail">SD କାର୍ଡ୍‍ ଆକସେସ୍ କରି ପାରିବେ ନାହିଁ।</string>
+    <string name="spaceIsLow_content">ଆପଣଙ୍କ SD କାର୍ଡ୍‍ ଷ୍ଟୋରେଜ୍‍ରେ ‍ସ୍ଥାନ ଖାଲି ନାହିଁ। ଗୁଣବତ୍ତା ସେଟିଂସ୍‍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ ବା ‍ସ୍ଥାନ ଖାଲି କରିବା ପାଇଁ ଅନ୍ୟ କିଛି ଫାଇଲ୍‍ ବିଲୋପ କରନ୍ତୁ।</string>
+    <string name="menu_scan_for_preset">ପ୍ରିସେଟ୍‍ ପାଇଁ ସ୍କାନ୍‍ କରନ୍ତୁ</string>
+    <string name="fm_off">FM ଅଫ୍‍ କରାଯାଇଛି।</string>
+    <string name="fm_call">କଲ୍‍ କରିବା ସମୟରେ FM ବ୍ୟବହାର କରିହେବ ନାହିଁ।</string>
+    <string name="alert_dialog_hint">ଏକ ନାମ ପ୍ରବେଶ କରନ୍ତୁ</string>
+    <string name="search_dialog_title">ଷ୍ଟେସନ୍‍ଗୁଡିକୁ ସ୍କାନ୍‍ କରନ୍ତୁ</string>
+    <string name="fm_command_timeout_title">ସମୟ ଶେଷ</string>
+    <string name="fm_tune_timeout_msg">FM ଷ୍ଟେସନ୍‍ ଟ୍ୟୁନ୍‍ କରିବା ପାଇଁ କୌଣସି ପ୍ରତ୍ୟୁତ୍ତର ମିଳିନାହିଁ। ଯଦି ସମସ୍ୟା ଲାଗିରହେ, ଦୟାକରି FM ବନ୍ଦ କରନ୍ତୁ ଓ ପୂଣିଥରେ ଅନ୍‍ କରନ୍ତୁ।</string>
+    <string name="fm_command_failed_title">FM  ଅପରେସନ୍‍ ବିଫଳ ହୋଇଛି</string>
+    <string name="fm_cmd_failed_msg">FM  ଅପରେସନ୍‍ ବିଫଳ ହୋଇଛି ଯଦି ସମସ୍ୟା ଲାଗିରହେ, ଦୟାକରି FM ବନ୍ଦ କରନ୍ତୁ ଓ ପୂଣିଥରେ ଅନ୍‍ କରନ୍ତୁ।</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM  ଅପରେସନ୍‍ ବିଫଳ ହୋଇଛି FM ଓ HDMI ଏକ ସମୟରେ କରିବା ସମର୍ଥନ କରୁନାହିଁ।</string>
+    <string name="fm_cmd_failed_call_on">FM  ଅପରେସନ୍‍ ବିଫଳ ହୋଇଛି କଲ୍‍ କରିବା ସମୟରେ FM ଅଡିଓ ପାଇଁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ।</string>
+    <string name="station_name">ଷ୍ଟେସନ୍:</string>
+    <string name="station_exists">ଏହି ଫ୍ରେକ୍ୱେନ୍ସି ଆଗରୁ ବିଦ୍ୟମାନ ଅଛି!</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="station_name_empty">ଷ୍ଟେସନ୍‍ ନାମ ଖାଲି ଅଛି, ଦୟାକରି ପୁନର୍ବାର ଇନ୍‍ପୁଟ୍‍ କରନ୍ତୁ।</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' ଆଗରୁ ବ୍ୟବହାର ହେଉଛି, ଦୟାକରି ଏକ ଭିନ୍ନ ନାମ ପ୍ରବେଶ କରନ୍ତୁ।</string>
+    <string name="rt_plus_tags">ଟ୍ୟାଗଗୁଡିକ</string>
+    <string name="usr_def_band_min">ସର୍ବନିମ୍ନ ଫ୍ରେକ୍ୱେନ୍ସି (MHz)</string>
+    <string name="usr_def_band_max">ସର୍ବାଧିକ ଫ୍ରେକ୍ୱେନ୍ସି (MHz)</string>
+    <string name="chanl_spacing">ଚ୍ୟାନେଲ୍‍ ବ୍ୟବଧାନ</string>
+    <string name="set">ସେଟ୍</string>
+    <string name="fm_search_no_results">କୌଣସି କମ୍ପାଟିବୁଲ୍‍ ଷ୍ଟେସନ୍‍ ମିଳୁନାହିଁ</string>
+    <string name="typ_All_stations">ସମସ୍ତ ଷ୍ଟେସନ୍‍</string>
+    <string name="typ_Culture">ସଂସ୍କୃତି</string>
+    <string name="typ_Current_affairs">ସମ୍ପ୍ରତି ଘଟଣାବଳି</string>
+    <string name="typ_Children">ପିଲାଙ୍କ କାର୍ଯ୍ୟକ୍ରମ</string>
+    <string name="typ_Country">ଦେଶ ସଂଗୀତ</string>
+    <string name="typ_Documentary">ଡକ୍ୟୁମେଣ୍ଟାରି</string>
+    <string name="typ_Drama">ଡ୍ରାମା</string>
+    <string name="typ_Easy_listening">ଗୀତ ସହଜରେ ଶୁଣିବା</string>
+    <string name="typ_Education">ଶିକ୍ଷା</string>
+    <string name="typ_Emergency">ଜରୁରୀକାଳୀନ</string>
+    <string name="typ_Emergency_test">ଜରୁରୀକାଳୀନ ପରୀ‍କ୍ଷା</string>
+    <string name="typ_Finance">ବିତ୍ତ</string>
+    <string name="typ_Folk">ଲୋକ ସଂଗୀତ</string>
+    <string name="typ_Information">ସୂଚନା</string>
+    <string name="typ_Jazz">ଜାଜ୍‍ ମ୍ୟୁଜିକ୍‍</string>
+    <string name="typ_Light_classical">ଲାଇଟ୍‍ କ୍ଲାସିକାଲ୍‍</string>
+    <string name="typ_Leisure">ଖାଲି ସମୟ</string>
+    <string name="typ_News">ଖବର</string>
+    <string name="typ_National">ଜାତୀୟ ସଂଗୀତ</string>
+    <string name="typ_Other">ଅନ୍ୟାନ୍ୟ ସଂଗୀତ</string>
+    <string name="typ_Oldies">ପୁରାତନ ସଂଗୀତ</string>
+    <string name="typ_Phone_in">ଫୋନ୍‍ ଇନ୍‍</string>
+    <string name="typ_Pop">ପପ୍‍ ମ୍ୟୁଜିକ୍‍</string>
+    <string name="typ_Religion">ଧର୍ମ</string>
+    <string name="typ_Rock">ରକ୍‍ ମ୍ୟୁଜିକ୍‍</string>
+    <string name="typ_Science">ବିଜ୍ଞାନ</string>
+    <string name="typ_Serious_classical">ସିରିୟସ୍‍ କ୍ଲାସିକାଲ୍‍</string>
+    <string name="typ_Social_affairs">ସାମାଜିକ ସଂଚାଳନାବଳି</string>
+    <string name="typ_Sport">କ୍ରୀଡା</string>
+    <string name="typ_Travel">ଭ୍ରମଣ</string>
+    <string name="typ_Varied">ପୃଥକ୍‍ ହେଉଛି</string>
+    <string name="typ_Weather">ପାଣିପାଗ</string>
+    <string name="typ_Adult_hits">ଆଡଲ୍ଟ ହିଟ୍ସ୍‍</string>
+    <string name="typ_Classical">କ୍ଲାସିକାଲ୍</string>
+    <string name="typ_Classic_Rock">କ୍ଲାସିକାଲ୍‍ ରକ୍‍</string>
+    <string name="typ_College">କଲେଜ</string>
+    <string name="typ_Foreign_language">ବିଦେଶୀ ଭାଷା</string>
+    <string name="typ_Hiphop">ହିପ୍ ହପ୍</string>
+    <string name="typ_Nostalgia">ନୋଷ୍ଟାଲ୍‍ହିଆ</string>
+    <string name="typ_Personality">ବ୍ୟକ୍ତି୍ତ୍ୱ</string>
+    <string name="typ_Public">ସର୍ବସାଧାରଣ</string>
+    <string name="typ_Religious_music">ଧର୍ମ ସମବଂଧୀୟ ଗୀତ</string>
+    <string name="typ_Religious_talk">ଧର୍ମ ସମବଂଧୀୟ କଥା</string>
+    <string name="typ_Rhythm_and_Blues">ରିଦିମ୍‍ ଓ ବ୍ଲୁଜ୍‍</string>
+    <string name="typ_Spanish_music">ସ୍ପାନିସ୍‍ ଗୀତ</string>
+    <string name="typ_Spanish_talk">ସ୍ପାନିସ୍‍ କଥା</string>
+    <string name="typ_Soft">ସଫ୍ଟ</string>
+    <string name="typ_Soft_Rock">ସଫ୍ଟ ରକ୍‍</string>
+    <string name="typ_Soft_Rhythm_and_Blues">ସଫ୍ଟ ରିଦିମ୍‍ ଓ ବ୍ଲୁଜ୍‍</string>
+    <string name="typ_Sports">ଖେଳ</string>
+    <string name="typ_Talk">କଥା</string>
+    <string name="typ_Top_40">ଶୀଷରେ ଥିବା 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-pl/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-pl/arrays.xml
index cb1457b..8831114 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-pl/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minut</item>
+    <item>15 minut</item>
+    <item>30 minut</item>
+    <item>Do zatrzymania</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minut</item>
+    <item>30 minut</item>
+    <item>45 minut</item>
+    <item>1 godzina</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-pl/strings.xml b/fmapp2/res/values-pl/strings.xml
new file mode 100644
index 0000000..fde6af9
--- /dev/null
+++ b/fmapp2/res/values-pl/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Nadajnik FM</string>
+    <string name="menu_scan_start">Skanuj</string>
+    <string name="menu_scan_stop">Przestań szukać</string>
+    <string name="menu_record_start">Nagraj</string>
+    <string name="menu_record_stop">Zatrzymaj nagrywanie</string>
+    <string name="menu_settings">Ustawienia</string>
+    <string name="menu_sleep">Uśpienie</string>
+    <string name="menu_sleep_cancel">Anuluj uśpienie</string>
+    <string name="menu_all_channels">Wszystkie kanały</string>
+    <string name="menu_display_tags">Pokaż Tagi</string>
+    <string name="button_text_stop">Zatrzymaj</string>
+    <string name="msg_seeking">Wyszukiwanie stacji FM\u2026</string>
+    <string name="msg_scanning">Skanowanie w poszukiwaniu wszystkich stacji FM\u2026</string>
+    <string name="msg_scanning_pty">Skanowanie \'<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">Automatyczny wybór predefiniowanych</string>
+    <string name="msg_searching">Wyszukiwanie stacji o silnym sygnale w celu utworzenia listy predefiniowanych\u2026</string>
+    <string name="msg_noantenna">Podłącz słuchawki, aby użyć radia FM</string>
+    <string name="dialog_sleep_title">Czas automatycznego wyłączenia uśpienia</string>
+    <string name="presetlist_select_name">Wybierz \"<xliff:g id="presetlist_name">%1$s</xliff:g>\"</string>
+    <string name="presetlist_add_new">Dodaj nową listę</string>
+    <string name="dialog_presetlist_rename_title">Wprowadź nazwę</string>
+    <string name="presetlist_autoselect_title">Potwierdź automatyczny wybór</string>
+    <string name="preset_replace">Zastąp</string>
+    <string name="preset_tune">Dostrój</string>
+    <string name="preset_rename">Zmień nazwę</string>
+    <string name="preset_delete">Usuń</string>
+    <string name="preset_search">Wyszukaj \"<xliff:g id="preset_pi">%1$s</xliff:g>\"</string>
+    <string name="stat_notif_frequency">\"<xliff:g id="frequency">%1$s</xliff:g>\" MHz</string>
+    <string name="regional_band">Regionalne pasmo</string>
+    <string name="regional_band_entry_north_america">Ameryka Północna</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japonia</string>
+    <string name="regional_band_entry_japan_wide">Japonia (cała)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgia</string>
+    <string name="regional_band_entry_brazil">Brazylia</string>
+    <string name="regional_band_entry_china">Chiny</string>
+    <string name="regional_band_entry_czech_republic">Czechy</string>
+    <string name="regional_band_entry_denmark">Dania</string>
+    <string name="regional_band_entry_finland">Finlandia</string>
+    <string name="regional_band_entry_france">Francja</string>
+    <string name="regional_band_entry_germany">Niemcy</string>
+    <string name="regional_band_entry_greece">Grecja</string>
+    <string name="regional_band_entry_hong_kong">Hongkong</string>
+    <string name="regional_band_entry_india">Indie</string>
+    <string name="regional_band_entry_indonesia">Indonezja</string>
+    <string name="regional_band_entry_ireland">Irlandia</string>
+    <string name="regional_band_entry_italy">Włochy</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Meksyk</string>
+    <string name="regional_band_entry_netherlands">Holandia</string>
+    <string name="regional_band_entry_new_zealand">Nowa Zelandia</string>
+    <string name="regional_band_entry_norway">Norwegia</string>
+    <string name="regional_band_entry_poland">Polska</string>
+    <string name="regional_band_entry_portugal">Portugalia</string>
+    <string name="regional_band_entry_russia">Rosja</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Słowacja</string>
+    <string name="regional_band_entry_spain">Hiszpania</string>
+    <string name="regional_band_entry_switzerland">Szwajcaria</string>
+    <string name="regional_band_entry_sweden">Szwecja</string>
+    <string name="regional_band_entry_taiwan">Tajwan</string>
+    <string name="regional_band_entry_turkey">Turcja</string>
+    <string name="regional_band_entry_united_kingdom">Wielka Brytania</string>
+    <string name="regional_band_entry_united_states">Stany Zjednoczone</string>
+    <string name="regional_band_entry_user_defined">Zespół zdefiniowany przez użytkownika</string>
+    <string name="regional_band_summary_north_america">Ameryka Północna (87,5 - 108.0 MHz co 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japonia (76.0 - 90.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japonia (cała) (90,0 - 108,0 MHz co 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_austria">Austria (87,5 - 108.0 MHz co 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Belgia (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brazylia (87,5 - 108.0 MHz co 200 kHz)</string>
+    <string name="regional_band_summary_china">Chiny (87.0 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Czechy (87.5 - 108.0 MHz co 100 KHz)</string>
+    <string name="regional_band_summary_denmark">Dania (87,5 - 108.0 MHz co 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlandia (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_france">Francja (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_germany">Niemcy (87,5 - 108.0 MHz co 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grecja (87,5 - 108.0 MHz co 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hongkong (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_india">Indie (87.5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonezja (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlandia (87,5 - 108.0 MHz co 50 kHz)</string>
+    <string name="regional_band_summary_italy">Włochy (87,5 - 108.0 MHz co 50 kHz)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 - 108.0 MHz co 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Meksyk (88.1 - 107,9 MHz co 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Holandia (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Nowa Zelandia (88.0 - 107.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norwegia (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polska (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugalia (87,5 - 108.0 MHz co 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rosja (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapur (88.0 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Słowacja (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_spain">Hiszpania (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Szwajcaria (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Szwecja (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Tajwan (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turcja (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Wielka Brytania (87,5 - 108.0 MHz co 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Stany Zjednoczone (88.1 - 107,9 MHz co 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Pasmo zdefiniowane przez użytkownika</string>
+    <string name="aud_output_mode">Tryb wyjścia audio</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Czas nagrywania</string>
+    <string name="auto_select_af">Alternatywne częstotliwości</string>
+    <string name="settings_revert_defaults_title">Przywróć ustawienia fabryczne</string>
+    <string name="settings_revert_defaults_summary">Zresetuj wszystkie ustawienia</string>
+    <string name="settings_revert_confirm_title">Potwierdź reset</string>
+    <string name="settings_revert_confirm_msg">Spowoduje to usunięcie wszystkich ustawień aplikacji, w tym zapisane ustawienia predefiniowane. Kontynuować?</string>
+    <string name="no_storage">Włóż kartę SD przed rozpoczęciem nagrywania.</string>
+    <string name="preparing_sd">Przygotowywanie karty SD\u2026</string>
+    <string name="access_sd_fail">Brak dostępu do karty SD.</string>
+    <string name="spaceIsLow_content">Brak miejsca na karcie SD. Zmniejsz jakość nagrywania albo zwolnij miejsce, usuwając stare pliki.</string>
+    <string name="FMRecording_reach_size_limit">Osiągnięto limit rozmiaru.</string>
+    <string name="menu_scan_for_preset">Skanuj w poszukiwaniu ustawień</string>
+    <string name="fm_off">FM jest wyłączone.</string>
+    <string name="fm_call">FM nie można używać podczas połączenia.</string>
+    <string name="alert_dialog_hint">Wpisz nazwę</string>
+    <string name="search_dialog_title">Skanuj stacje</string>
+    <string name="fm_command_timeout_title">Limit czasu</string>
+    <string name="fm_tune_timeout_msg">Brak odpowiedzi dla dostrajanej stacji FM. Jeżeli problem będzie się powtarzał, wyłącz odbiornik i uruchom go ponownie.</string>
+    <string name="fm_command_failed_title">Operacja FM zakończona niepowodzeniem</string>
+    <string name="fm_cmd_failed_msg">Uruchomienie radia FM nie powiodło się. Jeżeli problem będzie się powtarzał, wyłącz odbiornik i uruchom go ponownie.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Uruchomienie radia nie powiodło się. Współdziałanie odbiornika FM i HDMI nie jest wspierane.</string>
+    <string name="fm_cmd_failed_call_on">Uruchomienie radia nie powiodło się. Uruchamianie radia jest zablokowane podczas rozmowy.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Moje nagrania FM</string>
+    <string name="audio_db_album_name">Nagrania FM</string>
+    <string name="audio_db_playlist_name">Nagrania FM</string>
+    <string name="station_name">Stacja:</string>
+    <string name="station_exists">Ta częstotliwość już istnieje!</string>
+    <string name="station_list_delete_station">Usuń: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Czy na pewno chcesz usunąć \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Nie wprowadzono nazwy stacji, spróbuj ponownie.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' jest w użyciu, wpisz inną nazwę.</string>
+    <string name="rt_plus_tags">Etykiety</string>
+    <string name="usr_def_band_min">Najniższa częstotliwość (MHz)</string>
+    <string name="usr_def_band_max">Najwyższa częstotliwość (MHz)</string>
+    <string name="chanl_spacing">Odstępy kanałów</string>
+    <string name="set">Ustaw</string>
+    <string name="user_defind_band_msg">Wprowadź częstotliwość z zakresu 76.0-108.0 MHz z co najmniej 1 kanałem odstępu i 100 kHz odstępu od minimalnej i maksymalnej częstotliwości</string>
+    <string name="save_record_file">Nagranie FM zostało zapisane w \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nie znaleziono kompatybilnych stacji</string>
+    <string name="typ_All_stations">Wszystkie stacje</string>
+    <string name="typ_Culture">Kultura</string>
+    <string name="typ_Current_affairs">Sprawy bieżące</string>
+    <string name="typ_Children">Programy dla dzieci</string>
+    <string name="typ_Country">Muzyka country</string>
+    <string name="typ_Documentary">Dokument</string>
+    <string name="typ_Drama">Dramat</string>
+    <string name="typ_Easy_listening">Łagodna muzyka</string>
+    <string name="typ_Education">Edukacja</string>
+    <string name="typ_Emergency">Awaryjny</string>
+    <string name="typ_Emergency_test">Test awaryjny</string>
+    <string name="typ_Finance">Finanse</string>
+    <string name="typ_Folk">Muzyka folk</string>
+    <string name="typ_Information">Informacje</string>
+    <string name="typ_Jazz">Jazz</string>
+    <string name="typ_Light_classical">Lekka klasyka</string>
+    <string name="typ_Leisure">Wypoczynek</string>
+    <string name="typ_News">Wiadomości</string>
+    <string name="typ_National">Muzyka narodowa</string>
+    <string name="typ_Other">Inna muzyka</string>
+    <string name="typ_Oldies">Starsza muzyka</string>
+    <string name="typ_Phone_in">Telefon podłączony</string>
+    <string name="typ_Pop">Muzyka pop</string>
+    <string name="typ_Religion">Religia</string>
+    <string name="typ_Rock">Muzyka rockowa</string>
+    <string name="typ_Science">Nauka</string>
+    <string name="typ_Serious_classical">Poważna muzyka klasyczna</string>
+    <string name="typ_Social_affairs">Sprawy społeczne</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Podróź</string>
+    <string name="typ_Varied">Różne</string>
+    <string name="typ_Weather">Pogoda</string>
+    <string name="typ_Adult_hits">Starsze hity</string>
+    <string name="typ_Classical">Muzyka klasyczna</string>
+    <string name="typ_Classic_Rock">Klasyczny Rock</string>
+    <string name="typ_College">Muzyka studencka</string>
+    <string name="typ_Foreign_language">Język obcy</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Osobowość</string>
+    <string name="typ_Public">Publiczne</string>
+    <string name="typ_Religious_music">Muzyka religijna</string>
+    <string name="typ_Religious_talk">Religijna rozmowa</string>
+    <string name="typ_Rhythm_and_Blues">R\u0026B</string>
+    <string name="typ_Spanish_music">Muzyka hiszpańska</string>
+    <string name="typ_Spanish_talk">Mowa hiszpańska</string>
+    <string name="typ_Soft">Łagodna</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Łagodny R\u0026B</string>
+    <string name="typ_Sports">Sportowa</string>
+    <string name="typ_Talk">Rozmowa</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-pt-rBR/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-pt-rBR/arrays.xml
index cb1457b..1b78003 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-pt-rBR/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Estéreo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Estéreo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>Até parar</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>45 minutos</item>
+    <item>1 hora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-pt-rBR/strings.xml b/fmapp2/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..b13251c
--- /dev/null
+++ b/fmapp2/res/values-pt-rBR/strings.xml
@@ -0,0 +1,232 @@
+<?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">Rádio FM</string>
+    <string name="tx_app_name">Transmissor de FM</string>
+    <string name="menu_scan_start">Pesquisar estações</string>
+    <string name="menu_scan_stop">Parar pesquisa</string>
+    <string name="menu_record_start">Gravar</string>
+    <string name="menu_record_stop">Parar gravação</string>
+    <string name="menu_settings">Configurações</string>
+    <string name="menu_sleep">Suspender</string>
+    <string name="menu_sleep_cancel">Cancelar Sono</string>
+    <string name="menu_all_channels">Todos os canais</string>
+    <string name="menu_display_tags">Mostrar tags</string>
+    <string name="button_text_stop">Parar</string>
+    <string name="msg_seeking">Procurando estação FM\u2026</string>
+    <string name="msg_scanning">Procurando todas as estações FM\u2026</string>
+    <string name="msg_scanning_pty">Procurando \'<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">Memorização automática</string>
+    <string name="msg_searching">Procurando as estações mais fortes para criar uma lista de faixas pré definidas\u2026</string>
+    <string name="msg_noantenna">Ligue fones de ouvido com fio para ouvir rádio FM</string>
+    <string name="dialog_sleep_title">Tempo de sono antes de autodesligar</string>
+    <string name="presetlist_select_name">Selecionar \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Criar nova lista</string>
+    <string name="dialog_presetlist_rename_title">Digite o nome</string>
+    <string name="presetlist_autoselect_title">Confirmar seleção automática</string>
+    <string name="preset_replace">Substituir</string>
+    <string name="preset_tune">Sintonia</string>
+    <string name="preset_rename">Renomear</string>
+    <string name="preset_delete">Apagar</string>
+    <string name="preset_search">Pesquisar por \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Faixa regional</string>
+    <string name="regional_band_entry_north_america">América do Norte</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japão</string>
+    <string name="regional_band_entry_japan_wide">Japão (ampla)</string>
+    <string name="regional_band_entry_australia">Austrália</string>
+    <string name="regional_band_entry_austria">Áustria</string>
+    <string name="regional_band_entry_belgium">Bélgica</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">República Tcheca</string>
+    <string name="regional_band_entry_denmark">Dinamarca</string>
+    <string name="regional_band_entry_finland">Finlândia</string>
+    <string name="regional_band_entry_france">França</string>
+    <string name="regional_band_entry_germany">Alemanha</string>
+    <string name="regional_band_entry_greece">Grécia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Índia</string>
+    <string name="regional_band_entry_indonesia">Indonésia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Itália</string>
+    <string name="regional_band_entry_korea">Coréia</string>
+    <string name="regional_band_entry_mexico">México</string>
+    <string name="regional_band_entry_netherlands">Holanda</string>
+    <string name="regional_band_entry_new_zealand">Nova Zelândia</string>
+    <string name="regional_band_entry_norway">Noruega</string>
+    <string name="regional_band_entry_poland">Polônia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rússia</string>
+    <string name="regional_band_entry_singapore">Cingapura</string>
+    <string name="regional_band_entry_slovakia">Eslováquia</string>
+    <string name="regional_band_entry_spain">Espanha</string>
+    <string name="regional_band_entry_switzerland">Suíça</string>
+    <string name="regional_band_entry_sweden">Suécia</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turquia</string>
+    <string name="regional_band_entry_united_kingdom">Reino Unido</string>
+    <string name="regional_band_entry_united_states">Estados Unidos</string>
+    <string name="regional_band_entry_user_defined">Faixa definida pelo usuário</string>
+    <string name="regional_band_summary_north_america">América do Norte (87,5 MHz a 108,0 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japão (76,0 MHz  a 90,0 MHz  em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japão (amplo) (90,0 MHz a 108,0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_australia">Austrália (87,7 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_austria">Áustria (87,5 MHz  a 108,0 MHz  em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Bélgica (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (87,5 MHz  a 108,0 MHz  em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_china">China (87,0 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">República Tcheca (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Dinamarca (87,5 MHz a 108,0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlândia (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_france">França (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_germany">Alemanha (87,5 MHz a 108,0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grécia (87,5 MHz a 108,0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_india">Índia (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonésia (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (87,5 MHz a 108,0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_italy">Itália (87,5 MHz a 108,0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_korea">Coréia (87,5 MHz a 108,0 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_mexico">México (88,1 MHz a 107,9 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Holanda (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Nova Zelândia (88,0 MHz a 107,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_norway">Noruega (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polônia (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 MHz a 108,0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rússia (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapura (88,0 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Eslováquia (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_spain">Espanha (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Suíça (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Suécia (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turquia (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Reino Unido (87,5 MHz a 108,0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Estados Unidos (88,1 MHz a 107,9 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Faixa definida pelo usuário</string>
+    <string name="aud_output_mode">Modo de saída de áudio</string>
+    <string name="audio_type_stereo">Estéreo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Duração da gravação</string>
+    <string name="auto_select_af">Frequência alternativa</string>
+    <string name="settings_revert_defaults_title">Restaurar padrões de fábrica</string>
+    <string name="settings_revert_defaults_summary">Redefinir configurações</string>
+    <string name="settings_revert_confirm_title">Confirmar redefinição</string>
+    <string name="settings_revert_confirm_msg">Isto vai limpar todas as configurações, incluindo as estações pré configuradas. Continuar?</string>
+    <string name="no_storage">Monte o cartão SD antes de iniciar a gravação.</string>
+    <string name="preparing_sd">Preparando cartão SD\u2026</string>
+    <string name="access_sd_fail">Não foi possível acessar o cartão SD.</string>
+    <string name="spaceIsLow_content">Seu cartão de armazenamento SD está sem espaço. Troque a configuração de qualidade ou remova alguns arquivos para liberar espaço.</string>
+    <string name="FMRecording_reach_size_limit">Limite de tamanho atingido.</string>
+    <string name="menu_scan_for_preset">Procurar estações predefinidas</string>
+    <string name="fm_off">FM está desligado.</string>
+    <string name="fm_call">FM não pode ser usado durante uma ligação.</string>
+    <string name="alert_dialog_hint">Inserir um nome</string>
+    <string name="search_dialog_title">Procurar estações</string>
+    <string name="fm_command_timeout_title">Tempo limite</string>
+    <string name="fm_tune_timeout_msg">Não houve resposta na sintonização da estação. Se o problema continuar, desligue e ligue o FM.</string>
+    <string name="fm_command_failed_title">Falha na operação FM</string>
+    <string name="fm_cmd_failed_msg">Falha na operação FM. Se o problema continuar, desligue e ligue o FM.</string>
+    <string name="fm_cmd_failed_msg_hdmi">A operação FM falhou. FM e HDMI não podem ser usados simultaneamente.</string>
+    <string name="fm_cmd_failed_call_on">A operação FM falhou. O áudio FM não é permitido durante uma chamada. </string>
+    <string name="audio_db_artist_name">Minhas Gravações FM</string>
+    <string name="audio_db_album_name">Gravações FM</string>
+    <string name="audio_db_playlist_name">Gravações FM</string>
+    <string name="station_name">Estação:</string>
+    <string name="station_exists">Essa frequência já existe!</string>
+    <string name="station_list_delete_station">Apagar: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Tem certeza que quer apagar \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Nome de estação vazio, digite novamente.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' já está em uso, digite um nome diferente.</string>
+    <string name="rt_plus_tags">Tags</string>
+    <string name="usr_def_band_min">Menor frequência (MHz)</string>
+    <string name="usr_def_band_max">Maior frequência (MHz)</string>
+    <string name="chanl_spacing">Espaçamento entre canais</string>
+    <string name="set">Definir</string>
+    <string name="user_defind_band_msg">Digite uma frequência de 76,0 MHz à 108,0 MHz com, no mínimo, 1 canal de espaço e 100 kHz de diferença entre a frequência mínima e máxima</string>
+    <string name="save_record_file">Arquivo de gravação FM salvo em \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nenhuma estação compatível encontrada</string>
+    <string name="typ_All_stations">Todas as estações</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Atualidades</string>
+    <string name="typ_Children">Programas infantis</string>
+    <string name="typ_Country">Música country</string>
+    <string name="typ_Documentary">Documentário</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Música melódica</string>
+    <string name="typ_Education">Educação</string>
+    <string name="typ_Emergency">Emergência</string>
+    <string name="typ_Emergency_test">Teste de emergência</string>
+    <string name="typ_Finance">Finanças</string>
+    <string name="typ_Folk">Folk</string>
+    <string name="typ_Information">Informação</string>
+    <string name="typ_Jazz">Jazz</string>
+    <string name="typ_Light_classical">Clássica suave</string>
+    <string name="typ_Leisure">Lazer</string>
+    <string name="typ_News">Notícias</string>
+    <string name="typ_National">Música nacional</string>
+    <string name="typ_Other">Outras músicas</string>
+    <string name="typ_Oldies">Música antiga</string>
+    <string name="typ_Phone_in">Participação telefônica</string>
+    <string name="typ_Pop">Pop</string>
+    <string name="typ_Religion">Religião</string>
+    <string name="typ_Rock">Rock</string>
+    <string name="typ_Science">Ciência</string>
+    <string name="typ_Serious_classical">Clássica séria</string>
+    <string name="typ_Social_affairs">Temas sociais</string>
+    <string name="typ_Sport">Esporte</string>
+    <string name="typ_Travel">Viagens</string>
+    <string name="typ_Varied">Variedades</string>
+    <string name="typ_Weather">Clima</string>
+    <string name="typ_Adult_hits">Hits adultos</string>
+    <string name="typ_Classical">Clássica</string>
+    <string name="typ_Classic_Rock">Rock clássico</string>
+    <string name="typ_College">Universitária</string>
+    <string name="typ_Foreign_language">Língua estrangeira</string>
+    <string name="typ_Hiphop">Hip-hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personalidade</string>
+    <string name="typ_Public">Pública</string>
+    <string name="typ_Religious_music">Música religiosa</string>
+    <string name="typ_Religious_talk">Discussão religiosa</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Música espanhola</string>
+    <string name="typ_Spanish_talk">Conversa espanhola</string>
+    <string name="typ_Soft">Tranquila</string>
+    <string name="typ_Soft_Rock">Rock leve</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm and Blues leve</string>
+    <string name="typ_Sports">Esportes</string>
+    <string name="typ_Talk">Discussão</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-pt-rPT/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-pt-rPT/arrays.xml
index cb1457b..1b78003 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-pt-rPT/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Estéreo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Estéreo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>Até parar</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>45 minutos</item>
+    <item>1 hora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-pt-rPT/strings.xml b/fmapp2/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..c429950
--- /dev/null
+++ b/fmapp2/res/values-pt-rPT/strings.xml
@@ -0,0 +1,233 @@
+<?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">Rádio FM</string>
+    <string name="tx_app_name">Transmissor de FM</string>
+    <string name="menu_scan_start">Procurar</string>
+    <string name="menu_scan_stop">Parar de procurar</string>
+    <string name="menu_record_start">Gravar</string>
+    <string name="menu_record_stop">Parar de gravar</string>
+    <string name="menu_settings">Definições</string>
+    <string name="menu_sleep">Modo de espera</string>
+    <string name="menu_sleep_cancel">Cancelar modo de espera</string>
+    <string name="menu_all_channels">Todos os canais</string>
+    <string name="menu_display_tags">Mostrar etiquetas</string>
+    <string name="button_text_stop">Parar</string>
+    <string name="msg_seeking">A procurar estação FM\u2026</string>
+    <string name="msg_scanning">A procurar todas as estações FM\u2026</string>
+    <string name="msg_scanning_pty">A procurar por \'<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">Seleção automática de bandas</string>
+    <string name="msg_searching">Procurar as estações mais fortes para criar uma lista de bandas pré definidas\u2026</string>
+    <string name="msg_noantenna">Por favor ligue uns auscultadores para usar o rádio FM</string>
+    <string name="dialog_sleep_title">Tempo limite para desligar automaticamente</string>
+    <string name="presetlist_select_name">Selecionar \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Adicionar nova lista</string>
+    <string name="dialog_presetlist_rename_title">Introduzir nome</string>
+    <string name="presetlist_autoselect_title">Confirmar seleção automática</string>
+    <string name="preset_replace">Substituir</string>
+    <string name="preset_tune">Sintonizar</string>
+    <string name="preset_rename">Mudar nome</string>
+    <string name="preset_delete">Eliminar</string>
+    <string name="preset_search">A procurar \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Banda regional</string>
+    <string name="regional_band_entry_north_america">América do Norte</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japão</string>
+    <string name="regional_band_entry_japan_wide">Japão (completo)</string>
+    <string name="regional_band_entry_australia">Austrália</string>
+    <string name="regional_band_entry_austria">Áustria</string>
+    <string name="regional_band_entry_belgium">Bélgica</string>
+    <string name="regional_band_entry_brazil">Brasil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">República Checa</string>
+    <string name="regional_band_entry_denmark">Dinamarca</string>
+    <string name="regional_band_entry_finland">Finlândia</string>
+    <string name="regional_band_entry_france">França</string>
+    <string name="regional_band_entry_germany">Alemanha</string>
+    <string name="regional_band_entry_greece">Grécia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Índia</string>
+    <string name="regional_band_entry_indonesia">Indonésia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Itália</string>
+    <string name="regional_band_entry_korea">Coreia</string>
+    <string name="regional_band_entry_mexico">México</string>
+    <string name="regional_band_entry_netherlands">Países Baixos</string>
+    <string name="regional_band_entry_new_zealand">Nova Zelândia</string>
+    <string name="regional_band_entry_norway">Noruega</string>
+    <string name="regional_band_entry_poland">Polónia</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Rússia</string>
+    <string name="regional_band_entry_singapore">Singapura</string>
+    <string name="regional_band_entry_slovakia">República Eslovaca</string>
+    <string name="regional_band_entry_spain">Espanha</string>
+    <string name="regional_band_entry_switzerland">Suíça</string>
+    <string name="regional_band_entry_sweden">Suécia</string>
+    <string name="regional_band_entry_taiwan">República da China</string>
+    <string name="regional_band_entry_turkey">Turquia</string>
+    <string name="regional_band_entry_united_kingdom">Reino Unido</string>
+    <string name="regional_band_entry_united_states">Estados Unidos</string>
+    <string name="regional_band_entry_user_defined">Banda definida pelo utilizador</string>
+    <string name="regional_band_summary_north_america">América do Norte (87.5 MHz a 108.0 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japão (76.0 MHz a 90.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japão (completo) (90.0 MHz a 108.0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_australia">Austrália (87.7 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_austria">Áustria (87.5 MHz a 108.0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Bélgica (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasil (87.5 MHz a 108.0 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_china">China (87.0 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">República Checa (87.5 a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Dinamarca (87.5 MHz a 108.0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlândia (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_france">França (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_germany">Alemanha (87.5 MHz a 108.0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grécia (87.5 MHz a 108.0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_india">Índia (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonésia (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (87.5 MHz a 108.0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_italy">Itália (87.5 MHz a 108.0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_korea">Coreia (87.5 MHz a 108.0 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_mexico">México (88.1 MHz a 107.9 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Países Baixos (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Nova Zelândia (88.0 MHz a 107.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_norway">Noruega (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polónia (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 MHz a 108.0 MHz em intervalos de 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rússia (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapura (88.0 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">República Eslovaca (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_spain">Espanha (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Suíça (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Suécia (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">República da China (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turquia (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Reino Unido (87.5 MHz a 108.0 MHz em intervalos de 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Estados Unidos (88.1 MHz a 107.9 MHz em intervalos de 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Banda definida pelo utilizador</string>
+    <string name="aud_output_mode">Modo de saída de áudio</string>
+    <string name="audio_type_stereo">Estéreo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Duração da gravação</string>
+    <string name="auto_select_af">Frequência alternativa</string>
+    <string name="settings_revert_defaults_title">Reverter para as predefinições de fábrica</string>
+    <string name="settings_revert_defaults_summary">Repor todas as definições</string>
+    <string name="settings_revert_confirm_title">Confirme a reposição</string>
+    <string name="settings_revert_confirm_msg">Isto vai eliminar todas as definições, incluido as estações pré configuradas. Continuar?</string>
+    <string name="no_storage">Montar o cartão SD antes de iniciar a gravação.</string>
+    <string name="preparing_sd">A preparar o cartão SD\u2026</string>
+    <string name="access_sd_fail">Não foi possível aceder ao cartão SD.</string>
+    <string name="spaceIsLow_content">O seu cartão SD está a ficar sem espaço. Altere a definição de qualidade ou elimine alguns ficheiros para libertar espaço.</string>
+    <string name="FMRecording_reach_size_limit">Tamanho máximo atingido.</string>
+    <string name="menu_scan_for_preset">Procurar emissoras memorizadas</string>
+    <string name="fm_off">O rádio FM está desligado.</string>
+    <string name="fm_call">O rádio FM não pode ser utilizado durante uma chamada.</string>
+    <string name="alert_dialog_hint">Introduza um nome</string>
+    <string name="search_dialog_title">Procurar estações</string>
+    <string name="fm_command_timeout_title">Tempo para suspensão</string>
+    <string name="fm_tune_timeout_msg">Não foi possível sintonizar a estação FM. Se o problema persistir, desligue e volte a ligar o rádio.</string>
+    <string name="fm_command_failed_title">Falha no funcionamento do rádio</string>
+    <string name="fm_cmd_failed_msg">Falha no funcionamento do rádio. Se o problema persistir, desligue e volte a ligá-lo.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Falha no funcionamento do rádio. O rádio e o HDMI não podem ser usados em simultâneo.</string>
+    <string name="fm_cmd_failed_call_on">Falha no funcionamento do rádio. O rádio não pode ser usado durante uma chamada.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">As minhas gravações de rádio</string>
+    <string name="audio_db_album_name">Gravações de rádio</string>
+    <string name="audio_db_playlist_name">Gravações de rádio</string>
+    <string name="station_name">Estação:</string>
+    <string name="station_exists">Esta frequência já existe!</string>
+    <string name="station_list_delete_station">Eliminar: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Tem a certeza que quer eliminar \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">O nome da estação está vazio. Por favor, insira-o novamente.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' já está em utilização, por favor, digite um nome diferente.</string>
+    <string name="rt_plus_tags">Etiquetas</string>
+    <string name="usr_def_band_min">Frequência mínima (MHz)</string>
+    <string name="usr_def_band_max">Frequência máxima (MHz)</string>
+    <string name="chanl_spacing">Espaçamento entre canais</string>
+    <string name="set">Definir</string>
+    <string name="user_defind_band_msg">Introduza uma frequência de 76.0 a 108.0 MHz com, no mínimo, 1 canal de espaço e 100 kHz de espaçamento entre as frequências mínimas e máximas</string>
+    <string name="save_record_file">O ficheiro de gravação de rádio foi guardado como \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Não foram encontradas estações compatíveis</string>
+    <string name="typ_All_stations">Todas as estações</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Atualidades</string>
+    <string name="typ_Children">Programas infantis</string>
+    <string name="typ_Country">Música country</string>
+    <string name="typ_Documentary">Documentário</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Melodias</string>
+    <string name="typ_Education">Educação</string>
+    <string name="typ_Emergency">Emergência</string>
+    <string name="typ_Emergency_test">Teste de emergência</string>
+    <string name="typ_Finance">Finanças</string>
+    <string name="typ_Folk">Música popular</string>
+    <string name="typ_Information">Informações</string>
+    <string name="typ_Jazz">Música jazz</string>
+    <string name="typ_Light_classical">Clássica</string>
+    <string name="typ_Leisure">Lazer</string>
+    <string name="typ_News">Notícias</string>
+    <string name="typ_National">Música nacional</string>
+    <string name="typ_Other">Outros tipos de música</string>
+    <string name="typ_Oldies">Músicas antigas</string>
+    <string name="typ_Phone_in">Por telefone</string>
+    <string name="typ_Pop">Música pop</string>
+    <string name="typ_Religion">Religiosa</string>
+    <string name="typ_Rock">Música rock</string>
+    <string name="typ_Science">Ciência</string>
+    <string name="typ_Serious_classical">Clássica relevante</string>
+    <string name="typ_Social_affairs">Assuntos sociais</string>
+    <string name="typ_Sport">Desporto</string>
+    <string name="typ_Travel">Viagens</string>
+    <string name="typ_Varied">Diversificada</string>
+    <string name="typ_Weather">Tempo</string>
+    <string name="typ_Adult_hits">Hits para adultos</string>
+    <string name="typ_Classical">Clássica</string>
+    <string name="typ_Classic_Rock">Rock clássico</string>
+    <string name="typ_College">Colegial</string>
+    <string name="typ_Foreign_language">Língua estrangeira</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personalidades</string>
+    <string name="typ_Public">Público</string>
+    <string name="typ_Religious_music">Música religiosa</string>
+    <string name="typ_Religious_talk">Conversa religiosa</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Música hispânica</string>
+    <string name="typ_Spanish_talk">Conversa hispânica</string>
+    <string name="typ_Soft">Ligeira</string>
+    <string name="typ_Soft_Rock">Rock Ligeiro</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm and Blues suave</string>
+    <string name="typ_Sports">Desportos</string>
+    <string name="typ_Talk">Entrevistas</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ro/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ro/arrays.xml
index cb1457b..390b366 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ro/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minute</item>
+    <item>15 minute</item>
+    <item>30 de minute</item>
+    <item>Până la oprire</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minute</item>
+    <item>30 de minute</item>
+    <item>45 de minute</item>
+    <item>1 oră</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ro/strings.xml b/fmapp2/res/values-ro/strings.xml
new file mode 100644
index 0000000..54eac97
--- /dev/null
+++ b/fmapp2/res/values-ro/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Transmițător FM</string>
+    <string name="menu_scan_start">Scanare</string>
+    <string name="menu_scan_stop">Oprire căutare</string>
+    <string name="menu_record_start">Înregistrare</string>
+    <string name="menu_record_stop">Oprește înregistrarea</string>
+    <string name="menu_settings">Setări</string>
+    <string name="menu_sleep">Somn</string>
+    <string name="menu_sleep_cancel">Anulare somn</string>
+    <string name="menu_all_channels">Toate canalele</string>
+    <string name="menu_display_tags">Afișare etichete</string>
+    <string name="button_text_stop">Stop</string>
+    <string name="msg_seeking">Se caută stație FM\u2026</string>
+    <string name="msg_scanning">Se caută toate stațiile FM\u2026</string>
+    <string name="msg_scanning_pty">Se caută \'<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-selectare presetări</string>
+    <string name="msg_searching">Se caută stațiile puternice pentru a crea o listă de presetări\u2026</string>
+    <string name="msg_noantenna">Vă rugăm conectați o cască audio pentru a folosi radio FM</string>
+    <string name="dialog_sleep_title">Timpul de oprire automată</string>
+    <string name="presetlist_select_name">Selectați \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Adaugă o listă nouă</string>
+    <string name="dialog_presetlist_rename_title">Introduceți numele</string>
+    <string name="presetlist_autoselect_title">Confirmă auto-selecția</string>
+    <string name="preset_replace">Înlocuire</string>
+    <string name="preset_tune">Reglaj</string>
+    <string name="preset_rename">Redenumire</string>
+    <string name="preset_delete">Ștergere</string>
+    <string name="preset_search">Caută pentru \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Banda regională</string>
+    <string name="regional_band_entry_north_america">America de Nord</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japonia</string>
+    <string name="regional_band_entry_japan_wide">Japonia (extins)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgia</string>
+    <string name="regional_band_entry_brazil">Brazilia</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Republica Cehă</string>
+    <string name="regional_band_entry_denmark">Danemarca</string>
+    <string name="regional_band_entry_finland">Finlanda</string>
+    <string name="regional_band_entry_france">Franța</string>
+    <string name="regional_band_entry_germany">Germania</string>
+    <string name="regional_band_entry_greece">Grecia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonezia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Italia</string>
+    <string name="regional_band_entry_korea">Coreea</string>
+    <string name="regional_band_entry_mexico">Mexic</string>
+    <string name="regional_band_entry_netherlands">Olanda</string>
+    <string name="regional_band_entry_new_zealand">Noua Zeelandă</string>
+    <string name="regional_band_entry_norway">Norvegia</string>
+    <string name="regional_band_entry_poland">Polonia</string>
+    <string name="regional_band_entry_portugal">Portugalia</string>
+    <string name="regional_band_entry_russia">Rusia</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovacia</string>
+    <string name="regional_band_entry_spain">Spania</string>
+    <string name="regional_band_entry_switzerland">Elveția</string>
+    <string name="regional_band_entry_sweden">Suedia</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turcia</string>
+    <string name="regional_band_entry_united_kingdom">Marea Britanie</string>
+    <string name="regional_band_entry_united_states">Statele Unite</string>
+    <string name="regional_band_entry_user_defined">Bandă definită de utilizator</string>
+    <string name="regional_band_summary_north_america">America de Nord (87.5 la 108.0 MHz în pași de câte 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japonia (76.0 la 90.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japonia (extins) (90.0 la 108.0 MHz în pași de câte 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_austria">Australia (87.5 la 108.0 MHz în pași de câte 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Belgia (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brazilia (87.5 la 108.0 MHz în pași de câte 200 kHz)</string>
+    <string name="regional_band_summary_china">China (87.0 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Republica Cehă (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Denemarca (87.5 la 108.0 MHz în pași de câte 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlanda (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_france">Franța (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_germany">Germania (87.5 la 108.0 MHz în pași de câte 50 kHz)</string>
+    <string name="regional_band_summary_greece">Grecia (87.5 la 108.0 MHz în pași de câte 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_india">India (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonezia (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (87.5 la 108.0 MHz în pași de câte 50 kHz)</string>
+    <string name="regional_band_summary_italy">Italia (87.5 la 108.0 MHz în pași de câte 50 kHz)</string>
+    <string name="regional_band_summary_korea">Coreea (87.5 la 108.0 MHz în pași de câte 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Mexic (88.1 la 107.9 MHz în pași de câte 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Olanda (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Noua Zeealandă (88.0 la 107.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norvegia (87.5 la 108.0MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_poland">Polonia (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugalia (87.5 la 108.0 MHz în pași de câte 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rusia (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Slovacia (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_spain">Spania (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Elveția (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Suedia (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turcia (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Marea Britanie (87.5 la 108.0 MHz în pași de câte 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Statele Unite (88.1 la 107.9 MHz în pași de câte 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Bandă definită de utilizator</string>
+    <string name="aud_output_mode">Modul de ieșire audio</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Durata înregistrării</string>
+    <string name="auto_select_af">Frecvență alternativă</string>
+    <string name="settings_revert_defaults_title">Revenire la setările de fabrică</string>
+    <string name="settings_revert_defaults_summary">Reinițializați toate setările</string>
+    <string name="settings_revert_confirm_title">Confirmați reinițializarea</string>
+    <string name="settings_revert_confirm_msg">Aceasta va șterge toate setările aplicației, inclusiv presetările salvate. Continuați?</string>
+    <string name="no_storage">Montați cardul SD înainte de a începe înregistrarea.</string>
+    <string name="preparing_sd">Se pregătește cardul SD\u2026</string>
+    <string name="access_sd_fail">Nu s-a putut accesa cardul SD.</string>
+    <string name="spaceIsLow_content">Cardul dvs SD rămâne fără spațiu liber. Schimbați setarea de calitate sau ștergeți câteva dintre fișierele vechi pentru a elibera spațiul.</string>
+    <string name="FMRecording_reach_size_limit">Dimensiune limită atinsă.</string>
+    <string name="menu_scan_for_preset">Scanare pentru presetări</string>
+    <string name="fm_off">FM este oprit.</string>
+    <string name="fm_call">FM nu poate fi utilizat în același timp cu un apel.</string>
+    <string name="alert_dialog_hint">Introduceți un nume</string>
+    <string name="search_dialog_title">Scanare stații</string>
+    <string name="fm_command_timeout_title">Timeout</string>
+    <string name="fm_tune_timeout_msg">Nu am recepționat niciun răspuns pentru a regla stația FM. Dacă problema persistă, vă rugăm să opriți și să reporniți FM-ul.</string>
+    <string name="fm_command_failed_title">Operația FM a eșuat</string>
+    <string name="fm_cmd_failed_msg">Operația FM a eșuat. Dacă problema persistă, vă rugăm să opriți și să reporniți FM-ul.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Operația FM a eșuat. Concurența dintre FM și HDMI nu este acceptată.</string>
+    <string name="fm_cmd_failed_call_on">Operația FM a eșuat. În timpul unui apel, audio al FM nu este permis.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Înregistrările mele FM</string>
+    <string name="audio_db_album_name">Înregistrări FM</string>
+    <string name="audio_db_playlist_name">Înregistrări FM</string>
+    <string name="station_name">Stația:</string>
+    <string name="station_exists">Această frecvență există deja!</string>
+    <string name="station_list_delete_station">Șterg: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Sigur vrei să ștergi \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Numele stației este gol, vă rugăm să îl introduceți iar.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' este deja în uz, vă rugăm să introduceți un nume diferit.</string>
+    <string name="rt_plus_tags">Etichete</string>
+    <string name="usr_def_band_min">Frecvența minimă (MHz)</string>
+    <string name="usr_def_band_max">Frecvența maximă (MHz)</string>
+    <string name="chanl_spacing">Spațiere pentru canal</string>
+    <string name="set">Setați</string>
+    <string name="user_defind_band_msg">Introduceți o frecvență de la 76.0 la 108.0 MHz cu spațiu de un canal minimum și 100 kHz spațiu între frecvențele min și max</string>
+    <string name="save_record_file">Fișierul cu înregistrarea FM s-a salvat la \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nu s-au găsit posturi compatibile</string>
+    <string name="typ_All_stations">Toate stațiile</string>
+    <string name="typ_Culture">Cultură</string>
+    <string name="typ_Current_affairs">Actualități</string>
+    <string name="typ_Children">Programe pentru copii</string>
+    <string name="typ_Country">Muzică Country</string>
+    <string name="typ_Documentary">Documentar</string>
+    <string name="typ_Drama">Dramă</string>
+    <string name="typ_Easy_listening">Muzică ascultată ușor</string>
+    <string name="typ_Education">Educație</string>
+    <string name="typ_Emergency">Urgență</string>
+    <string name="typ_Emergency_test">Test de urgenţă</string>
+    <string name="typ_Finance">Finanțe</string>
+    <string name="typ_Folk">Muzică folk</string>
+    <string name="typ_Information">Informație</string>
+    <string name="typ_Jazz">Muzică Jazz</string>
+    <string name="typ_Light_classical">Clasică ușoară</string>
+    <string name="typ_Leisure">Timp liber</string>
+    <string name="typ_News">Știri</string>
+    <string name="typ_National">Muzică națională</string>
+    <string name="typ_Other">Altă muzică</string>
+    <string name="typ_Oldies">Muzică veche</string>
+    <string name="typ_Phone_in">Intrare telefon</string>
+    <string name="typ_Pop">Muzică Pop</string>
+    <string name="typ_Religion">Religie</string>
+    <string name="typ_Rock">Muzică rock</string>
+    <string name="typ_Science">Știință</string>
+    <string name="typ_Serious_classical">Clasică serioasă</string>
+    <string name="typ_Social_affairs">Afaceri sociale</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Călătorie</string>
+    <string name="typ_Varied">Variate</string>
+    <string name="typ_Weather">Vremea</string>
+    <string name="typ_Adult_hits">Hituri Adult</string>
+    <string name="typ_Classical">Clasică</string>
+    <string name="typ_Classic_Rock">Rock clasic</string>
+    <string name="typ_College">Colegiu</string>
+    <string name="typ_Foreign_language">Limbă străină</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgie</string>
+    <string name="typ_Personality">Personalitate</string>
+    <string name="typ_Public">Public</string>
+    <string name="typ_Religious_music">Muzică religioasă</string>
+    <string name="typ_Religious_talk">Conversații religioase</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm și Blues</string>
+    <string name="typ_Spanish_music">Muzică spaniolă</string>
+    <string name="typ_Spanish_talk">Conversații în spaniolă</string>
+    <string name="typ_Soft">Ușoară</string>
+    <string name="typ_Soft_Rock">Rock ușor</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm și Blues ușor</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Discuție</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ru/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ru/arrays.xml
index cb1457b..017a7c1 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ru/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Стерео</item>
+    <item>Моно</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 кГц</item>
+    <item>100 кГц</item>
+    <item>200 кГц</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-ru/strings.xml b/fmapp2/res/values-ru/strings.xml
new file mode 100644
index 0000000..3efe4e2
--- /dev/null
+++ b/fmapp2/res/values-ru/strings.xml
@@ -0,0 +1,234 @@
+<?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-радио</string>
+    <string name="tx_app_name">FM-передатчик</string>
+    <string name="menu_scan_start">Поиск</string>
+    <string name="menu_scan_stop">Прекратить поиск</string>
+    <string name="menu_record_start">Запись</string>
+    <string name="menu_record_stop">Остановить запись</string>
+    <string name="menu_settings">Настройки</string>
+    <string name="menu_sleep">Таймер</string>
+    <string name="menu_sleep_cancel">Отменить таймер</string>
+    <string name="menu_all_channels">Все каналы</string>
+    <string name="menu_display_tags">Показать теги</string>
+    <string name="button_text_stop">Остановить</string>
+    <string name="msg_seeking">Поиск FM-станции\u2026</string>
+    <string name="msg_scanning">Поиск всех FM-станций\u2026</string>
+    <string name="msg_scanning_pty">Поиск «<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> МГц</string>
+    <string name="msg_searching_title">Автопоиск станций</string>
+    <string name="msg_searching">Поиск станций с мощным сигналом для создания списка станций\u2026</string>
+    <string name="msg_noantenna">Подключите гарнитуру, чтобы использовать FM-радио</string>
+    <string name="dialog_sleep_title">Время автовыключения</string>
+    <string name="presetlist_select_name">Выбор «<xliff:g id="presetlist_name">%1$s</xliff:g>»</string>
+    <string name="presetlist_add_new">Добавить новый список</string>
+    <string name="dialog_presetlist_rename_title">Введите название</string>
+    <string name="presetlist_autoselect_title">Подтвердите автонастройку</string>
+    <string name="preset_replace">Изменить</string>
+    <string name="preset_tune">Настроить</string>
+    <string name="preset_rename">Переименовать</string>
+    <string name="preset_delete">Удалить</string>
+    <string name="preset_search">Поиск «<xliff:g id="preset_pi">%1$s</xliff:g>»
+        </string>
+    <string name="stat_notif_frequency"><xliff:g id="frequency">%1$s</xliff:g> МГц</string>
+    <string name="regional_band">Региональный диапазон</string>
+    <string name="regional_band_entry_north_america">Северная Америка</string>
+    <string name="regional_band_entry_europe">Европа</string>
+    <string name="regional_band_entry_japan">Япония</string>
+    <string name="regional_band_entry_japan_wide">Япония (широкий диапазон)</string>
+    <string name="regional_band_entry_australia">Австралия</string>
+    <string name="regional_band_entry_austria">Австрия</string>
+    <string name="regional_band_entry_belgium">Бельгия</string>
+    <string name="regional_band_entry_brazil">Бразилия</string>
+    <string name="regional_band_entry_china">Китай</string>
+    <string name="regional_band_entry_czech_republic">Чешская Республика</string>
+    <string name="regional_band_entry_denmark">Дания</string>
+    <string name="regional_band_entry_finland">Финляндия</string>
+    <string name="regional_band_entry_france">Франция</string>
+    <string name="regional_band_entry_germany">Германия</string>
+    <string name="regional_band_entry_greece">Греция</string>
+    <string name="regional_band_entry_hong_kong">Гонконг</string>
+    <string name="regional_band_entry_india">Индия</string>
+    <string name="regional_band_entry_indonesia">Индонезия</string>
+    <string name="regional_band_entry_ireland">Ирландия</string>
+    <string name="regional_band_entry_italy">Италия</string>
+    <string name="regional_band_entry_korea">Республика Корея</string>
+    <string name="regional_band_entry_mexico">Мексика</string>
+    <string name="regional_band_entry_netherlands">Нидерланды</string>
+    <string name="regional_band_entry_new_zealand">Новая Зеландия</string>
+    <string name="regional_band_entry_norway">Норвегия</string>
+    <string name="regional_band_entry_poland">Польша</string>
+    <string name="regional_band_entry_portugal">Португалия</string>
+    <string name="regional_band_entry_russia">Россия</string>
+    <string name="regional_band_entry_singapore">Сингапур</string>
+    <string name="regional_band_entry_slovakia">Словакия</string>
+    <string name="regional_band_entry_spain">Испания</string>
+    <string name="regional_band_entry_switzerland">Швейцария</string>
+    <string name="regional_band_entry_sweden">Швеция</string>
+    <string name="regional_band_entry_taiwan">Тайвань</string>
+    <string name="regional_band_entry_turkey">Турция</string>
+    <string name="regional_band_entry_united_kingdom">Великобритания</string>
+    <string name="regional_band_entry_united_states">США</string>
+    <string name="regional_band_entry_user_defined">Пользовательская полоса частот</string>
+    <string name="regional_band_summary_north_america">Северная Америка (87,5–108,0 МГц с шагом в 200 кГц)</string>
+    <string name="regional_band_summary_europe">Европа (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_japan">Япония (76,0–90,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_japan_wide">Япония (широкий диапазон) (90,0–108,0 МГц с шагом в 50 кГц)</string>
+    <string name="regional_band_summary_australia">Австралия (87,7–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_austria">Австрия (87,5–108,0 МГц с шагом в 50 кГц)</string>
+    <string name="regional_band_summary_belgium">Бельгия (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_brazil">Бразилия (87,5–108,0 МГц с шагом в 200 кГц)</string>
+    <string name="regional_band_summary_china">Китай (87,0–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_czech_republic">Чешская Республика (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_denmark">Дания (87,5–108,0 МГц с шагом в 50 кГц)</string>
+    <string name="regional_band_summary_finland">Финляндия (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_france">Франция (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_germany">Германия (87,5–108,0 МГц с шагом в 50 кГц)</string>
+    <string name="regional_band_summary_greece">Греция (87,5–108,0 МГц с шагом в 50 кГц)</string>
+    <string name="regional_band_summary_hong_kong">Гонконг (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_india">Индия (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_indonesia">Индонезия (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_ireland">Ирландия (87,5–108,0 МГц с шагом в 50 кГц)</string>
+    <string name="regional_band_summary_italy">Италия (87,5–108,0 МГц с шагом в 50 кГц)</string>
+    <string name="regional_band_summary_korea">Корея (87,5–108,0 МГц с шагом в 200 кГц)</string>
+    <string name="regional_band_summary_mexico">Мексика (88,1–107,9 МГц с шагом в 200 кГц)</string>
+    <string name="regional_band_summary_netherlands">Нидерланды (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_new_zealand">Новая Зеландия (88,0–107,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_norway">Норвегия (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_poland">Польша (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_portugal">Португалия (87,5–108,0 МГц с шагом в 50 кГц)</string>
+    <string name="regional_band_summary_russia">Россия (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_singapore">Сингапур (88,0–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_slovakia">Словакия (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_spain">Испания (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_switzerland">Швейцария (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_sweden">Швеция (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_taiwan">Тайвань (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_turkey">Турция (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_united_kingdom">Великобритания (87,5–108,0 МГц с шагом в 100 кГц)</string>
+    <string name="regional_band_summary_united_states">США (88,1–107,9 МГц с шагом в 200 кГц)</string>
+    <string name="regional_band_summary_user_defined">Пользовательская полоса частот</string>
+    <string name="aud_output_mode">Режим вывода звука</string>
+    <string name="audio_type_stereo">Стерео</string>
+    <string name="audio_type_mono">Ч/Б</string>
+    <string name="record_dur">Длительность записи</string>
+    <string name="auto_select_af">Альтернативная частота</string>
+    <string name="settings_revert_defaults_title">Вернуться к заводским настройкам</string>
+    <string name="settings_revert_defaults_summary">Сбросить все настройки</string>
+    <string name="settings_revert_confirm_title">Подтвердите сброс</string>
+    <string name="settings_revert_confirm_msg">Будут удалены все настройки приложения, включая список сохраненных станций. Продолжить?</string>
+    <string name="no_storage">Для начала записи подключите SD-карту.</string>
+    <string name="preparing_sd">Подготовка SD-карты…</string>
+    <string name="access_sd_fail">Не удалось получить доступ к SD-карте</string>
+    <string name="spaceIsLow_content">На SD-карте недостаточно места. Измените настройки качества или удалите несколько файлов, чтобы освободить место.</string>
+    <string name="FMRecording_reach_size_limit">Достигнут максимальный размер файла.</string>
+    <string name="menu_scan_for_preset">Искать сохраненные станции</string>
+    <string name="fm_off">FM отключено.</string>
+    <string name="fm_call">FM не может использоваться во время вызова.</string>
+    <string name="alert_dialog_hint">Введите название</string>
+    <string name="search_dialog_title">Искать станции</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">Операция невозможна. Если проблема не исчезнет, выключите FM-радио и включите его снова.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Одновременное использование FM-радио и HDMI невозможно.</string>
+    <string name="fm_cmd_failed_call_on">Использование FM-радио во время телефонного звонка невозможно.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">dd-MM-yyyy HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Мои радиозаписи</string>
+    <string name="audio_db_album_name">Радиозаписи</string>
+    <string name="audio_db_playlist_name">Радиозаписи</string>
+    <string name="station_name">Станция:</string>
+    <string name="station_exists">Эта частота уже существует!</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="station_name_empty">Пустое название станции. Введите еще раз.</string>
+    <string name="station_name_exist">«<xliff:g id="name">%s</xliff:g>» уже используется. Введите другое название.</string>
+    <string name="rt_plus_tags">Теги</string>
+    <string name="usr_def_band_min">Минимальная частота (МГц)</string>
+    <string name="usr_def_band_max">Максимальная частота (МГц)</string>
+    <string name="chanl_spacing">Шаг каналов</string>
+    <string name="set">Установить</string>
+    <string name="user_defind_band_msg">Введите частоту в пределах 76,0–108,0 МГц с минимальным интервалом в 1 канал и отступом в 100 кГц от минимальной и максимальной частоты</string>
+    <string name="save_record_file">Файл радиозаписи сохранен в «<xliff:g id="record_file">%1$s</xliff:g>»</string>
+    <string name="fm_search_no_results">Совместимых станций не найдено</string>
+    <string name="typ_All_stations">Все станции</string>
+    <string name="typ_Culture">Культура</string>
+    <string name="typ_Current_affairs">Текущие события</string>
+    <string name="typ_Children">Детские программы</string>
+    <string name="typ_Country">Кантри</string>
+    <string name="typ_Documentary">Документальные передачи</string>
+    <string name="typ_Drama">Драма</string>
+    <string name="typ_Easy_listening">Легкая музыка</string>
+    <string name="typ_Education">Образование</string>
+    <string name="typ_Emergency">Экстренные сообщ.</string>
+    <string name="typ_Emergency_test">Тест экстренных сообщ.</string>
+    <string name="typ_Finance">Финансы</string>
+    <string name="typ_Folk">Фолк</string>
+    <string name="typ_Information">Информация</string>
+    <string name="typ_Jazz">Джаз</string>
+    <string name="typ_Light_classical">Легкая классика</string>
+    <string name="typ_Leisure">Досуг</string>
+    <string name="typ_News">Новости</string>
+    <string name="typ_National">Национальная музыка</string>
+    <string name="typ_Other">Другая музыка</string>
+    <string name="typ_Oldies">Старая музыка</string>
+    <string name="typ_Phone_in">Звонок в студию</string>
+    <string name="typ_Pop">Поп-музыка</string>
+    <string name="typ_Religion">Религия</string>
+    <string name="typ_Rock">Рок</string>
+    <string name="typ_Science">Наука</string>
+    <string name="typ_Serious_classical">Классическая музыка</string>
+    <string name="typ_Social_affairs">Социальные передачи</string>
+    <string name="typ_Sport">Спорт</string>
+    <string name="typ_Travel">Путешествия</string>
+    <string name="typ_Varied">Разное</string>
+    <string name="typ_Weather">Погода</string>
+    <string name="typ_Adult_hits">Хиты для взрослых</string>
+    <string name="typ_Classical">Классика</string>
+    <string name="typ_Classic_Rock">Классический рок</string>
+    <string name="typ_College">Студенческое радио</string>
+    <string name="typ_Foreign_language">Иностранные языки</string>
+    <string name="typ_Hiphop">Хип-хоп</string>
+    <string name="typ_Nostalgia">Ностальгия</string>
+    <string name="typ_Personality">Персоналии</string>
+    <string name="typ_Public">Общественные передачи</string>
+    <string name="typ_Religious_music">Религиозная музыка</string>
+    <string name="typ_Religious_talk">Религиозные передачи</string>
+    <string name="typ_Rhythm_and_Blues">Ритм-энд-блюз</string>
+    <string name="typ_Spanish_music">Испанская музыка</string>
+    <string name="typ_Spanish_talk">Испанские передачи</string>
+    <string name="typ_Soft">Спокойная музыка</string>
+    <string name="typ_Soft_Rock">Софт-рок</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Легкий ритм-н-блюз</string>
+    <string name="typ_Sports">Спорт</string>
+    <string name="typ_Talk">Ток-шоу</string>
+    <string name="typ_Top_40">Топ-40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-sc-rIT/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-sc-rIT/arrays.xml
index cb1457b..78c05bf 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-sc-rIT/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>Until stopped</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>45 minutos</item>
+    <item>1 ora</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-sc-rIT/strings.xml b/fmapp2/res/values-sc-rIT/strings.xml
new file mode 100644
index 0000000..1c9f5c1
--- /dev/null
+++ b/fmapp2/res/values-sc-rIT/strings.xml
@@ -0,0 +1,233 @@
+<?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">Ràdiu FM</string>
+    <string name="tx_app_name">Trasmitidore FM</string>
+    <string name="menu_scan_start">Iscansiona</string>
+    <string name="menu_scan_stop">Firma sa chirca</string>
+    <string name="menu_record_start">Registra</string>
+    <string name="menu_record_stop">Firma sa registratzione</string>
+    <string name="menu_settings">Cunfiguratziones</string>
+    <string name="menu_sleep">Suspende</string>
+    <string name="menu_sleep_cancel">Annulla sa suspensione</string>
+    <string name="menu_all_channels">Totu is canales</string>
+    <string name="menu_display_tags">Mustra is etichetas</string>
+    <string name="button_text_stop">Firma</string>
+    <string name="msg_seeking">Chirchende emitente FM\u2026</string>
+    <string name="msg_scanning">Chirchende totu is emitentes FM\u2026</string>
+    <string name="msg_scanning_pty">Chirchende \'<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">Seletzione automàtica de is preconfiguratziones</string>
+    <string name="msg_searching">Chirchende emitentes fortes pro creare una lista de precunfiguratziones\u2026</string>
+    <string name="msg_noantenna">Connete is cùfias pro impreare sa ràdiu FM</string>
+    <string name="dialog_sleep_title">Tempus de istudadu automàticu</string>
+    <string name="presetlist_select_name">Seletziona \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Agiunghe una lista noa</string>
+    <string name="dialog_presetlist_rename_title">Inserta unu nòmine</string>
+    <string name="presetlist_autoselect_title">Cunfirma sa seletzione automàtica</string>
+    <string name="preset_replace">Sostitui</string>
+    <string name="preset_tune">Sintoniza</string>
+    <string name="preset_rename">Torra a nominare</string>
+    <string name="preset_delete">Iscantzella</string>
+    <string name="preset_search">Chirca \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Banda regionale</string>
+    <string name="regional_band_entry_north_america">Amèrica de su Nord</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Giapone</string>
+    <string name="regional_band_entry_japan_wide">Giapone (largu)</string>
+    <string name="regional_band_entry_australia">Austràlia</string>
+    <string name="regional_band_entry_austria">Àustria</string>
+    <string name="regional_band_entry_belgium">Bèlgiu</string>
+    <string name="regional_band_entry_brazil">Brasile</string>
+    <string name="regional_band_entry_china">Tzina</string>
+    <string name="regional_band_entry_czech_republic">Repùblica Tzeca</string>
+    <string name="regional_band_entry_denmark">Danimarca</string>
+    <string name="regional_band_entry_finland">Finlàndia</string>
+    <string name="regional_band_entry_france">Frantza</string>
+    <string name="regional_band_entry_germany">Germània</string>
+    <string name="regional_band_entry_greece">Grètzia</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Ìndia</string>
+    <string name="regional_band_entry_indonesia">Indonèsia</string>
+    <string name="regional_band_entry_ireland">Irlanda</string>
+    <string name="regional_band_entry_italy">Itàlia</string>
+    <string name="regional_band_entry_korea">Corea</string>
+    <string name="regional_band_entry_mexico">Mèssicu</string>
+    <string name="regional_band_entry_netherlands">Paisos Bassos</string>
+    <string name="regional_band_entry_new_zealand">Noa Zelanda</string>
+    <string name="regional_band_entry_norway">Norvègia</string>
+    <string name="regional_band_entry_poland">Polònia</string>
+    <string name="regional_band_entry_portugal">Portugallu</string>
+    <string name="regional_band_entry_russia">Rùssia</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Islovàchia</string>
+    <string name="regional_band_entry_spain">Ispàgna</string>
+    <string name="regional_band_entry_switzerland">Isvìtzera</string>
+    <string name="regional_band_entry_sweden">Isvètzia</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turchia</string>
+    <string name="regional_band_entry_united_kingdom">Regnu Unidu</string>
+    <string name="regional_band_entry_united_states">Istados Unidos</string>
+    <string name="regional_band_entry_user_defined">Banda definida dae s\'utente</string>
+    <string name="regional_band_summary_north_america">Amèrica de su Nord (dae 87.5 a 108.0 MHz in intervallos de 200 kHz)</string>
+    <string name="regional_band_summary_europe">Europa (dae 87.5 a 108.0 MHz in intervallos de 100 kHz)</string>
+    <string name="regional_band_summary_japan">Giapone (dae 76.0 a 90.0 MHz in intervallos de 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Giapone (largu) (dae 90.0 a 108.0 MHz in intervallos de 50 kHz)</string>
+    <string name="regional_band_summary_australia">Austràlia (dae 87.7 a 108.0 MHz in intervallos de 100 kHz)</string>
+    <string name="regional_band_summary_austria">Àustria (dae 87.5 a 108.0 MHz in intervallos de 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Bèlgiu (dae 87.5 a 108.0 MHz in intervallos de 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brasile (dae 87.5 a 108.0 MHz in intervallos de 200 kHz)</string>
+    <string name="regional_band_summary_china">Tzina (dae 87.0 a 108.0 MHz in intervallos de 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Repùblica Tzeca (dae 87.5 a 108.0 MHz in intervallos de 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Danimarca (dae 87.5MHz a 108.0MHz in intervallos de 50KHz)</string>
+    <string name="regional_band_summary_finland">Finlàndia (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_france">Frantza (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_germany">Germània (dae 87.5MHz a 108.0MHz in intervallos de 50KHz)</string>
+    <string name="regional_band_summary_greece">Grètzia (dae 87.5 a 108.0 MHz in intervallos de 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_india">Ìndia (dae 87,5MHz a 108,0MHz in intervallos de 100 KHz)</string>
+    <string name="regional_band_summary_indonesia">Indonèsia (dae 87,5MHz a 108,0MHz in intervallos de 100 KHz)</string>
+    <string name="regional_band_summary_ireland">Irlanda (dae 87.5MHz a 108.0MHz in intervallos de 50KHz)</string>
+    <string name="regional_band_summary_italy">Itàlia (dae 87.5MHz a 108.0MHz in intervallos de 50KHz)</string>
+    <string name="regional_band_summary_korea">Corea (dae 87.5MHz a 108.0MHz in intervallos de 200KHz)</string>
+    <string name="regional_band_summary_mexico">Mèssicu (dae 88.1MHz a 107.9MHz in intervallos de 200KHz)</string>
+    <string name="regional_band_summary_netherlands">Olanda (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_new_zealand">Noa Zelanda (dae 88.0 a 107.0 MHz in intervallos de 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norvègia (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_poland">Polònia (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_portugal">Portogallu (dae 87.5MHz a 108.0MHz in intervallos de 50KHz)</string>
+    <string name="regional_band_summary_russia">Rùssia (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_singapore">Singapore (dae 88.0MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_slovakia">Islovàchia (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_spain">Ispagna (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_switzerland">Isvìtzera (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_sweden">Isvètzia (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_turkey">Turchia (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_united_kingdom">Regnu Unidu (dae 87.5MHz a 108.0MHz in intervallos de 100KHz)</string>
+    <string name="regional_band_summary_united_states">Istados Unidos (dae 88.1MHz a 107.9MHz in intervallos de 200KHz)</string>
+    <string name="regional_band_summary_user_defined">Banda definida dae s\'utente</string>
+    <string name="aud_output_mode">Modalidade de essida de su sonu</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Durada de sa registratzione</string>
+    <string name="auto_select_af">Frecuèntzia alternativa</string>
+    <string name="settings_revert_defaults_title">Torra a is valores predefinidos de fàbrica</string>
+    <string name="settings_revert_defaults_summary">Riprìstina totu is cunfiguratziones</string>
+    <string name="settings_revert_confirm_title">Cunfirma su riprìstinu</string>
+    <string name="settings_revert_confirm_msg">Custu at a cantzellare totu is cunfiguratziones de s\'aplicatzione, fintzas is precunfiguratziones sarvadas. Boles sighire?</string>
+    <string name="no_storage">Monta s\'ischeda SD in antis de cumintzare a registrare.</string>
+    <string name="preparing_sd">Preparende s\'ischeda SD\u2026</string>
+    <string name="access_sd_fail">Impossìbile atzèdere a s\'ischeda SD.</string>
+    <string name="spaceIsLow_content">S\'ischeda SD tua est abarrende chene logu. Càmbia sa cunfiguratzione de calidade o cantzella immàgines o àteros archìvios pro liberare ispàtziu.</string>
+    <string name="FMRecording_reach_size_limit">Lìmite de mannària cròmpidu.</string>
+    <string name="menu_scan_for_preset">Chirca preconfiguratziones</string>
+    <string name="fm_off">Fm istudadu.</string>
+    <string name="fm_call">Non faghet a impreare s\'FM cando s\'est in una mutida.</string>
+    <string name="alert_dialog_hint">Inserta unu nòmine</string>
+    <string name="search_dialog_title">Iscanziona emitentes</string>
+    <string name="fm_command_timeout_title">Tempus iscadidu</string>
+    <string name="fm_tune_timeout_msg">Nissuna risposta retzida dae s\'emitente FM. Si su problema abarrat, istuda s\'FM e torra·dda a allùghere.</string>
+    <string name="fm_command_failed_title">Faddina in s\'operatzione de FM</string>
+    <string name="fm_cmd_failed_msg">Faddina in s\'operatzione de FM. Si su problema abarrat, istuda s\'FM e torra·dda a allùghere.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Faddina in s\'operatzione de FM. S\'FM e s\'HDMI no sunt cumpatìbiles in manera simultànea.</string>
+    <string name="fm_cmd_failed_call_on">Faddina in s\'operatzione de FM. S\'àudio de s\'FM no est permìtidu cando s\'est in una mutida.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Registratziones de FM mias</string>
+    <string name="audio_db_album_name">Registratziones de FM</string>
+    <string name="audio_db_playlist_name">Registratziones de FM</string>
+    <string name="station_name">Emitente:</string>
+    <string name="station_exists">Custa frecuèntzia esistit giai.</string>
+    <string name="station_list_delete_station">Cantzella: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Seguru chi boles cantzellare \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Su nòmine de s\'emitente est bòidu, inserta·ddu torra.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' est giai impreadu, inserta unu nòmine diferente.</string>
+    <string name="rt_plus_tags">Etichetas</string>
+    <string name="usr_def_band_min">Frecuèntzia prus bàscia (MHz)</string>
+    <string name="usr_def_band_max">Frecuèntzia prus arta (MHz)</string>
+    <string name="chanl_spacing">Separatzione intre canales</string>
+    <string name="set">Cunfigura</string>
+    <string name="user_defind_band_msg">Inserta una frecuèntzia intre 76.0 e 108.0 MHz cun a su mancu unu canale e cun 100 kHz de ispàtziu intre sa frecuèntzia mìnima e cussa màssima</string>
+    <string name="save_record_file">S\'archìviu FM registradu est istadu sarvadu in \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nissuna emitente cumpatìbile agatada</string>
+    <string name="typ_All_stations">Totu is emitentes</string>
+    <string name="typ_Culture">Cultura</string>
+    <string name="typ_Current_affairs">Atualidade</string>
+    <string name="typ_Children">Programmas pro sa pitzocalla</string>
+    <string name="typ_Country">Mùsica country</string>
+    <string name="typ_Documentary">Documentàrios</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Mùsica praghile</string>
+    <string name="typ_Education">Iscola e formatzione</string>
+    <string name="typ_Emergency">Emergèntzia</string>
+    <string name="typ_Emergency_test">Prova de emergèntzia</string>
+    <string name="typ_Finance">Finàntzias</string>
+    <string name="typ_Folk">Mùsica folk</string>
+    <string name="typ_Information">Informatzione</string>
+    <string name="typ_Jazz">Mùsica jazz</string>
+    <string name="typ_Light_classical">Clàssica lèbia</string>
+    <string name="typ_Leisure">Tempus lìberu</string>
+    <string name="typ_News">Noas</string>
+    <string name="typ_National">Mùsica natzionale</string>
+    <string name="typ_Other">Àteras mùsicas</string>
+    <string name="typ_Oldies">Mùsica antiga</string>
+    <string name="typ_Phone_in">Cun mutidas</string>
+    <string name="typ_Pop">Mùsica pop</string>
+    <string name="typ_Religion">Religione</string>
+    <string name="typ_Rock">Mùsica rock</string>
+    <string name="typ_Science">Sièntzia</string>
+    <string name="typ_Serious_classical">Clàssica sèria</string>
+    <string name="typ_Social_affairs">Temas sotziales</string>
+    <string name="typ_Sport">Isport</string>
+    <string name="typ_Travel">Biàgios</string>
+    <string name="typ_Varied">Vàrios</string>
+    <string name="typ_Weather">Meteorologia</string>
+    <string name="typ_Adult_hits">Hits de adultos</string>
+    <string name="typ_Classical">Clàssica</string>
+    <string name="typ_Classic_Rock">Rock clàssicu</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Lìnguas istràngias</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personalidades</string>
+    <string name="typ_Public">Pùblicas</string>
+    <string name="typ_Religious_music">Mùsica religiosa</string>
+    <string name="typ_Religious_talk">Arresonos religiosos</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Mùsica ispànica</string>
+    <string name="typ_Spanish_talk">Arresonos in castillianu</string>
+    <string name="typ_Soft">Pro si rilassare</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Isport</string>
+    <string name="typ_Talk">Arresonos</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-si/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-si/arrays.xml
index cb1457b..1d00d92 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-si/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>ත්‍රිමාන</item>
+    <item>ඒකීය</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-si/strings.xml b/fmapp2/res/values-si/strings.xml
new file mode 100644
index 0000000..2b16249
--- /dev/null
+++ b/fmapp2/res/values-si/strings.xml
@@ -0,0 +1,111 @@
+<?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 රේඩියෝව</string>
+    <string name="tx_app_name">FM සම්ප්‍රේෂකය</string>
+    <string name="menu_scan_start">සුපිරික්සන්න</string>
+    <string name="menu_scan_stop">සෙවීම නවත්වන්න</string>
+    <string name="menu_record_stop">රෙකෝඩනය නවත්වන්න</string>
+    <string name="menu_sleep">නිදියන්න</string>
+    <string name="menu_sleep_cancel">නින්ද අවලංගු කරන්න</string>
+    <string name="menu_all_channels">සියලුම නාලිකා</string>
+    <string name="menu_display_tags">ටැගයන් පෙන්වන්න</string>
+    <string name="button_text_stop">නවත්වන්න</string>
+    <string name="msg_noantenna">කරුණාකර FM රේඩියෝව භාවිතා කිරීමට කන්යෝමුවක් පේනුගත කරන්න</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' තෝරන්න</string>
+    <string name="presetlist_add_new">නව ලැයිස්තුවක් එකතු කරන්න</string>
+    <string name="preset_replace">ප්‍රතිස්ථාපනය</string>
+    <string name="preset_tune">තනුව</string>
+    <string name="preset_rename">යලි නම් තබන්න</string>
+    <string name="preset_delete">මකන්න</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' සඳහා සොයන්න</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">ප්‍රාදේශීය කලාපය</string>
+    <string name="regional_band_entry_north_america">උතුරු අමෙරිකාව</string>
+    <string name="regional_band_entry_europe">යුරෝපය</string>
+    <string name="regional_band_entry_japan">ජපානය</string>
+    <string name="regional_band_entry_japan_wide">ජපානය (ව්‍යාප්ත)</string>
+    <string name="regional_band_entry_australia">ඕස්ට්‍රේලියාව</string>
+    <string name="regional_band_entry_austria">ඕස්ට්‍රියාව</string>
+    <string name="regional_band_entry_belgium">බෙල්ජියම</string>
+    <string name="regional_band_entry_brazil">බ්‍රසීලය</string>
+    <string name="regional_band_entry_china">චීනය</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">ඩෙන්මාර්කය</string>
+    <string name="regional_band_entry_finland">ෆින්ලන්තය</string>
+    <string name="regional_band_entry_france">ප්‍රංශය</string>
+    <string name="regional_band_entry_germany">ජර්මනිය</string>
+    <string name="regional_band_entry_greece">ග්‍රීසිය</string>
+    <string name="regional_band_entry_hong_kong">හොංකොං</string>
+    <string name="regional_band_entry_india">ඉන්දියාව</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">අයර්ලන්තය</string>
+    <string name="regional_band_entry_italy">ඉතාලිය</string>
+    <string name="regional_band_entry_korea">කොරියාව</string>
+    <string name="regional_band_entry_mexico">මෙක්සිකෝව</string>
+    <string name="regional_band_entry_netherlands">නෙදර්ලන්තය</string>
+    <string name="regional_band_entry_new_zealand">නවසීලන්තය</string>
+    <string name="regional_band_entry_norway">නෝර්වීජියාව</string>
+    <string name="regional_band_entry_poland">පෝලන්තය</string>
+    <string name="regional_band_entry_portugal">පෘතුගාලය</string>
+    <string name="regional_band_entry_russia">රුසියාව</string>
+    <string name="regional_band_entry_singapore">සිංගප්පූරුව</string>
+    <string name="regional_band_entry_slovakia">ස්ලෝවේනියාව</string>
+    <string name="regional_band_entry_spain">ස්පාඤ්ඤය</string>
+    <string name="regional_band_entry_switzerland">ස්විස්ටර්ලන්තය</string>
+    <string name="regional_band_entry_sweden">ස්වීඩනය</string>
+    <string name="regional_band_entry_taiwan">තායිවානය</string>
+    <string name="regional_band_entry_turkey">තුර්කිය</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">එක්සත් ජනපදය</string>
+    <string name="regional_band_entry_user_defined">පරිශීලක නිශ්චිත කලාපය</string>
+    <string name="regional_band_summary_user_defined">පරිශීලක නිශ්චිත කලාපය</string>
+    <string name="aud_output_mode">ශ්‍රව්‍ය ප්‍රතිදාන ප්‍රකාරය</string>
+    <string name="audio_type_stereo">ත්‍රිමාන</string>
+    <string name="record_dur">රෙකෝඩන කාලමාත්‍රාව</string>
+    <string name="settings_revert_defaults_title">කර්මාන්තශාලා පෙරනිමි යලි පිහිටුවන්න</string>
+    <string name="settings_revert_defaults_summary">සියලු සැකසීම් ප්‍රත්‍යාරම්භ කරන්න</string>
+    <string name="no_storage">රෙකෝඩනය ඇරඹීමට පෙර SD කාඩ්පත ආරූඩ කරන්න.</string>
+    <string name="spaceIsLow_content">ඔබගේ SD කාඩ්පතෙහි ආචයනයේ ඉඩ අඩුවෙමින් පවතී. ඉඩ වැඩි කර ගැනීමට ගුණාත්මක සැකසීම වෙනස් කරන්න නැතිනම් අනෙක් ගොනු කිහිපයක් මකන්න.</string>
+    <string name="menu_scan_for_preset">පෙරසැකසීම් සඳහා සුපිරික්සන්න</string>
+    <string name="alert_dialog_hint">නමක් ඇතුල් කරන්න</string>
+    <string name="search_dialog_title">සේවා ස්ථාන සුපිරික්සන්න</string>
+    <string name="fm_command_timeout_title">කල්ඉකුත්වීම</string>
+    <string name="fm_tune_timeout_msg">FM සේවා ස්ථානය සුසර කිරීමට කිසිඳු ප්‍රතිචාරයක් නොලැබුණි. ප්‍රශ්නය දිගටම තිබුණහොත්, කරුණාකර FM ක්‍රියා විරහිත කර නැවත සක්‍රීය කරන්න.</string>
+    <string name="fm_command_failed_title">FM ක්‍රියාකාරීත්වය බිඳවැටුණි</string>
+    <string name="fm_cmd_failed_msg">FM ක්‍රියාකාරීත්වය බිඳවැටුණි. ප්‍රශ්නය දිගටම තිබුණහොත්, කරුණාකර FM ක්‍රියා විරහිත කර නැවත සක්‍රීය කරන්න.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM ක්‍රියාකාරීත්වය බිඳවැටුණි. FM සහ HDMI සංගමනය සහාය නොදක්වයි.</string>
+    <string name="fm_cmd_failed_call_on">FM ක්‍රියාකාරීත්වය බිඳවැටුණි. ඇමතුම් අතරතුර FM ශ්‍රව්‍ය අනුමත නැත.</string>
+    <string name="station_exists">මෙම සංඛ්‍යාතය දැනටමත් පවතී!</string>
+    <string name="station_list_delete_station"><xliff:g id="name">%s</xliff:g> මකන්න</string>
+    <string name="station_name_empty">සේවා ස්ථානයේ නම හිස්ය, කරුණාකර නැවත ආදානය කරන්න.</string>
+    <string name="rt_plus_tags">ටැගයන්</string>
+    <string name="chanl_spacing">නාලිකා පරතරය</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-sk/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-sk/arrays.xml
index cb1457b..358d78b 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-sk/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minút</item>
+    <item>15 minút</item>
+    <item>30 minút</item>
+    <item>Do zastavenia</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minút</item>
+    <item>30 minút</item>
+    <item>45 minút</item>
+    <item>1 hodina</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-sk/strings.xml b/fmapp2/res/values-sk/strings.xml
new file mode 100644
index 0000000..64e44e4
--- /dev/null
+++ b/fmapp2/res/values-sk/strings.xml
@@ -0,0 +1,233 @@
+<?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 rádio</string>
+    <string name="tx_app_name">FM vysielač</string>
+    <string name="menu_scan_start">Skenovať</string>
+    <string name="menu_scan_stop">Zastaviť vyhľadávanie</string>
+    <string name="menu_record_start">Nahrať</string>
+    <string name="menu_record_stop">Zastaviť nahrávanie</string>
+    <string name="menu_settings">Nastavenia</string>
+    <string name="menu_sleep">Spánok</string>
+    <string name="menu_sleep_cancel">Zrušiť spánok</string>
+    <string name="menu_all_channels">Všetky kanály</string>
+    <string name="menu_display_tags">Zobraziť značky</string>
+    <string name="button_text_stop">Zastaviť</string>
+    <string name="msg_seeking">Vyhľadávanie FM staníc\u2026</string>
+    <string name="msg_scanning">Skenovanie všetkých FM staníc\u2026</string>
+    <string name="msg_scanning_pty">Skenovanie \'<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">Automatický výber predvolieb</string>
+    <string name="msg_searching">Vyhľadávanie silných staníc pre vytvorenie zoznamu predvolieb\u2026</string>
+    <string name="msg_noantenna">Prosím, pripojte slúchadlá, ak chcete použiť FM rádio</string>
+    <string name="dialog_sleep_title">Doba spánku pre automatické vypnutie</string>
+    <string name="presetlist_select_name">Vybrať \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Pridať nový zoznam</string>
+    <string name="dialog_presetlist_rename_title">Zadajte názov</string>
+    <string name="presetlist_autoselect_title">Potvrdiť automatický výber</string>
+    <string name="preset_replace">Nahradiť</string>
+    <string name="preset_tune">Naladiť</string>
+    <string name="preset_rename">Premenovať</string>
+    <string name="preset_delete">Vymazať</string>
+    <string name="preset_search">Vyhľadať \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Pásmo regiónu</string>
+    <string name="regional_band_entry_north_america">Severná Amerika</string>
+    <string name="regional_band_entry_europe">Európa</string>
+    <string name="regional_band_entry_japan">Japansko</string>
+    <string name="regional_band_entry_japan_wide">Japonsko (Široké)</string>
+    <string name="regional_band_entry_australia">Austrália</string>
+    <string name="regional_band_entry_austria">Rakúsko</string>
+    <string name="regional_band_entry_belgium">Belgicko</string>
+    <string name="regional_band_entry_brazil">Brazília</string>
+    <string name="regional_band_entry_china">Čína</string>
+    <string name="regional_band_entry_czech_republic">Česká republika</string>
+    <string name="regional_band_entry_denmark">Dánsko</string>
+    <string name="regional_band_entry_finland">Fínsko</string>
+    <string name="regional_band_entry_france">Francúzsko</string>
+    <string name="regional_band_entry_germany">Nemecko</string>
+    <string name="regional_band_entry_greece">Grécko</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonézia</string>
+    <string name="regional_band_entry_ireland">Írsko</string>
+    <string name="regional_band_entry_italy">Taliansko</string>
+    <string name="regional_band_entry_korea">Kórea</string>
+    <string name="regional_band_entry_mexico">Mexiko</string>
+    <string name="regional_band_entry_netherlands">Holandsko</string>
+    <string name="regional_band_entry_new_zealand">Nový Zéland</string>
+    <string name="regional_band_entry_norway">Nórsko</string>
+    <string name="regional_band_entry_poland">Poľsko</string>
+    <string name="regional_band_entry_portugal">Portugalsko</string>
+    <string name="regional_band_entry_russia">Rusko</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Slovensko</string>
+    <string name="regional_band_entry_spain">Španielsko</string>
+    <string name="regional_band_entry_switzerland">Švajčiarsko</string>
+    <string name="regional_band_entry_sweden">Švédsko</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turecko</string>
+    <string name="regional_band_entry_united_kingdom">Spojené kráľovstvo</string>
+    <string name="regional_band_entry_united_states">Spojené štáty</string>
+    <string name="regional_band_entry_user_defined">Používateľom určené pásmo</string>
+    <string name="regional_band_summary_north_america">Severná Amerika (87.5MHz až 108.0MHz v 200 KHz krokoch)</string>
+    <string name="regional_band_summary_europe">Európa (87.5MHz až 108.0MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_japan">Japonsko (76.0MHz až 90.0MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_japan_wide">Japonsko (rozšírené) (90.0MHz až 108.0MHz v 50 KHz krokoch)</string>
+    <string name="regional_band_summary_australia">Austrália (87.7 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_austria">Rakúsko (87,5 MHz až 108.0 MHz v 50 KHz krokoch)</string>
+    <string name="regional_band_summary_belgium">Belgicko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_brazil">Brazília (87,5 MHz až 108.0 MHz v 200 KHz krokoch)</string>
+    <string name="regional_band_summary_china">Čína (87.0 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_czech_republic">Česká republika (87.5 až 108.0 MHz v 100 kHz krokoch)</string>
+    <string name="regional_band_summary_denmark">Dánsko (87,5 MHz až 108.0 MHz v 50 KHz krokoch)</string>
+    <string name="regional_band_summary_finland">Fínsko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_france">Francúzsko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_germany">Nemecko (87,5 MHz až 108.0 MHz v 50 KHz krokoch)</string>
+    <string name="regional_band_summary_greece">Grécko (87,5 MHz až 108.0 MHz v 50 KHz krokoch)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_india">India (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_indonesia">Indonézia (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_ireland">Írsko (87,5 MHz až 108.0 MHz v 50 KHz krokoch)</string>
+    <string name="regional_band_summary_italy">Taliansko (87,5 MHz až 108.0 MHz v 50 KHz krokoch)</string>
+    <string name="regional_band_summary_korea">Kórea (87,5 MHz až 108.0 MHz v 200 KHz krokoch)</string>
+    <string name="regional_band_summary_mexico">Mexiko (88.1 MHz až 107,9 MHz v 200 KHz krokoch)</string>
+    <string name="regional_band_summary_netherlands">Holandsko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_new_zealand">Nový Zéland (88,0 MHz až 107.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_norway">Nórsko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_poland">Poľsko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_portugal">Portugalsko (87,5 MHz až 108.0 MHz v 50 KHz krokoch)</string>
+    <string name="regional_band_summary_russia">Rusko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_singapore">Singapur (88,0 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_slovakia">Slovensko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_spain">Španielsko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_switzerland">Švajčiarsko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_sweden">Švédsko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_turkey">Turecko (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_united_kingdom">Spojené kráľovstvo (87,5 MHz až 108.0 MHz v 100 KHz krokoch)</string>
+    <string name="regional_band_summary_united_states">Spojené štáty (88.1 MHz až 107,9 MHz v 200 KHz krokoch)</string>
+    <string name="regional_band_summary_user_defined">Užívateľom definované pásmo</string>
+    <string name="aud_output_mode">Režim zvukového výstupu</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Dĺžka záznamu</string>
+    <string name="auto_select_af">Alternatívna frekvencia</string>
+    <string name="settings_revert_defaults_title">Obnoviť továrenské nastavenia</string>
+    <string name="settings_revert_defaults_summary">Obnoviť všetky nastavenia</string>
+    <string name="settings_revert_confirm_title">Potvrdiť obnovenie</string>
+    <string name="settings_revert_confirm_msg">Toto vymaže všetky nastavenia aplikácie, vrátane uložených predvolieb. Pokračovať?</string>
+    <string name="no_storage">Pripojte kartu SD pred spustením nahrávania.</string>
+    <string name="preparing_sd">Príprava karty SD\u2026</string>
+    <string name="access_sd_fail">Nepodarilo sa získať prístup ku karte SD.</string>
+    <string name="spaceIsLow_content">Na Vašej karte SD nie je dostatok voľného miesta. Zmeňte nastavenie kvality alebo zmažte niektoré obrázky alebo iné súbory.</string>
+    <string name="FMRecording_reach_size_limit">Dosiahol sa limit veľkosti.</string>
+    <string name="menu_scan_for_preset">Skenovať predvoľby</string>
+    <string name="fm_off">FM rádio je vypnuté.</string>
+    <string name="fm_call">FM rádio nie je možné používať počas volania.</string>
+    <string name="alert_dialog_hint">Zadajte názov</string>
+    <string name="search_dialog_title">Skenovať stanice</string>
+    <string name="fm_command_timeout_title">Časový limit</string>
+    <string name="fm_tune_timeout_msg">Žiadna odpoveď od ladenej stanice. Ak problém pretrváva, vypnite FM rádio a opätovne ho zapnite.</string>
+    <string name="fm_command_failed_title">FM operácia zlyhala</string>
+    <string name="fm_cmd_failed_msg">FM operácia zlyhala. Ak problém pretrváva, vypnite FM rádio a opätovne ho zapnite.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM operácia zlyhala. Používanie FM rádia a HDMI nie je podporované.</string>
+    <string name="fm_cmd_failed_call_on">FM operácia zlyhala. Zvuk z FM rádia počas prebiehajúceho hovoru nie je povolený.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Moje nahrávky FM</string>
+    <string name="audio_db_album_name">Nahrávky FM</string>
+    <string name="audio_db_playlist_name">Nahrávky FM</string>
+    <string name="station_name">Stanica:</string>
+    <string name="station_exists">Táto frekvencia už existuje!</string>
+    <string name="station_list_delete_station">Odstrániť: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Chcete vymazať \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Názov stanice je prázdny, prosím, zadajte ho znova.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' sa už používa, prosím, zadajte iný názov.</string>
+    <string name="rt_plus_tags">Značky</string>
+    <string name="usr_def_band_min">Najnižšie frekvencia (MHz)</string>
+    <string name="usr_def_band_max">Najvyššia frekvencia (MHz)</string>
+    <string name="chanl_spacing">Oddeľovač kanálov</string>
+    <string name="set">Nastaviť</string>
+    <string name="user_defind_band_msg">Zadajte frekvenciu od 76,0 do 108,0 MHz s minimálne 1 kanálovým odstupom a 100 KHz priestorom medzi min a max frekvenciou</string>
+    <string name="save_record_file">Nahraný súbor bol uložený do \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nenašli sa žiadne kompatibilné stanice</string>
+    <string name="typ_All_stations">Všetky stanice</string>
+    <string name="typ_Culture">Kultúra</string>
+    <string name="typ_Current_affairs">Publicistika</string>
+    <string name="typ_Children">Detské programy</string>
+    <string name="typ_Country">Country</string>
+    <string name="typ_Documentary">Dokumentárne</string>
+    <string name="typ_Drama">Dráma</string>
+    <string name="typ_Easy_listening">Jemné melódie</string>
+    <string name="typ_Education">Vzdelávacie</string>
+    <string name="typ_Emergency">Núdzové</string>
+    <string name="typ_Emergency_test">Núdzový test</string>
+    <string name="typ_Finance">Financie</string>
+    <string name="typ_Folk">Ľudová hudba</string>
+    <string name="typ_Information">Informácie</string>
+    <string name="typ_Jazz">Jazzová hudba</string>
+    <string name="typ_Light_classical">Jemná klasika</string>
+    <string name="typ_Leisure">Voľný čas</string>
+    <string name="typ_News">Správy</string>
+    <string name="typ_National">Národná hudba</string>
+    <string name="typ_Other">Ostatné žánre</string>
+    <string name="typ_Oldies">Staré</string>
+    <string name="typ_Phone_in">Telefonické</string>
+    <string name="typ_Pop">Populárna hudba</string>
+    <string name="typ_Religion">Náboženské</string>
+    <string name="typ_Rock">Rocková hudba</string>
+    <string name="typ_Science">Veda</string>
+    <string name="typ_Serious_classical">Vážna hudba</string>
+    <string name="typ_Social_affairs">Sociálne veci</string>
+    <string name="typ_Sport">Šport</string>
+    <string name="typ_Travel">Cestovanie</string>
+    <string name="typ_Varied">Rôzne</string>
+    <string name="typ_Weather">Počasie</string>
+    <string name="typ_Adult_hits">Hity pre dospelých</string>
+    <string name="typ_Classical">Klasická hudba</string>
+    <string name="typ_Classic_Rock">Klasický Rock</string>
+    <string name="typ_College">Univerzitné</string>
+    <string name="typ_Foreign_language">Cudzí jazyk</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Osobnosti</string>
+    <string name="typ_Public">Verejné</string>
+    <string name="typ_Religious_music">Náboženská hudba</string>
+    <string name="typ_Religious_talk">Náboženské diskusie</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Španielska hudba</string>
+    <string name="typ_Spanish_talk">Španielske rozhovory</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm a Blues</string>
+    <string name="typ_Sports">Športy</string>
+    <string name="typ_Talk">Diskusie</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-sl/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-sl/arrays.xml
index cb1457b..66fa6ad 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-sl/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minut</item>
+    <item>15 minut</item>
+    <item>30 minut</item>
+    <item>Dokler ni zaustavljeno</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minut</item>
+    <item>30 minut</item>
+    <item>45 minut</item>
+    <item>1 ura</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-sl/strings.xml b/fmapp2/res/values-sl/strings.xml
new file mode 100644
index 0000000..2015078
--- /dev/null
+++ b/fmapp2/res/values-sl/strings.xml
@@ -0,0 +1,233 @@
+<?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">Radio FM</string>
+    <string name="tx_app_name">Oddajnik FM</string>
+    <string name="menu_scan_start">Preišči</string>
+    <string name="menu_scan_stop">Ustavi iskanje</string>
+    <string name="menu_record_start">Snemaj</string>
+    <string name="menu_record_stop">Ustavi snemanje</string>
+    <string name="menu_settings">Nastavitve</string>
+    <string name="menu_sleep">Spanje</string>
+    <string name="menu_sleep_cancel">Prekliči spanje</string>
+    <string name="menu_all_channels">Vsi kanali</string>
+    <string name="menu_display_tags">Prikaži oznake</string>
+    <string name="button_text_stop">Ustavi</string>
+    <string name="msg_seeking">Iskanje postaje FM \u2026</string>
+    <string name="msg_scanning">Preiskovanje vseh postaj FM \u2026</string>
+    <string name="msg_scanning_pty">Preiskovanje za \'<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">Samodejno izbiranje prednastavitev</string>
+    <string name="msg_searching">Iskanje močnih postaj za ustvarjanje seznama prednastavitev \u2026</string>
+    <string name="msg_noantenna">Za uporabo radia FM priključite slušalke</string>
+    <string name="dialog_sleep_title">Čas samodejnega izklopa spanja</string>
+    <string name="presetlist_select_name">Izberi \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Dodaj nov seznam</string>
+    <string name="dialog_presetlist_rename_title">Vnesite ime</string>
+    <string name="presetlist_autoselect_title">Potrdi samodejno izbiro</string>
+    <string name="preset_replace">Nadomesti</string>
+    <string name="preset_tune">Naravnaj</string>
+    <string name="preset_rename">Preimenuj</string>
+    <string name="preset_delete">Izbriši</string>
+    <string name="preset_search">Poišči \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Območni pas</string>
+    <string name="regional_band_entry_north_america">Severna Amerika</string>
+    <string name="regional_band_entry_europe">Evropa</string>
+    <string name="regional_band_entry_japan">Japonska</string>
+    <string name="regional_band_entry_japan_wide">Japonska (široki)</string>
+    <string name="regional_band_entry_australia">Avstralija</string>
+    <string name="regional_band_entry_austria">Avstrija</string>
+    <string name="regional_band_entry_belgium">Belgija</string>
+    <string name="regional_band_entry_brazil">Brazilija</string>
+    <string name="regional_band_entry_china">Kitajska</string>
+    <string name="regional_band_entry_czech_republic">Češka republika</string>
+    <string name="regional_band_entry_denmark">Danska</string>
+    <string name="regional_band_entry_finland">Finska</string>
+    <string name="regional_band_entry_france">Francija</string>
+    <string name="regional_band_entry_germany">Nemčija</string>
+    <string name="regional_band_entry_greece">Grčija</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indija</string>
+    <string name="regional_band_entry_indonesia">Indonezija</string>
+    <string name="regional_band_entry_ireland">Irska</string>
+    <string name="regional_band_entry_italy">Italija</string>
+    <string name="regional_band_entry_korea">Koreja</string>
+    <string name="regional_band_entry_mexico">Mehika</string>
+    <string name="regional_band_entry_netherlands">Nizozemska</string>
+    <string name="regional_band_entry_new_zealand">Nova Zelandija</string>
+    <string name="regional_band_entry_norway">Norveška</string>
+    <string name="regional_band_entry_poland">Poljska</string>
+    <string name="regional_band_entry_portugal">Portugalska</string>
+    <string name="regional_band_entry_russia">Rusija</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Slovaška</string>
+    <string name="regional_band_entry_spain">Španija</string>
+    <string name="regional_band_entry_switzerland">Švica</string>
+    <string name="regional_band_entry_sweden">Švedska</string>
+    <string name="regional_band_entry_taiwan">Tajvan</string>
+    <string name="regional_band_entry_turkey">Turčija</string>
+    <string name="regional_band_entry_united_kingdom">Združeno kraljestvo</string>
+    <string name="regional_band_entry_united_states">Združene države</string>
+    <string name="regional_band_entry_user_defined">Uporabniško določen pas</string>
+    <string name="regional_band_summary_north_america">Severna Amerika (od 87,5 MHz do 108,0 MHz v 200 kHz korakih)</string>
+    <string name="regional_band_summary_europe">Evropa (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_japan">Japonska (od 76,0 MHz do 90,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_japan_wide">Japonska (široki) (od 90,0 MHz do 108,0 MHz v 50 kHz korakih)</string>
+    <string name="regional_band_summary_australia">Avstralija (od 87,7 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_austria">Avstrija (od 87,5 MHz do 108,0 MHz v 50 kHz korakih)</string>
+    <string name="regional_band_summary_belgium">Belgija (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_brazil">Brazilija (od 87,5 MHz do 108,0 MHz v 200 kHz korakih)</string>
+    <string name="regional_band_summary_china">Kitajska (od 87,0 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_czech_republic">Češka republika (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_denmark">Danska (od 87,5 MHz do 108,0 MHz v 50 kHz korakih)</string>
+    <string name="regional_band_summary_finland">Finska (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_france">Francija (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_germany">Nemčija (od 87,5 MHz do 108,0 MHz v 50 kHz korakih)</string>
+    <string name="regional_band_summary_greece">Grčija (od 87,5 MHz do 108,0 MHz v 50 kHz korakih)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_india">Indija (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_indonesia">Indonezija (87.5 MHz do 108.0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_ireland">Irska (od 87,5 MHz do 108,0 MHz v 50 kHz korakih)</string>
+    <string name="regional_band_summary_italy">Italija (od 87,5 MHz do 108,0 MHz v 50 kHz korakih)</string>
+    <string name="regional_band_summary_korea">Koreja (od 87,5 MHz do 108,0 MHz v 200 kHz korakih)</string>
+    <string name="regional_band_summary_mexico">Mehika (od 88,1 MHz do 107,9 MHz v 200 kHz korakih)</string>
+    <string name="regional_band_summary_netherlands">Nizozemska (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_new_zealand">Nova Zelandija (od 88,0 MHz do 107,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_norway">Norveška (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_poland">Poljska (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_portugal">Portugalska (od 87,5 MHz do 108,0 MHz v 50 kHz korakih)</string>
+    <string name="regional_band_summary_russia">Rusija (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_singapore">Singapur (od 88,0 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_slovakia">Slovaška (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_spain">Španija (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_switzerland">Švica (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_sweden">Švedska (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_taiwan">Tajvan (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_turkey">Turčija (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_united_kingdom">Združeno kraljestvo (od 87,5 MHz do 108,0 MHz v 100 kHz korakih)</string>
+    <string name="regional_band_summary_united_states">Združene države (od 88,1 MHz do 107,9 MHz v 200 kHz korakih)</string>
+    <string name="regional_band_summary_user_defined">Uporabniško določen pas</string>
+    <string name="aud_output_mode">Način zvočnega izhoda</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Trajanje snemanja</string>
+    <string name="auto_select_af">Nadomestna frekvenca</string>
+    <string name="settings_revert_defaults_title">Povrni na tovarniške nastavitve</string>
+    <string name="settings_revert_defaults_summary">Ponastavi vse nastavitve</string>
+    <string name="settings_revert_confirm_title">Potrdi ponastavitev</string>
+    <string name="settings_revert_confirm_msg">To bo izbrisalo vse nastavitve aplikacije, vključno s shranjenimi prednastavitvami. Nadaljuj?</string>
+    <string name="no_storage">Pred začetkom snemanja priklopite kartico SD.</string>
+    <string name="preparing_sd">Pripravljanje kartice SD \u2026</string>
+    <string name="access_sd_fail">Dostop do kartice SD ni mogoč.</string>
+    <string name="spaceIsLow_content">Na kartici SD primanjkuje prostora. Spremenite nastavitev kakovosti ali izbrišite nekaj drugih datotek, da sprostite nekaj prostora.</string>
+    <string name="FMRecording_reach_size_limit">Dosežena je omejitev velikosti.</string>
+    <string name="menu_scan_for_preset">Preišči prednastavitve</string>
+    <string name="fm_off">FM je izklopljen.</string>
+    <string name="fm_call">FM-a ne morete uporabljati med klicanjem.</string>
+    <string name="alert_dialog_hint">Vnesite ime</string>
+    <string name="search_dialog_title">Preišči postaje</string>
+    <string name="fm_command_timeout_title">Časovna omejitev</string>
+    <string name="fm_tune_timeout_msg">Za naravnanje postaje FM ni bilo prejetega nobenega odziva. Če se težava še naprej pojavlja, izklopite FM in ga ponovno vklopite.</string>
+    <string name="fm_command_failed_title">Opravilo FM je spodletelo</string>
+    <string name="fm_cmd_failed_msg">Opravilo FM je spodletelo. Če se težava še naprej pojavlja, izklopite FM in ga ponovno vklopite.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Opravilo FM je spodletelo. Sočasnost FM in HDMI ni podprta.</string>
+    <string name="fm_cmd_failed_call_on">Opravilo FM je spodletelo. Zvok FM med klicem ni dovoljen.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">dd-MM-yyyy HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Moji posnetki FM</string>
+    <string name="audio_db_album_name">Posnetki FM</string>
+    <string name="audio_db_playlist_name">Posnetki FM</string>
+    <string name="station_name">Postaja:</string>
+    <string name="station_exists">Ta frekvenca že obstaja!</string>
+    <string name="station_list_delete_station">Izbriši: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Ali res želite izbrisati \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Ime postaje je prazno. Vnesite znova.</string>
+    <string name="station_name_exist">Postaja z imenom \'<xliff:g id="name">%s</xliff:g>\' že obstaja. Vnesite drugo ime.</string>
+    <string name="rt_plus_tags">Oznake</string>
+    <string name="usr_def_band_min">Najnižja frekvenca (MHz)</string>
+    <string name="usr_def_band_max">Najvišja frekvenca (MHz)</string>
+    <string name="chanl_spacing">Razmik med kanali</string>
+    <string name="set">Nastavi</string>
+    <string name="user_defind_band_msg">Vnesite frekvenco med 76,0 in 108,0 MHz z najmanj enim kanalom razmaka in 100 kHz razmaka med najmanjšo in največjo frekvenco</string>
+    <string name="save_record_file">Posneta datoteka FM shranjena v \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Ni bilo najdenih združljivih postaj</string>
+    <string name="typ_All_stations">Vse postaje</string>
+    <string name="typ_Culture">Kultura</string>
+    <string name="typ_Current_affairs">Tekoče zadeve</string>
+    <string name="typ_Children">Programi za otroke</string>
+    <string name="typ_Country">Narodnozabavna glasba</string>
+    <string name="typ_Documentary">Dokumentarec</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Lahka glasba</string>
+    <string name="typ_Education">Izobraževanje</string>
+    <string name="typ_Emergency">V sili</string>
+    <string name="typ_Emergency_test">Preskus v sili</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Ljudska glasba</string>
+    <string name="typ_Information">Podatki</string>
+    <string name="typ_Jazz">Jazz glasba</string>
+    <string name="typ_Light_classical">Lahka klasična</string>
+    <string name="typ_Leisure">Prosti čas</string>
+    <string name="typ_News">Novice</string>
+    <string name="typ_National">Narodna glasba</string>
+    <string name="typ_Other">Druga glasba</string>
+    <string name="typ_Oldies">Starodobna glasba</string>
+    <string name="typ_Phone_in">Klici</string>
+    <string name="typ_Pop">Pop glasba</string>
+    <string name="typ_Religion">Vera</string>
+    <string name="typ_Rock">Rock glasba</string>
+    <string name="typ_Science">Znanost</string>
+    <string name="typ_Serious_classical">Resna klasična</string>
+    <string name="typ_Social_affairs">Družbene zadeve</string>
+    <string name="typ_Sport">Šport</string>
+    <string name="typ_Travel">Potovanja</string>
+    <string name="typ_Varied">Raznolika</string>
+    <string name="typ_Weather">Vreme</string>
+    <string name="typ_Adult_hits">Uspešnice za odrasle</string>
+    <string name="typ_Classical">Klasična</string>
+    <string name="typ_Classic_Rock">Klasični rock</string>
+    <string name="typ_College">Študentska</string>
+    <string name="typ_Foreign_language">Tuj jezik</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgija</string>
+    <string name="typ_Personality">Osebnost</string>
+    <string name="typ_Public">Javna</string>
+    <string name="typ_Religious_music">Verska glasba</string>
+    <string name="typ_Religious_talk">Verski pogovor</string>
+    <string name="typ_Rhythm_and_Blues">Ritem in blues</string>
+    <string name="typ_Spanish_music">Španska glasba</string>
+    <string name="typ_Spanish_talk">Španski pogovori</string>
+    <string name="typ_Soft">Mehka glasba</string>
+    <string name="typ_Soft_Rock">Mehki Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Mehki ritem in blues</string>
+    <string name="typ_Sports">Šport</string>
+    <string name="typ_Talk">Pogovor</string>
+    <string name="typ_Top_40">Najboljših 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-sq/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-sq/arrays.xml
index cb1457b..ed61893 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-sq/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuta</item>
+    <item>15 minuta</item>
+    <item>30 minuta</item>
+    <item>Deri sa të ndalohet</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuta</item>
+    <item>30 minuta</item>
+    <item>45 minuta</item>
+    <item>1 orë</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-sq/strings.xml b/fmapp2/res/values-sq/strings.xml
new file mode 100644
index 0000000..e130ce6
--- /dev/null
+++ b/fmapp2/res/values-sq/strings.xml
@@ -0,0 +1,233 @@
+<?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">Transmetuesi FM</string>
+    <string name="menu_scan_start">Skano</string>
+    <string name="menu_scan_stop">Ndalo kërkimin</string>
+    <string name="menu_record_start">Regjistro</string>
+    <string name="menu_record_stop">Ndalo regjistrimin</string>
+    <string name="menu_settings">Parametrat</string>
+    <string name="menu_sleep">Fli</string>
+    <string name="menu_sleep_cancel">Anullo fjetjen</string>
+    <string name="menu_all_channels">Të gjithë kanalet</string>
+    <string name="menu_display_tags">Trego etiketat</string>
+    <string name="button_text_stop">Ndalo</string>
+    <string name="msg_seeking">Duke kërkuar stacion FM\u2026</string>
+    <string name="msg_scanning">Duke skanuar për të gjithë stacionet FM\u2026</string>
+    <string name="msg_scanning_pty">Duke skanuar për \'<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">Përzgjedhje automatike e kanaleve</string>
+    <string name="msg_searching">Duke kërkuar për stacione për të krijuar një listë\u2026</string>
+    <string name="msg_noantenna">Ju lutemi lidhni kufjet për të përdorur radion FM</string>
+    <string name="dialog_sleep_title">Kohëmatësi i fikjes automatike</string>
+    <string name="presetlist_select_name">Zgjidh \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Shto një listë të re</string>
+    <string name="dialog_presetlist_rename_title">Vendos emrin</string>
+    <string name="presetlist_autoselect_title">Konfirmo zgjedhjen automatike</string>
+    <string name="preset_replace">Zëvendëso</string>
+    <string name="preset_tune">Akordo</string>
+    <string name="preset_rename">Riemërto</string>
+    <string name="preset_delete">Fshi</string>
+    <string name="preset_search">Kërko për \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Bandë rajonale</string>
+    <string name="regional_band_entry_north_america">Amerika Veriore</string>
+    <string name="regional_band_entry_europe">Evrope</string>
+    <string name="regional_band_entry_japan">Japoni</string>
+    <string name="regional_band_entry_japan_wide">Japoni (e gjerë)</string>
+    <string name="regional_band_entry_australia">Australi</string>
+    <string name="regional_band_entry_austria">Austri</string>
+    <string name="regional_band_entry_belgium">Belgjikë</string>
+    <string name="regional_band_entry_brazil">Brazil</string>
+    <string name="regional_band_entry_china">Kinë</string>
+    <string name="regional_band_entry_czech_republic">Republika Çeke</string>
+    <string name="regional_band_entry_denmark">Danimarkë</string>
+    <string name="regional_band_entry_finland">Finlandë</string>
+    <string name="regional_band_entry_france">Francë</string>
+    <string name="regional_band_entry_germany">Gjermani</string>
+    <string name="regional_band_entry_greece">Greqi</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indi</string>
+    <string name="regional_band_entry_indonesia">Indonezi</string>
+    <string name="regional_band_entry_ireland">Irlandë</string>
+    <string name="regional_band_entry_italy">Itali</string>
+    <string name="regional_band_entry_korea">Kore</string>
+    <string name="regional_band_entry_mexico">Meksikë</string>
+    <string name="regional_band_entry_netherlands">Hollandë</string>
+    <string name="regional_band_entry_new_zealand">Zelanda e Re</string>
+    <string name="regional_band_entry_norway">Norvegji</string>
+    <string name="regional_band_entry_poland">Poloni</string>
+    <string name="regional_band_entry_portugal">Portugali</string>
+    <string name="regional_band_entry_russia">Rusi</string>
+    <string name="regional_band_entry_singapore">Singapor</string>
+    <string name="regional_band_entry_slovakia">Sllovaki</string>
+    <string name="regional_band_entry_spain">Spanjë</string>
+    <string name="regional_band_entry_switzerland">Zvicër</string>
+    <string name="regional_band_entry_sweden">Suedi</string>
+    <string name="regional_band_entry_taiwan">Taivan</string>
+    <string name="regional_band_entry_turkey">Turqi</string>
+    <string name="regional_band_entry_united_kingdom">Mbretëria e Bashkuar</string>
+    <string name="regional_band_entry_united_states">Shtetet e Bashkuara të Amerikës</string>
+    <string name="regional_band_entry_user_defined">Bandë e përcaktuar nga përdoruesi</string>
+    <string name="regional_band_summary_north_america">Amerika e Veriut (87.5 deri në 108.0MHz me gjerësi 200 kHz)</string>
+    <string name="regional_band_summary_europe">Evropë (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_japan">Japoni (76.0 deri në 90.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Japoni (e gjerë) (90.0 deri në 108.0MHz me gjerësi 50 kHz)</string>
+    <string name="regional_band_summary_australia">Australi (87.7 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_austria">Austri (87.5 deri në 108.0MHz me gjerësi 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Belgjikë (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5 deri në 108.0MHz me gjerësi 200 kHz)</string>
+    <string name="regional_band_summary_china">Kinë (87.0 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Republika Çeke (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Danimarkë (87.5 deri në 108.0MHz me gjerësi 50 kHz)</string>
+    <string name="regional_band_summary_finland">Finlandë (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_france">Francë (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_germany">Gjermani (87.5 deri në 108.0MHz me gjerësi 50 kHz)</string>
+    <string name="regional_band_summary_greece">Greqi (87.5 deri në 108.0MHz me gjerësi 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_india">Indi (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Indonezi (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Irlandë (87.5 deri në 108.0MHz me gjerësi 50 kHz)</string>
+    <string name="regional_band_summary_italy">Itali (87.5 deri në 108.0MHz me gjerësi 50 kHz)</string>
+    <string name="regional_band_summary_korea">Kore (87.5 deri në 108.0MHz me gjerësi 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Meksikë (88.1 deri në 107.9MHz me gjerësi 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Hollandë (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Zelanda e Re (88.0 deri në 107.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_norway">Norvegji (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_poland">Poloni (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Portugali (87.5 deri në 108.0MHz me gjerësi 50 kHz)</string>
+    <string name="regional_band_summary_russia">Rusi (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Singapor (88.0 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Sllovaki (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_spain">Spanjë (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Zvicër (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Suedi (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Taivan (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Turqi (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Mbretëria e Bashkuar (87.5 deri në 108.0MHz me gjerësi 100 kHz)</string>
+    <string name="regional_band_summary_united_states">Shtetet e Bashkuara të Amerikës (88.1 deri në 107.9MHz me gjerësi 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Bandë e përcaktuar nga përdoruesi</string>
+    <string name="aud_output_mode">Modaliteti i daljes së zërit</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Regjistro kohëzgjatjen</string>
+    <string name="auto_select_af">Frekuencë alternative</string>
+    <string name="settings_revert_defaults_title">Rikthe në gjendjen fillestare</string>
+    <string name="settings_revert_defaults_summary">Rikthe në gjëndje të mëparshme të gjitha parametrat</string>
+    <string name="settings_revert_confirm_title">Konfirmo rikthimin</string>
+    <string name="settings_revert_confirm_msg">Kjo do të pastrojë të gjithë parametrat e programit, përfshirë parametrat paraprakë. Të vazhdoj?</string>
+    <string name="no_storage">Monto kartën SD para nisjes së regjistimit.</string>
+    <string name="preparing_sd">Duke përgatitur kartën SD\u2026</string>
+    <string name="access_sd_fail">Karta SD nuk mund të aksesohet.</string>
+    <string name="spaceIsLow_content">Hapësira në kartën SD është pothuajse e mbushur plot. Ndrysho parametrat e cilësisë ose fshi disa imazhe apo disa skedarë të tjerë për të liruar vënd.</string>
+    <string name="FMRecording_reach_size_limit">U arrit kufiri i madhësisë.</string>
+    <string name="menu_scan_for_preset">Kërko për kanale</string>
+    <string name="fm_off">FM u çaktivizua.</string>
+    <string name="fm_call">FM s\'mund të përdoret gjatë telefonatës.</string>
+    <string name="alert_dialog_hint">Vendos një emër</string>
+    <string name="search_dialog_title">Skano stacionet</string>
+    <string name="fm_command_timeout_title">Koha mbaroi</string>
+    <string name="fm_tune_timeout_msg">Nuk u mor asnjë përgjigje për të akorduar kanalet FM. Nëse problemi vazhdon, ju lutemi fikeni FM dhe ndizeni sërish.</string>
+    <string name="fm_command_failed_title">Veprimi FM dështoi</string>
+    <string name="fm_cmd_failed_msg">Funksionimi i FM, dështoi. Nëse problemi vazhdon, ju lutemi fikeni FM dhe ndizeni sërish.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Funksionimi i FM dështoi. Nuk mundësohet funksionimi i njëkohëshëm i FM dhe HDMI.</string>
+    <string name="fm_cmd_failed_call_on">Funksionimi i FM dështoi. Radio FM nuk lejohet gjatë telefonatave.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Regjistrimet e mia FM</string>
+    <string name="audio_db_album_name">Regjistrimet FM</string>
+    <string name="audio_db_playlist_name">Regjistrimet FM</string>
+    <string name="station_name">Stacioni:</string>
+    <string name="station_exists">Kjo frekuencë ekziston tashmë!</string>
+    <string name="station_list_delete_station">Fshi: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">A jeni të sigurt që doni të fshini \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Emri i stacionit është bosh. Ju lutem vendoseni përsëri.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' është në përdorim, ju lutem vendosni një emër tjetër.</string>
+    <string name="rt_plus_tags">Etiketat</string>
+    <string name="usr_def_band_min">Frekuenca më e ulët (MHz)</string>
+    <string name="usr_def_band_max">Frekuenca më e lartë (MHz)</string>
+    <string name="chanl_spacing">Hapësira midis kanaleve</string>
+    <string name="set">Cakto</string>
+    <string name="user_defind_band_msg">Vendos frekuencën nga 76.0 deri në 108.0 MHz me të paktën 1 hapësirë midis kanaleve dhe me hapësirë 100 kHz midis frekuencës minimale dhe asaj maksimale</string>
+    <string name="save_record_file">Regjistrimi FM u ruajt në \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Nuk u gjet asnjë stacion i përshtatshëm</string>
+    <string name="typ_All_stations">Të gjitha stacionet</string>
+    <string name="typ_Culture">Kulturë</string>
+    <string name="typ_Current_affairs">Aktualitet</string>
+    <string name="typ_Children">Programe për fëmijë</string>
+    <string name="typ_Country">Muzikë Country</string>
+    <string name="typ_Documentary">Dokumentar</string>
+    <string name="typ_Drama">Dramë</string>
+    <string name="typ_Easy_listening">Muzikë e lehtë</string>
+    <string name="typ_Education">Edukim</string>
+    <string name="typ_Emergency">Emergjenca</string>
+    <string name="typ_Emergency_test">Test emergjence</string>
+    <string name="typ_Finance">Financë</string>
+    <string name="typ_Folk">Muzikë folk</string>
+    <string name="typ_Information">Informacion</string>
+    <string name="typ_Jazz">Muzikë Xhaz</string>
+    <string name="typ_Light_classical">Klasike e lehtë</string>
+    <string name="typ_Leisure">Argëtim</string>
+    <string name="typ_News">Lajme</string>
+    <string name="typ_National">Muzikë kombëtare</string>
+    <string name="typ_Other">Muzikë tjetër</string>
+    <string name="typ_Oldies">Muzikë e vjetër</string>
+    <string name="typ_Phone_in">Telefoni ne</string>
+    <string name="typ_Pop">Muzikë Pop</string>
+    <string name="typ_Religion">Fetare</string>
+    <string name="typ_Rock">Muzikë Rock</string>
+    <string name="typ_Science">Shkencë</string>
+    <string name="typ_Serious_classical">Klasike serioze</string>
+    <string name="typ_Social_affairs">Çështje shoqërore</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Udhëtime</string>
+    <string name="typ_Varied">Të ndryshme</string>
+    <string name="typ_Weather">Moti</string>
+    <string name="typ_Adult_hits">Hite për të rinj</string>
+    <string name="typ_Classical">Klasike</string>
+    <string name="typ_Classic_Rock">Rock Klasik</string>
+    <string name="typ_College">Universitet</string>
+    <string name="typ_Foreign_language">Gjuhë e huaj</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgji</string>
+    <string name="typ_Personality">Personalitete</string>
+    <string name="typ_Public">Publik</string>
+    <string name="typ_Religious_music">Muzikë fetare</string>
+    <string name="typ_Religious_talk">Biseda fetare</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Muzikë spanjolle</string>
+    <string name="typ_Spanish_talk">Biseda në spanjisht</string>
+    <string name="typ_Soft">E lehtë</string>
+    <string name="typ_Soft_Rock">Rock i lehtë</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Rhythm and Blues i lehtë</string>
+    <string name="typ_Sports">Sporte</string>
+    <string name="typ_Talk">Biseda</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-sr/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-sr/arrays.xml
index cb1457b..ce0419a 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-sr/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Стерео</item>
+    <item>Моно</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-sr/strings.xml b/fmapp2/res/values-sr/strings.xml
new file mode 100644
index 0000000..4a5d03b
--- /dev/null
+++ b/fmapp2/res/values-sr/strings.xml
@@ -0,0 +1,230 @@
+<?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 радио</string>
+    <string name="tx_app_name">FM предајник</string>
+    <string name="menu_scan_start">Скенирај</string>
+    <string name="menu_scan_stop">Заустави претрагу</string>
+    <string name="menu_record_start">Сними</string>
+    <string name="menu_record_stop">Зауставити снимање</string>
+    <string name="menu_settings">Поставке</string>
+    <string name="menu_sleep">Спавај</string>
+    <string name="menu_sleep_cancel">Откажи спавање</string>
+    <string name="menu_all_channels">Сви канали</string>
+    <string name="menu_display_tags">Прикажи ознаке</string>
+    <string name="button_text_stop">Cтоп</string>
+    <string name="msg_seeking">Претраживање FM станица\u2026</string>
+    <string name="msg_scanning">Претраживање свих FM станица\u2026</string>
+    <string name="msg_scanning_pty">Претрага \"<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">Аутоматско тражење станица</string>
+    <string name="msg_searching">Тражим станице са јаким сигналом ради израде списка станица\u2026</string>
+    <string name="msg_noantenna">Прикључите слушалице да бисте користили FM радио</string>
+    <string name="dialog_sleep_title">Време до аутоматског гашења</string>
+    <string name="presetlist_add_new">Додај нову листу</string>
+    <string name="dialog_presetlist_rename_title">Унесите име</string>
+    <string name="presetlist_autoselect_title">Потрвдите ауто-бирање</string>
+    <string name="preset_replace">Замените</string>
+    <string name="preset_tune">Подесите</string>
+    <string name="preset_rename">Преименовање</string>
+    <string name="preset_delete">Обриши</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Регионални опсег</string>
+    <string name="regional_band_entry_north_america">Северна Америка</string>
+    <string name="regional_band_entry_europe">Европа</string>
+    <string name="regional_band_entry_japan">Јапан</string>
+    <string name="regional_band_entry_japan_wide">Јапан (широкопојасно)</string>
+    <string name="regional_band_entry_australia">Аустралија</string>
+    <string name="regional_band_entry_austria">Аустрија</string>
+    <string name="regional_band_entry_belgium">Белгија</string>
+    <string name="regional_band_entry_brazil">Бразил</string>
+    <string name="regional_band_entry_china">Кина</string>
+    <string name="regional_band_entry_czech_republic">Чешка</string>
+    <string name="regional_band_entry_denmark">Данска</string>
+    <string name="regional_band_entry_finland">Финска</string>
+    <string name="regional_band_entry_france">Француска</string>
+    <string name="regional_band_entry_germany">Немачка</string>
+    <string name="regional_band_entry_greece">Грчка</string>
+    <string name="regional_band_entry_hong_kong">Хонг Конг</string>
+    <string name="regional_band_entry_india">Индија</string>
+    <string name="regional_band_entry_indonesia">Индонезија</string>
+    <string name="regional_band_entry_ireland">Ирска</string>
+    <string name="regional_band_entry_italy">Италија</string>
+    <string name="regional_band_entry_korea">Кореја</string>
+    <string name="regional_band_entry_mexico">Мексико</string>
+    <string name="regional_band_entry_netherlands">Холандија</string>
+    <string name="regional_band_entry_new_zealand">Нови Зеланд</string>
+    <string name="regional_band_entry_norway">Норвешка</string>
+    <string name="regional_band_entry_poland">Пољска</string>
+    <string name="regional_band_entry_portugal">Португал</string>
+    <string name="regional_band_entry_russia">Русија</string>
+    <string name="regional_band_entry_singapore">Сингапур</string>
+    <string name="regional_band_entry_slovakia">Словачка</string>
+    <string name="regional_band_entry_spain">Шпанија</string>
+    <string name="regional_band_entry_switzerland">Швајцарска</string>
+    <string name="regional_band_entry_sweden">Шведска</string>
+    <string name="regional_band_entry_taiwan">Тајван</string>
+    <string name="regional_band_entry_turkey">Турска</string>
+    <string name="regional_band_entry_united_kingdom">Уједињено Краљевство</string>
+    <string name="regional_band_entry_united_states">Сједињене Државе</string>
+    <string name="regional_band_entry_user_defined">Дефиниcано од cтране кориcника</string>
+    <string name="regional_band_summary_north_america">Северна Америка (87,5–108,0 MHz са размацима од 200 kHz)</string>
+    <string name="regional_band_summary_europe">Европа (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_japan">Јапан (76,0–90,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">Јапан (широкопојасно) (90,0–108,0 MHz са размацима од 50 kHz)</string>
+    <string name="regional_band_summary_australia">Аустралија (87,7–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_austria">Аустрија (87,5–108,0 MHz са размацима од 50 kHz)</string>
+    <string name="regional_band_summary_belgium">Белгија (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_brazil">Бразил (87,5–108,0 MHz са размацима од 200 kHz)</string>
+    <string name="regional_band_summary_china">Кина (87,0–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">Република Чешка (87.5 до 108.0 MHz у 100 KHz корацима)</string>
+    <string name="regional_band_summary_denmark">Данска (87,5–108,0 MHz са размацима од 50 kHz)</string>
+    <string name="regional_band_summary_finland">Финска (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_france">Француска (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_germany">Немачка (87,5–108,0 MHz са размацима од 50 kHz)</string>
+    <string name="regional_band_summary_greece">Грчка (87,5–108,0 MHz са размацима од 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">Хонгконг (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_india">Индија (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">Индонезија (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_ireland">Ирска (87,5–108,0 MHz са размацима од 50 kHz)</string>
+    <string name="regional_band_summary_italy">Италија (87,5–108,0 MHz са размацима од 50 kHz)</string>
+    <string name="regional_band_summary_korea">Кореја (87,5–108,0 MHz са размацима од 200 kHz)</string>
+    <string name="regional_band_summary_mexico">Мексико (88,1–107,9 MHz са размацима од 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">Холандија (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">Нови Зеланд (88,0–107,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_norway">Норвешка (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_poland">Пољска (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_portugal">Португалија (87,5–108,0 MHz са размацима од 50 kHz)</string>
+    <string name="regional_band_summary_russia">Русија (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_singapore">Сингапур (88,0–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">Словачка (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_spain">Шпанија (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">Швајцарска (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_sweden">Шведска (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">Тајван (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_turkey">Турска (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">Уједињено Краљевство (87,5–108,0 MHz са размацима од 100 kHz)</string>
+    <string name="regional_band_summary_united_states">САД (88,1–107,9 MHz са размацима од 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">Дефиниcано од cтране кориcника</string>
+    <string name="aud_output_mode">Режим звучног излаза</string>
+    <string name="audio_type_stereo">Стерео</string>
+    <string name="audio_type_mono">Моно</string>
+    <string name="record_dur">Трајање снимања</string>
+    <string name="auto_select_af">Алтернативна фреквенција</string>
+    <string name="settings_revert_defaults_title">Враћање на фабричка подешавања</string>
+    <string name="settings_revert_defaults_summary">Ресетуј сва подешавања</string>
+    <string name="settings_revert_confirm_title">Потврди ресет</string>
+    <string name="settings_revert_confirm_msg">Биће уклоњена сва подешавања апликација, укључујући списак сачуваних станица. Наставити?</string>
+    <string name="no_storage">Убаците SD картицу пре почетка снимања.</string>
+    <string name="preparing_sd">Припремам SD картицу\u2026</string>
+    <string name="access_sd_fail">Нема приступа SD картици.</string>
+    <string name="spaceIsLow_content">На SD картици понестаје простора. Промените подешавања квалитета или избришите неке датотеке да бисте ослободили простор.</string>
+    <string name="FMRecording_reach_size_limit">Достинута је максимална величина датотеке.</string>
+    <string name="menu_scan_for_preset">Претражи сачуване станице</string>
+    <string name="fm_off">FM је искључен.</string>
+    <string name="fm_call">FM се не може користити током позива.</string>
+    <string name="alert_dialog_hint">Унесите име</string>
+    <string name="search_dialog_title">Претрага станица</string>
+    <string name="fm_command_timeout_title">Време је истекло</string>
+    <string name="fm_tune_timeout_msg">Нема одговора на подешавање FM станице. Ако се проблем настави, молимо искључите FM и укључите га поново.</string>
+    <string name="fm_command_failed_title">FM операција неуспешна</string>
+    <string name="fm_cmd_failed_msg">FM операција неуспешна. Ако се проблем настави, молимо искључите FM и укључите га поново.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Истовремено коришћење FM радија и HDMI улаза није подржано.</string>
+    <string name="fm_cmd_failed_call_on">FM операција неуспешна. FM аудио није дозвољен у току позива.</string>
+    <string name="audio_db_artist_name">Моји радио-снимци</string>
+    <string name="audio_db_album_name">Радио-снимци</string>
+    <string name="audio_db_playlist_name">Радио-снимци</string>
+    <string name="station_name">Станица:</string>
+    <string name="station_exists">Ова фреквенција већ постоји.</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="station_name_empty">Име станице је празно. Унесите поново.</string>
+    <string name="station_name_exist">„<xliff:g id="name">%s</xliff:g>“ се већ користи. Унесите друго име.</string>
+    <string name="rt_plus_tags">Ознаке</string>
+    <string name="usr_def_band_min">Најнижа фреквенција (MHz)</string>
+    <string name="usr_def_band_max">Највиша фреквенција (MHz)</string>
+    <string name="chanl_spacing">Размак између канала</string>
+    <string name="set">Постави</string>
+    <string name="user_defind_band_msg">Унесите фреквенцију у опсегу 76,0–108,0 MHz са најмање једним каналом размака и 100 kHz размака између минималне и максималне фреквенције.</string>
+    <string name="save_record_file">Радио-снимак је сачуван у „<xliff:g id="record_file">%1$s</xliff:g>“</string>
+    <string name="fm_search_no_results">Нема одговарајућих станица.</string>
+    <string name="typ_All_stations">Све станице</string>
+    <string name="typ_Culture">Култура</string>
+    <string name="typ_Current_affairs">Актуелно</string>
+    <string name="typ_Children">Дечји програм</string>
+    <string name="typ_Country">Кантри</string>
+    <string name="typ_Documentary">Документарно</string>
+    <string name="typ_Drama">Драма</string>
+    <string name="typ_Easy_listening">Лака музика</string>
+    <string name="typ_Education">Образовање</string>
+    <string name="typ_Emergency">Ванредна ситуација</string>
+    <string name="typ_Emergency_test">Тест хитног позива</string>
+    <string name="typ_Finance">Финансије</string>
+    <string name="typ_Folk">Фолк музика</string>
+    <string name="typ_Information">Информације</string>
+    <string name="typ_Jazz">Џез</string>
+    <string name="typ_Light_classical">Лака класика</string>
+    <string name="typ_Leisure">Слободно време</string>
+    <string name="typ_News">Вести</string>
+    <string name="typ_National">Национална музика</string>
+    <string name="typ_Other">Друга музика</string>
+    <string name="typ_Oldies">Стара музика</string>
+    <string name="typ_Phone_in">У телефону</string>
+    <string name="typ_Pop">Поп музика</string>
+    <string name="typ_Religion">Религија</string>
+    <string name="typ_Rock">Рок</string>
+    <string name="typ_Science">Наука</string>
+    <string name="typ_Serious_classical">Озбиљна класика</string>
+    <string name="typ_Social_affairs">Друштвена питања</string>
+    <string name="typ_Sport">Спорт</string>
+    <string name="typ_Travel">Путовања</string>
+    <string name="typ_Varied">Разно</string>
+    <string name="typ_Weather">Време</string>
+    <string name="typ_Adult_hits">Хитови за одрасле</string>
+    <string name="typ_Classical">Класика</string>
+    <string name="typ_Classic_Rock">Класични рок</string>
+    <string name="typ_College">Универзитет</string>
+    <string name="typ_Foreign_language">Страни језик</string>
+    <string name="typ_Hiphop">Хип-хоп</string>
+    <string name="typ_Nostalgia">Носталгија</string>
+    <string name="typ_Personality">Лично</string>
+    <string name="typ_Public">Јавно</string>
+    <string name="typ_Religious_music">Религиозна музика</string>
+    <string name="typ_Religious_talk">Религиозни разговори</string>
+    <string name="typ_Rhythm_and_Blues">Ритам и блуз</string>
+    <string name="typ_Spanish_music">Шпанска музика</string>
+    <string name="typ_Spanish_talk">Шпански разговори</string>
+    <string name="typ_Soft">Баладе</string>
+    <string name="typ_Soft_Rock">Софт-рок</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Лаки ритам и блуз</string>
+    <string name="typ_Sports">Спортови</string>
+    <string name="typ_Talk">Разговори</string>
+    <string name="typ_Top_40">Топ 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-sv/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-sv/arrays.xml
index cb1457b..ea4ff80 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-sv/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 minuter</item>
+    <item>15 minuter</item>
+    <item>30 minuter</item>
+    <item>Tills stoppad</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 minuter</item>
+    <item>30 minuter</item>
+    <item>45 minuter</item>
+    <item>1 timme</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-sv/strings.xml b/fmapp2/res/values-sv/strings.xml
new file mode 100644
index 0000000..52a73bf
--- /dev/null
+++ b/fmapp2/res/values-sv/strings.xml
@@ -0,0 +1,232 @@
+<?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-sändare</string>
+    <string name="menu_scan_start">Sök</string>
+    <string name="menu_scan_stop">Sluta söka</string>
+    <string name="menu_record_start">Spela in</string>
+    <string name="menu_record_stop">Stoppa inspelning</string>
+    <string name="menu_settings">Inställningar</string>
+    <string name="menu_sleep">Sov</string>
+    <string name="menu_sleep_cancel">Avbryt sov</string>
+    <string name="menu_all_channels">Alla kanaler</string>
+    <string name="menu_display_tags">Visa etiketter</string>
+    <string name="button_text_stop">Stoppa</string>
+    <string name="msg_seeking">Söker FM station\u2026</string>
+    <string name="msg_scanning">Söker efter alla FM stationer\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Automatväljer förinställningar</string>
+    <string name="msg_searching">Söker efter starka stationer för att skapa en förvalslista\u2026</string>
+    <string name="msg_noantenna">Var god koppla in ett headset för att använda FM-radio</string>
+    <string name="dialog_sleep_title">Tidsgräns för automatisk avstängning</string>
+    <string name="presetlist_select_name">Välj \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Lägg till ny lista</string>
+    <string name="dialog_presetlist_rename_title">Ange namn</string>
+    <string name="presetlist_autoselect_title">Bekräfta automatiskt val</string>
+    <string name="preset_replace">Ersätt</string>
+    <string name="preset_tune">Ställ in</string>
+    <string name="preset_rename">Byt namn</string>
+    <string name="preset_delete">Ta bort</string>
+    <string name="preset_search">Sök efter \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Regionsband</string>
+    <string name="regional_band_entry_north_america">Nordamerika</string>
+    <string name="regional_band_entry_europe">Europa</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (bred)</string>
+    <string name="regional_band_entry_australia">Australien</string>
+    <string name="regional_band_entry_austria">Österrike</string>
+    <string name="regional_band_entry_belgium">Belgien</string>
+    <string name="regional_band_entry_brazil">Brasilien</string>
+    <string name="regional_band_entry_china">Kina</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Danmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">Frankrike</string>
+    <string name="regional_band_entry_germany">Tyskland</string>
+    <string name="regional_band_entry_greece">Grekland</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Indien</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Irland</string>
+    <string name="regional_band_entry_italy">Italien</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Nederländerna</string>
+    <string name="regional_band_entry_new_zealand">Nya Zeeland</string>
+    <string name="regional_band_entry_norway">Norge</string>
+    <string name="regional_band_entry_poland">Polen</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Ryssland</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakien</string>
+    <string name="regional_band_entry_spain">Spanien</string>
+    <string name="regional_band_entry_switzerland">Schweiz</string>
+    <string name="regional_band_entry_sweden">Sverige</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkiet</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">USA</string>
+    <string name="regional_band_entry_user_defined">Användardefinierat band</string>
+    <string name="regional_band_summary_north_america">Nordamerika (87,5 till 108,0MHz i 200 KHz-steg)</string>
+    <string name="regional_band_summary_europe">Europa (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 till 90.0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_japan_wide">Japan (bred) (90,0 till 108,0MHz i 50 KHz-steg)</string>
+    <string name="regional_band_summary_australia">Australien (87,7 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_austria">Österrike (87,5 till 108,0 MHz i 50 kHz-steg)</string>
+    <string name="regional_band_summary_belgium">Belgien (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_brazil">Brasilien (87,5 till 108,0 MHz i 200 kHz-steg)</string>
+    <string name="regional_band_summary_china">Kina (87,0 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_czech_republic">Tjeckien (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_denmark">Danmark (87,5 till 108,0 MHz i 50 kHz-steg)</string>
+    <string name="regional_band_summary_finland">Finland (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_france">Frankrike (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_germany">Tyskland (87,5 till 108,0 MHz i 50 kHz-steg)</string>
+    <string name="regional_band_summary_greece">Grekland (87,5 till 108,0 MHz i 50 kHz-steg)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87,5 MHz till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_india">Indien (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_indonesia">Indonesien (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_ireland">Irland (87,5 MHz till 108,0 MHz i 50 kHz-steg)</string>
+    <string name="regional_band_summary_italy">Italien (87,5 till 108,0 MHz i 50 kHz-steg)</string>
+    <string name="regional_band_summary_korea">Korea (87,5 till 108,0 MHz i 200 kHz-steg)</string>
+    <string name="regional_band_summary_mexico">Mexiko (88,1 MHz till 107,9 MHz i 200 kHz-steg)</string>
+    <string name="regional_band_summary_netherlands">Nederländerna (87,5 till 108,0MHz i 100 KHz-steg)</string>
+    <string name="regional_band_summary_new_zealand">Nya Zeeland (88,0 till 107,0MHz i 100 KHz-steg)</string>
+    <string name="regional_band_summary_norway">Norge (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_poland">Polen (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_portugal">Portugal (87,5 till 108,0 MHz i 50 kHz-steg)</string>
+    <string name="regional_band_summary_russia">Ryssland (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_singapore">Singapore (88,0 till 108,0 MHz i 100 kHz steg)</string>
+    <string name="regional_band_summary_slovakia">Slovakien (87,5 till 108,0 MHz i 100 kHz steg)</string>
+    <string name="regional_band_summary_spain">Spanien (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_switzerland">Schweiz (87,5 till 108,0MHz i 100 KHz-steg)</string>
+    <string name="regional_band_summary_sweden">Sverige (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_turkey">Turkiet (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_united_kingdom">Storbritannien (87,5 till 108,0 MHz i 100 kHz-steg)</string>
+    <string name="regional_band_summary_united_states">USA (88,1 till 107,9 MHz i 200 kHz-steg)</string>
+    <string name="regional_band_summary_user_defined">Användardefinierat band</string>
+    <string name="aud_output_mode">Ljudutgångsläge</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Inspelningslängd</string>
+    <string name="auto_select_af">Alternativ frekvens</string>
+    <string name="settings_revert_defaults_title">Återgå till fabriksstandard</string>
+    <string name="settings_revert_defaults_summary">Återställ alla inställningar</string>
+    <string name="settings_revert_confirm_title">Bekräfta återställning</string>
+    <string name="settings_revert_confirm_msg">Detta kommer att rensa alla inställningar, inklusive sparade förhandsinställningar. Vill du fortsätta?</string>
+    <string name="no_storage">Montera SD-kortet innan du börjar inspelningen.</string>
+    <string name="preparing_sd">Förbereder SD-kort\u2026</string>
+    <string name="access_sd_fail">Kunde inte komma åt SD-kort.</string>
+    <string name="spaceIsLow_content">Ditt SD-kort börjar få slut på utrymme. Ändra kvalitetsinställningen eller ta bort några andra filer för att frigöra utrymme.</string>
+    <string name="FMRecording_reach_size_limit">Storleksgränsen är nådd.</string>
+    <string name="menu_scan_for_preset">Sök efter förval</string>
+    <string name="fm_off">FM är avstängd.</string>
+    <string name="fm_call">FM kan inte användas när du ringer.</string>
+    <string name="alert_dialog_hint">Ange ett namn</string>
+    <string name="search_dialog_title">Sök efter stationer</string>
+    <string name="fm_command_timeout_title">Timeout</string>
+    <string name="fm_tune_timeout_msg">Inget svar mottogs för att ställa in FM-station. Om problemet kvarstår, var god stäng av och sätt på FM.</string>
+    <string name="fm_command_failed_title">FM-åtgärd misslyckades</string>
+    <string name="fm_cmd_failed_msg">FM-åtgärd misslyckades. Om problemet kvarstår, stäng av och sätt på FM.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM-åtgärd misslyckades. FM- och HDMI-parallellitet saknar stöd.</string>
+    <string name="fm_cmd_failed_call_on">FM-åtgärd misslyckades. FM-ljud är inte tillåtet under samtal.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Mina FM-inspelningar</string>
+    <string name="audio_db_album_name">FM-inspelningar</string>
+    <string name="audio_db_playlist_name">FM-inspelningar</string>
+    <string name="station_name">Station:</string>
+    <string name="station_exists">Denna frekvens finns redan!</string>
+    <string name="station_list_delete_station">Ta bort: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Är du säker på att du vill ta bort \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Stationsnamn är tomt, var god fyll i igen.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' används redan, ange ett annat namn.</string>
+    <string name="rt_plus_tags">Etiketter</string>
+    <string name="usr_def_band_min">Lägsta frekvens (MHz)</string>
+    <string name="usr_def_band_max">Högsta frekvens (MHz)</string>
+    <string name="chanl_spacing">Kanalavstånd</string>
+    <string name="set">Ställ in</string>
+    <string name="user_defind_band_msg">Ange frekvens mellan 76,0 och 108,0 MHz med minst en kanals mellanrum och 100 kHz avstånd mellan min- och maxfrekvens</string>
+    <string name="save_record_file">FM-inspelningen sparades till \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Inga kompatibla stationer hittades</string>
+    <string name="typ_All_stations">Alla stationer</string>
+    <string name="typ_Culture">Kultur</string>
+    <string name="typ_Current_affairs">Aktuella frågor</string>
+    <string name="typ_Children">Barnprogram</string>
+    <string name="typ_Country">Countrymusik</string>
+    <string name="typ_Documentary">Dokumentär</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Lättlyssnad musik</string>
+    <string name="typ_Education">Utbildning</string>
+    <string name="typ_Emergency">Nödläge</string>
+    <string name="typ_Emergency_test">Nödtest</string>
+    <string name="typ_Finance">Finans</string>
+    <string name="typ_Folk">Folkmusik</string>
+    <string name="typ_Information">Information</string>
+    <string name="typ_Jazz">Jazz</string>
+    <string name="typ_Light_classical">Lätt klassisk musik</string>
+    <string name="typ_Leisure">Fritid</string>
+    <string name="typ_News">Nyheter</string>
+    <string name="typ_National">Nationell musik</string>
+    <string name="typ_Other">Annan musik</string>
+    <string name="typ_Oldies">Gamla godingar</string>
+    <string name="typ_Phone_in">Ring in</string>
+    <string name="typ_Pop">Popmusik</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rockmusik</string>
+    <string name="typ_Science">Vetenskap</string>
+    <string name="typ_Serious_classical">Allvarlig klassisk musik</string>
+    <string name="typ_Social_affairs">Sociala frågor</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Resor</string>
+    <string name="typ_Varied">Varierat</string>
+    <string name="typ_Weather">Väder</string>
+    <string name="typ_Adult_hits">Vuxet</string>
+    <string name="typ_Classical">Klassiskt</string>
+    <string name="typ_Classic_Rock">Klassisk rock</string>
+    <string name="typ_College">Universitet</string>
+    <string name="typ_Foreign_language">Utländska språk</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgi</string>
+    <string name="typ_Personality">Personlighet</string>
+    <string name="typ_Public">Offentligt</string>
+    <string name="typ_Religious_music">Religiös musik</string>
+    <string name="typ_Religious_talk">Religiöst prat</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Spansk musik</string>
+    <string name="typ_Spanish_talk">Spanskt tal</string>
+    <string name="typ_Soft">Mjuk</string>
+    <string name="typ_Soft_Rock">Mjuk Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Mjuk Rhythm and Blues</string>
+    <string name="typ_Sports">Sport</string>
+    <string name="typ_Talk">Prat</string>
+    <string name="typ_Top_40">Topp 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ta/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ta/arrays.xml
index cb1457b..b73fbe6 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ta/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>ஸ்டீரியோ</item>
+    <item>மோனோ</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-ta/strings.xml b/fmapp2/res/values-ta/strings.xml
new file mode 100644
index 0000000..a872775
--- /dev/null
+++ b/fmapp2/res/values-ta/strings.xml
@@ -0,0 +1,189 @@
+<?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 ரேடியோ</string>
+    <string name="tx_app_name">FM டிரான்ஸ்மிட்டர்</string>
+    <string name="menu_scan_start">ஸ்கேன் செய்</string>
+    <string name="menu_scan_stop">தேடலை நிறுத்து</string>
+    <string name="menu_record_start">பதிவுசெய்</string>
+    <string name="menu_record_stop">பதிவுசெய்தலை நிறுத்து</string>
+    <string name="menu_settings">அமைப்புகள்</string>
+    <string name="menu_sleep">உறக்கநிலையிலிரு</string>
+    <string name="menu_sleep_cancel">உறக்கத்தை ரத்துசெய்</string>
+    <string name="menu_all_channels">அனைத்து சேனல்களும்</string>
+    <string name="menu_display_tags">குறிச்சொற்களைக் காட்டுகிறது</string>
+    <string name="button_text_stop">நிறுத்து</string>
+    <string name="msg_seeking">FM நிலையத்தை தேடுகிறது\u2026</string>
+    <string name="msg_scanning">அனைத்து FM நிலையங்களையும் ஸ்கேன்செய்கிறது\u2026</string>
+    <string name="msg_scanning_pty">\'<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">முன்னமைவுகளை தானியக்கமாக தேர்வுசெய்கிறது</string>
+    <string name="msg_searching">ஒரு முன்னமைவு பட்டியலை உருவாக்க வலிமையான நிலையங்களை தேடுகிறது\u2026</string>
+    <string name="msg_noantenna">FM வானொலியை பயன்படுத்த தயவுசெய்து ஒரு தலையணியை ப்ளக் இன் செய்யவும்</string>
+    <string name="dialog_sleep_title">தானியக்க ஆஃப் உறக்க நேரம்</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\' தேர்வுசெய்</string>
+    <string name="presetlist_add_new">புதிய பட்டியலை சேர்</string>
+    <string name="dialog_presetlist_rename_title">பெயரை உள்ளிடு</string>
+    <string name="presetlist_autoselect_title">தானியக்க தேர்வுசெய்தலை உறுதிசெய்</string>
+    <string name="preset_replace">மாற்றிடு</string>
+    <string name="preset_tune">டியூன்</string>
+    <string name="preset_rename">மறுபெயரிடு</string>
+    <string name="preset_delete">நீக்கு</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' க்காக தேடு</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">மண்டல பேண்ட்</string>
+    <string name="regional_band_entry_north_america">வட அமெரிக்கா</string>
+    <string name="regional_band_entry_europe">ஐரோப்பா</string>
+    <string name="regional_band_entry_japan">ஜப்பான்</string>
+    <string name="regional_band_entry_japan_wide">ஜப்பான் (பரவலாக)</string>
+    <string name="regional_band_entry_australia">ஆஸ்திரேலியா</string>
+    <string name="regional_band_entry_austria">ஆஸ்திரியா</string>
+    <string name="regional_band_entry_belgium">பெல்ஜியம்</string>
+    <string name="regional_band_entry_brazil">பிரேசில்</string>
+    <string name="regional_band_entry_china">சீனா</string>
+    <string name="regional_band_entry_czech_republic">செக் குடியரசு</string>
+    <string name="regional_band_entry_denmark">டென்மார்க்</string>
+    <string name="regional_band_entry_finland">ஃபின்லாந்து</string>
+    <string name="regional_band_entry_france">பிரான்சு</string>
+    <string name="regional_band_entry_germany">ஜெர்மனி</string>
+    <string name="regional_band_entry_greece">கிரீஸ்</string>
+    <string name="regional_band_entry_hong_kong">ஹாங் காங்</string>
+    <string name="regional_band_entry_india">இந்தியா</string>
+    <string name="regional_band_entry_indonesia">இந்தோனேசியா</string>
+    <string name="regional_band_entry_ireland">அயர்லாந்து</string>
+    <string name="regional_band_entry_italy">இத்தாலி</string>
+    <string name="regional_band_entry_korea">கொரியா</string>
+    <string name="regional_band_entry_mexico">மெக்சிக்கோ</string>
+    <string name="regional_band_entry_netherlands">நெதர்லாந்து</string>
+    <string name="regional_band_entry_new_zealand">நியூசீலாந்து</string>
+    <string name="regional_band_entry_norway">நார்வே</string>
+    <string name="regional_band_entry_poland">போலந்து</string>
+    <string name="regional_band_entry_portugal">போர்ச்சுகல்</string>
+    <string name="regional_band_entry_russia">ரஷ்யா</string>
+    <string name="regional_band_entry_singapore">சிங்கப்பூர்</string>
+    <string name="regional_band_entry_slovakia">ஸ்லோவாக்கியா</string>
+    <string name="regional_band_entry_spain">ஸ்பெயின்</string>
+    <string name="regional_band_entry_switzerland">ஸ்விட்ச்சர்லாந்து</string>
+    <string name="regional_band_entry_sweden">ஸ்வீடன்</string>
+    <string name="regional_band_entry_taiwan">தாய்வான்</string>
+    <string name="regional_band_entry_turkey">துருக்கி</string>
+    <string name="regional_band_entry_united_kingdom">ஐக்கிய ராஜ்யம்</string>
+    <string name="regional_band_entry_united_states">யுனைட்டெட் ஸ்டேட்ஸ்</string>
+    <string name="regional_band_entry_user_defined">பயனர் விவரித்த பேண்ட்</string>
+    <string name="regional_band_summary_user_defined">பயனர் விவரித்த பேண்ட்</string>
+    <string name="aud_output_mode">ஆடியோ அவுட்புட் பயன்முறை</string>
+    <string name="audio_type_stereo">ஸ்டீரியோ</string>
+    <string name="audio_type_mono">மோனோ</string>
+    <string name="record_dur">பதிவுசெய்தல் கால அளவு</string>
+    <string name="auto_select_af">மாற்று அதிர்வெண்</string>
+    <string name="settings_revert_defaults_title">தொழிற்சாலை இயல்புநிலைகளுக்கு மீட்டமை</string>
+    <string name="settings_revert_defaults_summary">அனைத்து அமைப்புகளையும் மீட்டமை</string>
+    <string name="settings_revert_confirm_title">மீட்டமைத்தலை உறுதிசெய்</string>
+    <string name="settings_revert_confirm_msg">சேமிக்கப்பட்ட முன்னமைவுகள் உட்பட அனைத்து பயன்பாட்டு அமைப்புகளையும் இது அழிக்கும். தொடரவா?</string>
+    <string name="no_storage">பதிவுசெய்ய தொடங்குவதற்கு முன்பாக SD கார்டை மவுண்ட்செய்</string>
+    <string name="preparing_sd">SD கார்டை தயார்செய்கிறது\u2026</string>
+    <string name="access_sd_fail">SD கார்டை அணுக முடியவில்லை</string>
+    <string name="spaceIsLow_content">உங்கள் SD கார்டு சேமிப்பகம் இடமின்றி தொடருகிறது தர அமைப்பை மாற்றவும் அல்லது இடத்தை வெறுமையாக சில கோப்புகளை நீக்கவும்</string>
+    <string name="menu_scan_for_preset">முன்னமைவுகளுக்காக ஸ்கேன்செய்</string>
+    <string name="fm_off">FM ஆஃப் செய்யப்பட்டுள்ளது</string>
+    <string name="fm_call">அழைப்பின்போது FM பயன்படுத்தப்பட முடியாது.</string>
+    <string name="alert_dialog_hint">ஒரு பெயரை உள்ளிடு</string>
+    <string name="search_dialog_title">நிலையங்களை ஸ்கேன்செய்</string>
+    <string name="fm_command_timeout_title">நேரமுடிவு</string>
+    <string name="fm_tune_timeout_msg">FM நிலையத்தை டியூன்செய்ய எந்த பதிலும் பெறப்படவில்லை. சிக்கல் தொடர்ந்தால், தயவுசெய்து FMஐ ஆஃப் செய்து பின்னர் ஆன் செய்யவும்</string>
+    <string name="fm_command_failed_title">FM இயக்கம் தோல்வியுற்றது.</string>
+    <string name="fm_cmd_failed_msg">FM இயக்கம் தோல்வியுற்றது. சிக்கல் தொடர்ந்தால், தயவுசெய்து FMஐ ஆஃப் செய்து பின்னர் ஆன் செய்யவும்</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM இயக்கம் தோல்வியுற்றது. FM மற்றும் HDMI ஒரேசமய பயன்பாடு ஆதரிக்கபப்டவில்லை.</string>
+    <string name="fm_cmd_failed_call_on">FM இயக்கம் தோல்வியுற்றது. அழைப்பின்போது FM ஒலி அனுமதிக்கப்படுவது இல்லை</string>
+    <string name="station_name">நிலையம்:</string>
+    <string name="station_exists">இந்த அதிர்வெண் முன்பே இருக்கிறது!</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="station_name_empty">நிலைய பெயர் வெறுமையாக உள்ளது, தயவுசெய்து மீண்டும் உள்ளிடவும்.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\ முன்பே பயன்பாட்டில் உள்ளது, தயவுசெய்து வேறு பெயரை உள்ளிடவும்.</string>
+    <string name="rt_plus_tags">குறிச்சொற்கள்</string>
+    <string name="usr_def_band_min">குறைந்த அதிர்வெண் (MHz)</string>
+    <string name="usr_def_band_max">உயர்ந்த அதிர்வெண்(MHz)</string>
+    <string name="chanl_spacing">சேனல் இடம்</string>
+    <string name="set">அமை</string>
+    <string name="fm_search_no_results">இணக்கமான நிலையங்கள் எதுவும் கண்டுபிடிக்கப்படவில்லை</string>
+    <string name="typ_All_stations">அனைத்து நிலையங்களும்</string>
+    <string name="typ_Culture">கலாச்சாரம்</string>
+    <string name="typ_Current_affairs">நடப்பு செய்திகள்</string>
+    <string name="typ_Children">குழந்தைகள் நிகழ்ச்சிகள்</string>
+    <string name="typ_Country">நாட்டுப்புற இசை</string>
+    <string name="typ_Documentary">ஆவணப்படம்</string>
+    <string name="typ_Drama">நாடகம்</string>
+    <string name="typ_Easy_listening">எளிதாக கேட்கும் இசை</string>
+    <string name="typ_Education">கல்வி</string>
+    <string name="typ_Emergency">அவசர அழைப்பு</string>
+    <string name="typ_Emergency_test">அவசர சோதனை</string>
+    <string name="typ_Finance">நிதி</string>
+    <string name="typ_Folk">நாட்டுப்புற இசை</string>
+    <string name="typ_Information">தகவல்கள்</string>
+    <string name="typ_Jazz">ஜாஸ் இசை</string>
+    <string name="typ_Light_classical">லைட் கிளாசிக்கல்</string>
+    <string name="typ_Leisure">ஓய்வு</string>
+    <string name="typ_News">செய்திகள்</string>
+    <string name="typ_National">தேசிய இசை</string>
+    <string name="typ_Other">மற்ற இசை</string>
+    <string name="typ_Oldies">பழங்கால இசை</string>
+    <string name="typ_Phone_in">தொலைப்பேசியில்</string>
+    <string name="typ_Pop">பாப் இசை</string>
+    <string name="typ_Religion">சமயம்</string>
+    <string name="typ_Rock">ராக் இசை</string>
+    <string name="typ_Science">அறிவியல்</string>
+    <string name="typ_Serious_classical">தீவிர கிளாசிக்கல்</string>
+    <string name="typ_Social_affairs">சமூக பிரச்சனைகள்</string>
+    <string name="typ_Sport">விளையாட்டு</string>
+    <string name="typ_Travel">பயணம்</string>
+    <string name="typ_Varied">பல்வேறு</string>
+    <string name="typ_Weather">வானிலை</string>
+    <string name="typ_Adult_hits">பெரியோர் ஹிட்ஸ்</string>
+    <string name="typ_Classical">கிளாசிக்கல்</string>
+    <string name="typ_Classic_Rock">கிளாசிக் ராக்</string>
+    <string name="typ_College">கல்லூரி</string>
+    <string name="typ_Foreign_language">அந்நிய மொழி</string>
+    <string name="typ_Hiphop">ஹிப் ஹாப்</string>
+    <string name="typ_Nostalgia">அந்தநாள் நியாபகம்</string>
+    <string name="typ_Personality">ஆள்தத்துவம்</string>
+    <string name="typ_Public">பொது</string>
+    <string name="typ_Religious_music">சமய இசை</string>
+    <string name="typ_Religious_talk">சமய பேச்சு</string>
+    <string name="typ_Rhythm_and_Blues">ரிதம் மற்றும் ப்ளூஸ்</string>
+    <string name="typ_Spanish_music">ஸ்பேனிஷ் இசை</string>
+    <string name="typ_Spanish_talk">ஸ்பேனிஷ் பேச்சு</string>
+    <string name="typ_Soft">மெல்லிசை</string>
+    <string name="typ_Soft_Rock">மெல்லிய ராக்</string>
+    <string name="typ_Soft_Rhythm_and_Blues">மென்மையான ரிதம் மற்றும் ப்ளூஸ்</string>
+    <string name="typ_Sports">விளையாட்டுக்கள்</string>
+    <string name="typ_Talk">பேச்சு</string>
+    <string name="typ_Top_40">முதல்-40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-te/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-te/arrays.xml
index cb1457b..2d51918 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-te/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>స్టీరియో</item>
+    <item>మోనో</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-te/strings.xml b/fmapp2/res/values-te/strings.xml
new file mode 100644
index 0000000..07e1813
--- /dev/null
+++ b/fmapp2/res/values-te/strings.xml
@@ -0,0 +1,189 @@
+<?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 రేడియో</string>
+    <string name="tx_app_name">FM ట్రాన్స్‌మిట్టర్</string>
+    <string name="menu_scan_start">స్కాన్ చేయి</string>
+    <string name="menu_scan_stop">శోధన ఆపుము</string>
+    <string name="menu_record_start">రికార్డ్ చేయుము</string>
+    <string name="menu_record_stop">రికార్డింగును నిలిపివేయుము</string>
+    <string name="menu_settings">సెట్టింగ్‌లు</string>
+    <string name="menu_sleep">నిద్రావస్థ</string>
+    <string name="menu_sleep_cancel">విశ్రాంతిని రద్దు చేయుము</string>
+    <string name="menu_all_channels">అన్ని ఛానళ్ళు</string>
+    <string name="menu_display_tags">ట్యాగులను చూపుము</string>
+    <string name="button_text_stop">ఆపివేయండి</string>
+    <string name="msg_seeking">FM స్టేషన్ శోధన\u2026</string>
+    <string name="msg_scanning">అన్ని FM స్టేషన్ల కొరకు స్కాన్ జరుగుతూ ఉంది\u2026</string>
+    <string name="msg_scanning_pty">\'<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">స్వయంచాలక-ఎంపిక పూర్వ అమరికలు</string>
+    <string name="msg_searching">పూర్వ అమరికల జాబితాను సృష్టించేందుకు బలమైన స్టేషన్ల కొరకు శోధన జరుగుతూ ఉంది\u2026</string>
+    <string name="msg_noantenna">FM రేడియోను ఉపయోగించేందుకు దయచేసి హెడ్ సెట్ అనుసంధానించుము</string>
+    <string name="dialog_sleep_title">ఆటో-ఆఫ్ విశ్రాంతి సమయం</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\'ను ఎంచుకొనుము</string>
+    <string name="presetlist_add_new">క్రొత్త జాబితాను జోడించుము</string>
+    <string name="dialog_presetlist_rename_title">పేరును ఎంటర్ చేయుము</string>
+    <string name="presetlist_autoselect_title">స్వీయ-ఎంపికను నిర్ధారించుము</string>
+    <string name="preset_replace">భర్తీ చేయి</string>
+    <string name="preset_tune">ట్యూన్</string>
+    <string name="preset_rename">పేరు మార్చు</string>
+    <string name="preset_delete">తొలగించు</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\' కొరకు శోధించుము</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">ప్రాంతీయ బ్యాండ్</string>
+    <string name="regional_band_entry_north_america">ఉత్తర అమెరికా</string>
+    <string name="regional_band_entry_europe">యూరోప్</string>
+    <string name="regional_band_entry_japan">జపాన్</string>
+    <string name="regional_band_entry_japan_wide">జపాన్ (వైడ్)</string>
+    <string name="regional_band_entry_australia">ఆస్ట్రేలియా</string>
+    <string name="regional_band_entry_austria">ఆస్ట్రియా</string>
+    <string name="regional_band_entry_belgium">బెల్జియం</string>
+    <string name="regional_band_entry_brazil">బ్రెజిల్</string>
+    <string name="regional_band_entry_china">చైనా</string>
+    <string name="regional_band_entry_czech_republic">చెక్ రిపబ్లిక్</string>
+    <string name="regional_band_entry_denmark">డెన్మార్క్</string>
+    <string name="regional_band_entry_finland">ఫిన్లాండ్</string>
+    <string name="regional_band_entry_france">ఫ్రాన్స్</string>
+    <string name="regional_band_entry_germany">జెర్మనీ</string>
+    <string name="regional_band_entry_greece">గ్రీస్</string>
+    <string name="regional_band_entry_hong_kong">హాంగ్ కాంగ్</string>
+    <string name="regional_band_entry_india">భారతదేశం</string>
+    <string name="regional_band_entry_indonesia">ఇండోనేషియా</string>
+    <string name="regional_band_entry_ireland">ఐరిలాండ్</string>
+    <string name="regional_band_entry_italy">ఇటలీ</string>
+    <string name="regional_band_entry_korea">కొరియా</string>
+    <string name="regional_band_entry_mexico">మెక్సికో</string>
+    <string name="regional_band_entry_netherlands">నెథర్లాండ్స్</string>
+    <string name="regional_band_entry_new_zealand">న్యూజిలాండ్</string>
+    <string name="regional_band_entry_norway">నార్వే</string>
+    <string name="regional_band_entry_poland">పోలాండ్</string>
+    <string name="regional_band_entry_portugal">పోర్టుగల్</string>
+    <string name="regional_band_entry_russia">రష్యా</string>
+    <string name="regional_band_entry_singapore">సింగపూర్</string>
+    <string name="regional_band_entry_slovakia">స్లొవేకియా</string>
+    <string name="regional_band_entry_spain">స్పెయిన్</string>
+    <string name="regional_band_entry_switzerland">స్విట్జర్లాండ్</string>
+    <string name="regional_band_entry_sweden">స్వీడన్</string>
+    <string name="regional_band_entry_taiwan">తైవాన్</string>
+    <string name="regional_band_entry_turkey">టర్కీ</string>
+    <string name="regional_band_entry_united_kingdom">యునైటెడ్ కింగ్డమ్</string>
+    <string name="regional_band_entry_united_states">సంయుక్త రాష్ట్రాలు</string>
+    <string name="regional_band_entry_user_defined">వినియోగాదారునిచే నిర్వచించబడ్డ బ్యాండ్</string>
+    <string name="regional_band_summary_user_defined">వినియోగాదారునిచే నిర్వచించబడ్డ బ్యాండ్</string>
+    <string name="aud_output_mode">ఆడియో అవుట్పుట్ మోడ్</string>
+    <string name="audio_type_stereo">స్టీరియో</string>
+    <string name="audio_type_mono">మోనో</string>
+    <string name="record_dur">రికార్డ్ వ్యవధి</string>
+    <string name="auto_select_af">ప్రత్యామ్నాయ తరచుదనం</string>
+    <string name="settings_revert_defaults_title">ఫ్యాక్టరీ స్వయంసిద్ధాలకు తిరిగి మారుము</string>
+    <string name="settings_revert_defaults_summary">అన్ని సెట్టింగులను తిరిగి సెట్ చేయుము</string>
+    <string name="settings_revert_confirm_title">తిరిగి సెట్ చేయడాన్ని నిర్ధారించుము</string>
+    <string name="settings_revert_confirm_msg">ఇది సేవ్ చేయబడిన పూర్వ అమరికలతో సహా అన్ని అప్లికేషన్ల సెట్టింగులను తొలిగిస్తుంది. కొనసాగించాలా?</string>
+    <string name="no_storage">రికార్డింగును ప్రారంభించే ముందు SD కార్డును మౌంట్ చేయుము.</string>
+    <string name="preparing_sd">SD సిద్ధం చేయబడుతుంది\u2026</string>
+    <string name="access_sd_fail">SD కార్డుకు ప్రాప్యత సాధ్యపడలేదు.</string>
+    <string name="spaceIsLow_content">మీ యొక్క SD కార్డ్ నిల్వలో ఖాళీ అయిపోతోంది. నాణ్యతా సెట్టింగును మార్చండి లేదా ఖాళీను సృష్టించేందుకు కొన్ని ఇతర ఫైళ్ళను తొలిగించండి.</string>
+    <string name="menu_scan_for_preset">పూర్వ అమరికల కొరకు స్కాన్ చేయుము</string>
+    <string name="fm_off">FM ఆపివేయబడింది.</string>
+    <string name="fm_call">కాల్ చేసే సమయంలో FMను ఉపయోగించడం కుదరదు.</string>
+    <string name="alert_dialog_hint">పేరును ఎంటర్ చేయుము</string>
+    <string name="search_dialog_title">స్టేషనులను స్కాన్ చేయుము</string>
+    <string name="fm_command_timeout_title">సమయం ముగిసింది</string>
+    <string name="fm_tune_timeout_msg">FM స్టేషనును ట్యూన్ చేసేందుకు ఎటువంటి ప్రతిస్పందన లభించలేదు. సమస్య కొనసాగితే, దయచేసి  FMను ఆపివేసి మరలా దానిని ఆన్ చేయండి.</string>
+    <string name="fm_command_failed_title">FM ఆపరేషన్ విఫలమయింది</string>
+    <string name="fm_cmd_failed_msg">FM ఆపరేషన్ విఫలమయింది. సమస్య కొనసాగితే, దయచేసి  FMను ఆపివేసి మరలా దానిని ఆన్ చేయండి.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM ఆపరేషన్ విఫలమయింది. FM మరియు HDMI అనుకూలతకు మద్దతు లేదు.</string>
+    <string name="fm_cmd_failed_call_on">FM ఆపరేషన్ విఫలమయింది. కాల్ చేసే సమయంలో FM ఆడియో అనుమతించబడదు.</string>
+    <string name="station_name">స్టేషన్:</string>
+    <string name="station_exists">ఈ ఫ్రీక్వెన్సీ ఇప్పటికే ఉంది!</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="station_name_empty">స్టేషన్ పేరు ఖాళీగా ఉంది, దయచేసి మరలా ఎంటర్ చేయుము.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' ఇప్పటికే ఉపయోగించబడుతోంది, దయచేసి భిన్నమైన పేరును ఎంటర్ చేయుము.</string>
+    <string name="rt_plus_tags">ట్యాగ్‌లు</string>
+    <string name="usr_def_band_min">అతితక్కువ ఫ్రీక్వెన్సీ (MHz)</string>
+    <string name="usr_def_band_max">అత్యధిక ఫ్రీక్వెన్సీ (MHz)</string>
+    <string name="chanl_spacing">ఛానల్ అంతరం</string>
+    <string name="set">సెట్ చేయి</string>
+    <string name="fm_search_no_results">అనుకూలమైన స్టేషన్లు దొరకలేదు</string>
+    <string name="typ_All_stations">అన్ని స్టేషన్లు</string>
+    <string name="typ_Culture">సంస్కృతి</string>
+    <string name="typ_Current_affairs">సమకాలిన అంశాలు</string>
+    <string name="typ_Children">పిల్లల కార్యక్రమాలు</string>
+    <string name="typ_Country">దేశీయ సంగీతం</string>
+    <string name="typ_Documentary">డాక్యుమెంటరీ</string>
+    <string name="typ_Drama">డ్రామా</string>
+    <string name="typ_Easy_listening">శ్రావ్యమైన సంగీతం</string>
+    <string name="typ_Education">విద్య</string>
+    <string name="typ_Emergency">అత్యవసరం</string>
+    <string name="typ_Emergency_test">అత్యవసర పరీక్ష</string>
+    <string name="typ_Finance">ఫైనాన్స్</string>
+    <string name="typ_Folk">జానపద సంగీతం</string>
+    <string name="typ_Information">సమాచారం</string>
+    <string name="typ_Jazz">జాజ్ సంగీతం</string>
+    <string name="typ_Light_classical">లైట్ శాస్త్రీయ సంగీతం</string>
+    <string name="typ_Leisure">తీరిక</string>
+    <string name="typ_News">వార్తలు</string>
+    <string name="typ_National">జాతీయ సంగీతం</string>
+    <string name="typ_Other">ఇతర సంగీతం</string>
+    <string name="typ_Oldies">ప్రజాదరణ పొందిన పాత పాటలు</string>
+    <string name="typ_Phone_in">ఫోన్ చేయుము</string>
+    <string name="typ_Pop">పాప్ సంగీతం</string>
+    <string name="typ_Religion">మతం</string>
+    <string name="typ_Rock">రాక్ సంగీతం</string>
+    <string name="typ_Science">సైన్స్</string>
+    <string name="typ_Serious_classical">అసలైన శాస్త్రీయ సంగీతం</string>
+    <string name="typ_Social_affairs">సామాజిక అంశాలు</string>
+    <string name="typ_Sport">క్రీడా</string>
+    <string name="typ_Travel">ప్రయాణం.</string>
+    <string name="typ_Varied">వైవిధ్యభరిత</string>
+    <string name="typ_Weather">వాతావరణం</string>
+    <string name="typ_Adult_hits">అడల్ట్ హిట్స్</string>
+    <string name="typ_Classical">క్లాసికల్</string>
+    <string name="typ_Classic_Rock">క్లాసిక్ రాక్</string>
+    <string name="typ_College">కాలేజ్</string>
+    <string name="typ_Foreign_language">విదేశీ భాష</string>
+    <string name="typ_Hiphop">హిప్ హాప్</string>
+    <string name="typ_Nostalgia">పాత జ్ఞాపకాలు</string>
+    <string name="typ_Personality">పర్సనాలిటీ</string>
+    <string name="typ_Public">ప్రజా</string>
+    <string name="typ_Religious_music">మతపరమైన సంగీతం</string>
+    <string name="typ_Religious_talk">మతపరమైన చర్చ</string>
+    <string name="typ_Rhythm_and_Blues">రిథమ్ మరియు బ్లూస్ (ఒక రకమైన సంగీతం)</string>
+    <string name="typ_Spanish_music">స్పానిష్ సంగీతం</string>
+    <string name="typ_Spanish_talk">స్పానిష్ చర్చ</string>
+    <string name="typ_Soft">మృదువైన</string>
+    <string name="typ_Soft_Rock">సాఫ్ట్ రాక్</string>
+    <string name="typ_Soft_Rhythm_and_Blues">సాఫ్ట్ రిథమ్ మరియు బ్లూస్</string>
+    <string name="typ_Sports">క్రీడలు</string>
+    <string name="typ_Talk">చర్చ</string>
+    <string name="typ_Top_40">అగ్రగామి 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-th/arrays.xml
similarity index 62%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-th/arrays.xml
index cb1457b..fd3d153 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-th/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>สเตอริโอ</item>
+    <item>โมโน</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-th/strings.xml b/fmapp2/res/values-th/strings.xml
new file mode 100644
index 0000000..8b4af78
--- /dev/null
+++ b/fmapp2/res/values-th/strings.xml
@@ -0,0 +1,232 @@
+<?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</string>
+    <string name="tx_app_name">ตัวถ่ายทอด FM</string>
+    <string name="menu_scan_start">สแกน</string>
+    <string name="menu_scan_stop">หยุดค้นหา</string>
+    <string name="menu_record_start">บันทึก</string>
+    <string name="menu_record_stop">หยุดบันทึก</string>
+    <string name="menu_settings">การตั้งค่า</string>
+    <string name="menu_sleep">พักหน้าจอ</string>
+    <string name="menu_sleep_cancel">ยกเลิกการพักหน้าจอ</string>
+    <string name="menu_all_channels">ทุกช่อง</string>
+    <string name="menu_display_tags">แสดงแท็ก</string>
+    <string name="button_text_stop">หยุด</string>
+    <string name="msg_seeking">กำลังค้นหาสถานีวิทยุ FM\u2026</string>
+    <string name="msg_scanning">กำลังค้นหาสถานีวิทยุ FM ทั้งหมด\u2026</string>
+    <string name="msg_scanning_pty">กำลังค้นหา \'<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">การเลือกสถานีอัตโนมัติ</string>
+    <string name="msg_searching">กำลังค้นหาสถานีที่ชัดเจนเพื่อสร้างรายชื่อสถานี\u2026</string>
+    <string name="msg_noantenna">กรุณาเสียบหูฟังเพื่อใช้วิทยุ FM</string>
+    <string name="dialog_sleep_title">เวลาปิดอัตโนมัติ</string>
+    <string name="presetlist_select_name">เลือก \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">เพิ่มรายการใหม่</string>
+    <string name="dialog_presetlist_rename_title">ใส่ชื่อ</string>
+    <string name="presetlist_autoselect_title">ยืนยันการเลือกอัตโนมัติ</string>
+    <string name="preset_replace">แทน​ที่</string>
+    <string name="preset_tune">ปรับ</string>
+    <string name="preset_rename">เปลี่ยนชื่อ</string>
+    <string name="preset_delete">ลบ</string>
+    <string name="preset_search">ค้นหา \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">เขตสัญญาณตามภูมิภาค</string>
+    <string name="regional_band_entry_north_america">อเมริกาเหนือ</string>
+    <string name="regional_band_entry_europe">ยุโรป</string>
+    <string name="regional_band_entry_japan">ญี่ปุ่น</string>
+    <string name="regional_band_entry_japan_wide">ญี่ปุน (วงกว้าง)</string>
+    <string name="regional_band_entry_australia">ออสเตรเลีย</string>
+    <string name="regional_band_entry_austria">ออสเตรีย</string>
+    <string name="regional_band_entry_belgium">เบลเยี่ยม</string>
+    <string name="regional_band_entry_brazil">บราซิล</string>
+    <string name="regional_band_entry_china">จีน</string>
+    <string name="regional_band_entry_czech_republic">สาธารณรัฐเช็ก</string>
+    <string name="regional_band_entry_denmark">เดนมาร์ก</string>
+    <string name="regional_band_entry_finland">ฟินแลนด์</string>
+    <string name="regional_band_entry_france">ฝรั่งเศส</string>
+    <string name="regional_band_entry_germany">เยอรมันนี</string>
+    <string name="regional_band_entry_greece">กรีซ</string>
+    <string name="regional_band_entry_hong_kong">ฮ่องกง</string>
+    <string name="regional_band_entry_india">อินเดีย</string>
+    <string name="regional_band_entry_indonesia">อินโดนีเซีย</string>
+    <string name="regional_band_entry_ireland">ไอร์แลนด์</string>
+    <string name="regional_band_entry_italy">อิตาลี</string>
+    <string name="regional_band_entry_korea">เกาหลี</string>
+    <string name="regional_band_entry_mexico">เม็กซิโก</string>
+    <string name="regional_band_entry_netherlands">เนเธอร์แลนด์</string>
+    <string name="regional_band_entry_new_zealand">นิวซีแลนด์</string>
+    <string name="regional_band_entry_norway">นอร์เวย์</string>
+    <string name="regional_band_entry_poland">โปแลนด์</string>
+    <string name="regional_band_entry_portugal">โปรตุเกส</string>
+    <string name="regional_band_entry_russia">รัสเซีย</string>
+    <string name="regional_band_entry_singapore">สิงคโปร์</string>
+    <string name="regional_band_entry_slovakia">สโลวาเกีย</string>
+    <string name="regional_band_entry_spain">สเปน</string>
+    <string name="regional_band_entry_switzerland">สวิตเซอร์แลนด์</string>
+    <string name="regional_band_entry_sweden">สวีเดน</string>
+    <string name="regional_band_entry_taiwan">ไต้หวัน</string>
+    <string name="regional_band_entry_turkey">ตุรกี</string>
+    <string name="regional_band_entry_united_kingdom">สหราชอาณาจักร</string>
+    <string name="regional_band_entry_united_states">สหรัฐอเมริกา</string>
+    <string name="regional_band_entry_user_defined">ผู้ใช้กำหนดเอง</string>
+    <string name="regional_band_summary_north_america">อเมริกาเหนือ (87.5 ถึง 108.0 MHz ในระยะ 200 kHz)</string>
+    <string name="regional_band_summary_europe">ยุโรป (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_japan">ญี่ปุ่น (76.0 ถึง 90.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">ญี่ปุ่น (วงกว้าง) (90.0 ถึง 108.0 MHz ในระยะ 50 kHz)</string>
+    <string name="regional_band_summary_australia">ออสเตรเลีย (87.7 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_austria">ออสเตรีย (87.5 ถึง 108.0 MHz ในระยะ 50 kHz)</string>
+    <string name="regional_band_summary_belgium">เบลเยี่ยม (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_brazil">บราซิล (87.5 ถึง 108.0 MHz ในระยะ 200 kHz)</string>
+    <string name="regional_band_summary_china">จีน (87.0 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">สาธารณรัฐเช็ก (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_denmark">เดนมาร์ก (87.5 ถึง 108.0 MHz ในระยะ 50 kHz)</string>
+    <string name="regional_band_summary_finland">ฟินแลนด์ (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_france">ฝรั่งเศส (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_germany">เยอรมนี (87.5 ถึง 108.0 MHz ในระยะ 50 kHz)</string>
+    <string name="regional_band_summary_greece">กรีซ (87.5 ถึง 108.0 MHz ในระยะ 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">ฮ่องกง (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_india">อินเดีย (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">อินโดนีเซีย (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_ireland">ไอร์แลนด์ (87.5 ถึง 108.0 MHz ในระยะ 50 kHz)</string>
+    <string name="regional_band_summary_italy">อิตาลี (87.5 ถึง 108.0 MHz ในระยะ 50 kHz)</string>
+    <string name="regional_band_summary_korea">เกาหลี (87.5 ถึง 108.0 MHz ในระยะ 200 kHz)</string>
+    <string name="regional_band_summary_mexico">เม็กซิโก (88.1 ถึง 107.9 MHz ในระยะ 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">เนเธอร์แลนด์ (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">นิวซีแลนด์ (88.0 ถึง 107.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_norway">นอร์เวย์ (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_poland">โปแลนด์ (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_portugal">โปรตุเกส (87.5 ถึง 108.0 MHz ในระยะ 50 kHz)</string>
+    <string name="regional_band_summary_russia">รัสเซีย (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_singapore">สิงคโปร์ (88.0 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">สโลวาเกีย (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_spain">สเปน (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">สวิตเซอร์แลนด์ (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_sweden">สวีเดน (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">ไต้หวัน (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_turkey">ตุรกี (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">สหราชอาณาจักร (87.5 ถึง 108.0 MHz ในระยะ 100 kHz)</string>
+    <string name="regional_band_summary_united_states">สหรัฐอเมริกา (88.1 ถึง 107.9 MHz ในระยะ 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">ผู้ใช้กำหนดเอง</string>
+    <string name="aud_output_mode">รูปแบบเสียงออก</string>
+    <string name="audio_type_stereo">สเตอริโอ</string>
+    <string name="audio_type_mono">โมโน</string>
+    <string name="record_dur">ระยะเวลาการบันทึก</string>
+    <string name="auto_select_af">ความถี่อื่น</string>
+    <string name="settings_revert_defaults_title">กลับสู่ค่าเริ่มต้นจากโรงงาน</string>
+    <string name="settings_revert_defaults_summary">รีเซ็ตการตั้งค่าทั้งหมด</string>
+    <string name="settings_revert_confirm_title">ยืนยันการรีเซ็ต</string>
+    <string name="settings_revert_confirm_msg">การกระทำนี้จะล้างการตั้งค่าแอปทั้งหมด รวมถึงสถานีที่บันทึกไว้ด้วย ดำเนินการต่อหรือไม่</string>
+    <string name="no_storage">เชื่อมต่อ SD การ์ดก่อนเริ่มการบันทึก</string>
+    <string name="preparing_sd">กำลังเตรียม SD การ์ด…</string>
+    <string name="access_sd_fail">ไม่สามารถเข้าถึง SD การ์ด</string>
+    <string name="spaceIsLow_content">SD การ์ดของคุณกำลังจะเต็ม เปลี่ยนการตั้งค่าคุณภาพหรือลบไฟล์อื่น ๆ เพื่อให้มีพื้นที่ว่างเพิ่ม</string>
+    <string name="FMRecording_reach_size_limit">ถึงขีดจำกัดขนาดสูงสุด</string>
+    <string name="menu_scan_for_preset">ค้นหาเพื่อตั้งรายการล่วงหน้า</string>
+    <string name="fm_off">FM ถูกปิดอยู่</string>
+    <string name="fm_call">ไม่สามารถใช้ FM ได้ขณะกำลังใช้สาย</string>
+    <string name="alert_dialog_hint">ใส่ชื่อ</string>
+    <string name="search_dialog_title">ค้นหาสถานี</string>
+    <string name="fm_command_timeout_title">หมดเวลา</string>
+    <string name="fm_tune_timeout_msg">ไม่มีการตอบสนองจากการปรับคลื่นสถานีวิทยุ FM หากปัญหายังเกิดขึ้น กรุณาปิดวิทยุ FM แล้วเปิดใหม่อีกครั้ง</string>
+    <string name="fm_command_failed_title">การดำเนินการ FM ล้มเหลว</string>
+    <string name="fm_cmd_failed_msg">การดำเนินการ FM ล้มเหลว หากปัญหายังเกิดขึ้น ให้ลองปิดวิทยุ FM แล้วเปิดใหม่</string>
+    <string name="fm_cmd_failed_msg_hdmi">การดำเนินการ FM ล้มเหลว ไม่รองรับการใช้ FM และ HDMI ในเวลาเดียวกัน</string>
+    <string name="fm_cmd_failed_call_on">การดำเนินการ FM ล้มเหลว ไม่สามารถใช้ FM ขณะโทรออกได้</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">การบันทึก FM ของฉัน</string>
+    <string name="audio_db_album_name">การบันทึก FM</string>
+    <string name="audio_db_playlist_name">การบันทึก FM</string>
+    <string name="station_name">สถานี:</string>
+    <string name="station_exists">มีความถี่นี่อยู่แล้ว!</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="station_name_empty">ชื่อสถานีเว้นว่าง กรุณากรอกใหม่</string>
+    <string name="rt_plus_tags">แท็ก</string>
+    <string name="usr_def_band_min">ความถี่ต่ำสุด (MHz)</string>
+    <string name="usr_def_band_max">ความถี่สูงสุด (MHz)</string>
+    <string name="chanl_spacing">ระยะช่องสถานี</string>
+    <string name="set">ตั้งค่า</string>
+    <string name="user_defind_band_msg">ป้อนความถี่จาก 76.0 ถึง 108.0 MHz โดยมีช่องว่างอย่างน้อย 1 ช่อง และ 100 kHz ระหว่างความถี่ต่ำสุดและสูงสุด</string>
+    <string name="save_record_file">บันทึกไฟล์ FM ไปยัง \"<xliff:g id="record_file">%1$s</xliff:g>\" แล้ว</string>
+    <string name="fm_search_no_results">ไม่มีสถานีที่เข้ากันได้</string>
+    <string name="typ_All_stations">สถานีทั้งหมด</string>
+    <string name="typ_Culture">วัฒนธรรม</string>
+    <string name="typ_Current_affairs">เหตุการณ์ปัจจุบัน</string>
+    <string name="typ_Children">สำหรับเด็ก</string>
+    <string name="typ_Country">ดนตรีคันทรี่</string>
+    <string name="typ_Documentary">สารคดี</string>
+    <string name="typ_Drama">ดราม่า</string>
+    <string name="typ_Easy_listening">แนวเพลงฟังง่าย</string>
+    <string name="typ_Education">การศึกษา</string>
+    <string name="typ_Emergency">ฉุกเฉิน</string>
+    <string name="typ_Emergency_test">ทดสอบฉุกเฉิน</string>
+    <string name="typ_Finance">การเงิน</string>
+    <string name="typ_Folk">ดนตรีโฟล์ค</string>
+    <string name="typ_Information">ข้อมูล</string>
+    <string name="typ_Jazz">แนวเพลงแจ๊ส</string>
+    <string name="typ_Light_classical">คลาสสิกเบา ๆ</string>
+    <string name="typ_Leisure">เพื่อการพักผ่อน</string>
+    <string name="typ_News">ข่าว</string>
+    <string name="typ_National">เพลงประจำชาติ</string>
+    <string name="typ_Other">เพลงแนวอื่น</string>
+    <string name="typ_Oldies">แนวเพลงเก่า</string>
+    <string name="typ_Phone_in">โทรเข้า</string>
+    <string name="typ_Pop">เพลงป๊อป</string>
+    <string name="typ_Religion">ศาสนา</string>
+    <string name="typ_Rock">เพลงร็อค</string>
+    <string name="typ_Science">วิทยาศาสตร์</string>
+    <string name="typ_Serious_classical">คลาสสิกนุ่มลึก</string>
+    <string name="typ_Social_affairs">กิจการทางสังคม</string>
+    <string name="typ_Sport">กีฬา</string>
+    <string name="typ_Travel">การเดินทาง</string>
+    <string name="typ_Varied">แบบต่าง ๆ</string>
+    <string name="typ_Weather">สภาพอากาศ</string>
+    <string name="typ_Adult_hits">เพลงฮิตผู้ใหญ่</string>
+    <string name="typ_Classical">คลาสสิก</string>
+    <string name="typ_Classic_Rock">คลาสสิกร็อค</string>
+    <string name="typ_College">วิทยาลัย</string>
+    <string name="typ_Foreign_language">ภาษาต่างประเทศ</string>
+    <string name="typ_Hiphop">ฮิปฮอป</string>
+    <string name="typ_Nostalgia">คิดถึงบ้าน</string>
+    <string name="typ_Personality">บุคลิกลักษณะ</string>
+    <string name="typ_Public">สาธารณะ</string>
+    <string name="typ_Religious_music">เพลงทางศาสนา</string>
+    <string name="typ_Religious_talk">สนทนาทางศาสนา</string>
+    <string name="typ_Rhythm_and_Blues">แนวริทึมแอนด์บลูส์</string>
+    <string name="typ_Spanish_music">แนวเพลงสเปน</string>
+    <string name="typ_Spanish_talk">การสนทนาภาษาสเปน</string>
+    <string name="typ_Soft">ซอฟต์</string>
+    <string name="typ_Soft_Rock">ซอฟต์ร็อค</string>
+    <string name="typ_Soft_Rhythm_and_Blues">แนวซอฟต์ริทึมแอนด์บลูส์</string>
+    <string name="typ_Sports">กีฬา</string>
+    <string name="typ_Talk">สนทนา</string>
+    <string name="typ_Top_40">40 อันดับสูงสุด</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-tr/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-tr/arrays.xml
index cb1457b..3a3121a 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-tr/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Stereo</item>
+    <item>Mono</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Stereo</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 dakika</item>
+    <item>15 dakika</item>
+    <item>30 dakika</item>
+    <item>Durana kadar</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 dakika</item>
+    <item>30 dakika</item>
+    <item>45 dakika</item>
+    <item>1 saat</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-tr/strings.xml b/fmapp2/res/values-tr/strings.xml
new file mode 100644
index 0000000..99d2881
--- /dev/null
+++ b/fmapp2/res/values-tr/strings.xml
@@ -0,0 +1,232 @@
+<?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 Radyo</string>
+    <string name="tx_app_name">FM Verici</string>
+    <string name="menu_scan_start">Tara</string>
+    <string name="menu_scan_stop">Aramayı durdur</string>
+    <string name="menu_record_start">Kaydet</string>
+    <string name="menu_record_stop">Kaydı durdur</string>
+    <string name="menu_settings">Ayarlar</string>
+    <string name="menu_sleep">Uyku</string>
+    <string name="menu_sleep_cancel">Uykudan çık</string>
+    <string name="menu_all_channels">Tüm kanallar</string>
+    <string name="menu_display_tags">Etiketleri göster</string>
+    <string name="button_text_stop">Durdur</string>
+    <string name="msg_seeking">FM kanalı aranıyor\u2026</string>
+    <string name="msg_scanning">Tüm FM kanalları taranıyor\u2026</string>
+    <string name="msg_scanning_pty">\'<xliff:g id="pty_name">%1$s</xliff:g>\' için taranıyor\u2026</string>
+    <string name="msg_search_title"><xliff:g id="frequency_string">%1$s</xliff:g> MHz</string>
+    <string name="msg_searching_title">Listeleri otomatik seç</string>
+    <string name="msg_searching">Tanımlı liste oluşturmak için güçlü kanallar aranıyor\u2026</string>
+    <string name="msg_noantenna">FM radyoyu kullanmak için lütfen kulaklığı takınız</string>
+    <string name="dialog_sleep_title">Otomatik kapanma uyku süresi</string>
+    <string name="presetlist_select_name">\'<xliff:g id="presetlist_name">%1$s</xliff:g>\'i seçin</string>
+    <string name="presetlist_add_new">Yeni liste ekle</string>
+    <string name="dialog_presetlist_rename_title">İsim girin</string>
+    <string name="presetlist_autoselect_title">Otomatik seçimi onayla</string>
+    <string name="preset_replace">Değiştir</string>
+    <string name="preset_tune">Ayarla</string>
+    <string name="preset_rename">Yeniden adlandır</string>
+    <string name="preset_delete">Sil</string>
+    <string name="preset_search">\'<xliff:g id="preset_pi">%1$s</xliff:g>\'ı arayın</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Bölgesel bant</string>
+    <string name="regional_band_entry_north_america">Kuzey Amerika</string>
+    <string name="regional_band_entry_europe">Avrupa</string>
+    <string name="regional_band_entry_japan">Japonya</string>
+    <string name="regional_band_entry_japan_wide">Japonya (geniş)</string>
+    <string name="regional_band_entry_australia">Avustralya</string>
+    <string name="regional_band_entry_austria">Avusturya</string>
+    <string name="regional_band_entry_belgium">Belçika</string>
+    <string name="regional_band_entry_brazil">Brezilya</string>
+    <string name="regional_band_entry_china">Çin</string>
+    <string name="regional_band_entry_czech_republic">Çek Cumhuriyeti</string>
+    <string name="regional_band_entry_denmark">Danimarka</string>
+    <string name="regional_band_entry_finland">Finlandiya</string>
+    <string name="regional_band_entry_france">Fransa</string>
+    <string name="regional_band_entry_germany">Almanya</string>
+    <string name="regional_band_entry_greece">Yunanistan</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">Hindistan</string>
+    <string name="regional_band_entry_indonesia">Endonezya</string>
+    <string name="regional_band_entry_ireland">İrlanda</string>
+    <string name="regional_band_entry_italy">İtalya</string>
+    <string name="regional_band_entry_korea">Kore</string>
+    <string name="regional_band_entry_mexico">Meksika</string>
+    <string name="regional_band_entry_netherlands">Hollanda</string>
+    <string name="regional_band_entry_new_zealand">Yeni Zelanda</string>
+    <string name="regional_band_entry_norway">Norveç</string>
+    <string name="regional_band_entry_poland">Polonya</string>
+    <string name="regional_band_entry_portugal">Portekiz</string>
+    <string name="regional_band_entry_russia">Rusya</string>
+    <string name="regional_band_entry_singapore">Singapur</string>
+    <string name="regional_band_entry_slovakia">Slovakya</string>
+    <string name="regional_band_entry_spain">İspanya</string>
+    <string name="regional_band_entry_switzerland">İsviçre</string>
+    <string name="regional_band_entry_sweden">İsveç</string>
+    <string name="regional_band_entry_taiwan">Tayvan</string>
+    <string name="regional_band_entry_turkey">Türkiye</string>
+    <string name="regional_band_entry_united_kingdom">Birleşik Krallık</string>
+    <string name="regional_band_entry_united_states">Birleşik Devletler</string>
+    <string name="regional_band_entry_user_defined">Kullanıcı tanımlı bant</string>
+    <string name="regional_band_summary_north_america">Kuzey Amerika (87.5 - 108.0 MHz arası 200 kHz aralıklarla)</string>
+    <string name="regional_band_summary_europe">Avrupa (87.5 - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_japan">Japonya (76.0 MHz - 90.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_japan_wide">Japonya (geniş) (90.0 MHz - 108.0 MHz arası 50 kHz aralıklarla)</string>
+    <string name="regional_band_summary_australia">Avustralya (87.7 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_austria">Avusturya (87.5 MHz - 108.0 MHz arası 50 kHz aralıklarla)</string>
+    <string name="regional_band_summary_belgium">Belçika (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_brazil">Brezilya (87.5 MHz - 108.0 MHz arası 200 kHz aralıklarla)</string>
+    <string name="regional_band_summary_china">Çin (87.0 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_czech_republic">Çek Cumhuriyeti (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_denmark">Danimarka (87.5 MHz - 108.0 MHz arası 50 kHz aralıklarla)</string>
+    <string name="regional_band_summary_finland">Finlandiya (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_france">Fransa (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_germany">Almanya (87.5 MHz - 108.0 MHz arası 50 kHz aralıklarla)</string>
+    <string name="regional_band_summary_greece">Yunanistan (87.5 MHz - 108.0 MHz arası 50 kHz aralıklarla)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_india">Hindistan (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_indonesia">Endonezya (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_ireland">İrlanda (87.5 MHz - 108.0 MHz arası 50 kHz aralıklarla)</string>
+    <string name="regional_band_summary_italy">İtalya (87.5 MHz - 108.0 MHz arası 50 kHz aralıklarla)</string>
+    <string name="regional_band_summary_korea">Kore (87.5 MHz - 108.0 MHz arası 200 kHz aralıklarla)</string>
+    <string name="regional_band_summary_mexico">Meksika (88.1 MHz - 107.9 MHz arası 200 kHz aralıklarla)</string>
+    <string name="regional_band_summary_netherlands">Hollanda (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_new_zealand">Yeni Zelanda (88.0 MHz - 107.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_norway">Norveç (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_poland">Polonya (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_portugal">Portekiz (87.5 MHz - 108.0 MHz arası 50 kHz aralıklarla)</string>
+    <string name="regional_band_summary_russia">Rusya (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_singapore">Singapur (88.0 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_slovakia">Slovakya (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_spain">İspanya (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_switzerland">İsviçre (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_sweden">İsveç (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_taiwan">Tayvan (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_turkey">Türkiye (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_united_kingdom">Birleşik Krallık (87.5 MHz - 108.0 MHz arası 100 kHz aralıklarla)</string>
+    <string name="regional_band_summary_united_states">Birleşik Devletler (88.1 MHz - 107.9 MHz arası 200 kHz aralıklarla)</string>
+    <string name="regional_band_summary_user_defined">Kullanıcı tanımlı bant</string>
+    <string name="aud_output_mode">Ses çıkış modu</string>
+    <string name="audio_type_stereo">Stereo</string>
+    <string name="audio_type_mono">Mono</string>
+    <string name="record_dur">Kayıt süresi</string>
+    <string name="auto_select_af">Alternatif frekans</string>
+    <string name="settings_revert_defaults_title">Fabrika ayarlarına geri döndür</string>
+    <string name="settings_revert_defaults_summary">Tüm ayarları sıfırla</string>
+    <string name="settings_revert_confirm_title">Sıfırlamayı onaylayın</string>
+    <string name="settings_revert_confirm_msg">Tüm uygulama ayarları, kaydedilen listeler silinecek. Devam edilsin mi?</string>
+    <string name="no_storage">Kayda başlamadan önce SD kartı yerleştirin.</string>
+    <string name="preparing_sd">SD kart hazırlanıyor\u2026</string>
+    <string name="access_sd_fail">SD karta erişilemedi.</string>
+    <string name="spaceIsLow_content">SD kart depolama alanınız doluyor. Kalite ayarını değiştirin ya da yer açmak için birkaç dosya silin.</string>
+    <string name="FMRecording_reach_size_limit">Boyut limitine ulaşıldı.</string>
+    <string name="menu_scan_for_preset">Tanımlı listeleri tara</string>
+    <string name="fm_off">FM kapatıldı.</string>
+    <string name="fm_call">FM arama sırasında kullanılamaz.</string>
+    <string name="alert_dialog_hint">Bir isim girin</string>
+    <string name="search_dialog_title">Kanalları tara</string>
+    <string name="fm_command_timeout_title">Zaman aşımı</string>
+    <string name="fm_tune_timeout_msg">FM kanalı ayarlamak için cevap alınamadı. Eğer sorun devam ederse, lütfen FM\'i kapatın ve yeniden açın.</string>
+    <string name="fm_command_failed_title">FM işlemi başarısız oldu</string>
+    <string name="fm_cmd_failed_msg">FM işlemi başarısız oldu. Sorun devam ederse, lütfen FM\'i kapatın ve tekrar açın.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM işlemi başarısız oldu. FM ve HDMI eşzamanlılığı desteklenmiyor.</string>
+    <string name="fm_cmd_failed_call_on">FM işlemi başarısız oldu. FM sesine telefon konuşması sırasında izin verilmiyor.</string>
+    <string name="audio_db_artist_name">FM kayıtlarım</string>
+    <string name="audio_db_album_name">FM kayıtları</string>
+    <string name="audio_db_playlist_name">FM kayıtları</string>
+    <string name="station_name">Kanal:</string>
+    <string name="station_exists">Bu frekans zaten mevcut!</string>
+    <string name="station_list_delete_station">Sil: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">\'<xliff:g id="name">%s</xliff:g>\' kanalını silmek istediğinize emin misiniz?</string>
+    <string name="station_name_empty">Kanal ismi boş, lütfen tekrar girin.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' ismi zaten kullanılıyor, lütfen farklı bir isim giriniz.</string>
+    <string name="rt_plus_tags">Etiketler</string>
+    <string name="usr_def_band_min">En düşük frekans (MHz)</string>
+    <string name="usr_def_band_max">En yüksek frekans (MHz)</string>
+    <string name="chanl_spacing">Kanal aralığı</string>
+    <string name="set">Ayarla</string>
+    <string name="user_defind_band_msg">Minimum 1 kanal aralığı ve min ve maks frekansı arasında 100 kHz aralığa sahip 76.0\'dan 108.0 MHz\'e kadarki frekansı girin</string>
+    <string name="save_record_file">FM kayıt dosyası \'<xliff:g id="record_file">%1$s</xliff:g>\' yoluna kaydedildi</string>
+    <string name="fm_search_no_results">Uyumlu kanal bulunmadı</string>
+    <string name="typ_All_stations">Tüm kanallar</string>
+    <string name="typ_Culture">Kültür</string>
+    <string name="typ_Current_affairs">Güncel olaylar</string>
+    <string name="typ_Children">Çocuk programları</string>
+    <string name="typ_Country">Country müzik</string>
+    <string name="typ_Documentary">Belgesel</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Kolay dinlenen müzik</string>
+    <string name="typ_Education">Eğitim</string>
+    <string name="typ_Emergency">Acil</string>
+    <string name="typ_Emergency_test">Acil test</string>
+    <string name="typ_Finance">Finans</string>
+    <string name="typ_Folk">Halk müziği</string>
+    <string name="typ_Information">Bilgilendirme</string>
+    <string name="typ_Jazz">Caz müziği</string>
+    <string name="typ_Light_classical">Hafif klasik</string>
+    <string name="typ_Leisure">Boş zaman</string>
+    <string name="typ_News">Haberler</string>
+    <string name="typ_National">Ulusal müzik</string>
+    <string name="typ_Other">Diğer müzik</string>
+    <string name="typ_Oldies">Eskilerin müziği</string>
+    <string name="typ_Phone_in">Telefondan</string>
+    <string name="typ_Pop">Pop müzik</string>
+    <string name="typ_Religion">Dini</string>
+    <string name="typ_Rock">Rock müzik</string>
+    <string name="typ_Science">Bilim</string>
+    <string name="typ_Serious_classical">Ciddi klasik</string>
+    <string name="typ_Social_affairs">Sosyal olaylar</string>
+    <string name="typ_Sport">Spor</string>
+    <string name="typ_Travel">Seyahat</string>
+    <string name="typ_Varied">Çeşitli</string>
+    <string name="typ_Weather">Hava durumu</string>
+    <string name="typ_Adult_hits">Yetişkin hit</string>
+    <string name="typ_Classical">Klasik</string>
+    <string name="typ_Classic_Rock">Klasik Rock</string>
+    <string name="typ_College">Kolej</string>
+    <string name="typ_Foreign_language">Yabancı dil</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalji</string>
+    <string name="typ_Personality">Kişilik</string>
+    <string name="typ_Public">Halka açık</string>
+    <string name="typ_Religious_music">Dini müzik</string>
+    <string name="typ_Religious_talk">Dini sohbet</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm ve Blues</string>
+    <string name="typ_Spanish_music">İspanyol müziği</string>
+    <string name="typ_Spanish_talk">İspanyol konuşması</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm ve Blues</string>
+    <string name="typ_Sports">Spor</string>
+    <string name="typ_Talk">Sohbet</string>
+    <string name="typ_Top_40">En iyi 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-ug/arrays.xml
similarity index 67%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-ug/arrays.xml
index cb1457b..580ebee 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-ug/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>سىتېرېئو</item>
+    <item>رەڭسىز</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-ug/strings.xml b/fmapp2/res/values-ug/strings.xml
new file mode 100644
index 0000000..fdaac5e
--- /dev/null
+++ b/fmapp2/res/values-ug/strings.xml
@@ -0,0 +1,195 @@
+<?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 رادىيو</string>
+    <string name="tx_app_name">FM تارقاتقۇچ</string>
+    <string name="menu_scan_start">تەكشۈرۈش</string>
+    <string name="menu_scan_stop">ئىزدەشنى توختات</string>
+    <string name="menu_record_start">خاتىرىلەش</string>
+    <string name="menu_record_stop">خاتىرىلەشنى توختىتىش</string>
+    <string name="menu_settings">تەڭشەكلەر</string>
+    <string name="menu_sleep">ئۇخلىتىش</string>
+    <string name="menu_sleep_cancel">ئويغىتىش</string>
+    <string name="menu_all_channels">ھەممە قاناللار</string>
+    <string name="menu_display_tags">بەلگىلەرنى كۆرسىتىش</string>
+    <string name="button_text_stop">توختىتىش</string>
+    <string name="msg_seeking">FM قانىلى ئىزدەۋاتىدۇ\u2026</string>
+    <string name="msg_scanning">ھەممە FM قاناللىرىنى ئىزدەۋاتىدۇ\u2026</string>
+    <string name="msg_scanning_pty">ئىزدەۋاتقىنى \'<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">ئالدىن تاللاشنى ئۆزلۈكىدىن تاللاش</string>
+    <string name="msg_searching">سىگنالى كۈچەيتىلگەن پونكىتنى ئىزدەپ بىر تىزىملىك قۇرۋاتىدۇ\u2026</string>
+    <string name="msg_noantenna">تېڭىشىغۇچ سېلىپ FM رادىئوسىنى ئاڭلاڭ</string>
+    <string name="dialog_sleep_title">ئۇخلاش ۋاقتىدا ئاپتۇماتېك تاقىلىش</string>
+    <string name="presetlist_select_name">تاللاڭ \"<xliff:g id="presetlist_name">%1$s</xliff:g>\"</string>
+    <string name="presetlist_add_new">يېڭى تىزىملىك قوشۇش</string>
+    <string name="dialog_presetlist_rename_title">ئىسىم كىرگۈزۈڭ</string>
+    <string name="presetlist_autoselect_title">ئاپتۇماتېك تاللاشنى جەزىملەش</string>
+    <string name="preset_replace">ئالماشتۇرۈش</string>
+    <string name="preset_tune">سىمفونىيە</string>
+    <string name="preset_rename">ئىسمىنى ئۆزگەرتىش</string>
+    <string name="preset_delete">ئۆچۈرۈش</string>
+    <string name="preset_search">ئىزدەش \"<xliff:g id="preset_pi">%1$s</xliff:g>\"</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">رايون دولقۇن بۆلىكى</string>
+    <string name="regional_band_entry_north_america">شىمالىي ئامېرىكا</string>
+    <string name="regional_band_entry_europe">ياۋروپا</string>
+    <string name="regional_band_entry_japan">ياپونىيە</string>
+    <string name="regional_band_entry_japan_wide">ياپونىيە (كەڭ)</string>
+    <string name="regional_band_entry_australia">ئاۋسترالىيە</string>
+    <string name="regional_band_entry_austria">ئاۋسترىيە</string>
+    <string name="regional_band_entry_belgium">بىلگىيە</string>
+    <string name="regional_band_entry_brazil">بىرازىلىيە</string>
+    <string name="regional_band_entry_china">جۇڭگو</string>
+    <string name="regional_band_entry_czech_republic">چېخ جۇمھۇرىيىتى</string>
+    <string name="regional_band_entry_denmark">دانىيە</string>
+    <string name="regional_band_entry_finland">فىنلاندىيە</string>
+    <string name="regional_band_entry_france">فىرانسىيە</string>
+    <string name="regional_band_entry_germany">گېرمانىيە</string>
+    <string name="regional_band_entry_greece">گىرېتسىيە</string>
+    <string name="regional_band_entry_hong_kong">شياڭگاڭ</string>
+    <string name="regional_band_entry_india">ھىندىستان</string>
+    <string name="regional_band_entry_indonesia">ھىندونېزىيە</string>
+    <string name="regional_band_entry_ireland">ئىرلاندىيە</string>
+    <string name="regional_band_entry_italy">ئىتالىيە</string>
+    <string name="regional_band_entry_korea">كورېيە</string>
+    <string name="regional_band_entry_mexico">مېكسىكا</string>
+    <string name="regional_band_entry_netherlands">گوللاندىيە</string>
+    <string name="regional_band_entry_new_zealand">يېڭى زىلاندىيە</string>
+    <string name="regional_band_entry_norway">نورۋېگىيە</string>
+    <string name="regional_band_entry_poland">پولشا</string>
+    <string name="regional_band_entry_portugal">پورتۇگالىيە</string>
+    <string name="regional_band_entry_russia">رۇسىيە</string>
+    <string name="regional_band_entry_singapore">سىنگاپور</string>
+    <string name="regional_band_entry_slovakia">سىلوۋاكىيە</string>
+    <string name="regional_band_entry_spain">ئىسپانىيە</string>
+    <string name="regional_band_entry_switzerland">شىۋېتسارىيە</string>
+    <string name="regional_band_entry_sweden">شىۋېتسىيە</string>
+    <string name="regional_band_entry_taiwan">تەيۋەن</string>
+    <string name="regional_band_entry_turkey">تۈركىيە</string>
+    <string name="regional_band_entry_united_kingdom">ئەنگلىيە</string>
+    <string name="regional_band_entry_united_states">ئامېرىكا قوشما شتاتلىرى</string>
+    <string name="regional_band_entry_user_defined">ئىشلەتكۈچى بەلگىلىگەن چاستوتا</string>
+    <string name="regional_band_summary_user_defined">ئىشلەتكۈچى بەلگىلىگەن چاستوتا</string>
+    <string name="aud_output_mode">ئاۋاز چاستوتىسى چىقىرىش ھالىتى</string>
+    <string name="audio_type_stereo">سىتېرېئو</string>
+    <string name="audio_type_mono">رەڭسىز</string>
+    <string name="record_dur">ئۈن ئېلىش ئۇزۇنلىقى</string>
+    <string name="auto_select_af">زاپاس چاستوتا</string>
+    <string name="settings_revert_defaults_title">زاۋۇتتىن چىققان ھالەتكە قايتۇرۇش</string>
+    <string name="settings_revert_defaults_summary">بارلىق تەڭشەكنى تازىلاش</string>
+    <string name="settings_revert_confirm_title">قايتا بېكىتىشنى جەزىملەش</string>
+    <string name="settings_revert_confirm_msg">بۇ بارلىق ئەپنىڭ تەڭشىكىنى يۇيۋېتىدۇ، داۋاملاشتۇرامسىز؟</string>
+    <string name="no_storage">ئۈنگە ئېلىشتىن ئىلگىرى SD كارتىنى ئېگەرلەڭ.</string>
+    <string name="preparing_sd">SD كارتا تەييارلاۋاتىدۇ…</string>
+    <string name="access_sd_fail">SD كارتىنى زىيارەت قىلالمايدۇ.</string>
+    <string name="spaceIsLow_content">سىزنىڭ SD كارتىڭىزدا بوشلۇق يېتىشمىدى. سۈپەت تەڭشىكىنى ئۆزگەرتىڭ ياكى باشقا ھۆججەتنى ئۆچۈرۈپ بوشلۇق ئاجىرىتىڭ.</string>
+    <string name="FMRecording_reach_size_limit">چوڭلۇق چېكىگە يەتتى.</string>
+    <string name="menu_scan_for_preset">ئالدىن بېكىتمىنى سىكاننېرلاش</string>
+    <string name="fm_off">FM تاقالدى.</string>
+    <string name="fm_call">سۆزلىشىۋاتقاندا FM نى ئىشلەتكىلى بولمايدۇ.</string>
+    <string name="alert_dialog_hint">بىر ئىسىم كىرگۈزۈڭ</string>
+    <string name="search_dialog_title">پونكىت ئىزدەۋاتىدۇ</string>
+    <string name="fm_command_timeout_title">ۋاقىت ھالقىش</string>
+    <string name="fm_tune_timeout_msg">FM پونكىتىدىن كەلگەن ئۇچۇرنى تاپشۇرۇپ ئالالمىدۇق. ئەگەر يەنىلا مەسىلە بولسا، FM تاقاپ قايتا قوزغىتىڭ.</string>
+    <string name="fm_command_failed_title">FDN مەشغۇلاتى مەغلۇپ بولدى</string>
+    <string name="fm_cmd_failed_msg">FM مەشخۇلاتى مەغلۇب بولدى. ئەگەر يەنىلا مەسىلە بولسا، FM تاقاپ قايتا قوزغىتىڭ.</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM مەشخۇلاتى مەغلۇب بولدى. FM ۋە HDMI بىرگە ئەۋەتىشنى قوللىمايدۇ.</string>
+    <string name="fm_cmd_failed_call_on">FM مەشخۇلاتى مەغلۇب بولدى. سۆزلىشىش جەريانىدا FM ئاۋاز چاستوتىسى چەكلىنىدۇ.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">مېنىڭ FM ئۈن خاتىرەم</string>
+    <string name="audio_db_album_name">FM ئۈن خاتىرىلەر</string>
+    <string name="audio_db_playlist_name">FM ئۈن خاتىرىلەر</string>
+    <string name="station_name">پونكىت:</string>
+    <string name="station_exists">بۇ چاستوتا مەۋجۇت!</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="station_name_empty">پونكىت ئىسمى قۇرۇق بولسا بولمايدۇ، قايتا كىرگۈزۈڭ.</string>
+    <string name="station_name_exist">ئىسىم \"<xliff:g id="name">%s</xliff:g>\" ئىشلىتىپ بۇلۇنغان، قايتا ئوخشىمىغان ئىسىم كىرگۈزۈڭ.</string>
+    <string name="rt_plus_tags">خەتكۈچلەر</string>
+    <string name="usr_def_band_min">ئەڭ تۆۋەن چاستوتا(MHz)</string>
+    <string name="usr_def_band_max">ئەڭ يوقىرى چاستوتا(MHz)</string>
+    <string name="chanl_spacing">چاستوتا ئارىلىقى</string>
+    <string name="set">تەڭشەك</string>
+    <string name="save_record_file">FM ئۈن خاتىرە ھۆججىتى <xliff:g id="record_file">%1$s</xliff:g> غا ساقلاندى</string>
+    <string name="fm_search_no_results">ماسلىشىشچان چاستوتا تاپالمىدى</string>
+    <string name="typ_All_stations">بارلىق ئىستانسىلار</string>
+    <string name="typ_Culture">مەدەنىيەت</string>
+    <string name="typ_Current_affairs">نۆۋەتتىكى ئىشلار</string>
+    <string name="typ_Children">بالىلار پىروگراممىسى</string>
+    <string name="typ_Country">سەھرا نەغمىسى</string>
+    <string name="typ_Documentary">ھۆججەتلىك فىلىم</string>
+    <string name="typ_Drama">دراما</string>
+    <string name="typ_Easy_listening">لەرزان نەغمە</string>
+    <string name="typ_Education">مائارىپ</string>
+    <string name="typ_Emergency">جىددىي ئەھۋال</string>
+    <string name="typ_Emergency_test">جىددىي سىناق</string>
+    <string name="typ_Finance">ئىقتىساد</string>
+    <string name="typ_Folk">ئەل ئارا نەغمە</string>
+    <string name="typ_Information">ئۇچۇر</string>
+    <string name="typ_Jazz">جاز نەغمە</string>
+    <string name="typ_Light_classical">يىنىك كىلاسسىك</string>
+    <string name="typ_Leisure">لەرزان</string>
+    <string name="typ_News">خەۋەرلەر</string>
+    <string name="typ_National">مىللىي نەغمە</string>
+    <string name="typ_Other">باشقا نەغمە</string>
+    <string name="typ_Oldies">قەدىمكى نەغمە</string>
+    <string name="typ_Phone_in">تېلېفوندىن</string>
+    <string name="typ_Pop">مودا نەغمە</string>
+    <string name="typ_Religion">دىنى</string>
+    <string name="typ_Rock">روك نەغمە</string>
+    <string name="typ_Science">ئىلىم-پەن</string>
+    <string name="typ_Serious_classical">جىددىي كىلاسسىك</string>
+    <string name="typ_Social_affairs">ئىجتىمائىي ئىشلار</string>
+    <string name="typ_Sport">تەنتەربىيە</string>
+    <string name="typ_Travel">ساياھەت</string>
+    <string name="typ_Varied">خىلمۇ-خىل</string>
+    <string name="typ_Weather">ھاۋارايى</string>
+    <string name="typ_Adult_hits">چوڭلار نەغمىسى</string>
+    <string name="typ_Classical">كىلاسسىك</string>
+    <string name="typ_Classic_Rock">كىلاسسىك روك</string>
+    <string name="typ_College">مەكتەپ</string>
+    <string name="typ_Foreign_language">چەتئەل تىلى</string>
+    <string name="typ_Hiphop">خىپخوپ</string>
+    <string name="typ_Nostalgia">يۇرتىنى سېغىنىش</string>
+    <string name="typ_Personality">خاسلىق</string>
+    <string name="typ_Public">ئاممىۋى</string>
+    <string name="typ_Religious_music">دىنىي نەغمە</string>
+    <string name="typ_Religious_talk">دىنىي سۆھبەت</string>
+    <string name="typ_Rhythm_and_Blues">رىتىم ۋە بىلۇز</string>
+    <string name="typ_Spanish_music">ئىسپانىيە مۇزىكىسى</string>
+    <string name="typ_Spanish_talk">ئىسپانىيە پارىڭى</string>
+    <string name="typ_Soft">يۇمشاق</string>
+    <string name="typ_Soft_Rock">يۇمشاق تولغىما ئۇسسۇل</string>
+    <string name="typ_Soft_Rhythm_and_Blues">يۇمشاق رىتىم ۋە بىلۇز</string>
+    <string name="typ_Sports">تەنتەربىيە</string>
+    <string name="typ_Talk">سۆھبەت</string>
+    <string name="typ_Top_40">ئالدىنقى 40</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-uk/arrays.xml
similarity index 63%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-uk/arrays.xml
index cb1457b..46f89d8 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-uk/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Стерео</item>
+    <item>Моно</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 кГц</item>
+    <item>100 кГц</item>
+    <item>200 кГц</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-uk/strings.xml b/fmapp2/res/values-uk/strings.xml
new file mode 100644
index 0000000..c8282c6
--- /dev/null
+++ b/fmapp2/res/values-uk/strings.xml
@@ -0,0 +1,231 @@
+<?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-радіо</string>
+    <string name="tx_app_name">FM-передавач</string>
+    <string name="menu_scan_start">Сканувати</string>
+    <string name="menu_scan_stop">Зупинити пошук</string>
+    <string name="menu_record_start">Запис</string>
+    <string name="menu_record_stop">Зупинити запис</string>
+    <string name="menu_settings">Налаштування</string>
+    <string name="menu_sleep">Спати</string>
+    <string name="menu_sleep_cancel">Скасувати сон</string>
+    <string name="menu_all_channels">Всі канали</string>
+    <string name="menu_display_tags">Показати мітки</string>
+    <string name="button_text_stop">Зупинити</string>
+    <string name="msg_seeking">Пошук FM станції\u2026</string>
+    <string name="msg_scanning">Сканування всіх FM станцій\u2026</string>
+    <string name="msg_scanning_pty">Сканування <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">Автопошук станцій</string>
+    <string name="msg_searching">Сканування радіостанцій з потужним сигналом та створення їх каталогу\u2026</string>
+    <string name="msg_noantenna">Підключіть будь-ласка навушники аби користуватись FM-радіо</string>
+    <string name="dialog_sleep_title">Час автовідключення</string>
+    <string name="presetlist_select_name">Вибір \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Додати новий список</string>
+    <string name="dialog_presetlist_rename_title">Введіть ім\'я</string>
+    <string name="presetlist_autoselect_title">Підтвердіть автоматичний вибір</string>
+    <string name="preset_replace">Замінити</string>
+    <string name="preset_tune">Налаштувати</string>
+    <string name="preset_rename">Перейменувати</string>
+    <string name="preset_delete">Видалити</string>
+    <string name="preset_search">Шукати за \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' МГц</string>
+    <string name="regional_band">Регіональний діапазон</string>
+    <string name="regional_band_entry_north_america">Північна Америка</string>
+    <string name="regional_band_entry_europe">Європа</string>
+    <string name="regional_band_entry_japan">Японія</string>
+    <string name="regional_band_entry_japan_wide">Японія (широкий)</string>
+    <string name="regional_band_entry_australia">Австралія</string>
+    <string name="regional_band_entry_austria">Австрія</string>
+    <string name="regional_band_entry_belgium">Бельгія</string>
+    <string name="regional_band_entry_brazil">Бразилія</string>
+    <string name="regional_band_entry_china">Китай</string>
+    <string name="regional_band_entry_czech_republic">Чеська Республіка</string>
+    <string name="regional_band_entry_denmark">Данія</string>
+    <string name="regional_band_entry_finland">Фінляндія</string>
+    <string name="regional_band_entry_france">Франція</string>
+    <string name="regional_band_entry_germany">Німеччина</string>
+    <string name="regional_band_entry_greece">Греція</string>
+    <string name="regional_band_entry_hong_kong">Гонконг</string>
+    <string name="regional_band_entry_india">Індія</string>
+    <string name="regional_band_entry_indonesia">Індонезія</string>
+    <string name="regional_band_entry_ireland">Ірландія</string>
+    <string name="regional_band_entry_italy">Італія</string>
+    <string name="regional_band_entry_korea">Корея</string>
+    <string name="regional_band_entry_mexico">Мексика</string>
+    <string name="regional_band_entry_netherlands">Нідерланди</string>
+    <string name="regional_band_entry_new_zealand">Нова Зеландія</string>
+    <string name="regional_band_entry_norway">Норвегія</string>
+    <string name="regional_band_entry_poland">Польща</string>
+    <string name="regional_band_entry_portugal">Португалія</string>
+    <string name="regional_band_entry_russia">Росія</string>
+    <string name="regional_band_entry_singapore">Сингапур</string>
+    <string name="regional_band_entry_slovakia">Словакія</string>
+    <string name="regional_band_entry_spain">Іспанія</string>
+    <string name="regional_band_entry_switzerland">Швейцарія</string>
+    <string name="regional_band_entry_sweden">Швеція</string>
+    <string name="regional_band_entry_taiwan">Тайвань</string>
+    <string name="regional_band_entry_turkey">Туреччина</string>
+    <string name="regional_band_entry_united_kingdom">Великобританія</string>
+    <string name="regional_band_entry_united_states">Великобританія</string>
+    <string name="regional_band_entry_user_defined">Користувацька смуга частот</string>
+    <string name="regional_band_summary_north_america">Північна Америка (від 87.5 МГц до 108.0 МГц з кроком у 200 кГц)</string>
+    <string name="regional_band_summary_europe">Європа (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_japan">Японія (від 76.0 МГц до 90.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_japan_wide">Японія (широкий осяг) (від 90.0 МГц до 108.0 МГц з кроком у 50 кГц)</string>
+    <string name="regional_band_summary_australia">Австралія (від 87.7 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_austria">Австрія (від 87.5 МГц до 108.0 МГц з кроком у 50 кГц)</string>
+    <string name="regional_band_summary_belgium">Бельгія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_brazil">Бразилія (від 87.5 МГц до 108.0 МГц з кроком у 200 кГц)</string>
+    <string name="regional_band_summary_china">Китай (від 87.0 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_czech_republic">Чехія (від 87.5 MHz до 108.0 MHz у межах 100 kHz)</string>
+    <string name="regional_band_summary_denmark">Данія (від 87.5 МГц до 108.0 МГц з кроком у 50 кГц)</string>
+    <string name="regional_band_summary_finland">Фінляндія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_france">Франція (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_germany">Німеччина (від 87.5 МГц до 108.0 МГц з кроком у 50 кГц)</string>
+    <string name="regional_band_summary_greece">Греція (від 87.5 МГц до 108.0 МГц з кроком у 50 кГц)</string>
+    <string name="regional_band_summary_hong_kong">Гонконг (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_india">Індія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_indonesia">Індонезія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_ireland">Ірландія (від 87.5 МГц до 108.0 МГц з кроком у 50 кГц)</string>
+    <string name="regional_band_summary_italy">Італія (від 87.5 МГц до 108.0 МГц з кроком у 50 кГц)</string>
+    <string name="regional_band_summary_korea">Корея (від 87.5 МГц до 108.0 МГц з кроком у 200 кГц)</string>
+    <string name="regional_band_summary_mexico">Мексика (від 88,1 МГц 107,9 МГц з кроком у 200 кГц)</string>
+    <string name="regional_band_summary_netherlands">Нідерланди (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_new_zealand">Нова Зеландія (від 88.0 МГц до 107.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_norway">Норвегія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_poland">Польща (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_portugal">Португалія (від 87.5 МГц до 108.0 МГц з кроком у 50 кГц)</string>
+    <string name="regional_band_summary_russia">Росія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_singapore">Сингапур (від 88.0 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_slovakia">Словаччина (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_spain">Іспанія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_switzerland">Швейцарія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_sweden">Швеція (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_taiwan">Тайвань (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_turkey">Туреччина (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_united_kingdom">Велика Британія (від 87.5 МГц до 108.0 МГц з кроком у 100 кГц)</string>
+    <string name="regional_band_summary_united_states">США (від 88.1 МГц 107.9 МГц з кроком у 200 кГц)</string>
+    <string name="regional_band_summary_user_defined">Користувацька смуга частот</string>
+    <string name="aud_output_mode">Режим відтворення звуку</string>
+    <string name="audio_type_stereo">Стерео</string>
+    <string name="audio_type_mono">Монохром</string>
+    <string name="record_dur">Тривалість запису</string>
+    <string name="auto_select_af">Альтернативна частота</string>
+    <string name="settings_revert_defaults_title">Повернути типові налаштування</string>
+    <string name="settings_revert_defaults_summary">Скинути всі налаштування</string>
+    <string name="settings_revert_confirm_title">Підтвердіть скидання</string>
+    <string name="settings_revert_confirm_msg">Це видалить всі налаштування додатку, включно із збереженими радіостанціями. Продовжити?</string>
+    <string name="no_storage">Змонтувати SD-карту перед початком запису.</string>
+    <string name="preparing_sd">Підготовка SD-карти\u2026</string>
+    <string name="access_sd_fail">Не вдалося відкрити SD-карту.</string>
+    <string name="spaceIsLow_content">Закінчується місце на вашій SD-карті. Змініть якість в налаштуваннях або ж видаліть зображення чи інші файли.</string>
+    <string name="FMRecording_reach_size_limit">Досягнуто обмеження розміру.</string>
+    <string name="menu_scan_for_preset">Сканувати за попередніми налаштуваннями</string>
+    <string name="fm_off">FM-радіо вимкнено.</string>
+    <string name="fm_call">FM-радіо не може використовуватись при дзвінках.</string>
+    <string name="alert_dialog_hint">Вкажіть назву</string>
+    <string name="search_dialog_title">Сканувати станції</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">Операція неможлива. Якщо проблема не зникне, вимкніть FM-радіо і увімкніть його знову.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Одночасне використання FM-радіо і HDMI неможливо.</string>
+    <string name="fm_cmd_failed_call_on">Використання FM-радіо під час телефонного дзвінка неможливо.</string>
+    <string name="audio_db_artist_name">Мої записи з FM</string>
+    <string name="audio_db_album_name">Записи з FM</string>
+    <string name="audio_db_playlist_name">Записи з FM</string>
+    <string name="station_name">Станція:</string>
+    <string name="station_exists">Ця частота вже існує!</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="station_name_empty">Порожня назва станції, будь ласка, введіть ще раз.</string>
+    <string name="rt_plus_tags">Мітки</string>
+    <string name="usr_def_band_min">Найнижчі частоти (МГц)</string>
+    <string name="usr_def_band_max">Найвищі частоти (МГц)</string>
+    <string name="chanl_spacing">Крок каналів</string>
+    <string name="set">Встановити</string>
+    <string name="user_defind_band_msg">Введіть частоту в межах 76,0-108,0 МГц з мінімальним інтервалом в 1 канал та відступом в 100 кГц від мінімальної і максимальної частоти</string>
+    <string name="save_record_file">Записаний з FM файл збережено до \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Не знайдено сумісних станцій</string>
+    <string name="typ_All_stations">Всі станції</string>
+    <string name="typ_Culture">Культура</string>
+    <string name="typ_Current_affairs">Поточні події</string>
+    <string name="typ_Children">Дитячі програми</string>
+    <string name="typ_Country">Музика кантрі</string>
+    <string name="typ_Documentary">Документалістика</string>
+    <string name="typ_Drama">Драма</string>
+    <string name="typ_Easy_listening">Легка музика</string>
+    <string name="typ_Education">Освіта</string>
+    <string name="typ_Emergency">Аварійний</string>
+    <string name="typ_Emergency_test">Аварійний тест</string>
+    <string name="typ_Finance">Фінанси</string>
+    <string name="typ_Folk">Народна музика</string>
+    <string name="typ_Information">Інформація</string>
+    <string name="typ_Jazz">Джазова музика</string>
+    <string name="typ_Light_classical">Легка класична</string>
+    <string name="typ_Leisure">Дозвілля</string>
+    <string name="typ_News">Новини</string>
+    <string name="typ_National">Етнічна музика</string>
+    <string name="typ_Other">Інша музика</string>
+    <string name="typ_Oldies">Стара музика</string>
+    <string name="typ_Phone_in">Телефон в</string>
+    <string name="typ_Pop">Поп-музика</string>
+    <string name="typ_Religion">Релігія</string>
+    <string name="typ_Rock">Рок-музика</string>
+    <string name="typ_Science">Наука</string>
+    <string name="typ_Serious_classical">Серйозна класика</string>
+    <string name="typ_Social_affairs">Соціальні питання</string>
+    <string name="typ_Sport">Спорт</string>
+    <string name="typ_Travel">Подорожі</string>
+    <string name="typ_Varied">Різне</string>
+    <string name="typ_Weather">Погода</string>
+    <string name="typ_Adult_hits">Хіти для дорослих</string>
+    <string name="typ_Classical">Класика</string>
+    <string name="typ_Classic_Rock">Класичний рок</string>
+    <string name="typ_College">Коледж</string>
+    <string name="typ_Foreign_language">Іншомовне</string>
+    <string name="typ_Hiphop">Хіп-хоп</string>
+    <string name="typ_Nostalgia">Ностальгія</string>
+    <string name="typ_Personality">Особистість</string>
+    <string name="typ_Public">Громадський</string>
+    <string name="typ_Religious_music">Релігійна музика</string>
+    <string name="typ_Religious_talk">Релігійні розмови</string>
+    <string name="typ_Rhythm_and_Blues">Ритм-енд-блюз</string>
+    <string name="typ_Spanish_music">Іспанська музика</string>
+    <string name="typ_Spanish_talk">Іспанські передачі</string>
+    <string name="typ_Soft">Легкий</string>
+    <string name="typ_Soft_Rock">Легкий рок</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Легкий ритм-енд-блюз</string>
+    <string name="typ_Sports">Спорт</string>
+    <string name="typ_Talk">Розмови</string>
+    <string name="typ_Top_40">40 кращих</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-vi/arrays.xml
similarity index 64%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-vi/arrays.xml
index cb1457b..0822c13 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-vi/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>Âm thanh nổi</item>
+    <item>Âm thanh đơn</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <item>Âm thanh nổi</item>
+  </string-array>
+  <string-array name="record_durations_entries">
+    <item>5 phút</item>
+    <item>15 phút</item>
+    <item>30 phút</item>
+    <item>Cho đến khi ngừng</item>
+  </string-array>
+  <string-array name="sleep_duration_values">
+    <item>15 phút</item>
+    <item>30 phút</item>
+    <item>45 phút</item>
+    <item>1 giờ</item>
+  </string-array>
+  <string-array name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-vi/strings.xml b/fmapp2/res/values-vi/strings.xml
new file mode 100644
index 0000000..ee922ec
--- /dev/null
+++ b/fmapp2/res/values-vi/strings.xml
@@ -0,0 +1,233 @@
+<?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 Transmitter</string>
+    <string name="menu_scan_start">Dò</string>
+    <string name="menu_scan_stop">Dừng tìm kiếm</string>
+    <string name="menu_record_start">Ghi âm</string>
+    <string name="menu_record_stop">Dừng ghi âm</string>
+    <string name="menu_settings">Cài đặt</string>
+    <string name="menu_sleep">Hẹn giờ tắt</string>
+    <string name="menu_sleep_cancel">Bỏ tắt</string>
+    <string name="menu_all_channels">Tất cả kênh</string>
+    <string name="menu_display_tags">Hiện thẻ</string>
+    <string name="button_text_stop">Dừng</string>
+    <string name="msg_seeking">Đang tìm đài FM\u2026</string>
+    <string name="msg_scanning">Đang dò tất cả các đài FM\u2026</string>
+    <string name="msg_scanning_pty">Đang dò \'<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">Tự chọn cài đặt sẵn</string>
+    <string name="msg_searching">Đang tìm các đài mạnh để tạo danh sách cài đặt sẵn\u2026</string>
+    <string name="msg_noantenna">Hãy cắm tai nghe để sử dụng FM radio</string>
+    <string name="dialog_sleep_title">Thời gian tự động tắt chế độ ngủ</string>
+    <string name="presetlist_select_name">Chọn \'<xliff:g id="presetlist_name">%1$s</xliff:g>\'</string>
+    <string name="presetlist_add_new">Thêm danh sách mới</string>
+    <string name="dialog_presetlist_rename_title">Nhập tên</string>
+    <string name="presetlist_autoselect_title">Xác nhận tự động lựa chọn</string>
+    <string name="preset_replace">Thay thế</string>
+    <string name="preset_tune">Dò đài</string>
+    <string name="preset_rename">Đổi tên</string>
+    <string name="preset_delete">Xóa</string>
+    <string name="preset_search">Tìm kiếm \'<xliff:g id="preset_pi">%1$s</xliff:g>\'</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">Ban nhạc khu vực</string>
+    <string name="regional_band_entry_north_america">Bắc Mỹ</string>
+    <string name="regional_band_entry_europe">Châu Âu</string>
+    <string name="regional_band_entry_japan">Nhật Bản</string>
+    <string name="regional_band_entry_japan_wide">Nhật Bản (rộng)</string>
+    <string name="regional_band_entry_australia">Úc</string>
+    <string name="regional_band_entry_austria">Áo</string>
+    <string name="regional_band_entry_belgium">Bỉ</string>
+    <string name="regional_band_entry_brazil">Brazil</string>
+    <string name="regional_band_entry_china">Trung Quốc</string>
+    <string name="regional_band_entry_czech_republic">Séc</string>
+    <string name="regional_band_entry_denmark">Đan Mạch</string>
+    <string name="regional_band_entry_finland">Phần Lan</string>
+    <string name="regional_band_entry_france">Pháp</string>
+    <string name="regional_band_entry_germany">Đức</string>
+    <string name="regional_band_entry_greece">Hy Lạp</string>
+    <string name="regional_band_entry_hong_kong">Hồng Kông</string>
+    <string name="regional_band_entry_india">Ấn Độ</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Ai Len</string>
+    <string name="regional_band_entry_italy">Ý</string>
+    <string name="regional_band_entry_korea">Hàn Quốc</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Hà Lan</string>
+    <string name="regional_band_entry_new_zealand">New Zealand</string>
+    <string name="regional_band_entry_norway">Na Uy</string>
+    <string name="regional_band_entry_poland">Ba Lan</string>
+    <string name="regional_band_entry_portugal">Bồ Đào Nha</string>
+    <string name="regional_band_entry_russia">Nga</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Tây Ban Nha</string>
+    <string name="regional_band_entry_switzerland">Thuỵ Sỹ</string>
+    <string name="regional_band_entry_sweden">Thuỵ Điển</string>
+    <string name="regional_band_entry_taiwan">Đài Loan</string>
+    <string name="regional_band_entry_turkey">Thổ Nhĩ Kỳ</string>
+    <string name="regional_band_entry_united_kingdom">Anh </string>
+    <string name="regional_band_entry_united_states">Hoa Kỳ</string>
+    <string name="regional_band_entry_user_defined">Băng tần do người dùng xác định</string>
+    <string name="regional_band_summary_north_america">Bắc Mỹ (87.5MHz đến 108.0MHz trong bước sóng 200 KHz)</string>
+    <string name="regional_band_summary_europe">Châu Âu (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_japan">Nhật Bản (76.0MHz đến 90.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_japan_wide">Nhật Bản (rộng) (90.0 MHz đến 108.0 MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_australia">Úc (87.7 MHz đến 108.0 MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_austria">Áo (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_belgium">Bỉ (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5MHz đến 108.0MHz trong bước sóng 200 KHz)</string>
+    <string name="regional_band_summary_china">Trung Quốc (87.0MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_czech_republic">Cộng hoà Séc (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_denmark">Đan Mạch (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_finland">Phần Lan (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_france">Pháp (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_germany">Đức (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_greece">Hy Lạp (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_hong_kong">Hồng Kông (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_india">Ấn Độ (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_ireland">Ai Len (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_italy">Ý (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_korea">Hàn Quốc (87.5MHz đến 108.0MHz trong bước sóng 200 KHz)</string>
+    <string name="regional_band_summary_mexico">Mexico (88.1MHz đến 107.9MHz trong bước sóng 200 KHz)</string>
+    <string name="regional_band_summary_netherlands">Hà Lan (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_new_zealand">New Zealand (88.0MHz đến 107.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_norway">Na Uy (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_poland">Phần Lan (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_portugal">Bồ Đào Nha (87.5MHz đến 108.0MHz trong bước sóng 50 KHz)</string>
+    <string name="regional_band_summary_russia">Nga (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_slovakia">Slovakia (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_spain">Tây Ban Nha (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_switzerland">Thụy Sỹ (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_sweden">Thụy Điển (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_taiwan">Đài Loan (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_turkey">Thổ Nhĩ Kỳ (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_united_kingdom">Vương Quốc Anh (87.5MHz đến 108.0MHz trong bước sóng 100 KHz)</string>
+    <string name="regional_band_summary_united_states">Hoa Kỳ (88.1MHz đến 107.9MHz trong bước sóng 200 KHz)</string>
+    <string name="regional_band_summary_user_defined">Băng tần do người dùng xác định</string>
+    <string name="aud_output_mode">Chế độ âm thanh đầu ra</string>
+    <string name="audio_type_stereo">Âm thanh nổi</string>
+    <string name="audio_type_mono">Âm thanh đơn</string>
+    <string name="record_dur">Thời gian ghi âm</string>
+    <string name="auto_select_af">Tần số thay thế</string>
+    <string name="settings_revert_defaults_title">Trở lại mặc định nhà sản xuất</string>
+    <string name="settings_revert_defaults_summary">Đặt lại tất cả cài đặt</string>
+    <string name="settings_revert_confirm_title">Xác nhận đặt lại</string>
+    <string name="settings_revert_confirm_msg">Điều này sẽ xoá tất cả cài đặt ứng dụng, bao gồm cả cài đặt đã lưu trước. Tiếp tục?</string>
+    <string name="no_storage">Kết nối thẻ nhớ trước khi bắt đầu ghi âm.</string>
+    <string name="preparing_sd">Đang chuẩn bị thẻ nhớ\u2026</string>
+    <string name="access_sd_fail">Không thể truy cập thẻ nhớ.</string>
+    <string name="spaceIsLow_content">Thẻ nhớ của bạn sắp hết dung lượng. Thay đổi cài đặt chất lượng hoặc xóa một số tệp khác để giải phóng dung lượng.</string>
+    <string name="FMRecording_reach_size_limit">Đã đạt tới giới hạn kích thước.</string>
+    <string name="menu_scan_for_preset">Quét cài đặt trước</string>
+    <string name="fm_off">FM bị tắt.</string>
+    <string name="fm_call">FM không thể được sử dụng trong khi gọi điện thoại.</string>
+    <string name="alert_dialog_hint">Nhập tên</string>
+    <string name="search_dialog_title">Quét đài</string>
+    <string name="fm_command_timeout_title">Thời gian chờ</string>
+    <string name="fm_tune_timeout_msg">Không nhận được phản hồi nào để điều chỉnh đài FM. Nếu vẫn tiếp tục xảy ra sự cố, vui lòng tắt FM và quay lại.</string>
+    <string name="fm_command_failed_title">FM hoạt động thất bại</string>
+    <string name="fm_cmd_failed_msg">Thao tác FM không thành công. Nếu vẫn tiếp tục xảy ra vấn đề, vui lòng tắt FM và quay lại.</string>
+    <string name="fm_cmd_failed_msg_hdmi">Thao tác FM không thành công. Truy cập đồng thời FM và HDMI không được hỗ trợ.</string>
+    <string name="fm_cmd_failed_call_on">Thao tác FM không thành công. Âm thanh FM không được cho phép trong suốt cuộc gọi.</string>
+    <string name="audio_db_title_format"><xliff:g id="format">dd-MM-yyyy HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">Bản ghi âm FM của tôi</string>
+    <string name="audio_db_album_name">Bản ghi âm FM</string>
+    <string name="audio_db_playlist_name">Bản ghi âm FM</string>
+    <string name="station_name">Trạm:</string>
+    <string name="station_exists">Tần số này đã tồn tại!</string>
+    <string name="station_list_delete_station">Xóa: <xliff:g id="name">%s</xliff:g></string>
+    <string name="station_list_delete_station_prompt">Bạn có chắc chắn muốn xóa \'<xliff:g id="name">%s</xliff:g>\'?</string>
+    <string name="station_name_empty">Tên trạm trống, vui lòng nhập lại.</string>
+    <string name="station_name_exist">\'<xliff:g id="name">%s</xliff:g>\' đã được sử dụng, vui lòng nhập tên khác.</string>
+    <string name="rt_plus_tags">Thẻ</string>
+    <string name="usr_def_band_min">Tần số thấp nhất (MHz)</string>
+    <string name="usr_def_band_max">Tần số cao nhất (MHz)</string>
+    <string name="chanl_spacing">Khoảng cách giữa các kênh</string>
+    <string name="set">Thiết đặt</string>
+    <string name="user_defind_band_msg">Nhập tần số từ 76.0 đến 108.0 MHz với khoảng cách giữa các kênh tối thiểu là 1 và khoảng cách 100KHz giữa tần số tối thiểu và tối đa</string>
+    <string name="save_record_file">Tệp ghi âm FM được lưu vào \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">Không tìm thấy đài tương thích</string>
+    <string name="typ_All_stations">Tất cả các đài</string>
+    <string name="typ_Culture">Văn hóa</string>
+    <string name="typ_Current_affairs">Vấn đề hiện tại</string>
+    <string name="typ_Children">Chương trình trẻ em</string>
+    <string name="typ_Country">Nhạc đồng quê</string>
+    <string name="typ_Documentary">Phim tài liệu</string>
+    <string name="typ_Drama">Phim truyền hình</string>
+    <string name="typ_Easy_listening">Dễ dàng nghe nhạc</string>
+    <string name="typ_Education">Giáo dục</string>
+    <string name="typ_Emergency">Khẩn cấp</string>
+    <string name="typ_Emergency_test">Thử nghiệm khẩn cấp</string>
+    <string name="typ_Finance">Tài chính</string>
+    <string name="typ_Folk">Nhạc dân gian</string>
+    <string name="typ_Information">Thông tin</string>
+    <string name="typ_Jazz">Nhạc jazz</string>
+    <string name="typ_Light_classical">Cổ điển nhẹ</string>
+    <string name="typ_Leisure">Giải trí</string>
+    <string name="typ_News">Tin tức</string>
+    <string name="typ_National">Nhạc dân tộc</string>
+    <string name="typ_Other">Nhạc khác</string>
+    <string name="typ_Oldies">Nhạc xưa</string>
+    <string name="typ_Phone_in">Chương trình truyền hình, phát thanh mà người nghe/người xem có thể gọi điện thoại đến đài</string>
+    <string name="typ_Pop">Nhạc pop</string>
+    <string name="typ_Religion">Tôn giáo</string>
+    <string name="typ_Rock">Nhạc rock</string>
+    <string name="typ_Science">Khoa học</string>
+    <string name="typ_Serious_classical">Cổ điển sâu</string>
+    <string name="typ_Social_affairs">Vấn đề xã hội</string>
+    <string name="typ_Sport">Thể thao</string>
+    <string name="typ_Travel">Du lịch</string>
+    <string name="typ_Varied">Đa dạng</string>
+    <string name="typ_Weather">Thời tiết</string>
+    <string name="typ_Adult_hits">Adult hits</string>
+    <string name="typ_Classical">Cổ điển</string>
+    <string name="typ_Classic_Rock">Rock cổ điển</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Ngoại ngữ</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Hoài niệm</string>
+    <string name="typ_Personality">Tính cách</string>
+    <string name="typ_Public">Quần chúng</string>
+    <string name="typ_Religious_music">Âm nhạc tôn giáo</string>
+    <string name="typ_Religious_talk">Nói chuyện tôn giáo</string>
+    <string name="typ_Rhythm_and_Blues">Nhịp điệu và nhạc Blues</string>
+    <string name="typ_Spanish_music">Nhạc Tây Ban Nha</string>
+    <string name="typ_Spanish_talk">Trò chuyện tiếng Tây Ban Nha</string>
+    <string name="typ_Soft">Nhẹ</string>
+    <string name="typ_Soft_Rock">Rock nhẹ</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Nhịp điệu nhẹ và nhạc blues</string>
+    <string name="typ_Sports">Thể thao</string>
+    <string name="typ_Talk">Trò chuyện</string>
+    <string name="typ_Top_40">Top 40</string>
+</resources>
diff --git a/fmapp2/res/values-zh-rCN/arrays.xml b/fmapp2/res/values-zh-rCN/arrays.xml
index 788b807..9093b18 100644
--- a/fmapp2/res/values-zh-rCN/arrays.xml
+++ b/fmapp2/res/values-zh-rCN/arrays.xml
@@ -1,205 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
- * Copyright (C) 2012-2013, The Linux Foundation. All rights reserved.
+ * 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.
+ * 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.
- */
+ * 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="ster_mon_entries">
     <item>立体声</item>
     <item>单声道</item>
   </string-array>
-
+  <string-array name="ster_entries">
+    <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 name="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
   </string-array>
 </resources>
diff --git a/fmapp2/res/values-zh-rCN/strings.xml b/fmapp2/res/values-zh-rCN/strings.xml
index d32c0cd..b0ef65d 100644
--- a/fmapp2/res/values-zh-rCN/strings.xml
+++ b/fmapp2/res/values-zh-rCN/strings.xml
@@ -1,120 +1,233 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
- * Copyright (C) 2012-2013, 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:
- *     * 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.
+ * 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.
- */
- -->
+ * 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">调频收音机</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="app_name">FM 收音机</string>
+    <string name="tx_app_name">FM 发射机</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="menu_record_start">录制</string>
+    <string name="menu_record_stop">停止录音</string>
+    <string name="menu_settings">设置</string>
+    <string name="menu_sleep">自动关闭</string>
+    <string name="menu_sleep_cancel">取消睡眠</string>
+    <string name="menu_all_channels">所有频道</string>
+    <string name="menu_display_tags">显示标签</string>
+    <string name="button_text_stop">停止</string>
+    <string name="msg_seeking">正在搜索 FM 电台\u2026</string>
+    <string name="msg_scanning">扫描全部 FM 电台\u2026</string>
+    <string name="msg_scanning_pty">正在扫描“<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">自动选择预设</string>
+    <string name="msg_searching">正在搜索强信号的电台以创建一个预设列表\u2026</string>
+    <string name="msg_noantenna">请插上耳机来使用 FM 收音机</string>
+    <string name="dialog_sleep_title">睡眠时自动关闭的时间</string>
+    <string name="presetlist_select_name">选择“<xliff:g id="preset_name">%1$s</xliff:g>”</string>
+    <string name="presetlist_add_new">添加新列表</string>
+    <string name="dialog_presetlist_rename_title">输入名称</string>
+    <string name="presetlist_autoselect_title">确认自动选择</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="preset_search">搜索“<xliff:g id="preset_pi">%1$s</xliff:g>”</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">区域波段</string>
+    <string name="regional_band_entry_north_america">北美</string>
+    <string name="regional_band_entry_europe">欧洲</string>
+    <string name="regional_band_entry_japan">日本</string>
+    <string name="regional_band_entry_japan_wide">日本 (宽频)</string>
+    <string name="regional_band_entry_australia">澳大利亚</string>
+    <string name="regional_band_entry_austria">奥地利</string>
+    <string name="regional_band_entry_belgium">比利时</string>
+    <string name="regional_band_entry_brazil">巴西</string>
+    <string name="regional_band_entry_china">中国</string>
+    <string name="regional_band_entry_czech_republic">捷克共和国</string>
+    <string name="regional_band_entry_denmark">丹麦</string>
+    <string name="regional_band_entry_finland">芬兰</string>
+    <string name="regional_band_entry_france">法国</string>
+    <string name="regional_band_entry_germany">德国</string>
+    <string name="regional_band_entry_greece">希腊</string>
+    <string name="regional_band_entry_hong_kong">香港</string>
+    <string name="regional_band_entry_india">印度</string>
+    <string name="regional_band_entry_indonesia">印尼</string>
+    <string name="regional_band_entry_ireland">爱尔兰</string>
+    <string name="regional_band_entry_italy">意大利</string>
+    <string name="regional_band_entry_korea">韩国</string>
+    <string name="regional_band_entry_mexico">墨西哥</string>
+    <string name="regional_band_entry_netherlands">荷兰</string>
+    <string name="regional_band_entry_new_zealand">新西兰</string>
+    <string name="regional_band_entry_norway">挪威</string>
+    <string name="regional_band_entry_poland">波兰</string>
+    <string name="regional_band_entry_portugal">葡萄牙</string>
+    <string name="regional_band_entry_russia">俄罗斯</string>
+    <string name="regional_band_entry_singapore">新加坡</string>
+    <string name="regional_band_entry_slovakia">斯洛伐克</string>
+    <string name="regional_band_entry_spain">西班牙</string>
+    <string name="regional_band_entry_switzerland">瑞士</string>
+    <string name="regional_band_entry_sweden">瑞典</string>
+    <string name="regional_band_entry_taiwan">台湾</string>
+    <string name="regional_band_entry_turkey">土耳其</string>
+    <string name="regional_band_entry_united_kingdom">英国</string>
+    <string name="regional_band_entry_united_states">美国</string>
+    <string name="regional_band_entry_user_defined">用户定义的频段</string>
+    <string name="regional_band_summary_north_america">北美 (87.5 - 108.0 MHz ，步长 200 kHz)</string>
+    <string name="regional_band_summary_europe">欧洲 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_japan">日本 (76.0 - 90.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_japan_wide">日本 (宽频) (90.0 - 108.0 MHz ，步长 50 kHz)</string>
+    <string name="regional_band_summary_australia">澳大利亚 (87.7 - 108.0 MHz ， 步长 100 kHz)</string>
+    <string name="regional_band_summary_austria">奥地利 (87.5 - 108.0 MHz ， 步长 50 kHz)</string>
+    <string name="regional_band_summary_belgium">比利时 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_brazil">巴西 (87.5 - 108.0 MHz ，步长 200 kHz)</string>
+    <string name="regional_band_summary_china">中国 (87.0 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_czech_republic">捷克共和国 (87.5 - 108.0 MHz, 步长 100 kHz)</string>
+    <string name="regional_band_summary_denmark">丹麦 (87.5 - 108.0 MHz ，步长 50 kHz)</string>
+    <string name="regional_band_summary_finland">芬兰 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_france">法国 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_germany">德国 (87.5 - 108.0 MHz ，步长 50 kHz)</string>
+    <string name="regional_band_summary_greece">希腊 (87.5 - 108.0 MHz ，步长 50 kHz)</string>
+    <string name="regional_band_summary_hong_kong">香港 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_india">印度 ( 87.5 - 108.0 MHz, 步长 100 kHz)</string>
+    <string name="regional_band_summary_indonesia">印度尼西亚 (87.5 - 108.0 MHz，步长 100 kHz)</string>
+    <string name="regional_band_summary_ireland">爱尔兰 (87.5 - 108.0 MHz ，步长 50 kHz)</string>
+    <string name="regional_band_summary_italy">意大利 (87.5 - 108.0 MHz ， 步长 50 kHz)</string>
+    <string name="regional_band_summary_korea">韩国 (87.5 - 108.0 MHz ，步长 200 kHz)</string>
+    <string name="regional_band_summary_mexico">墨西哥 (88.1 - 107.9 MHz ，步长 200 kHz)</string>
+    <string name="regional_band_summary_netherlands">荷兰 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_new_zealand">新西兰 (88.0 - 107.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_norway">挪威 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_poland">波兰 (88.0 - 108.0 MHz ，步长 50 kHz)</string>
+    <string name="regional_band_summary_portugal">葡萄牙 (87.5 - 108.0 MHz ，步长 50 kHz)</string>
+    <string name="regional_band_summary_russia">俄罗斯 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_singapore">新加坡 (88.0 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_slovakia">斯洛伐克 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_spain">西班牙 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_switzerland">瑞士 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_sweden">瑞典 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_taiwan">台湾 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_turkey">土耳其 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_united_kingdom">英国 (87.5 - 108.0 MHz ，步长 100 kHz)</string>
+    <string name="regional_band_summary_united_states">美国 (88.1 - 107.9 MHz ，步长 200 kHz)</string>
+    <string name="regional_band_summary_user_defined">用户定义的频段</string>
     <string name="aud_output_mode">音频输出模式</string>
-    <string name="sel_audio_output">选择音频输出</string>
+    <string name="audio_type_stereo">立体声​​​</string>
+    <string name="audio_type_mono">单声道</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="settings_revert_confirm_title">确认重置</string>
+    <string name="settings_revert_confirm_msg">这将会清除所有应用设置，包括已保存的预设。是否继续？</string>
+    <string name="no_storage">在开始录制之前挂载 SD 卡。</string>
+    <string name="preparing_sd">正在准备 SD 卡\u2026</string>
+    <string name="access_sd_fail">无法访问 SD 卡。</string>
+    <string name="spaceIsLow_content">您的 SD 卡存储空间不足。更改质量设置或删除一些其他文件以释放空间。</string>
+    <string name="FMRecording_reach_size_limit">已达文件大小上限。</string>
+    <string name="menu_scan_for_preset">扫描预设</string>
+    <string name="fm_off">FM 已关闭。</string>
+    <string name="fm_call">FM 不能在通话时使用。</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="fm_command_timeout_title">超时</string>
+    <string name="fm_tune_timeout_msg">未收到回应以调谐 FM 电台。如果问题仍然存在，请关闭 FM，并重新打开。</string>
+    <string name="fm_command_failed_title">FM 操作失败</string>
+    <string name="fm_cmd_failed_msg">FM 操作失败。如果问题仍然存在，请关闭 FM，并将其重新打开。</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM 操作失败。不支持 FM 和 HDMI 并发。</string>
+    <string name="fm_cmd_failed_call_on">FM 操作失败。通话期间禁止 FM 音频。</string>
+    <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
+    <string name="audio_db_artist_name">我的 FM 录音</string>
+    <string name="audio_db_album_name">FM 录音</string>
+    <string name="audio_db_playlist_name">FM 录音</string>
+    <string name="station_name">电台：</string>
+    <string name="station_exists">此频率已存在！</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="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="station_name_exist">“<xliff:g id="name">%s</xliff:g>”已经被使用，请重新输入一个不同的名称。</string>
     <string name="rt_plus_tags">标签</string>
-    <string name="user_defind_band_msg">请输入有效的频段范围 76.0 - 108.0</string>
+    <string name="usr_def_band_min">最低频率(兆赫)</string>
+    <string name="usr_def_band_max">最高频率(兆赫)</string>
+    <string name="chanl_spacing">频道间隔</string>
+    <string name="set">设置</string>
+    <string name="user_defind_band_msg">输入从 76.0 至 108.0 MHz 间的频率，并需以至少一个频道间隔，以及与最高和最低频率分别间隔至少 100 kHz</string>
+    <string name="save_record_file">FM 录音文件已保存至 \'<xliff:g id="record_file">%1$s</xliff:g>\'</string>
+    <string name="fm_search_no_results">没有找到兼容的频道</string>
+    <string name="typ_All_stations">所有电台</string>
+    <string name="typ_Culture">文化</string>
+    <string name="typ_Current_affairs">时事</string>
+    <string name="typ_Children">儿童节目</string>
+    <string name="typ_Country">乡村音乐</string>
+    <string name="typ_Documentary">纪实</string>
+    <string name="typ_Drama">戏剧</string>
+    <string name="typ_Easy_listening">轻音乐</string>
+    <string name="typ_Education">教育</string>
+    <string name="typ_Emergency">紧急</string>
+    <string name="typ_Emergency_test">紧急测试</string>
+    <string name="typ_Finance">经济</string>
+    <string name="typ_Folk">民间音乐</string>
+    <string name="typ_Information">信息</string>
+    <string name="typ_Jazz">爵士音乐</string>
+    <string name="typ_Light_classical">轻古典音乐</string>
+    <string name="typ_Leisure">休闲</string>
+    <string name="typ_News">新闻</string>
+    <string name="typ_National">民族音乐</string>
+    <string name="typ_Other">其他音乐</string>
+    <string name="typ_Oldies">怀旧音乐</string>
+    <string name="typ_Phone_in">点播</string>
+    <string name="typ_Pop">流行音乐</string>
+    <string name="typ_Religion">宗教</string>
+    <string name="typ_Rock">摇滚音乐</string>
+    <string name="typ_Science">科学</string>
+    <string name="typ_Serious_classical">古典</string>
+    <string name="typ_Social_affairs">社会事务</string>
+    <string name="typ_Sport">体育</string>
+    <string name="typ_Travel">旅行</string>
+    <string name="typ_Varied">变奏</string>
+    <string name="typ_Weather">天气</string>
+    <string name="typ_Adult_hits">成人金曲音乐</string>
+    <string name="typ_Classical">古典</string>
+    <string name="typ_Classic_Rock">经典摇滚</string>
+    <string name="typ_College">校园</string>
+    <string name="typ_Foreign_language">外语频道</string>
+    <string name="typ_Hiphop">嘻哈</string>
+    <string name="typ_Nostalgia">怀旧</string>
+    <string name="typ_Personality">个性</string>
+    <string name="typ_Public">公共频道</string>
+    <string name="typ_Religious_music">宗教音乐</string>
+    <string name="typ_Religious_talk">宗教对话</string>
+    <string name="typ_Rhythm_and_Blues">节奏布鲁斯</string>
+    <string name="typ_Spanish_music">西班牙音乐</string>
+    <string name="typ_Spanish_talk">西班牙语谈话</string>
+    <string name="typ_Soft">轻音乐</string>
+    <string name="typ_Soft_Rock">轻摇滚</string>
+    <string name="typ_Soft_Rhythm_and_Blues">轻节奏布鲁斯</string>
+    <string name="typ_Sports">体育</string>
+    <string name="typ_Talk">交流</string>
+    <string name="typ_Top_40">前 40</string>
 </resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-zh-rHK/arrays.xml
similarity index 69%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-zh-rHK/arrays.xml
index cb1457b..dd32c0a 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-zh-rHK/arrays.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-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:
@@ -26,10 +27,24 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>立體聲</item>
+    <item>單聲道</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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>
+</resources>
diff --git a/fmapp2/res/values-zh-rHK/strings.xml b/fmapp2/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..50bec0e
--- /dev/null
+++ b/fmapp2/res/values-zh-rHK/strings.xml
@@ -0,0 +1,129 @@
+<?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 收音機</string>
+    <string name="tx_app_name">FM 發射器</string>
+    <string name="menu_scan_start">掃描</string>
+    <string name="menu_scan_stop">停止搜尋</string>
+    <string name="menu_settings">設定</string>
+    <string name="menu_sleep">休眠</string>
+    <string name="menu_sleep_cancel">取消休眠</string>
+    <string name="menu_all_channels">所有頻道</string>
+    <string name="menu_display_tags">顯示標籤</string>
+    <string name="button_text_stop">停止</string>
+    <string name="msg_seeking">正在搜尋 FM 電台\u2026</string>
+    <string name="msg_scanning">正在掃描以獲取所有 FM 電台\u2026</string>
+    <string name="msg_scanning_pty">正在掃描以獲取「<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">自動選擇預設值</string>
+    <string name="msg_searching">正在搜尋接收良好的電台來創建一個預設清單\u2026</string>
+    <string name="msg_noantenna">請插上耳機來使用 FM 收音機</string>
+    <string name="dialog_sleep_title">自動關閉休眠時間</string>
+    <string name="presetlist_select_name">選擇「<xliff:g id="presetlist_name">%1$s</xliff:g>」</string>
+    <string name="presetlist_add_new">新增新清單</string>
+    <string name="dialog_presetlist_rename_title">輸入名稱</string>
+    <string name="presetlist_autoselect_title">確認自動選擇</string>
+    <string name="preset_tune">調整</string>
+    <string name="preset_rename">重新命名</string>
+    <string name="preset_delete">刪除</string>
+    <string name="preset_search">搜尋「<xliff:g id="preset_pi">%1$s</xliff:g>」</string>
+    <string name="stat_notif_frequency">\'<xliff:g id="frequency">%1$s</xliff:g>\' MHz</string>
+    <string name="regional_band">地區波段</string>
+    <string name="regional_band_entry_north_america">北美</string>
+    <string name="regional_band_entry_europe">歐洲</string>
+    <string name="regional_band_entry_japan">日本</string>
+    <string name="regional_band_entry_japan_wide">日本 (廣泛)</string>
+    <string name="regional_band_entry_australia">澳洲</string>
+    <string name="regional_band_entry_austria">奧地利</string>
+    <string name="regional_band_entry_belgium">比利時</string>
+    <string name="regional_band_entry_brazil">巴西</string>
+    <string name="regional_band_entry_china">中國</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">丹麥</string>
+    <string name="regional_band_entry_finland">芬蘭</string>
+    <string name="regional_band_entry_france">法國</string>
+    <string name="regional_band_entry_germany">德國</string>
+    <string name="regional_band_entry_greece">希臘</string>
+    <string name="regional_band_entry_hong_kong">香港</string>
+    <string name="regional_band_entry_india">印度</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">愛爾蘭</string>
+    <string name="regional_band_entry_italy">意大利</string>
+    <string name="regional_band_entry_korea">韓國</string>
+    <string name="regional_band_entry_mexico">墨西哥</string>
+    <string name="regional_band_entry_netherlands">荷蘭</string>
+    <string name="regional_band_entry_new_zealand">紐西蘭</string>
+    <string name="regional_band_entry_norway">挪威</string>
+    <string name="regional_band_entry_poland">波蘭</string>
+    <string name="regional_band_entry_portugal">葡萄牙</string>
+    <string name="regional_band_entry_russia">俄羅斯</string>
+    <string name="regional_band_entry_singapore">新加坡</string>
+    <string name="regional_band_entry_slovakia">斯洛伐克</string>
+    <string name="regional_band_entry_spain">西班牙</string>
+    <string name="regional_band_entry_switzerland">瑞士</string>
+    <string name="regional_band_entry_sweden">瑞典</string>
+    <string name="regional_band_entry_taiwan">台灣</string>
+    <string name="regional_band_entry_turkey">土耳其</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">美國</string>
+    <string name="regional_band_entry_user_defined">使用者定義的頻段</string>
+    <string name="regional_band_summary_user_defined">使用者定義的頻段</string>
+    <string name="aud_output_mode">音訊輸出模式</string>
+    <string name="audio_type_stereo">立體聲</string>
+    <string name="record_dur">記錄時間</string>
+    <string name="auto_select_af">備用頻率</string>
+    <string name="settings_revert_defaults_title">恢復到出廠預設</string>
+    <string name="settings_revert_defaults_summary">清除所有設定</string>
+    <string name="settings_revert_confirm_msg">將會清除所有應用程式設定，包括已儲存的預設值。是否繼續？</string>
+    <string name="access_sd_fail">無法存取 SD 卡。</string>
+    <string name="spaceIsLow_content">您的 SD 卡儲存空間用完，更改質量設定或刪除一些其他的檔案以釋放空間。</string>
+    <string name="menu_scan_for_preset">掃描預設</string>
+    <string name="fm_off">FM 已關閉。</string>
+    <string name="fm_call">FM 不能在通話時使用。</string>
+    <string name="search_dialog_title">掃描電台</string>
+    <string name="fm_command_timeout_title">逾時</string>
+    <string name="fm_tune_timeout_msg">沒有收到要 FM 電台的回應。如果問題仍然存在，請關閉 FM，並將其重新開啟。</string>
+    <string name="fm_command_failed_title">FM 操作失敗</string>
+    <string name="fm_cmd_failed_msg">FM 操作失敗。如果問題仍然存在，請關閉 FM 及重新開啟。</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM 操作失敗。不支援 FM 和 HDMI 的並行。</string>
+    <string name="fm_cmd_failed_call_on">FM 操作失敗。通話期間不允許 FM 音頻。</string>
+    <string name="station_name">電台：</string>
+    <string name="station_exists">此頻率已存在!</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="station_name_empty">電台名字不能為空，請新重輸入</string>
+    <string name="station_name_exist">「<xliff:g id="name">%s</xliff:g>」已被使用，請輸入其他名稱。</string>
+    <string name="rt_plus_tags">標籤</string>
+    <string name="usr_def_band_min">最低頻率 (MHz)</string>
+    <string name="usr_def_band_max">最高頻率 (MHz)</string>
+    <string name="chanl_spacing">頻道距間</string>
+    <string name="set">設定</string>
+    <string name="fm_search_no_results">找不到相容的電台</string>
+</resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values-zh-rTW/arrays.xml
similarity index 65%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values-zh-rTW/arrays.xml
index cb1457b..2af43c1 100644
--- a/fmapp2/res/drawable/preset_page_button.xml
+++ b/fmapp2/res/values-zh-rTW/arrays.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-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:
@@ -26,10 +27,29 @@
  * 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>
+  <string-array name="ster_mon_entries">
+    <item>立體聲</item>
+    <item>單聲道</item>
+  </string-array>
+  <string-array name="ster_entries">
+    <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="channel_spacing_entries">
+    <item>50 kHz</item>
+    <item>100 kHz</item>
+    <item>200 kHz</item>
+  </string-array>
+</resources>
diff --git a/fmapp2/res/values-zh-rTW/strings.xml b/fmapp2/res/values-zh-rTW/strings.xml
index 11a4cf7..e2669bb 100644
--- a/fmapp2/res/values-zh-rTW/strings.xml
+++ b/fmapp2/res/values-zh-rTW/strings.xml
@@ -1,104 +1,232 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
- * Copyright (C) 2012-2013, 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:
- *     * 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.
+ * 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.
- */
- -->
+ * 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">調頻收音機</string>
+    <string name="app_name">FM 收音機</string>
+    <string name="tx_app_name">FM 發射器</string>
+    <string name="menu_scan_start">掃描</string>
+    <string name="menu_scan_stop">停止搜尋</string>
+    <string name="menu_record_start">錄製</string>
+    <string name="menu_record_stop">停止錄製</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="menu_sleep">休眠</string>
+    <string name="menu_sleep_cancel">取消休眠</string>
+    <string name="menu_all_channels">所有頻道</string>
+    <string name="menu_display_tags">顯示標籤</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="msg_seeking">正在搜尋 FM 電台\u2026</string>
+    <string name="msg_scanning">正在掃描所有 FM 電台\u2026</string>
+    <string name="msg_scanning_pty">正在掃描「<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">自動選擇預設值</string>
+    <string name="msg_searching">正在為預設清單搜尋接收良好的電台\u2026</string>
+    <string name="msg_noantenna">插上耳機即可使用 FM 收音機</string>
+    <string name="dialog_sleep_title">自動休眠時間</string>
+    <string name="presetlist_select_name">選擇「<xliff:g id="presetlist_name">%1$s</xliff:g>」</string>
+    <string name="presetlist_add_new">新增清單</string>
+    <string name="dialog_presetlist_rename_title">輸入名稱</string>
+    <string name="presetlist_autoselect_title">確認自動選擇</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="preset_tune">調整</string>
+    <string name="preset_rename">重新命名</string>
+    <string name="preset_delete">移除</string>
+    <string name="preset_search">正在搜尋「<xliff:g id="preset_pi">%1$s</xliff:g>」</string>
+    <string name="stat_notif_frequency"><xliff:g id="frequency">%1$s</xliff:g> MHz</string>
+    <string name="regional_band">地區頻段</string>
+    <string name="regional_band_entry_north_america">北美</string>
+    <string name="regional_band_entry_europe">歐洲</string>
+    <string name="regional_band_entry_japan">日本</string>
+    <string name="regional_band_entry_japan_wide">日本 (廣泛地區)</string>
+    <string name="regional_band_entry_australia">澳洲</string>
+    <string name="regional_band_entry_austria">奧地利</string>
+    <string name="regional_band_entry_belgium">比利時</string>
+    <string name="regional_band_entry_brazil">巴西</string>
+    <string name="regional_band_entry_china">中國</string>
+    <string name="regional_band_entry_czech_republic">捷克共和國</string>
+    <string name="regional_band_entry_denmark">丹麥</string>
+    <string name="regional_band_entry_finland">芬蘭</string>
+    <string name="regional_band_entry_france">法國</string>
+    <string name="regional_band_entry_germany">德國</string>
+    <string name="regional_band_entry_greece">希臘</string>
+    <string name="regional_band_entry_hong_kong">香港</string>
+    <string name="regional_band_entry_india">印度</string>
+    <string name="regional_band_entry_indonesia">印尼</string>
+    <string name="regional_band_entry_ireland">愛爾蘭</string>
+    <string name="regional_band_entry_italy">義大利</string>
+    <string name="regional_band_entry_korea">韓國</string>
+    <string name="regional_band_entry_mexico">墨西哥</string>
+    <string name="regional_band_entry_netherlands">荷蘭</string>
+    <string name="regional_band_entry_new_zealand">紐西蘭</string>
+    <string name="regional_band_entry_norway">挪威</string>
+    <string name="regional_band_entry_poland">波蘭</string>
+    <string name="regional_band_entry_portugal">葡萄牙</string>
+    <string name="regional_band_entry_russia">俄羅斯</string>
+    <string name="regional_band_entry_singapore">新加坡</string>
+    <string name="regional_band_entry_slovakia">斯洛伐克</string>
+    <string name="regional_band_entry_spain">西班牙</string>
+    <string name="regional_band_entry_switzerland">瑞士</string>
+    <string name="regional_band_entry_sweden">瑞典</string>
+    <string name="regional_band_entry_taiwan">台灣</string>
+    <string name="regional_band_entry_turkey">土耳其</string>
+    <string name="regional_band_entry_united_kingdom">英國</string>
+    <string name="regional_band_entry_united_states">美國</string>
+    <string name="regional_band_entry_user_defined">使用者定義的頻段</string>
+    <string name="regional_band_summary_north_america">北美 (87.5 Mhz - 108.0 MHz 內 200 KHz 頻道距離)</string>
+    <string name="regional_band_summary_europe">歐洲 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_japan">日本 (76.0 Mhz - 90.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_japan_wide">日本 (廣泛) (90.0 Mhz - 108.0 MHz 內 50 KHz 頻道距離)</string>
+    <string name="regional_band_summary_australia">澳洲 (87.7 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_austria">奧地利 (87.5 Mhz - 108.0 MHz 內 50 KHz 頻道距離)</string>
+    <string name="regional_band_summary_belgium">比利時 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_brazil">巴西 (87.5 Mhz - 108.0 MHz 內 200 KHz 頻道距離)</string>
+    <string name="regional_band_summary_china">中國 (87.0 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_czech_republic">捷克共和國 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_denmark">丹麥 (87.5 Mhz - 108.0 MHz 內 50 KHz 頻道距離)</string>
+    <string name="regional_band_summary_finland">芬蘭 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_france">法國 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_germany">德國 (87.5 Mhz - 108.0 MHz 內 50 KHz 頻道距離)</string>
+    <string name="regional_band_summary_greece">希臘 (87.5 Mhz - 108.0 MHz 內 50 KHz 頻道距離)</string>
+    <string name="regional_band_summary_hong_kong">香港 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_india">印度 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_indonesia">印尼 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_ireland">愛爾蘭 (87.5 Mhz - 108.0 MHz 內 50 KHz 頻道距離)</string>
+    <string name="regional_band_summary_italy">義大利 (87.5 Mhz - 108.0 MHz 內 50 KHz 頻道距離)</string>
+    <string name="regional_band_summary_korea">韓國 (87.5 Mhz - 108.0 MHz 內 200 KHz 頻道距離)</string>
+    <string name="regional_band_summary_mexico">墨西哥 (88.1 Mhz - 107.9 MHz 內 200 KHz 頻道距離)</string>
+    <string name="regional_band_summary_netherlands">荷蘭 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_new_zealand">紐西蘭 (88.0 Mhz - 107.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_norway">挪威 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_poland">波蘭 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_portugal">葡萄牙 (87.5 Mhz - 108.0 MHz 內 50 KHz 頻道距離)</string>
+    <string name="regional_band_summary_russia">俄羅斯 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_singapore">新加坡 (88.0 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_slovakia">斯洛伐克 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_spain">西班牙 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_switzerland">瑞士 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_sweden">瑞典 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_taiwan">台灣 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_turkey">土耳其 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_united_kingdom">英國 (87.5 Mhz - 108.0 MHz 內 100 KHz 頻道距離)</string>
+    <string name="regional_band_summary_united_states">美國 (88.1 Mhz - 107.9 MHz 內 200 KHz 頻道距離)</string>
+    <string name="regional_band_summary_user_defined">使用者定義的頻段</string>
+    <string name="aud_output_mode">音訊輸出模式</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>
-
+    <string name="audio_type_mono">單色</string>
+    <string name="record_dur">錄製長度</string>
+    <string name="auto_select_af">備用頻率</string>
+    <string name="settings_revert_defaults_title">恢復原廠設定</string>
+    <string name="settings_revert_defaults_summary">清除所有設定</string>
+    <string name="settings_revert_confirm_title">確定重設</string>
+    <string name="settings_revert_confirm_msg">將會清除所有應用程式設定，包括已儲存的預設值。是否繼續？</string>
+    <string name="no_storage">開始錄製前請先掛載 SD 卡。</string>
+    <string name="preparing_sd">正在準備 SD 卡\u2026</string>
+    <string name="access_sd_fail">無法存取 SD 卡。</string>
+    <string name="spaceIsLow_content">您的 SD 卡儲存空間即將用完，變更品質設定或刪除一些檔案即可增加可用空間。</string>
+    <string name="FMRecording_reach_size_limit">已達大小上限。</string>
+    <string name="menu_scan_for_preset">掃描預設</string>
+    <string name="fm_off">FM 已關閉。</string>
+    <string name="fm_call">FM 不能在通話時使用</string>
+    <string name="alert_dialog_hint">輸入名稱 </string>
+    <string name="search_dialog_title">掃描電台</string>
+    <string name="fm_command_timeout_title">逾時</string>
+    <string name="fm_tune_timeout_msg">未收到回應來調整 FM 電台。如果問題仍然持續，請關閉 FM，並將其重新開啟。</string>
+    <string name="fm_command_failed_title">FM 操作失敗</string>
+    <string name="fm_cmd_failed_msg">FM 操作失敗。如果問題仍然持續，請關閉 FM，並將其重新開啟。</string>
+    <string name="fm_cmd_failed_msg_hdmi">FM 操作失敗。不支援 FM和 HDMI 併頻 。 </string>
+    <string name="fm_cmd_failed_call_on">FM 操作失敗。通話期間禁止 FM 音訊。</string>
+    <string name="audio_db_artist_name">我的 FM 錄音</string>
+    <string name="audio_db_album_name">FM 錄音</string>
+    <string name="audio_db_playlist_name">FM 錄音</string>
+    <string name="station_name">電台：</string>
+    <string name="station_exists">此頻率已存在！</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="station_name_empty">電台名稱不能為空，請重新輸入。</string>
+    <string name="station_name_exist">「<xliff:g id="name">%s</xliff:g>」已被使用，請輸入其他名稱。</string>
+    <string name="rt_plus_tags">標籤</string>
+    <string name="usr_def_band_min">最低頻率 (MHz)</string>
+    <string name="usr_def_band_max">最高頻率 (MHz)</string>
+    <string name="chanl_spacing">頻道間距</string>
+    <string name="set">設定</string>
+    <string name="user_defind_band_msg">輸入由 76.0Mhz 至 108.0Mhz 間的頻率，並需以至少一個頻道間隔，以及與最高和最低頻率分別間隔至少100KHz</string>
+    <string name="save_record_file">FM 錄音檔已儲存至「<xliff:g id="record_file">%1$s</xliff:g>」</string>
+    <string name="fm_search_no_results">沒有找到相容的頻道</string>
+    <string name="typ_All_stations">所有電台</string>
+    <string name="typ_Culture">文化</string>
+    <string name="typ_Current_affairs">目前事務</string>
+    <string name="typ_Children">兒童節目</string>
+    <string name="typ_Country">鄉村音樂</string>
+    <string name="typ_Documentary">寫實</string>
+    <string name="typ_Drama">戲劇</string>
+    <string name="typ_Easy_listening">輕音樂</string>
+    <string name="typ_Education">教育</string>
+    <string name="typ_Emergency">緊急</string>
+    <string name="typ_Emergency_test">應急測試</string>
+    <string name="typ_Finance">財經</string>
+    <string name="typ_Folk">民間音樂</string>
+    <string name="typ_Information">資訊</string>
+    <string name="typ_Jazz">爵士音樂</string>
+    <string name="typ_Light_classical">輕古典</string>
+    <string name="typ_Leisure">休閒</string>
+    <string name="typ_News">新聞</string>
+    <string name="typ_National">民族音樂</string>
+    <string name="typ_Other">其他音樂</string>
+    <string name="typ_Oldies">懷舊音樂</string>
+    <string name="typ_Phone_in">撥打電話</string>
+    <string name="typ_Pop">流行音樂</string>
+    <string name="typ_Religion">宗教</string>
+    <string name="typ_Rock">搖滾音樂</string>
+    <string name="typ_Science">科學</string>
+    <string name="typ_Serious_classical">嚴肅古典</string>
+    <string name="typ_Social_affairs">社會事務</string>
+    <string name="typ_Sport">運動</string>
+    <string name="typ_Travel">旅遊</string>
+    <string name="typ_Varied">大千世界</string>
+    <string name="typ_Weather">天氣</string>
+    <string name="typ_Adult_hits">成人點播</string>
+    <string name="typ_Classical">古典</string>
+    <string name="typ_Classic_Rock">經典搖滾</string>
+    <string name="typ_College">校園</string>
+    <string name="typ_Foreign_language">外語</string>
+    <string name="typ_Hiphop">嘻哈</string>
+    <string name="typ_Nostalgia">懷舊</string>
+    <string name="typ_Personality">個性</string>
+    <string name="typ_Public">公開</string>
+    <string name="typ_Religious_music">宗教音樂</string>
+    <string name="typ_Religious_talk">宗教談話</string>
+    <string name="typ_Rhythm_and_Blues">節奏及藍調</string>
+    <string name="typ_Spanish_music">西班牙音樂</string>
+    <string name="typ_Spanish_talk">西班牙對話</string>
+    <string name="typ_Soft">柔和</string>
+    <string name="typ_Soft_Rock">軟搖滾</string>
+    <string name="typ_Soft_Rhythm_and_Blues">柔和節奏及藍調</string>
+    <string name="typ_Sports">體育</string>
+    <string name="typ_Talk">談話</string>
+    <string name="typ_Top_40">前 40</string>
 </resources>
diff --git a/fmapp2/res/values/arrays.xml b/fmapp2/res/values/arrays.xml
index cda326c..fc60d74 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,48 +65,40 @@
     <item>15 minutes</item>
     <item>30 minutes</item>
     <item>45 minutes</item>
-    <item>1 Hour</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>
+  <string-array name="search_category_rbds_entries" translatable="false">
+    <item>@string/typ_All_stations</item>
+    <item>@string/typ_Adult_hits</item>
+    <item>@string/typ_Classical</item>
+    <item>@string/typ_Classic_Rock</item>
+    <item>@string/typ_College</item>
+    <item>@string/typ_Country</item>
+    <item>@string/typ_Emergency</item>
+    <item>@string/typ_Emergency_test</item>
+    <item>@string/typ_Foreign_language</item>
+    <item>@string/typ_Information</item>
+    <item>@string/typ_Jazz</item>
+    <item>@string/typ_News</item>
+    <item>@string/typ_Nostalgia</item>
+    <item>@string/typ_Oldies</item>
+    <item>@string/typ_Personality</item>
+    <item>@string/typ_Public</item>
+    <item>@string/typ_Religious_music</item>
+    <item>@string/typ_Religious_talk</item>
+    <item>@string/typ_Rhythm_and_Blues</item>
+    <item>@string/typ_Rock</item>
+    <item>@string/typ_Soft</item>
+    <item>@string/typ_Soft_Rock</item>
+    <item>@string/typ_Soft_Rhythm_and_Blues</item>
+    <item>@string/typ_Sports</item>
+    <item>@string/typ_Talk</item>
+    <item>@string/typ_Top_40</item>
+    <item>@string/typ_Weather</item>
   </string-array>
 
-  <string-array name="search_category_rbds_entries">
-    <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>Information</item>
-    <item>Jazz</item>
-    <item>News</item>
-    <item>Nostalgia</item>
-    <item>Oldies</item>
-    <item>Personality</item>
-    <item>Public</item>
-    <item>Religious Music</item>
-    <item>Religious Talk</item>
-    <item>Rhythm and Blues</item>
-    <item>Rock</item>
-    <item>Soft</item>
-    <item>Soft Rock</item>
-    <item>Soft Rhythm and Blues</item>
-    <item>Sports</item>
-    <item>Talk</item>
-    <item>Top 40</item>
-    <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>Culture</item>
-    <item>Current Affairs</item>
-    <item>Children programs</item>
-    <item>Country Music</item>
-    <item>Documentary</item>
-    <item>Drama</item>
-    <item>Easy Listening Music</item>
-    <item>Education</item>
-    <item>Emergency</item>
-    <item>Emergency Test</item>
-    <item>Finance</item>
-    <item>Folk Music</item>
-    <item>Information</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>Religion</item>
-    <item>Rock Music</item>
-    <item>Science</item>
-    <item>Serious classical</item>
-    <item>Social Affairs</item>
-    <item>Sport</item>
-    <item>Travel</item>
-    <item>Varied</item>
-    <item>Weather</item>
+  <string-array name="search_category_rds_entries" translatable="false">
+    <item>@string/typ_All_stations</item>
+    <item>@string/typ_Culture</item>
+    <item>@string/typ_Current_affairs</item>
+    <item>@string/typ_Children</item>
+    <item>@string/typ_Country</item>
+    <item>@string/typ_Documentary</item>
+    <item>@string/typ_Drama</item>
+    <item>@string/typ_Easy_listening</item>
+    <item>@string/typ_Education</item>
+    <item>@string/typ_Emergency</item>
+    <item>@string/typ_Emergency_test</item>
+    <item>@string/typ_Finance</item>
+    <item>@string/typ_Folk</item>
+    <item>@string/typ_Information</item>
+    <item>@string/typ_Jazz</item>
+    <item>@string/typ_Light_classical</item>
+    <item>@string/typ_Leisure</item>
+    <item>@string/typ_News</item>
+    <item>@string/typ_National</item>
+    <item>@string/typ_Other</item>
+    <item>@string/typ_Oldies</item>
+    <item>@string/typ_Phone_in</item>
+    <item>@string/typ_Pop</item>
+    <item>@string/typ_Religion</item>
+    <item>@string/typ_Rock</item>
+    <item>@string/typ_Science</item>
+    <item>@string/typ_Serious_classical</item>
+    <item>@string/typ_Social_affairs</item>
+    <item>@string/typ_Sport</item>
+    <item>@string/typ_Travel</item>
+    <item>@string/typ_Varied</item>
+    <item>@string/typ_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,54 +198,48 @@
     <item>16</item>
   </string-array>
 
-  <string-array name="presetlist_edit_category">
-    <item>Rename</item>
-    <item>Auto-Select</item>
-    <item>Delete</item>
+  <string-array name="regional_band_entries" translatable="false">
+    <item>@string/regional_band_entry_north_america</item>
+    <item>@string/regional_band_entry_europe</item>
+    <item>@string/regional_band_entry_japan</item>
+    <item>@string/regional_band_entry_japan_wide</item>
+    <item>@string/regional_band_entry_australia</item>
+    <item>@string/regional_band_entry_austria</item>
+    <item>@string/regional_band_entry_belgium</item>
+    <item>@string/regional_band_entry_brazil</item>
+    <item>@string/regional_band_entry_china</item>
+    <item>@string/regional_band_entry_czech_republic</item>
+    <item>@string/regional_band_entry_denmark</item>
+    <item>@string/regional_band_entry_finland</item>
+    <item>@string/regional_band_entry_france</item>
+    <item>@string/regional_band_entry_germany</item>
+    <item>@string/regional_band_entry_greece</item>
+    <item>@string/regional_band_entry_hong_kong</item>
+    <item>@string/regional_band_entry_india</item>
+    <item>@string/regional_band_entry_ireland</item>
+    <item>@string/regional_band_entry_italy</item>
+    <item>@string/regional_band_entry_korea</item>
+    <item>@string/regional_band_entry_mexico</item>
+    <item>@string/regional_band_entry_netherlands</item>
+    <item>@string/regional_band_entry_new_zealand</item>
+    <item>@string/regional_band_entry_norway</item>
+    <item>@string/regional_band_entry_poland</item>
+    <item>@string/regional_band_entry_portugal</item>
+    <item>@string/regional_band_entry_russia</item>
+    <item>@string/regional_band_entry_singapore</item>
+    <item>@string/regional_band_entry_slovakia</item>
+    <item>@string/regional_band_entry_spain</item>
+    <item>@string/regional_band_entry_switzerland</item>
+    <item>@string/regional_band_entry_sweden</item>
+    <item>@string/regional_band_entry_taiwan</item>
+    <item>@string/regional_band_entry_turkey</item>
+    <item>@string/regional_band_entry_united_kingdom</item>
+    <item>@string/regional_band_entry_united_states</item>
+    <item>@string/regional_band_entry_user_defined</item>
+    <item>@string/regional_band_entry_indonesia</item>
   </string-array>
 
-
-  <string-array name="regional_band_entries">
-    <item>North America</item>
-    <item>Europe</item>
-    <item>Japan</item>
-    <item>Japan (Wide)</item>
-    <item>Australia</item>
-    <item>Austria</item>
-    <item>Belgium</item>
-    <item>Brazil</item>
-    <item>China</item>
-    <item>Czech</item>
-    <item>Denmark</item>
-    <item>Finland</item>
-    <item>France</item>
-    <item>Germany</item>
-    <item>Greece</item>
-    <item>Hong Kong</item>
-    <item>India</item>
-    <item>Ireland</item>
-    <item>Italy</item>
-    <item>Korea</item>
-    <item>Mexico</item>
-    <item>Netherlands</item>
-    <item>New Zealand</item>
-    <item>Norway</item>
-    <item>Poland</item>
-    <item>Portugal</item>
-    <item>Russia</item>
-    <item>Singapore</item>
-    <item>Slovakia</item>
-    <item>Spain</item>
-    <item>Switzerland</item>
-    <item>Sweden</item>
-    <item>Taiwan</item>
-    <item>Turkey</item>
-    <item>United Kingdom </item>
-    <item>United States</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>
@@ -292,156 +277,60 @@
     <item>34</item>
     <item>35</item>
     <item>36</item>
+    <item>37</item>
   </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>
+  <string-array name="regional_band_summary" translatable="false">
+    <item>@string/regional_band_summary_north_america</item>
+    <item>@string/regional_band_summary_europe</item>
+    <item>@string/regional_band_summary_japan</item>
+    <item>@string/regional_band_summary_japan_wide</item>
+    <item>@string/regional_band_summary_australia</item>
+    <item>@string/regional_band_summary_austria</item>
+    <item>@string/regional_band_summary_belgium</item>
+    <item>@string/regional_band_summary_brazil</item>
+    <item>@string/regional_band_summary_china</item>
+    <item>@string/regional_band_summary_czech_republic</item>
+    <item>@string/regional_band_summary_denmark</item>
+    <item>@string/regional_band_summary_finland</item>
+    <item>@string/regional_band_summary_france</item>
+    <item>@string/regional_band_summary_germany</item>
+    <item>@string/regional_band_summary_greece</item>
+    <item>@string/regional_band_summary_hong_kong</item>
+    <item>@string/regional_band_summary_india</item>
+    <item>@string/regional_band_summary_ireland</item>
+    <item>@string/regional_band_summary_italy</item>
+    <item>@string/regional_band_summary_korea</item>
+    <item>@string/regional_band_summary_mexico</item>
+    <item>@string/regional_band_summary_netherlands</item>
+    <item>@string/regional_band_summary_new_zealand</item>
+    <item>@string/regional_band_summary_norway</item>
+    <item>@string/regional_band_summary_poland</item>
+    <item>@string/regional_band_summary_portugal</item>
+    <item>@string/regional_band_summary_russia</item>
+    <item>@string/regional_band_summary_singapore</item>
+    <item>@string/regional_band_summary_slovakia</item>
+    <item>@string/regional_band_summary_spain</item>
+    <item>@string/regional_band_summary_switzerland</item>
+    <item>@string/regional_band_summary_sweden</item>
+    <item>@string/regional_band_summary_taiwan</item>
+    <item>@string/regional_band_summary_turkey</item>
+    <item>@string/regional_band_summary_united_kingdom</item>
+    <item>@string/regional_band_summary_united_states</item>
+    <item>@string/regional_band_summary_user_defined</item>
+    <item>@string/regional_band_summary_indonesia</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/colors.xml b/fmapp2/res/values/colors.xml
new file mode 100644
index 0000000..c80e356
--- /dev/null
+++ b/fmapp2/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="favorite_button_normal">#4DB6AC</color>
+    <color name="favorite_button_active">#00796B</color>
+    <color name="background_color">#4DB6AC</color>
+    <color name="picker_background_color">@color/primary</color>
+    <color name="white">#FAFAFA</color>
+    <!-- Material -->
+    <color name="primary">#00796B</color>
+    <color name="primary_dark">#004D40</color>
+    <color name="accent">#4DB6AC</color>
+</resources>
diff --git a/fmapp2/res/values/customize.xml b/fmapp2/res/values/customize.xml
index f4dcdbc..3216d42 100644
--- a/fmapp2/res/values/customize.xml
+++ b/fmapp2/res/values/customize.xml
@@ -39,12 +39,6 @@
     <bool name="def_fm_country_location_enabled">false</bool>
 
     <!--
-        customize the the special carrier for fm,
-        default value is false,true is for Micromax
-    -->
-    <bool name="def_fm_special_carrier_enabled">false</bool>
-
-    <!--
         customize the output list,true is stereo only, false is stereo and mono,
             default value is false
     -->
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/drawable/station_border.xml b/fmapp2/res/values/integers.xml
similarity index 81%
copy from fmapp2/res/drawable/station_border.xml
copy to fmapp2/res/values/integers.xml
index 2aee777..a1698e1 100644
--- a/fmapp2/res/drawable/station_border.xml
+++ b/fmapp2/res/values/integers.xml
@@ -1,5 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
- * Copyright (c) 2009, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009, 2011-2013 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2014 The CyanogenMod Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -25,9 +27,7 @@
  * 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>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Look at FmSharedPreferences.java for index -->
+    <integer name="default_country_index">0</integer>
+</resources>
diff --git a/fmapp2/res/values/lineage_dimens.xml b/fmapp2/res/values/lineage_dimens.xml
new file mode 100644
index 0000000..0532ceb
--- /dev/null
+++ b/fmapp2/res/values/lineage_dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="min_touch_size">48dp</dimen>
+</resources>
diff --git a/fmapp2/res/values/strings.xml b/fmapp2/res/values/strings.xml
index 3d490d0..788e744 100644
--- a/fmapp2/res/values/strings.xml
+++ b/fmapp2/res/values/strings.xml
@@ -1,204 +1,196 @@
 <?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">\'<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="regional_band_entry_north_america">North America</string>
+    <string name="regional_band_entry_europe">Europe</string>
+    <string name="regional_band_entry_japan">Japan</string>
+    <string name="regional_band_entry_japan_wide">Japan (wide)</string>
+    <string name="regional_band_entry_australia">Australia</string>
+    <string name="regional_band_entry_austria">Austria</string>
+    <string name="regional_band_entry_belgium">Belgium</string>
+    <string name="regional_band_entry_brazil">Brazil</string>
+    <string name="regional_band_entry_china">China</string>
+    <string name="regional_band_entry_czech_republic">Czech Republic</string>
+    <string name="regional_band_entry_denmark">Denmark</string>
+    <string name="regional_band_entry_finland">Finland</string>
+    <string name="regional_band_entry_france">France</string>
+    <string name="regional_band_entry_germany">Germany</string>
+    <string name="regional_band_entry_greece">Greece</string>
+    <string name="regional_band_entry_hong_kong">Hong Kong</string>
+    <string name="regional_band_entry_india">India</string>
+    <string name="regional_band_entry_indonesia">Indonesia</string>
+    <string name="regional_band_entry_ireland">Ireland</string>
+    <string name="regional_band_entry_italy">Italy</string>
+    <string name="regional_band_entry_korea">Korea</string>
+    <string name="regional_band_entry_mexico">Mexico</string>
+    <string name="regional_band_entry_netherlands">Netherlands</string>
+    <string name="regional_band_entry_new_zealand">New Zealand</string>
+    <string name="regional_band_entry_norway">Norway</string>
+    <string name="regional_band_entry_poland">Poland</string>
+    <string name="regional_band_entry_portugal">Portugal</string>
+    <string name="regional_band_entry_russia">Russia</string>
+    <string name="regional_band_entry_singapore">Singapore</string>
+    <string name="regional_band_entry_slovakia">Slovakia</string>
+    <string name="regional_band_entry_spain">Spain</string>
+    <string name="regional_band_entry_switzerland">Switzerland</string>
+    <string name="regional_band_entry_sweden">Sweden</string>
+    <string name="regional_band_entry_taiwan">Taiwan</string>
+    <string name="regional_band_entry_turkey">Turkey</string>
+    <string name="regional_band_entry_united_kingdom">United Kingdom</string>
+    <string name="regional_band_entry_united_states">United States</string>
+    <string name="regional_band_entry_user_defined">User defined band</string>
 
-    <string name="settings_menu">Settings</string>
-    <string name="regional_band">Regional Band</string>
+    <string name="regional_band_summary_north_america">North America (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_europe">Europe (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan">Japan (76.0 to 90.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_japan_wide">Japan (wide) (90.0 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_australia">Australia (87.7 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_austria">Austria (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_belgium">Belgium (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_brazil">Brazil (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_china">China (87.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_czech_republic">Czech Republic (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_denmark">Denmark (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_finland">Finland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_france">France (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_germany">Germany (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_greece">Greece (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_hong_kong">Hong Kong (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_india">India (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_indonesia">Indonesia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_ireland">Ireland (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_italy">Italy (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_korea">Korea (87.5 to 108.0 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_mexico">Mexico (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_netherlands">Netherlands (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_new_zealand">New Zealand (88.0 to 107.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_norway">Norway (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_poland">Poland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_portugal">Portugal (87.5 to 108.0 MHz in 50 kHz steps)</string>
+    <string name="regional_band_summary_russia">Russia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_singapore">Singapore (88.0 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_slovakia">Slovakia (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_spain">Spain (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_switzerland">Switzerland (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_sweden">Sweden (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_taiwan">Taiwan (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_turkey">Turkey (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_kingdom">United Kingdom (87.5 to 108.0 MHz in 100 kHz steps)</string>
+    <string name="regional_band_summary_united_states">United States (88.1 to 107.9 MHz in 200 kHz steps)</string>
+    <string name="regional_band_summary_user_defined">User defined 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>
+
+    <!-- Off messages -->
+    <string name="fm_off">FM is turned off.</string>
+    <string name="fm_call">FM can\'t be used while calling.</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 +199,81 @@
     <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="default_blank" translatable="false"></string>
+    <string name="add_station" translatable="false">+</string>
 
     <string name="station_name">Station:</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>
+    <string name="fm_search_no_results">No compatible stations found</string>
 
+    <!-- program types -->
+    <string name="typ_All_stations">All stations</string>
+    <string name="typ_Culture">Culture</string>
+    <string name="typ_Current_affairs">Current affairs</string>
+    <string name="typ_Children">Children programs</string>
+    <string name="typ_Country">Country music</string>
+    <string name="typ_Documentary">Documentary</string>
+    <string name="typ_Drama">Drama</string>
+    <string name="typ_Easy_listening">Easy listening music</string>
+    <string name="typ_Education">Education</string>
+    <string name="typ_Emergency">Emergency</string>
+    <string name="typ_Emergency_test">Emergency test</string>
+    <string name="typ_Finance">Finance</string>
+    <string name="typ_Folk">Folk music</string>
+    <string name="typ_Information">Information</string>
+    <string name="typ_Jazz">Jazz music</string>
+    <string name="typ_Light_classical">Light classical</string>
+    <string name="typ_Leisure">Leisure</string>
+    <string name="typ_News">News</string>
+    <string name="typ_National">National music</string>
+    <string name="typ_Other">Other music</string>
+    <string name="typ_Oldies">Oldies music</string>
+    <string name="typ_Phone_in">Phone in</string>
+    <string name="typ_Pop">Pop music</string>
+    <string name="typ_Religion">Religion</string>
+    <string name="typ_Rock">Rock music</string>
+    <string name="typ_Science">Science</string>
+    <string name="typ_Serious_classical">Serious classical</string>
+    <string name="typ_Social_affairs">Social affairs</string>
+    <string name="typ_Sport">Sport</string>
+    <string name="typ_Travel">Travel</string>
+    <string name="typ_Varied">Varied</string>
+    <string name="typ_Weather">Weather</string>
+
+    <!-- RBDS (North America) -->
+    <string name="typ_Adult_hits">Adult hits</string>
+    <string name="typ_Classical">Classical</string>
+    <string name="typ_Classic_Rock">Classic Rock</string>
+    <string name="typ_College">College</string>
+    <string name="typ_Foreign_language">Foreign language</string>
+    <string name="typ_Hiphop">Hip Hop</string>
+    <string name="typ_Nostalgia">Nostalgia</string>
+    <string name="typ_Personality">Personality</string>
+    <string name="typ_Public">Public</string>
+    <string name="typ_Religious_music">Religious music</string>
+    <string name="typ_Religious_talk">Religious talk</string>
+    <string name="typ_Rhythm_and_Blues">Rhythm and Blues</string>
+    <string name="typ_Spanish_music">Spanish music</string>
+    <string name="typ_Spanish_talk">Spanish talk</string>
+    <string name="typ_Soft">Soft</string>
+    <string name="typ_Soft_Rock">Soft Rock</string>
+    <string name="typ_Soft_Rhythm_and_Blues">Soft Rhythm and Blues</string>
+    <string name="typ_Sports">Sports</string>
+    <string name="typ_Talk">Talk</string>
+    <string name="typ_Top_40">Top 40</string>
 </resources>
diff --git a/fmapp2/res/values/styles.xml b/fmapp2/res/values/styles.xml
index e9c9bcf..9be17ff 100644
--- a/fmapp2/res/values/styles.xml
+++ b/fmapp2/res/values/styles.xml
@@ -27,6 +27,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+    <style name="FMTheme" parent="@android:Theme.Material">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:colorAccent">@color/accent</item>
+    </style>
     <style name="FMStationSeekBar">
         <item name="android:indeterminateOnly">false</item>
         <item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
@@ -37,25 +42,47 @@
         <item name="android:focusable">true</item>
     </style>
 
+    <style name="ButtonStripButtons">
+        <item name="android:gravity">center</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_width">80dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:text">@string/add_station</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <style name="ButtonStripLeft">
         <item name="android:gravity">center</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/btn_strip_trans_left</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
+        <item name="android:singleLine">true</item>
     </style>
 
     <style name="ButtonStripMiddle">
         <item name="android:gravity">center</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/btn_strip_trans_middle</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
+        <item name="android:singleLine">true</item>
     </style>
 
     <style name="ButtonStripRight">
         <item name="android:gravity">center</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/btn_strip_trans_right</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
+        <item name="android:singleLine">true</item>
     </style>
 
 </resources>
diff --git a/fmapp2/res/drawable/preset_page_button.xml b/fmapp2/res/values/transmit_strings.xml
similarity index 66%
copy from fmapp2/res/drawable/preset_page_button.xml
copy to fmapp2/res/values/transmit_strings.xml
index cb1457b..566af1d 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">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/FMAdapterApp.java b/fmapp2/src/com/caf/fmradio/FMAdapterApp.java
index dbc17c5..40a6731 100644
--- a/fmapp2/src/com/caf/fmradio/FMAdapterApp.java
+++ b/fmapp2/src/com/caf/fmradio/FMAdapterApp.java
@@ -29,6 +29,7 @@
 public class FMAdapterApp extends Application {
     private static final String TAG = "FMAdapterApp";
     private static final boolean DBG = true;
+    public static FMAdapterApp context = null;  // Allow global access
     //For Debugging only
     private static int sRefCount=0;
 
@@ -39,6 +40,7 @@
 
     public FMAdapterApp() {
         super();
+        context = this;
         if (DBG) {
             synchronized (FMAdapterApp.class) {
                 sRefCount++;
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 5ab8276..325d213 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -28,6 +28,7 @@
 
 package com.caf.fmradio;
 
+import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -60,8 +61,6 @@
 import android.view.View;
 import android.view.Window;
 import android.view.KeyEvent;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -98,6 +97,7 @@
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Point;
+import android.graphics.drawable.ColorDrawable;
 import android.Manifest;
 import android.content.pm.PackageManager;
 
@@ -224,12 +224,15 @@
    private TextView mSleepMsgTV;
    private TextView mRecordingMsgTV;
 
+   private ImageView mFmSeeker;
+
    private double mOutputFreq;
    private int mPresetPageNumber = 0;
    private int mStereo = -1;
 
    private static boolean mFMStats = false;
 
+   private boolean mShowStationList = false;
 
    /* Current Status Indicators */
    private static boolean mRecording = false;
@@ -239,7 +242,6 @@
    private static boolean mIsSearching = false;
    private static int mScanPty = 0;
    private static int mScanPtyIndex = 0;
-   private Animation mAnimation = null;
    private ScrollerText mRadioTextScroller = null;
    private ScrollerText mERadioTextScroller = null;
 
@@ -278,7 +280,10 @@
    public static boolean mUpdatePickerValue = false;
 
    private LoadedDataAndState SavedDataAndState = null;
-   private static String mBTsoc;
+   private static String mBTsoc = "invalid";
+
+   /** fm stats property string */
+   public static final String FM_STATS_PROP = "persist.fm.stats";
 
    private BroadcastReceiver mFmSettingReceiver = null;
    private static String[] RECORD_PERMISSIONS = {
@@ -333,6 +338,17 @@
       DisplayMetrics outMetrics = new DisplayMetrics();
       getWindowManager().getDefaultDisplay().getMetrics(outMetrics );
 
+      getWindow().setBackgroundDrawableResource(R.color.background_color);
+
+      // Set up your ActionBar
+      final ActionBar actionBar = getActionBar();
+      actionBar.setDisplayShowHomeEnabled(false);
+      actionBar.setDisplayShowTitleEnabled(false);
+      actionBar.setDisplayShowCustomEnabled(true);
+      actionBar.setCustomView(R.layout.action_bar);
+
+      ((TextView) findViewById(R.id.title)).setText(R.string.app_name);
+
       setContentView(R.layout.fmradio);
       SavedDataAndState = (LoadedDataAndState)getLastNonConfigurationInstance();
 
@@ -351,9 +367,6 @@
         });
       }
 
-      mAnimation = AnimationUtils.loadAnimation(this,
-                                                R.anim.preset_select);
-
       mMuteButton = (ImageView)findViewById(R.id.btn_silent);
       if (mMuteButton != null) {
           mMuteButton.setOnClickListener(mMuteModeClickListener);
@@ -372,15 +385,15 @@
       mForwardButton = (ImageView)findViewById(R.id.btn_forward);
       if (mForwardButton != null) {
           mForwardButton.setOnClickListener(mForwardClickListener);
-          mForwardButton.setOnLongClickListener(mForwardLongClickListener);
       }
 
       mBackButton = (ImageView)findViewById(R.id.btn_back);
       if (mBackButton != null) {
           mBackButton.setOnClickListener(mBackClickListener);
-          mBackButton.setOnLongClickListener(mBackLongClickListener);
       }
 
+      mFmSeeker = (ImageView)findViewById(R.id.fm_seeker);
+
       /* 6 Preset Buttons */
       mPresetButtons[0] = (Button)findViewById(R.id.presets_button_1);
       mPresetButtons[1] = (Button)findViewById(R.id.presets_button_2);
@@ -429,6 +442,7 @@
       if ((mERadioTextScroller == null) && (mERadioTextTV != null)) {
           mERadioTextScroller = new ScrollerText(mERadioTextTV);
       }
+      mBTsoc = SystemProperties.get("vendor.qcom.bluetooth.soc");
    }
 
    protected void setDisplayvalue(){
@@ -538,13 +552,34 @@
       mERadioTextScroller.stopScroll();
       FmSharedPreferences.setTunedFrequency(mTunedStation.getFrequency());
       mPrefs.Save();
+      if (mService != null) {
+          try {
+            mService.unregisterCallbacks();
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+      }
    }
 
+    private void syncScanState() {
+        if (!mIsScaning || mService == null) {
+            return;
+        }
+        try {
+            if (!mService.isSearchInProgress()) {
+                mServiceCallbacks.onSearchComplete();
+            }
+        }catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
+
    @Override
    public void onResume() {
       Log.d(LOGTAG, "FMRadio: onResume");
 
       super.onResume();
+      syncScanState();
 
       if (mService == null) {
           Log.d(LOGTAG,"bind callback has not received yet - wait for 100ms");
@@ -668,7 +703,6 @@
       MenuItem item;
       boolean radioOn = isFmOn();
       boolean recording = isRecording();
-      boolean mSpeakerPhoneOn = isSpeakerEnabled();
       boolean sleepActive = isSleepTimerActive();
       boolean searchActive = isScanActive() || isSeekActive();
       Log.d(LOGTAG, "onCreateOptionsmenu");
@@ -688,14 +722,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 */
@@ -712,17 +744,7 @@
       if (item != null) {
           item.setVisible(sleepActive && radioOn);
       }
-
-      if (mService != null) {
-          try {
-              mFMStats = mService.getFmStatsProp();
-              Log.d(LOGTAG, "mFMStats: " + mFMStats);
-          } catch (RemoteException e) {
-              e.printStackTrace();
-              return false;
-          }
-      }
-
+      mFMStats = SystemProperties.getBoolean(FM_STATS_PROP, false);
       if(mFMStats) {
           item = menu.add(0, MENU_STAT_TEST, 0,R.string.menu_stats).
                              setIcon(android.R.drawable.ic_menu_info_details);
@@ -740,7 +762,6 @@
       boolean radioOn = isFmOn();
       boolean recording = isRecording();
       boolean RtPlusSupported = isRtPlusSupported();
-      boolean mSpeakerPhoneOn = isSpeakerEnabled();
       boolean searchActive = isScanActive() || isSeekActive();
 
       item = menu.findItem(MENU_SCAN_START);
@@ -753,14 +774,13 @@
       }
       if (RECORDING_ENABLE) {
          item = menu.findItem(MENU_RECORD_START);
+         boolean canRecordOrStop = radioOn && !isAnalogModeEnabled();
          if (item != null) {
-            item.setVisible(true);
-            item.setEnabled((!recording) && radioOn && (!isAnalogModeEnabled()));
+            item.setVisible(!recording && canRecordOrStop);
          }
          item = menu.findItem(MENU_RECORD_STOP);
          if (item != null) {
-             item.setVisible(true);
-             item.setEnabled(recording && radioOn && (!isAnalogModeEnabled()));
+             item.setVisible(recording && canRecordOrStop);
          }
       }
 
@@ -796,29 +816,12 @@
           startActivity(launchFMStatIntent);
           return true;
       case MENU_SCAN_START:
-          Log.d(LOGTAG, "mBTsoc: " + mBTsoc + " mService: " + mService);
-
-          if (mBTsoc == null) {
-              if (mService != null) {
-                  try {
-                      mBTsoc = mService.getSocName();
-                      Log.d(LOGTAG, "mBTsoc: " + mBTsoc);
-                  }catch (RemoteException e) {
-                      e.printStackTrace();
-                      return false;
-                  }
-              } else {
-                return false;
-              }
-          }
-
          if (mBTsoc.equals("rome")) {
              clearStationList();
              initiateSearch(0); // 0 - All stations
          } else {
              displayDialog(DIALOG_SEARCH);
          }
-
          return true;
       case MENU_SCAN_STOP:
          cancelSearch();
@@ -853,7 +856,7 @@
    }
 
    private void enableSpeaker() {
-    //This method with toggle Speaker phone based on existing state .
+       //This method with toggle Speaker phone based on existing state .
        boolean bSpeakerPhoneOn = isSpeakerEnabled();
        if(mService != null) {
            try {
@@ -1210,7 +1213,7 @@
       if (bSearchActive) {
           AlertDialog.Builder builder = new AlertDialog.Builder(this);
           builder.setTitle(titleStr);
-          builder.setIcon(R.drawable.ic_launcher_fmradio);
+          builder.setIcon(R.mipmap.ic_launcher);
           View view = getLayoutInflater().inflate(R.layout.layout_dialog_progress,null);
           builder.setView(view);
           TextView tvMessage = (TextView)view.findViewById(R.id.id_tv_message);
@@ -1296,7 +1299,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();
@@ -1315,7 +1318,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);
@@ -1329,7 +1332,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) {
@@ -1348,7 +1351,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) {
@@ -1366,7 +1369,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) {
@@ -1402,35 +1405,15 @@
    private View.OnClickListener mForwardClickListener =
       new View.OnClickListener() {
         public void onClick(View v) {
-          int frequency = FmSharedPreferences.getNextTuneFrequency();
-          Log.d(LOGTAG, "Tune Up: to " + frequency);
-          tuneRadio(frequency);
+          SeekNextStation();
       }
    };
 
    private View.OnClickListener mBackClickListener =
       new View.OnClickListener() {
         public void onClick(View v) {
-          int frequency = FmSharedPreferences.getPrevTuneFrequency();
-          Log.d(LOGTAG, "Tune Down: to " + frequency);
-          tuneRadio(frequency);
-      }
-   };
-
-   private View.OnLongClickListener mForwardLongClickListener =
-      new View.OnLongClickListener() {
-        public boolean onLongClick(View view) {
-          SeekNextStation();
-          return true;
-        }
-   };
-
-   private View.OnLongClickListener mBackLongClickListener =
-      new View.OnLongClickListener() {
-        public boolean onLongClick(View view) {
           SeekPreviousStation();
-          return true;
-        }
+      }
    };
 
    private View.OnClickListener mPresetsPageClickListener =
@@ -1449,7 +1432,6 @@
               Log.d(LOGTAG, "station - " + station.getName() + " ("
                     + station.getFrequency() + ")");
               tuneRadio(station.getFrequency());
-              view.startAnimation(mAnimation);
            }
       }
    };
@@ -1465,7 +1447,6 @@
                displayDialog(DIALOG_PRESET_OPTIONS);
            }else {
                addToPresets();
-               view.startAnimation(mAnimation);
            }
          return true;
       }
@@ -1484,7 +1465,6 @@
         new View.OnClickListener() {
           @Override
           public void onClick(View v) {
-             // TODO Auto-generated method stub
              mSpeakerButton.setClickable(false);
              mSpeakerButton.setOnClickListener(null);
              mHandler.removeCallbacks(mEnableRadioTask);
@@ -1513,7 +1493,6 @@
                }
                if (bStatus) {
                    setMuteModeButtonImage(true);
-                   v.startAnimation(mAnimation);
                }else {
                    mCommandFailed = CMD_MUTE;
                    if(isCallActive()) {
@@ -1627,7 +1606,6 @@
                 bStatus = mService.fmOn();
                 if(bStatus) {
                    tuneRadio(FmSharedPreferences.getTunedFrequency());
-                   enableRadioOnOffUI();
                 }else {
                    Log.e(LOGTAG, "mService.fmOn failed");
                    mCommandFailed = CMD_FMON;
@@ -1785,8 +1763,7 @@
 
    private void setRecordingStartImage() {
        if(null != mRecordingMsgTV) {
-          mRecordingMsgTV.setCompoundDrawablesWithIntrinsicBounds
-                           (R.drawable.recorder_start, 0, 0, 0);
+          mRecordingMsgTV.setCompoundDrawables(null,  null,  null,  null);
        }
    }
 
@@ -1875,6 +1852,7 @@
          FmSharedPreferences.addStation(selectedStation.getName(), selectedStation
                         .getFrequency(), currentList);
          setupPresetLayout();
+         mPrefs.Save();
       }
    }
 
@@ -1893,6 +1871,7 @@
           setMuteModeButtonImage(false);
       }
       if (bEnable) {
+         mFmSeeker.setVisibility(View.VISIBLE);
          if (mRadioTextScroller != null) {
              mRadioTextScroller.startScroll();
          }
@@ -1917,6 +1896,7 @@
              }
         }
       }else {
+         mFmSeeker.setVisibility(View.INVISIBLE);
          if (mRadioTextScroller != null) {
              mRadioTextScroller.stopScroll();
          }
@@ -1925,7 +1905,7 @@
          }
          for (int nButton = 0; nButton < MAX_PRESETS_PER_PAGE; nButton++) {
              if (mPresetButtons[nButton] != null) {
-                  mPresetButtons[nButton].setTextColor(Color.BLACK);
+                  mPresetButtons[nButton].setTextColor(Color.WHITE);
              }
          }
       }
@@ -1955,23 +1935,19 @@
       }
       if (mSleepMsgTV != null) {
          mSleepMsgTV.setVisibility(((bEnable && isSleepTimerActive()) ? View.VISIBLE
-                                 : View.INVISIBLE));
+                                 : View.GONE));
       }
       if (mRecordingMsgTV != null) {
          mRecordingMsgTV.setVisibility(((bEnable == true) ? View.VISIBLE
-                                     : View.INVISIBLE));
-      }
-      if (mRadioTextTV != null) {
-         mRadioTextTV.setVisibility(((bEnable == true) ? View.VISIBLE
-                                  : View.INVISIBLE));
+                                     : View.GONE));
       }
       if(mERadioTextTV != null) {
          mERadioTextTV.setVisibility(((bEnable == true) ? View.VISIBLE
-                                  : View.INVISIBLE));
+                                  : View.GONE));
       }
       if (mProgramServiceTV != null) {
          mProgramServiceTV.setVisibility(((bEnable == true) ? View.VISIBLE
-                                  : View.INVISIBLE));
+                                  : View.GONE));
       }
 
       if (!isAntennaAvailable()) {
@@ -1985,11 +1961,12 @@
          }
       }else if (isCallActive()) {
          if (mRadioTextTV != null) {
-            mRadioTextTV.setText("");
-            mRadioTextScroller.mOriginalString = "";
+            mRadioTextTV.setText(getString(R.string.fm_call));
+            mRadioTextScroller.mOriginalString = getString(R.string.fm_call);
          }
          if (mERadioTextTV != null) {
              mERadioTextTV.setText("");
+             mERadioTextTV.setVisibility(View.GONE);
              mERadioTextScroller.mOriginalString = "";
          }
          if (mOnOffButton != null) {
@@ -1997,11 +1974,16 @@
          }
       }else {
          if (mRadioTextTV != null) {
-             mRadioTextTV.setText("");
+             if (bEnable) {
+                 mRadioTextTV.setText("");
+             } else {
+                 mRadioTextTV.setText(getString(R.string.fm_off));
+             }
              mRadioTextScroller.mOriginalString = "";
          }
          if (mERadioTextTV != null) {
              mERadioTextTV.setText("");
+             mERadioTextTV.setVisibility(View.GONE);
              mERadioTextScroller.mOriginalString = "";
          }
          if (mOnOffButton != null) {
@@ -2009,7 +1991,7 @@
          }
       }
 
-      if (mStereoTV != null) {
+      if (false && mStereoTV != null) {
           mStereoTV.setVisibility(((bEnable == true) ? View.VISIBLE
                                    : View.INVISIBLE));
       }
@@ -2064,6 +2046,29 @@
       }
    }
 
+   private void saveStations() {
+       List<Integer> scannedFrequencies = null;
+       try {
+           scannedFrequencies = mService.getScannedFrequencies();
+       } catch (RemoteException e) {
+           e.printStackTrace();
+       }
+       if (scannedFrequencies != null && scannedFrequencies.size() > 0) {
+           Collections.sort(scannedFrequencies);
+           SharedPreferences sp = getSharedPreferences(SCAN_STATION_PREFS_NAME, 0);
+           SharedPreferences.Editor editor = sp.edit();
+
+           int index = 0;
+           for (Integer freq : scannedFrequencies) {
+               index++;
+               editor.putString(STATION_NAME + index, index + "");
+               editor.putInt(STATION_FREQUENCY + index, freq);
+           }
+           editor.putInt(NUM_OF_STATIONS, index);
+           editor.commit();
+       }
+   }
+
    private void setupPresetLayout() {
       int numStations = FmSharedPreferences.getListStationCount();
       int addedStations = 0;
@@ -2104,7 +2109,7 @@
 
    private void updateStationInfoToUI() {
       double frequency = mTunedStation.getFrequency() / 1000.0;
-      mTuneStationFrequencyTV.setText("" + frequency + "MHz");
+      mTuneStationFrequencyTV.setText("" + frequency);
       if ((mPicker != null) && mUpdatePickerValue) {
           mPicker.setValue(((mTunedStation.getFrequency() - mPrefs.getLowerLimit())
                               / mPrefs.getFrequencyStepSize()));
@@ -2113,6 +2118,7 @@
       mProgramTypeTV.setText(mTunedStation.getPtyString());
       mRadioTextTV.setText("");
       mERadioTextTV.setText("");
+      mERadioTextTV.setVisibility(View.GONE);
       mRadioTextScroller.mOriginalString = "";
       mRadioTextScroller.mStringlength = 0;
       mRadioTextScroller.mIteration = 0;
@@ -2401,7 +2407,7 @@
          }
       }
       if(null != mSleepMsgTV) {
-         mSleepMsgTV.setVisibility(View.INVISIBLE);
+         mSleepMsgTV.setVisibility(View.GONE);
       }
    }
 
@@ -2433,7 +2439,7 @@
    }
 
    private void updateExpiredSleepTime() {
-      int vis = View.INVISIBLE;
+      int vis = View.GONE;
       if (isSleepTimerActive()) {
          long timeNow = ((SystemClock.elapsedRealtime()));
          if (mSleepAtPhoneTime >= timeNow) {
@@ -2442,8 +2448,8 @@
             mSleepMsgTV.setText(sleepMsg);
             if (seconds < SLEEP_TOGGLE_SECONDS) {
                int nowVis = mSleepMsgTV.getVisibility();
-               vis = (nowVis == View.INVISIBLE) ? View.VISIBLE
-                     : View.INVISIBLE;
+               vis = (nowVis == View.GONE) ? View.VISIBLE
+                     : View.GONE;
             }else {
                vis = View.VISIBLE;
             }
@@ -2559,6 +2565,7 @@
              mTunedStation.setPI(0);
              mTunedStation.setPty(0);
              updateStationInfoToUI();
+             enableRadioOnOffUI();
          }catch (RemoteException e) {
             e.printStackTrace();
          }
@@ -2607,7 +2614,7 @@
       mTunedStation.setPI(0);
       mTunedStation.setRDSSupported(false);
       mTunedStation.setPty(0);
-      mRadioTextTV.setText("");
+      mRadioTextTV.setText(getString(R.string.fm_off));
       mERadioTextTV.setText("");
       mRadioTextScroller.mOriginalString = "";
       mProgramServiceTV.setText("");
@@ -2616,6 +2623,7 @@
       mERadioTextScroller.stopScroll();
       mUpdatePickerValue = true;
       updateStationInfoToUI();
+      enableRadioOnOffUI();
    }
 
    Runnable mRadioEnabled = new Runnable() {
@@ -2669,6 +2677,12 @@
          updateSearchProgress();
          resetFMStationInfoUI();
          invalidateOptionsMenu();
+         saveStations();
+         if (mShowStationList) {
+            Intent stationListIntent = new Intent(FMRadio.this, StationListActivity.class);
+            startActivity(stationListIntent);
+         }
+         mShowStationList = false;
       }
    };
 
@@ -2712,7 +2726,7 @@
                   mRadioTextScroller.mOriginalString = str;
                }else if(TextUtils.isEmpty(str)) { /* Rest the string to empty*/
                   mRadioTextTV.setText("");
-                  mRadioTextScroller.mOriginalString = "";
+                  mRadioTextScroller.mOriginalString = getString(R.string.fm_off);
                }else {
                   Log.v(LOGTAG, "mUpdateRadioText: Leaving old string " + mRadioTextTV.getText());
                }
@@ -2756,6 +2770,7 @@
                    mERadioTextTV.setText("");
                    mERadioTextScroller.mOriginalString = "";
                }else {
+                   mERadioTextTV.setVisibility(View.GONE);
                    mERadioTextTV.setText(str);
                    mERadioTextScroller.mOriginalString = str;
                }
@@ -3076,15 +3091,6 @@
          Log.d(LOGTAG, "mServiceCallbacks.onTuneStatusChanged: ");
          if (mIsScaning) {
              Log.d(LOGTAG, "isScanning....................");
-             SharedPreferences sp = getSharedPreferences(SCAN_STATION_PREFS_NAME, 0);
-             SharedPreferences.Editor editor = sp.edit();
-             int station_number = sp.getInt(NUM_OF_STATIONS, 0);
-             station_number++;
-             editor.putInt(NUM_OF_STATIONS, station_number);
-             editor.putString(STATION_NAME + station_number, station_number + "");
-             editor.putInt(STATION_FREQUENCY + station_number,
-                                   FmSharedPreferences.getTunedFrequency());
-             editor.commit();
          }
          cleanupTimeoutHandler();
          mHandler.post(mUpdateStationInfo);
@@ -3113,6 +3119,26 @@
       }
       public void onSearchComplete() {
          Log.d(LOGTAG, "mServiceCallbacks.onSearchComplete :");
+         if (mIsScaning) {
+             List<Integer> scannedFrequencies = null;
+             try {
+                 scannedFrequencies = mService.getScannedFrequencies();
+             } catch (RemoteException e) {
+                 e.printStackTrace();
+             }
+             if (scannedFrequencies != null && !scannedFrequencies.isEmpty()) {
+                 mShowStationList = true;
+             } else {
+                 mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast t = Toast.makeText(FMRadio.this,
+                           getString(R.string.fm_search_no_results), Toast.LENGTH_SHORT);
+                        t.show();
+                    }
+                 });
+             }
+         }
          mScanPty = 0;
          mScanPtyIndex = 0;
          mIsScaning = false;
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 4807355..7457ca3 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -50,6 +50,7 @@
 import android.media.AudioManager.OnAudioFocusChangeListener;
 import android.media.AudioSystem;
 import android.media.MediaRecorder;
+import android.media.AudioDeviceAttributes;
 import android.media.AudioDevicePort;
 import android.media.AudioDevicePortConfig;
 import android.media.AudioFormat;
@@ -144,6 +145,7 @@
    private int mServiceStartId = -1;
    private boolean mServiceInUse = false;
    private static boolean mMuted = false;
+   private static int mFreq = 0;
    private static boolean mResumeAfterCall = false;
    private static int mAudioDevice = AudioDeviceInfo.TYPE_WIRED_HEADPHONES;
    MediaRecorder mRecorder = null;
@@ -159,12 +161,12 @@
    private boolean mA2dpDisconnected = false;
    private boolean mA2dpConnected = false;
 
-   private boolean mFmStats = false;
    //Install the death receipient
    private IBinder.DeathRecipient mDeathRecipient;
    private FMDeathRecipient mFMdr;
 
    //PhoneStateListener instances corresponding to each
+   private ArrayList<Integer> mScannedFrequencies = new ArrayList<Integer>();
 
    private FmRxRdsData mFMRxRDSData=null;
    // interval after which we stop the service when idle
@@ -215,10 +217,13 @@
    private boolean mIsSSRInProgressFromActivity = false;
    private int mKeyActionDownCount = 0;
 
+   private Thread mRecordSinkThread = null;
    private AudioTrack mAudioTrack = null;
+   private boolean mIsRecordSink = false;
    private static final int AUDIO_FRAMES_COUNT_TO_IGNORE = 3;
    private Object mEventWaitLock = new Object();
    private boolean mIsFMDeviceLoopbackActive = false;
+   private Object mRecordSinkLock = new Object();
    private File mStoragePath = null;
    private static final int FM_OFF_FROM_APPLICATION = 1;
    private static final int FM_OFF_FROM_ANTENNA = 2;
@@ -237,6 +242,20 @@
    private AudioFocusRequest mGainFocusReq;
    private PhoneStateCallback mPhoneStateCallback;
 
+   private AudioRoutingListener mRoutingListener =  null;
+   private int mCurrentDevice = AudioDeviceInfo.TYPE_UNKNOWN; // current output device
+   private boolean mUseAudioSession = false;
+
+   private static final int AUDIO_SAMPLE_RATE = 44100;
+   private static final int AUDIO_CHANNEL_CONFIG =
+           AudioFormat.CHANNEL_CONFIGURATION_STEREO;
+   private static final int AUDIO_ENCODING_FORMAT =
+           AudioFormat.ENCODING_PCM_16BIT;
+   private static final int FM_RECORD_BUF_SIZE =
+           AudioRecord.getMinBufferSize(AUDIO_SAMPLE_RATE,
+                   AUDIO_CHANNEL_CONFIG, AUDIO_ENCODING_FORMAT);
+   private AudioRecord mAudioRecord = null;
+
    public FMRadioService() {
    }
 
@@ -284,6 +303,10 @@
       mA2dpDeviceSupportInHal = valueStr.contains("=true");
       Log.d(LOGTAG, " is A2DP device Supported In HAL"+mA2dpDeviceSupportInHal);
 
+      mUseAudioSession = SystemProperties.getBoolean("ro.vendor.fm.use_audio_session", false);
+      if (mUseAudioSession) {
+          mRoutingListener = new AudioRoutingListener();
+      }
       mGainFocusReq = requestAudioFocus();
       AudioManager mAudioManager =
           (AudioManager) getSystemService(Context.AUDIO_SERVICE);
@@ -375,6 +398,164 @@
       super.onDestroy();
    }
 
+    private synchronized void createRecordSessions() {
+        if (mAudioRecord != null) {
+            mAudioRecord.stop();
+        }
+        if (mAudioTrack != null) {
+            mAudioTrack.stop();
+        }
+
+        mAudioRecord = new AudioRecord(MediaRecorder.AudioSource.RADIO_TUNER,
+                AUDIO_SAMPLE_RATE, AUDIO_CHANNEL_CONFIG,
+                AUDIO_ENCODING_FORMAT, FM_RECORD_BUF_SIZE);
+
+        mAudioTrack = new AudioTrack.Builder()
+                .setAudioFormat(new AudioFormat.Builder()
+                        .setEncoding(AUDIO_ENCODING_FORMAT)
+                        .setSampleRate(AUDIO_SAMPLE_RATE)
+                        .setChannelIndexMask(AUDIO_CHANNEL_CONFIG)
+                        .build())
+                .setBufferSizeInBytes(FM_RECORD_BUF_SIZE)
+                .build();
+        Log.d(LOGTAG, " adding RoutingChangedListener() ");
+        mAudioTrack.addOnRoutingChangedListener(mRoutingListener, null);
+
+        if (mMuted) {
+            mAudioTrack.setVolume(0.0f);
+        }
+    }
+
+    private synchronized void startRecordSink() {
+        Log.d(LOGTAG, "startRecordSink " + AudioSystem.getForceUse(AudioSystem.FOR_MEDIA));
+
+        mIsRecordSink = true;
+        createRecordSinkThread();
+    }
+
+    private synchronized void createRecordSinkThread() {
+        if (mRecordSinkThread == null) {
+            mRecordSinkThread = new RecordSinkThread();
+            mRecordSinkThread.start();
+            Log.d(LOGTAG, "mRecordSinkThread started");
+            try {
+                synchronized (mRecordSinkLock) {
+                    Log.d(LOGTAG, "waiting for play to complete");
+                    mRecordSinkLock.wait();
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            if (FmReceiver.isCherokeeChip() && mPref.getBoolean("SLIMBUS_SEQ", true)) {
+                enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+            }
+        }
+    }
+
+    private synchronized void exitRecordSinkThread() {
+        if (isRecordSinking()) {
+            Log.d(LOGTAG, "stopRecordSink");
+            mAudioTrack.setPreferredDevice(null);
+            mIsRecordSink = false;
+        } else {
+            Log.d(LOGTAG, "exitRecordSinkThread called mRecordSinkThread not running");
+            return;
+        }
+        try {
+            Log.d(LOGTAG, "stopRecordSink waiting to join mRecordSinkThread");
+            mRecordSinkThread.join();
+        } catch (InterruptedException e) {
+            Log.d(LOGTAG, "Exceprion while mRecordSinkThread join");
+        }
+        mRecordSinkThread = null;
+        mAudioTrack = null;
+        mAudioRecord = null;
+        Log.d(LOGTAG, "exitRecordSinkThread completed");
+    }
+
+    private boolean isRecordSinking() {
+        return mIsRecordSink;
+    }
+
+    class RecordSinkThread extends Thread {
+        private int mCurrentFrame = 0;
+
+        private boolean isAudioFrameNeedIgnore() {
+            return mCurrentFrame < AUDIO_FRAMES_COUNT_TO_IGNORE;
+        }
+
+        @Override
+        public void run() {
+            try {
+                Log.d(LOGTAG, "RecordSinkThread: run started ");
+                byte[] buffer = new byte[FM_RECORD_BUF_SIZE];
+                while (isRecordSinking()) {
+                    // Speaker mode or BT a2dp mode will come here and keep reading and writing.
+                    // If we want FM sound output from speaker or BT a2dp, we must record data
+                    // to AudioRecrd and write data to AudioTrack.
+                    if (mAudioRecord.getRecordingState() == AudioRecord.RECORDSTATE_STOPPED) {
+                        mAudioRecord.startRecording();
+                        Log.d(LOGTAG, "RecordSinkThread: mAudioRecord.startRecording started");
+                    }
+
+                    if (mAudioTrack.getPlayState() == AudioTrack.PLAYSTATE_STOPPED) {
+                        Log.d(LOGTAG, "RecordSinkThread: mAudioTrack.play executed");
+                        mAudioTrack.play();
+                        Log.d(LOGTAG, "RecordSinkThread: mAudioTrack.play completed");
+                        synchronized (mRecordSinkLock) {
+                            mRecordSinkLock.notify();
+                        }
+                    }
+                    int size = mAudioRecord.read(buffer, 0, FM_RECORD_BUF_SIZE);
+                    // check whether need to ignore first 3 frames audio data from AudioRecord
+                    // to avoid pop noise.
+                    if (isAudioFrameNeedIgnore()) {
+                        mCurrentFrame += 1;
+                        continue;
+                    }
+                    if (size <= 0) {
+                        Log.e(LOGTAG, "RecordSinkThread read data from AudioRecord "
+                                + "error size: " + size);
+                        continue;
+                    }
+                    byte[] tmpBuf = new byte[size];
+                    System.arraycopy(buffer, 0, tmpBuf, 0, size);
+                    // Check again to avoid noises, because RecordSink may be changed
+                    // while AudioRecord is reading.
+                    if (isRecordSinking()) {
+                        mAudioTrack.write(tmpBuf, 0, tmpBuf.length);
+                    } else {
+                        mCurrentFrame = 0;
+                        Log.d(LOGTAG,
+                                "RecordSinkThread: stopRecordSink called stopping mAudioTrack and"
+                                        + " mAudioRecord ");
+                        break;
+                    }
+                }
+            } catch (Exception e) {
+                Log.d(LOGTAG, "RecordSinkThread.run, thread is interrupted, need exit thread");
+            } finally {
+                Log.d(LOGTAG,
+                        "RecordSinkThread: stopRecordSink called stopping mAudioTrack and "
+                                + "mAudioRecord ");
+                if (mAudioRecord.getRecordingState() == AudioRecord.RECORDSTATE_RECORDING) {
+                    Log.d(LOGTAG, "RecordSinkThread: mAudioRecord.stop()");
+                    mAudioRecord.stop();
+                    Log.d(LOGTAG, "RecordSinkThread: mAudioRecord.stop() completed");
+                    mAudioRecord.release();
+                    Log.d(LOGTAG, "RecordSinkThread: mAudioRecord.release() completed");
+                }
+                if (mAudioTrack.getPlayState() == AudioTrack.PLAYSTATE_PLAYING) {
+                    Log.d(LOGTAG, "RecordSinkThread: mAudioTrack.stop();");
+                    mAudioTrack.stop();
+                    Log.d(LOGTAG, "RecordSinkThread:mAudioTrack.stop() completed");
+                    mAudioTrack.release();
+                    Log.d(LOGTAG, "RecordSinkThread: mAudioTrack.release() completed");
+                }
+            }
+        }
+    }
+
     private void setFMVolume(int mCurrentVolumeIndex) {
        AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
        float decibels = audioManager.getStreamVolumeDb(AudioManager.STREAM_MUSIC,
@@ -448,6 +629,81 @@
         return true;
     }
 
+    private boolean configureFMDeviceLoopback_O(boolean enable) {
+        boolean success = true;
+        int status = AudioSystem.SUCCESS;
+
+        Log.d(LOGTAG, "configureFMDeviceLoopback enable:" + enable +
+                " DeviceLoopbackActive:" + mIsFMDeviceLoopbackActive);
+        if (enable && !mIsFMDeviceLoopbackActive) {
+            status = AudioSystem.getDeviceConnectionState(AudioSystem.DEVICE_OUT_FM, "");
+            Log.d(LOGTAG, " FM hardwareLoopback Status = " + status);
+            if (status == AudioSystem.DEVICE_STATE_AVAILABLE) {
+                // This case usually happens, when FM is force killed through settings app
+                // and we don't get chance to disable Hardware LoopBack.
+                Log.d(LOGTAG, " FM HardwareLoopBack Active, disable it first");
+                AudioSystem.setDeviceConnectionState(
+                        new AudioDeviceAttributes(AudioSystem.DEVICE_OUT_FM, ""),
+                        AudioSystem.DEVICE_STATE_UNAVAILABLE,
+                        AudioSystem.AUDIO_FORMAT_DEFAULT);
+                mCurrentDevice = AudioDeviceInfo.TYPE_WIRED_HEADSET;
+            }
+            status = AudioSystem.setDeviceConnectionState(
+                    new AudioDeviceAttributes(AudioSystem.DEVICE_OUT_FM, ""),
+                    AudioSystem.DEVICE_STATE_AVAILABLE,
+                    AudioSystem.AUDIO_FORMAT_DEFAULT);
+            if (status != AudioSystem.SUCCESS) {
+                success = false;
+                Log.e(LOGTAG, "configureFMDeviceLoopback failed! status:" + status);
+                AudioSystem.setDeviceConnectionState(
+                        new AudioDeviceAttributes(AudioSystem.DEVICE_OUT_FM, ""),
+                        AudioSystem.DEVICE_STATE_UNAVAILABLE,
+                        AudioSystem.AUDIO_FORMAT_DEFAULT);
+                mCurrentDevice = AudioDeviceInfo.TYPE_UNKNOWN;
+            } else {
+                mIsFMDeviceLoopbackActive = true;
+            }
+        } else if (!enable && mIsFMDeviceLoopbackActive) {
+            AudioSystem.setDeviceConnectionState(
+                    new AudioDeviceAttributes(AudioSystem.DEVICE_OUT_FM, ""),
+                    AudioSystem.DEVICE_STATE_UNAVAILABLE,
+                    AudioSystem.AUDIO_FORMAT_DEFAULT);
+            mIsFMDeviceLoopbackActive = false;
+            mCurrentDevice = AudioDeviceInfo.TYPE_UNKNOWN;
+        }
+
+        return success;
+    }
+
+    private synchronized void configureAudioDataPath(boolean enable) {
+        Log.d(LOGTAG, "configureAudioDataPath:" + enable +
+                " mA2dpConnected:" + mA2dpConnected +
+                " isRecordSinking" + isRecordSinking() +
+                " mSpeakerPhoneOn:" + mSpeakerPhoneOn +
+                " mIsFMDeviceLoopbackActive:" + mIsFMDeviceLoopbackActive);
+
+        if (enable) {
+            Log.d(LOGTAG, "Start Hardware loop back for audio");
+            if (mStoppedOnFocusLoss) {
+                Log.d(LOGTAG, "FM does not have audio focus, not enabling " +
+                        "audio path");
+                return;
+            }
+            if (!mIsFMDeviceLoopbackActive && !mA2dpConnected && !mSpeakerPhoneOn) {
+                // not on BT and device loop is also not active
+                if (FmReceiver.isCherokeeChip() && mPref.getBoolean("SLIMBUS_SEQ", true)) {
+                    enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+                }
+                exitRecordSinkThread();
+                configureFMDeviceLoopback_O(true);
+            }
+        } else {
+            //inform audio to disbale fm audio
+            configureFMDeviceLoopback_O(false);
+            exitRecordSinkThread();
+        }
+    }
+
     private void setCurrentFMVolume() {
         if(isFmOn()) {
             AudioManager maudioManager =
@@ -852,7 +1108,9 @@
           setLowPowerMode(false);
           if(false == mPlaybackInProgress) {
               startFM();
-              enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+              if (mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+                  enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+              }
           }
       }
    }
@@ -1092,6 +1350,9 @@
        if (mStoppedOnFactoryReset) {
            mStoppedOnFactoryReset = false;
            mSpeakerPhoneOn = false;
+           if (mUseAudioSession) {
+               configureAudioDataPath(true);
+           }
        // In FM stop, the audio route is set to default audio device
        }
        String temp = mSpeakerPhoneOn ? "Speaker" : "WiredHeadset";
@@ -1101,7 +1362,11 @@
        } else {
            mAudioDevice = AudioDeviceInfo.TYPE_WIRED_HEADPHONES;
        }
-       configureFMDeviceLoopback(true);
+       if (mUseAudioSession) {
+           startApplicationLoopBack(mAudioDevice);
+       } else {
+           configureFMDeviceLoopback(true);
+       }
        try {
            if ((mServiceInUse) && (mCallbacks != null))
                mCallbacks.onFmAudioPathStarted();
@@ -1112,7 +1377,11 @@
 
    private void stopFM() {
        Log.d(LOGTAG, "In stopFM");
-       configureFMDeviceLoopback(false);
+       if (mUseAudioSession) {
+           configureAudioDataPath(false);
+       } else {
+           configureFMDeviceLoopback(false);
+       }
        mPlaybackInProgress = false;
        try {
            if ((mServiceInUse) && (mCallbacks != null))
@@ -1125,7 +1394,11 @@
    private void resetFM(){
        Log.d(LOGTAG, "resetFM");
        mPlaybackInProgress = false;
-       configureFMDeviceLoopback(false);
+       if (mUseAudioSession) {
+           configureAudioDataPath(false);
+       } else {
+           configureFMDeviceLoopback(false);
+       }
    }
 
    private boolean getRecordServiceStatus() {
@@ -1222,11 +1495,11 @@
         try {
             if (getResources().getBoolean(R.bool.def_save_name_format_enabled)) {
                 String suffix = getResources().getString(R.string.def_save_name_suffix);
-                suffix = "".equals(suffix) ? ".3gpp" : suffix;
+                suffix = "".equals(suffix) ? ".aac" : suffix;
                 String prefix = getResources().getString(R.string.def_save_name_prefix) + '-';
                 mSampleFile = createTempFile(prefix, suffix, sampleDir);
             } else {
-                mSampleFile = File.createTempFile("FMRecording", ".3gpp", sampleDir);
+                mSampleFile = File.createTempFile("FMRecording", ".aac", sampleDir);
             }
         } catch (IOException e) {
             Log.e(LOGTAG, "Not able to access SD Card");
@@ -1471,6 +1744,8 @@
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
+            } else if (mFreq > 0) {
+                tune(mFreq);
             }
         }
     }
@@ -1552,6 +1827,20 @@
       }
  };
 
+   private class AudioRoutingListener implements AudioRouting.OnRoutingChangedListener {
+       public void onRoutingChanged(AudioRouting audioRouting) {
+           Log.d(LOGTAG, " onRoutingChanged  + currdevice " + mCurrentDevice);
+           AudioDeviceInfo routedDevice = audioRouting.getRoutedDevice();
+           // if routing is nowhere, we get routedDevice as null
+           if (routedDevice != null) {
+               Log.d(LOGTAG, " Audio Routed to device id " + routedDevice.getType());
+               if (routedDevice.getType() != mCurrentDevice) {
+                   startApplicationLoopBack(mCurrentDevice);
+               }
+           }
+       }
+   }
+
    private Handler mDelayedStopHandler = new Handler() {
       @Override
       public void handleMessage(Message msg) {
@@ -1608,9 +1897,10 @@
                       //intentional fall through.
                   case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
                       Log.v(LOGTAG, "AudioFocus: received AUDIOFOCUS_LOSS_TRANSIENT");
-
-                      enableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
-
+                      if (mReceiver != null && mReceiver.isCherokeeChip() &&
+                                            (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+                          enableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
+                      }
                       if (true == mPlaybackInProgress) {
                           stopFM();
                       }
@@ -1632,8 +1922,10 @@
 
                       if(false == mPlaybackInProgress) {
                           startFM();
-                          enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
-
+                          if (mReceiver != null && mReceiver.isCherokeeChip() &&
+                                (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+                              enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+                          }
                       } else {
                           /* This case usually happens, when FM volume is lowered down and Playback
                            * In Progress on AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK recived. Need
@@ -1707,15 +1999,6 @@
       Log.d(LOGTAG,"startNotification");
 
       synchronized (mNotificationLock) {
-          RemoteViews views = new RemoteViews(getPackageName(), R.layout.statusbar);
-          views.setImageViewResource(R.id.icon, R.drawable.stat_notify_fm);
-          if (isFmOn())
-          {
-              views.setTextViewText(R.id.frequency, getTunedFrequencyString());
-          } else {
-             views.setTextViewText(R.id.frequency, "");
-          }
-
           Context context = getApplicationContext();
           Notification notification;
           NotificationManager notificationManager =
@@ -1728,8 +2011,9 @@
           notificationManager.createNotificationChannel(notificationChannel);
 
           notification = new Notification.Builder(context, FMRADIO_NOTIFICATION_CHANNEL)
-            .setCustomContentView(views)
             .setSmallIcon(R.drawable.stat_notify_fm)
+            .setContentTitle(isFmOn() ? getString(R.string.app_name) : "")
+            .setContentText(isFmOn() ? getTunedFrequencyString() : "")
             .setContentIntent(PendingIntent.getActivity(this,
                 0, new Intent("com.caf.fmradio.FMRADIO_ACTIVITY"), PendingIntent.FLAG_IMMUTABLE))
             .setOngoing(true)
@@ -1741,25 +2025,6 @@
       }
    }
 
-      /* hide the FM Notification */
-   public void stopNotification() {
-      Log.d(LOGTAG,"stopNotification");
-
-      synchronized (mNotificationLock) {
-          Context context = getApplicationContext();
-          NotificationManager notificationManager =
-              (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-          if((notificationManager != null)
-            && (notificationManager.getNotificationChannel(FMRADIO_NOTIFICATION_CHANNEL) != null)) {
-             try {
-               notificationManager.deleteNotificationChannel(FMRADIO_NOTIFICATION_CHANNEL);
-             } catch (Exception e) {
-               Log.e(LOGTAG,"exception raised from deleteNotificationChannel");
-             }
-          }
-      }
-   }
-
    private void stop() {
       Log.d(LOGTAG,"in stop");
 
@@ -1944,6 +2209,11 @@
       {
          return(mService.get().getProgramID());
       }
+      public int[] getSearchList()
+      {
+         return(mService.get().getSearchList());
+      }
+
       public boolean setLowPowerMode(boolean enable)
       {
          return(mService.get().setLowPowerMode(enable));
@@ -2093,12 +2363,6 @@
       {
           return (mService.get().getAfJmpRmssiSamplesCnt());
       }
-
-      public String getSocName()
-      {
-          return (mService.get().getSocName());
-      }
-
       public boolean setAfJmpRmssiSamplesCnt(int afJmpRmssiSmplsCnt)
       {
           return (mService.get().setAfJmpRmssiSamplesCnt(afJmpRmssiSmplsCnt));
@@ -2128,16 +2392,21 @@
          return(mService.get().isA2DPConnected());
       }
 
+      public boolean isSearchInProgress()
+      {
+         return(mService.get().isSearchInProgress());
+      }
+
+      public List<Integer> getScannedFrequencies()
+      {
+         return(mService.get().getScannedFrequencies());
+      }
+
       public int getExtenCountryCode()
       {
          return(mService.get().getExtenCountryCode());
       }
 
-      public boolean getFmStatsProp()
-      {
-          return (mService.get().getFmStatsProp());
-      }
-
       public void restoreDefaults()
       {
          mService.get().restoreDefaults();
@@ -2188,6 +2457,86 @@
        return status;
    }
 
+   private boolean fmTurnOnSequence () {
+       boolean bStatus = false;
+       // This sets up the FM radio device
+       FmConfig config = FmSharedPreferences.getFMConfiguration();
+
+       Log.d(LOGTAG, "fmOn: RadioBand   :"+ config.getRadioBand());
+       Log.d(LOGTAG, "fmOn: Emphasis    :"+ config.getEmphasis());
+       Log.d(LOGTAG, "fmOn: ChSpacing   :"+ config.getChSpacing());
+       Log.d(LOGTAG, "fmOn: RdsStd      :"+ config.getRdsStd());
+       Log.d(LOGTAG, "fmOn: LowerLimit  :"+ config.getLowerLimit());
+       Log.d(LOGTAG, "fmOn: UpperLimit  :"+ config.getUpperLimit());
+
+       mEventReceived = false;
+       bStatus = mReceiver.enable(FmSharedPreferences.getFMConfiguration(), this);
+
+       if (mReceiver.isCherokeeChip()) {
+           bStatus = waitForEvent();
+       }
+
+       Log.d(LOGTAG, "mReceiver.enable done, Status :" +  bStatus);
+
+         if (bStatus == true)
+         {
+            /* Put the hardware into normal mode */
+            bStatus = setLowPowerMode(false);
+            Log.d(LOGTAG, "setLowPowerMode done, Status :" +  bStatus);
+
+
+            AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+            if( (audioManager != null) &&(false == mPlaybackInProgress) )
+            {
+               Log.d(LOGTAG, "mAudioManager.setFmRadioOn = true \n" );
+               //audioManager.setParameters("FMRadioOn="+mAudioDevice);
+               int state =  getCallState();
+               if ( TelephonyManager.CALL_STATE_IDLE != getCallState() )
+               {
+                 fmActionOnCallState(state);
+               } else {
+                   startFM(); // enable FM Audio only when Call is IDLE
+               }
+               Log.d(LOGTAG, "mAudioManager.setFmRadioOn done \n" );
+            }
+            if (mReceiver != null) {
+                bStatus = mReceiver.registerRdsGroupProcessing(FmReceiver.FM_RX_RDS_GRP_RT_EBL|
+                                                           FmReceiver.FM_RX_RDS_GRP_PS_EBL|
+                                                           FmReceiver.FM_RX_RDS_GRP_AF_EBL|
+                                                           FmReceiver.FM_RX_RDS_GRP_PS_SIMPLE_EBL|
+                                                           FmReceiver.FM_RX_RDS_GRP_ECC_EBL|
+                                                           FmReceiver.FM_RX_RDS_GRP_PTYN_EBL|
+                                                           FmReceiver.FM_RX_RDS_GRP_RT_PLUS_EBL);
+                Log.d(LOGTAG, "registerRdsGroupProcessing done, Status :" +  bStatus);
+            }
+            bStatus = enableAutoAF(FmSharedPreferences.getAutoAFSwitch());
+            Log.d(LOGTAG, "enableAutoAF done, Status :" +  bStatus);
+
+            /* There is no internal Antenna*/
+            bStatus = mReceiver.setInternalAntenna(false);
+            Log.d(LOGTAG, "setInternalAntenna done, Status :" +  bStatus);
+
+            /* Read back to verify the internal Antenna mode*/
+            readInternalAntennaAvailable();
+
+            startNotification();
+            bStatus = true;
+         }
+         else
+         {
+            if ((mReceiver.getFMState() != mReceiver.subPwrLevel_FMRx_Starting) &&
+                            (mReceiver.getFMState() != mReceiver.FMState_Rx_Turned_On)) {
+                mReceiver = null; // as enable failed no need to disable
+                              // failure of enable can be because handle
+                              // already open which gets effected if
+                              // we disable
+                stop();
+            }
+         }
+
+         return bStatus;
+   }
+
    private boolean enableSlimbus(int flag) {
        Log.d(LOGTAG, "enableSlimbus");
        boolean bStatus = false;
@@ -2206,7 +2555,7 @@
    *                                                                                 .
    * @return true if fm Enable api was invoked successfully, false if the api failed.
    */
-   private boolean fmTurnOnSequence() {
+   private boolean fmTurnOnSequenceCherokee () {
        boolean bStatus = false;
        AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
        if ((audioManager != null) & (false == mPlaybackInProgress)) {
@@ -2256,13 +2605,12 @@
             bStatus = enableAutoAF(FmSharedPreferences.getAutoAFSwitch());
             Log.d(LOGTAG, "enableAutoAF done, Status :" +  bStatus);
 
-            /* There is no internal Antenna*/
-            bStatus = mReceiver.setInternalAntenna(false);
-            Log.d(LOGTAG, "setInternalAntenna done, Status :" +  bStatus);
-
             /* Read back to verify the internal Antenna mode*/
             readInternalAntennaAvailable();
 
+            bStatus = mReceiver.setInternalAntenna(mInternalAntennaAvailable);
+            Log.d(LOGTAG, "setInternalAntenna done, Status :" +  bStatus);
+
             startNotification();
             bStatus = true;
        } else {
@@ -2312,14 +2660,17 @@
          }
          else
          {
-             enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
-             bStatus = fmTurnOnSequence();
-                /* reset SSR flag */
+           if (mReceiver.isCherokeeChip()) {
+               if (mPref.getBoolean("SLIMBUS_SEQ", true)) {
+                   enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+               }
+               bStatus = fmTurnOnSequenceCherokee();
+           } else {
+               bStatus = fmTurnOnSequence();
+           }
+           /* reset SSR flag */
            mIsSSRInProgressFromActivity = false;
          }
-
-         if (mReceiver != null)
-            mFmStats = mReceiver.getFmStatsProp();
       }
       return(bStatus);
    }
@@ -2390,6 +2741,23 @@
    private boolean fmOffImpl() {
       boolean bStatus=false;
 
+      // This will disable the FM radio device
+      synchronized(mReceiverLock) {
+         if (mReceiver != null)
+         {
+            bStatus = mReceiver.disable(this);
+            mReceiver = null;
+         }
+      }
+      fmOperationsOff();
+      stop();
+
+      return(bStatus);
+   }
+
+   private boolean fmOffImplCherokee() {
+      boolean bStatus=false;
+
       fmOperationsOff();
       stop();
       try {
@@ -2425,7 +2793,11 @@
    private boolean fmOff() {
        boolean ret = false;
        if (mReceiver != null) {
-           ret = fmOffImpl();
+           if (mReceiver.isCherokeeChip()) {
+               ret = fmOffImplCherokee();
+           } else {
+              ret = fmOffImpl();
+           }
        }
        mWakeLock.release();
        return ret;
@@ -2441,9 +2813,6 @@
            isfmOffFromApplication = true;
        }
 
-       //stop Notification
-       stopNotification();
-
        return fmOff();
    }
   /*
@@ -2467,6 +2836,15 @@
       return(bStatus);
    }
 
+   public List<Integer> getScannedFrequencies() {
+       return mScannedFrequencies;
+   }
+
+   public boolean isSearchInProgress() {
+      int state = mReceiver.getFMState();
+      return state == qcom.fmradio.FmTransceiver.FMState_Srch_InProg;
+   }
+
    public boolean isSSRInProgress() {
       return mIsSSRInProgress;
    }
@@ -2509,7 +2887,9 @@
            return;
 
        mSpeakerPhoneOn = speakerOn;
-       enableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
+       if (mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+           enableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
+       }
 
        if (speakerOn == false) {
            mAudioDevice = AudioDeviceInfo.TYPE_WIRED_HEADPHONES;
@@ -2518,12 +2898,18 @@
            mAudioDevice = AudioDeviceInfo.TYPE_BUILTIN_SPEAKER;
            outputDevice = "Speaker";
        }
-       mAudioDeviceType = mAudioDevice | AudioSystem.DEVICE_OUT_FM;
-       AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-       String keyValPairs = new String("fm_routing="+mAudioDeviceType);
-       Log.d(LOGTAG, "keyValPairs = "+keyValPairs);
-       audioManager.setParameters(keyValPairs);
-       enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+       if (mUseAudioSession) {
+           startApplicationLoopBack(mAudioDevice);
+       } else {
+           mAudioDeviceType = mAudioDevice | AudioSystem.DEVICE_OUT_FM;
+           AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+           String keyValPairs = new String("fm_routing=" + mAudioDeviceType);
+           Log.d(LOGTAG, "keyValPairs = " + keyValPairs);
+           audioManager.setParameters(keyValPairs);
+       }
+       if (mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+          enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+       }
    }
   /*
    *  ReConfigure the FM Setup parameters
@@ -2642,6 +3028,7 @@
       {
          mReceiver.setStation(frequency);
          bCommandSent = true;
+         mFreq = frequency;
       }
       return bCommandSent;
    }
@@ -2697,6 +3084,8 @@
     */
    public boolean scan(int pty)
    {
+      // Clear previously scanned frequencies
+      mScannedFrequencies.clear();
       boolean bCommandSent=false;
       if (mReceiver != null)
       {
@@ -2919,6 +3308,24 @@
       return pi;
    }
 
+
+   /* Retrieves the station list from the SearchStationlist.
+    *
+    * @return Array of integers that represents the station frequencies.
+    * Note: 1. This is a synchronous call that should typically called when
+    *           Callback onSearchListComplete.
+    */
+   public int[] getSearchList()
+   {
+      int[] frequencyList = null;
+      if (mReceiver != null)
+      {
+         Log.d(LOGTAG, "getSearchList: ");
+         frequencyList = mReceiver.getStationList();
+      }
+      return frequencyList;
+   }
+
    /* Set the FM Power Mode on the FM hardware SoC.
     * Typically used when UI/Activity is in the background, so the Host is interrupted less often.
     *
@@ -3112,9 +3519,11 @@
       {
          Log.d(LOGTAG, "FmRxEvEnableReceiver");
          if (mReceiver != null) {
-             synchronized(mEventWaitLock) {
-                 mEventReceived = true;
-                 mEventWaitLock.notify();
+             if (mReceiver.isCherokeeChip()) {
+                 synchronized(mEventWaitLock) {
+                     mEventReceived = true;
+                     mEventWaitLock.notify();
+                 }
              }
          }
       }
@@ -3123,9 +3532,11 @@
          Log.d(LOGTAG, "FmRxEvDisableReceiver");
          mFMOn = false;
          FmSharedPreferences.clearTags();
-         synchronized (mEventWaitLock) {
-             mEventReceived = true;
-             mEventWaitLock.notify();
+         if (mReceiver != null && mReceiver.isCherokeeChip()) {
+             synchronized (mEventWaitLock) {
+                 mEventReceived = true;
+                 mEventWaitLock.notify();
+             }
          }
       }
       public void FmRxEvRadioReset()
@@ -3211,6 +3622,9 @@
             if(mReceiver != null) {
                clearStationInfo();
             }
+            if (isSearchInProgress()) {
+                mScannedFrequencies.add(frequency);
+            }
             if(mCallbacks != null)
             {
                mCallbacks.onTuneStatusChanged();
@@ -3361,9 +3775,11 @@
           if (mCallbacks != null) {
               try {
                   mCallbacks.getStationParamCb(val, status);
-                  synchronized(mEventWaitLock) {
-                      mEventReceived = true;
-                      mEventWaitLock.notify();
+                  if (mReceiver != null && mReceiver.isCherokeeChip()) {
+                      synchronized(mEventWaitLock) {
+                          mEventReceived = true;
+                          mEventWaitLock.notify();
+                      }
                   }
               } catch (RemoteException e) {
                   e.printStackTrace();
@@ -3572,18 +3988,21 @@
       public void FmRxEvEnableSlimbus(int status)
       {
          Log.e(LOGTAG, "FmRxEvEnableSlimbus status = " + status);
-         synchronized(mEventWaitLock) {
-             mEventReceived = true;
-             mEventWaitLock.notify();
+         if (mReceiver != null && mReceiver.isCherokeeChip()) {
+             synchronized(mEventWaitLock) {
+                 mEventReceived = true;
+                 mEventWaitLock.notify();
+             }
          }
-
       }
       public void FmRxEvEnableSoftMute(int status)
       {
          Log.e(LOGTAG, "FmRxEvEnableSoftMute status = " + status);
-         synchronized(mEventWaitLock) {
-             mEventReceived = true;
-             mEventWaitLock.notify();
+         if (mReceiver != null && mReceiver.isCherokeeChip()) {
+             synchronized(mEventWaitLock) {
+                 mEventReceived = true;
+                 mEventWaitLock.notify();
+             }
          }
       }
    };
@@ -3773,18 +4192,6 @@
           else
              return Integer.MIN_VALUE;
    }
-
-   String getSocName() {
-          if(mReceiver != null)
-             return mReceiver.getSocName();
-          else
-             return null;
-   }
-
-   boolean getFmStatsProp() {
-          return mFmStats;
-   }
-
    private void setAlarmSleepExpired (long duration) {
        Intent i = new Intent(SLEEP_EXPIRED_ACTION);
        AlarmManager am = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
@@ -3866,7 +4273,18 @@
    }
 
    private void requestFocusImpl() {
-      Log.d(LOGTAG, "++requestFocusImpl mPlaybackInProgress: " +
+      if( (false == mPlaybackInProgress) &&
+          (true  == mStoppedOnFocusLoss) && isFmOn()) {
+           // adding code for audio focus gain.
+           AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+           audioManager.requestAudioFocus(mGainFocusReq);
+           startFM();
+           mStoppedOnFocusLoss = false;
+       }
+   }
+
+   private void requestFocusImplCherokee() {
+      Log.d(LOGTAG, "++requestFocusImplCherokee mPlaybackInProgress: " +
                     mPlaybackInProgress + " mStoppedOnFocusLoss: " +
                     mStoppedOnFocusLoss + " isFmOn: " + isFmOn());
       if( (false == mPlaybackInProgress) &&
@@ -3876,7 +4294,9 @@
            audioManager.requestAudioFocus(mGainFocusReq);
            if(false == mPlaybackInProgress) {
                startFM();
-               enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+               if (mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+                  enableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+               }
            }
            mStoppedOnFocusLoss = false;
        }
@@ -3884,10 +4304,15 @@
 
    private void requestFocus() {
        Log.d(LOGTAG, "++requestFocus");
-       requestFocusImpl();
+       if (mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+           requestFocusImplCherokee();
+       } else {
+           requestFocusImpl();
+       }
        Log.d(LOGTAG, "--requestFocus");
    }
 
+
    public void onAudioFocusChange(int focusChange) {
            mDelayedStopHandler.obtainMessage(FOCUSCHANGE, focusChange, 0).sendToTarget();
    }
@@ -3938,4 +4363,50 @@
            //TODO unregister the fm service here.
        }
    }
+
+    private void startApplicationLoopBack(int deviceType) {
+        // stop existing playback path before starting new one
+        Log.d(LOGTAG, "startApplicationLoopBack for device " + deviceType);
+
+        AudioDeviceInfo outputDevice = null;
+        AudioDeviceInfo[] deviceList = mAudioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS);
+        for (AudioDeviceInfo audioDeviceInfo : deviceList) {
+            Log.d(LOGTAG, "startApplicationLoopBack dev_type " + audioDeviceInfo.getType());
+            if (AudioDeviceInfo.TYPE_WIRED_HEADSET == deviceType
+                    || AudioDeviceInfo.TYPE_WIRED_HEADPHONES == deviceType) {
+                if (audioDeviceInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
+                        audioDeviceInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADPHONES) {
+                    outputDevice = audioDeviceInfo;
+                    Log.d(LOGTAG, "startApplicationLoopBack found_dev "
+                            + audioDeviceInfo.getType());
+                    break;
+                }
+            } else if (audioDeviceInfo.getType() == deviceType) {
+                outputDevice = audioDeviceInfo;
+                Log.d(LOGTAG, "startApplicationLoopBack found_dev " + audioDeviceInfo.getType());
+                break;
+            }
+        }
+        if (outputDevice == null) {
+            Log.d(LOGTAG, "no output device" + deviceType + " found");
+            return;
+        }
+        if (mIsFMDeviceLoopbackActive) {
+            if (mReceiver != null && FmReceiver.isCherokeeChip() &&
+                    mPref.getBoolean("SLIMBUS_SEQ", true)) {
+                enableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
+            }
+            configureFMDeviceLoopback_O(false);
+        }
+        if (!isRecordSinking()) {
+            createRecordSessions();
+            Log.d(LOGTAG, "creating AudioTrack session");
+        }
+        mCurrentDevice = outputDevice.getType();
+        mAudioTrack.setPreferredDevice(outputDevice);
+        Log.d(LOGTAG, "PreferredDevice is set to " + outputDevice.getType());
+        if (!isRecordSinking()) {
+            startRecordSink();
+        }
+    }
 }
diff --git a/fmapp2/src/com/caf/fmradio/FMStats.java b/fmapp2/src/com/caf/fmradio/FMStats.java
index 063326d..6f51263 100644
--- a/fmapp2/src/com/caf/fmradio/FMStats.java
+++ b/fmapp2/src/com/caf/fmradio/FMStats.java
@@ -334,9 +334,6 @@
                           (this, R.array.band_sweep_methods,
                             android.R.layout.simple_spinner_item);
 
-        if(mReceiver == null)
-            mReceiver = new FmReceiver();
-
         Log.d(LOGTAG, "oncreate");
         checkTransportLayer();
         if (isCherokeeChip()) {
@@ -369,6 +366,9 @@
 
         tLayout = (TableLayout) findViewById(R.id.maintable);
 
+        if(mReceiver == null)
+            mReceiver = new FmReceiver();
+
         long curTime = System.currentTimeMillis();
         mCurrentFileName = "FMStats_".concat(
                                  Long.toString(curTime).concat(".txt")
@@ -2837,8 +2837,8 @@
         }
     }
     private void checkTransportLayer() {
-       String chip = mReceiver.getSocName();
-       if (chip.equals("pronto"))
+       String chip = SystemProperties.get("vendor.qcom.bluetooth.soc","default");
+       if (chip.equals("default"))
            mIsTransportSMD = true;
        else
            mIsTransportSMD = false;
@@ -2850,8 +2850,7 @@
     private boolean isCherokeeChip() {
         Log.d(LOGTAG, "isCherokeeChip");
 
-        String chip = mReceiver.getSocName();
-
+        String chip = SystemProperties.get("vendor.qcom.bluetooth.soc");
         if (chip.equals("cherokee"))
             return true;
         else
@@ -2859,15 +2858,16 @@
     }
 
     private boolean isRomeChip() {
-        String chip = mReceiver.getSocName();
+        String chip = "";
 
+        chip = SystemProperties.get("vendor.qcom.bluetooth.soc");
         if(chip.equals("rome"))
            return true;
         return false;
     }
 
     private boolean isHastingsChip() {
-        String chip = mReceiver.getSocName();
+        String chip = SystemProperties.get("vendor.qcom.bluetooth.soc","default");
 
         if(chip.equals("hastings"))
            return true;
@@ -3018,11 +3018,15 @@
         case SEARCH_TEST:
               try {
                   Log.e(LOGTAG, "start scanning\n");
-                  Log.d(LOGTAG,"Scanning with 0 scan time");
-                  if (mReceiver != null)
-                      mIsSearching = mReceiver.searchStations(FmReceiver.FM_RX_SRCH_MODE_SCAN,
-                              SCAN_DWELL_PERIOD, FmReceiver.FM_RX_SEARCHDIR_UP);
-              } catch (Exception e) {
+                  if(isTransportLayerSMD() || isCherokeeChip()) {
+                      Log.d(LOGTAG,"Scanning with 0 scan time");
+                      if (mReceiver != null)
+                          mIsSearching = mReceiver.searchStations(FmReceiver.FM_RX_SRCH_MODE_SCAN,
+                                  SCAN_DWELL_PERIOD, FmReceiver.FM_RX_SEARCHDIR_UP);
+                  } else {
+                      mIsSearching = mService.scan(0);
+                  }
+              }catch (RemoteException e) {
                   e.printStackTrace();
               }
 
@@ -3219,12 +3223,16 @@
         boolean isCherokeeChip = isCherokeeChip();
         if((null != mService)) {
             try {
-                lastCmdSent = CMD_STNPARAM_RSSI;
-                ret = mService.getRssi();
-                if (ret != 0) {
-                    Log.e(LOGTAG, "getrssi cmd failed: ret = " + ret);
-                    lastCmdSent = 0;
-                    return null;
+                if (isCherokeeChip) {
+                    lastCmdSent = CMD_STNPARAM_RSSI;
+                    ret = mService.getRssi();
+                     if (ret != 0) {
+                         Log.e(LOGTAG, "getrssi cmd failed: ret = " + ret);
+                         lastCmdSent = 0;
+                         return null;
+                     }
+                } else {
+                    nRssi = mService.getRssi();
                 }
                 Log.e(LOGTAG, "Got response of mService.getRssi");
                 if (nRssi != Integer.MAX_VALUE) {
diff --git a/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java b/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
index 70a7d1c..a664f51 100644
--- a/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
+++ b/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
@@ -37,6 +37,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.telephony.TelephonyManager;
 import qcom.fmradio.FmReceiver;
 import qcom.fmradio.FmConfig;
 import android.os.SystemProperties;
@@ -81,6 +82,8 @@
    public static final int REGIONAL_BAND_UNITEDKINGDOM   = 34;
    public static final int REGIONAL_BAND_UNITED_STATES   = 35;
    public static final int REGIONAL_BAND_USER_DEFINED    = 36;
+   public static final int REGIONAL_BAND_INDONESIA       = 37;
+   // If you add to this list, add to getBand() below as well.
 
    public static final int RECORD_DUR_INDEX_0_VAL        = 5;
    public static final int RECORD_DUR_INDEX_1_VAL       = 15;
@@ -168,7 +171,8 @@
    private static boolean mAFAutoSwitch = true;
    private static int mRecordDuration = 0;
    private static int mLastAudioMode = -1;
-   private static boolean mSpecialCarrierFlag = false;
+
+   public static int mDefaultCountryIndex = REGIONAL_BAND_NORTH_AMERICA;
 
    FmSharedPreferences(Context context){
       mContext = context.getApplicationContext();
@@ -449,8 +453,6 @@
       {
          return;
       }
-      mSpecialCarrierFlag = mContext.getResources().getBoolean(
-              R.bool.def_fm_special_carrier_enabled);
       SharedPreferences sp = mContext.getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
       mTunedFrequency = sp.getInt(PREF_LAST_TUNED_FREQUENCY, DEFAULT_NO_FREQUENCY);
       mRecordDuration = sp.getInt(LAST_RECORD_DURATION, RECORD_DUR_INDEX_0_VAL);
@@ -507,7 +509,9 @@
                 .getBoolean(R.bool.def_fm_country_location_enabled)) {
             setCountry(sp.getInt(FMCONFIG_COUNTRY, REGIONAL_BAND_INDIA));
       } else {
-          setCountry(sp.getInt(FMCONFIG_COUNTRY, REGIONAL_BAND_NORTH_AMERICA));
+          mDefaultCountryIndex =
+                  getBand(mContext.getResources().getInteger(R.integer.default_country_index));
+          setCountry(sp.getInt(FMCONFIG_COUNTRY, mDefaultCountryIndex));
       }
       /* Last list the user was navigating */
       mListIndex = sp.getInt(LAST_LIST_INDEX, 0);
@@ -581,7 +585,7 @@
           setCountry(REGIONAL_BAND_CHINA);
           //Others set north America.
       } else {
-          setCountry(REGIONAL_BAND_NORTH_AMERICA);
+          setCountry(mDefaultCountryIndex);
       }
    }
 
@@ -937,15 +941,9 @@
         }
         case REGIONAL_BAND_INDIA:
         {
-          if (mSpecialCarrierFlag) {
-              /*87500 TO 108000 IN 100 KHZ STEPS*/
-              mFMConfiguration.setLowerLimit(87500);
-              mFMConfiguration.setUpperLimit(108000);
-          } else {
-              /*91000 TO 106400 IN 100 KHZ STEPS*/
-              mFMConfiguration.setLowerLimit(91000);
-              mFMConfiguration.setUpperLimit(106400);
-          }
+          /*87500 TO 108000 IN 100 KHZ STEPS*/
+          mFMConfiguration.setLowerLimit(87500);
+          mFMConfiguration.setUpperLimit(108000);
           mFrequencyBand_Stepsize = 100;
           break;
         }
@@ -1090,6 +1088,14 @@
           mFrequencyBand_Stepsize = 200;
           break;
         }
+        case REGIONAL_BAND_INDONESIA:
+        {
+            /*INDONESIA : 87500 TO 108000 IN 100 KHZ STEPS*/
+            mFMConfiguration.setLowerLimit(87500);
+            mFMConfiguration.setUpperLimit(108000);
+            mFrequencyBand_Stepsize = 100;
+            break;
+        }
         case REGIONAL_BAND_USER_DEFINED:
         {
           mFMConfiguration.setRadioBand(FmReceiver.FM_USER_DEFINED_BAND);
@@ -1174,4 +1180,100 @@
    public static boolean getAutoAFSwitch() {
       return mAFAutoSwitch;
    }
+
+   /**
+    * Map country code to radio band. If country code is not found
+    * in the list, takes the default from resources.
+    */
+   private static int getBand(int deflt) {
+      // Try to determine the current location from the phone
+      // network. If unable, or not found in band list, try
+      // from locale. If that fails too, then use the default.
+      // TODO: Once a band is selected, the app remembers it in the
+      // shared preferences. This means the radio band isn't auto-updated
+      // if the user travels to a different country. A better approach would
+      // be to always call this code when the app starts up unless the user
+      // has explicitly set a band. In fact, "auto" should be one of the options.
+      // That will be the subject of another Jira, I think.
+      String countryCode;
+      int band;
+      try {
+         TelephonyManager tm = (TelephonyManager)
+            FMAdapterApp.context.getSystemService(Context.TELEPHONY_SERVICE);
+         countryCode = tm.getNetworkCountryIso();
+         if ((band = getBand(countryCode, -1)) >= 0) return band;
+      } catch (Exception e) {
+         // Failed, perhaps because of no sim card or inadequate permissions.
+         // Ignore it and carry on.
+      }
+      return getBand(Locale.getDefault().getCountry(), deflt);
+   }
+
+   /**
+    * Map a country code to an FM band code.
+    * @param country  2-letter country code
+    * @return band code or deflt on not found.
+    */
+   private static int getBand(String country, int deflt) {
+      // The order of country codes in this list is very strict; it
+      // needs to exactly correspond to the REGIONAL_BAND definitions
+      // at the top of this file. That is why there are two "JP"
+      // entries, one of which is unreachable, and why there is a
+      // placeholder for REGIONAL_BAND_USER_DEFINED.
+      // Some of these entries are intelligent guesses, e.g. my
+      // research indicates that Geurnsey, Jersey, and the Isle of Man
+      // use the same standards as GB.
+      // Many, many countries are not listed. Those will receive the
+      // default setting specified in the resources file.
+      final String[][] countries = {
+         {"CA"},    // REGIONAL_BAND_NORTH_AMERICA
+         {"AL", "AD", "AM", "AZ", "BY", "BA", "BG", "HR", "CY", "EE",
+          "GE", "HU", "IS", "KZ", "LV", "LI", "LT", "LU", "MK", "MT",
+          "MD", "MC", "ME", "RO", "SM", "RS", "SK", "SI", "UA", "VA"}, // REGIONAL_BAND_EUROPE
+         {"JP"},    // REGIONAL_BAND_JAPAN
+         {"JP"},    // REGIONAL_BAND_JAPAN_WIDE (not reached)
+         {"AU"},    // REGIONAL_BAND_AUSTRALIA
+         {"AT"},    // REGIONAL_BAND_AUSTRIA
+         {"BE"},    // REGIONAL_BAND_BELGIUM
+         {"BR"},    // REGIONAL_BAND_BRAZIL
+         {"CN"},    // REGIONAL_BAND_CHINA
+         {"CZ"},    // REGIONAL_BAND_CZECH
+         {"DK"},    // REGIONAL_BAND_DENMARK
+         {"FI"},    // REGIONAL_BAND_FINLAND
+         {"FR"},    // REGIONAL_BAND_FRANCE
+         {"DE"},    // REGIONAL_BAND_GERMANY
+         {"GR"},    // REGIONAL_BAND_GREECE
+         {"HK"},    // REGIONAL_BAND_HONGKONG
+         {"IN"},    // REGIONAL_BAND_INDIA
+         {"IE"},    // REGIONAL_BAND_IRELAND
+         {"IT"},    // REGIONAL_BAND_ITALY
+         {"KR"},    // REGIONAL_BAND_KOREA
+         {"MX"},    // REGIONAL_BAND_MEXICO
+         {"NL"},    // REGIONAL_BAND_NETHERLANDS
+         {"NZ"},    // REGIONAL_BAND_NEWZEALAND
+         {"NO","IS"},    // REGIONAL_BAND_NORWAY
+         {"PL"},    // REGIONAL_BAND_POLAND
+         {"PT"},    // REGIONAL_BAND_PORTUGAL
+         {"RU"},    // REGIONAL_BAND_RUSSIA
+         {"SG"},    // REGIONAL_BAND_SINGAPORE
+         {"SK"},    // REGIONAL_BAND_SLOVAKIA
+         {"ES"},    // REGIONAL_BAND_SPAIN
+         {"CH"},    // REGIONAL_BAND_SWITZERLAND
+         {"SE"},    // REGIONAL_BAND_SWEDEN
+         {"TW"},    // REGIONAL_BAND_TAIWAN
+         {"TR"},    // REGIONAL_BAND_TURKEY
+         {"GB","GG","IM","JE"},    // REGIONAL_BAND_UNITEDKINGDOM
+         {"US"},    // REGIONAL_BAND_UNITED_STATES
+         {"--"},    // REGIONAL_BAND_USER_DEFINED (handled elsewhere)
+         {"ID"},    // REGIONAL_BAND_INDONESIA
+      };
+      for (int band = 0; band < countries.length; ++band) {
+         for (String cc : countries[band]) {
+            if (cc.equalsIgnoreCase(country)) {
+               return band;
+            }
+         }
+      }
+      return deflt;
+   }
 }
diff --git a/fmapp2/src/com/caf/fmradio/HorizontalNumberPicker.java b/fmapp2/src/com/caf/fmradio/HorizontalNumberPicker.java
index 505097f..4f3c3fb 100644
--- a/fmapp2/src/com/caf/fmradio/HorizontalNumberPicker.java
+++ b/fmapp2/src/com/caf/fmradio/HorizontalNumberPicker.java
@@ -30,6 +30,7 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Typeface;
 import android.graphics.Paint.Align;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -92,7 +93,7 @@
     /**
      * The coefficient by which to adjust (divide) the max fling velocity.
      */
-    private static final int SELECTOR_MAX_FLING_VELOCITY_ADJUSTMENT = 8;
+    private static final int SELECTOR_MAX_FLING_VELOCITY_ADJUSTMENT = 4;
 
     /**
      * The the duration for adjusting the selector wheel.
@@ -138,36 +139,6 @@
     private static final int SELECTOR_WHEEL_STATE_LARGE = 2;
 
     /**
-     * The alpha of the selector wheel when it is bright.
-     */
-    private static final int SELECTOR_WHEEL_BRIGHT_ALPHA = 255;
-
-    /**
-     * The alpha of the selector wheel when it is dimmed.
-     */
-    private static final int SELECTOR_WHEEL_DIM_ALPHA = 60;
-
-    /**
-     * The alpha for the increment/decrement button when it is transparent.
-     */
-    private static final int BUTTON_ALPHA_TRANSPARENT = 0;
-
-    /**
-     * The alpha for the increment/decrement button when it is opaque.
-     */
-    private static final int BUTTON_ALPHA_OPAQUE = 1;
-
-    /**
-     * The property for setting the selector paint.
-     */
-    private static final String PROPERTY_SELECTOR_PAINT_ALPHA = "selectorPaintAlpha";
-
-    /**
-     * The property for setting the increment/decrement button alpha.
-     */
-    private static final String PROPERTY_BUTTON_ALPHA = "alpha";
-
-    /**
      * The numbers accepted by the input text's {@link Filter}
      */
     private static final char[] DIGIT_CHARACTERS = new char[] { '0', '1', '2',
@@ -247,7 +218,7 @@
     /**
      * The height of the text.
      */
-    private int mTextSize = 20;
+    private int mTextSize = 60;
     /**
      * The height of the gap between text elements if the selector wheel.
      */
@@ -343,10 +314,6 @@
      * The offset to middle of selector.
      */
     private static final int SELECTOR_OFFSET_ZERO = 0;
-    /**
-     * The colors alpha of selector text.
-     */
-    private static final int SELECTOR_TEXT_ALPHA_TRANSPARENT_NONE = 255;
 
     private static float mDensity = 1.0f;
     private static final float LDPI = 0.75f;
@@ -354,9 +321,9 @@
     private static final float HDPI = 1.5f;
     private static final float XHDPI = 2.0f;
 
-    private float mScaleWidth = 2;
+    private float mScaleWidth = 5;
     private float mScaleLengthShort = 10;
-    private float mScaleLengthLong = 20;
+    private float mScaleLengthLong = 40;
     private float mGapBetweenNumAndScale = 18;
     private float mHdpiPositionAdjust = 18;
 
@@ -809,7 +776,6 @@
             mBeginEditOnUpEvent = false;
             mAdjustScrollerOnUpEvent = true;
             if (mSelectorWheelState == SELECTOR_WHEEL_STATE_LARGE) {
-                mSelectorWheelPaint.setAlpha(SELECTOR_WHEEL_BRIGHT_ALPHA);
                 boolean scrollersFinished = mFlingScroller.isFinished()
                         && mAdjustScroller.isFinished();
                 if (!scrollersFinished) {
@@ -899,19 +865,19 @@
                 setSelectorWheelState(SELECTOR_WHEEL_STATE_SMALL);
                 return true;
             }
-//            VelocityTracker velocityTracker = mVelocityTracker;
-//            velocityTracker.computeCurrentVelocity(1000, mMaximumFlingVelocity);
-//            int initialVelocity=0;
-//            if(!mHorizontal){
-//                initialVelocity = (int) velocityTracker.getYVelocity();
-//            }else{
-//              initialVelocity = (int)velocityTracker.getXVelocity();
-//            }
-//            if (Math.abs(initialVelocity) > mMinimumFlingVelocity) {
-//                // fling after up
-//                fling(initialVelocity);
-//                onScrollStateChange(OnScrollListener.SCROLL_STATE_FLING);
-//            } else {
+            VelocityTracker velocityTracker = mVelocityTracker;
+            velocityTracker.computeCurrentVelocity(1000, mMaximumFlingVelocity);
+            int initialVelocity=0;
+            if(!mHorizontal){
+                initialVelocity = (int) velocityTracker.getYVelocity();
+            }else{
+              initialVelocity = (int)velocityTracker.getXVelocity();
+            }
+            if (Math.abs(initialVelocity) > mMinimumFlingVelocity) {
+                // fling after up
+                fling(initialVelocity);
+                onScrollStateChange(OnScrollListener.SCROLL_STATE_FLING);
+            } else {
                 if (mAdjustScrollerOnUpEvent) {
                     if (mFlingScroller.isFinished()
                             && mAdjustScroller.isFinished()) {
@@ -920,7 +886,7 @@
                 } else {
                     postAdjustScrollerCommand(SHOW_INPUT_CONTROLS_DELAY_MILLIS);
                 }
-//            }
+            }
             mVelocityTracker.recycle();
             mVelocityTracker = null;
             break;
@@ -1492,13 +1458,10 @@
                     .get(selectorIndex);
                 if(i - mSelectorMiddleItemIndex > 0 ){
                     mSelectorWheelPaint.setColor(Color.WHITE);
-                    mSelectorWheelPaint.setAlpha((2*mSelectorMiddleItemIndex - i) * SELECTOR_TEXT_ALPHA_TRANSPARENT_NONE / mSelectorMiddleItemIndex);
                 }else if(i - mSelectorMiddleItemIndex < 0 ){
                     mSelectorWheelPaint.setColor(Color.WHITE);
-                    mSelectorWheelPaint.setAlpha(i * SELECTOR_TEXT_ALPHA_TRANSPARENT_NONE / mSelectorMiddleItemIndex);
                 }else{
-                    mSelectorWheelPaint.setColor(Color.RED);
-                    mSelectorWheelPaint.setAlpha(SELECTOR_TEXT_ALPHA_TRANSPARENT_NONE);
+                    mSelectorWheelPaint.setColor(Color.WHITE);
                 }
                 try {
                     fNumber = Float.valueOf(scrollSelectorValue).floatValue();
@@ -1516,13 +1479,24 @@
                         bShowNumber = true;
                         fScaleLength = mScaleLengthLong * mDensity;
                     }
+                } else {
+                    fWidthOfScale-=2;
                 }
                 if(bShowNumber){
-                    canvas.drawText(scrollSelectorValue, x, y, mSelectorWheelPaint);
+                    float originalWidth = mSelectorWheelPaint.getStrokeWidth();
+                    mSelectorWheelPaint.setTypeface(Typeface.DEFAULT_BOLD);
+                    mSelectorWheelPaint.setStrokeWidth(2);
+                    mSelectorWheelPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+                    canvas.drawText(scrollSelectorValue, x, mTextSize * 2, mSelectorWheelPaint);
+                    mSelectorWheelPaint.setStyle(Paint.Style.FILL);
+                    mSelectorWheelPaint.setStrokeWidth(originalWidth);
                 }
-                canvas.drawRect(x, y+fGapBetweenNumAndScale, x+fWidthOfScale, y + fGapBetweenNumAndScale + fScaleLength , mSelectorWheelPaint);
 
-//            }
+                float left = x;
+                float top = (mBottom - mTop) - fGapBetweenNumAndScale - fScaleLength;
+                float right = x+fWidthOfScale;
+                float bottom = (mBottom - mTop);
+                canvas.drawRect(left, top, right, bottom, mSelectorWheelPaint);
             if (mHorizontal) {
                 x += mSelectorElementWidth;
             } else {
@@ -1646,7 +1620,6 @@
      */
     private void changeCurrentByOne(boolean increment) {
         if (mFlingable) {
-            mSelectorWheelPaint.setAlpha(SELECTOR_WHEEL_BRIGHT_ALPHA);
             mPreviousScrollerY = 0;
             mPreviousScrollerX = 0;
             forceCompleteChangeCurrentByOneViaScroll();
@@ -1703,17 +1676,6 @@
     }
 
     /**
-     * Sets the <code>alpha</code> of the {@link Paint} for drawing the selector
-     * wheel.
-     */
-    @SuppressWarnings("unused")
-    // Called via reflection
-    private void setSelectorPaintAlpha(int alpha) {
-        mSelectorWheelPaint.setAlpha(alpha);
-        invalidate();
-    }
-
-    /**
      * @return If the <code>event</code> is in the visible <code>view</code>.
      */
     private boolean isEventInVisibleViewHitRect(MotionEvent event, View view) {
@@ -1730,7 +1692,6 @@
     private void setSelectorWheelState(int selectorWheelState) {
         mSelectorWheelState = selectorWheelState;
         if (selectorWheelState == SELECTOR_WHEEL_STATE_LARGE) {
-            mSelectorWheelPaint.setAlpha(SELECTOR_WHEEL_BRIGHT_ALPHA);
         }
 
         if (mFlingable && selectorWheelState == SELECTOR_WHEEL_STATE_LARGE
diff --git a/fmapp2/src/com/caf/fmradio/IFMRadioService.aidl b/fmapp2/src/com/caf/fmradio/IFMRadioService.aidl
index 70d906e..f4900af 100644
--- a/fmapp2/src/com/caf/fmradio/IFMRadioService.aidl
+++ b/fmapp2/src/com/caf/fmradio/IFMRadioService.aidl
@@ -25,6 +25,7 @@
     boolean scan(int pty);
     boolean seekPI(int piCode);
     boolean searchStrongStationList(int numStations);
+    int[]   getSearchList();
     boolean cancelSearch();
     String getProgramService();
     String getRadioText();
@@ -68,17 +69,17 @@
     int getAfJmpRmssiTh();
     int getGoodChRmssiTh();
     int getAfJmpRmssiSamplesCnt();
-    String getSocName();
     boolean setRxRepeatCount(int count);
     long getRecordingStartTime();
     boolean isSleepTimerActive();
     boolean isSSRInProgress();
     boolean isRtPlusSupported();
     boolean isA2DPConnected();
+    boolean isSearchInProgress();
+    List getScannedFrequencies();
     boolean getIntfDetLowTh();
     boolean getIntfDetHighTh();
     boolean getRxRepeatCount();
-    boolean getFmStatsProp();
     void restoreDefaults();
 }
 
diff --git a/fmapp2/src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl b/fmapp2/src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl
deleted file mode 100644
index 641785d..0000000
--- a/fmapp2/src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2009,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 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.
- */
-
-package com.caf.fmradio;
-
-interface IFMTransmitterServiceCallbacks
-{
-  void onEnabled(boolean bStatus);
-  void onDisabled();
-  void onRadioReset();
-  void onTuneStatusChanged(int frequency);
-  void onRadioTextChanged();
-  void onSearchListComplete(boolean bStatus);
-  void onReconfigured();
-  void onMetaDataChanged(String str);
-  void onPSInfoSent(String str);
-}
diff --git a/fmapp2/src/com/caf/fmradio/PresetStation.java b/fmapp2/src/com/caf/fmradio/PresetStation.java
index 698cdb6..7d09d01 100644
--- a/fmapp2/src/com/caf/fmradio/PresetStation.java
+++ b/fmapp2/src/com/caf/fmradio/PresetStation.java
@@ -30,6 +30,7 @@
 
 import qcom.fmradio.FmReceiver;
 import java.util.Locale;
+import android.content.res.Resources;
 import android.text.TextUtils;
 //import android.util.Log;
 
@@ -616,622 +617,49 @@
    public static String parsePTY(int pty)
    {
       String ptyStr="";
+      Resources res = FMAdapterApp.context.getResources();
       int rdsStd = FmSharedPreferences.getFMConfiguration().getRdsStd();
-      if(rdsStd ==  FmReceiver.FM_RDS_STD_RBDS)
-      {
-         ptyStr = getRBDSPtyString(pty);
-      }
-      else if(rdsStd ==  FmReceiver.FM_RDS_STD_RDS)
-      {
-         ptyStr = getRDSPtyString(pty);
-      }
-      return (ptyStr);
+      int resid;
+      final int[][] typeCodes = {       // RDS, RDBS
+         {0, 0},
+         {R.string.typ_News, R.string.typ_News},
+         {R.string.typ_Current_affairs, R.string.typ_Information},
+         {R.string.typ_Information, R.string.typ_Sports},
+         {R.string.typ_Sport, R.string.typ_Talk},
+         {R.string.typ_Education, R.string.typ_Rock},
+         {R.string.typ_Drama, R.string.typ_Classic_Rock},
+         {R.string.typ_Culture, R.string.typ_Adult_hits},
+         {R.string.typ_Science, R.string.typ_Soft_Rock},
+         {R.string.typ_Varied, R.string.typ_Top_40},
+         {R.string.typ_Pop, R.string.typ_Country},
+         {R.string.typ_Rock, R.string.typ_Oldies},
+         {R.string.typ_Easy_listening, R.string.typ_Soft},
+         {R.string.typ_Light_classical, R.string.typ_Nostalgia},
+         {R.string.typ_Serious_classical, R.string.typ_Jazz},
+         {R.string.typ_Other, R.string.typ_Classical},
+         {R.string.typ_Weather, R.string.typ_Rhythm_and_Blues},
+         {R.string.typ_Finance, R.string.typ_Soft_Rhythm_and_Blues},
+         {R.string.typ_Children, R.string.typ_Foreign_language},
+         {R.string.typ_Social_affairs, R.string.typ_Religious_music},
+         {R.string.typ_Religion, R.string.typ_Religious_talk},
+         {R.string.typ_Phone_in, R.string.typ_Personality},
+         {R.string.typ_Travel, R.string.typ_Public},
+         {R.string.typ_Leisure, R.string.typ_College},
+         {R.string.typ_Jazz, R.string.typ_Spanish_talk},
+         {R.string.typ_Country, R.string.typ_Spanish_music},
+         {R.string.typ_National, R.string.typ_Hiphop},
+         {R.string.typ_Oldies, 0},
+         {R.string.typ_Folk, 0},
+         {R.string.typ_Documentary, R.string.typ_Weather},
+         {R.string.typ_Emergency_test, R.string.typ_Emergency_test},
+         {R.string.typ_Emergency, R.string.typ_Emergency},
+      };
+      if (pty < 0 || pty >= typeCodes.length)
+         return ptyStr;
+      resid = typeCodes[pty][rdsStd == FmReceiver.FM_RDS_STD_RDS ? 0 : 1];
+      if (resid == 0)
+         return ptyStr;
+      String s = res.getString(resid);
+      return s;
    }
-
-   /**
-    *  get the Text String for the RBDS Program type Code
-    */
-   public static String getRBDSPtyString(int pty)
-   {
-      String ptyStr = "";
-
-      switch (pty)
-      {
-         case 1:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "新聞";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "新闻";
-            else
-                ptyStr = "News";
-            break;
-         }
-         case 2:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "資訊";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "信息频道";
-            else
-                ptyStr = "Information";
-            break;
-         }
-         case 3:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "体育";
-            else
-                ptyStr = "Sports";
-            break;
-         }
-         case 4:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "討論";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "交流";
-            else
-                ptyStr = "Talk";
-            break;
-         }
-         case 5:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "搖滾";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "摇滚";
-            else
-                ptyStr = "Rock";
-            break;
-         }
-         case 6:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "古典搖滾";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "经典摇滚";
-            else
-                ptyStr = "Classic Rock";
-            break;
-         }
-         case 7:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "成人熱門精選";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "成人点击";
-            else
-                ptyStr = "Adult Hits";
-            break;
-         }
-         case 8:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "輕柔搖滾樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "轻摇滚";
-            else
-                ptyStr = "Soft Rock";
-            break;
-         }
-         case 9:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "前40首最熱門歌曲";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "前40";
-            else
-                ptyStr = "Top 40";
-            break;
-         }
-         case 10:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "鄉村音樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "乡村";
-            else
-                ptyStr = "Country";
-            break;
-         }
-         case 11:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "懷舊";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "老歌";
-            else
-                ptyStr = "Oldies";
-            break;
-         }
-         case 12:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "輕柔";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "轻音乐";
-            else
-                ptyStr = "Soft";
-            break;
-         }
-         case 13:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "思鄉";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "怀旧";
-            else
-                ptyStr = "Nostalgia";
-            break;
-         }
-         case 14:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "爵士樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "爵士";
-            else
-                ptyStr = "Jazz";
-            break;
-         }
-         case 15:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "古典";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "古典";
-            else
-                ptyStr = "Classical";
-            break;
-         }
-         case 16:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "節奏藍調";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "节奏布鲁斯";
-            else
-                ptyStr = "Rhythm and Blues";
-            break;
-         }
-         case 17:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "輕柔節奏藍調";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "轻节奏布鲁斯";
-            else
-                ptyStr = "Soft Rhythm and Blues";
-            break;
-         }
-         case 18:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "外語";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "外语频道";
-            else
-                ptyStr = "Foreign Language";
-            break;
-         }
-         case 19:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "宗教音樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "宗教音乐";
-            else
-                ptyStr = "Religious Music";
-            break;
-         }
-         case 20:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "宗教討論";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "宗教交流";
-            else
-                ptyStr = "Religious Talk";
-            break;
-         }
-         case 21:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "個人";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "个性";
-            else
-                ptyStr = "Personality";
-            break;
-         }
-         case 22:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "公開";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "公共频道";
-            else
-                ptyStr = "Public";
-            break;
-         }
-         case 23:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "學院";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "校园";
-            else
-                ptyStr = "College";
-            break;
-         }
-         case 29:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "天氣";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "天气";
-            else
-                ptyStr = "Weather";
-            break;
-         }
-         case 30:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "緊急測試";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "紧急 测试";
-            else
-                ptyStr = "Emergency Test";
-            break;
-         }
-         case 31:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "緊急";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "紧急";
-            else
-                ptyStr = "Emergency";
-            break;
-         }
-         default:
-         {
-            ptyStr = "";
-            //Log.e(FMRadio.LOGTAG, "Unknown RBDS ProgramType [" + pty + "]");
-            break;
-         }
-      }
-      return ptyStr;
-   }
-
-   /** get the Text String for the Program type Code */
-   public static String getRDSPtyString(int pty)
-   {
-      String ptyStr = "";
-      switch (pty)
-      {
-         case 1:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "新聞";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "新闻";
-            else
-                ptyStr = "News";
-            break;
-         }
-         case 2:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "新聞時事";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "新闻时事";
-            else
-                ptyStr = "Current Affairs";
-            break;
-         }
-         case 3:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "資訊";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "信息";
-            else
-                ptyStr = "Information";
-            break;
-         }
-         case 4:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "體育";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "体育";
-            else
-                ptyStr = "Sport";
-            break;
-         }
-         case 5:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "教育";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "教育";
-            else
-                ptyStr = "Education";
-            break;
-         }
-         case 6:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "戲劇";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "戏剧";
-            else
-                ptyStr = "Drama";
-            break;
-         }
-         case 7:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "文化";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "文化";
-            else
-                ptyStr = "Culture";
-            break;
-         }
-         case 8:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "科學";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "科学";
-            else
-                ptyStr = "Science";
-            break;
-         }
-         case 9:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "多樣化";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "变奏";
-            else
-                ptyStr = "Varied";
-            break;
-         }
-         case 10:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "流行音樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "流行音乐";
-            else
-                ptyStr = "Pop Music";
-            break;
-         }
-         case 11:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "搖滾樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "摇滚音乐";
-            else
-                ptyStr = "Rock Music";
-            break;
-         }
-         case 12:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "輕音樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "轻音乐";
-            else
-                ptyStr = "Easy Listening Music";
-            break;
-         }
-         case 13:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "輕古典音樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "轻古典音乐";
-            else
-                ptyStr = "Light classical";
-            break;
-         }
-         case 14:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "正統古典";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "古典";
-            else
-                ptyStr = "Serious classical";
-            break;
-         }
-         case 15:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "其他音樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "其他音乐";
-            else
-                ptyStr = "Other Music";
-            break;
-         }
-         case 16:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "天氣";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "天气";
-            else
-                ptyStr = "Weather";
-            break;
-         }
-         case 17:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "財政";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "经济";
-            else
-                ptyStr = "Finance";
-            break;
-         }
-         case 18:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "少兒節目";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "儿童节目";
-            else
-                ptyStr = "Children programs";
-            break;
-         }
-         case 19:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "社會事務";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "社会事务";
-            else
-                ptyStr = "Social Affairs";
-            break;
-         }
-         case 20:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "宗教";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "宗教";
-            else
-                ptyStr = "Religion";
-            break;
-         }
-         case 21:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "聽眾來得";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "听众来电";
-            else
-                ptyStr = "Phone In";
-            break;
-         }
-         case 22:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "旅遊";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "旅行";
-            else
-                ptyStr = "Travel";
-            break;
-         }
-         case 23:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "休閒";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "休闲";
-            else
-                ptyStr = "Leisure";
-            break;
-         }
-         case 24:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "爵士樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "爵士音乐";
-            else
-                ptyStr = "Jazz Music";
-            break;
-         }
-         case 25:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "鄉村音樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "乡村音乐";
-            else
-                ptyStr = "Country Music";
-            break;
-         }
-         case 26:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "國樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "民族音乐";
-            else
-                ptyStr = "National Music";
-            break;
-         }
-         case 27:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "懷舊金曲";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "怀旧";
-            else
-                ptyStr = "Oldies Music";
-            break;
-         }
-         case 28:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "民俗音樂";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "民族音乐";
-            else
-                ptyStr = "Folk Music";
-            break;
-         }
-         case 29:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "紀實";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "记录";
-            else
-                ptyStr = "Documentary";
-            break;
-         }
-         case 30:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "緊急測試";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "紧急测试";
-            else
-                ptyStr = "Emergency Test";
-            break;
-         }
-         case 31:
-         {
-            if (Locale.getDefault().toString().equals("zh_HK"))
-                ptyStr = "緊急";
-            else if (Locale.getDefault().toString().equals("zh_CN"))
-                ptyStr = "紧急";
-            else
-                ptyStr = "Emergency";
-            break;
-         }
-         default:
-         {
-            ptyStr = "";
-            //Log.e(FMRadio.LOGTAG, "Unknown RDS ProgramType [" + pty + "]");
-            break;
-         }
-      }
-      return ptyStr;
-   }
-
-
 }
diff --git a/fmapp2/src/com/caf/fmradio/Settings.java b/fmapp2/src/com/caf/fmradio/Settings.java
index 6ad98e6..50f7872 100644
--- a/fmapp2/src/com/caf/fmradio/Settings.java
+++ b/fmapp2/src/com/caf/fmradio/Settings.java
@@ -112,6 +112,7 @@
           // Root
           PreferenceScreen root = getPreferenceManager().createPreferenceScreen(
                                 this);
+          getListView().setDivider(null);
 
            summaryBandItems = getResources().getStringArray(
                                 R.array.regional_band_summary);
@@ -120,7 +121,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 +136,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);
 
@@ -145,6 +146,7 @@
            mUserBandMinPref.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER |
                                                         InputType.TYPE_NUMBER_FLAG_DECIMAL);
            mUserBandMinPref.setDialogTitle(R.string.usr_def_band_min);
+           mUserBandMinPref.getEditText().setSelectAllOnFocus(true);
 
            mUserBandMaxPref = new EditTextPreference(this);
            mUserBandMaxPref.setKey(USER_DEFINED_BAND_MAX_KEY);
@@ -152,6 +154,7 @@
            mUserBandMaxPref.setDialogTitle(R.string.usr_def_band_max);
            mUserBandMaxPref.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER |
                                                         InputType.TYPE_NUMBER_FLAG_DECIMAL);
+           mUserBandMaxPref.getEditText().setSelectAllOnFocus(true);
 
            setBandSummary(index);
 
@@ -181,7 +184,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 +197,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 +210,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();
@@ -279,7 +280,7 @@
               if((index < 0) || (index >= summaryBandItems.length)) {
                   index = 0;
                   mBandPreference.setValueIndex(0);
-              }else if((index + 1) == summaryBandItems.length) {
+              }else if(index == FmSharedPreferences.REGIONAL_BAND_USER_DEFINED) {
                    mChannelSpacingPref.setEnabled(true);
               }else {
                    mChannelSpacingPref.setEnabled(false);
@@ -347,14 +348,10 @@
                   && (noOfChannels > 0) && (band_width >= 100)) {
                   FmSharedPreferences.setLowerLimit((int)freq);
                   sendSettingsChangedIntent(FM_BAND_CHANGED);
-                  setBandSummary(summaryBandItems.length - 1);
+                  setBandSummary(FmSharedPreferences.REGIONAL_BAND_USER_DEFINED);
                   clearStationList();
                }else {
-                  if ((Locale.getDefault().toString().equals("zh_HK")))
-                      Toast.makeText(this,"請輸入有效的頻道範圍76.0-108.0",
-                                                            Toast.LENGTH_SHORT).show();
-                  else
-                      Toast.makeText(this, getString(R.string.user_defind_band_msg),
+                  Toast.makeText(this, getString(R.string.user_defind_band_msg),
                                                             Toast.LENGTH_SHORT).show();
                }
            }else if(key.equals(USER_DEFINED_BAND_MAX_KEY)) {
@@ -375,14 +372,10 @@
                   && (noOfChannels > 0) && (band_width >= 100)) {
                   FmSharedPreferences.setUpperLimit((int)freq);
                   sendSettingsChangedIntent(FM_BAND_CHANGED);
-                  setBandSummary(summaryBandItems.length - 1);
+                  setBandSummary(FmSharedPreferences.REGIONAL_BAND_USER_DEFINED);
                   clearStationList();
                }else {
-                  if ((Locale.getDefault().toString().equals("zh_HK")))
-                      Toast.makeText(this,"請輸入有效的頻道範圍76.0-108.0",
-                                                            Toast.LENGTH_SHORT).show();
-                  else
-                      Toast.makeText(this, getString(R.string.user_defind_band_msg),
+                  Toast.makeText(this, getString(R.string.user_defind_band_msg),
                                                             Toast.LENGTH_SHORT).show();
                }
           }else {
@@ -467,7 +460,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 +470,7 @@
                               restoreSettingsDefault();
                               finish();
                            }
-                      }).setNegativeButton(R.string.alert_dialog_cancel,
+                      }).setNegativeButton(android.R.string.cancel,
                               new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog,
                                                        int whichButton) {
@@ -491,8 +484,7 @@
                  mBandPreference
                         .setValueIndex(FmSharedPreferences.REGIONAL_BAND_CHINA);
              }else {
-                 mBandPreference
-                        .setValueIndex(FmSharedPreferences.REGIONAL_BAND_NORTH_AMERICA);
+                 mBandPreference.setValueIndex(FmSharedPreferences.mDefaultCountryIndex);
              }
              if (mRxMode) {
                 mAudioPreference.setValueIndex(0);
@@ -506,8 +498,7 @@
                     FmSharedPreferences
                     .setCountry(FmSharedPreferences.REGIONAL_BAND_CHINA);
                 }else{
-                    FmSharedPreferences
-                    .setCountry(FmSharedPreferences.REGIONAL_BAND_NORTH_AMERICA);
+                    FmSharedPreferences.setCountry(FmSharedPreferences.mDefaultCountryIndex);
                 }
              }
              mPrefs.Save();
@@ -540,7 +531,7 @@
           }
         }
         private void setBandSummary(int index) {
-           if((index + 1) == summaryBandItems.length) {
+           if(index == FmSharedPreferences.REGIONAL_BAND_USER_DEFINED) {
               min_freq = FmSharedPreferences.getLowerLimit();
               max_freq = FmSharedPreferences.getUpperLimit();
               chan_spacing = FmSharedPreferences.getChSpacing();
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 =
diff --git a/helium/Android.bp b/helium/Android.bp
deleted file mode 100644
index b10722e..0000000
--- a/helium/Android.bp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-cc_library_shared {
-    name: "fm_helium",
-
-    srcs: [
-        "radio_helium_hal.c",
-        "radio_helium_hal_cmds.c",
-    ],
-
-    shared_libs: [
-        "libfm-hci",
-        "libdl",
-        "liblog",
-        "libnativehelper",
-        "libcutils",
-    ],
-
-    include_dirs: ["vendor/qcom/opensource/commonsys/fm/fm_hci"],
-
-    system_ext_specific: true,
-
-}
diff --git a/helium/radio-helium.h b/helium/radio-helium.h
index d3dae68..eb6ea9b 100644
--- a/helium/radio-helium.h
+++ b/helium/radio-helium.h
@@ -134,7 +134,6 @@
 #define FM_AFJUMP_CONFG_MODE 0x42
 #define FM_SRCH_CNFG_LEN    0x08
 #define FM_AFJUMP_CNFG_LEN  0x06
-#define STD_BUF_SIZE  256
 
 /* HCI timeouts */
 #define RADIO_HCI_TIMEOUT   (10000) /* 10 seconds */
@@ -514,10 +513,6 @@
 #define HCI_EV_RADIO_TEXT_PLUS_TAG      0x19
 #define HCI_EV_HW_ERR_EVENT             0x1A
 
-/*HCI event opcode for fm driver RDS support*/
-#define HCI_EV_DRIVER_RDS_EVENT         0x1B
-#define HCI_EV_E_RADIO_TEXT             0x1C
-
 #define HCI_REQ_DONE      0
 #define HCI_REQ_PEND      1
 #define HCI_REQ_CANCELED  2
diff --git a/helium/radio_helium_hal.c b/helium/radio_helium_hal.c
index e258bff..79e69f5 100644
--- a/helium/radio_helium_hal.c
+++ b/helium/radio_helium_hal.c
@@ -862,50 +862,6 @@
     }
 }
 
-static void hci_ev_driver_rds_event(uint8_t buff[])
-{
-    uint8_t rds_type;
-    char *rds_data = NULL;
-    rds_type = buff[0];
-
-    ALOGD("%s:%s:rds type = 0x%x", LOG_TAG, __func__, rds_type);
-    rds_data = malloc(STD_BUF_SIZE);
-    if (rds_data == NULL) {
-        ALOGE("%s:memory allocation failed\n", LOG_TAG);
-        return;
-    } else {
-        memcpy(rds_data, &buff[1],STD_BUF_SIZE);
-    }
-
-    switch (rds_type) {
-        case HCI_EV_RADIO_TEXT:
-            hal->jni_cb->rt_update_cb(rds_data);
-            break;
-
-        case HCI_EV_PROGRAM_SERVICE:
-            hal->jni_cb->ps_update_cb(rds_data);
-            break;
-
-        case HCI_EV_FM_AF_LIST:
-            hal->jni_cb->af_list_update_cb((uint16_t *)&rds_data);
-            break;
-
-        case HCI_EV_RADIO_TEXT_PLUS_TAG:
-            hal->jni_cb->rt_plus_update_cb(rds_data);
-            break;
-
-        case HCI_EV_E_RADIO_TEXT:
-            hal->jni_cb->ert_update_cb(rds_data);
-            break;
-
-        default:
-            ALOGD("%s: Unknown RDS event", __func__);
-            break;
-        }
-
-    free(rds_data);
-}
-
 static void hci_ev_ert()
 {
     char *data = NULL;
@@ -1119,9 +1075,6 @@
     case HCI_EV_EXT_COUNTRY_CODE:
         hci_ev_ext_country_code(((struct fm_event_header_t *)evt_buf)->params);
         break;
-    case HCI_EV_DRIVER_RDS_EVENT:
-        hci_ev_driver_rds_event(((struct fm_event_header_t *)evt_buf)->params);
-        break;
     case HCI_EV_HW_ERR_EVENT:
         hci_ev_hw_error();
         break;
diff --git a/jni/Android.bp b/jni/Android.bp
index 1d6e8e0..307ff22 100755
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -4,6 +4,10 @@
     system_ext_specific: true,
     srcs: [
         "android_hardware_fm.cpp",
+        "ConfFileParser.cpp",
+        "ConfigFmThs.cpp",
+        "FmIoctlsInterface.cpp",
+        "FmPerformanceParams.cpp",
     ],
 
     host_ldlibs: ["-ldl"],
@@ -12,12 +16,9 @@
         "libnativehelper",
         "liblog",
         "libcutils",
-        "libbtconfigstore",
     ],
 
     include_dirs: [
-        "vendor/qcom/opensource/commonsys-intf/bluetooth/include",
-        "vendor/qcom/opensource/commonsys/bluetooth_ext/system_bt_ext/btconfigstore",
         "vendor/qcom/opensource/commonsys/fm/helium",
     ],
 
diff --git a/jni/ConfFileParser.cpp b/jni/ConfFileParser.cpp
new file mode 100644
index 0000000..912d40d
--- /dev/null
+++ b/jni/ConfFileParser.cpp
@@ -0,0 +1,880 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#include "ConfFileParser.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <limits.h>
+#include <math.h>
+#include <utils/Log.h>
+
+//declaration of functions only specific to this file
+static char parse_line
+(
+  group_table *key_file,
+  const char *line,
+  char **cur_grp
+);
+
+static char parse_load_frm_fhandler
+(
+  group_table *key_file,
+  FILE *fp
+);
+
+static char line_is_grp
+(
+  group_table *key_file,
+  const char *str,
+  char **cur_grp
+);
+
+static void free_grp_list
+(
+  group *a
+);
+
+static void free_key_list
+(
+  key_value_pair_list *a
+);
+
+static char line_is_key_value_pair
+(
+  group_table *key_file,
+  const char *str,
+  const char *cur_grp
+);
+
+static char line_is_comment
+(
+  const char *str
+);
+
+static char grp_exist
+(
+  const group_table *key_file,
+  const char *new_grp
+);
+
+static char add_grp
+(
+  group_table *key_file,
+  const char *new_grp
+);
+
+static group *alloc_group
+(
+  void
+);
+
+static key_value_pair_list *alloc_key_value_pair
+(
+  void
+);
+
+static char add_key_value_pair
+(
+  group_table *key_file,
+  const char *cur_grp,
+  const char *key,
+  const char *val
+);
+
+
+//Definitions
+void free_strs
+(
+  char **str_array
+)
+{
+  char **str_array_cpy = str_array;
+  if(str_array != NULL) {
+     while(*str_array != NULL) {
+           free(*str_array);
+           str_array++;
+     }
+  }
+  free(str_array_cpy);
+}
+//ToDo: Come up with code hashing
+//function
+unsigned int get_hash_code
+(
+  const char *str
+)
+{
+
+  unsigned len = strlen(str);
+  unsigned int i;
+  unsigned int hash_code = 0;
+
+  for(i = 0; len > 0; len--, i++) {
+      hash_code += (int)((str[i] * pow(2, len))) % INT_MAX;
+      hash_code %= INT_MAX;
+  }
+  return hash_code;
+}
+
+static key_value_pair_list *alloc_key_value_pair
+(
+  void
+)
+{
+  key_value_pair_list *key_list = NULL;
+
+  key_list = (key_value_pair_list *)malloc(
+                                       sizeof(key_value_pair_list));
+  if(key_list != NULL) {
+     key_list->key = NULL;
+     key_list->next = NULL;
+     key_list->value = NULL;
+  }
+  return key_list;
+}
+
+static group * alloc_group
+(
+  void
+)
+{
+  group *grp = NULL;
+  unsigned int i;
+
+  grp = (group *)malloc(sizeof(group));
+  if(grp != NULL) {
+     grp->grp_name = NULL;
+     grp->grp_next = NULL;
+     grp->num_of_keys = 0;
+     grp->keys_hash_size = MAX_UNIQ_KEYS;
+     grp->list = (key_value_pair_list **)malloc
+                    (sizeof(key_value_pair_list *) * grp->keys_hash_size);
+     if(grp->list == NULL) {
+        ALOGE("Could not alloc group\n");
+        free(grp);
+        grp = NULL;
+     }else {
+        for(i = 0; i < grp->keys_hash_size; i++) {
+            grp->list[i] = NULL;
+        }
+     }
+  }
+  return grp;
+}
+
+group_table *get_key_file
+(
+)
+{
+  group_table *t = NULL;
+  unsigned int i;
+
+  t = (group_table *)malloc(sizeof(group_table));
+  if (t != NULL) {
+      t->grps_hash_size = MAX_UNIQ_GRPS;
+      t->num_of_grps = 0;
+      t->grps_hash = (group **)malloc(sizeof(group *)
+                                       * t->grps_hash_size);
+      if (t->grps_hash == NULL) {
+          free(t);
+          return NULL;
+      }
+      for(i = 0; i < t->grps_hash_size; i++) {
+          t->grps_hash[i] = NULL;
+      }
+  }
+  return t;
+}
+
+void free_key_file(
+  group_table *key_file
+)
+{
+  unsigned int i;
+
+  if(key_file != NULL) {
+     if(key_file->grps_hash != NULL) {
+        for(i = 0; i < key_file->grps_hash_size; i++) {
+            free_grp_list(key_file->grps_hash[i]);
+        }
+     }
+     free(key_file->grps_hash);
+     free(key_file);
+  }
+}
+
+static void free_grp_list
+(
+  group *a
+)
+{
+  group *next;
+  unsigned int i;
+
+  while(a != NULL) {
+       next = a->grp_next;
+       if(a->list != NULL) {
+          for(i = 0; i < a->keys_hash_size; i++) {
+              free_key_list(a->list[i]);
+          }
+       }
+       free(a->grp_name);
+       free(a->list);
+       free(a);
+       a = next;
+  }
+}
+
+static void free_key_list
+(
+  key_value_pair_list *a
+)
+{
+  key_value_pair_list *next;
+
+  while(a != NULL) {
+       next = a->next;
+       free(a->key);
+       free(a->value);
+       free(a);
+       a = next;
+  }
+}
+//return all the groups
+//present in the file
+char **get_grps
+(
+  const group_table *key_file
+)
+{
+  char **grps = NULL;
+  unsigned int i = 0;
+  unsigned int j = 0;
+  unsigned int grp_len;
+  group *grp_list;
+
+  if((key_file == NULL)
+     || (key_file->grps_hash == NULL)
+     || (key_file->grps_hash_size == 0)
+     || (key_file->num_of_grps == 0)) {
+     return grps;
+  }
+  grps = (char **)calloc((key_file->num_of_grps + 1),
+                           sizeof(char *));
+  if(grps == NULL) {
+     return grps;
+  }
+  for(i = 0; i < key_file->grps_hash_size; i++) {
+      grp_list = key_file->grps_hash[i];
+      while(grp_list != NULL) {
+            grp_len = strlen(grp_list->grp_name);
+            grps[j] = (char *)malloc(sizeof(char) *
+                                     (grp_len + 1));
+            if(grps[j] == NULL) {
+               free_strs(grps);
+               grps = NULL;
+               return grps;
+            }
+            memcpy(grps[j], grp_list->grp_name,
+                   (grp_len + 1));
+            grp_list = grp_list->grp_next;
+            j++;
+      }
+  }
+  grps[j] = NULL;
+  return grps;
+}
+
+//returns the list of keys
+//associated with group name
+char **get_keys
+(
+  const group_table *key_file,
+  const char *grp_name
+)
+{
+  unsigned int grp_hash_code;
+  unsigned int grp_index;
+  unsigned int i;
+  unsigned int j = 0;
+  unsigned int key_len;
+  group *grp;
+  key_value_pair_list *key_val_list;
+  char **keys = NULL;
+
+  if((key_file == NULL) || (grp_name == NULL)
+     || (key_file->num_of_grps == 0) ||
+     (key_file->grps_hash_size == 0) ||
+     (key_file->grps_hash == NULL) ||
+     (!strcmp(grp_name, ""))) {
+      return keys;
+  }
+  grp_hash_code = get_hash_code(grp_name);
+  grp_index = (grp_hash_code % key_file->grps_hash_size);
+  grp = key_file->grps_hash[grp_index];
+  while(grp != NULL) {
+        if(!strcmp(grp_name, grp->grp_name)) {
+            if((grp->num_of_keys == 0)
+               || (grp->keys_hash_size == 0)
+               || (grp->list == 0)) {
+               return keys;
+            }
+            keys = (char **)calloc((grp->num_of_keys + 1),
+                                   sizeof(char *));
+            if(keys == NULL) {
+                return keys;
+            }
+            for(i = 0; i < grp->keys_hash_size; i++) {
+                key_val_list = grp->list[i];
+                while(key_val_list != NULL) {
+                     key_len = strlen(key_val_list->key);
+                     keys[j] = (char *)malloc(sizeof(char) *
+                                              (key_len + 1));
+                     if(keys[j] == NULL) {
+                         free_strs(keys);
+                         keys = NULL;
+                         return keys;
+                     }
+                     memcpy(keys[j], key_val_list->key,
+                            (key_len + 1));
+                     j++;
+                     key_val_list = key_val_list->next;
+                }
+            }
+            keys[j] = NULL;
+            return keys;
+        }
+        grp = grp->grp_next;
+  }
+  return keys;
+}
+
+char *get_value
+(
+   const group_table *key_file,
+   const char *grp_name,
+   const char *key
+)
+{
+   unsigned int grp_hash_code;
+   unsigned int key_hash_code;
+   unsigned int grp_index;
+   unsigned int key_index;
+   unsigned val_len;
+   char *val = NULL;
+   group *grp;
+   key_value_pair_list *list;
+
+   if((key_file == NULL) || (grp_name == NULL)
+      || (key == NULL) || (key_file->grps_hash == NULL)
+      || (key_file->grps_hash_size == 0) || !strcmp(grp_name, "")
+      ||(!strcmp(key, ""))) {
+       return NULL;
+   }
+   grp_hash_code = get_hash_code(grp_name);
+   key_hash_code = get_hash_code(key);
+   grp_index = (grp_hash_code % key_file->grps_hash_size);
+   grp = key_file->grps_hash[grp_index];
+   while(grp != NULL) {
+         if(!strcmp(grp_name, grp->grp_name) && grp->keys_hash_size
+            && grp->list) {
+            key_index = (key_hash_code % grp->keys_hash_size);
+            list = grp->list[key_index];
+            while((list != NULL) && (strcmp(list->key, key))) {
+                   list = list->next;
+            }
+            if(list != NULL) {
+                val_len = strlen(list->value);
+                val = (char *)malloc(sizeof(char) * (val_len + 1));
+                if(val != NULL) {
+                   memcpy(val, list->value, val_len);
+                   val[val_len] = '\0';
+                }
+            }
+            return val;
+         }
+         grp = grp->grp_next;
+   }
+   return val;
+}
+//open the file,
+//read, parse and load
+//returns PARSE_SUCCESS if successfully
+//loaded else PARSE_FAILED
+char parse_load_file
+(
+  group_table *key_file,
+  const char *file
+)
+{
+  FILE *fp;
+  char ret = FALSE;
+
+  if((file == NULL) || !strcmp(file, "")) {
+     ALOGE("File name is null or empty \n");
+     return ret;
+  }
+
+  fp = fopen(file, "r");
+  if(fp == NULL) {
+     ALOGE("could not open file for read\n");
+     return ret;
+  }
+
+  ret = parse_load_frm_fhandler(key_file, fp);
+  fclose(fp);
+
+  return ret;
+}
+
+//Read block of data from file handler
+//extract each line, check kind of line(comment,
+//group, key value pair)
+static char parse_load_frm_fhandler
+(
+  group_table *key_file,
+  FILE *fp
+)
+{
+  char buf[MAX_LINE_LEN];
+  char ret = TRUE;
+  char *line = NULL;
+  void *new_line;
+  char *cur_grp = NULL;
+  unsigned line_len = 0;
+  unsigned line_allocated = 0;
+  unsigned int bytes_read = 0;
+  unsigned int i;
+  bool has_carriage_rtn = false;
+
+  while((bytes_read = fread(buf, 1, MAX_LINE_LEN, fp))) {
+        for(i = 0; i < bytes_read; i++) {
+            if(line_len == line_allocated) {
+                line_allocated += 25;
+                new_line = realloc(line, line_allocated);
+                if(new_line == NULL) {
+                   ret = FALSE;
+                   ALOGE("memory allocation failed for line\n");
+                   break;
+                }
+                line = (char *)new_line;
+            }
+            if(buf[i] == '\n') {
+                has_carriage_rtn = false;
+                line[line_len] = '\0';
+                ret = parse_line(key_file, line, &cur_grp);
+                line_len = 0;
+                if(ret == FALSE) {
+                   ALOGE("could not parse the line, line not proper\n");
+                   break;
+                }
+            }else if(buf[i] == '\r') {
+                ALOGE("File has carriage return\n");
+                has_carriage_rtn = true;
+            }else if(has_carriage_rtn) {
+                ALOGE("File format is not proper, no line character\
+                        after carraige return\n");
+                ret = FALSE;
+                break;
+            }else {
+                line[line_len] = buf[i];
+                line_len++;
+            }
+        }
+        if (!ret) {
+            break;
+        }
+  }
+  free(line);
+  free(cur_grp);
+
+  return ret;
+}
+
+//checks whether a line is
+//comment or grp or key pair value
+//and accordingly adds to list
+static char parse_line
+(
+  group_table *key_file,
+  const char *line,
+  char **cur_grp
+)
+{
+  const char *line_begin;
+
+  if((line == NULL) || (key_file == NULL)) {
+      ALOGE("key file or line is null\n");
+      return FALSE;
+  }
+
+  for(line_begin = line; isspace(*line_begin);
+          line_begin++);
+
+  if(line_is_comment(line_begin)) {
+      ALOGE("line is comment\n");
+      return TRUE;
+  }else if(line_is_grp(key_file, line_begin, cur_grp)) {
+      ALOGE("line is grp\n");
+      return TRUE;
+  }else if(line_is_key_value_pair(key_file, line_begin, *cur_grp)) {
+      ALOGE("line is key value pair\n");
+      return TRUE;
+  }else {
+     ALOGE("line is neither comment, grp nor key value pair\n");
+     return FALSE;
+  }
+}
+
+static char line_is_comment
+(
+  const char *str
+)
+{
+  if(str == NULL) {
+      return FALSE;
+  }else if(((*str) == '#') || ((*str) == '\0')
+       || ((*str) == '\n')) {
+      return TRUE;
+  }else {
+      ALOGE("line is not comment\n");
+      return FALSE;
+  }
+}
+
+//return true if a group
+//name already exist
+//else false
+static char grp_exist
+(
+  const group_table *key_file,
+  const char *new_grp
+)
+{
+  unsigned hash_code;
+  unsigned int index;
+  group *grp;
+
+  if((key_file == NULL) || (new_grp == NULL)
+     || (!key_file->grps_hash_size)) {
+     return FALSE;
+  }else {
+    hash_code = get_hash_code(new_grp);
+    index = hash_code % key_file->grps_hash_size;
+    grp = key_file->grps_hash[index];
+    while(grp != NULL) {
+          if (!strcmp(grp->grp_name, new_grp))
+              return TRUE;
+          grp = grp->grp_next;
+    }
+    return FALSE;
+  }
+}
+
+//Add a group to group
+//table if it does not exist
+static char add_grp
+(
+  group_table *key_file,
+  const char *new_grp
+)
+{
+  unsigned int hash_code;
+  unsigned int index;
+  unsigned int grp_name_len;
+  group *grp;
+
+  if(!grp_exist(key_file, new_grp)) {
+      if((key_file == NULL) || (new_grp == NULL)
+         || !key_file->grps_hash_size) {
+         return FALSE;
+      }
+      hash_code = get_hash_code(new_grp);
+      ALOGE("group hash code is: %u\n", hash_code);
+      index = hash_code % key_file->grps_hash_size;
+      ALOGE("group index is: %u\n", index);
+      grp = alloc_group();
+      if(grp == NULL) {
+         return FALSE;
+      }
+      grp_name_len = strlen(new_grp);
+      grp->grp_name = (char *)malloc(
+                                  sizeof(char) * (grp_name_len + 1));
+      if(grp->grp_name == NULL) {
+         ALOGE("could not alloc memory for group name\n");
+         ALOGE("Add group failed\n");
+         free_grp_list(grp);
+         return FALSE;
+      }else {
+         memcpy(grp->grp_name, new_grp, (grp_name_len + 1));
+      }
+      grp->grp_next = key_file->grps_hash[index];
+      key_file->grps_hash[index] = grp;
+      key_file->num_of_grps++;
+      return TRUE;
+  }else {
+     return FALSE;
+  }
+}
+
+//checks validity of a group
+//a valid group is
+//inside [] group name must be
+//alphanumeric
+//Example: [grpName]
+static char line_is_grp
+(
+  group_table *key_file,
+  const char *str,
+  char **cur_grp
+)
+{
+  const char *g_start;
+  const char *g_end;
+  char *new_grp;
+  unsigned int grp_len;
+
+  if ((str == NULL) || (key_file == NULL)) {
+      ALOGE("str is null or key file is null\n");
+      return FALSE;
+  }
+  //checks start mark char ']'
+  if(((*str) != '[')) {
+      ALOGE("start mark is not '['\n");
+      return FALSE;
+  }else {
+      str++;
+      g_start = str;
+  }
+  //checks the end char '['
+  while((*str != '\0') && ((*str) != ']')) {
+        str++;
+  }
+  //if end mark group not found
+  if ((*str) != ']') {
+       ALOGE("grp end mark is not '['\n");
+       return FALSE;
+  }else {
+       g_end = (str - 1);
+  }
+
+  str++;
+  //if end mark found checks the rest chars as well
+  //rest chars should be space
+  while(((*str) == ' ') || ((*str) == '\t')) {
+        str++;
+  }
+  if(*str) {
+     ALOGE("after ']' there are some character\n");
+     return FALSE;
+  }
+
+  str = g_start;
+  while((*g_start != '\0') && (g_start != g_end)
+         && isalnum(*g_start)) {
+        g_start++;
+  }
+  if((g_start == g_end) && isalnum(*g_start)) {
+      //look up if already exist
+      //return false else insert the grp in grp table
+      grp_len = (g_end - str + 1);
+      new_grp = (char *)malloc(sizeof(char) * (grp_len + 1));
+      if (new_grp == NULL) {
+          ALOGE("could not alloc memory for new group\n");
+          return FALSE;
+      }
+      memcpy(new_grp, str, grp_len);
+      new_grp[grp_len] = '\0';
+
+      if(add_grp(key_file, new_grp)) {
+          free(*cur_grp);
+         *cur_grp = new_grp;
+         return TRUE;
+      }else {
+         ALOGE("could not add group to group table\n");
+         return FALSE;
+      }
+  }else {
+      return FALSE;
+  }
+}
+
+//checks validity of key
+//a valid key must start in
+//a seperate line and key must
+//be alphanumeric and before '='
+//there must not be any space
+//Example: key=value
+static char line_is_key_value_pair
+(
+  group_table *key_file,
+  const char *str,
+  const char *cur_grp
+)
+{
+  const char *equal_start;
+  char *key = NULL;
+  char *val = NULL;
+  unsigned key_len;
+  unsigned val_len;
+
+  if((str == NULL) || (cur_grp == NULL) ||
+     !strcmp(cur_grp, "") || (key_file == NULL)) {
+     ALOGE("line is null or cur group or key file is null or empty\n");
+     return FALSE;
+  }
+  equal_start = strchr(str, '=');
+  key_len = (equal_start - str);
+  if((equal_start == NULL) || (equal_start == str)) {
+     ALOGE("line does not have '=' character or no key\n");
+     return FALSE;
+  }
+  while((str != equal_start) && isalnum(*str))
+        str++;
+  if(str == equal_start) {
+      key = (char *)malloc(sizeof(char) * (key_len + 1));
+      if(key == NULL) {
+         ALOGE("could not alloc memory for new key\n");
+         return FALSE;
+      }
+      equal_start++;
+      val_len = strlen(equal_start);
+      val = (char *)malloc(sizeof(char) * (val_len + 1));
+      if(val == NULL) {
+         ALOGE("could not alloc memory for value\n");
+         if(key){
+             free(key);
+             key = NULL;
+         }
+         return FALSE;
+      }
+      memcpy(key, (str - key_len), key_len);
+      memcpy(val, equal_start, val_len);
+      key[key_len] = '\0';
+      val[val_len] = '\0';
+      ALOGE("Grp: %s, key: %s, value: %s\n", cur_grp, key, val);
+      return add_key_value_pair(key_file,
+                                 cur_grp, key, val);
+  }else {
+     ALOGE("key name doesnot have alpha numeric char\n");
+     return FALSE;
+  }
+}
+
+static char add_key_value_pair
+(
+  group_table *key_file,
+  const char *cur_grp,
+  const char *key,
+  const char *val
+)
+{
+  unsigned int grp_hash_code;
+  unsigned int key_hash_code;
+  unsigned int grp_index;
+  unsigned int key_index;
+  unsigned key_len = 0;
+  unsigned val_len = 0;
+  group *grp = NULL;
+  key_value_pair_list *list = NULL;
+
+  if((key_file != NULL) && (cur_grp != NULL)
+      && (key != NULL) && ((key_file->grps_hash != NULL))
+      && (strcmp(key, ""))) {
+     grp_hash_code = get_hash_code(cur_grp);
+     ALOGE("grp hash code is %u\n", grp_hash_code);
+     grp_index = (grp_hash_code % key_file->grps_hash_size);
+     ALOGE("grp index is %u\n", grp_index);
+     grp = key_file->grps_hash[grp_index];
+     key_hash_code = get_hash_code(key);
+     while((grp != NULL)) {
+           if(!strcmp(cur_grp, grp->grp_name)) {
+              key_index = (key_hash_code % grp->keys_hash_size);
+              if(grp->list) {
+                 list = grp->list[key_index];
+              }else {
+                 ALOGE("group list is null\n");
+                 goto err;
+              }
+              while((list != NULL) && strcmp(key, list->key)) {
+                    list = list->next;
+              }
+              if(list != NULL) {
+                  ALOGE("group already contains the key\n");
+                  goto err;
+              }else{
+                  list = alloc_key_value_pair();
+                  if(list == NULL) {
+                     ALOGE("add key value failed as could not alloc memory for key\
+                            val pair\n");
+                     goto err;
+                  }
+                  if(key) {
+                      key_len = strlen(key);
+                  }
+                  list->key = (char *)malloc(sizeof(char) *
+                                              (key_len + 1));
+                  if(list->key == NULL) {
+                     ALOGE("could not alloc memory for key\n");
+                     free(list);
+                     goto err;
+                  }
+                  if(val) {
+                      val_len = strlen(val);
+                  }
+                  list->value = (char *)malloc(sizeof(char) *
+                                                (val_len + 1));
+                  if(!list->value) {
+                      free(list->key);
+                      free(list);
+                      goto err;
+                  }
+                  memcpy(list->key, key, key_len);
+                  memcpy(list->value, val, val_len);
+                  if (key) free((char*)key);
+                  if (val) free((char*)val);
+                  list->key[key_len] = '\0';
+                  list->value[val_len] = '\0';
+                  list->next = grp->list[key_index];
+                  grp->list[key_index] = list;
+                  grp->num_of_keys++;
+                  return TRUE;
+              }
+           }
+           grp = grp->grp_next;
+     }
+     ALOGE("group does not exist\n");
+     goto err;
+  }
+err:
+     if (key) free((char*)key);
+     if (val) free((char*)val);
+     return FALSE;
+}
diff --git a/jni/ConfFileParser.h b/jni/ConfFileParser.h
new file mode 100644
index 0000000..33b86ce
--- /dev/null
+++ b/jni/ConfFileParser.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+
+#ifndef __CONF_FILE_PARSER_H__
+#define __CONF_FILE_PARSER_H__
+
+#define MAX_LINE_LEN 512
+#define MAX_UNIQ_KEYS 5
+#define MAX_UNIQ_GRPS 10
+#define TRUE 1
+#define FALSE 0
+
+struct key_value_pair_list
+{
+   char *key;
+   char *value;
+   key_value_pair_list *next;
+};
+
+struct group
+{
+    char *grp_name;
+    unsigned int num_of_keys;
+    unsigned int keys_hash_size;
+    key_value_pair_list **list;
+    group *grp_next;
+};
+
+struct group_table
+{
+    unsigned int grps_hash_size;
+    unsigned int num_of_grps;
+    group **grps_hash;
+};
+
+enum CONF_PARSE_ERRO_CODE
+{
+  PARSE_SUCCESS,
+  INVALID_FILE_NAME,
+  FILE_OPEN_FAILED,
+  FILE_NOT_PROPER,
+  MEMORY_ALLOC_FAILED,
+  PARSE_FAILED,
+};
+
+unsigned int get_hash_code(const char *str);
+group_table *get_key_file();
+void free_strs(char **str_array);
+void free_key_file(group_table *key_file);
+char parse_load_file(group_table *key_file, const char *file);
+char **get_grps(const group_table *key_file);
+char **get_keys(const group_table *key_file, const char *grp);
+char *get_value(const group_table *key_file, const char *grp,
+                 const char *key);
+
+#endif //__CONF_FILE_PARSER_H__
diff --git a/jni/ConfigFmThs.cpp b/jni/ConfigFmThs.cpp
new file mode 100644
index 0000000..10bb921
--- /dev/null
+++ b/jni/ConfigFmThs.cpp
@@ -0,0 +1,525 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#include <cstdlib>
+#include <cstring>
+#include "ConfigFmThs.h"
+#include "FmPerformanceParams.h"
+#include <utils/Log.h>
+
+static int compare_name
+(
+   const void *name1, const void *name2
+)
+{
+    char *first = (char *)name1;
+    struct NAME_MAP *second = (struct NAME_MAP *)name2;
+
+    return(strcmp(first, second->name));
+}
+
+ConfigFmThs :: ConfigFmThs
+(
+)
+{
+    keyfile = NULL;
+}
+
+ConfigFmThs :: ~ConfigFmThs
+(
+)
+{
+   free_key_file(keyfile);
+}
+
+void ConfigFmThs :: set_af_ths
+(
+   UINT fd
+)
+{
+    signed char ret = FM_SUCCESS;
+    char **keys;
+    char **keys_cpy;
+    char *key_value;
+    int value;
+    FmPerformanceParams perf_params;
+    struct NAME_MAP *found;
+
+    if(keyfile != NULL) {
+       keys_cpy = keys = get_keys(keyfile, GRPS_MAP[0].name);
+       if(keys != NULL) {
+          while(*keys != NULL) {
+              ALOGE("key found is: %s\n", *keys);
+              found = (NAME_MAP *)bsearch(*keys, AF_PARAMS_MAP,
+                          MAX_AF_PARAMS, sizeof(NAME_MAP), compare_name);
+              if(found != NULL) {
+                 key_value = get_value(keyfile,
+                                     GRPS_MAP[0].name, found->name);
+                 if((key_value != NULL) && strcmp(key_value, "")) {
+                    value = atoi(key_value);
+                    switch(found->num) {
+                    case AF_RMSSI_TH:
+                         if((value >= AF_RMSSI_TH_MIN)
+                             && (value <= AF_RMSSI_TH_MAX)) {
+                             ALOGE("Set af rmssi th: %d\n", value);
+                             ret = perf_params.SetAfRmssiTh(fd, value);
+                             if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting Af Rmssi th\n");
+                                break;
+                             }
+                             unsigned short th;
+                             ret = perf_params.GetAfRmssiTh(fd, th);
+                             if(ret == FM_SUCCESS) {
+                                ALOGE("Read af rmssith: %hd\n", th);
+                             }else {
+                                ALOGE("Error in reading Af Rmssi th\n");
+                             }
+                         }
+                         break;
+                    case AF_RMSSI_SAMPLES:
+                         if((value >= AF_RMSSI_SAMPLES_MIN)
+                             && (value <= AF_RMSSI_SAMPLES_MAX)) {
+                             ALOGE("Set af rmssi samples cnt: %d\n", value);
+                             ret = perf_params.SetAfRmssiSamplesCnt(fd, value);
+                             if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting af rmssi samples\n");
+                                break;
+                             }
+                             unsigned char cnt;
+                             ret = perf_params.GetAfRmssiSamplesCnt(fd, cnt);
+                             if(ret == FM_SUCCESS) {
+                                ALOGE("Read af rmssi samples cnt: %hhd\n", cnt);
+                             }else {
+                                 ALOGE("Error in reading rmssi samples\n");
+                             }
+                         }
+                         break;
+                    case GOOD_CH_RMSSI_TH:
+                         if((value >= GOOD_CH_RMSSI_TH_MIN)
+                             && (value <= GOOD_CH_RMSSI_TH_MAX)) {
+                             ALOGE("Set Good channle rmssi th: %d\n", value);
+                             ret = perf_params.SetGoodChannelRmssiTh(fd, value);
+                             if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting Good channle rmssi th\n");
+                                break;
+                             }
+                             signed char th;
+                             ret = perf_params.GetGoodChannelRmssiTh(fd, th);
+                             if(ret == FM_SUCCESS) {
+                                ALOGE("Read good channel rmssi th: %d\n", th);
+                             }else {
+                                ALOGE("Error in reading Good channle rmssi th\n");
+                             }
+                         }
+                         break;
+                   }
+                 }else {
+                   ALOGE("key_val for key: %s is empty\n",
+                             *keys);
+                 }
+                 free(key_value);
+              }
+              keys++;
+          }
+       }else {
+          ALOGE("No of keys found is zero\n");
+       }
+       free_strs(keys_cpy);
+    }else {
+       ALOGE("key file is null\n");
+    }
+}
+
+void ConfigFmThs :: set_srch_ths
+(
+    UINT fd
+)
+{
+    signed char ret = FM_SUCCESS;
+    char **keys = NULL;
+    char **keys_cpy = NULL;
+    char *key_value = NULL;
+    int value;
+    FmPerformanceParams perf_params;
+    struct NAME_MAP *found = NULL;
+
+    if(keyfile != NULL) {
+       keys_cpy = keys = get_keys(keyfile, GRPS_MAP[2].name);
+       if(keys != NULL) {
+          while(*keys != NULL) {
+              found = (NAME_MAP *)bsearch(*keys, SEACH_PARAMS_MAP,
+                           MAX_SRCH_PARAMS, sizeof(NAME_MAP), compare_name);
+              if(found != NULL) {
+                 key_value = get_value(keyfile, GRPS_MAP[2].name, found->name);
+                 ALOGE("found srch ths: %s: %s\n", found->name, key_value);
+                 if((key_value != NULL) && strcmp(key_value, "")) {
+                    value = atoi(key_value);
+                    switch(found->num) {
+                    case SINR_FIRST_STAGE:
+                         if((value >= SINR_FIRST_STAGE_MIN)
+                             && (value <= SINR_FIRST_STAGE_MAX)) {
+                             ALOGE("Set sinr first stage: %d\n", value);
+                             ret = perf_params.SetSinrFirstStage(fd, value);
+                             if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting sinr first stage\n");
+                                break;
+                             }
+                             signed char th;
+                             ret = perf_params.GetSinrFirstStage(fd, th);
+                             if(ret == FM_SUCCESS) {
+                                ALOGE("Read sinr first stage: %d\n", th);
+                             }else {
+                                ALOGE("Error in reading sinr first stage\n");
+                             }
+                         }
+                         break;
+                    case RMSSI_FIRST_STAGE:
+                         if((value >= RMSSI_FIRST_STAGE_MIN)
+                             && (value <= RMSSI_FIRST_STAGE_MAX)) {
+                             ALOGE("Set rmssi first stage: %d\n", value);
+                             ret = perf_params.SetRmssiFirstStage(fd, value);
+                             if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting rmssi first stage\n");
+                                break;
+                             }
+                             signed char th;
+                             ret = perf_params.GetRmssiFirstStage(fd, th);
+                             if(ret == FM_SUCCESS) {
+                                ALOGE("Read rmssi first stage: %d\n", th);
+                             }else {
+                                ALOGE("Error in reading rmssi first stage\n");
+                             }
+                         }
+                         break;
+                    case INTF_LOW_TH:
+                         if((value >= INTF_LOW_TH_MIN)
+                             && (value <= INTF_LOW_TH_MAX)) {
+                            ALOGE("Set intf low th: %d\n", value);
+                            ret = perf_params.SetIntfLowTh(fd, value);
+                            if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting intf low th\n");
+                                break;
+                            }
+                            unsigned char th;
+                            ret = perf_params.GetIntfLowTh(fd, th);
+                            if(ret == FM_SUCCESS) {
+                               ALOGE("Read intf low th: %u\n", th);
+                            }else {
+                               ALOGE("Error in reading intf low th\n");
+                            }
+                         }
+                         break;
+                    case INTF_HIGH_TH:
+                         if((value >= INTF_HIGH_TH_MIN)
+                             && (value <= INTF_HIGH_TH_MAX)) {
+                            ALOGE("Set intf high th: %d\n", value);
+                            ret = perf_params.SetIntfHighTh(fd, value);
+                            if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting intf high th\n");
+                                break;
+                            }
+                            unsigned char th;
+                            ret = perf_params.GetIntfHighTh(fd, th);
+                            if(ret == FM_SUCCESS) {
+                               ALOGE("Read intf high th: %u\n", th);
+                            }else {
+                               ALOGE("Error in reading intf high th\n");
+                            }
+                         }
+                         break;
+                    case CF0_TH:
+                         ALOGE("Set cf0 th: %d\n", value);
+                         ret = perf_params.SetCf0Th12(fd, value);
+                         if(ret == FM_FAILURE) {
+                            ALOGE("Error in setting cf0 th\n");
+                            break;
+                         }
+                         int th;
+                         ret = perf_params.GetCf0Th12(fd, th);
+                         if(ret == FM_SUCCESS) {
+                            ALOGE("Read CF012 th: %d\n", th);
+                         }else {
+                            ALOGE("Error in reading cf0 th\n");
+                         }
+                         break;
+                    case SRCH_ALGO_TYPE:
+                         if((value >= SRCH_ALGO_TYPE_MIN)
+                             && (value <= SRCH_ALGO_TYPE_MAX)) {
+                             ALOGE("Set search algo type: %d\n", value);
+                             ret = perf_params.SetSrchAlgoType(fd, value);
+                             if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting search algo type\n");
+                                break;
+                             }
+                             unsigned char algo;
+                             ret = perf_params.GetSrchAlgoType(fd, algo);
+                             if(ret == FM_SUCCESS) {
+                                ALOGE("Read algo type: %u\n", algo);
+                             }else {
+                                ALOGE("Error in reading search algo type\n");
+                             }
+                         }
+                         break;
+                    case SINR_SAMPLES:
+                         if((value >= SINR_SAMPLES_CNT_MIN)
+                             && (value <= SINR_SAMPLES_CNT_MAX)) {
+                             ALOGE("Set sinr samples count: %d\n", value);
+                             ret = perf_params.SetSinrSamplesCnt(fd, value);
+                             if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting sinr samples count\n");
+                                break;
+                             }
+                             unsigned char cnt;
+                             ret = perf_params.GetSinrSamplesCnt(fd, cnt);
+                             if(ret == FM_SUCCESS) {
+                                ALOGE("Read sinr samples cnt: %u\n", cnt);
+                             }else {
+                                ALOGE("Error in reading sinr samples count\n");
+                             }
+                         }
+                         break;
+                    case SINR:
+                         if((value >= SINR_FINAL_STAGE_MIN)
+                             && (value <= SINR_FINAL_STAGE_MAX)) {
+                             ALOGE("Set final stage sinr: %d\n", value);
+                             ret = perf_params.SetSinrFinalStage(fd, value);
+                             if(ret == FM_FAILURE) {
+                                ALOGE("Error in setting final stage sinr\n");
+                                break;
+                             }
+                             signed char th;
+                             ret = perf_params.GetSinrFinalStage(fd, th);
+                             if(ret == FM_SUCCESS) {
+                                ALOGE("Read final stage sinr: %d\n", th);
+                             }else {
+                                ALOGE("Error in reading final stage sinr\n");
+                             }
+                         }
+                         break;
+                    }
+                 }else {
+                    ALOGE("key_value for key: %s is empty\n",
+                                  *keys);
+                 }
+                 free(key_value);
+              }
+              keys++;
+          }
+       }else {
+          ALOGE("No of keys found is zero\n");
+       }
+       free_strs(keys_cpy);
+    }else {
+       ALOGE("key file is null\n");
+    }
+}
+
+void ConfigFmThs :: set_hybrd_list
+(
+    UINT fd
+)
+{
+    char **keys = NULL;
+    char **keys_cpy = NULL;
+    char *key_value = NULL;
+    char *freqs = NULL;
+    unsigned int *freqs_array = NULL;
+    signed char *sinrs_array = NULL;
+    char *sinrs = NULL;
+    unsigned int freq_cnt = 0;
+    unsigned int sinr_cnt = 0;
+    FmPerformanceParams perf_params;
+    struct NAME_MAP *found;
+
+    ALOGE("Inside hybrid srch list\n");
+    if(keyfile != NULL) {
+       keys_cpy = keys = get_keys(keyfile, GRPS_MAP[1].name);
+       if(keys != NULL) {
+          while(*keys != NULL) {
+              found = (NAME_MAP *)bsearch(*keys, HYBRD_SRCH_MAP,
+                           MAX_HYBRID_SRCH_PARAMS, sizeof(NAME_MAP), compare_name);
+              if(found != NULL) {
+                 key_value = get_value(keyfile, GRPS_MAP[1].name, found->name);
+                 if((key_value != NULL) && strcmp(key_value, "")) {
+                     switch(found->num) {
+                     case FREQ_LIST:
+                          freqs = key_value;
+                          break;
+                     case SINR_LIST:
+                          sinrs = key_value;
+                          break;
+                     default:
+                          free(key_value);
+                          break;
+                     }
+                 }
+              }
+              keys++;
+          }
+          free_strs(keys_cpy);
+       }else {
+          ALOGE("No of keys found is zero\n");
+       }
+    }else {
+       ALOGE("key file is null\n");
+    }
+
+    freq_cnt = extract_comma_sep_freqs(freqs, &freqs_array, ",");
+    sinr_cnt = extract_comma_sep_sinrs(sinrs, &sinrs_array, ",");
+
+    if((freq_cnt == sinr_cnt) && (sinr_cnt > 0)) {
+       perf_params.SetHybridSrchList(fd, freqs_array, sinrs_array, freq_cnt);
+    }
+
+    free(freqs);
+    free(sinrs);
+    free(freqs_array);
+    free(sinrs_array);
+}
+
+unsigned int ConfigFmThs :: extract_comma_sep_freqs
+(
+    char *freqs,
+    unsigned int **freqs_arr,
+    const char *str
+)
+{
+    char *next_freq;
+    char *saveptr = NULL;
+    unsigned int freq;
+    unsigned int *freqs_new_arr;
+    unsigned int size = 0;
+    unsigned int len = 0;
+
+    next_freq = strtok_r(freqs, str, &saveptr);
+    while(next_freq != NULL) {
+          freq = atoi(next_freq);
+          ALOGD("HYBRID_SRCH freq: %u\n", freq);
+          if(size == len) {
+             size <<= 1;
+             if(size == 0)
+                size = 1;
+             freqs_new_arr = (unsigned int *)realloc(*freqs_arr,
+                                              size * sizeof(unsigned int));
+             if(freqs_new_arr == NULL) {
+                free(*freqs_arr);
+                *freqs_arr = NULL;
+                break;
+             }
+             *freqs_arr = freqs_new_arr;
+          }
+          (*freqs_arr)[len] = freq;
+          len++;
+          next_freq = strtok_r(NULL, str, &saveptr);
+    }
+    return len;
+}
+
+unsigned int ConfigFmThs :: extract_comma_sep_sinrs
+(
+    char *sinrs,
+    signed char **sinrs_arr,
+    const char *str
+)
+{
+    char *next_sinr;
+    char *saveptr = NULL;
+    signed char *sinrs_new_arr;
+    unsigned int size = 0;
+    unsigned int len = 0;
+    signed char sinr;
+
+    next_sinr = strtok_r(sinrs, str, &saveptr);
+    while(next_sinr != NULL) {
+          sinr = atoi(next_sinr);
+          ALOGD("HYBRID_SRCH sinr: %d\n", sinr);
+          if(size == len) {
+             size <<= 1;
+             if(size == 0)
+                size = 1;
+             sinrs_new_arr = (signed char *)realloc(*sinrs_arr,
+                                               size * sizeof(signed char));
+             if(sinrs_new_arr == NULL) {
+                free(*sinrs_arr);
+                *sinrs_arr = NULL;
+                break;
+             }
+             *sinrs_arr = sinrs_new_arr;
+          }
+          (*sinrs_arr)[len] = sinr;
+          len++;
+          next_sinr = strtok_r(NULL, str, &saveptr);
+    }
+    return len;
+}
+
+void  ConfigFmThs :: SetRxSearchAfThs
+(
+    const char *file, UINT fd
+)
+{
+    struct NAME_MAP *found;
+    char **grps = NULL;
+    char **grps_cpy = NULL;
+
+    keyfile = get_key_file();
+
+    ALOGE("file name is: %s\n", file);
+    if(!parse_load_file(keyfile, file)) {
+       ALOGE("Error in loading threshold file\n");
+    }else {
+       grps_cpy = grps = get_grps(keyfile);
+       if(grps != NULL) {
+          while(*grps != NULL) {
+              ALOGE("Search grp: %s\n", *grps);
+              found = (NAME_MAP *)bsearch(*grps, GRPS_MAP, MAX_GRPS,
+                             sizeof(NAME_MAP), compare_name);
+              if(found != NULL) {
+                 ALOGE("Found group: %s\n", found->name);
+                 switch(found->num) {
+                 case AF_THS:
+                      set_af_ths(fd);
+                      break;
+                 case SRCH_THS:
+                      set_srch_ths(fd);
+                      break;
+                 case HYBRD_SRCH_LIST:
+                      set_hybrd_list(fd);
+                      break;
+                 }
+              }
+              grps++;
+          }
+       }else {
+          ALOGE("No of groups found is zero\n");
+       }
+       free_strs(grps_cpy);
+    }
+    free_key_file(keyfile);
+    keyfile = NULL;
+}
diff --git a/jni/ConfigFmThs.h b/jni/ConfigFmThs.h
new file mode 100644
index 0000000..0a791f7
--- /dev/null
+++ b/jni/ConfigFmThs.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef __CONFIG_FM_THS_H__
+#define __CONFIG_FM_THS_H__
+
+#include <cstring>
+#include "FmConst.h"
+#include "ConfFileParser.h"
+
+#define MAX_GRPS 3
+#define MAX_SRCH_PARAMS 8
+#define MAX_AF_PARAMS 3
+
+#define SINR_SAMPLES_CNT_MIN 0
+#define SINR_SAMPLES_CNT_MAX 255
+#define SINR_FIRST_STAGE_MIN -128
+#define SINR_FIRST_STAGE_MAX 127
+#define RMSSI_FIRST_STAGE_MIN -128
+#define RMSSI_FIRST_STAGE_MAX 127
+#define INTF_LOW_TH_MIN 0
+#define INTF_LOW_TH_MAX  255
+#define INTF_HIGH_TH_MIN 0
+#define INTF_HIGH_TH_MAX 255
+#define SRCH_ALGO_TYPE_MIN 0
+#define SRCH_ALGO_TYPE_MAX 1
+#define SINR_FINAL_STAGE_MIN -128
+#define SINR_FINAL_STAGE_MAX 127
+
+#define AF_RMSSI_TH_MIN 0
+#define AF_RMSSI_TH_MAX 65535
+#define AF_RMSSI_SAMPLES_MIN 0
+#define AF_RMSSI_SAMPLES_MAX 255
+#define GOOD_CH_RMSSI_TH_MIN -128
+#define GOOD_CH_RMSSI_TH_MAX 127
+
+const unsigned char MAX_HYBRID_SRCH_PARAMS = 2;
+
+struct NAME_MAP
+{
+   const char name[50];
+   const int num;
+};
+
+enum PERFORMANCE_GRPS
+{
+    AF_THS,
+    SRCH_THS,
+    HYBRD_SRCH_LIST,
+};
+
+enum PERFORMANCE_SRCH_PARAMS
+{
+    SRCH_ALGO_TYPE,
+    CF0_TH,
+    SINR_FIRST_STAGE,
+    SINR,
+    RMSSI_FIRST_STAGE,
+    INTF_LOW_TH,
+    INTF_HIGH_TH,
+    SINR_SAMPLES,
+};
+
+enum PERFORMANCE_AF_PARAMS
+{
+    AF_RMSSI_TH,
+    AF_RMSSI_SAMPLES,
+    GOOD_CH_RMSSI_TH,
+};
+
+enum HYBRID_SRCH_PARAMS
+{
+    FREQ_LIST,
+    SINR_LIST,
+};
+
+//Keep this list in sorted order (ascending order in terms of "name")
+//Don't change the name of GRPS, if changed please also change accordingly
+//file: fm_srch_af_th.conf
+static struct NAME_MAP GRPS_MAP[] =
+{
+   {"AFTHRESHOLDS", AF_THS},
+   {"HYBRIDSEARCHLIST", HYBRD_SRCH_LIST},
+   {"SEARCHTHRESHOLDS", SRCH_THS},
+};
+
+//Keep this list in sorted order (ascending order in terms of "name")
+//Don't change the name of SEARCH thresholds,
+//if changed please also change accordingly
+//file: fm_srch_af_th.conf
+static struct NAME_MAP SEACH_PARAMS_MAP[] =
+{
+   {"Cf0Th12", CF0_TH},
+   {"IntfHighTh", INTF_HIGH_TH},
+   {"IntfLowTh", INTF_LOW_TH},
+   {"RmssiFirstStage", RMSSI_FIRST_STAGE},
+   {"SearchAlgoType", SRCH_ALGO_TYPE},
+   {"Sinr", SINR},
+   {"SinrFirstStage", SINR_FIRST_STAGE},
+   {"SinrSamplesCnt", SINR_SAMPLES},
+};
+
+//Keep this list in sorted order (ascending order in terms of "name")
+//Don't change the name of SEARCH thresholds,
+//if changed please also change accordingly
+//file: fm_srch_af_th.conf
+static struct NAME_MAP AF_PARAMS_MAP[] =
+{
+   {"AfRmssiSamplesCnt", AF_RMSSI_SAMPLES},
+   {"AfRmssiTh", AF_RMSSI_TH},
+   {"GoodChRmssiTh", GOOD_CH_RMSSI_TH},
+};
+
+static struct NAME_MAP HYBRD_SRCH_MAP[] =
+{
+   {"Freqs", FREQ_LIST},
+   {"Sinrs", SINR_LIST},
+};
+
+class ConfigFmThs {
+   private:
+          group_table *keyfile;
+          void set_srch_ths(UINT fd);
+          void set_af_ths(UINT fd);
+          unsigned int extract_comma_sep_freqs(char *freqs, unsigned int **freqs_arr, const char *str);
+          unsigned int extract_comma_sep_sinrs(char *sinrs, signed char **sinrs_arr, const char *str);
+          void set_hybrd_list(UINT fd);
+   public:
+          ConfigFmThs();
+          ~ConfigFmThs();
+          void SetRxSearchAfThs(const char *file, UINT fd);
+};
+
+#endif //__CONFIG_FM_THS_H__
diff --git a/jni/FmConst.h b/jni/FmConst.h
new file mode 100644
index 0000000..fc858d9
--- /dev/null
+++ b/jni/FmConst.h
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2014, 2015, 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.
+ */
+
+#ifndef __FM_CONST_H__
+#define __FM_CONST_H__
+
+
+typedef  unsigned int UINT;
+typedef  unsigned long ULINT;
+
+//return related
+const int IOCTL_SUCC = 0;
+const int FM_SUCCESS = 0;
+const int FM_FAILURE = -1;
+const int PROP_SET_SUCC = 0;
+
+#define TUNE_MULT  16
+const UINT CAL_DATA_SIZE = 23;
+#define STD_BUF_SIZE  256
+
+const char *const FM_PERFORMANCE_PARAMS = "/etc/fm/fm_srch_af_th.conf";
+const char *const CALIB_DATA_NAME = "/data/misc/fm/Riva_fm_cal";
+
+#define V4L2_CTRL_CLASS_USER  0x00980000
+#define V4L2_CID_BASE  (V4L2_CTRL_CLASS_USER | 0x900)
+#ifndef V4L2_CID_AUDIO_MUTE
+#define V4L2_CID_AUDIO_MUTE   (V4L2_CID_BASE + 9)
+#endif
+const UINT SEARCH_DWELL_TIME = 2;
+const UINT SEEK_DWELL_TIME = 0;
+
+enum FM_AUDIO_PATH
+{
+    AUDIO_DIGITAL_PATH,
+    AUDIO_ANALOG_PATH,
+};
+
+enum FM_DEVICE
+{
+    FM_DEV_NONE,
+    FM_RX,
+    FM_TX,
+};
+
+enum BUFF_INDEXES
+{
+    STATION_LIST_IND,
+    EVENT_IND,
+    RT_IND,
+    PS_IND,
+    AF_LIST_IND = PS_IND + 2,
+    RT_PLUS_IND = 11,
+    ERT_IND,
+};
+
+enum SEARCH_MODE
+{
+    SEEK_MODE,
+    SCAN_MODE,
+};
+
+enum SEARCH_DIR
+{
+    SEARCH_DOWN,
+    SEARCH_UP,
+};
+
+enum AUDIO_MODE
+{
+    MONO,
+    STEREO,
+};
+
+//V4L2 CONTROLS FOR FM DRIVER
+enum FM_V4L2_PRV_CONTROLS
+{
+    V4L2_CID_PRV_BASE = 0x8000000,
+    V4L2_CID_PRV_SRCHMODE,
+    V4L2_CID_PRV_SCANDWELL,
+    V4L2_CID_PRV_SRCHON,
+    V4L2_CID_PRV_STATE,
+    V4L2_CID_PRV_TRANSMIT_MODE,
+    V4L2_CID_PRV_RDSGROUP_MASK,
+    V4L2_CID_PRV_REGION,
+    V4L2_CID_PRV_SIGNAL_TH,
+    V4L2_CID_PRV_SRCH_PTY,
+    V4L2_CID_PRV_SRCH_PI,
+    V4L2_CID_PRV_SRCH_CNT,
+    V4L2_CID_PRV_EMPHASIS,
+    V4L2_CID_PRV_RDS_STD,
+    V4L2_CID_PRV_CHAN_SPACING,
+    V4L2_CID_PRV_RDSON,
+    V4L2_CID_PRV_RDSGROUP_PROC,
+    V4L2_CID_PRV_LP_MODE,
+    V4L2_CID_PRV_INTDET = V4L2_CID_PRV_BASE + 25,
+    V4L2_CID_PRV_AF_JUMP = V4L2_CID_PRV_BASE + 27,
+    V4L2_CID_PRV_SOFT_MUTE = V4L2_CID_PRV_BASE + 30,
+    V4L2_CID_PRV_AUDIO_PATH = V4L2_CID_PRV_BASE + 41,
+    V4L2_CID_PRV_SINR = V4L2_CID_PRV_BASE + 44,
+    V4L2_CID_PRV_ON_CHANNEL_THRESHOLD = V4L2_CID_PRV_BASE + 0x2D,
+    V4L2_CID_PRV_OFF_CHANNEL_THRESHOLD,
+    V4L2_CID_PRV_SINR_THRESHOLD,
+    V4L2_CID_PRV_SINR_SAMPLES,
+    V4L2_CID_PRV_SPUR_FREQ,
+    V4L2_CID_PRV_SPUR_FREQ_RMSSI,
+    V4L2_CID_PRV_SPUR_SELECTION,
+    V4L2_CID_PRV_AF_RMSSI_TH = V4L2_CID_PRV_BASE + 0x36,
+    V4L2_CID_PRV_AF_RMSSI_SAMPLES,
+    V4L2_CID_PRV_GOOD_CH_RMSSI_TH,
+    V4L2_CID_PRV_SRCHALGOTYPE,
+    V4L2_CID_PRV_CF0TH12,
+    V4L2_CID_PRV_SINRFIRSTSTAGE,
+    V4L2_CID_PRV_RMSSIFIRSTSTAGE,
+    V4L2_CID_PRV_SOFT_MUTE_TH,
+    V4L2_CID_PRV_IRIS_RDSGRP_RT,
+    V4L2_CID_PRV_IRIS_RDSGRP_PS_SIMPLE,
+    V4L2_CID_PRV_IRIS_RDSGRP_AFLIST,
+    V4L2_CID_PRV_IRIS_RDSGRP_ERT,
+    V4L2_CID_PRV_IRIS_RDSGRP_RT_PLUS,
+    V4L2_CID_PRV_IRIS_RDSGRP_3A,
+
+    V4L2_CID_PRV_IRIS_READ_DEFAULT = V4L2_CTRL_CLASS_USER + 0x928,
+    V4L2_CID_PRV_IRIS_WRITE_DEFAULT,
+    V4L2_CID_PRV_SET_CALIBRATION = V4L2_CTRL_CLASS_USER + 0x92A,
+    HCI_FM_HELIUM_SET_SPURTABLE = 0x0098092D,
+    HCI_FM_HELIUM_GET_SPUR_TBL  = 0x0098092E,
+    V4L2_CID_PRV_IRIS_FREQ,
+    V4L2_CID_PRV_IRIS_SEEK,
+    V4L2_CID_PRV_IRIS_UPPER_BAND,
+    V4L2_CID_PRV_IRIS_LOWER_BAND,
+    V4L2_CID_PRV_IRIS_AUDIO_MODE,
+    V4L2_CID_PRV_IRIS_RMSSI,
+
+    V4L2_CID_PRV_ENABLE_SLIMBUS = 0x00980940,
+};
+
+#endif
diff --git a/jni/FmIoctlsInterface.cpp b/jni/FmIoctlsInterface.cpp
new file mode 100644
index 0000000..04cfd64
--- /dev/null
+++ b/jni/FmIoctlsInterface.cpp
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <fcntl.h>
+#include <utils/Log.h>
+#include <cutils/properties.h>
+#include <sys/ioctl.h>
+#include <linux/videodev2.h>
+#include <math.h>
+#include "FmIoctlsInterface.h"
+
+char const * const FmIoctlsInterface::LOGTAG = "FmIoctlsInterface";
+
+int  FmIoctlsInterface :: get_cur_freq
+(
+    UINT fd, long &freq
+)
+{
+    int ret;
+    struct v4l2_frequency channel;
+
+    channel.type = V4L2_TUNER_RADIO;
+    ret = ioctl(fd, VIDIOC_G_FREQUENCY, &channel);
+
+    if(ret < IOCTL_SUCC) {
+        return FM_FAILURE;
+    }else {
+        freq = (channel.frequency / TUNE_MULT);
+        return FM_SUCCESS;
+    }
+}
+
+int  FmIoctlsInterface :: set_freq
+(
+    UINT fd, ULINT freq
+)
+{
+    int ret;
+    struct v4l2_frequency channel;
+
+    channel.type = V4L2_TUNER_RADIO;
+    channel.frequency = (freq * TUNE_MULT);
+
+    ret = ioctl(fd, VIDIOC_S_FREQUENCY, &channel);
+    if(ret < IOCTL_SUCC) {
+        return FM_FAILURE;
+    }else {
+        return FM_SUCCESS;
+    }
+}
+
+int FmIoctlsInterface :: set_control
+(
+    UINT fd, UINT id, int val
+)
+{
+    int ret;
+    struct v4l2_control control;
+
+    control.value = val;
+    control.id = id;
+
+    for(int i = 0; i < 3; i++) {
+        ret = ioctl(fd, VIDIOC_S_CTRL, &control);
+        if(ret < IOCTL_SUCC) {
+           ret = FM_FAILURE;
+        }else {
+           ret = FM_SUCCESS;
+           break;
+        }
+    }
+    return ret;
+}
+
+int  FmIoctlsInterface :: set_calibration
+(
+    UINT fd
+)
+{
+    int ret;
+    FILE *cal_fp;
+    struct v4l2_ext_control ext_ctl;
+    struct v4l2_ext_controls v4l2_ctls;
+    char cal_data[CAL_DATA_SIZE] = {0};
+
+    memset(&v4l2_ctls, 0, sizeof(v4l2_ctls));
+    memset(&ext_ctl, 0, sizeof(ext_ctl));
+
+    cal_fp = fopen(CALIB_DATA_NAME, "r");
+    if(cal_fp != NULL) {
+       if(fread(&cal_data[0], 1, CAL_DATA_SIZE, cal_fp)
+           < CAL_DATA_SIZE) {
+           fclose(cal_fp);
+           ALOGE("%s: calibration file read failed\n", LOGTAG);
+           return FM_FAILURE;
+       }
+       fclose(cal_fp);
+       ext_ctl.id = V4L2_CID_PRV_SET_CALIBRATION;
+       ext_ctl.string = cal_data;
+       ext_ctl.size = CAL_DATA_SIZE;
+       v4l2_ctls.ctrl_class = V4L2_CTRL_CLASS_USER;
+       v4l2_ctls.count = 1;
+       v4l2_ctls.controls = &ext_ctl;
+       ret = ioctl(fd, VIDIOC_S_EXT_CTRLS, &v4l2_ctls);
+       if(ret < IOCTL_SUCC) {
+           ALOGE("%s: ioctl call failed\n", LOGTAG);
+           return FM_FAILURE;
+       }else {
+           return FM_SUCCESS;
+       }
+    }else {
+        return FM_SUCCESS;
+    }
+}
+
+int  FmIoctlsInterface :: get_control
+(
+    UINT fd, UINT id, long &val
+)
+{
+    int ret;
+    struct v4l2_control control;
+
+    control.id = id;
+    ret = ioctl(fd, VIDIOC_G_CTRL, &control);
+    if(ret < IOCTL_SUCC) {
+        return FM_FAILURE;
+    }else {
+        val = control.value;
+        return FM_SUCCESS;
+    }
+}
+
+int  FmIoctlsInterface :: start_search
+(
+    UINT fd, UINT dir
+)
+{
+    int ret;
+    struct v4l2_hw_freq_seek hw_seek;
+
+    hw_seek.seek_upward = dir;
+    hw_seek.type = V4L2_TUNER_RADIO;
+
+    ret = ioctl(fd, VIDIOC_S_HW_FREQ_SEEK, &hw_seek);
+    if(ret < IOCTL_SUCC) {
+        return FM_FAILURE;
+    }else {
+        return FM_SUCCESS;
+    }
+}
+
+int  FmIoctlsInterface :: set_band
+(
+    UINT fd, ULINT low, ULINT high
+)
+{
+    int ret;
+    struct v4l2_tuner tuner;
+
+    tuner.index = 0;
+    tuner.signal = 0;
+    tuner.rangelow = (low * TUNE_MULT);
+    tuner.rangehigh = (high * TUNE_MULT);
+
+    ret = ioctl(fd, VIDIOC_S_TUNER, &tuner);
+    ret = set_control(fd, V4L2_CID_PRV_REGION, 0);
+    if(ret < IOCTL_SUCC) {
+        return FM_FAILURE;
+    }else {
+        return FM_SUCCESS;
+    }
+}
+
+int FmIoctlsInterface :: get_rmssi
+(
+    UINT fd, long &rmssi
+)
+{
+    struct v4l2_tuner tuner;
+    int ret;
+
+    tuner.index = 0;
+    tuner.signal = 0;
+    ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
+    if(ret < IOCTL_SUCC) {
+        ret = FM_FAILURE;
+    }else {
+        rmssi = tuner.signal;
+        ret = FM_SUCCESS;
+    }
+    return ret;
+}
+
+int FmIoctlsInterface :: get_upperband_limit
+(
+    UINT fd, ULINT &freq
+)
+{
+    int ret;
+    struct v4l2_tuner tuner;
+
+    tuner.index = 0;
+    ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
+    if(ret < IOCTL_SUCC) {
+        return FM_FAILURE;
+    }else {
+        freq = (tuner.rangehigh / TUNE_MULT);
+        return FM_SUCCESS;
+    }
+}
+
+int FmIoctlsInterface :: get_lowerband_limit
+(
+    UINT fd, ULINT &freq
+)
+{
+    int ret;
+    struct v4l2_tuner tuner;
+
+    tuner.index = 0;
+    ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
+    if(ret < IOCTL_SUCC) {
+        return FM_FAILURE;
+    }else {
+        freq = (tuner.rangelow / TUNE_MULT);
+        return FM_SUCCESS;
+    }
+}
+
+int FmIoctlsInterface :: set_audio_mode
+(
+    UINT fd, enum AUDIO_MODE mode
+)
+{
+    int ret;
+    struct v4l2_tuner tuner;
+
+    tuner.index = 0;
+    ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
+    if(ret < IOCTL_SUCC) {
+        return FM_FAILURE;
+    }else {
+        tuner.audmode = mode;
+        ret = ioctl(fd, VIDIOC_S_TUNER, &tuner);
+        if(ret < IOCTL_SUCC) {
+            return FM_FAILURE;
+        }else {
+            return FM_SUCCESS;
+        }
+    }
+}
+
+int FmIoctlsInterface :: get_buffer
+(
+     UINT fd, char *buff, UINT len, UINT index
+)
+{
+    int ret;
+    struct v4l2_buffer v4l2_buf;
+
+    if((len < STD_BUF_SIZE) || (buff == NULL)) {
+        return FM_FAILURE;
+    }else {
+        memset(&v4l2_buf, 0, sizeof(v4l2_buf));
+        v4l2_buf.index = index;
+        v4l2_buf.type = V4L2_BUF_TYPE_PRIVATE;
+        v4l2_buf.length = STD_BUF_SIZE;
+        v4l2_buf.m.userptr = (ULINT)buff;
+        ret = ioctl(fd, VIDIOC_DQBUF, &v4l2_buf);
+        if(ret < IOCTL_SUCC) {
+            return FM_FAILURE;
+        }else {
+            return v4l2_buf.bytesused;
+        }
+    }
+}
+
+int FmIoctlsInterface :: set_ext_control
+(
+    UINT fd,
+    struct v4l2_ext_controls *v4l2_ctls
+)
+{
+    int ret;
+
+    ret = ioctl(fd, VIDIOC_S_EXT_CTRLS, v4l2_ctls);
+
+    if(ret < IOCTL_SUCC) {
+       return FM_FAILURE;
+    }else {
+       return FM_SUCCESS;
+    }
+}
+
diff --git a/jni/FmIoctlsInterface.h b/jni/FmIoctlsInterface.h
new file mode 100644
index 0000000..eda28ee
--- /dev/null
+++ b/jni/FmIoctlsInterface.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef __FM_IOCTL_INTERFACE_H__
+#define __FM_IOCTL_INTERFACE_H__
+
+#include "FmConst.h"
+
+#include <linux/videodev2.h>
+
+class FmIoctlsInterface
+{
+    private:
+        static char const * const LOGTAG;
+    public:
+        static int start_fm_patch_dl(UINT fd);
+        static int close_fm_patch_dl(void);
+        static int get_cur_freq(UINT fd, long &freq);
+        static int set_freq(UINT fd, ULINT freq);
+        static int set_control(UINT fd, UINT id, int val);
+        static int set_calibration(UINT fd);
+        static int get_control(UINT fd, UINT id, long &val);
+        static int start_search(UINT fd, UINT dir);
+        static int set_band(UINT fd, ULINT low, ULINT high);
+        static int get_upperband_limit(UINT fd, ULINT &freq);
+        static int get_lowerband_limit(UINT fd, ULINT &freq);
+        static int set_audio_mode(UINT fd, enum AUDIO_MODE mode);
+        static int get_buffer(UINT fd, char *buff, UINT len, UINT index);
+        static int get_rmssi(UINT fd, long &rmssi);
+        static int set_ext_control(UINT fd, struct v4l2_ext_controls *v4l2_ctls);
+};
+
+//char const *FmIoctlsInterface::LOGTAG = "FmIoctlsInterface";
+
+#endif //__FM_IOCTL_INTERFACE_H__
diff --git a/jni/FmPerformanceParams.cpp b/jni/FmPerformanceParams.cpp
new file mode 100644
index 0000000..aa26a37
--- /dev/null
+++ b/jni/FmPerformanceParams.cpp
@@ -0,0 +1,421 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#include <cstdio>
+#include <linux/videodev2.h>
+#include <utils/Log.h>
+
+#include "FmPerformanceParams.h"
+#include "FmIoctlsInterface.h"
+
+signed char FmPerformanceParams :: SetAfRmssiTh
+(
+   UINT fd, unsigned short th
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_AF_RMSSI_TH, th);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetAfRmssiSamplesCnt
+(
+   UINT fd, unsigned char cnt
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_AF_RMSSI_SAMPLES, cnt);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetGoodChannelRmssiTh
+(
+   UINT fd, signed char th
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_GOOD_CH_RMSSI_TH, th);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetSrchAlgoType
+(
+   UINT fd, unsigned char algo
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_SRCHALGOTYPE, algo);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetSinrFirstStage
+(
+   UINT fd, signed char th
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_SINRFIRSTSTAGE, th);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetRmssiFirstStage
+(
+   UINT fd, signed char th
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_RMSSIFIRSTSTAGE, th);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetCf0Th12
+(
+   UINT fd, int th
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_CF0TH12, th);
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetSinrSamplesCnt
+(
+   UINT fd, unsigned char cnt
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_SINR_SAMPLES, cnt);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetIntfLowTh
+(
+   UINT fd, unsigned char th
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_ON_CHANNEL_THRESHOLD, th);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetIntfHighTh
+(
+   UINT fd, unsigned char th
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_OFF_CHANNEL_THRESHOLD, th);
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetSinrFinalStage
+(
+   UINT fd, signed char th
+)
+{
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::set_control(fd,
+                V4L2_CID_PRV_SINR_THRESHOLD, th);
+
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetAfRmssiTh
+(
+   UINT fd, unsigned short &th
+)
+{
+   long int af_rmssi_th;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_AF_RMSSI_TH, af_rmssi_th);
+   if(ret == FM_SUCCESS) {
+      th = af_rmssi_th;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetAfRmssiSamplesCnt
+(
+   UINT fd, unsigned char &cnt
+)
+{
+   long int af_samples_cnt;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_AF_RMSSI_SAMPLES, af_samples_cnt);
+   if(ret == FM_SUCCESS) {
+      cnt = af_samples_cnt;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetGoodChannelRmssiTh
+(
+   UINT fd, signed char &th
+)
+{
+   long int gd_chan_rmssi_th;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_GOOD_CH_RMSSI_TH, gd_chan_rmssi_th);
+   if(ret == FM_SUCCESS) {
+      th = gd_chan_rmssi_th;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetSrchAlgoType
+(
+   UINT fd, unsigned char &algo
+)
+{
+   long int srch_algo_type;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_SRCHALGOTYPE, srch_algo_type);
+   if(ret == FM_SUCCESS) {
+      algo = srch_algo_type;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetSinrFirstStage
+(
+   UINT fd, signed char &th
+)
+{
+   long int sinr_first_stage;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_SINRFIRSTSTAGE, sinr_first_stage);
+   if(ret == FM_SUCCESS) {
+      th = sinr_first_stage;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetRmssiFirstStage
+(
+   UINT fd, signed char &th
+)
+{
+   long int rmssi_first_stage;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_RMSSIFIRSTSTAGE, rmssi_first_stage);
+   if(ret == FM_SUCCESS) {
+      th = rmssi_first_stage;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetCf0Th12
+(
+   UINT fd, int &th
+)
+{
+   long int cf0th12;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_CF0TH12, cf0th12);
+   if(ret == FM_SUCCESS) {
+      th = cf0th12;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetSinrSamplesCnt
+(
+   UINT fd, unsigned char &cnt
+)
+{
+   long int sinr_samples_cnt;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_SINR_SAMPLES, sinr_samples_cnt);
+   if(ret == FM_SUCCESS) {
+      cnt = sinr_samples_cnt;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetIntfLowTh
+(
+   UINT fd, unsigned char &th
+)
+{
+   long int intf_low_th;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+               V4L2_CID_PRV_ON_CHANNEL_THRESHOLD, intf_low_th);
+   if(ret == FM_SUCCESS) {
+      th = intf_low_th;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetIntfHighTh
+(
+   UINT fd, unsigned char &th
+)
+{
+   long int intf_high_th;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+               V4L2_CID_PRV_OFF_CHANNEL_THRESHOLD, intf_high_th);
+   if(ret == FM_SUCCESS) {
+      th = intf_high_th;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: GetIntfDet
+(
+   UINT fd, unsigned char &th
+)
+{
+   long int int_det;
+   signed char ret = FM_FAILURE;
+
+   ret = FmIoctlsInterface::get_control(fd,
+               V4L2_CID_PRV_INTDET, int_det);
+   if(ret == FM_SUCCESS) {
+      th = int_det;
+   }
+   return ret;
+}
+signed char FmPerformanceParams :: GetSinrFinalStage
+(
+   UINT fd, signed char &th
+)
+{
+   signed char ret = FM_FAILURE;
+   long int sinr;
+
+   ret = FmIoctlsInterface::get_control(fd,
+                V4L2_CID_PRV_SINR_THRESHOLD, sinr);
+
+   if(ret == FM_SUCCESS) {
+      th = sinr;
+   }
+   return ret;
+}
+
+signed char FmPerformanceParams :: SetHybridSrchList
+(
+   UINT fd,
+   unsigned int *freqs,
+   signed char *sinrs,
+   unsigned int n
+)
+{
+   struct v4l2_ext_control ext_ctl;
+   struct v4l2_ext_controls v4l2_ctls;
+   unsigned int freq;
+   unsigned int size = 0;
+   char *data = NULL;
+   signed char ret = FM_FAILURE;
+
+   if(n <= 0) {
+      return ret;
+   }
+   data = new char[(n * 3 + 3)];
+
+   if(data != NULL) {
+      data[size++] = 0x40;
+      data[size++] = ((n * 3) + 1);
+      data[size++] = n;
+      while((size < (n * 3 + 2)) && (freqs != NULL)
+            && (sinrs != NULL)) {
+            freq = (*freqs - 76000) / 50;
+            data[size++] = (freq & 0xff);
+            data[size++] = ((freq >> 8) & 0xff);
+            data[size++] = *sinrs;
+            freqs++;
+            sinrs++;
+      }
+      if(size == (n * 3 + 3)) {
+         ext_ctl.id = V4L2_CID_PRV_IRIS_WRITE_DEFAULT;
+         ext_ctl.string = data;
+         ext_ctl.size = size;
+         v4l2_ctls.ctrl_class = V4L2_CTRL_CLASS_USER;
+         v4l2_ctls.count = 1;
+         v4l2_ctls.controls  = &ext_ctl;
+         ret =  FmIoctlsInterface::set_ext_control(fd, &v4l2_ctls);
+         if(ret == FM_SUCCESS) {
+            ALOGE("hybrid srch list sent successfully\n");
+         }else {
+            ALOGE("hybrid srch list setting failed\n");
+         }
+      }
+   }
+
+   delete []data;
+
+   return ret;
+}
diff --git a/jni/FmPerformanceParams.h b/jni/FmPerformanceParams.h
new file mode 100644
index 0000000..fd9ee52
--- /dev/null
+++ b/jni/FmPerformanceParams.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+#ifndef __FM_PERFORMANCE_PARAMS_H__
+#define __FM_PERFORMANCE_PARAMS_H__
+
+#include "FmConst.h"
+
+class FmPerformanceParams
+{
+      private:
+      public:
+          signed char SetAfRmssiTh(UINT fd, unsigned short th);
+          signed char SetAfRmssiSamplesCnt(UINT fd, unsigned char cnt);
+          signed char SetGoodChannelRmssiTh(UINT fd, signed char th);
+          signed char SetSrchAlgoType(UINT fd, unsigned char algo);
+          signed char SetSinrFirstStage(UINT fd, signed char th);
+          signed char SetRmssiFirstStage(UINT fd, signed char th);
+          signed char SetCf0Th12(UINT fd, int th);
+          signed char SetSinrSamplesCnt(UINT fd, unsigned char cnt);
+          signed char SetIntfLowTh(UINT fd, unsigned char th);
+          signed char SetIntfHighTh(UINT fd, unsigned char th);
+          signed char SetSinrFinalStage(UINT fd, signed char th);
+          signed char SetHybridSrchList(UINT fd, unsigned int *freqs, signed char *sinrs, unsigned int n);
+
+          signed char GetAfRmssiTh(UINT fd, unsigned short &th);
+          signed char GetAfRmssiSamplesCnt(UINT fd, unsigned char &cnt);
+          signed char GetGoodChannelRmssiTh(UINT fd, signed char &th);
+          signed char GetSrchAlgoType(UINT fd, unsigned char &algo);
+          signed char GetSinrFirstStage(UINT fd, signed char &th);
+          signed char GetRmssiFirstStage(UINT fd, signed char &th);
+          signed char GetCf0Th12(UINT fd, int &th);
+          signed char GetSinrSamplesCnt(UINT fd, unsigned char &cnt);
+          signed char GetIntfLowTh(UINT fd, unsigned char &th);
+          signed char GetIntfHighTh(UINT fd, unsigned char &th);
+          signed char GetIntfDet(UINT fd, unsigned char &th);
+          signed char GetSinrFinalStage(UINT fd, signed char &th);
+};
+
+#endif //__FM_PERFORMANCE_PARAMS_H__
diff --git a/jni/android_hardware_fm.cpp b/jni/android_hardware_fm.cpp
index 6809a27..bdaceae 100644
--- a/jni/android_hardware_fm.cpp
+++ b/jni/android_hardware_fm.cpp
@@ -41,13 +41,11 @@
 #include <dlfcn.h>
 #include "android_runtime/Log.h"
 #include "android_runtime/AndroidRuntime.h"
-#include "bt_configstore.h"
-#include <vector>
 #include "radio-helium.h"
+#include "FmIoctlsInterface.h"
+#include "ConfigFmThs.h"
 
-typedef  unsigned int UINT;
-typedef  unsigned long ULINT;
-#define STD_BUF_SIZE  256
+#define RADIO "/dev/radio0"
 #define FM_JNI_SUCCESS 0L
 #define FM_JNI_FAILURE -1L
 #define SEARCH_DOWN 0
@@ -74,68 +72,6 @@
 #define MASK_PTY                   (0x0000001F)
 #define MASK_TXREPCOUNT            (0x0000000F)
 
-enum FM_V4L2_PRV_CONTROLS
-{
-    V4L2_CID_PRV_BASE = 0x8000000,
-    V4L2_CID_PRV_SRCHMODE,
-    V4L2_CID_PRV_SCANDWELL,
-    V4L2_CID_PRV_SRCHON,
-    V4L2_CID_PRV_STATE,
-    V4L2_CID_PRV_TRANSMIT_MODE,
-    V4L2_CID_PRV_RDSGROUP_MASK,
-    V4L2_CID_PRV_REGION,
-    V4L2_CID_PRV_SIGNAL_TH,
-    V4L2_CID_PRV_SRCH_PTY,
-    V4L2_CID_PRV_SRCH_PI,
-    V4L2_CID_PRV_SRCH_CNT,
-    V4L2_CID_PRV_EMPHASIS,
-    V4L2_CID_PRV_RDS_STD,
-    V4L2_CID_PRV_CHAN_SPACING,
-    V4L2_CID_PRV_RDSON,
-    V4L2_CID_PRV_RDSGROUP_PROC,
-    V4L2_CID_PRV_LP_MODE,
-    V4L2_CID_PRV_INTDET = V4L2_CID_PRV_BASE + 25,
-    V4L2_CID_PRV_AF_JUMP = V4L2_CID_PRV_BASE + 27,
-    V4L2_CID_PRV_SOFT_MUTE = V4L2_CID_PRV_BASE + 30,
-    V4L2_CID_PRV_AUDIO_PATH = V4L2_CID_PRV_BASE + 41,
-    V4L2_CID_PRV_SINR = V4L2_CID_PRV_BASE + 44,
-    V4L2_CID_PRV_ON_CHANNEL_THRESHOLD = V4L2_CID_PRV_BASE + 0x2D,
-    V4L2_CID_PRV_OFF_CHANNEL_THRESHOLD,
-    V4L2_CID_PRV_SINR_THRESHOLD,
-    V4L2_CID_PRV_SINR_SAMPLES,
-    V4L2_CID_PRV_SPUR_FREQ,
-    V4L2_CID_PRV_SPUR_FREQ_RMSSI,
-    V4L2_CID_PRV_SPUR_SELECTION,
-    V4L2_CID_PRV_AF_RMSSI_TH = V4L2_CID_PRV_BASE + 0x36,
-    V4L2_CID_PRV_AF_RMSSI_SAMPLES,
-    V4L2_CID_PRV_GOOD_CH_RMSSI_TH,
-    V4L2_CID_PRV_SRCHALGOTYPE,
-    V4L2_CID_PRV_CF0TH12,
-    V4L2_CID_PRV_SINRFIRSTSTAGE,
-    V4L2_CID_PRV_RMSSIFIRSTSTAGE,
-    V4L2_CID_PRV_SOFT_MUTE_TH,
-    V4L2_CID_PRV_IRIS_RDSGRP_RT,
-    V4L2_CID_PRV_IRIS_RDSGRP_PS_SIMPLE,
-    V4L2_CID_PRV_IRIS_RDSGRP_AFLIST,
-    V4L2_CID_PRV_IRIS_RDSGRP_ERT,
-    V4L2_CID_PRV_IRIS_RDSGRP_RT_PLUS,
-    V4L2_CID_PRV_IRIS_RDSGRP_3A,
-
-    V4L2_CID_PRV_IRIS_READ_DEFAULT = V4L2_CTRL_CLASS_USER + 0x928,
-    V4L2_CID_PRV_IRIS_WRITE_DEFAULT,
-    V4L2_CID_PRV_SET_CALIBRATION = V4L2_CTRL_CLASS_USER + 0x92A,
-    HCI_FM_HELIUM_SET_SPURTABLE = 0x0098092D,
-    HCI_FM_HELIUM_GET_SPUR_TBL  = 0x0098092E,
-    V4L2_CID_PRV_IRIS_FREQ,
-    V4L2_CID_PRV_IRIS_SEEK,
-    V4L2_CID_PRV_IRIS_UPPER_BAND,
-    V4L2_CID_PRV_IRIS_LOWER_BAND,
-    V4L2_CID_PRV_IRIS_AUDIO_MODE,
-    V4L2_CID_PRV_IRIS_RMSSI,
-
-    V4L2_CID_PRV_ENABLE_SLIMBUS = 0x00980940,
-};
-
 enum search_dir_t {
     SEEK_UP,
     SEEK_DN,
@@ -143,25 +79,15 @@
     SCAN_DN
 };
 
-enum fm_prop_t {
-    FMWAN_RATCONF,
-    FMBTWLAN_LPFENABLER
-};
-
 static JavaVM *g_jVM = NULL;
 
 namespace android {
 
-char *FM_LIBRARY_NAME = "fm_helium.so";
-char *FM_LIBRARY_SYMBOL_NAME = "FM_HELIUM_LIB_INTERFACE";
+const char *FM_LIBRARY_NAME = "fm_helium.so";
+const char *FM_LIBRARY_SYMBOL_NAME = "FM_HELIUM_LIB_INTERFACE";
 void *lib_handle;
 static int slimbus_flag = 0;
 
-static char soc_name[16];
-bool isSocNameAvailable = false;
-static bt_configstore_interface_t* bt_configstore_intf = NULL;
-static void *bt_configstore_lib_handle = NULL;
-
 static JNIEnv *mCallbackEnv = NULL;
 static jobject mCallbacksObj = NULL;
 static bool mCallbacksObjCreated = false;
@@ -195,8 +121,6 @@
 jmethodID method_enableSoftMuteCallback;
 jmethodID method_FmReceiverJNICtor;
 
-int load_bt_configstore_lib();
-
 static bool checkCallbackThread() {
    JNIEnv* env = AndroidRuntime::getJNIEnv();
    if (mCallbackEnv != env || mCallbackEnv == NULL)
@@ -330,7 +254,6 @@
     }
 
     mCallbackEnv->SetByteArrayRegion(rt_buff, 0, len,(jbyte *)rt);
-    jbyte* bytes= mCallbackEnv->GetByteArrayElements(rt_buff,0);
 
     mCallbackEnv->CallVoidMethod(mCallbacksObj, method_rtCallback,rt_buff);
     mCallbackEnv->DeleteLocalRef(rt_buff);
@@ -355,7 +278,6 @@
     }
 
     mCallbackEnv->SetByteArrayRegion(ps_data, 0, len,(jbyte *)ps);
-    jbyte* bytes= mCallbackEnv->GetByteArrayElements(ps_data,0);
     mCallbackEnv->CallVoidMethod(mCallbacksObj, method_psInfoCallback,ps_data);
     mCallbackEnv->DeleteLocalRef(ps_data);
 }
@@ -434,12 +356,12 @@
 }
 
 
-void rds_grp_cntrs_rsp_cb(char * evt_buffer)
+void rds_grp_cntrs_rsp_cb(char * evt_buffer __unused)
 {
    ALOGD("rds_grp_cntrs_rsp_cb");
 }
 
-void rds_grp_cntrs_ext_rsp_cb(char * evt_buffer)
+void rds_grp_cntrs_ext_rsp_cb(char * evt_buffer __unused)
 {
    ALOGE("rds_grp_cntrs_ext_rsp_cb");
 }
@@ -454,19 +376,19 @@
     mCallbacksObjCreated = false;
 }
 
-void fm_peek_rsp_cb(char *peek_rsp) {
+void fm_peek_rsp_cb(char *peek_rsp __unused) {
     ALOGD("fm_peek_rsp_cb");
 }
 
-void fm_ssbi_peek_rsp_cb(char *ssbi_peek_rsp){
+void fm_ssbi_peek_rsp_cb(char *ssbi_peek_rsp __unused){
     ALOGD("fm_ssbi_peek_rsp_cb");
 }
 
-void fm_agc_gain_rsp_cb(char *agc_gain_rsp){
+void fm_agc_gain_rsp_cb(char *agc_gain_rsp __unused){
     ALOGE("fm_agc_gain_rsp_cb");
 }
 
-void fm_ch_det_th_rsp_cb(char *ch_det_rsp){
+void fm_ch_det_th_rsp_cb(char *ch_det_rsp __unused){
     ALOGD("fm_ch_det_th_rsp_cb");
 }
 
@@ -648,163 +570,393 @@
     fm_enable_softmute_cb
 };
 /* native interface */
-
-static void get_property(int ptype, char *value)
+static jint android_hardware_fmradio_FmReceiverJNI_acquireFdNative
+        (JNIEnv* env, jobject thiz __unused, jstring path)
 {
-    std::vector<vendor_property_t> vPropList;
-    bt_configstore_intf->get_vendor_properties(ptype, vPropList);
-
-    for (auto&& vendorProp : vPropList) {
-        if (vendorProp.type == ptype) {
-            strlcpy(value, vendorProp.value,PROPERTY_VALUE_MAX);
-        }
+    int fd;
+    int i = 0, err;
+    char value[PROPERTY_VALUE_MAX] = {'\0'};
+    char versionStr[40] = {'\0'};
+    int init_success = 0;
+    jboolean isCopy;
+    v4l2_capability cap;
+    const char* radio_path = env->GetStringUTFChars(path, &isCopy);
+    if(radio_path == NULL){
+        return FM_JNI_FAILURE;
     }
+    fd = open(radio_path, O_RDONLY);
+    if(isCopy == JNI_TRUE){
+        env->ReleaseStringUTFChars(path, radio_path);
+    }
+    if(fd < 0){
+        return FM_JNI_FAILURE;
+    }
+    //Read the driver verions
+    err = ioctl(fd, VIDIOC_QUERYCAP, &cap);
+
+    ALOGD("VIDIOC_QUERYCAP returns :%d: version: %d \n", err , cap.version );
+
+    if( err >= 0 ) {
+       ALOGD("Driver Version(Same as ChipId): %x \n",  cap.version );
+       /*Conver the integer to string */
+       snprintf(versionStr, sizeof(versionStr), "%d", cap.version);
+       property_set("vendor.hw.fm.version", versionStr);
+    } else {
+       close(fd);
+       return FM_JNI_FAILURE;
+    }
+
+    property_get("vendor.qcom.bluetooth.soc", value, NULL);
+
+    ALOGD("BT soc is %s\n", value);
+
+    if ((strcmp(value, "rome") != 0) && (strcmp(value, "hastings") != 0))
+    {
+       /*Set the mode for soc downloader*/
+       property_set("vendor.hw.fm.mode", "normal");
+       /* Need to clear the hw.fm.init firstly */
+       property_set("vendor.hw.fm.init", "0");
+       property_set("ctl.start", "vendor.fm");
+       sched_yield();
+       for(i=0; i<45; i++) {
+         property_get("vendor.hw.fm.init", value, NULL);
+         if (strcmp(value, "1") == 0) {
+            init_success = 1;
+            break;
+         } else {
+            usleep(WAIT_TIMEOUT);
+         }
+       }
+       ALOGE("init_success:%d after %f seconds \n", init_success, 0.2*i);
+       if(!init_success) {
+         property_set("ctl.stop", "vendor.fm");
+         // close the fd(power down)
+         close(fd);
+         return FM_JNI_FAILURE;
+       }
+    }
+    return fd;
 }
 
+/* native interface */
+static jint android_hardware_fmradio_FmReceiverJNI_closeFdNative
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd)
+{
+    char value[PROPERTY_VALUE_MAX] = {'\0'};
+
+    property_get("vendor.qcom.bluetooth.soc", value, NULL);
+
+    ALOGD("BT soc is %s\n", value);
+
+    if ((strcmp(value, "rome") != 0) && (strcmp(value, "hastings") != 0))
+    {
+        property_set("ctl.stop", "vendor.fm");
+    }
+    close(fd);
+    return FM_JNI_SUCCESS;
+}
+
+static bool is_soc_cherokee() {
+    char value[PROPERTY_VALUE_MAX] = {'\0'};
+    property_get("vendor.qcom.bluetooth.soc", value, NULL);
+    ALOGD("BT soc is %s\n", value);
+
+    if(strcmp(value, "cherokee") == 0)
+        return true;
+    else
+        return false;
+}
 /********************************************************************
  * Current JNI
  *******************************************************************/
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_getFreqNative
-    (JNIEnv * env, jobject thiz, jint fd)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused)
 {
     int err;
     long freq;
-
-    err = vendor_interface->get_fm_ctrl(V4L2_CID_PRV_IRIS_FREQ, (int *)&freq);
-    if (err == FM_JNI_SUCCESS) {
-        err = freq;
-    } else {
-        err = FM_JNI_FAILURE;
-        ALOGE("%s: get freq failed\n", LOG_TAG);
+    if (is_soc_cherokee())
+    {
+        err = vendor_interface->get_fm_ctrl(V4L2_CID_PRV_IRIS_FREQ, (int *)&freq);
+        if (err == FM_JNI_SUCCESS) {
+            err = freq;
+        } else {
+            err = FM_JNI_FAILURE;
+            ALOGE("%s: get freq failed\n", LOG_TAG);
+        }
+    }
+    else
+    {
+        if (fd >= 0) {
+            err = FmIoctlsInterface :: get_cur_freq(fd, freq);
+            if(err < 0) {
+               err = FM_JNI_FAILURE;
+               ALOGE("%s: get freq failed\n", LOG_TAG);
+            } else {
+               err = freq;
+            }
+        } else {
+            ALOGE("%s: get freq failed because fd is negative, fd: %d\n",
+                  LOG_TAG, fd);
+            err = FM_JNI_FAILURE;
+        }
     }
     return err;
 }
 
 /*native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_setFreqNative
-    (JNIEnv * env, jobject thiz, jint fd, jint freq)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused, jint freq)
 {
     int err;
-
-    err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_FREQ, freq);
-
+    if (is_soc_cherokee())
+    {
+        err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_FREQ, freq);
+    }
+    else
+    {
+        if ((fd >= 0) && (freq > 0)) {
+            err = FmIoctlsInterface :: set_freq(fd, freq);
+            if (err < 0) {
+                ALOGE("%s: set freq failed, freq: %d\n", LOG_TAG, freq);
+                err = FM_JNI_FAILURE;
+            } else {
+                err = FM_JNI_SUCCESS;
+            }
+        } else {
+            ALOGE("%s: set freq failed because either fd/freq is negative,\
+                   fd: %d, freq: %d\n", LOG_TAG, fd, freq);
+            err = FM_JNI_FAILURE;
+        }
+    }
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_setControlNative
-    (JNIEnv * env, jobject thiz, jint fd, jint id, jint value)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused, jint id,
+    jint value)
 {
     int err;
     ALOGE("id(%x) value: %x\n", id, value);
-
-    err = vendor_interface->set_fm_ctrl(id, value);
-
+    if (is_soc_cherokee())
+    {
+        err = vendor_interface->set_fm_ctrl(id, value);
+    }
+    else
+    {
+        if ((fd >= 0) && (id >= 0)) {
+            err = FmIoctlsInterface :: set_control(fd, id, value);
+            if (err < 0) {
+                ALOGE("%s: set control failed, id: %d\n", LOG_TAG, id);
+                err = FM_JNI_FAILURE;
+            } else {
+                err = FM_JNI_SUCCESS;
+            }
+        } else {
+            ALOGE("%s: set control failed because either fd/id is negavtive,\
+                   fd: %d, id: %d\n", LOG_TAG, fd, id);
+            err = FM_JNI_FAILURE;
+        }
+    }
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_getControlNative
-    (JNIEnv * env, jobject thiz, jint fd, jint id)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused, jint id)
 {
     int err;
     long val;
 
     ALOGE("id(%x)\n", id);
-    err = vendor_interface->get_fm_ctrl(id, (int *)&val);
-    if (err < 0) {
-        ALOGE("%s: get control failed, id: %d\n", LOG_TAG, id);
-        err = FM_JNI_FAILURE;
-    } else {
-        err = val;
+    if (is_soc_cherokee())
+    {
+        err = vendor_interface->get_fm_ctrl(id, (int *)&val);
+        if (err < 0) {
+            ALOGE("%s: get control failed, id: %d\n", LOG_TAG, id);
+            err = FM_JNI_FAILURE;
+        } else {
+            err = val;
+        }
     }
+    else
+    {
+        if ((fd >= 0) && (id >= 0)) {
+            err = FmIoctlsInterface :: get_control(fd, id, val);
+            if (err < 0) {
+                ALOGE("%s: get control failed, id: %d\n", LOG_TAG, id);
+                err = FM_JNI_FAILURE;
+            } else {
+                err = val;
+            }
+        } else {
+            ALOGE("%s: get control failed because either fd/id is negavtive,\
+                   fd: %d, id: %d\n", LOG_TAG, fd, id);
+            err = FM_JNI_FAILURE;
+        }
+    }
+
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_startSearchNative
-    (JNIEnv * env, jobject thiz, jint fd, jint dir)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused, jint dir)
 {
     int err;
-
-    err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_SEEK, dir);
-    if (err < 0) {
-        ALOGE("%s: search failed, dir: %d\n", LOG_TAG, dir);
-        err = FM_JNI_FAILURE;
-    } else {
-        err = FM_JNI_SUCCESS;
+    if (is_soc_cherokee())
+    {
+        err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_SEEK, dir);
+        if (err < 0) {
+            ALOGE("%s: search failed, dir: %d\n", LOG_TAG, dir);
+            err = FM_JNI_FAILURE;
+        } else {
+            err = FM_JNI_SUCCESS;
+        }
     }
-
+    else
+    {
+        if ((fd >= 0) && (dir >= 0)) {
+            ALOGD("startSearchNative: Issuing the VIDIOC_S_HW_FREQ_SEEK");
+            err = FmIoctlsInterface :: start_search(fd, dir);
+            if (err < 0) {
+                ALOGE("%s: search failed, dir: %d\n", LOG_TAG, dir);
+                err = FM_JNI_FAILURE;
+            } else {
+                err = FM_JNI_SUCCESS;
+            }
+        } else {
+            ALOGE("%s: search failed because either fd/dir is negative,\
+                   fd: %d, dir: %d\n", LOG_TAG, fd, dir);
+            err = FM_JNI_FAILURE;
+        }
+    }
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_cancelSearchNative
-    (JNIEnv * env, jobject thiz, jint fd)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused)
 {
     int err;
 
-    err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_SRCHON, 0);
-    if (err < 0) {
-        ALOGE("%s: cancel search failed\n", LOG_TAG);
-        err = FM_JNI_FAILURE;
-    } else {
-        err = FM_JNI_SUCCESS;
+    if (is_soc_cherokee())
+    {
+        err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_SRCHON, 0);
+        if (err < 0) {
+            ALOGE("%s: cancel search failed\n", LOG_TAG);
+            err = FM_JNI_FAILURE;
+        } else {
+            err = FM_JNI_SUCCESS;
+        }
     }
-
+    else
+    {
+        if (fd >= 0) {
+            err = FmIoctlsInterface :: set_control(fd, V4L2_CID_PRV_SRCHON, 0);
+            if (err < 0) {
+                ALOGE("%s: cancel search failed\n", LOG_TAG);
+                err = FM_JNI_FAILURE;
+            } else {
+                err = FM_JNI_SUCCESS;
+            }
+        } else {
+            ALOGE("%s: cancel search failed because fd is negative, fd: %d\n",
+                   LOG_TAG, fd);
+            err = FM_JNI_FAILURE;
+        }
+    }
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_getRSSINative
-    (JNIEnv * env, jobject thiz, jint fd)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused)
 {
     int err;
     long rmssi;
 
-    err = vendor_interface->get_fm_ctrl(V4L2_CID_PRV_IRIS_RMSSI, (int *)&rmssi);
-    if (err < 0) {
-        ALOGE("%s: Get Rssi failed", LOG_TAG);
-        err = FM_JNI_FAILURE;
-    } else {
-        err = FM_JNI_SUCCESS;
+    if (is_soc_cherokee())
+    {
+        err = vendor_interface->get_fm_ctrl(V4L2_CID_PRV_IRIS_RMSSI, (int *)&rmssi);
+        if (err < 0) {
+            ALOGE("%s: Get Rssi failed", LOG_TAG);
+            err = FM_JNI_FAILURE;
+        } else {
+            err = FM_JNI_SUCCESS;
+        }
     }
-
+    else
+    {
+        if (fd >= 0) {
+            err = FmIoctlsInterface :: get_rmssi(fd, rmssi);
+            if (err < 0) {
+                ALOGE("%s: get rmssi failed\n", LOG_TAG);
+                err = FM_JNI_FAILURE;
+            } else {
+                err = rmssi;
+            }
+        } else {
+            ALOGE("%s: get rmssi failed because fd is negative, fd: %d\n",
+                   LOG_TAG, fd);
+            err = FM_JNI_FAILURE;
+        }
+    }
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_setBandNative
-    (JNIEnv * env, jobject thiz, jint fd, jint low, jint high)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused, jint low,
+    jint high)
 {
     int err;
-
-    err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_UPPER_BAND, high);
-    if (err < 0) {
-        ALOGE("%s: set band failed, high: %d\n", LOG_TAG, high);
-        err = FM_JNI_FAILURE;
-        return err;
+    if (is_soc_cherokee())
+    {
+        err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_UPPER_BAND, high);
+        if (err < 0) {
+            ALOGE("%s: set band failed, high: %d\n", LOG_TAG, high);
+            err = FM_JNI_FAILURE;
+            return err;
+        }
+        err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_LOWER_BAND, low);
+        if (err < 0) {
+            ALOGE("%s: set band failed, low: %d\n", LOG_TAG, low);
+            err = FM_JNI_FAILURE;
+        } else {
+            err = FM_JNI_SUCCESS;
+        }
     }
-    err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_LOWER_BAND, low);
-    if (err < 0) {
-        ALOGE("%s: set band failed, low: %d\n", LOG_TAG, low);
-        err = FM_JNI_FAILURE;
-    } else {
-        err = FM_JNI_SUCCESS;
+    else
+    {
+        if ((fd >= 0) && (low >= 0) && (high >= 0)) {
+            err = FmIoctlsInterface :: set_band(fd, low, high);
+            if (err < 0) {
+                ALOGE("%s: set band failed, low: %d, high: %d\n",
+                       LOG_TAG, low, high);
+                err = FM_JNI_FAILURE;
+            } else {
+                err = FM_JNI_SUCCESS;
+            }
+        } else {
+            ALOGE("%s: set band failed because either fd/band is negative,\
+                   fd: %d, low: %d, high: %d\n", LOG_TAG, fd, low, high);
+            err = FM_JNI_FAILURE;
+        }
     }
-
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_getLowerBandNative
-    (JNIEnv * env, jobject thiz, jint fd)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd)
 {
     int err;
     ULINT freq;
-
+if (is_soc_cherokee())
+{
     err = vendor_interface->get_fm_ctrl(V4L2_CID_PRV_IRIS_LOWER_BAND, (int *)&freq);
     if (err < 0) {
         ALOGE("%s: get lower band failed\n", LOG_TAG);
@@ -812,17 +964,35 @@
     } else {
         err = freq;
     }
-
+    return err;
+}
+else
+{
+    if (fd >= 0) {
+        err = FmIoctlsInterface :: get_lowerband_limit(fd, freq);
+        if (err < 0) {
+            ALOGE("%s: get lower band failed\n", LOG_TAG);
+            err = FM_JNI_FAILURE;
+        } else {
+            err = freq;
+        }
+    } else {
+        ALOGE("%s: get lower band failed because fd is negative,\
+               fd: %d\n", LOG_TAG, fd);
+        err = FM_JNI_FAILURE;
+    }
+}
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_getUpperBandNative
-    (JNIEnv * env, jobject thiz, jint fd)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd)
 {
     int err;
     ULINT freq;
-
+if (is_soc_cherokee())
+{
     err = vendor_interface->get_fm_ctrl(V4L2_CID_PRV_IRIS_UPPER_BAND, (int *)&freq);
     if (err < 0) {
         ALOGE("%s: get upper band failed\n", LOG_TAG);
@@ -830,16 +1000,34 @@
     } else {
         err = freq;
     }
-
+    return err;
+}
+else
+{
+    if (fd >= 0) {
+        err = FmIoctlsInterface :: get_upperband_limit(fd, freq);
+        if (err < 0) {
+            ALOGE("%s: get lower band failed\n", LOG_TAG);
+            err = FM_JNI_FAILURE;
+        } else {
+            err = freq;
+        }
+    } else {
+        ALOGE("%s: get lower band failed because fd is negative,\
+               fd: %d\n", LOG_TAG, fd);
+        err = FM_JNI_FAILURE;
+    }
+}
     return err;
 }
 
 static jint android_hardware_fmradio_FmReceiverJNI_setMonoStereoNative
-    (JNIEnv * env, jobject thiz, jint fd, jint val)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd, jint val)
 {
 
     int err;
-
+if (is_soc_cherokee())
+{
     err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_IRIS_AUDIO_MODE, val);
     if (err < 0) {
         ALOGE("%s: set audio mode failed\n", LOG_TAG);
@@ -847,13 +1035,59 @@
     } else {
         err = FM_JNI_SUCCESS;
     }
+    return err;
+}
+else
+{
+    if (fd >= 0) {
+        err = FmIoctlsInterface :: set_audio_mode(fd, (enum AUDIO_MODE)val);
+        if (err < 0) {
+            err = FM_JNI_FAILURE;
+        } else {
+            err = FM_JNI_SUCCESS;
+        }
+    } else {
+        err = FM_JNI_FAILURE;
+    }
+}
+    return err;
+}
+
+
+/* native interface */
+static jint android_hardware_fmradio_FmReceiverJNI_getBufferNative
+    (JNIEnv * env, jobject thiz __unused, jint fd, jbyteArray buff, jint index)
+{
+    int err;
+    jboolean isCopy;
+    jbyte *byte_buffer = NULL;
+
+    if ((fd >= 0) && (index >= 0)) {
+        ALOGE("index: %d\n", index);
+        byte_buffer = env->GetByteArrayElements(buff, &isCopy);
+        err = FmIoctlsInterface :: get_buffer(fd,
+                                               (char *)byte_buffer,
+                                               STD_BUF_SIZE,
+                                               index);
+        if (err < 0) {
+            err = FM_JNI_FAILURE;
+        }
+        if (buff != NULL) {
+            ALOGE("Free the buffer\n");
+            env->ReleaseByteArrayElements(buff, byte_buffer, 0);
+            byte_buffer =  NULL;
+        }
+    } else {
+        err = FM_JNI_FAILURE;
+    }
 
     return err;
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_getRawRdsNative
- (JNIEnv * env, jobject thiz, jint fd, jbooleanArray buff, jint count)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd, jbooleanArray buff,
+    jint count)
 {
 
     return (read (fd, buff, count));
@@ -861,118 +1095,148 @@
 }
 
 static jint android_hardware_fmradio_FmReceiverJNI_configureSpurTable
-    (JNIEnv * env, jobject thiz, jint fd)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd)
 {
+    int err;
+
     ALOGD("->android_hardware_fmradio_FmReceiverJNI_configureSpurTable\n");
 
-    return FM_JNI_SUCCESS;
+    if (fd >= 0) {
+        err = FmIoctlsInterface :: set_control(fd,
+                                                V4L2_CID_PRIVATE_UPDATE_SPUR_TABLE,
+                                                0);
+        if (err < 0) {
+            err = FM_JNI_FAILURE;
+        } else {
+            err = FM_JNI_SUCCESS;
+        }
+    } else {
+        err = FM_JNI_FAILURE;
+    }
+
+    return err;
 }
 
 static jint android_hardware_fmradio_FmReceiverJNI_setPSRepeatCountNative
-    (JNIEnv * env, jobject thiz, jint fd, jint repCount)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd, jint repCount)
 {
+    int masked_ps_repeat_cnt;
+    int err;
 
     ALOGE("->android_hardware_fmradio_FmReceiverJNI_setPSRepeatCountNative\n");
 
-    return FM_JNI_SUCCESS;
+    if (fd >= 0) {
+        masked_ps_repeat_cnt = repCount & MASK_TXREPCOUNT;
+        err = FmIoctlsInterface :: set_control(fd,
+                                                V4L2_CID_PRIVATE_TAVARUA_TX_SETPSREPEATCOUNT,
+                                                masked_ps_repeat_cnt);
+        if (err < 0) {
+            err = FM_JNI_FAILURE;
+        } else {
+            err = FM_JNI_SUCCESS;
+        }
+    } else {
+        err = FM_JNI_FAILURE;
+    }
 
+    return err;
 }
 
 static jint android_hardware_fmradio_FmReceiverJNI_setTxPowerLevelNative
-    (JNIEnv * env, jobject thiz, jint fd, jint powLevel)
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd, jint powLevel)
 {
+    int err;
 
     ALOGE("->android_hardware_fmradio_FmReceiverJNI_setTxPowerLevelNative\n");
 
-    return FM_JNI_SUCCESS;
+    if (fd >= 0) {
+        err = FmIoctlsInterface :: set_control(fd,
+                                                V4L2_CID_TUNE_POWER_LEVEL,
+                                                powLevel);
+        if (err < 0) {
+            err = FM_JNI_FAILURE;
+        } else {
+            err = FM_JNI_SUCCESS;
+        }
+    } else {
+        err = FM_JNI_FAILURE;
+    }
+
+    return err;
+}
+
+static void android_hardware_fmradio_FmReceiverJNI_configurePerformanceParams
+    (JNIEnv * env __unused, jobject thiz __unused, jint fd)
+{
+
+     ConfigFmThs thsObj;
+
+     thsObj.SetRxSearchAfThs(FM_PERFORMANCE_PARAMS, fd);
 }
 
 /* native interface */
 static jint android_hardware_fmradio_FmReceiverJNI_setSpurDataNative
- (JNIEnv * env, jobject thiz, jint fd, jshortArray buff, jint count)
+    (JNIEnv * env, jobject thiz __unused, jint fd, jshortArray buff,
+    jint count)
 {
     ALOGE("entered JNI's setSpurDataNative\n");
+    int err, i = 0;
+    struct v4l2_ext_control ext_ctl;
+    struct v4l2_ext_controls v4l2_ctls;
+    uint8_t *data;
+    short *spur_data = env->GetShortArrayElements(buff, NULL);
+    if (spur_data == NULL) {
+        ALOGE("Spur data is NULL\n");
+        return FM_JNI_FAILURE;
+    }
+    data = (uint8_t *) malloc(count);
+    if (data == NULL) {
+        ALOGE("Allocation failed for data\n");
+        return FM_JNI_FAILURE;
+    }
+    for(i = 0; i < count; i++)
+        data[i] = (uint8_t) spur_data[i];
 
+    ext_ctl.id = V4L2_CID_PRIVATE_IRIS_SET_SPURTABLE;
+    ext_ctl.string = (char*)data;
+    ext_ctl.size = count;
+    v4l2_ctls.ctrl_class = V4L2_CTRL_CLASS_USER;
+    v4l2_ctls.count   = 1;
+    v4l2_ctls.controls  = &ext_ctl;
+
+    err = ioctl(fd, VIDIOC_S_EXT_CTRLS, &v4l2_ctls );
+    if (err < 0){
+        ALOGE("Set ioctl failed\n");
+        free(data);
+        return FM_JNI_FAILURE;
+    }
+    free(data);
     return FM_JNI_SUCCESS;
 }
 
 static jint android_hardware_fmradio_FmReceiverJNI_enableSlimbusNative
- (JNIEnv * env, jobject thiz, jint fd, jint val)
+ (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused, jint val)
 {
     ALOGD("%s: val = %d\n", __func__, val);
     int err = JNI_ERR;
+if (is_soc_cherokee()) {
     err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_ENABLE_SLIMBUS, val);
-
+}
     return err;
 }
 
-static jboolean android_hardware_fmradio_FmReceiverJNI_getFmStatsPropNative
- (JNIEnv* env)
-{
-    jboolean ret;
-    char value[PROPERTY_VALUE_MAX] = {'\0'};
-    get_property(FM_STATS_PROP, value);
-    if (!strncasecmp(value, "true", sizeof("true"))) {
-        ret = true;
-    } else {
-        ret = false;
-    }
-
-    return ret;
-}
-
-static jint android_hardware_fmradio_FmReceiverJNI_getFmCoexPropNative
-(JNIEnv * env, jobject thiz, jint fd, jint prop)
-{
-    jint ret;
-    int property = (int)prop;
-    char value[PROPERTY_VALUE_MAX] = {'\0'};
-
-    if (property == FMWAN_RATCONF) {
-        get_property(FM_PROP_WAN_RATCONF, value);
-    } else if (property == FMBTWLAN_LPFENABLER) {
-        get_property(FM_PROP_BTWLAN_LPFENABLER, value);
-    } else {
-        ALOGE("%s: invalid get property prop = %d\n", __func__, property);
-    }
-
-    ret = atoi(value);
-    ALOGI("%d:: ret  = %d",property, ret);
-    return ret;
-}
-
 static jint android_hardware_fmradio_FmReceiverJNI_enableSoftMuteNative
- (JNIEnv * env, jobject thiz, jint fd, jint val)
+ (JNIEnv * env __unused, jobject thiz __unused, jint fd __unused, jint val)
 {
     ALOGD("%s: val = %d\n", __func__, val);
     int err = JNI_ERR;
+if (is_soc_cherokee()) {
     err = vendor_interface->set_fm_ctrl(V4L2_CID_PRV_SOFT_MUTE, val);
-
+}
     return err;
 }
 
-static jstring android_hardware_fmradio_FmReceiverJNI_getSocNameNative
- (JNIEnv* env)
-{
-    ALOGI("%s, bt_configstore_intf: %p isSocNameAvailable: %d",
-        __FUNCTION__, bt_configstore_intf, isSocNameAvailable);
-
-    if (bt_configstore_intf != NULL && isSocNameAvailable == false) {
-       std::vector<vendor_property_t> vPropList;
-
-       bt_configstore_intf->get_vendor_properties(BT_PROP_SOC_TYPE, vPropList);
-       for (auto&& vendorProp : vPropList) {
-          if (vendorProp.type == BT_PROP_SOC_TYPE) {
-            strlcpy(soc_name, vendorProp.value, sizeof(soc_name));
-            isSocNameAvailable = true;
-            ALOGI("%s:: soc_name = %s",__func__, soc_name);
-          }
-       }
-    }
-    return env->NewStringUTF(soc_name);
-}
-
-static void classInitNative(JNIEnv* env, jclass clazz) {
+static void classInitNative(JNIEnv* env __unused, jclass clazz __unused) {
 
     ALOGI("ClassInit native called \n");
     jclass dataClass = env->FindClass("qcom/fmradio/FmReceiverJNI");
@@ -1026,7 +1290,8 @@
     lib_handle = NULL;
 }
 
-static void initNative(JNIEnv *env, jobject object) {
+static void initNative(JNIEnv *env __unused, jobject object __unused) {
+if (is_soc_cherokee()) {
     int status;
     ALOGI("Init native called \n");
 
@@ -1041,12 +1306,15 @@
     }
     mCallbacksObj = env->NewGlobalRef(object);
 }
+}
 
-static void cleanupNative(JNIEnv *env, jobject object) {
+static void cleanupNative(JNIEnv *env __unused, jobject object __unused) {
 
-    if (mCallbacksObj != NULL) {
-        env->DeleteGlobalRef(mCallbacksObj);
-        mCallbacksObj = NULL;
+    if (is_soc_cherokee()) {
+        if (mCallbacksObj != NULL) {
+            env->DeleteGlobalRef(mCallbacksObj);
+            mCallbacksObj = NULL;
+        }
     }
 }
 /*
@@ -1057,6 +1325,10 @@
         { "classInitNative", "()V", (void*)classInitNative},
         { "initNative", "()V", (void*)initNative},
         {"cleanupNative", "()V", (void *) cleanupNative},
+        { "acquireFdNative", "(Ljava/lang/String;)I",
+            (void*)android_hardware_fmradio_FmReceiverJNI_acquireFdNative},
+        { "closeFdNative", "(I)I",
+            (void*)android_hardware_fmradio_FmReceiverJNI_closeFdNative},
         { "getFreqNative", "(I)I",
             (void*)android_hardware_fmradio_FmReceiverJNI_getFreqNative},
         { "setFreqNative", "(II)I",
@@ -1077,6 +1349,8 @@
             (void*)android_hardware_fmradio_FmReceiverJNI_getLowerBandNative},
         { "getUpperBandNative", "(I)I",
             (void*)android_hardware_fmradio_FmReceiverJNI_getUpperBandNative},
+        { "getBufferNative", "(I[BI)I",
+            (void*)android_hardware_fmradio_FmReceiverJNI_getBufferNative},
         { "setMonoStereoNative", "(II)I",
             (void*)android_hardware_fmradio_FmReceiverJNI_setMonoStereoNative},
         { "getRawRdsNative", "(I[BI)I",
@@ -1089,75 +1363,22 @@
             (void*)android_hardware_fmradio_FmReceiverJNI_configureSpurTable},
         { "setSpurDataNative", "(I[SI)I",
             (void*)android_hardware_fmradio_FmReceiverJNI_setSpurDataNative},
+        { "configurePerformanceParams", "(I)V",
+             (void*)android_hardware_fmradio_FmReceiverJNI_configurePerformanceParams},
         { "enableSlimbus", "(II)I",
              (void*)android_hardware_fmradio_FmReceiverJNI_enableSlimbusNative},
         { "enableSoftMute", "(II)I",
              (void*)android_hardware_fmradio_FmReceiverJNI_enableSoftMuteNative},
-        {"getSocNameNative", "()Ljava/lang/String;",
-             (void*) android_hardware_fmradio_FmReceiverJNI_getSocNameNative},
-        {"getFmStatsPropNative", "()Z",
-             (void*) android_hardware_fmradio_FmReceiverJNI_getFmStatsPropNative},
-        { "getFmCoexPropNative", "(II)I",
-            (void*)android_hardware_fmradio_FmReceiverJNI_getFmCoexPropNative},
 };
 
 int register_android_hardware_fm_fmradio(JNIEnv* env)
 {
-        ALOGI("%s, bt_configstore_intf", __FUNCTION__, bt_configstore_intf);
-        if (bt_configstore_intf == NULL) {
-          load_bt_configstore_lib();
-        }
-
         return jniRegisterNativeMethods(env, "qcom/fmradio/FmReceiverJNI", gMethods, NELEM(gMethods));
 }
 
-int deregister_android_hardware_fm_fmradio(JNIEnv* env)
-{
-        if (bt_configstore_lib_handle) {
-            dlclose(bt_configstore_lib_handle);
-            bt_configstore_lib_handle = NULL;
-            bt_configstore_intf = NULL;
-        }
-        return 0;
-}
-
-int load_bt_configstore_lib() {
-    const char* sym = BT_CONFIG_STORE_INTERFACE_STRING;
-
-    bt_configstore_lib_handle = dlopen("libbtconfigstore.so", RTLD_NOW);
-    if (!bt_configstore_lib_handle) {
-        const char* err_str = dlerror();
-        ALOGE("%s:: failed to load Bt Config store library, error= %s",
-            __func__, (err_str) ? err_str : "error unknown");
-        goto error;
-    }
-
-    // Get the address of the bt_configstore_interface_t.
-    bt_configstore_intf = (bt_configstore_interface_t*)dlsym(bt_configstore_lib_handle, sym);
-    if (!bt_configstore_intf) {
-        ALOGE("%s:: failed to load symbol from bt config store library = %s",
-            __func__, sym);
-        goto error;
-    }
-
-    // Success.
-    ALOGI("%s::  loaded HAL: bt_configstore_interface_t = %p , bt_configstore_lib_handle= %p",
-        __func__, bt_configstore_intf, bt_configstore_lib_handle);
-    return 0;
-
-  error:
-    if (bt_configstore_lib_handle) {
-      dlclose(bt_configstore_lib_handle);
-      bt_configstore_lib_handle = NULL;
-      bt_configstore_intf = NULL;
-    }
-
-    return -EINVAL;
-}
-
 } // end namespace
 
-jint JNI_OnLoad(JavaVM *jvm, void *reserved)
+jint JNI_OnLoad(JavaVM *jvm, void *reserved __unused)
 {
     JNIEnv *e;
     int status;
@@ -1175,22 +1396,3 @@
     }
     return JNI_VERSION_1_6;
 }
-
-jint JNI_OnUnLoad(JavaVM *jvm, void *reserved)
-{
-    JNIEnv *e;
-    int status;
-    g_jVM = jvm;
-
-    ALOGI("FM : unLoading QCOMM FM-JNI");
-    if (jvm->GetEnv((void **)&e, JNI_VERSION_1_6)) {
-        ALOGE("JNI version mismatch error");
-        return JNI_ERR;
-    }
-
-    if ((status = android::deregister_android_hardware_fm_fmradio(e)) < 0) {
-        ALOGE("jni adapter service unregistration failure, status: %d", status);
-        return JNI_ERR;
-    }
-    return JNI_VERSION_1_6;
-}
diff --git a/qcom/fmradio/Android.bp b/qcom/fmradio/Android.bp
index 29817d8..c238b9f 100644
--- a/qcom/fmradio/Android.bp
+++ b/qcom/fmradio/Android.bp
@@ -5,7 +5,14 @@
 
 java_library {
     name: "qcom.fmradio",
+    provides_uses_lib: "qcom.fmradio",
     defaults: ["qcom.fmradio_defaults"],
     installable: true,
     srcs: ["**/*.java"],
 }
+
+prebuilt_etc {
+    name: "qcom.fmradio.xml",
+    src: "qcom.fmradio.xml",
+    sub_dir: "permissions",
+}
diff --git a/qcom/fmradio/FmReceiver.java b/qcom/fmradio/FmReceiver.java
index 48e4d11..4686d26 100644
--- a/qcom/fmradio/FmReceiver.java
+++ b/qcom/fmradio/FmReceiver.java
@@ -343,29 +343,30 @@
    private static final int SEARCH_MPXDCC = 0;
    private static final int SEARCH_SINR_INT = 1;
 
-   /**
-    * Fm Coex property type
-    */
-   private static final int WAN_RATCONF = 0;
-   private static final int BTWLAN_LPFENABLER = 1;
-
-
    public boolean isSmdTransportLayer() {
-       String chip = getSocName();
-       if (chip.equals("pronto"))
+       String chip = SystemProperties.get("vendor.qcom.bluetooth.soc","default");
+       if (chip.equals("default"))
            return true;
        else
            return false;
    }
 
    public static boolean isRomeChip() {
-       String chip = FmReceiverJNI.getSocNameNative();
+       String chip = SystemProperties.get("vendor.qcom.bluetooth.soc");
        if (chip.equals("rome"))
            return true;
        else
            return false;
    }
 
+   public static boolean isCherokeeChip() {
+       String chip = SystemProperties.get("vendor.qcom.bluetooth.soc");
+       if (chip.equals("cherokee"))
+           return true;
+       else
+           return false;
+   }
+
    public PhoneStateListener  mDataConnectionStateListener = new PhoneStateListener(){
         public void onDataConnectionStateChanged(int state, int networkType) {
               Log.d (TAG, "state: " + Integer.toString(state) +  " networkType: " + Integer.toString(networkType));
@@ -401,7 +402,7 @@
            if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) {
                int newState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
                        WifiManager.WIFI_STATE_UNKNOWN);
-               int mBtWlanLpf = getFmWanWlanCoexProp(BTWLAN_LPFENABLER);
+               int mBtWlanLpf = SystemProperties.getInt("persist.btwlan.lpfenabler", 0);
                if (newState == WifiManager.WIFI_STATE_ENABLED) {
                    Log.d (TAG, "enable LPF on wifi enabled " + newState);
                    if ((mBtWlanLpf & mIsWlanLpfEnabled) == mIsWlanLpfEnabled)
@@ -445,6 +446,7 @@
    public FmReceiver(){
       mControl = new FmRxControls();
       mRdsData = new FmRxRdsData (sFd);
+      mRxEvents = new FmRxEventListner();
    }
 
    /**
@@ -459,11 +461,79 @@
    public FmReceiver(String devicePath,
                      FmRxEvCallbacksAdaptor callback) throws InstantiationException {
       mControl = new FmRxControls();
+      mRxEvents = new FmRxEventListner();
 
       Log.e(TAG, "FmReceiver constructor");
       //registerClient(callback);
       mCallback = callback;
-      mFmReceiverJNI = new FmReceiverJNI(mCallback);
+      if (isCherokeeChip()) {
+          mFmReceiverJNI = new FmReceiverJNI(mCallback);
+      }
+   }
+
+
+   /*==============================================================
+   FUNCTION:  registerClient
+   ==============================================================*/
+   /**
+   *    Registers a callback for FM receiver event
+   *           notifications.
+   *    <p>
+   *    This is a synchronous command used to register for event
+   *    notifications from the FM receiver driver. Since the FM
+   *    driver performs some tasks asynchronously, this function
+   *    allows the client to receive information asynchronously.
+   *    <p>
+   *    When calling this function, the client must pass a callback
+   *    function which will be used to deliver asynchronous events.
+   *    The argument callback must be a non-NULL value.  If a NULL
+   *    value is passed to this function, the registration will
+   *    fail.
+   *    <p>
+   *    The client can choose which events will be sent from the
+   *    receiver driver by simply implementing functions for events
+   *    it wishes to receive.
+   *    <p>
+   *    @param callback the callbacks to handle the events
+   *                               events from the FM receiver.
+   *    @return true if Callback registered, false if Callback
+   *            registration failed.
+   *    <p>
+   *    @see #acquire
+   *    @see #unregisterClient
+   *
+   */
+   public boolean registerClient(FmRxEvCallbacks callback){
+      boolean status;
+      status = super.registerClient(callback);
+      /* Do Receiver Specific Stuff here.*/
+
+      return status;
+   }
+
+   /*==============================================================
+   FUNCTION:  unregisterClient
+   ==============================================================*/
+   /**
+   *    UnRegisters a client's event notification callback.
+   *
+   *    This is a synchronous command used to unregister a client's
+   *    event callback.
+   *    <p>
+   *    @return true Always returns true.
+   *    <p>
+   *    @see #acquire
+   *    @see #release
+   *    @see #registerClient
+   *
+   */
+   public boolean unregisterClient () {
+      boolean status;
+
+      status = super.unregisterClient();
+
+      /* Do Receiver Specific Stuff here.*/
+      return status;
    }
 
    /*==============================================================
@@ -531,6 +601,10 @@
       status = super.enable(configSettings, FmTransceiver.FM_RX);
 
       if (status == true ) {
+          if (!isCherokeeChip()) {
+              /* Do Receiver Specific Enable Stuff here.*/
+              status = registerClient(mCallback);
+          }
           mRdsData = new FmRxRdsData(sFd);
           registerDataConnectionStateListener(app_context);
           app_context.registerReceiver(mReceiver, mIntentFilter);
@@ -591,6 +665,10 @@
       setFMPowerState(FMState_Turned_Off);
       Log.v(TAG, "reset: NEW-STATE : FMState_Turned_Off");
 
+      status = unregisterClient();
+
+      release("/dev/radio0");
+
       return status;
    }
 
@@ -1491,7 +1569,11 @@
       int piLower = 0;
       int piHigher = 0;
 
-      buff = FmReceiverJNI.getPsBuffer(buff);
+      if(isCherokeeChip()) {
+          buff = FmReceiverJNI.getPsBuffer(buff);
+      }
+      else
+          FmReceiverJNI.getBufferNative(sFd, buff, 3);
 
       /* byte is signed ;(
       *  knock down signed bits
@@ -1544,8 +1626,12 @@
       int piLower = 0;
       int piHigher = 0;
 
-      buff = FmReceiverJNI.getPsBuffer(buff);
-
+      if (isCherokeeChip()) {
+          buff = FmReceiverJNI.getPsBuffer(buff);
+      }
+      else {
+          FmReceiverJNI.getBufferNative(sFd, buff, 2);
+      }
       String rdsStr = new String(buff);
       /* byte is signed ;(
       *  knock down signed bit
@@ -1572,10 +1658,15 @@
       int bytes_read;
       String rt = "";
       int rt_len;
-      int i, j = 2;
+      int i, count, avail_tag_num = 0;
       byte tag_code, tag_len, tag_start_pos;
-      rt_plus = FmReceiverJNI.getPsBuffer(rt_plus);
-
+      if (isCherokeeChip()) {
+          rt_plus = FmReceiverJNI.getPsBuffer(rt_plus);
+      }
+      else
+      {
+          bytes_read = FmReceiverJNI.getBufferNative(sFd, rt_plus, BUF_RTPLUS);
+      }
       bytes_read = rt_plus[0];
       if (bytes_read > 0) {
           if (rt_plus[RT_OR_ERT_IND] == 0)
@@ -1585,14 +1676,20 @@
           if ((rt != "") && (rt != null)) {
               rt_len = rt.length();
               mRdsData.setTagNums(0);
-              for (i = 1; (i <= 2) && (j < rt_plus[LEN_IND]); i++) {
-                  tag_code = rt_plus[j++];
-                  tag_start_pos = rt_plus[j++];
-                  tag_len = rt_plus[j++];
+              avail_tag_num = (rt_plus[LEN_IND] - 2)/3;
+              if (avail_tag_num > 2) {
+                  avail_tag_num = 2;
+              }
+              count = 1;
+              for (i = 0; i < avail_tag_num; i++) {
+                  tag_code = rt_plus[2+3*i];
+                  tag_start_pos = rt_plus[3+3*i];
+                  tag_len = rt_plus[4+3*i];
                   if (((tag_len + tag_start_pos) <= rt_len) && (tag_code > 0)) {
                       mRdsData.setTagValue(rt.substring(tag_start_pos,
-                                            (tag_len + tag_start_pos)), i);
-                      mRdsData.setTagCode(tag_code, i);
+                                            (tag_len + tag_start_pos)), count);
+                      mRdsData.setTagCode(tag_code, count);
+                      count++;
                   }
               }
           } else {
@@ -1612,8 +1709,14 @@
       String encoding_type = "UCS-2";
       int bytes_read;
 
-      raw_ert = FmReceiverJNI.getPsBuffer(raw_ert);
-
+      if(isCherokeeChip())
+      {
+         raw_ert = FmReceiverJNI.getPsBuffer(raw_ert);
+      }
+      else
+      {
+         bytes_read = FmReceiverJNI.getBufferNative(sFd, raw_ert, BUF_ERT);
+      }
       bytes_read = raw_ert[0];
       if (bytes_read > 0) {
           ert_text = new byte[raw_ert[LEN_IND]];
@@ -1680,29 +1783,58 @@
       int  [] AfList = new int [50];
       int lowerBand, i;
       int tunedFreq, PI, size_AFLIST;
+      if (isCherokeeChip()) {
+          buff = FmReceiverJNI.getPsBuffer(buff);
+      }
+      else
+      {
+          FmReceiverJNI.getBufferNative(sFd, buff, TAVARUA_BUF_AF_LIST);
+      }
+      if (isSmdTransportLayer() || isRomeChip() || isCherokeeChip()) {
+          Log.d(TAG, "SMD transport layer or Rome chip");
 
-      buff = FmReceiverJNI.getPsBuffer(buff);
+          tunedFreq = (buff[0] & 0xFF) |
+                      ((buff[1] & 0xFF) << 8) |
+                      ((buff[2] & 0xFF) << 16) |
+                      ((buff[3] & 0xFF) << 24) ;
+          Log.d(TAG, "tunedFreq = " +tunedFreq);
 
-      tunedFreq = (buff[0] & 0xFF) |
-                  ((buff[1] & 0xFF) << 8) |
-                  ((buff[2] & 0xFF) << 16) |
-                  ((buff[3] & 0xFF) << 24) ;
-      Log.d(TAG, "tunedFreq = " +tunedFreq);
-       PI = (buff[4] & 0xFF) |
-           ((buff[5] & 0xFF) << 8);
-      Log.d(TAG, "PI: " + PI);
-       size_AFLIST = buff[6] & 0xFF;
-      Log.d(TAG, "size_AFLIST : " +size_AFLIST);
+          PI = (buff[4] & 0xFF) |
+               ((buff[5] & 0xFF) << 8);
+          Log.d(TAG, "PI: " + PI);
 
-      for (i = 0;i < size_AFLIST;i++) {
-            AfList[i] = (buff[6 + i * 4 + 1] & 0xFF) |
-                       ((buff[6 + i * 4 + 2] & 0xFF) << 8) |
-                       ((buff[6 + i * 4 + 3] & 0xFF) << 16) |
-                       ((buff[6 + i * 4 + 4] & 0xFF) << 24) ;
-            Log.d(TAG, "AF: " + AfList[i]);
+          size_AFLIST = buff[6] & 0xFF;
+          Log.d(TAG, "size_AFLIST : " +size_AFLIST);
+
+          for (i = 0;i < size_AFLIST;i++) {
+                AfList[i] = (buff[6 + i * 4 + 1] & 0xFF) |
+                           ((buff[6 + i * 4 + 2] & 0xFF) << 8) |
+                           ((buff[6 + i * 4 + 3] & 0xFF) << 16) |
+                           ((buff[6 + i * 4 + 4] & 0xFF) << 24) ;
+                Log.d(TAG, "AF: " + AfList[i]);
+          }
+      } else {
+
+          if ((buff[4] <= 0) || (buff[4] > 25))
+              return null;
+
+          lowerBand = FmReceiverJNI.getLowerBandNative(sFd);
+          Log.d (TAG, "Low band " + lowerBand);
+
+          Log.d (TAG, "AF_buff 0: " + (buff[0] & 0xff));
+          Log.d (TAG, "AF_buff 1: " + (buff[1] & 0xff));
+          Log.d (TAG, "AF_buff 2: " + (buff[2] & 0xff));
+          Log.d (TAG, "AF_buff 3: " + (buff[3] & 0xff));
+          Log.d (TAG, "AF_buff 4: " + (buff[4] & 0xff));
+
+          for (i=0; i<buff[4]; i++) {
+               AfList[i] = ((buff[i+4] & 0xFF) * 1000) + lowerBand;
+               Log.d (TAG, "AF : " + AfList[i]);
+          }
       }
 
       return AfList;
+
    }
 
    /*==============================================================
@@ -2271,6 +2403,39 @@
    }
 
    /*==============================================================
+   FUNCTION:  getStationList
+   ==============================================================*/
+   /**
+   *    Returns a frequency List of the searched stations.
+   *
+   *    <p>
+   *    This method retreives the results of the {@link
+   *    #searchStationList}. This method should be called when the
+   *    FmRxEvSearchListComplete is invoked.
+   *
+   *    <p>
+   *    @return      An array of integers that corresponds to the
+   *                    frequency of the searched Stations
+   *    @see #searchStationList
+   */
+   public int[] getStationList ()
+   {
+      int state = getFMState();
+      /* Check current state of FM device */
+      if (state == FMState_Turned_Off || state == FMState_Srch_InProg) {
+          Log.d(TAG, "getStationList: Device currently busy in executing another command.");
+          return null;
+      }
+      int[] stnList = new int [100];
+
+      stnList = mControl.stationList (sFd);
+
+      return stnList;
+
+   }
+
+
+   /*==============================================================
    FUNCTION:  getRssi
    ==============================================================*/
    /**
@@ -2763,8 +2928,40 @@
        return retval;
    }
 
+   public static void getSpurTableData()
+   {
+     int freq;
+     byte no_of_spurs;
+     int rotation_value;
+     byte lsbOfLen;
+     byte filterCoe;
+     byte isEnbale;
+     byte [] buff = new byte[STD_BUF_SIZE];
+     int i = 0;
+     FmReceiverJNI.getBufferNative(sFd, buff, 13);
+
+     freq = buff[0] & 0xFF;
+     freq |= ((buff[1] & 0xFF) << 8);
+     freq |= ((buff[2] & 0xFF) << 16);
+     Log.d (TAG, "freq = " +freq);
+     no_of_spurs =  buff[3];
+     Log.d (TAG, "no_of_spurs = " + no_of_spurs);
+     for(i = 0; i < FmConfig.no_Of_Spurs_For_Entry; i++) {
+         rotation_value =  buff[(i * 4) + 4] & 0xFF;
+         rotation_value |= ((buff[(i * 4) + 5] & 0xFF) << 8);
+         rotation_value |= ((buff[(i * 4) + 6] & 0x0F) << 12);
+         Log.d (TAG, "rotation_value = " +rotation_value);
+         lsbOfLen = (byte) (((buff[(i * 4) + 6] & 0xF0) >> 4) & 0x01);
+         Log.d (TAG, "lsbOfLen = "+lsbOfLen);
+         filterCoe = (byte) (((buff[(i * 4) + 6] & 0xF0) >> 5) & 0x03);
+         Log.d (TAG, "filterCoe = " +filterCoe);
+         isEnbale = (byte) (((buff[(i * 4) + 6] & 0xF0) >> 7) & 0x01);
+         Log.d (TAG, "spur level: " +buff[(i * 4) + 7]);
+     }
+     return;
+   }
    public void FMcontrolLowPassFilter(int state, int net_type, int enable) {
-       int RatConf = getFmWanWlanCoexProp(WAN_RATCONF);
+       int RatConf = SystemProperties.getInt("persist.fm_wan.ratconf", 0);
        Log.v (TAG, "FMcontrolLowPassFilter " + RatConf);
        switch (net_type)
        {
@@ -2897,16 +3094,4 @@
        Log.d(TAG, "enableSoftMute :enable =" + enable);
        mControl.enableSoftMute(sFd, enable);
    }
-
-   public String getSocName() {
-     return FmReceiverJNI.getSocNameNative();
-   }
-
-   public boolean getFmStatsProp() {
-     return FmReceiverJNI.getFmStatsPropNative();
-   }
-
-   public int getFmWanWlanCoexProp(int property) {
-     return FmReceiverJNI.getFmCoexPropNative(sFd, property);
-   }
 }
diff --git a/qcom/fmradio/FmReceiverJNI.java b/qcom/fmradio/FmReceiverJNI.java
index 298ed07..7329bb3 100644
--- a/qcom/fmradio/FmReceiverJNI.java
+++ b/qcom/fmradio/FmReceiverJNI.java
@@ -319,6 +319,8 @@
         Log.d(TAG, "FmReceiverJNI constructor called");
     }
 
+    static native int acquireFdNative(String path);
+
     /**
      * native method:
      * @param fd
@@ -338,6 +340,15 @@
     static native int cancelSearchNative(int fd);
 
     /**
+     * native method: release control of device
+     * @param fd file descriptor of device
+     * @return May return
+     *             {@link #FM_JNI_SUCCESS}
+     *             {@link #FM_JNI_FAILURE}
+     */
+    static native int closeFdNative(int fd);
+
+    /**
      * native method: get frequency
      * @param fd file descriptor of device
      * @return Returns frequency in int form
@@ -383,6 +394,16 @@
     static native int startSearchNative (int fd, int dir);
 
     /**
+     * native method: get buffer
+     * @param fd file descriptor of device
+     * @param buff[] buffer
+     * @param index index of the buffer to be retrieved
+     * @return {@link #FM_JNI_SUCCESS}
+     *         {@link #FM_JNI_FAILURE}
+     */
+    static native int getBufferNative (int fd, byte  buff[], int index);
+
+    /**
      * native method: get RSSI value of the
      *                received signal
      * @param fd file descriptor of device
@@ -468,9 +489,7 @@
      *         {@link #FM_JNI_FAILURE}
      */
     static native int setSpurDataNative(int fd, short  buff[], int len);
+    static native void configurePerformanceParams(int fd);
     static native int enableSlimbus(int fd, int val);
     static native int enableSoftMute(int fd, int val);
-    static native String getSocNameNative();
-    static native boolean getFmStatsPropNative();
-    static native int getFmCoexPropNative(int fd, int property);
 }
diff --git a/qcom/fmradio/FmRxControls.java b/qcom/fmradio/FmRxControls.java
index 1891ece..c67b7e4 100644
--- a/qcom/fmradio/FmRxControls.java
+++ b/qcom/fmradio/FmRxControls.java
@@ -123,11 +123,12 @@
          Log.d(TAG,"setControlNative faile" + V4L2_CID_PRIVATE_TAVARUA_STATE);
          return re;
       }
-      boolean ret = enableSoftMute(fd,ENABLE_SOFT_MUTE);
-      if(false == ret) {
-          Log.d(TAG,"enableSoftMute failed");
+      if (FmReceiver.isCherokeeChip()) {
+          boolean ret = enableSoftMute(fd,ENABLE_SOFT_MUTE);
+          if(false == ret) {
+              Log.d(TAG,"enableSoftMute failed");
+          }
       }
-
       setAudioPath(fd, false);
       return re;
    }
@@ -438,6 +439,69 @@
 
    }
 
+   /* Read search list from buffer */
+   public int[] stationList (int fd)
+   {
+         int freq = 0;
+         int i=0, j = 0;
+         int station_num = 0;
+         float real_freq = 0;
+         int [] stationList;
+         byte [] sList = new byte[100];
+         int tmpFreqByte1=0;
+         int tmpFreqByte2=0;
+         float lowBand, highBand;
+
+
+         lowBand  = (float) (FmReceiverJNI.getLowerBandNative(fd) / 1000.00);
+         highBand = (float) (FmReceiverJNI.getUpperBandNative(fd) / 1000.00);
+
+         Log.d(TAG, "lowBand: " + lowBand);
+         Log.d(TAG, "highBand: " + highBand);
+
+         FmReceiverJNI.getBufferNative(fd, sList, 0);
+
+         if ((int)sList[0] >0) {
+            station_num = (int)sList[0];
+         }
+         stationList = new int[station_num+1];
+         Log.d(TAG, "station_num: " + station_num);
+
+         for (i=0;i<station_num;i++) {
+            freq = 0;
+            Log.d(TAG, " Byte1 = " + sList[i*2+1]);
+            Log.d(TAG, " Byte2 = " + sList[i*2+2]);
+            tmpFreqByte1 = sList[i*2+1] & 0xFF;
+            tmpFreqByte2 = sList[i*2+2] & 0xFF;
+            Log.d(TAG, " tmpFreqByte1 = " + tmpFreqByte1);
+            Log.d(TAG, " tmpFreqByte2 = " + tmpFreqByte2);
+            freq = (tmpFreqByte1 & 0x03) << 8;
+            freq |= tmpFreqByte2;
+            Log.d(TAG, " freq: " + freq);
+            real_freq  = (float)(freq * 50) + (lowBand * FREQ_MUL);//tuner.rangelow * FREQ_MUL;
+            Log.d(TAG, " real_freq: " + real_freq);
+            if ( (real_freq < (lowBand * FREQ_MUL)) || (real_freq > (highBand * FREQ_MUL)) ) {
+               Log.e(TAG, "Frequency out of band limits");
+            }
+            else {
+               stationList[j] = (int)(real_freq);
+               Log.d(TAG, " stationList: " + stationList[j]);
+               j++;
+            }
+         }
+
+        try {
+          // mark end of list
+           stationList[station_num] = 0;
+        }
+        catch (ArrayIndexOutOfBoundsException e) {
+           Log.d(TAG, "ArrayIndexOutOfBoundsException !!");
+        }
+
+        return stationList;
+
+   }
+
 
    /* configure various search parameters and start search */
    public int searchStations (int fd, int mode, int dwell,
diff --git a/qcom/fmradio/FmRxEventListner.java b/qcom/fmradio/FmRxEventListner.java
new file mode 100644
index 0000000..c178f17
--- /dev/null
+++ b/qcom/fmradio/FmRxEventListner.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2009,2012-2014, 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.
+ */
+
+package qcom.fmradio;
+import qcom.fmradio.FmReceiver;
+import qcom.fmradio.FmTransceiver;
+import java.util.Arrays;
+import android.util.Log;
+
+
+class FmRxEventListner {
+
+    private final int EVENT_LISTEN = 1;
+
+    private final int STD_BUF_SIZE = 256;
+
+    private enum FmRxEvents {
+      READY_EVENT,
+      TUNE_EVENT,
+      SEEK_COMPLETE_EVENT,
+      SCAN_NEXT_EVENT,
+      RAW_RDS_EVENT,
+      RT_EVENT,
+      PS_EVENT,
+      ERROR_EVENT,
+      BELOW_TH_EVENT,
+      ABOVE_TH_EVENT,
+      STEREO_EVENT,
+      MONO_EVENT,
+      RDS_AVAL_EVENT,
+      RDS_NOT_AVAL_EVENT,
+      TAVARUA_EVT_NEW_SRCH_LIST,
+      TAVARUA_EVT_NEW_AF_LIST
+    }
+
+    private Thread mThread;
+    private static final String TAG = "FMRadio";
+
+    public void startListner (final int fd, final FmRxEvCallbacks cb) {
+        /* start a thread and listen for messages */
+        mThread = new Thread(){
+            public void run(){
+                byte [] buff = new byte[STD_BUF_SIZE];
+                Log.d(TAG, "Starting listener " + fd);
+
+                while ((!Thread.currentThread().isInterrupted())) {
+
+                    try {
+                        int index = 0;
+                        int state = 0;
+                        Arrays.fill(buff, (byte)0x00);
+                        int freq = 0;
+                        int eventCount = FmReceiverJNI.getBufferNative (fd, buff, EVENT_LISTEN);
+
+                        if (eventCount >= 0)
+                            Log.d(TAG, "Received event. Count: " + eventCount);
+
+                        for (  index = 0; index < eventCount; index++ ) {
+                            Log.d(TAG, "Received <" +buff[index]+ ">" );
+
+                            switch(buff[index]){
+                            case 0:
+                                Log.d(TAG, "Got READY_EVENT");
+                                if(FmTransceiver.getFMPowerState() == FmTransceiver.subPwrLevel_FMRx_Starting) {
+                                    /*Set the state as FMRxOn */
+                                    FmTransceiver.setFMPowerState(FmTransceiver.FMState_Rx_Turned_On);
+                                    Log.v(TAG, "RxEvtList: CURRENT-STATE : FMRxStarting ---> NEW-STATE : FMRxOn");
+                                    cb.FmRxEvEnableReceiver();
+                                    FmReceiverJNI.configurePerformanceParams(fd);
+                                }
+                                else if (FmTransceiver.getFMPowerState() == FmTransceiver.subPwrLevel_FMTurning_Off) {
+                                    /*Set the state as FMOff */
+                                    FmTransceiver.setFMPowerState(FmTransceiver.FMState_Turned_Off);
+                                    Log.v(TAG, "RxEvtList: CURRENT-STATE : FMTurningOff ---> NEW-STATE : FMOff");
+                                    FmTransceiver.release("/dev/radio0");
+                                    cb.FmRxEvDisableReceiver();
+                                    Thread.currentThread().interrupt();
+                                }
+                                break;
+                            case 1:
+                                Log.d(TAG, "Got TUNE_EVENT");
+                                freq = FmReceiverJNI.getFreqNative(fd);
+                                state = FmReceiver.getSearchState();
+                                switch(state) {
+                                   case FmTransceiver.subSrchLevel_SrchAbort:
+                                        Log.v(TAG, "Current state is SRCH_ABORTED");
+                                        Log.v(TAG, "Aborting on-going search command...");
+                                        /* intentional fall through */
+                                   case FmTransceiver.subSrchLevel_SeekInPrg :
+                                        Log.v(TAG, "Current state is " + state);
+                                        FmReceiver.setSearchState(FmTransceiver.subSrchLevel_SrchComplete);
+                                        Log.v(TAG, "RxEvtList: CURRENT-STATE : Search ---> NEW-STATE : FMRxOn");
+                                        cb.FmRxEvSearchComplete(freq);
+                                        break;
+                                   default:
+                                        if (freq > 0)
+                                            cb.FmRxEvRadioTuneStatus(freq);
+                                        else
+                                            Log.e(TAG, "get frequency command failed");
+                                        break;
+                                }
+                                break;
+                            case 2:
+                                Log.d(TAG, "Got SEEK_COMPLETE_EVENT");
+                                state = FmReceiver.getSearchState();
+                                switch(state) {
+                                   case FmTransceiver.subSrchLevel_ScanInProg:
+                                      Log.v(TAG, "Current state is " + state);
+                                      FmReceiver.setSearchState(FmTransceiver.subSrchLevel_SrchComplete);
+                                      Log.v(TAG, "RxEvtList: CURRENT-STATE : Search ---> NEW-STATE :FMRxOn");
+                                      cb.FmRxEvSearchComplete(FmReceiverJNI.getFreqNative(fd));
+                                      break;
+                                   case FmTransceiver.subSrchLevel_SrchAbort:
+                                      Log.v(TAG, "Current state is SRCH_ABORTED");
+                                      Log.v(TAG, "Aborting on-going search command...");
+                                      FmReceiver.setSearchState(FmTransceiver.subSrchLevel_SrchComplete);
+                                      Log.v(TAG, "RxEvtList: CURRENT-STATE : Search ---> NEW-STATE : FMRxOn");
+                                      cb.FmRxEvSearchComplete(FmReceiverJNI.getFreqNative(fd));
+                                      break;
+                                }
+                                break;
+                            case 3:
+                                Log.d(TAG, "Got SCAN_NEXT_EVENT");
+                                cb.FmRxEvSearchInProgress();
+                                break;
+                            case 4:
+                                Log.d(TAG, "Got RAW_RDS_EVENT");
+                                cb.FmRxEvRdsGroupData();
+                                break;
+                            case 5:
+                                Log.d(TAG, "Got RT_EVENT");
+                                cb.FmRxEvRdsRtInfo();
+                                break;
+                            case 6:
+                                Log.d(TAG, "Got PS_EVENT");
+                                cb.FmRxEvRdsPsInfo();
+                                break;
+                            case 7:
+                                Log.d(TAG, "Got ERROR_EVENT");
+                                break;
+                            case 8:
+                                Log.d(TAG, "Got BELOW_TH_EVENT");
+                                cb.FmRxEvServiceAvailable (false);
+                                break;
+                            case 9:
+                                Log.d(TAG, "Got ABOVE_TH_EVENT");
+                                cb.FmRxEvServiceAvailable(true);
+                                break;
+                            case 10:
+                                Log.d(TAG, "Got STEREO_EVENT");
+                                cb.FmRxEvStereoStatus (true);
+                                break;
+                            case 11:
+                                Log.d(TAG, "Got MONO_EVENT");
+                                cb.FmRxEvStereoStatus (false);
+                                break;
+                            case 12:
+                                Log.d(TAG, "Got RDS_AVAL_EVENT");
+                                cb.FmRxEvRdsLockStatus (true);
+                                break;
+                            case 13:
+                                Log.d(TAG, "Got RDS_NOT_AVAL_EVENT");
+                                cb.FmRxEvRdsLockStatus (false);
+                                break;
+                            case 14:
+                                Log.d(TAG, "Got NEW_SRCH_LIST");
+                                state = FmReceiver.getSearchState();
+                                switch(state) {
+                                   case FmTransceiver.subSrchLevel_SrchListInProg:
+                                      Log.v(TAG, "FmRxEventListener: Current state is AUTO_PRESET_INPROGRESS");
+                                      FmReceiver.setSearchState(FmTransceiver.subSrchLevel_SrchComplete);
+                                      Log.v(TAG, "RxEvtList: CURRENT-STATE : Search ---> NEW-STATE : FMRxOn");
+                                      cb.FmRxEvSearchListComplete ();
+                                      break;
+                                   case FmTransceiver.subSrchLevel_SrchAbort:
+                                      Log.v(TAG, "Current state is SRCH_ABORTED");
+                                      Log.v(TAG, "Aborting on-going SearchList command...");
+                                      FmReceiver.setSearchState(FmTransceiver.subSrchLevel_SrchComplete);
+                                      Log.v(TAG, "RxEvtList: CURRENT-STATE : Search ---> NEW-STATE : FMRxOn");
+                                      cb.FmRxEvSearchCancelled();
+                                      break;
+                                }
+                                break;
+                            case 15:
+                                Log.d(TAG, "Got NEW_AF_LIST");
+                                cb.FmRxEvRdsAfInfo();
+                                break;
+                            case 18:
+                                Log.d(TAG, "Got RADIO_DISABLED");
+                                if (FmTransceiver.getFMPowerState() == FmTransceiver.subPwrLevel_FMTurning_Off) {
+                                    FmTransceiver.release("/dev/radio0");
+                                    /*Set the state as FMOff */
+                                    FmTransceiver.setFMPowerState(FmTransceiver.FMState_Turned_Off);
+                                    cb.FmRxEvDisableReceiver();
+                                    Log.v(TAG, "RxEvtList: CURRENT-STATE : FMTurningOff ---> NEW-STATE : FMOff");
+                                    Thread.currentThread().interrupt();
+                                } else {
+                                    Log.d(TAG, "Unexpected RADIO_DISABLED recvd");
+                                    FmTransceiver.release("/dev/radio0");
+                                    cb.FmRxEvRadioReset();
+                                    FmTransceiver.setFMPowerState(FmTransceiver.FMState_Turned_Off);
+                                    Log.v(TAG, "RxEvtList: CURRENT-STATE : FMRxOn ---> NEW-STATE : FMOff");
+                                    Thread.currentThread().interrupt();
+                                }
+                                break;
+                            case 19:
+                                FmTransceiver.setRDSGrpMask(0);
+                                break;
+                            case 20:
+                                Log.d(TAG, "got RT plus event");
+                                cb.FmRxEvRTPlus();
+                                break;
+                            case 21:
+                                Log.d(TAG, "got eRT event");
+                                cb.FmRxEvERTInfo();
+                                break;
+                            case 22:
+                                Log.d(TAG, "got IRIS_EVT_SPUR_TBL event");
+                                FmReceiver.getSpurTableData();
+                                break;
+                            default:
+                                Log.d(TAG, "Unknown event");
+                                break;
+                            }
+                        }//end of for
+                    } catch ( Exception ex ) {
+                        Log.d( TAG,  "RunningThread InterruptedException");
+                        ex.printStackTrace();
+                        Thread.currentThread().interrupt();
+                    }
+                }
+            }
+        };
+        mThread.start();
+    }
+
+    public void stopListener(){
+        //mThread.stop();
+        //Thread stop is deprecate API
+        //Interrupt the thread and check for the thread status
+        // and return from the run() method to stop the thread
+        //properly
+        Log.d( TAG,  "stopping the Listener\n");
+        if( mThread != null ) {
+         mThread.interrupt();
+        }
+    }
+
+}
diff --git a/qcom/fmradio/FmTransceiver.java b/qcom/fmradio/FmTransceiver.java
index eee89d4..cd619df 100644
--- a/qcom/fmradio/FmTransceiver.java
+++ b/qcom/fmradio/FmTransceiver.java
@@ -28,6 +28,7 @@
 
 
 package qcom.fmradio;
+import android.os.SystemProperties;
 import android.util.Log;
 import java.io.File;
 
@@ -139,14 +140,168 @@
    private static final int V4L2_CID_PRIVATE_TAVARUA_SET_NOTCH_FILTER = V4L2_CID_PRIVATE_BASE + 40;
 
    private final String TAG = "FmTransceiver";
+   private final String V4L2_DEVICE = "/dev/radio0";
 
    protected static int sFd;
    protected FmRxControls mControl;
    protected int mPowerMode;
+   protected FmRxEventListner mRxEvents;
    protected FmRxRdsData mRdsData;
+
    public static final int ERROR = -1;
 
    /*==============================================================
+   FUNCTION:  acquire
+   ==============================================================*/
+   /**
+   *    Allows access to the V4L2 FM device.
+   *
+   *    This synchronous call allows a client to use the V4L2 FM
+   *    device. This must be the first call issued by the client
+   *    before any receiver interfaces can be used.
+   *
+   *    This call also powers up the FM Module.
+   *
+   *    @param device String that is path to radio device
+   *
+   *    @return true if V4L2 FM device acquired, false if V4L2 FM
+   *            device could not be acquired, possibly acquired by
+   *            other client
+   *    @see   #release
+   *
+   */
+   protected boolean acquire(String device){
+      boolean bStatus = true;
+      if (sFd <= 0) { // if previous open fails fd will be -ve.
+         sFd = FmReceiverJNI.acquireFdNative(V4L2_DEVICE);
+
+         if (sFd > 0) {
+            Log.d(TAG, "Opened "+ sFd);
+            bStatus = true;
+         }
+         else {
+            Log.d(TAG, "Fail to Open "+ sFd);
+	    bStatus = false;
+         }
+      }
+      else {
+         Log.d(TAG, "Already Opened:" + sFd);
+         /*This should be case
+          * Where User try to opne the device
+          * secondtime.
+          * Case where Tx and Rx try to
+          * acquire the device
+          */
+         bStatus = false;
+       }
+      return (bStatus);
+   }
+
+   /*==============================================================
+   FUNCTION:  release
+   ==============================================================*/
+   /**
+   *    Releases access to the V4L2 FM device.
+   *    <p>
+   *    This synchronous call allows a client to release control of
+   *    V4L2 FM device.  This function should be called when the FM
+   *    device is no longer needed. This should be the last call
+   *    issued by the FM client. Once called, the client must call
+   *    #acquire to re-aquire the V4L2 device control before the
+   *    FM device can be used again.
+   *    <p>
+   *    Before the client can release control of the FM receiver
+   *    interface, it must disable the FM receiver, if the client
+   *    enabled it, and unregister any registered callback.  If the
+   *    client has ownership of the receiver, it will automatically
+   *    be returned to the system.
+   *    <p>
+   *    This call also powers down the FM Module.
+   *    <p>
+   *    @param device String that is path to radio device
+   *    @return true if V4L2 FM device released, false if V4L2 FM
+   *            device could not be released
+   *    @see   #acquire
+   */
+   static boolean release(String device) {
+      if (sFd!=0)
+      {
+         FmReceiverJNI.closeFdNative(sFd);
+         sFd = 0;
+         Log.d("FmTransceiver", "Turned off: " + sFd);
+      } else
+      {
+         Log.d("FmTransceiver", "Error turning off");
+      }
+      return true;
+   }
+
+   /*==============================================================
+   FUNCTION:  registerClient
+   ==============================================================*/
+   /**
+   *    Registers a callback for FM receiver event notifications.
+   *    <p>
+   *    This is a synchronous call used to register for event
+   *    notifications from the FM receiver driver. Since the FM
+   *    driver performs some tasks asynchronously, this function
+   *    allows the client to receive information asynchronously.
+   *    <p>
+   *    When calling this function, the client must pass a callback
+   *    function which will be used to deliver asynchronous events.
+   *    The argument callback must be a non-NULL value.  If a NULL
+   *    value is passed to this function, the registration will
+   *    fail.
+   *    <p>
+   *    The client can choose which events will be sent from the
+   *    receiver driver by simply implementing functions for events
+   *    it wishes to receive.
+   *    <p>
+   *
+   *    @param callback the callback to handle the events events
+   *                    from the FM receiver.
+   *    @return true if Callback registered, false if Callback
+   *            registration failed.
+   *
+   *    @see #acquire
+   *    @see #unregisterClient
+   *
+   */
+   public boolean registerClient(FmRxEvCallbacks callback){
+      boolean bReturnStatus = false;
+      if (callback!=null)
+      {
+         mRxEvents.startListner(sFd, callback);
+         bReturnStatus = true;
+      } else
+      {
+         Log.d(TAG, "Null, do nothing");
+      }
+      return bReturnStatus;
+   }
+
+   /*==============================================================
+   FUNCTION:  unregisterClient
+   ==============================================================*/
+   /**
+   *    Unregisters a client's event notification callback.
+   *    <p>
+   *    This is a synchronous call used to unregister a client's
+   *    event callback.
+   *    <p>
+   *    @return true always.
+   *
+   *    @see  #acquire
+   *    @see  #release
+   *    @see  #registerClient
+   *
+   */
+   public boolean unregisterClient () {
+      mRxEvents.stopListener();
+      return true;
+   }
+
+   /*==============================================================
    FUNCTION:  enable
    ==============================================================*/
    /**
@@ -183,6 +338,12 @@
       boolean status;
       int ret;
 
+      if (!FmReceiver.isCherokeeChip()) {
+          //Acquire the deviceon Enable
+          if (!acquire("/dev/radio0")) {
+              return false;
+          }
+      }
       if (new File("/etc/fm/SpurTableFile.txt").isFile()) {
           Log.d(TAG, "Send Spur roation table");
           FmConfig.fmSpurConfig(sFd);
@@ -193,6 +354,7 @@
       ret = mControl.fmOn(sFd, device);
       if (ret < 0) {
           Log.d(TAG, "turning on failed");
+          FmReceiverJNI.closeFdNative(sFd);
           sFd = 0;
           return false;
       }
@@ -201,6 +363,7 @@
       status = FmConfig.fmConfigure (sFd, configSettings);
       if (!status) {
           Log.d(TAG, "fmConfigure failed");
+          FmReceiverJNI.closeFdNative(sFd);
           sFd = 0;
       }
       return status;
@@ -329,13 +492,9 @@
    */
    public boolean getInternalAntenna()
    {
-
-       int re = FmReceiverJNI.getControlNative (sFd, V4L2_CID_PRIVATE_TAVARUA_ANTENNA);
-
-       if (re == 1)
-         return true;
-
-       return false;
+       return ((FmReceiverJNI.getControlNative(sFd,
+                       V4L2_CID_PRIVATE_TAVARUA_ANTENNA) == 1) ||
+               SystemProperties.getBoolean("hw.fm.internal_antenna", false));
    }
 
    /*==============================================================
diff --git a/qcom/fmradio/qcom.fmradio.xml b/qcom/fmradio/qcom.fmradio.xml
new file mode 100644
index 0000000..6a55cc6
--- /dev/null
+++ b/qcom/fmradio/qcom.fmradio.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <library name="qcom.fmradio"
+            file="/system/framework/qcom.fmradio.jar" />
+</permissions>