Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26
diff --git a/Android.mk b/Android.mk
old mode 100644
new mode 100755
index 3088512..106299d
--- a/Android.mk
+++ b/Android.mk
@@ -4,23 +4,14 @@
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_JAVA_LIBRARIES := telephony-common
+
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript
 
-LOCAL_RENDERSCRIPT_TARGET_API := 18
-LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
-LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
-
-# Keep track of previously compiled RS files too (from bundled GalleryGoogle).
-prev_compiled_rs_files := $(call all-renderscript-files-under, src)
-
-# We already have these files from GalleryGoogle, so don't install them.
-LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
@@ -29,12 +20,26 @@
 
 LOCAL_PACKAGE_NAME := Gallery2
 
+LOCAL_CERTIFICATE := platform
+
 LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
-LOCAL_SDK_VERSION := current
+LOCAL_PROGUARD_ENABLED := disabled
+
+#LOCAL_SDK_VERSION := current
 
 LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
 
+ifeq ($(TARGET_TS_MAKEUP), true)
+  LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni
+endif
+
+ifeq ($(WITH_SLIM_GALLERY2), true)
+  LOCAL_MANIFEST_FILE := slim_manifest/AndroidManifest.xml
+else
+  LOCAL_MANIFEST_FILE := AndroidManifest.xml
+endif
+
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2aea569..937a461 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
+     Not a Contribution.
+
+     Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 
 <manifest android:versionCode="40030"
         android:versionName="1.1.40030"
@@ -7,11 +24,14 @@
 
     <original-package android:name="com.android.gallery3d" />
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 
     <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
             android:protectionLevel="signatureOrSystem" />
 
+    <permission android:name="com.android.gallery3d.permission.STORAGE_CHANGE"
+            android:protectionLevel="signatureOrSystem" />
+
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -19,6 +39,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -29,8 +50,11 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/>
     <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
 
     <supports-screens android:smallScreens="false"
             android:normalScreens="true" android:largeScreens="true"
@@ -64,6 +88,7 @@
                 <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
+                <data android:scheme="rtsp" />
                 <data android:mimeType="video/mpeg4" />
                 <data android:mimeType="video/mp4" />
                 <data android:mimeType="video/3gp" />
@@ -72,6 +97,14 @@
                 <data android:mimeType="video/webm" />
                 <data android:mimeType="video/avi" />
                 <data android:mimeType="application/sdp" />
+                <data android:mimeType="video/mp2ts" />
+                <data android:mimeType="video/x-ms-asf" />
+                <data android:mimeType="video/x-ms-wmv" />
+                <data android:mimeType="video/x-matroska" />
+                <data android:mimeType="video/x-msvideo"/>
+                <data android:mimeType="video/divx" />
+                <data android:mimeType="video/mkv" />
+                <data android:mimeType="video/mpeg" />
              </intent-filter>
              <intent-filter>
                 <!-- HTTP live support -->
@@ -84,11 +117,13 @@
                 <data android:mimeType="audio/mpegurl" />
                 <data android:mimeType="application/vnd.apple.mpegurl" />
                 <data android:mimeType="application/x-mpegurl" />
+                <data android:mimeType="application/dash+xml" />
              </intent-filter>
         </activity>
 
-        <activity android:name="com.android.gallery3d.app.GalleryActivity" android:label="@string/app_name"
-                android:configChanges="keyboardHidden|orientation|screenSize">
+        <activity android:name="com.android.gallery3d.app.GalleryActivity"
+                  android:label="@string/app_name"
+                  android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -165,8 +200,7 @@
 
         <!-- This activity acts as a trampoline to the new Gallery activity,
              so that existing shortcuts are preserved. -->
-        <activity android:name="com.android.gallery3d.app.Gallery"
-            android:theme="@style/android:Theme.NoDisplay">
+        <activity android:name="com.android.gallery3d.app.Gallery">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -298,6 +332,16 @@
                 android:theme="@style/Theme.Gallery"
                 android:configChanges="orientation|keyboardHidden|screenSize" />
 
+        <activity android:name="com.android.gallery3d.util.ViewGifImage"
+                android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+                android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation">
+            <intent-filter>
+                <action android:name="com.android.gallery3d.VIEW_GIF" />
+                <data android:mimeType="image/gif" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <provider android:name="com.android.gallery3d.provider.GalleryProvider"
                 android:syncable="false"
                 android:grantUriPermissions="true"
@@ -354,6 +398,54 @@
             </intent-filter>
         </receiver>
 
+        <!-- Receiver to keep the storage path for the camera in sync -->
+        <receiver android:name="com.android.gallery3d.app.StorageChangeReceiver"
+            android:permission="com.android.gallery3d.permission.STORAGE_CHANGE" >
+            <intent-filter>
+                <action android:name="com.android.gallery3d.STORAGE_CHANGE" />
+            </intent-filter>
+        </receiver>
+
         <service android:name="com.android.camera.MediaSaveService" />
+
+        <activity android:name="org.codeaurora.gallery3d.video.SettingsActivity"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:label="@string/streaming_settings" >
+            <intent-filter>
+                <action android:name="org.codeaurora.settings.streaming" />
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <receiver android:name="org.codeaurora.gallery3d.video.DmReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="streaming.action.WRITE_SETTINGS" />
+            </intent-filter>
+        </receiver>
+
+        <activity android:name="org.codeaurora.gallery3d.video.BookmarkActivity"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:icon="@drawable/ic_menu_display_bookmark"
+                android:label="@string/bookmark_list"
+                android:theme="@android:style/Theme.Holo" >
+            <intent-filter>
+                <action android:name="org.codeaurora.bookmark.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name="org.codeaurora.gallery3d.video.VideoSettingsActivity"
+                android:label="@string/movie_view_label"
+                android:configChanges="orientation|keyboardHidden|screenSize|mnc|mcc">
+        </activity>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.android.gallery3d.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 </manifest>
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 20db309..dede88e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,6 +50,8 @@
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Gallery*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Gallery*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Gallery*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Gallery2_intermediates)
+
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java b/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java
index a1cf0fc..2142209 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java
@@ -318,6 +318,13 @@
     public static final int TAG_INTEROPERABILITY_INDEX =
         defineTag(IfdId.TYPE_IFD_INTEROPERABILITY, (short) 1);
 
+    private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";
+    private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss";
+    public static final DateFormat DATETIME_FORMAT = new SimpleDateFormat(DATETIME_FORMAT_STR);
+    private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR);
+    private final Calendar mGPSTimeStampCalendar = Calendar
+            .getInstance(TimeZone.getTimeZone("UTC"));
+
     /**
      * Tags that contain offset markers. These are included in the banned
      * defines.
@@ -732,7 +739,7 @@
      * @param inStream an InputStream containing a jpeg compressed image.
      * @throws IOException
      */
-    public void readExif(InputStream inStream) throws IOException {
+    public void readExif(InputStream inStream) throws IOException, NullPointerException {
         if (inStream == null) {
             throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
         }
@@ -1944,13 +1951,6 @@
         return latLon;
     }
 
-    private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";
-    private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss";
-    private final DateFormat mDateTimeStampFormat = new SimpleDateFormat(DATETIME_FORMAT_STR);
-    private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR);
-    private final Calendar mGPSTimeStampCalendar = Calendar
-            .getInstance(TimeZone.getTimeZone("UTC"));
-
     /**
      * Creates, formats, and sets the DateTimeStamp tag for one of:
      * {@link #TAG_DATE_TIME}, {@link #TAG_DATE_TIME_DIGITIZED},
@@ -1964,8 +1964,8 @@
     public boolean addDateTimeStampTag(int tagId, long timestamp, TimeZone timezone) {
         if (tagId == TAG_DATE_TIME || tagId == TAG_DATE_TIME_DIGITIZED
                 || tagId == TAG_DATE_TIME_ORIGINAL) {
-            mDateTimeStampFormat.setTimeZone(timezone);
-            ExifTag t = buildTag(tagId, mDateTimeStampFormat.format(timestamp));
+            DATETIME_FORMAT.setTimeZone(timezone);
+            ExifTag t = buildTag(tagId, DATETIME_FORMAT.format(timestamp));
             if (t == null) {
                 return false;
             }
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
index b8b3872..186cb81 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java
@@ -17,7 +17,6 @@
 package com.android.gallery3d.exif;
 
 import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 
@@ -102,8 +101,6 @@
     // Value offset in exif header.
     private int mOffset;
 
-    private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyy:MM:dd kk:mm:ss");
-
     /**
      * Returns true if the given IFD is a valid IFD.
      */
@@ -314,13 +311,17 @@
      * Sets a string value into this tag. This method should be used for tags of
      * type {@link #TYPE_ASCII}. The string is converted to an ASCII string.
      * Characters that cannot be converted are replaced with '?'. The length of
-     * the string must be equal to either (component count -1) or (component
-     * count). The final byte will be set to the string null terminator '\0',
-     * overwriting the last character in the string if the value.length is equal
-     * to the component count. This method will fail if:
+     * the string must be equal to either
+     * <ul>
+     * <li>component count - 1 when the terminating '\0' is not present</li>
+     * <li>component count when the terminating '\0' is present</li>
+     * <li>to comply with some non-conformant implementations, the terminating
+     * '\0' will be appended if it's not present and component count equals
+     * the string length; the component count will be updated in that case</li>
+     * This method will fail if:
      * <ul>
      * <li>The data type is not {@link #TYPE_ASCII} or {@link #TYPE_UNDEFINED}.</li>
-     * <li>The length of the string is not equal to (component count -1) or
+     * <li>The length of the string is not equal to (component count - 1) or
      * (component count) in the definition for this tag.</li>
      * </ul>
      */
@@ -331,11 +332,20 @@
 
         byte[] buf = value.getBytes(US_ASCII);
         byte[] finalBuf = buf;
-        if (buf.length > 0) {
-            finalBuf = (buf[buf.length - 1] == 0 || mDataType == TYPE_UNDEFINED) ? buf : Arrays
-                .copyOf(buf, buf.length + 1);
-        } else if (mDataType == TYPE_ASCII && mComponentCountActual == 1) {
-            finalBuf = new byte[] { 0 };
+        if (mDataType == TYPE_ASCII) {
+            if (buf.length > 0) {
+                if (buf[buf.length - 1] != 0) {
+                    finalBuf = Arrays.copyOf(buf, buf.length + 1);
+                    // Apply the workaround for non conformant implementations
+                    // (e.g. Samsung Wave 2): Accept a string with missing
+                    // termination character
+                    if (mComponentCountActual == buf.length) {
+                        mComponentCountActual++;
+                    }
+                }
+            } else if (mComponentCountActual == 1) {
+                finalBuf = new byte[] { 0 };
+            }
         }
         int count = finalBuf.length;
         if (checkBadComponentCount(count)) {
@@ -524,9 +534,10 @@
      * @return true on success
      */
     public boolean setTimeValue(long time) {
-        // synchronized on TIME_FORMAT as SimpleDateFormat is not thread safe
-        synchronized (TIME_FORMAT) {
-            return setValue(TIME_FORMAT.format(new Date(time)));
+        // synchronized on DATETIME_FORMAT as SimpleDateFormat is not thread
+        // safe
+        synchronized (ExifInterface.DATETIME_FORMAT) {
+            return setValue(ExifInterface.DATETIME_FORMAT.format(new Date(time)));
         }
     }
 
diff --git a/proguard.flags b/proguard.flags
index 65104ec..d190434 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,6 +1,10 @@
 # Disable the warnings of using dynamic method call in common library.
 -dontnote com.android.gallery3d.common.*
 
+#Avoid the library class dependency error
+-dontwarn android.view.inputmethod.InputMethodManager
+-dontwarn android.content.res.Resources
+
 # Keep all classes extended from com.android.gallery3d.common.Entry
 # Since we annotate on the fields and use reflection to create SQL
 # according to those field.
@@ -84,3 +88,7 @@
 -keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; }
 -keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; }
 -keep class com.android.gallery3d.jpegstream.StreamUtils { *; }
+
+-keep class com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine{
+  *;
+}
diff --git a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png
deleted file mode 100644
index 06e5b47..0000000
--- a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/frame_overlay_gallery_camera.png b/res/drawable-hdpi/frame_overlay_gallery_camera.png
index b27bbe5..aa3a3e5 100644
--- a/res/drawable-hdpi/frame_overlay_gallery_camera.png
+++ b/res/drawable-hdpi/frame_overlay_gallery_camera.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_cameraalbum_overlay.png b/res/drawable-hdpi/ic_cameraalbum_overlay.png
index e58777f..90ffbbd 100644
--- a/res/drawable-hdpi/ic_cameraalbum_overlay.png
+++ b/res/drawable-hdpi/ic_cameraalbum_overlay.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_media_bigscreen.png b/res/drawable-hdpi/ic_media_bigscreen.png
new file mode 100644
index 0000000..b68002d
--- /dev/null
+++ b/res/drawable-hdpi/ic_media_bigscreen.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_media_cropscreen.png b/res/drawable-hdpi/ic_media_cropscreen.png
new file mode 100644
index 0000000..d6e4e70
--- /dev/null
+++ b/res/drawable-hdpi/ic_media_cropscreen.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_media_fullscreen.png b/res/drawable-hdpi/ic_media_fullscreen.png
new file mode 100644
index 0000000..a4569fb
--- /dev/null
+++ b/res/drawable-hdpi/ic_media_fullscreen.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_disabled_forward.png b/res/drawable-hdpi/ic_menu_disabled_forward.png
new file mode 100644
index 0000000..c9683df
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_disabled_forward.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_disabled_rewind.png b/res/drawable-hdpi/ic_menu_disabled_rewind.png
new file mode 100644
index 0000000..1f74fb8
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_disabled_rewind.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_disabled_stop.png b/res/drawable-hdpi/ic_menu_disabled_stop.png
new file mode 100644
index 0000000..292c492
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_disabled_stop.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_display_bookmark.png b/res/drawable-hdpi/ic_menu_display_bookmark.png
new file mode 100644
index 0000000..a5118ea
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_display_bookmark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_edit_holo_dark.png b/res/drawable-hdpi/ic_menu_edit_holo_dark.png
deleted file mode 100644
index 54952f5..0000000
--- a/res/drawable-hdpi/ic_menu_edit_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_forward.png b/res/drawable-hdpi/ic_menu_forward.png
new file mode 100644
index 0000000..4680082
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_forward.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_loop.png b/res/drawable-hdpi/ic_menu_loop.png
new file mode 100644
index 0000000..add4633
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_loop.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_rewind.png b/res/drawable-hdpi/ic_menu_rewind.png
new file mode 100644
index 0000000..37c5708
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_rewind.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_share_holo_light.png b/res/drawable-hdpi/ic_menu_share_holo_light.png
deleted file mode 100644
index 492d609..0000000
--- a/res/drawable-hdpi/ic_menu_share_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_stop.png b/res/drawable-hdpi/ic_menu_stop.png
new file mode 100644
index 0000000..aea1c45
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_stop.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_trash_holo_light.png b/res/drawable-hdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index 721ee5c..0000000
--- a/res/drawable-hdpi/ic_menu_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_unloop.png b/res/drawable-hdpi/ic_menu_unloop.png
new file mode 100644
index 0000000..3140051
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_unloop.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_photoeditor_makeup.png b/res/drawable-hdpi/ic_photoeditor_makeup.png
new file mode 100644
index 0000000..06913d6
--- /dev/null
+++ b/res/drawable-hdpi/ic_photoeditor_makeup.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_separator_line.png b/res/drawable-hdpi/ic_separator_line.png
new file mode 100644
index 0000000..2ebff3f
--- /dev/null
+++ b/res/drawable-hdpi/ic_separator_line.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_camera.png b/res/drawable-hdpi/ic_switch_camera.png
index 11dd39a..509657d 100644
--- a/res/drawable-hdpi/ic_switch_camera.png
+++ b/res/drawable-hdpi/ic_switch_camera.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_ts_makeup_bigeye.png b/res/drawable-hdpi/ic_ts_makeup_bigeye.png
new file mode 100644
index 0000000..bf7b6f5
--- /dev/null
+++ b/res/drawable-hdpi/ic_ts_makeup_bigeye.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_ts_makeup_soften.png b/res/drawable-hdpi/ic_ts_makeup_soften.png
new file mode 100644
index 0000000..caa6451
--- /dev/null
+++ b/res/drawable-hdpi/ic_ts_makeup_soften.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_ts_makeup_trimface.png b/res/drawable-hdpi/ic_ts_makeup_trimface.png
new file mode 100644
index 0000000..3ac43f7
--- /dev/null
+++ b/res/drawable-hdpi/ic_ts_makeup_trimface.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_ts_makeup_whiten.png b/res/drawable-hdpi/ic_ts_makeup_whiten.png
new file mode 100644
index 0000000..a12560f
--- /dev/null
+++ b/res/drawable-hdpi/ic_ts_makeup_whiten.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_vidcontrol_disable_pause.png b/res/drawable-hdpi/ic_vidcontrol_disable_pause.png
new file mode 100644
index 0000000..41b3725
--- /dev/null
+++ b/res/drawable-hdpi/ic_vidcontrol_disable_pause.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_vidcontrol_disable_play.png b/res/drawable-hdpi/ic_vidcontrol_disable_play.png
new file mode 100644
index 0000000..fdc5380
--- /dev/null
+++ b/res/drawable-hdpi/ic_vidcontrol_disable_play.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_vidcontrol_disable_reload.png b/res/drawable-hdpi/ic_vidcontrol_disable_reload.png
new file mode 100644
index 0000000..5611a92
--- /dev/null
+++ b/res/drawable-hdpi/ic_vidcontrol_disable_reload.png
Binary files differ
diff --git a/res/drawable-hdpi/knob.png b/res/drawable-hdpi/knob.png
new file mode 100644
index 0000000..1eba937
--- /dev/null
+++ b/res/drawable-hdpi/knob.png
Binary files differ
diff --git a/res/drawable-hdpi/knob_toggle_off.png b/res/drawable-hdpi/knob_toggle_off.png
new file mode 100644
index 0000000..a89595e
--- /dev/null
+++ b/res/drawable-hdpi/knob_toggle_off.png
Binary files differ
diff --git a/res/drawable-hdpi/knob_toggle_on.png b/res/drawable-hdpi/knob_toggle_on.png
new file mode 100644
index 0000000..ab8d3d7
--- /dev/null
+++ b/res/drawable-hdpi/knob_toggle_on.png
Binary files differ
diff --git a/res/drawable-hdpi/media_default_bkg.9.png b/res/drawable-hdpi/media_default_bkg.9.png
new file mode 100644
index 0000000..7b95239
--- /dev/null
+++ b/res/drawable-hdpi/media_default_bkg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/switch_thumb_activated.9.png b/res/drawable-hdpi/switch_thumb_activated.9.png
new file mode 100644
index 0000000..072aa64
--- /dev/null
+++ b/res/drawable-hdpi/switch_thumb_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/switch_thumb_off.9.png b/res/drawable-hdpi/switch_thumb_off.9.png
new file mode 100644
index 0000000..45786a3
--- /dev/null
+++ b/res/drawable-hdpi/switch_thumb_off.9.png
Binary files differ
diff --git a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png
deleted file mode 100644
index 81de1bb..0000000
--- a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/frame_overlay_gallery_camera.png b/res/drawable-mdpi/frame_overlay_gallery_camera.png
index 3736a5c..994b3f3 100644
--- a/res/drawable-mdpi/frame_overlay_gallery_camera.png
+++ b/res/drawable-mdpi/frame_overlay_gallery_camera.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_cameraalbum_overlay.png b/res/drawable-mdpi/ic_cameraalbum_overlay.png
index 5d14c32..2cce0d4 100644
--- a/res/drawable-mdpi/ic_cameraalbum_overlay.png
+++ b/res/drawable-mdpi/ic_cameraalbum_overlay.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_media_bigscreen.png b/res/drawable-mdpi/ic_media_bigscreen.png
new file mode 100644
index 0000000..f04026e
--- /dev/null
+++ b/res/drawable-mdpi/ic_media_bigscreen.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_media_cropscreen.png b/res/drawable-mdpi/ic_media_cropscreen.png
new file mode 100644
index 0000000..a2517bd
--- /dev/null
+++ b/res/drawable-mdpi/ic_media_cropscreen.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_media_fullscreen.png b/res/drawable-mdpi/ic_media_fullscreen.png
new file mode 100644
index 0000000..a53cb3d
--- /dev/null
+++ b/res/drawable-mdpi/ic_media_fullscreen.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_camera_holo_light.png b/res/drawable-mdpi/ic_menu_camera_holo_light.png
index d425084..aa3a3e5 100644
--- a/res/drawable-mdpi/ic_menu_camera_holo_light.png
+++ b/res/drawable-mdpi/ic_menu_camera_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_disabled_forward.png b/res/drawable-mdpi/ic_menu_disabled_forward.png
new file mode 100644
index 0000000..bbc8920
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_disabled_forward.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_disabled_rewind.png b/res/drawable-mdpi/ic_menu_disabled_rewind.png
new file mode 100644
index 0000000..28acd42
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_disabled_rewind.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_disabled_stop.png b/res/drawable-mdpi/ic_menu_disabled_stop.png
new file mode 100644
index 0000000..0532cea
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_disabled_stop.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_display_bookmark.png b/res/drawable-mdpi/ic_menu_display_bookmark.png
new file mode 100644
index 0000000..a3acdd6
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_display_bookmark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_edit_holo_dark.png b/res/drawable-mdpi/ic_menu_edit_holo_dark.png
deleted file mode 100644
index ca9188e..0000000
--- a/res/drawable-mdpi/ic_menu_edit_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_forward.png b/res/drawable-mdpi/ic_menu_forward.png
new file mode 100644
index 0000000..85b7057
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_forward.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_loop.png b/res/drawable-mdpi/ic_menu_loop.png
new file mode 100644
index 0000000..688b2c5
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_loop.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_rewind.png b/res/drawable-mdpi/ic_menu_rewind.png
new file mode 100644
index 0000000..8b46eee
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_rewind.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_share_holo_light.png b/res/drawable-mdpi/ic_menu_share_holo_light.png
deleted file mode 100644
index 29574f5..0000000
--- a/res/drawable-mdpi/ic_menu_share_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_stop.png b/res/drawable-mdpi/ic_menu_stop.png
new file mode 100644
index 0000000..96cf8f4
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_stop.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_trash_holo_light.png b/res/drawable-mdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index f45540b..0000000
--- a/res/drawable-mdpi/ic_menu_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_unloop.png b/res/drawable-mdpi/ic_menu_unloop.png
new file mode 100644
index 0000000..e474964
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_unloop.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_photoeditor_makeup.png b/res/drawable-mdpi/ic_photoeditor_makeup.png
new file mode 100644
index 0000000..606f591
--- /dev/null
+++ b/res/drawable-mdpi/ic_photoeditor_makeup.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_camera.png b/res/drawable-mdpi/ic_switch_camera.png
index a978117..90dd073 100644
--- a/res/drawable-mdpi/ic_switch_camera.png
+++ b/res/drawable-mdpi/ic_switch_camera.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_ts_makeup_bigeye.png b/res/drawable-mdpi/ic_ts_makeup_bigeye.png
new file mode 100644
index 0000000..8d8da29
--- /dev/null
+++ b/res/drawable-mdpi/ic_ts_makeup_bigeye.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_ts_makeup_soften.png b/res/drawable-mdpi/ic_ts_makeup_soften.png
new file mode 100644
index 0000000..a36d189
--- /dev/null
+++ b/res/drawable-mdpi/ic_ts_makeup_soften.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_ts_makeup_trimface.png b/res/drawable-mdpi/ic_ts_makeup_trimface.png
new file mode 100644
index 0000000..e27370f
--- /dev/null
+++ b/res/drawable-mdpi/ic_ts_makeup_trimface.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_ts_makeup_whiten.png b/res/drawable-mdpi/ic_ts_makeup_whiten.png
new file mode 100644
index 0000000..7ac8823
--- /dev/null
+++ b/res/drawable-mdpi/ic_ts_makeup_whiten.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_vidcontrol_disable_pause.png b/res/drawable-mdpi/ic_vidcontrol_disable_pause.png
new file mode 100644
index 0000000..c5c42cb
--- /dev/null
+++ b/res/drawable-mdpi/ic_vidcontrol_disable_pause.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_vidcontrol_disable_play.png b/res/drawable-mdpi/ic_vidcontrol_disable_play.png
new file mode 100644
index 0000000..70374fb
--- /dev/null
+++ b/res/drawable-mdpi/ic_vidcontrol_disable_play.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_vidcontrol_disable_reload.png b/res/drawable-mdpi/ic_vidcontrol_disable_reload.png
new file mode 100644
index 0000000..052df4c
--- /dev/null
+++ b/res/drawable-mdpi/ic_vidcontrol_disable_reload.png
Binary files differ
diff --git a/res/drawable-mdpi/media_default_bkg.9.png b/res/drawable-mdpi/media_default_bkg.9.png
new file mode 100644
index 0000000..20bb108
--- /dev/null
+++ b/res/drawable-mdpi/media_default_bkg.9.png
Binary files differ
diff --git a/res/drawable-sw600dp/ic_vidcontrol_disable_pause.png b/res/drawable-sw600dp/ic_vidcontrol_disable_pause.png
new file mode 100644
index 0000000..41b3725
--- /dev/null
+++ b/res/drawable-sw600dp/ic_vidcontrol_disable_pause.png
Binary files differ
diff --git a/res/drawable-sw600dp/ic_vidcontrol_disable_play.png b/res/drawable-sw600dp/ic_vidcontrol_disable_play.png
new file mode 100644
index 0000000..fdc5380
--- /dev/null
+++ b/res/drawable-sw600dp/ic_vidcontrol_disable_play.png
Binary files differ
diff --git a/res/drawable-sw600dp/ic_vidcontrol_disable_reload.png b/res/drawable-sw600dp/ic_vidcontrol_disable_reload.png
new file mode 100644
index 0000000..5611a92
--- /dev/null
+++ b/res/drawable-sw600dp/ic_vidcontrol_disable_reload.png
Binary files differ
diff --git a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png
deleted file mode 100644
index 36d8cf4..0000000
--- a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/frame_overlay_gallery_camera.png b/res/drawable-xhdpi/frame_overlay_gallery_camera.png
index e2109ac..aa3a3e5 100644
--- a/res/drawable-xhdpi/frame_overlay_gallery_camera.png
+++ b/res/drawable-xhdpi/frame_overlay_gallery_camera.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_cameraalbum_overlay.png b/res/drawable-xhdpi/ic_cameraalbum_overlay.png
index bf71eaa..6056fcc 100644
--- a/res/drawable-xhdpi/ic_cameraalbum_overlay.png
+++ b/res/drawable-xhdpi/ic_cameraalbum_overlay.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_media_bigscreen.png b/res/drawable-xhdpi/ic_media_bigscreen.png
new file mode 100644
index 0000000..ba36709
--- /dev/null
+++ b/res/drawable-xhdpi/ic_media_bigscreen.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_media_cropscreen.png b/res/drawable-xhdpi/ic_media_cropscreen.png
new file mode 100644
index 0000000..e08c1db
--- /dev/null
+++ b/res/drawable-xhdpi/ic_media_cropscreen.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_media_fullscreen.png b/res/drawable-xhdpi/ic_media_fullscreen.png
new file mode 100644
index 0000000..ffcb4de
--- /dev/null
+++ b/res/drawable-xhdpi/ic_media_fullscreen.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_camera_holo_light.png b/res/drawable-xhdpi/ic_menu_camera_holo_light.png
new file mode 100644
index 0000000..c1a3549
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_camera_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_disabled_forward.png b/res/drawable-xhdpi/ic_menu_disabled_forward.png
new file mode 100644
index 0000000..e73d4d4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_disabled_forward.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_disabled_rewind.png b/res/drawable-xhdpi/ic_menu_disabled_rewind.png
new file mode 100644
index 0000000..ad3be64
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_disabled_rewind.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_disabled_stop.png b/res/drawable-xhdpi/ic_menu_disabled_stop.png
new file mode 100644
index 0000000..ba0fc5f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_disabled_stop.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_display_bookmark.png b/res/drawable-xhdpi/ic_menu_display_bookmark.png
new file mode 100644
index 0000000..4ad8414
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_display_bookmark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_edit_holo_dark.png b/res/drawable-xhdpi/ic_menu_edit_holo_dark.png
deleted file mode 100644
index 65e72c1..0000000
--- a/res/drawable-xhdpi/ic_menu_edit_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_forward.png b/res/drawable-xhdpi/ic_menu_forward.png
new file mode 100644
index 0000000..f225ffc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_forward.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_loop.png b/res/drawable-xhdpi/ic_menu_loop.png
new file mode 100644
index 0000000..e664915
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_loop.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_rewind.png b/res/drawable-xhdpi/ic_menu_rewind.png
new file mode 100644
index 0000000..fbfa5ca
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_rewind.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_stop.png b/res/drawable-xhdpi/ic_menu_stop.png
new file mode 100644
index 0000000..43e77be
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_stop.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_unloop.png b/res/drawable-xhdpi/ic_menu_unloop.png
new file mode 100644
index 0000000..89d1da2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_unloop.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_photoeditor_makeup.png b/res/drawable-xhdpi/ic_photoeditor_makeup.png
new file mode 100644
index 0000000..834c899
--- /dev/null
+++ b/res/drawable-xhdpi/ic_photoeditor_makeup.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_camera.png b/res/drawable-xhdpi/ic_switch_camera.png
index 7d24062..8522251 100644
--- a/res/drawable-xhdpi/ic_switch_camera.png
+++ b/res/drawable-xhdpi/ic_switch_camera.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ts_makeup_bigeye.png b/res/drawable-xhdpi/ic_ts_makeup_bigeye.png
new file mode 100644
index 0000000..f4b8500
--- /dev/null
+++ b/res/drawable-xhdpi/ic_ts_makeup_bigeye.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ts_makeup_soften.png b/res/drawable-xhdpi/ic_ts_makeup_soften.png
new file mode 100644
index 0000000..cdd6995
--- /dev/null
+++ b/res/drawable-xhdpi/ic_ts_makeup_soften.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ts_makeup_trimface.png b/res/drawable-xhdpi/ic_ts_makeup_trimface.png
new file mode 100644
index 0000000..e419c19
--- /dev/null
+++ b/res/drawable-xhdpi/ic_ts_makeup_trimface.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ts_makeup_whiten.png b/res/drawable-xhdpi/ic_ts_makeup_whiten.png
new file mode 100644
index 0000000..6fc305f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_ts_makeup_whiten.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_vidcontrol_disable_pause.png b/res/drawable-xhdpi/ic_vidcontrol_disable_pause.png
new file mode 100644
index 0000000..0b1a136
--- /dev/null
+++ b/res/drawable-xhdpi/ic_vidcontrol_disable_pause.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_vidcontrol_disable_play.png b/res/drawable-xhdpi/ic_vidcontrol_disable_play.png
new file mode 100644
index 0000000..f2c2f11
--- /dev/null
+++ b/res/drawable-xhdpi/ic_vidcontrol_disable_play.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_vidcontrol_disable_reload.png b/res/drawable-xhdpi/ic_vidcontrol_disable_reload.png
new file mode 100644
index 0000000..37a394f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_vidcontrol_disable_reload.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_cameraalbum_overlay.png b/res/drawable-xxhdpi/ic_cameraalbum_overlay.png
new file mode 100644
index 0000000..abf97ec
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_cameraalbum_overlay.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_photoeditor_makeup_xx.png b/res/drawable-xxhdpi/ic_photoeditor_makeup_xx.png
new file mode 100644
index 0000000..3db1df2
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_photoeditor_makeup_xx.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_cameraalbum_overlay.png b/res/drawable-xxxhdpi/ic_cameraalbum_overlay.png
new file mode 100644
index 0000000..762a41f
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_cameraalbum_overlay.png
Binary files differ
diff --git a/res/drawable/dropdown_ic_arrow.xml b/res/drawable/dropdown_ic_arrow.xml
new file mode 100644
index 0000000..f9464fa
--- /dev/null
+++ b/res/drawable/dropdown_ic_arrow.xml
@@ -0,0 +1,11 @@
+<?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">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M7,10l5,5l5-5H7Z" />
+</vector>
diff --git a/res/drawable/fab_accent.xml b/res/drawable/fab_accent.xml
new file mode 100644
index 0000000..f334676
--- /dev/null
+++ b/res/drawable/fab_accent.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The CyanogenMod Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+  <solid android:color="@color/fab" />
+</shape>
diff --git a/res/drawable/filtershow_background.png b/res/drawable/filtershow_background.png
deleted file mode 100644
index 22e1641..0000000
--- a/res/drawable/filtershow_background.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/filtershow_background_new.png b/res/drawable/filtershow_background_new.png
deleted file mode 100644
index a115389..0000000
--- a/res/drawable/filtershow_background_new.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
new file mode 100644
index 0000000..57a4c8f
--- /dev/null
+++ b/res/drawable/floating_action_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The CyanogenMod Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="@color/floating_action_button_touch_tint">
+  <item android:id="@android:id/mask">
+    <shape android:shape="oval">
+      <solid android:color="@color/fab" />
+    </shape>
+  </item>
+</ripple>
diff --git a/res/drawable/ic_edit.xml b/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..1116c1c
--- /dev/null
+++ b/res/drawable/ic_edit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="30dp"
+  android:height="30dp"
+  android:viewportWidth="48"
+  android:viewportHeight="48">
+
+  <path
+    android:fillColor="#ffffff"
+    android:pathData="M14,28c-3.31,0-6,2.689-6,6c0,2.62-2.31,4-4,4c1.84,
+    2.439,4.99,4,8,4c4.42,0,8-3.58,8-8C20,30.689,17.31,28,14,28Z
+    M41.41,9.26l-2.67-2.67c-0.78-0.78-2.051-0.78-2.83,0L18,	
+    24.5l5.5,5.5l17.91-17.91C42.2,11.3,42.2,10.04,41.41,9.26z" />
+  </vector>
diff --git a/res/drawable/ic_menu_share.xml b/res/drawable/ic_menu_share.xml
new file mode 100644
index 0000000..4f15606
--- /dev/null
+++ b/res/drawable/ic_menu_share.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="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M36,32.17c-1.52,0-2.891,0.59-3.93,1.54L17.82,
+        25.4C17.93,24.95,18,24.48,18,24s-0.07-0.95-0.18-1.4l14.1-8.23
+        c1.07,1,2.5,1.62,4.08,1.62c3.311,0,6-2.69,6-6c0-3.31-2.689-6-6-6s-6,
+        2.69-6,6c0,0.48,0.07,0.95,0.18,1.4l-14.1,8.23
+        c-1.07-1-2.5-1.62-4.08-1.62c-3.31,0-6,2.69-6,6c0,3.311,2.69,6,6,6c1.58,
+        0,3.01-0.62,4.08-1.62l14.25,8.31c-0.1,0.42-0.16,0.86-0.16,1.311c0,
+        3.221,2.609,5.83,5.83,5.83s5.83-2.609,5.83-5.83S39.221,32.17,36,32.17Z"
+    />
+</vector>
diff --git a/res/drawable/ic_menu_single_track.xml b/res/drawable/ic_menu_single_track.xml
new file mode 100644
index 0000000..9ca139a
--- /dev/null
+++ b/res/drawable/ic_menu_single_track.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M24,4C12.97,4,4,12.97,4,24c0,11.029,8.97,20,20,
+        20c11.029,0,20-8.971,20-20C44,12.97,35.029,4,24,4ZM24,40c-8.82,
+        0-16-7.18-16-16c0-8.82,7.18-16,16-16c8.82,0,16,7.18,16,16C40,32.82,
+        32.82,40,24,40zM30,24c0,3.311-2.689,6-6,6
+        c-3.31,0-6-2.689-6-6c0-3.31,2.69-6,6-6C27.311,18,30,20.69,30,24z" />
+</vector>
diff --git a/res/drawable/ic_menu_stereo.xml b/res/drawable/ic_menu_stereo.xml
new file mode 100644
index 0000000..1d10587
--- /dev/null
+++ b/res/drawable/ic_menu_stereo.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M34,4H14c-2.21,0-4,1.79-4,4v32c0,2.21,1.79,3.98,4,
+        3.98L34,44c2.21,0,4-1.79,4-4V8C38,5.79,36.21,4,34,4Z
+        M24,8 c2.21,0,4,1.79,4,4s-1.79,4-4,4s-4-1.79-4-4S21.79,8,24,8z
+        M24,40c-5.52,0-10-4.48-10-10c0-5.52,4.48-10,10-10c5.52,0,10,4.48,10,10
+        C34,35.52,29.52,40,24,40zM24,24c-3.31,0-6,2.689-6,6s2.69,6,6,6c3.311,
+        0,6-2.689,6-6S27.311,24,24,24z" />
+</vector>
diff --git a/res/drawable/ic_menu_trash.xml b/res/drawable/ic_menu_trash.xml
new file mode 100644
index 0000000..8c5f85a
--- /dev/null
+++ b/res/drawable/ic_menu_trash.xml
@@ -0,0 +1,12 @@
+<?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="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,38c0,2.21,1.79,4,4,4h16c2.21,0,4-1.79,
+        4-4V14H12V38ZM38,8h-7l-2-2H19l-2,2h-7v4h28V8z" />
+</vector>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/drawable/icn_media_forward.xml
similarity index 64%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/drawable/icn_media_forward.xml
index dfc7592..374ca5d 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/drawable/icn_media_forward.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true"
+        android:drawable="@drawable/ic_menu_forward" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_menu_disabled_forward" />
+</selector>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/drawable/icn_media_rewind.xml
similarity index 64%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/drawable/icn_media_rewind.xml
index dfc7592..b606637 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/drawable/icn_media_rewind.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true"
+        android:drawable="@drawable/ic_menu_rewind" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_menu_disabled_rewind" />
+</selector>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/drawable/icn_media_stop.xml
similarity index 64%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/drawable/icn_media_stop.xml
index dfc7592..31d8555 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/drawable/icn_media_stop.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true"
+        android:drawable="@drawable/ic_menu_stop" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_menu_disabled_stop" />
+</selector>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/drawable/videoplayer_pause.xml
similarity index 63%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/drawable/videoplayer_pause.xml
index dfc7592..39a4361 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/drawable/videoplayer_pause.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true"
+        android:drawable="@drawable/ic_vidcontrol_pause" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_vidcontrol_disable_pause" />
+</selector>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/drawable/videoplayer_play.xml
similarity index 64%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/drawable/videoplayer_play.xml
index dfc7592..be78a7b 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/drawable/videoplayer_play.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true"
+        android:drawable="@drawable/ic_vidcontrol_play" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_vidcontrol_disable_play" />
+</selector>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/drawable/videoplayer_reload.xml
similarity index 63%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/drawable/videoplayer_reload.xml
index dfc7592..b5d48bf 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/drawable/videoplayer_reload.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true"
+        android:drawable="@drawable/ic_vidcontrol_reload" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_vidcontrol_disable_reload" />
+</selector>
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index d177240..4baf23e 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -24,13 +24,13 @@
             android:clickable="true"
             android:layout_height="match_parent"
             android:layout_width="@dimen/switcher_size"
-            android:layout_gravity="right" />
+            android:layout_gravity="end" />
 
         <include layout="@layout/menu_indicators"
             android:layout_width="64dip"
             android:layout_height="64dip"
             android:layout_marginTop="-5dip"
-            android:layout_marginRight="6dip"
+            android:layout_marginEnd="6dip"
             android:layout_gravity="top|right"/>
 
         <com.android.camera.ui.PieMenuButton
@@ -38,13 +38,13 @@
             style="@style/SwitcherButton"
             android:contentDescription="@string/accessibility_menu_button"
             android:layout_gravity="right|top"
-            android:layout_marginRight="2dip" />
+            android:layout_marginEnd="2dip" />
 
         <com.android.camera.ui.CameraSwitcher
             android:id="@+id/camera_switcher"
             style="@style/SwitcherButton"
             android:layout_gravity="right|bottom"
-            android:layout_marginRight="2dip"
+            android:layout_marginEnd="2dip"
             android:contentDescription="@string/accessibility_mode_picker" />
 
         <com.android.camera.ShutterButton
@@ -52,7 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right|center_vertical"
-            android:layout_marginRight="@dimen/shutter_offset"
+            android:layout_marginEnd="@dimen/shutter_offset"
             android:clickable="true"
             android:contentDescription="@string/accessibility_shutter_button"
             android:focusable="true"
diff --git a/res/layout-land/filtershow_activity.xml b/res/layout-land/filtershow_activity.xml
index f438012..c1c7e0e 100644
--- a/res/layout-land/filtershow_activity.xml
+++ b/res/layout-land/filtershow_activity.xml
@@ -19,7 +19,7 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:id="@+id/mainView"
-             android:background="@drawable/filtershow_tiled_background">
+             android:background="@color/filtershow_background">
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -35,7 +35,7 @@
 
             <ProgressBar
                     android:id="@+id/loading"
-                    style="@android:style/Widget.Holo.ProgressBar.Large"
+                    style="@android:style/Widget.Material.ProgressBar.Large"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/res/layout-land/filtershow_color_border_ui.xml b/res/layout-land/filtershow_color_border_ui.xml
index 9945d9d..82fe14a 100644
--- a/res/layout-land/filtershow_color_border_ui.xml
+++ b/res/layout-land/filtershow_color_border_ui.xml
@@ -46,14 +46,14 @@
 
                 <TextView
                         android:id="@+id/controlName1"
-                        android:layout_gravity="left"
-                        android:layout_marginLeft="8dip"
+                        android:layout_gravity="start"
+                        android:layout_marginStart="8dip"
                         android:text="@string/color_border_size"/>
 
                 <TextView
                         android:id="@+id/colorBorderSizeValue"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="8dip"
+                        android:layout_gravity="end"
+                        android:layout_marginEnd="8dip"
                         android:textStyle="bold"/>
 
                 <SeekBar
@@ -74,14 +74,14 @@
 
                 <TextView
                         android:id="@+id/controlName2"
-                        android:layout_gravity="left"
-                        android:layout_marginLeft="8dip"
+                        android:layout_gravity="start"
+                        android:layout_marginStart="8dip"
                         android:text="@string/color_border_corner_size"/>
 
                 <TextView
                         android:id="@+id/colorBorderCornerValue"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="8dip"
+                        android:layout_gravity="end"
+                        android:layout_marginEnd="8dip"
                         android:textStyle="bold"/>
 
                 <SeekBar
@@ -122,7 +122,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/draw_color"
-                    android:layout_marginLeft="8dip"
+                    android:layout_marginStart="8dip"
                     android:id="@+id/textView"/>
 
 
@@ -130,8 +130,8 @@
                     android:id="@+id/btnSelect"
                     android:layout_width="match_parent"
                     android:layout_height="32dp"
-                    android:layout_marginLeft="18dp"
-                    android:layout_marginRight="18dp"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="18dp"
                     android:layout_marginTop="0dp"
                     android:layout_marginBottom="0dp"
                     />
@@ -142,7 +142,7 @@
                     android:layout_height="@dimen/draw_ui_width"
                     android:layout_gravity="center"
                     android:layout_marginTop="8dp"
-                    android:layout_marginRight="1dp"/>
+                    android:layout_marginEnd="1dp"/>
 
             <com.android.gallery3d.filtershow.colorpicker.ColorHueView
                     android:id="@+id/ColorHueView"
@@ -164,8 +164,8 @@
             android:orientation="horizontal"
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
-            android:layout_marginLeft="1dp"
-            android:layout_marginRight="1dp">
+            android:layout_marginStart="1dp"
+            android:layout_marginEnd="1dp">
 
         <LinearLayout
                 android:layout_width="match_parent"
@@ -173,8 +173,8 @@
                 android:orientation="horizontal"
                 android:layout_marginBottom="10dp"
                 android:layout_marginTop="10dp"
-                android:layout_marginLeft="1dp"
-                android:layout_marginRight="1dp">
+                android:layout_marginStart="1dp"
+                android:layout_marginEnd="1dp">
 
             <LinearLayout
                     android:id="@+id/listColors"
@@ -189,7 +189,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button02"
@@ -197,7 +197,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button03"
@@ -205,7 +205,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button04"
@@ -213,7 +213,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button05"
@@ -221,7 +221,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
             </LinearLayout>
             <FrameLayout
diff --git a/res/layout-land/filtershow_draw_ui.xml b/res/layout-land/filtershow_draw_ui.xml
index 5e0a327..642a7bd 100644
--- a/res/layout-land/filtershow_draw_ui.xml
+++ b/res/layout-land/filtershow_draw_ui.xml
@@ -55,14 +55,14 @@
 
                 <TextView
                         android:id="@+id/controlName1"
-                        android:layout_gravity="left"
-                        android:layout_marginLeft="8dip"
+                        android:layout_gravity="start"
+                        android:layout_marginStart="8dip"
                         android:text="@string/draw_size"/>
 
                 <TextView
                         android:id="@+id/drawSizeValue"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="8dip"
+                        android:layout_gravity="end"
+                        android:layout_marginEnd="8dip"
                         android:textStyle="bold"/>
 
                 <SeekBar
@@ -106,7 +106,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/draw_color"
-                    android:layout_marginLeft="8dip"
+                    android:layout_marginStart="8dip"
                     android:id="@+id/textView"
                     android:visibility="gone"/>
 
@@ -114,8 +114,8 @@
                     android:id="@+id/btnSelect"
                     android:layout_width="match_parent"
                     android:layout_height="32dp"
-                    android:layout_marginLeft="18dp"
-                    android:layout_marginRight="18dp"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="18dp"
                     android:layout_marginTop="0dp"
                     android:layout_marginBottom="0dp"
                     />
@@ -126,7 +126,7 @@
                     android:layout_height="@dimen/draw_ui_width"
                     android:layout_gravity="center"
                     android:layout_marginTop="8dp"
-                    android:layout_marginRight="1dp"/>
+                    android:layout_marginEnd="1dp"/>
 
             <com.android.gallery3d.filtershow.colorpicker.ColorHueView
                     android:id="@+id/ColorHueView"
@@ -149,8 +149,8 @@
             android:orientation="horizontal"
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
-            android:layout_marginLeft="1dp"
-            android:layout_marginRight="1dp">
+            android:layout_marginStart="1dp"
+            android:layout_marginEnd="1dp">
 
 
             <LinearLayout
@@ -166,7 +166,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button02"
@@ -174,7 +174,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button03"
@@ -182,7 +182,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button04"
@@ -190,7 +190,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button05"
@@ -198,7 +198,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_marginRight="4dp"/>
+                        android:layout_marginEnd="4dp"/>
 
             </LinearLayout>
 
diff --git a/res/layout-land/filtershow_grad_ui.xml b/res/layout-land/filtershow_grad_ui.xml
index fd09bee..8f6a8ae 100644
--- a/res/layout-land/filtershow_grad_ui.xml
+++ b/res/layout-land/filtershow_grad_ui.xml
@@ -30,14 +30,14 @@
 
         <TextView
                 android:id="@+id/controlName1"
-                android:layout_gravity="left"
-                android:layout_marginLeft="8dip"
+                android:layout_gravity="start"
+                android:layout_marginStart="8dip"
                 android:text="@string/editor_grad_brightness" />
 
         <TextView
                 android:id="@+id/gradBrightnessValue"
-                android:layout_gravity="right"
-                android:layout_marginRight="8dip"
+                android:layout_gravity="end"
+                android:layout_marginEnd="8dip"
                 android:textStyle="bold" />
 
         <SeekBar
@@ -58,14 +58,14 @@
 
         <TextView
                 android:id="@+id/controlName2"
-                android:layout_gravity="left"
-                android:layout_marginLeft="8dip"
+                android:layout_gravity="start"
+                android:layout_marginStart="8dip"
                 android:text="@string/editor_grad_saturation"/>
 
         <TextView
                 android:id="@+id/gradSaturationValue"
-                android:layout_gravity="right"
-                android:layout_marginRight="8dip"
+                android:layout_gravity="end"
+                android:layout_marginEnd="8dip"
                 android:textStyle="bold" />
 
         <SeekBar
@@ -84,14 +84,14 @@
 
         <TextView
                 android:id="@+id/controlName3"
-                android:layout_gravity="left"
-                android:layout_marginLeft="8dip"
+                android:layout_gravity="start"
+                android:layout_marginStart="8dip"
                 android:text="@string/editor_grad_contrast"/>
 
         <TextView
                 android:id="@+id/gradContrastValue"
-                android:layout_gravity="right"
-                android:layout_marginRight="8dip"
+                android:layout_gravity="end"
+                android:layout_marginEnd="8dip"
                 android:textStyle="bold" />
 
         <SeekBar
@@ -120,7 +120,7 @@
             android:background="@drawable/filtershow_button_background"
             android:src="@drawable/filtershow_addpoint"
             android:paddingBottom="8dp"
-            android:layout_marginLeft="48dp" />
+            android:layout_marginStart="48dp" />
 
         <View
             android:layout_width="wrap_content"
@@ -136,9 +136,9 @@
             android:scaleType="centerInside"
             android:layout_weight="0"
             android:background="@drawable/filtershow_button_background"
-            android:src="@drawable/ic_menu_trash_holo_light"
+            android:src="@drawable/ic_menu_trash"
             android:paddingBottom="8dp"
-            android:layout_marginRight="48dp" />
+            android:layout_marginEnd="48dp" />
 
     </LinearLayout>
 
diff --git a/res/layout-land/filtershow_main_panel.xml b/res/layout-land/filtershow_main_panel.xml
index 6a36de2..e508e76 100644
--- a/res/layout-land/filtershow_main_panel.xml
+++ b/res/layout-land/filtershow_main_panel.xml
@@ -83,6 +83,16 @@
                     android:padding="2dip"
                     android:scaleType="centerInside"
                     android:src="@drawable/ic_photoeditor_color"/>
+            <ImageButton
+                    android:id="@+id/makeupButton"
+                    android:layout_width="@dimen/thumbnail_size"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/filtershow_button_background"
+                    android:padding="2dip"
+                    android:scaleType="centerInside"
+                    android:visibility="gone"
+                    android:src="@drawable/ic_photoeditor_makeup"/>
 
         </LinearLayout>
 
diff --git a/res/layout-land/filtershow_saturation_controls.xml b/res/layout-land/filtershow_saturation_controls.xml
index f452a64..6003b73 100644
--- a/res/layout-land/filtershow_saturation_controls.xml
+++ b/res/layout-land/filtershow_saturation_controls.xml
@@ -25,11 +25,11 @@
                     android:text="@string/editor_chan_sat_red"
                     android:textStyle="bold"
                     android:textColor="#ff8080"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/redValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/redSeekBar"
                     android:layout_width="match_parent"
@@ -42,11 +42,11 @@
                     android:text="@string/editor_chan_sat_yellow"
                     android:textStyle="bold"
                     android:textColor="#ffff80"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/yellowValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/yellowSeekBar"
                     android:layout_width="match_parent"
@@ -59,11 +59,11 @@
                     android:text="@string/editor_chan_sat_green"
                     android:textStyle="bold"
                     android:textColor="#80ff80"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/greenValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/greenSeekBar"
                     android:layout_width="match_parent"
@@ -76,11 +76,11 @@
                     android:text="@string/editor_chan_sat_cyan"
                     android:textStyle="bold"
                     android:textColor="#80ffff"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/cyanValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/cyanSeekBar"
                     android:layout_width="match_parent"
@@ -93,11 +93,11 @@
                     android:text="@string/editor_chan_sat_blue"
                     android:textStyle="bold"
                     android:textColor="#8080ff"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/blueValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/blueSeekBar"
                     android:layout_width="match_parent"
@@ -110,11 +110,11 @@
                     android:text="@string/editor_chan_sat_magenta"
                     android:textStyle="bold"
                     android:textColor="#ff80ff"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/magentaValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/magentaSeekBar"
                     android:layout_width="match_parent"
@@ -137,11 +137,11 @@
         <TextView
                 android:layout_gravity="left|center_vertical"
                 android:text="@string/editor_chan_sat_main"
-                android:layout_marginLeft="8dp"/>
+                android:layout_marginStart="8dp"/>
         <TextView
                 android:layout_gravity="right|center_vertical"
                 android:id="@+id/mainValue"
-                android:layout_marginRight="16dp"/>
+                android:layout_marginEnd="16dp"/>
         <SeekBar
                 android:id="@+id/mainSeekbar"
                 android:layout_width="match_parent"
diff --git a/res/layout-land/filtershow_vignette_controls.xml b/res/layout-land/filtershow_vignette_controls.xml
index 9bfb29f..7cb27e9 100644
--- a/res/layout-land/filtershow_vignette_controls.xml
+++ b/res/layout-land/filtershow_vignette_controls.xml
@@ -24,12 +24,12 @@
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/vignette_exposure"
                     android:textStyle="bold"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:visibility="gone"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/exposureValue"
-                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
                     android:visibility="gone"/>
             <SeekBar
                     android:id="@+id/exposureSeekBar"
@@ -43,11 +43,11 @@
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/vignette_saturation"
                     android:textStyle="bold"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/saturationValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/saturationSeekBar"
                     android:layout_width="match_parent"
@@ -59,11 +59,11 @@
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/vignette_contrast"
                     android:textStyle="bold"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/contrastValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/contrastSeekBar"
                     android:layout_width="match_parent"
@@ -75,11 +75,11 @@
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/vignette_falloff"
                     android:textStyle="bold"
-                    android:layout_marginLeft="8dp"/>
+                    android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/falloffValue"
-                    android:layout_marginRight="16dp"/>
+                    android:layout_marginEnd="16dp"/>
             <SeekBar
                     android:id="@+id/falloffSeekBar"
                     android:layout_width="match_parent"
@@ -103,11 +103,11 @@
         <TextView
                 android:layout_gravity="left|center_vertical"
                 android:text="@string/vignette_main"
-                android:layout_marginLeft="8dp"/>
+                android:layout_marginStart="8dp"/>
         <TextView
                 android:layout_gravity="right|center_vertical"
                 android:id="@+id/mainVignetteValue"
-                android:layout_marginRight="16dp"/>
+                android:layout_marginEnd="16dp"/>
         <SeekBar
                 android:id="@+id/mainVignetteSeekbar"
                 android:layout_width="match_parent"
diff --git a/res/layout-land/keyguard_widget.xml b/res/layout-land/keyguard_widget.xml
index f0f4362..6839623 100644
--- a/res/layout-land/keyguard_widget.xml
+++ b/res/layout-land/keyguard_widget.xml
@@ -25,8 +25,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="@dimen/shutter_offset"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="@dimen/shutter_offset"
         android:contentDescription="@string/accessibility_shutter_button"
         android:scaleType="center"
         android:src="@drawable/btn_new_shutter" />
@@ -35,8 +35,8 @@
         android:layout_width="64dip"
         android:layout_height="64dip"
         android:layout_above="@id/shutter_button"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="6dip"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="-5dip"
         layout="@layout/menu_indicators_keyguard" />
 
@@ -44,8 +44,8 @@
         android:id="@+id/camera_switcher"
         style="@style/SwitcherButton"
         android:layout_below="@id/shutter_button"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="2dip"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="2dip"
         android:contentDescription="@string/accessibility_mode_picker"
         android:scaleType="center"
         android:src="@drawable/ic_switch_camera" />
@@ -54,8 +54,8 @@
         android:id="@+id/camera_switcher_ind"
         style="@style/SwitcherButton"
         android:layout_below="@id/shutter_button"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="2dip"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="2dip"
         android:contentDescription="@string/accessibility_mode_picker"
         android:scaleType="center"
         android:src="@drawable/ic_switcher_menu_indicator" />
diff --git a/res/layout-land/review_module_control.xml b/res/layout-land/review_module_control.xml
index 9f8b0cd..6e0ee4a 100644
--- a/res/layout-land/review_module_control.xml
+++ b/res/layout-land/review_module_control.xml
@@ -16,21 +16,21 @@
 <com.android.camera.ui.RotatableLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
         style="@style/CameraControls"
-        android:layout_gravity="right|center_vertical"
-        android:layout_marginRight="2dip">
+        android:layout_gravity="end|center_vertical"
+        android:layout_marginEnd="2dip">
     <ImageView android:id="@+id/btn_done"
             style="@style/ReviewControlIcon"
             android:contentDescription="@string/accessibility_review_ok"
             android:visibility="gone"
             android:scaleType="center"
-            android:layout_gravity="top|right"
+            android:layout_gravity="top|end"
             android:background="@drawable/bg_pressed"
             android:src="@drawable/ic_menu_done_holo_light" />
 
     <ImageView android:id="@+id/btn_retake"
         style="@style/ReviewControlIcon"
         android:contentDescription="@string/accessibility_review_retake"
-        android:layout_gravity="right|center_vertical"
+        android:layout_gravity="end|center_vertical"
         android:scaleType="center"
         android:focusable="true"
         android:visibility="gone"
@@ -42,7 +42,7 @@
             android:contentDescription="@string/accessibility_review_cancel"
             android:visibility="gone"
             android:scaleType="center"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:background="@drawable/bg_pressed"
             android:src="@drawable/ic_menu_cancel_holo_light" />
 </com.android.camera.ui.RotatableLayout>
diff --git a/res/layout-land/switcher_popup.xml b/res/layout-land/switcher_popup.xml
index fc2d7bc..ebb4243 100644
--- a/res/layout-land/switcher_popup.xml
+++ b/res/layout-land/switcher_popup.xml
@@ -19,10 +19,10 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom|right"
-    android:layout_marginRight="8dip"
+    android:layout_marginEnd="8dip"
     android:layout_marginBottom="8dip"
-    android:paddingLeft="8dip"
-    android:paddingRight="8dip"
+    android:paddingStart="8dip"
+    android:paddingEnd="8dip"
     android:paddingTop="16dip"
     android:paddingBottom="16dip"
     android:background="#80000000" />
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 5f89830..e3ad8c1 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -31,7 +31,7 @@
             android:layout_height="64dip"
             android:layout_gravity="bottom|right"
             android:layout_marginBottom="6dip"
-            android:layout_marginRight="-5dip" />
+            android:layout_marginEnd="-5dip" />
 
         <com.android.camera.ui.PieMenuButton
             android:id="@+id/menu"
diff --git a/res/layout-port/keyguard_widget.xml b/res/layout-port/keyguard_widget.xml
index 28b59c4..40a601f 100644
--- a/res/layout-port/keyguard_widget.xml
+++ b/res/layout-port/keyguard_widget.xml
@@ -32,15 +32,15 @@
     <include layout="@layout/menu_indicators_keyguard"
         android:layout_width="64dip"
         android:layout_height="64dip"
-        android:layout_toRightOf="@id/shutter"
+        android:layout_toEndOf="@id/shutter"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="6dip"
-        android:layout_marginRight="-5dip" />
+        android:layout_marginEnd="-5dip" />
 
     <ImageView
         android:id="@+id/camera_switcher"
         style="@style/SwitcherButton"
-        android:layout_toLeftOf="@id/shutter"
+        android:layout_toStartOf="@id/shutter"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="2dip"
         android:scaleType="center"
@@ -50,7 +50,7 @@
     <ImageView
         android:id="@+id/camera_switcher_ind"
         style="@style/SwitcherButton"
-        android:layout_toLeftOf="@id/shutter"
+        android:layout_toStartOf="@id/shutter"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="2dip"
         android:scaleType="center"
diff --git a/res/layout-port/review_module_control.xml b/res/layout-port/review_module_control.xml
index 3c4280e..c7b04f7 100644
--- a/res/layout-port/review_module_control.xml
+++ b/res/layout-port/review_module_control.xml
@@ -23,7 +23,7 @@
             android:contentDescription="@string/accessibility_review_ok"
             android:visibility="gone"
             android:scaleType="center"
-            android:layout_gravity="right|bottom"
+            android:layout_gravity="end|bottom"
             android:background="@drawable/bg_pressed"
             android:src="@drawable/ic_menu_done_holo_light" />
 
@@ -42,7 +42,7 @@
             android:contentDescription="@string/accessibility_review_cancel"
             android:visibility="gone"
             android:scaleType="center"
-            android:layout_gravity="left|bottom"
+            android:layout_gravity="start|bottom"
             android:background="@drawable/bg_pressed"
             android:src="@drawable/ic_menu_cancel_holo_light" />
 </com.android.camera.ui.RotatableLayout>
diff --git a/res/layout-port/switcher_popup.xml b/res/layout-port/switcher_popup.xml
index 8fe09a3..609f869 100644
--- a/res/layout-port/switcher_popup.xml
+++ b/res/layout-port/switcher_popup.xml
@@ -19,10 +19,10 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom|left"
-    android:layout_marginLeft="8dip"
+    android:layout_marginStart="8dip"
     android:layout_marginBottom="8dip"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip"
+    android:paddingStart="16dip"
+    android:paddingEnd="16dip"
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
     android:background="#80000000" />
diff --git a/res/layout/action_bar_text.xml b/res/layout/action_bar_text.xml
index a332647..10839ea 100644
--- a/res/layout/action_bar_text.xml
+++ b/res/layout/action_bar_text.xml
@@ -21,8 +21,8 @@
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:gravity="center_vertical"
-    android:paddingLeft="18dp"
-    android:paddingRight="18dp"
+    android:paddingStart="18dp"
+    android:paddingEnd="18dp"
     android:singleLine="true"
     android:minHeight="?attr/listPreferredItemHeightSmall"
 />
diff --git a/res/layout/action_bar_two_line_text.xml b/res/layout/action_bar_two_line_text.xml
index 92a4af9..6233d8e 100644
--- a/res/layout/action_bar_two_line_text.xml
+++ b/res/layout/action_bar_two_line_text.xml
@@ -19,7 +19,7 @@
         android:orientation="vertical"
         android:gravity="center_vertical"
         android:duplicateParentState="false"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_width="wrap_content" >
         <TextView
             android:id="@android:id/text1"
@@ -35,7 +35,7 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:includeFontPadding="false"
-            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
             android:layout_below="@android:id/text1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index 6c516e6..096187b 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -14,35 +14,22 @@
      limitations under the License.
 -->
 
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/navigation_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="wrap_content"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
             android:layout_height="match_parent">
-        <ImageView android:layout_gravity="right"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:src="@drawable/dropdown_ic_arrow_normal_holo_dark" />
-        <Button android:id="@+id/selection_menu"
-                style="?android:attr/actionButtonStyle"
-                android:divider="?android:attr/listDividerAlertDialog"
-                android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-                android:textColor="?android:attr/actionMenuTextColor"
-                android:singleLine="true"
-                android:gravity="left|center_vertical"
-                android:paddingRight="25dip"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent" />
-    </FrameLayout>
-    <ImageView android:layout_marginLeft="16dip"
-            android:layout_marginRight="8dip"
+    <Button android:id="@+id/selection_menu"
+            style="?android:attr/actionButtonStyle"
+            android:divider="?android:attr/listDividerAlertDialog"
+            android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
+            android:textColor="?android:attr/actionMenuTextColor"
+            android:singleLine="true"
+            android:gravity="left|center_vertical"
+            android:paddingRight="25dip"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            android:src="@drawable/cab_divider_vertical_dark" />
-</LinearLayout>
+            android:layout_height="match_parent" />
+    <ImageView android:layout_width="wrap_content"
+               android:layout_height="match_parent"
+               android:src="@drawable/dropdown_ic_arrow"
+               android:layout_toRightOf="@id/selection_menu"/>
+
+</RelativeLayout>
diff --git a/res/layout/album_header.xml b/res/layout/album_header.xml
index 76c9a45..caae962 100644
--- a/res/layout/album_header.xml
+++ b/res/layout/album_header.xml
@@ -27,8 +27,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:paddingLeft="15dip"
+        android:layout_alignParentStart="true"
+        android:paddingStart="15dip"
         android:paddingBottom="10dip"
         android:paddingTop="20dip"
         android:background="@drawable/white_text_bg_gradient"
diff --git a/res/layout/appwidget_main.xml b/res/layout/appwidget_main.xml
index 0accabb..368d90b 100644
--- a/res/layout/appwidget_main.xml
+++ b/res/layout/appwidget_main.xml
@@ -31,6 +31,7 @@
                     android:layout_width="@dimen/stack_photo_width"
                     android:layout_height="@dimen/stack_photo_height"
                     android:gravity="center"
+                    android:textColor="@android:color/black"
                     android:text="@string/appwidget_empty_text"/>
         </FrameLayout>
     </RelativeLayout>
diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml
new file mode 100644
index 0000000..49dcafb
--- /dev/null
+++ b/res/layout/audio_effects_dialog.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:paddingBottom="10dp">
+
+        <LinearLayout
+            android:id="@+id/aEffectsPanel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="10dp"
+            android:gravity="center_vertical">
+
+            <com.android.gallery3d.ui.Knob
+                android:id="@+id/bBStrengthKnob"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                custom:label="@string/bass_boost_strength"
+                custom:foreground="@drawable/knob" />
+
+            <com.android.gallery3d.ui.Knob
+                android:id="@+id/vIStrengthKnob"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                custom:label="@string/virtualizer_strength"
+                custom:foreground="@drawable/knob" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/audio_effects_title.xml b/res/layout/audio_effects_title.xml
new file mode 100644
index 0000000..fcfb11d
--- /dev/null
+++ b/res/layout/audio_effects_title.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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 "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"
+    xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="left|center_vertical">
+
+    <TextView
+        android:text="@string/audio_effects_dialog_title"
+        android:gravity="left|center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:textSize="20dp" />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+    <ToggleButton
+        android:id="@+id/audio_effects_switch"
+        android:textOn=""
+        android:textOff=""
+        android:layout_width="72dp"
+        android:layout_height="34dp"
+        android:layout_marginEnd="4dp"/>
+</LinearLayout>
diff --git a/res/layout/bookmark.xml b/res/layout/bookmark.xml
new file mode 100644
index 0000000..ac4ac34
--- /dev/null
+++ b/res/layout/bookmark.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:gravity="center"
+        android:paddingBottom="30dip"
+        android:text="@string/bookmark_empty"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:visibility="gone" />
+</FrameLayout>
diff --git a/res/layout/bookmark_edit_dialog.xml b/res/layout/bookmark_edit_dialog.xml
new file mode 100644
index 0000000..8282d39
--- /dev/null
+++ b/res/layout/bookmark_edit_dialog.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="8dip" >
+
+        <TextView
+            style="?android:attr/textAppearanceSmallInverse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bookmark_title" />
+
+        <EditText
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dip"
+            android:inputType="text"
+            android:scrollHorizontally="true"
+            android:singleLine="true" />
+
+        <TextView
+            style="?android:attr/textAppearanceSmallInverse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bookmark_location" />
+
+        <EditText
+            android:id="@+id/data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dip"
+            android:inputType="textUri"
+            android:scrollHorizontally="true"
+            android:singleLine="true" />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/bookmark_item.xml b/res/layout/bookmark_item.xml
new file mode 100644
index 0000000..3fb2fab
--- /dev/null
+++ b/res/layout/bookmark_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/panel"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="6dip" >
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/data"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index d94a9d2..6fbc621 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -32,8 +32,8 @@
         android:background="@drawable/transparent_button_background"
         android:clickable="true"
         android:paddingBottom="5dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
         android:paddingTop="5dp"
         android:visibility="gone"
         android:src="@drawable/ic_view_photosphere" />
@@ -44,8 +44,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:paddingBottom="52dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
         android:paddingTop="5dp"
         android:visibility="gone"
         android:orientation="vertical">
@@ -61,10 +61,10 @@
             android:shadowRadius="2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:paddingBottom="8dp"
             android:visibility="visible"
-            android:layout_gravity="right"/>
+            android:layout_gravity="end"/>
 
         <ProgressBar
             android:id="@+id/pano_stitching_progress_bar"
diff --git a/res/layout/choose_widget_type.xml b/res/layout/choose_widget_type.xml
index 5f1739a..d8af048 100644
--- a/res/layout/choose_widget_type.xml
+++ b/res/layout/choose_widget_type.xml
@@ -16,8 +16,8 @@
 
 <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/widget_type"
-        android:paddingLeft="32dp"
-        android:paddingRight="32dp"
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -42,8 +42,8 @@
     <View android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_weight="0"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:background="?android:attr/dividerHorizontal" />
     <Button style="?android:attr/buttonBarButtonStyle"
             android:id="@+id/cancel"
diff --git a/res/layout/count_down_to_capture.xml b/res/layout/count_down_to_capture.xml
index 68276ad..5cf1e3f 100644
--- a/res/layout/count_down_to_capture.xml
+++ b/res/layout/count_down_to_capture.xml
@@ -27,7 +27,7 @@
     <TextView android:id="@+id/count_down_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
+        android:paddingStart="10dp"
         android:paddingTop="20dp"
         android:textSize="20sp"
         android:textColor="@android:color/white"
diff --git a/res/layout/countdown_setting_popup.xml b/res/layout/countdown_setting_popup.xml
index 22acd92..1a314ad 100644
--- a/res/layout/countdown_setting_popup.xml
+++ b/res/layout/countdown_setting_popup.xml
@@ -55,8 +55,8 @@
                 android:layout_width="160dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
+                android:layout_marginStart="16dip"
+                android:layout_marginEnd="16dip"
                 android:focusable="false" />
         </LinearLayout>
 
diff --git a/res/layout/dialog_picker.xml b/res/layout/dialog_picker.xml
index ccc5121..fc5f287 100644
--- a/res/layout/dialog_picker.xml
+++ b/res/layout/dialog_picker.xml
@@ -26,8 +26,8 @@
     </FrameLayout>
     <ImageView android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:background="@drawable/list_divider_holo_dark" />
     <Button style="?android:attr/buttonBarButtonStyle"
             android:id="@+id/cancel"
diff --git a/res/layout/editor_grad_button.xml b/res/layout/editor_grad_button.xml
index 4d1b10b..032eb68 100644
--- a/res/layout/editor_grad_button.xml
+++ b/res/layout/editor_grad_button.xml
@@ -20,7 +20,7 @@
     android:layout_height="wrap_content"
     android:layout_weight="1"
     android:layout_alignParentTop="true"
-    android:layout_marginLeft="26dp"
+    android:layout_marginStart="26dp"
     android:layout_marginTop="21dp"
     android:orientation="horizontal" >
 
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index 5f0aa3f..924d717 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -17,11 +17,10 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:background="@drawable/filtershow_button_background"
     android:id="@+id/filtershow_done"
     android:textAllCaps="true"
     android:text="@string/save"
     android:gravity="center_vertical"
     android:textSize="14sp"
-    android:drawableLeft="@drawable/menu_save_photo"
+    android:drawableStart="@drawable/menu_save_photo"
     android:drawablePadding="8dip" />
\ No newline at end of file
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 79c315b..e3f4a0e 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -19,7 +19,7 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:id="@+id/mainView"
-             android:background="@drawable/filtershow_tiled_background">
+             android:background="@color/filtershow_background">
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -33,7 +33,7 @@
 
             <ProgressBar
                     android:id="@+id/loading"
-                    style="@android:style/Widget.Holo.ProgressBar.Large"
+                    style="@android:style/Widget.Material.ProgressBar.Large"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/res/layout/filtershow_color_picker.xml b/res/layout/filtershow_color_picker.xml
index e56bc0d..7b05765 100644
--- a/res/layout/filtershow_color_picker.xml
+++ b/res/layout/filtershow_color_picker.xml
@@ -30,8 +30,8 @@
                 android:id="@+id/btnSelect"
                 android:layout_width="match_parent"
                 android:layout_height="32dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="0dp"
                 />
@@ -40,7 +40,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="256dp"
                 android:layout_marginTop="0dp"
-                android:layout_marginRight="1dp"/>
+                android:layout_marginEnd="1dp"/>
 
         <com.android.gallery3d.filtershow.colorpicker.ColorHueView
                 android:id="@+id/ColorHueView"
diff --git a/res/layout/filtershow_control_action_slider.xml b/res/layout/filtershow_control_action_slider.xml
index 34eac1e..ebaf7be 100644
--- a/res/layout/filtershow_control_action_slider.xml
+++ b/res/layout/filtershow_control_action_slider.xml
@@ -48,7 +48,7 @@
         android:scaleType="centerInside"
         android:layout_weight="0"
         android:background="@drawable/filtershow_button_background"
-        android:src="@drawable/ic_menu_trash_holo_light"
+        android:src="@drawable/ic_menu_trash"
         android:paddingBottom="8dp"  />
 
 </LinearLayout>
diff --git a/res/layout/filtershow_control_color_chooser.xml b/res/layout/filtershow_control_color_chooser.xml
index 5bfe460..145041c 100644
--- a/res/layout/filtershow_control_color_chooser.xml
+++ b/res/layout/filtershow_control_color_chooser.xml
@@ -33,7 +33,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginRight="4dp"/>
+                android:layout_marginEnd="4dp"/>
 
         <Button
                 android:id="@+id/draw_color_button02"
@@ -41,7 +41,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginRight="4dp"/>
+                android:layout_marginEnd="4dp"/>
 
         <Button
                 android:id="@+id/draw_color_button03"
@@ -49,7 +49,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginRight="4dp"/>
+                android:layout_marginEnd="4dp"/>
 
         <Button
                 android:id="@+id/draw_color_button04"
@@ -57,7 +57,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginRight="4dp"/>
+                android:layout_marginEnd="4dp"/>
 
         <Button
                 android:id="@+id/draw_color_button05"
@@ -65,7 +65,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginRight="4dp"/>
+                android:layout_marginEnd="4dp"/>
 
     </LinearLayout>
 
diff --git a/res/layout/filtershow_control_style_chooser.xml b/res/layout/filtershow_control_style_chooser.xml
index 9588ea2..d0004ff 100644
--- a/res/layout/filtershow_control_style_chooser.xml
+++ b/res/layout/filtershow_control_style_chooser.xml
@@ -18,7 +18,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness"
     android:layout_width="match_parent"
-    android:layout_height="32dp"
+    android:layout_height="wrap_content"
     android:orientation="horizontal" >
             <HorizontalScrollView
                 android:id="@+id/scrollList"
diff --git a/res/layout/filtershow_control_title_slider.xml b/res/layout/filtershow_control_title_slider.xml
index 584e015..23a5978 100644
--- a/res/layout/filtershow_control_title_slider.xml
+++ b/res/layout/filtershow_control_title_slider.xml
@@ -23,13 +23,13 @@
 
     <TextView
         android:id="@+id/controlName"
-        android:layout_gravity="left"
-        android:layout_marginLeft="8dip" />
+        android:layout_gravity="start"
+        android:layout_marginStart="8dip" />
 
     <TextView
         android:id="@+id/controlValue"
-        android:layout_gravity="right"
-        android:layout_marginRight="8dip"
+        android:layout_gravity="end"
+        android:layout_marginEnd="8dip"
         android:textStyle="bold" />
 
     <SeekBar
diff --git a/res/layout/filtershow_cp_custom_title.xml b/res/layout/filtershow_cp_custom_title.xml
index cef8b6c..5d7ed92 100644
--- a/res/layout/filtershow_cp_custom_title.xml
+++ b/res/layout/filtershow_cp_custom_title.xml
@@ -21,6 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:layout_marginLeft="20dp"
-    android:layout_marginRight="20dp" >
+    android:layout_marginStart="20dp"
+    android:layout_marginEnd="20dp" >
 </TextView>
\ No newline at end of file
diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml
index 4e13f39..8dc5fc3 100644
--- a/res/layout/filtershow_export_dialog.xml
+++ b/res/layout/filtershow_export_dialog.xml
@@ -40,7 +40,7 @@
 
         <TextView
                 android:text="@string/size"
-                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
                 android:layout_gravity="start|center_vertical"/>
 
         <EditText
@@ -61,7 +61,7 @@
 
         <TextView
                 android:id="@+id/estimadedSize"
-                android:layout_marginRight="8dp"
+                android:layout_marginEnd="8dp"
                 android:layout_gravity="end|center_vertical"/>
 
         <LinearLayout
diff --git a/res/layout/filtershow_info_panel.xml b/res/layout/filtershow_info_panel.xml
index 43878b6..1ca64bd 100644
--- a/res/layout/filtershow_info_panel.xml
+++ b/res/layout/filtershow_info_panel.xml
@@ -74,7 +74,7 @@
                         android:layout_width="0dp"
                         android:layout_height="196dp"
                         android:scaleType="centerCrop"
-                        android:layout_marginRight="16dp"
+                        android:layout_marginEnd="16dp"
                         android:background="@null"
 
                         />
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index d3400fa..f8b26b0 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -95,8 +95,19 @@
                     android:scaleType="centerInside"
                     android:src="@drawable/ic_photoeditor_color"/>
 
+            <ImageButton
+                    android:id="@+id/makeupButton"
+                    android:layout_width="@dimen/thumbnail_size"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:padding="2dip"
+                    android:background="@drawable/filtershow_button_background"
+                    android:scaleType="centerInside"
+                    android:visibility="gone"
+                    android:src="@drawable/ic_photoeditor_makeup"/>
+
         </LinearLayout>
 
     </com.android.gallery3d.filtershow.CenteredLinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/filtershow_presets_management_row.xml b/res/layout/filtershow_presets_management_row.xml
index bd3e479..d4e05ba 100644
--- a/res/layout/filtershow_presets_management_row.xml
+++ b/res/layout/filtershow_presets_management_row.xml
@@ -47,6 +47,6 @@
             android:background="@android:color/transparent"
             android:layout_weight=".1"
             android:gravity="center"
-            android:src="@drawable/ic_menu_trash_holo_light"
+            android:src="@drawable/ic_menu_trash"
             android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_splashscreen.xml b/res/layout/filtershow_splashscreen.xml
index 06958ca..8d7fe3e 100644
--- a/res/layout/filtershow_splashscreen.xml
+++ b/res/layout/filtershow_splashscreen.xml
@@ -23,7 +23,7 @@
               android:padding="10dip">
 
 <ProgressBar android:id="@+id/progress_bar"
-             android:layout_alignParentRight="true"
+             android:layout_alignParentEnd="true"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:gravity="center_vertical"
diff --git a/res/layout/ingest_date_tile.xml b/res/layout/ingest_date_tile.xml
index 8cd63e9..b042213 100644
--- a/res/layout/ingest_date_tile.xml
+++ b/res/layout/ingest_date_tile.xml
@@ -61,4 +61,4 @@
             android:fontFamily="sans-serif"
             android:textColor="@color/ingest_date_tile_text" />
     </GridLayout>
-</com.android.gallery3d.ingest.ui.DateTileView>
\ No newline at end of file
+</com.android.gallery3d.ingest.ui.DateTileView>
diff --git a/res/layout/ingest_fullsize.xml b/res/layout/ingest_fullsize.xml
index d57c4ae..91a3fcf 100644
--- a/res/layout/ingest_fullsize.xml
+++ b/res/layout/ingest_fullsize.xml
@@ -41,4 +41,4 @@
         android:layout_alignParentRight="true"
         android:text="@string/ingest_import" />
 
-</com.android.gallery3d.ingest.ui.MtpFullscreenView>
\ No newline at end of file
+</com.android.gallery3d.ingest.ui.MtpFullscreenView>
diff --git a/res/layout/knob.xml b/res/layout/knob.xml
new file mode 100644
index 0000000..d504774
--- /dev/null
+++ b/res/layout/knob.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/knob_foreground"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <ImageView
+        android:id="@+id/knob_toggle_on"
+        android:layout_gravity="center_horizontal|center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/knob_toggle_on"
+        android:visibility="gone" />
+    <ImageView
+        android:id="@+id/knob_toggle_off"
+        android:layout_gravity="center_horizontal|center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/knob_toggle_off"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
+        android:gravity="center_horizontal">
+
+        <TextView
+            android:id="@+id/knob_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
+        <TextView
+            android:id="@+id/knob_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:ellipsize="marquee"
+            android:visibility="gone" />
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 08e5959..e26e0fc 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -13,8 +13,8 @@
     <FrameLayout android:id="@+id/footer"
             android:visibility="gone"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 </RelativeLayout>
diff --git a/res/layout/manage_offline_bar.xml b/res/layout/manage_offline_bar.xml
index 5c71613..6996180 100644
--- a/res/layout/manage_offline_bar.xml
+++ b/res/layout/manage_offline_bar.xml
@@ -39,23 +39,23 @@
     </RelativeLayout>
     <RelativeLayout android:layout_width="fill_parent"
                 android:layout_height="@dimen/manage_cache_bottom_height"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
                 android:background="#1f1f1f">
         <TextView android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/make_available_offline"
             android:textSize="14sp"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:gravity="center_vertical"
-            android:drawableLeft="@drawable/ic_menu_make_offline"
+            android:drawableStart="@drawable/ic_menu_make_offline"
             android:drawablePadding="3dp"/>
         <Button android:id="@+id/done"
             android:layout_width="74dp"
             android:layout_height="match_parent"
             android:text="@string/done"
             android:textSize="14sp"
-            android:layout_alignParentRight="true"/>
+            android:layout_alignParentEnd="true"/>
     </RelativeLayout>
 </LinearLayout>
diff --git a/res/layout/menu_indicators_keyguard.xml b/res/layout/menu_indicators_keyguard.xml
index 7a8795d..b8f36cf 100644
--- a/res/layout/menu_indicators_keyguard.xml
+++ b/res/layout/menu_indicators_keyguard.xml
@@ -21,7 +21,7 @@
     <ImageView
         android:id="@+id/menu_scenemode_indicator"
         style="@style/MenuIndicator"
-        android:layout_gravity="left|top"
+        android:layout_gravity="start|top"
         android:src="@drawable/ic_indicator_sce_off" />
 
     <ImageView
@@ -33,13 +33,13 @@
     <ImageView
         android:id="@+id/menu_flash_indicator"
         style="@style/MenuIndicator"
-        android:layout_gravity="right|top"
+        android:layout_gravity="end|top"
         android:src="@drawable/ic_indicator_flash_auto" />
 
     <ImageView
         android:id="@+id/menu_exposure_indicator"
         style="@style/MenuIndicator"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         android:src="@drawable/ic_indicator_ev_0" />
 
     <ImageView
@@ -51,7 +51,7 @@
     <ImageView
         android:id="@+id/menu_wb_indicator"
         style="@style/MenuIndicator"
-        android:layout_gravity="right|bottom"
+        android:layout_gravity="end|bottom"
         android:src="@drawable/ic_indicator_wb_off" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml
index 75b8dfd..a086792 100644
--- a/res/layout/movie_view.xml
+++ b/res/layout/movie_view.xml
@@ -19,7 +19,7 @@
         android:background="@android:color/black"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <VideoView android:id="@+id/surface_view"
+    <org.codeaurora.gallery3d.video.CodeauroraVideoView android:id="@+id/surface_view"
             android:visibility="invisible"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/multigrid_content.xml b/res/layout/multigrid_content.xml
index b1cb145..618af48 100644
--- a/res/layout/multigrid_content.xml
+++ b/res/layout/multigrid_content.xml
@@ -36,7 +36,7 @@
 
     </LinearLayout>
 
-    <FrameLayout android:id="@+id/gridContainer"
+    <HorizontalScrollView android:id="@+id/gridContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -52,6 +52,6 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
-    </FrameLayout>
+    </HorizontalScrollView>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/photo_frame.xml b/res/layout/photo_frame.xml
index deadaeb..63faf53 100755
--- a/res/layout/photo_frame.xml
+++ b/res/layout/photo_frame.xml
@@ -19,8 +19,8 @@
         android:layout_height="match_parent"
         android:paddingTop="4dp"
         android:paddingBottom="23dp"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp">
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp">
     <ImageView android:id="@+id/photo"
             android:layout_gravity="center"
             android:layout_width="wrap_content"
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index f3226e6..51f714e 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -1,50 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/photopage_bottom_controls"
-        android:padding="10dp"
-        android:layout_width="match_parent"
+  android:id="@+id/photopage_bottom_controls"
+  android:padding="10dp"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_alignParentBottom="true"
+  android:layout_alignParentRight="true"
+  android:orientation="horizontal"
+  android:visibility="gone">
+
+  <FrameLayout
+    android:id="@+id/photopage_bottom_control_tiny_planet"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/floating_action_button_margin_left"
+    android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentBottom="true"
+    android:background="@drawable/floating_action_button"
+    android:elevation="@dimen/floating_action_button_translation_z"
+    android:clickable="true"
+    android:visibility="gone">
+    <ImageButton
+      android:layout_width="@dimen/floating_action_button_width"
+      android:layout_height="@dimen/floating_action_button_height"
+      android:id="@+id/floating_action_button_tiny_planet"
+      android:background="@drawable/floating_action_button"
+      android:tint="@color/floating_action_button_icon_color"
+      android:src="@drawable/ic_menu_tiny_planet"
+      android:clickable="false"
+      android:duplicateParentState="true"/>
+    </FrameLayout>
+
+    <FrameLayout
+      android:id="@+id/photopage_bottom_control_panorama"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="@dimen/floating_action_button_margin_left"
+      android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+      android:layout_centerHorizontal="true"
+      android:layout_alignParentBottom="true"
+      android:background="@drawable/floating_action_button"
+      android:elevation="@dimen/floating_action_button_translation_z"
+      android:clickable="true"
+      android:visibility="gone">
+      <ImageButton
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:id="@+id/floating_action_button_panorama"
+        android:background="@drawable/floating_action_button"
+        android:tint="@color/floating_action_button_icon_color"
+        android:src="@drawable/ic_view_photosphere"
+        android:clickable="false"
+        android:duplicateParentState="true"/>
+      </FrameLayout>
+
+      <FrameLayout
+        android:id="@+id/photopage_bottom_control_edit"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/floating_action_button_margin_right"
+        android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:orientation="horizontal"
+        android:background="@drawable/fab_accent"
+        android:elevation="@dimen/floating_action_button_translation_z"
+        android:clickable="true"
         android:visibility="gone">
         <ImageButton
-                android:id="@+id/photopage_bottom_control_edit"
-                android:src="@drawable/ic_menu_edit_holo_dark"
-                android:background="@drawable/photopage_bottom_button_background"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp"
-                android:visibility="gone"/>
-        <ImageButton
-                android:id="@+id/photopage_bottom_control_panorama"
-                android:src="@drawable/ic_view_photosphere"
-                android:background="@drawable/transparent_button_background"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:layout_centerHorizontal="true"
-                android:layout_alignParentBottom="true"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:visibility="gone"/>
-        <ImageButton
-                android:id="@+id/photopage_bottom_control_tiny_planet"
-                android:src="@drawable/ic_menu_tiny_planet"
-                android:background="@drawable/photopage_bottom_button_background"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp"
-                android:visibility="gone"/>
-</RelativeLayout>
+          android:layout_width="@dimen/floating_action_button_width"
+          android:layout_height="@dimen/floating_action_button_height"
+          android:id="@+id/floating_action_button_edit"
+          android:background="@drawable/floating_action_button"
+          android:tint="@color/floating_action_button_icon_color"
+          android:src="@drawable/ic_edit"
+          android:clickable="false"
+          android:duplicateParentState="true"/>
+        </FrameLayout>
+      </RelativeLayout>
diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml
index 778feb3..57b7832 100644
--- a/res/layout/photopage_progress_bar.xml
+++ b/res/layout/photopage_progress_bar.xml
@@ -4,7 +4,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:padding="25dp"
         android:visibility="invisible">
         <View
@@ -19,7 +19,7 @@
                 android:background="#ff33b5e5"
                 android:layout_width="10dp"
                 android:layout_height="8dp"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_alignParentBottom="true"
                 android:visibility="visible"/>
         <TextView
@@ -33,7 +33,7 @@
                 android:shadowRadius="2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_above="@id/photopage_progress_background"
                 android:paddingBottom="8dp"
                 android:visibility="visible"/>
diff --git a/res/layout/popup_list_item.xml b/res/layout/popup_list_item.xml
index 5a87af7..837da0a 100644
--- a/res/layout/popup_list_item.xml
+++ b/res/layout/popup_list_item.xml
@@ -21,8 +21,8 @@
     android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
     android:singleLine="true"
     android:gravity="center_vertical"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:minWidth="196dp"
 />
diff --git a/res/layout/rotate_dialog.xml b/res/layout/rotate_dialog.xml
index c62ce91..c1cf866 100644
--- a/res/layout/rotate_dialog.xml
+++ b/res/layout/rotate_dialog.xml
@@ -44,8 +44,8 @@
                 <TextView android:id="@+id/rotate_dialog_title"
                         style="@style/TextAppearance.DialogWindowTitle"
                         android:gravity="center_vertical"
-                        android:layout_marginLeft="16dip"
-                        android:layout_marginRight="16dip"
+                        android:layout_marginStart="16dip"
+                        android:layout_marginEnd="16dip"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:minHeight="64dp"/>
diff --git a/res/layout/setting_list.xml b/res/layout/setting_list.xml
new file mode 100644
index 0000000..51ad753
--- /dev/null
+++ b/res/layout/setting_list.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <!--
+        /* * Copyright (C) 2008 Esmertec AG. * Copyright (C) 2008 The Android
+        Open Source Project * * Licensed under the Apache License, Version 2.0
+        (the "License"); * you may not use this file except in compliance with
+        the License. * You may obtain a copy of the License at * *
+        http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+        applicable law or agreed to in writing, software * distributed under the
+        License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR
+        CONDITIONS OF ANY KIND, either express or implied. * See the License for
+        the specific language governing permissions and * limitations under the
+        License. */
+    -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ListView android:id="@android:id/list" android:layout_width="match_parent"
+        android:layout_height="0px" android:layout_weight="1"
+        android:paddingStart="16dip" android:paddingEnd="16dip"
+        android:paddingTop="0dp" android:paddingBottom="0dp"
+        android:clipToPadding="false" android:scrollbarStyle="outsideOverlay"
+        android:drawSelectorOnTop="false" android:cacheColorHint="@android:color/transparent"
+        android:listPreferredItemHeight="48dp"
+        android:scrollbarAlwaysDrawVerticalTrack="true" />
+</LinearLayout>
+
diff --git a/res/layout/time_interval_picker.xml b/res/layout/time_interval_picker.xml
index d2a9462..daab1c8 100644
--- a/res/layout/time_interval_picker.xml
+++ b/res/layout/time_interval_picker.xml
@@ -40,8 +40,8 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="16dip"
-            android:paddingRight="16dip" >
+            android:paddingStart="16dip"
+            android:paddingEnd="16dip" >
 
         <!-- time interval duration -->
         <NumberPicker
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
-                android:layout_marginLeft="20dip"
+                android:layout_marginStart="20dip"
                 android:focusable="false" />
 
     </LinearLayout>
diff --git a/res/layout/time_interval_popup.xml b/res/layout/time_interval_popup.xml
index 9cf224a..2eadf90 100644
--- a/res/layout/time_interval_popup.xml
+++ b/res/layout/time_interval_popup.xml
@@ -38,8 +38,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="0"
-                    android:layout_marginRight="8dp"
-                    android:layout_gravity="right|center_vertical" />
+                    android:layout_marginEnd="8dp"
+                    android:layout_gravity="end|center_vertical" />
         </LinearLayout>
 
         <View style="@style/PopupTitleSeparator" />
@@ -54,8 +54,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingTop="16dip"
-                    android:paddingLeft="16dip"
-                    android:paddingRight="16dip"
+                    android:paddingStart="16dip"
+                    android:paddingEnd="16dip"
                     android:paddingBottom="16dip"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:text="@string/set_time_interval_help"/>
diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml
index e233392..c46be4c 100644
--- a/res/layout/trim_menu.xml
+++ b/res/layout/trim_menu.xml
@@ -20,13 +20,13 @@
         android:layout_centerVertical="true">
     <TextView
         android:id="@+id/start_trim"
-        android:layout_marginLeft="8dp"
+        android:layout_marginStart="8dp"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:text="@string/save"
         android:textAllCaps="true"
         android:textSize="14sp"
         android:gravity="left|center_vertical"
-        android:drawableLeft="@drawable/menu_save_photo"
+        android:drawableStart="@drawable/menu_save_photo"
         android:drawablePadding="8dp" />
 </FrameLayout>
diff --git a/res/layout/undo_bar.xml b/res/layout/undo_bar.xml
index 33ec91d..bd4274d 100644
--- a/res/layout/undo_bar.xml
+++ b/res/layout/undo_bar.xml
@@ -27,5 +27,5 @@
     <TextView android:id="@+id/undo_button"
             style="@style/UndoButton"
             android:text="@string/undo"
-            android:drawableLeft="@drawable/ic_menu_revert_holo_dark"/>
+            android:drawableStart="@drawable/ic_menu_revert_holo_dark"/>
 </LinearLayout>
diff --git a/res/layout/view_gif_image.xml b/res/layout/view_gif_image.xml
new file mode 100644
index 0000000..976549a
--- /dev/null
+++ b/res/layout/view_gif_image.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <LinearLayout
+            android:id="@+id/image_absoluteLayout"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent">
+        <ImageView android:id="@+id/image_display_area"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:clickable="true">
+        </ImageView>
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/viewfinder_labels_video.xml b/res/layout/viewfinder_labels_video.xml
index cfe3b02..1ed7f39 100644
--- a/res/layout/viewfinder_labels_video.xml
+++ b/res/layout/viewfinder_labels_video.xml
@@ -21,7 +21,7 @@
     <TextView android:id="@+id/recording_time"
             style="@style/OnViewfinderLabel"
             android:gravity="center"
-            android:drawableLeft="@drawable/ic_recording_indicator"
+            android:drawableStart="@drawable/ic_recording_indicator"
             android:drawablePadding="5dp"
             android:visibility="gone" />
     <TextView android:id="@+id/time_lapse_label"
diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml
index 8ac8cbb..1a33ba2 100644
--- a/res/menu/albumset.xml
+++ b/res/menu/albumset.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Google Inc.
+<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
+     Not a Contribution.
+
+     Copyright (C) 2010 Google Inc.
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -21,17 +24,30 @@
     <item android:id="@+id/action_select"
             android:title="@string/select_album"
             android:showAsAction="never" />
+
+<!-- These items do not serve a purpose due to the lack of built in
+     picasa support. -->
     <item android:id="@+id/action_manage_offline"
             android:title="@string/make_available_offline"
+            android:visible="false"
             android:showAsAction="never" />
     <item android:id="@+id/action_sync_picasa_albums"
             android:title="@string/sync_picasa_albums"
+            android:visible="false"
             android:showAsAction="never" />
+
+<!-- Settings visibility in menu set to false because they are empty.
+     This should be set to true when GallerySettings.java has content. -->
     <item android:id="@+id/action_settings"
             android:title="@string/settings"
+            android:visible="false"
             android:showAsAction="never" />
+
     <item android:id="@+id/action_general_help"
             android:title="@string/help"
             android:visible="false"
             android:showAsAction="never" />
+    <item android:id="@+id/action_more_image"
+            android:title="@string/more_image"
+            android:showAsAction="never" />
 </menu>
diff --git a/res/menu/movie.xml b/res/menu/movie.xml
index fde235c..0676efb 100644
--- a/res/menu/movie.xml
+++ b/res/menu/movie.xml
@@ -15,7 +15,7 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/action_share"
-            android:icon="@drawable/ic_menu_share_holo_light"
+            android:icon="@drawable/ic_menu_share"
             android:title="@string/share"
             android:enabled="true"
             android:actionProviderClass="android.widget.ShareActionProvider"
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index d1791e2..b915f39 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -23,21 +23,21 @@
          But, if share_panorama is set to never, it doesn't seem to get promoted
          to the action bar and stays on the overflow menu. -->
     <item android:id="@+id/action_share_panorama"
-            android:icon="@drawable/ic_menu_share_holo_light"
+            android:icon="@drawable/ic_menu_share"
             android:title="@string/share_panorama"
             android:visible="false"
             android:actionProviderClass="android.widget.ShareActionProvider"
             android:showAsAction="ifRoom">
     </item>
     <item android:id="@+id/action_share"
-            android:icon="@drawable/ic_menu_share_holo_light"
+            android:icon="@drawable/ic_menu_share"
             android:title="@string/share"
             android:visible="false"
             android:actionProviderClass="android.widget.ShareActionProvider"
             android:showAsAction="never">
     </item>
     <item android:id="@+id/action_delete"
-            android:icon="@drawable/ic_menu_trash_holo_light"
+            android:icon="@drawable/ic_menu_trash"
             android:title="@string/delete"
             android:visible="false"
             android:showAsAction="ifRoom" />
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index bcd452e..91bf044 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -23,19 +23,19 @@
          But, if share_panorama is set to never, it doesn't seem to get promoted
          to the action bar and stays on the overflow menu. -->
     <item android:id="@+id/action_share_panorama"
-            android:icon="@drawable/ic_menu_share_holo_light"
+            android:icon="@drawable/ic_menu_share"
             android:title="@string/share_panorama"
             android:visible="false"
             android:actionProviderClass="android.widget.ShareActionProvider"
             android:showAsAction="ifRoom" />
     <item android:id="@+id/action_share"
-            android:icon="@drawable/ic_menu_share_holo_light"
+            android:icon="@drawable/ic_menu_share"
             android:title="@string/share"
             android:visible="false"
             android:actionProviderClass="android.widget.ShareActionProvider"
             android:showAsAction="never" />
     <item android:id="@+id/action_delete"
-            android:icon="@drawable/ic_menu_trash_holo_light"
+            android:icon="@drawable/ic_menu_trash"
             android:title="@string/delete"
             android:visible="false"
             android:showAsAction="never" />
diff --git a/res/mipmap-hdpi/ic_launcher_gallery.png b/res/mipmap-hdpi/ic_launcher_gallery.png
index 23ea998..65d9f3c 100644
--- a/res/mipmap-hdpi/ic_launcher_gallery.png
+++ b/res/mipmap-hdpi/ic_launcher_gallery.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_gallery.png b/res/mipmap-mdpi/ic_launcher_gallery.png
index e1a9949..5eb1f62 100644
--- a/res/mipmap-mdpi/ic_launcher_gallery.png
+++ b/res/mipmap-mdpi/ic_launcher_gallery.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_gallery.png b/res/mipmap-xhdpi/ic_launcher_gallery.png
index 79544a2..aacb61b 100644
--- a/res/mipmap-xhdpi/ic_launcher_gallery.png
+++ b/res/mipmap-xhdpi/ic_launcher_gallery.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_gallery.png b/res/mipmap-xxhdpi/ic_launcher_gallery.png
new file mode 100644
index 0000000..19b1750
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_gallery.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_gallery.png b/res/mipmap-xxxhdpi/ic_launcher_gallery.png
new file mode 100644
index 0000000..f13b734
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_gallery.png
Binary files differ
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-af/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-af/cm_strings.xml
index dfc7592..f4553e1 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-af/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tyd van opname</string>
+</resources>
diff --git a/res/values-af/codeaurora_strings.xml b/res/values-af/codeaurora_strings.xml
new file mode 100644
index 0000000..878bf97
--- /dev/null
+++ b/res/values-af/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Stap</string>
+  <string name="step_option_desc">Verpersoonlik vinnige vorentoe/terugspeel stap</string>
+  <string name="setp_option_three_second">3 sekondes</string>
+  <string name="setp_option_six_second">6 sekondes</string>
+  <string name="loop">"Omkring"</string>
+  <string name="single">"Enkel"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Luidspreker AAN</string>
+  <string name="speaker_off">Luidspreker AF</string>
+  <string name="speaker_need_headset">Prop in oorfone om hierdie funksie te gebruik.</string>
+  <string name="single_track">"Enkele snit"</string>
+  <string name="input_url">"Sleutel URL in"</string>
+  <string name="streaming_settings">"Stroom instellings"</string>
+  <string name="next">"Volgende"</string>
+  <string name="previous">"Vorige"</string>
+  <string name="buffer_size">Buffer grootte</string>
+  <string name="apn">Voorkeur TPN</string>
+  <string name="rtp_min_port">Min poort</string>
+  <string name="rtp_max_port">Maks poort</string>
+  <string name="set_rtp_min_port">Stel min poort</string>
+  <string name="set_rtp_max_port">Stel maks poort</string>
+  <string name="set_buffer_size">Stel buffer grootte</string>
+  <string name="set_apn">Kies gewenste TPN</string>
+  <string name="setting">Instellings</string>
+  <string name="server_timeout_title">"Bediener tydverstreke"</string>
+  <string name="server_timeout_message">"Herkonnekteer met die bediener om die video te speel?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Verbinding het misluk, probeer weer om aan te sluit na %1$d\u2026"</string>
+  <string name="media_controller_live">Regstreeks</string>
+  <string name="media_controller_playing">Speel</string>
+  <string name="media_controller_connecting">Koppel\u2026</string>
+  <string name="bookmark_add">"Voeg boekmerk by"</string>
+  <string name="bookmark_display">"Wys boekmerk"</string>
+  <string name="bookmark_empty">"Geen boekmerk"</string>
+  <string name="bookmark_exist">"Boekmerk bestaan alreeds"</string>
+  <string name="bookmark_add_success">"Boekmerk bygevoeg"</string>
+  <string name="bookmark_list">"Boekmerke"</string>
+  <string name="bookmark_title">"Titel"</string>
+  <string name="bookmark_location">"Ligging"</string>
+  <string name="delete_all">"Verwyder alles"</string>
+  <string name="default_title">"Standaard titel"</string>
+  <string name="more_image">Nog prente</string>
+  <string name="mute_nosupport">Kan nie klank afskakel: video nie ondersteun</string>
+  <string name="map_activity_not_found_err">Daar is geen kaart program geïnstalleer om die plek te wys nie.</string>
+  <string name="bass_boost_strength">Versterk bas</string>
+  <string name="virtualizer_strength">3D Effek</string>
+  <string name="audio_effects">Klank effekte</string>
+  <string name="headset_plug">Prop in oorfone vir hierdie effekte.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Oudio+</string>
+  <string name="fail_trim">Jammer, hierdie video lêer kan nie afgewerk word nie</string>
+  <string name="no_permission_for_drm">Jammer, maar DRM beskermde leërs kan nie gedeel word nie</string>
+  <string name="drm_license_info">DRM lisensie inligting</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-ar/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-ar/cm_strings.xml
index dfc7592..92d70a3 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">وقت التسجيل</string>
+</resources>
diff --git a/res/values-ar/codeaurora_strings.xml b/res/values-ar/codeaurora_strings.xml
new file mode 100644
index 0000000..ffdd96d
--- /dev/null
+++ b/res/values-ar/codeaurora_strings.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">خطوة</string>
+  <string name="step_option_desc">تخصيص خطوة التقديم/الترجيع السريع</string>
+  <string name="setp_option_three_second">3 ثوان
+</string>
+  <string name="setp_option_six_second">6 ثوانٍ</string>
+  <string name="loop">"تكرار"</string>
+  <string name="single">"واحد"</string>
+  <string name="stereo">"استيريو"</string>
+  <string name="speaker_on">تشغيل مكبّر الصوت</string>
+  <string name="speaker_off">إيقاف مكبّر الصوت</string>
+  <string name="speaker_need_headset">قم بتوصيل سماعات الرأس لاستخدام هذه الميزة.</string>
+  <string name="single_track">"أغنية واحدة"</string>
+  <string name="input_url">"أدخل عنوان URL"</string>
+  <string name="streaming_settings">"إعدادات التدفق"</string>
+  <string name="next">"التالي"</string>
+  <string name="previous">"السابق"</string>
+  <string name="buffer_size">حجم المخزن المؤقت</string>
+  <string name="apn">APN المفضل</string>
+  <string name="rtp_min_port">منفذ الحد الأدنى </string>
+  <string name="rtp_max_port">منفذ الحد الأقصى</string>
+  <string name="set_rtp_min_port">تعيين الحد الأدنى للمنفذ</string>
+  <string name="set_rtp_max_port">تعيين الحد الأقصى للمنفذ</string>
+  <string name="set_buffer_size">تعيين حجم المخزن المؤقت</string>
+  <string name="set_apn">حدد APN المفضل</string>
+  <string name="setting">إعدادات</string>
+  <string name="server_timeout_title">"مهلة الخادم"</string>
+  <string name="server_timeout_message">"هل تود إعادة الاتصال بالخادم لتشغيل الفيديو؟"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"فشل الاتصال، جاري محاولة إعادة الاتصال ب%1$d\u2026"</string>
+  <string name="media_controller_live">مباشر</string>
+  <string name="media_controller_playing">قيد التشغيل</string>
+  <string name="media_controller_connecting">جاري الاتصال\u2026</string>
+  <string name="bookmark_add">"إضافة إشارة مرجعية"</string>
+  <string name="bookmark_display">"عرض الإشارات المرجعية"</string>
+  <string name="bookmark_empty">"لا توجد إشارات مرجعية"</string>
+  <string name="bookmark_exist">"هذه الإشارة المرجعية موجودة بالفعل"</string>
+  <string name="bookmark_add_success">"تمت إضافة الإشارة المرجعية"</string>
+  <string name="bookmark_list">"الإشارات المرجعيّة"</string>
+  <string name="bookmark_title">"العنوان"</string>
+  <string name="bookmark_location">"الموقع"</string>
+  <string name="delete_all">"حذف الكل"</string>
+  <string name="default_title">"العنوان الافتراضي"</string>
+  <string name="more_image">مزيد من الصور</string>
+  <string name="mute_nosupport">لا يمكن كتم الصوت : الفيديو غير مدعوم</string>
+  <string name="map_activity_not_found_err">لا يوجد تطبيق خرائط مثبت لإظهار الموقع.</string>
+  <string name="bass_boost_strength">التقوية</string>
+  <string name="virtualizer_strength">تأثير ثلاثي الأبعاد</string>
+  <string name="audio_effects">التأثيرات الصوتية</string>
+  <string name="headset_plug">قم بتوصيل سماعات الرأس لاستخدام هذه الآثار.</string>
+  <string name="audio_effects_dialog_title">صوت سناب دراغون+ </string>
+  <string name="fail_trim">عذراً، لا يمكن الاقتطاع من ملف الفيديو هذا</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-ast-rES/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-ast-rES/cm_strings.xml
index dfc7592..696c009 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Hora de grabación</string>
+</resources>
diff --git a/res/values-ast-rES/codeaurora_strings.xml b/res/values-ast-rES/codeaurora_strings.xml
new file mode 100644
index 0000000..9a2da4e
--- /dev/null
+++ b/res/values-ast-rES/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">saltu</string>
+  <string name="step_option_desc">Personalizar el saltu rápidu hacia alantre o hacia atrás</string>
+  <string name="setp_option_three_second">3 segundos</string>
+  <string name="setp_option_six_second">6 segundos</string>
+  <string name="loop">"Bucle"</string>
+  <string name="single">"Simple"</string>
+  <string name="stereo">"Estereu"</string>
+  <string name="speaker_on">Altavoz encesu</string>
+  <string name="speaker_off">Altavoz apagáu</string>
+  <string name="speaker_need_headset">Coneuta unos auriculares pa usar esta carauterística.</string>
+  <string name="single_track">"Una pista"</string>
+  <string name="input_url">"Introducir URL"</string>
+  <string name="streaming_settings">"Axustes de fluxu de datos"</string>
+  <string name="next">"Siguiente"</string>
+  <string name="previous">"Anterior"</string>
+  <string name="buffer_size">Tamañu del buffer</string>
+  <string name="apn">APN preferíu</string>
+  <string name="rtp_min_port">Puertu min.</string>
+  <string name="rtp_max_port">Puertu máx.</string>
+  <string name="set_rtp_min_port">Afitar el puertu min.</string>
+  <string name="set_rtp_max_port">Afitar el puertu máx.</string>
+  <string name="set_buffer_size">Afitar el tamañu del buffer</string>
+  <string name="set_apn">Seleicionar APN preferíu</string>
+  <string name="setting">Axustes</string>
+  <string name="server_timeout_title">"Tiempu d'espera del sirvidor"</string>
+  <string name="server_timeout_message">"¿Volver a coneutar al sirvidor pa reproducir el videu?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Falló la conexón. Intentando volver a coneutar con %1$d\u2026"</string>
+  <string name="media_controller_live">En direutu</string>
+  <string name="media_controller_playing">Reproduciendo</string>
+  <string name="media_controller_connecting">Coneutando\u2026</string>
+  <string name="bookmark_add">"Amestar marcador"</string>
+  <string name="bookmark_display">"Amosar marcadores"</string>
+  <string name="bookmark_empty">"Ensin marcadores"</string>
+  <string name="bookmark_exist">"Esti marcador yá esiste"</string>
+  <string name="bookmark_add_success">"Marcador amestáu"</string>
+  <string name="bookmark_list">"Marcadores"</string>
+  <string name="bookmark_title">"Títulu"</string>
+  <string name="bookmark_location">"Llocalización"</string>
+  <string name="delete_all">"Desanicialo too"</string>
+  <string name="default_title">"Títulu por defeutu"</string>
+  <string name="more_image">Más imáxenes</string>
+  <string name="mute_nosupport">Nun pue silenciase: videu non sofitáu</string>
+  <string name="map_activity_not_found_err">Nun hai nenguna aplicación de mapes instalada p\'amosar la llocalización.</string>
+  <string name="bass_boost_strength">Amplificación de graves</string>
+  <string name="virtualizer_strength">Efeutu 3D</string>
+  <string name="audio_effects">Efeutos d\'audiu</string>
+  <string name="headset_plug">Coneuta los auriculares pa estos efectos.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">El videu nun pue retayase</string>
+  <string name="no_permission_for_drm">Perdón, los ficheros protexíos con DRM nun puen compartise</string>
+  <string name="drm_license_info">Información de llicencia de DRM</string>
+</resources>
diff --git a/res/values-ast-rES/filtershow_strings.xml b/res/values-ast-rES/filtershow_strings.xml
new file mode 100644
index 0000000..056b9f4
--- /dev/null
+++ b/res/values-ast-rES/filtershow_strings.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <string name="title_activity_filter_show">Editor de semeyes</string>
+  <string name="cannot_load_image">Fallu al cargar la imaxe!</string>
+  <string name="cannot_edit_original">Nun pue editase l\'orixinal</string>
+  <string name="setting_wallpaper">Afitando fondu de pantalla...</string>
+  <string name="download_failure">Nun pudo descargase la semeya porque la rede nun ta disponible.</string>
+  <string name="original">Orixinal</string>
+  <string name="borders" msgid="4461692156695893616">Marcu</string>
+  <string name="custom_border">Personalizáu</string>
+  <string name="filtershow_undo">Desfacer</string>
+  <string name="filtershow_redo">Refacer</string>
+  <string name="show_imagestate_panel">Amosar efeutos aplicaos</string>
+  <string name="hide_imagestate_panel">Anubrir efeutos aplicaos</string>
+  <string name="export_image">Esportar</string>
+  <string name="print_image">Imprentar</string>
+  <string name="export_flattened">Esportar imaxe aplastada</string>
+  <string name="select_output_settings">La imaxe esportada va ser una copia y nun va incluyir l\'historial.</string>
+  <string name="quality">Calidá</string>
+  <string name="size">Tamañu</string>
+  <string name="x">x</string>
+  <string name="menu_settings">Axustes</string>
+  <string name="unsaved">Hai cambeos ensin guardar nesta imaxe.</string>
+  <string name="save_before_exit">¿Quies guardar enantes de salir?</string>
+  <string name="save_and_exit">Guardar y salir</string>
+  <string name="save_and_processing">Procesando imaxe con resolución completa...</string>
+  <string name="exit">Salir</string>
+  <string name="history">Historial</string>
+  <string name="reset">Restablecer</string>
+  <string name="history_original">@string/original</string>
+  <string name="imageState">Efeutos aplicaos</string>
+  <string name="compare_original">Comparar</string>
+  <string name="apply_effect">Aplicar</string>
+  <string name="reset_effect">Restablecer</string>
+  <string name="aspect">Aspeutu</string>
+  <string name="aspect1to1_effect">1:1</string>
+  <string name="aspect4to3_effect">4:3</string>
+  <string name="aspect3to4_effect">3:4</string>
+  <string name="aspect4to6_effect">4:6</string>
+  <string name="aspect5to7_effect">5:7</string>
+  <string name="aspect7to5_effect">7:5</string>
+  <string name="aspect9to16_effect">16:9</string>
+  <string name="aspectNone_effect">Nengún</string>
+  <string name="Fixed">Fixu</string>
+  <string name="tinyplanet">Pequeñu planeta</string>
+  <string name="exposure" msgid="1229093066434614811">Esposición</string>
+  <string name="sharpness">Nitidez</string>
+  <string name="contrast">Contraste</string>
+  <string name="vibrance">Intensidá</string>
+  <string name="saturation">Saturación</string>
+  <string name="bwfilter">Filtru b/n</string>
+  <string name="wbalance">Color automáticu</string>
+  <string name="hue">Tonalidá</string>
+  <string name="shadow_recovery">Solombres</string>
+  <string name="highlight_recovery">Destacáu</string>
+  <string name="curvesRGB">Curvar</string>
+  <string name="vignette">Viñeta</string>
+  <string name="vignette_main">Viñeta</string>
+  <string name="vignette_exposure">Esposición</string>
+  <string name="vignette_saturation">Saturación</string>
+  <string name="vignette_contrast">Contraste</string>
+  <string name="vignette_falloff">Atenuación</string>
+  <string name="redeye">Güeyos bermeyos</string>
+  <string name="imageDraw">Dibuxu</string>
+  <string name="straighten" msgid="5217801513491493491">Enderezar</string>
+  <string name="crop" msgid="5584000454518174632">Recortar</string>
+  <string name="rotate" msgid="460017689320955494">Xirar</string>
+  <string name="mirror">Espeyu</string>
+  <string name="negative">Negativu</string>
+  <string name="none" msgid="3601545724573307541">Nengún</string>
+  <string name="edge">Bordes</string>
+  <string name="kmeans">Posterizar</string>
+  <string name="downsample">Amenorgar calidá</string>
+  <string name="grad">Graduada</string>
+  <string name="editor_grad_brightness">Brillu</string>
+  <string name="editor_grad_contrast">Contraste</string>
+  <string name="editor_grad_saturation">Saturación</string>
+  <string name="editor_chan_sat_main">Principal</string>
+  <string name="editor_chan_sat_red">Bermeyu</string>
+  <string name="editor_chan_sat_yellow">Mariellu</string>
+  <string name="editor_chan_sat_green">Verde</string>
+  <string name="editor_chan_sat_cyan">Cianu</string>
+  <string name="editor_chan_sat_blue">Azul</string>
+  <string name="editor_chan_sat_magenta">Maxenta</string>
+  <string name="editor_grad_style">Estilu</string>
+  <string name="editor_grad_new">Nueva</string>
+  <string name="curves_channel_rgb">RGB</string>
+  <string name="curves_channel_red">Bermeyu</string>
+  <string name="curves_channel_green">Verde</string>
+  <string name="curves_channel_blue">Azul</string>
+  <string name="draw_style">Estilu</string>
+  <string name="draw_size">Tamañu</string>
+  <string name="draw_hue">Matiz</string>
+  <string name="draw_saturation">Saturación</string>
+  <string name="draw_value">Brillu</string>
+  <string name="draw_color">Color</string>
+  <string name="draw_style_line">Llinies</string>
+  <string name="draw_style_brush_spatter">Rotulador</string>
+  <string name="draw_style_brush_marker">Manches</string>
+  <string name="draw_clear">Llimpiar</string>
+  <string name="color_border_size">Grosor</string>
+  <string name="color_border_corner_size">Tamañu esquina</string>
+  <string name="color_border_color">Color</string>
+  <string name="color_border_clear">Llimpiar</string>
+  <string name="color_pick_select">Escoyer un color personalizáu</string>
+  <string name="color_pick_title">Seleicionar color</string>
+  <string name="draw_size_title">Seleicionar tamañu</string>
+  <string name="draw_size_accept">Aceutar</string>
+  <string name="state_panel_original">Orixinal</string>
+  <string name="state_panel_result">Resultáu</string>
+  <string name="filtershow_notification_label">Guardando imaxe</string>
+  <string name="filtershow_notification_message">Procesando...</string>
+  <string name="filtershow_save_preset">Guardar valor predetermináu</string>
+  <string name="filtershow_manage_preset">Alministrar predeterminaos</string>
+  <string name="filtershow_new_preset">Valor predetermináu nuevu</string>
+  <string name="filtershow_preset_name">Nome predetermináu</string>
+  <string name="filtershow_show_info_panel">Información</string>
+  <string name="filtershow_show_info_panel_name">Nome de la imaxe</string>
+  <string name="filtershow_show_info_panel_size">Tamañu de la imaxe</string>
+  <string name="filtershow_show_info_panel_histogram">Histograma</string>
+  <string name="filtershow_show_info_panel_exif">Datos de EXIF</string>
+  <string name="filtershow_add_button_looks">Predetermináu</string>
+  <string name="filtershow_add_button_versions">Versión</string>
+  <string name="filtershow_version_original">Orixinal</string>
+  <string name="filtershow_version_current">Actual</string>
+  <string name="filtershow_exif_model">Modelu</string>
+  <string name="filtershow_exif_aperture">Apertura</string>
+  <string name="filtershow_exif_focal_length">Llonxitú focal</string>
+  <string name="filtershow_exif_iso">ISO</string>
+  <string name="filtershow_exif_subject_distance">Distancia del suxetu</string>
+  <string name="filtershow_exif_date">Data de creación</string>
+  <string name="filtershow_exif_f_stop">Númberu f</string>
+  <string name="filtershow_exif_exposure_time">Tiempu d\'esposición</string>
+  <string name="filtershow_exif_copyright">Copyright</string>
+</resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
new file mode 100644
index 0000000..302e23c
--- /dev/null
+++ b/res/values-ast-rES/strings.xml
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Galería</string>
+  <string name="gadget_title">Marcu de semeya</string>
+  <string name="details_ms">%1$02d:%2$02d</string>
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
+  <string name="movie_view_label">Reproductor de videu</string>
+  <string name="loading_video">Cargando videu…</string>
+  <string name="loading_image">Cargando imaxe…</string>
+  <string name="loading_account">Cargando cuenta...</string>
+  <string name="resume_playing_title">Reanudar videu</string>
+  <string name="resume_playing_message">Reanudar reproducción a partir de %s ?</string>
+  <string name="resume_playing_resume">Reanudar reproducción</string>
+  <string name="loading">Cargando...</string>
+  <string name="fail_to_load">Fallu al cargar</string>
+  <string name="fail_to_load_image">Nun pue cargase la imaxe.</string>
+  <string name="no_thumbnail">Nun hai miniatures.</string>
+  <string name="resume_playing_restart">Volver a reproducir</string>
+  <string name="crop_save_text">Aceutar</string>
+  <string name="ok">Aceutar</string>
+  <string name="multiface_crop_help">Toca una cara pa entamar.</string>
+  <string name="saving_image">Guardando imaxe...</string>
+  <string name="filtershow_saving_image">Guardando imaxe en <xliff:g id="ALBUM_NAME">%1$s</xliff:g> …</string>
+  <string name="save_error">Fallu al guardar la imaxe recortada</string>
+  <string name="crop_label">Recortar</string>
+  <string name="trim_label">Recortar videu</string>
+  <string name="select_image">Esbillar semeya</string>
+  <string name="select_video">Esbillar videu</string>
+  <string name="select_item">Esbillar elementu</string>
+  <string name="select_album">Esbillar álbum</string>
+  <string name="select_group">Esbillar grupu</string>
+  <string name="set_image">Afitar como...</string>
+  <string name="set_wallpaper">Afitar fondu de pantalla</string>
+  <string name="wallpaper">Afitando fondu de pantalla...</string>
+  <string name="camera_setas_wallpaper">Fondu de pantalla</string>
+  <string name="delete">Desaniciar</string>
+  <plurals name="delete_selection">
+    <item quantity="one">¿Desaniciar elementu esbilláu?</item>
+    <item quantity="other">¿Desaniciar elementos esbillaos?</item>
+  </plurals>
+  <string name="confirm">Confirmar</string>
+  <string name="cancel">Encaboxar</string>
+  <string name="share">Compartir</string>
+  <string name="share_panorama">Compartir panorámica</string>
+  <string name="share_as_photo">Compartir como semeya</string>
+  <string name="deleted">Desaniciada</string>
+  <string name="undo">DESFACER</string>
+  <string name="select_all">Marcalo too</string>
+  <string name="deselect_all">Desmarcalo too</string>
+  <string name="slideshow">Presentación</string>
+  <string name="details">Detalles</string>
+  <string name="details_title">Elementu: %1$d de %2$d</string>
+  <string name="close">Zarrar</string>
+  <string name="switch_to_camera">Cambiar a la cámara</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d esbilláu</item>
+    <item quantity="other">%1$d esbillaos</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d esbilláu</item>
+    <item quantity="other">%1$d esbillaos</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d esbilláu</item>
+    <item quantity="other">%1$d esbillaos</item>
+  </plurals>
+  <string name="show_on_map">Amosar nel mapa</string>
+  <string name="rotate_left">Xirar a la esquierda</string>
+  <string name="rotate_right">Xirar a la derecha</string>
+  <string name="no_such_item">Nun pudo alcontrase l\'elementu.</string>
+  <string name="edit">Editar</string>
+  <string name="simple_edit">Edición simple</string>
+  <string name="process_caching_requests">Procesando solicitúes d\'almacenamientu en caché</string>
+  <string name="caching_label">Almacenando en caché...</string>
+  <string name="crop_action">Recortar</string>
+  <string name="trim_action">Recortar</string>
+  <string name="mute_action">Silenciar</string>
+  <string name="set_as">Afitar como</string>
+  <string name="video_mute_err">Nun pue silenciase\'l videu.</string>
+  <string name="video_err">Nun pue reproducise\'l videu.</string>
+  <string name="group_by_location">Per llocalización</string>
+  <string name="group_by_time">Per data</string>
+  <string name="group_by_tags">Por etiquetes</string>
+  <string name="group_by_faces">Por persones</string>
+  <string name="group_by_album">Por álbum</string>
+  <string name="group_by_size">Por tamañu</string>
+  <string name="untagged">Ensin etiquetes</string>
+  <string name="no_location">Ensin llocalización</string>
+  <string name="no_connectivity">Nun pudieron identificase dalgunes llocalizaciones por fallos na rede.</string>
+  <string name="sync_album_error">Nun pudieron descargase les semeyes del álbum. Inténtalo de nueves más tarde.</string>
+  <string name="show_images_only">Namái imáxenes</string>
+  <string name="show_videos_only">Namái vídeos</string>
+  <string name="show_all">Imáxenes y vídeos</string>
+  <string name="appwidget_title">Galería de semeyes</string>
+  <string name="appwidget_empty_text">Nun hai semeyes.</string>
+  <string name="crop_saved">La imaxe recortada guardóse en <xliff:g id="FOLDER_NAME">%s</xliff:g>.</string>
+  <string name="no_albums_alert">Nun hai álbumes disponibles.</string>
+  <string name="empty_album">Nun hai imáxenes nin vídeos disponibles.</string>
+  <string name="picasa_posts">Publicaciones</string>
+  <string name="make_available_offline">Disponible ensin conexón</string>
+  <string name="sync_picasa_albums">Anovar</string>
+  <string name="done">Fecho</string>
+  <string name="sequence_in_set">Elementu: %1$d de %2$d</string>
+  <string name="title">Títulu</string>
+  <string name="description">Descripción</string>
+  <string name="time">Hora</string>
+  <string name="location">Llocalización</string>
+  <string name="path">Camín</string>
+  <string name="width">Anchor</string>
+  <string name="height">Altor</string>
+  <string name="orientation">Orientación</string>
+  <string name="duration">Duración</string>
+  <string name="mimetype">Tipu de MIME</string>
+  <string name="file_size">Tamañu del ficheru</string>
+  <string name="maker">Creador</string>
+  <string name="model">Modelu</string>
+  <string name="flash">Flash</string>
+  <string name="aperture">Apertura</string>
+  <string name="focal_length">Llonxitú focal</string>
+  <string name="white_balance">Balance de blancos</string>
+  <string name="exposure_time">Tiempu esposición</string>
+  <string name="iso">ISO</string>
+  <string name="unit_mm">mm</string>
+  <string name="manual">Manual</string>
+  <string name="auto">Automáticu</string>
+  <string name="flash_on">Flash activáu</string>
+  <string name="flash_off">Ensin flash</string>
+  <string name="unknown">Desconocíu</string>
+  <string name="ffx_original">Orixinal</string>
+  <string name="ffx_vintage">Vintage</string>
+  <string name="ffx_instant">Instantánea</string>
+  <string name="ffx_bleach">Decolorar</string>
+  <string name="ffx_blue_crush">Azul</string>
+  <string name="ffx_bw_contrast">Blancu y prietu</string>
+  <string name="ffx_punch">Punch</string>
+  <string name="ffx_x_process">Procesamientu X</string>
+  <string name="ffx_washout">Latte</string>
+  <string name="ffx_washout_color">Litho</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one">Faciendo que l\'álbum pueda vese ensin conexón</item>
+    <item quantity="other">Faciendo que los álbumes puedan vese ensin conexón...</item>
+  </plurals>
+  <string name="try_to_set_local_album_available_offline">L\'elementu almacenóse de forma llocal y ta disponible ensin conexón.</string>
+  <string name="set_label_all_albums">Tolos álbumes</string>
+  <string name="set_label_local_albums">Álbumes llocales</string>
+  <string name="set_label_mtp_devices">Preseos MTP</string>
+  <string name="set_label_picasa_albums">Álbumes de Picasa</string>
+  <string name="free_space_format"><xliff:g id="BYTES">%s</xliff:g> llibres</string>
+  <string name="size_below"><xliff:g id="SIZE">%1$s</xliff:g> o inferior</string>
+  <string name="size_above"><xliff:g id="SIZE">%1$s</xliff:g> o superior</string>
+  <string name="size_between">De <xliff:g id="MIN_SIZE">%1$s</xliff:g> a <xliff:g id="MAX_SIZE">%2$s</xliff:g></string>
+  <string name="Import">Importar</string>
+  <string name="import_complete">Importación completada</string>
+  <string name="import_fail">Fallu al importar</string>
+  <string name="camera_connected">Cámara coneutada</string>
+  <string name="camera_disconnected">Cámara desconeutada</string>
+  <string name="click_import">Toca equí pa facer la importación.</string>
+  <string name="widget_type_album">Esbillar un álbum</string>
+  <string name="widget_type_shuffle">Amosar imáxenes al debalu</string>
+  <string name="widget_type_photo">Esbillar una imaxe</string>
+  <string name="widget_type">Esbillar imáxenes</string>
+  <string name="slideshow_dream_name">Presentación</string>
+  <string name="albums">Álbumes</string>
+  <string name="times">Data</string>
+  <string name="locations">Llocalizaciones</string>
+  <string name="people">Persones</string>
+  <string name="tags">Etiquetes</string>
+  <string name="group_by">Agrupar por</string>
+  <string name="settings">Axustes</string>
+  <string name="add_account">Amestar cuenta</string>
+  <string name="folder_camera">Cámara</string>
+  <string name="folder_download">Descargaes</string>
+  <string name="folder_edited_online_photos">Semeyes online editaes</string>
+  <string name="folder_imported">Importaes</string>
+  <string name="folder_screenshot">Captures de pantalla</string>
+  <string name="help">Ayuda</string>
+  <string name="no_external_storage_title">Ensin almacenamientu</string>
+  <string name="no_external_storage">Nun hai almacenamientu esternu disponible.</string>
+  <string name="switch_photo_filmstrip">Vista de tira de película</string>
+  <string name="switch_photo_grid">Vista de cuadrícula</string>
+  <string name="switch_photo_fullscreen">Pantalla completa</string>
+  <string name="trimming">Recortando...</string>
+  <string name="muting">Silenciando...</string>
+  <string name="please_wait">Espera...</string>
+  <string name="save_into">Guardando videu en <xliff:g id="ALBUM_NAME">%1$s</xliff:g>…</string>
+  <string name="trim_too_short">Nun se pue recortar: el videu de destín ye enforma curtiu.</string>
+  <string name="pano_progress_text">Creando panorámica...</string>
+  <string name="save" msgid="8140440041190264400">Guardar</string>
+  <string name="ingest_scanning" msgid="2048262851775139720">Analizando conteníu...</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="one">%1$d elementu analizáu</item>
+    <item quantity="other">%1$d elementos analizaos</item>
+  </plurals>
+  <plurals name="ingest_number_of_items_selected">
+    <item quantity="one">%1$d elementu esbilláu</item>
+    <item quantity="other">%1$d elementos esbillaos</item>
+  </plurals>
+  <string name="ingest_sorting" msgid="624687230903648118">Ordenando...</string>
+  <string name="ingest_scanning_done">Análisis completu</string>
+  <string name="ingest_importing">Importando...</string>
+  <string name="ingest_empty_device">Nun hai conteníu disponible pa importar nesti preséu.</string>
+  <string name="ingest_no_device">Nun hai preseos MTP coneutaos</string>
+  <string name="camera_error_title">Fallu de cámara</string>
+  <string name="cannot_connect_camera">Nun pue accedese a la cámara.</string>
+  <string name="camera_disabled">Inhabilitóse la cámara por polítiques de seguridá.</string>
+  <string name="camera_label">Cámara</string>
+  <string name="wait">Por favor, espera...</string>
+  <string name="no_storage" product="nosdcard">Pa poder usar la cámara, activa l\'almacenamientu USB.</string>
+  <string name="no_storage" product="default">Pa poder usar la cámara, inxerta una tarxeta SD.</string>
+  <string name="preparing_sd" product="nosdcard">Tresnando almacenamientu USB…</string>
+  <string name="preparing_sd" product="default">Tresnando tarxeta SD…</string>
+  <string name="access_sd_fail" product="nosdcard">Nun pudo accedese al almacenamientu USB.</string>
+  <string name="access_sd_fail" product="default">Nun pudo accedese a la tarxeta SD.</string>
+  <string name="review_cancel">ENCABOXAR</string>
+  <string name="review_ok">FECHO</string>
+  <string name="time_lapse_title">Grabación a intervalos de tiempu</string>
+  <string name="pref_camera_id_title">Seleicionar cámara</string>
+  <string name="pref_camera_id_entry_back">Trasera</string>
+  <string name="pref_camera_id_entry_front">Delantera</string>
+  <string name="pref_camera_recordlocation_title">Amestar llocalización</string>
+  <string name="pref_camera_location_label">LLOCALIZACIÓN</string>
+  <string name="pref_camera_timer_title">Temporizador de cuenta atrás</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">1 segundu</item>
+    <item quantity="other">%d segundos</item>
+  </plurals>
+  <string name="pref_camera_timer_sound_default">@string/setting_on_value</string>
+  <string name="pref_camera_timer_sound_title">Usar pitíu</string>
+  <string name="setting_off">Desactiváu</string>
+  <string name="setting_on">Activáu</string>
+  <string name="pref_video_quality_title">Calidá de videu</string>
+  <string name="pref_video_quality_entry_high">Alta</string>
+  <string name="pref_video_quality_entry_low">Baxa</string>
+  <string name="pref_video_time_lapse_frame_interval_title">Intervalu de tiempu</string>
+  <string name="pref_camera_settings_category">Axustes de la cámara</string>
+  <string name="pref_camcorder_settings_category">Configuración de videocámara</string>
+  <string name="pref_camera_picturesize_title">Tamañu imaxe</string>
+  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
+  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
+  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
+  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
+  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
+  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
+  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
+  <string name="pref_camera_picturesize_entry_1_3mp">1,3 MP</string>
+  <string name="pref_camera_picturesize_entry_1mp">1 MP</string>
+  <string name="pref_camera_picturesize_entry_vga">VGA</string>
+  <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
+  <string name="pref_camera_focusmode_title">Mou d\'enfoque</string>
+  <string name="pref_camera_focusmode_entry_auto">Auto</string>
+  <string name="pref_camera_focusmode_entry_infinity">Infinitu</string>
+  <string name="pref_camera_focusmode_entry_macro">Macro</string>
+  <string name="pref_camera_focusmode_label_auto">AUTOMÁTICU</string>
+  <string name="pref_camera_focusmode_label_infinity">INFINITU</string>
+  <string name="pref_camera_focusmode_label_macro">MACRO</string>
+  <string name="pref_camera_flashmode_title">Flash</string>
+  <string name="pref_camera_flashmode_label">MOU FLASH</string>
+  <string name="pref_camera_flashmode_entry_auto">Automáticu</string>
+  <string name="pref_camera_flashmode_entry_on">Activáu</string>
+  <string name="pref_camera_flashmode_entry_off">Desactiváu</string>
+  <string name="pref_camera_flashmode_label_auto">FLASH AUTOMÁTICU</string>
+  <string name="pref_camera_flashmode_label_on">FLASH ACTIVÁU</string>
+  <string name="pref_camera_flashmode_label_off">FLASH DESACTIVÁU</string>
+  <string name="pref_camera_whitebalance_title">Balance de blancos</string>
+  <string name="pref_camera_whitebalance_label">BALANCE DE BLANCOS</string>
+  <string name="pref_camera_whitebalance_entry_auto">Automáticu</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">Incandescente</string>
+  <string name="pref_camera_whitebalance_entry_daylight">Lluz natural</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescente</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">Ñuble</string>
+  <string name="pref_camera_whitebalance_label_auto">AUTOMÁTICU</string>
+  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENTE</string>
+  <string name="pref_camera_whitebalance_label_daylight">LLUZ NATURAL</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENTE</string>
+  <string name="pref_camera_whitebalance_label_cloudy">ÑUBLE</string>
+  <string name="pref_camera_scenemode_title">Mou d\'escena</string>
+  <string name="pref_camera_scenemode_entry_auto">Automáticu</string>
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
+  <string name="pref_camera_scenemode_entry_action">Aición</string>
+  <string name="pref_camera_scenemode_entry_night">Nocherniegu</string>
+  <string name="pref_camera_scenemode_entry_sunset">Atapecer</string>
+  <string name="pref_camera_scenemode_entry_party">Folixa</string>
+  <string name="pref_camera_scenemode_label_auto">NENGÚN</string>
+  <string name="pref_camera_scenemode_label_action">AICIÓN</string>
+  <string name="pref_camera_scenemode_label_night">NUECHE</string>
+  <string name="pref_camera_scenemode_label_sunset">ATAPECER</string>
+  <string name="pref_camera_scenemode_label_party">FOLIXA</string>
+  <string name="pref_camera_countdown_label">TEMPORIZADOR DE CUENTA ATRÁS</string>
+  <string name="pref_camera_countdown_label_off">TEMPORIZADOR DESACTIVÁU</string>
+  <string name="pref_camera_countdown_label_one">1 SEGUNDU</string>
+  <string name="pref_camera_countdown_label_three">3 SEGUNDOS</string>
+  <string name="pref_camera_countdown_label_ten">10 SEGUNDOS</string>
+  <string name="pref_camera_countdown_label_fifteen">15 SEGUNDOS</string>
+  <string name="not_selectable_in_scene_mode">Nun pue seleicionase nel mou d\'escena.</string>
+  <string name="pref_exposure_title">Esposición</string>
+  <string name="pref_exposure_label">ESPOSICIÓN</string>
+  <string name="pref_camera_hdr_default">@string/setting_off_value</string>
+  <string name="pref_camera_hdr_label">HDR</string>
+  <string name="pref_camera_id_label_back">CÁMARA FRONTAL</string>
+  <string name="pref_camera_id_label_front">CÁMARA TRASERA</string>
+  <string name="dialog_ok">Aceutar</string>
+  <string name="spaceIsLow_content" product="nosdcard">Nun hai espaciu nel almacenamientu USB. Cambia la configuración de calidá o desanicia dalgunes imáxenes o otros ficheros.</string>
+  <string name="spaceIsLow_content" product="default">Nun hai espaciu na tarxeta SD. Cambia la configuración de calidá o desanicia dalgunes imáxenes o otros ficheros.</string>
+  <string name="video_reach_size_limit">Algamóse la llende de tamañu.</string>
+  <string name="pano_too_fast_prompt">Mui rápidu</string>
+  <string name="pano_dialog_prepare_preview">Preparando mou panorámicu</string>
+  <string name="pano_dialog_panorama_failed">Fallu al guardar imaxe panorámica</string>
+  <string name="pano_dialog_title">Panorámicu</string>
+  <string name="pano_capture_indication">Capturando panorámica</string>
+  <string name="pano_dialog_waiting_previous">Esperando semeya panorámica anterior...</string>
+  <string name="pano_review_saving_indication_str">Guardando...</string>
+  <string name="pano_review_rendering">Creando panorámica...</string>
+  <string name="tap_to_focus">Toca pa enfocar</string>
+  <string name="pref_video_effect_title">Efeutos</string>
+  <string name="effect_none">Nengún</string>
+  <string name="effect_goofy_face_squeeze">Comprimir</string>
+  <string name="effect_goofy_face_big_eyes">Güeyos grandes</string>
+  <string name="effect_goofy_face_big_mouth">Boca grande</string>
+  <string name="effect_goofy_face_small_mouth">Boca pequeña</string>
+  <string name="effect_goofy_face_big_nose">Nariz grande</string>
+  <string name="effect_goofy_face_small_eyes">Güeyos pequeños</string>
+  <string name="effect_backdropper_space">Nel espaciu</string>
+  <string name="effect_backdropper_sunset">Atapecer</string>
+  <string name="effect_backdropper_gallery">El to videu</string>
+  <string name="bg_replacement_message">Desactiva\'l preséu.\nDexa d\'usalu unos minutos.</string>
+  <string name="video_snapshot_hint">Toca pa facer una semeya mientres grabes un videu.</string>
+  <string name="video_recording_started">Anicióse la grabación de videu.</string>
+  <string name="video_recording_stopped">La grabación de videu detúvose.</string>
+  <string name="disable_video_snapshot_hint">La instantánea de videu inhabilítase al activar efeutos especiales.</string>
+  <string name="clear_effects">Quitar efeutos</string>
+  <string name="effect_silly_faces">CARES GRACIOSES</string>
+  <string name="effect_background">FONDU</string>
+  <string name="accessibility_shutter_button">Botón del obturador</string>
+  <string name="accessibility_menu_button">Botón de menú</string>
+  <string name="accessibility_review_thumbnail">Semeya más recién</string>
+  <string name="accessibility_camera_picker">Opción de cámara trasera y delantera</string>
+  <string name="accessibility_mode_picker">Cámara, videu o mou panorámicu</string>
+  <string name="accessibility_second_level_indicators">Más controles de configuración</string>
+  <string name="accessibility_back_to_first_level">Zarrar controles de configuración</string>
+  <string name="accessibility_zoom_control">Control de zoom</string>
+  <string name="accessibility_decrement">Amenorgar %1$s</string>
+  <string name="accessibility_increment">Aumentar %1$s</string>
+  <string name="accessibility_check_box">Caxellu de verificación %1$s</string>
+  <string name="accessibility_switch_to_camera">Cambiar a la cámara</string>
+  <string name="accessibility_switch_to_video">Cambiar a videu</string>
+  <string name="accessibility_switch_to_panorama">Cambiar a mou panorámicu</string>
+  <string name="accessibility_switch_to_new_panorama">Cambiar a nueva panorámica</string>
+  <string name="accessibility_switch_to_refocus">Cambiar a reenfoque</string>
+  <string name="accessibility_review_cancel">Encaboxar</string>
+  <string name="accessibility_review_ok">Fecho</string>
+  <string name="accessibility_review_retake">Revisar repetición</string>
+  <string name="accessibility_play_video">Ver un videu</string>
+  <string name="accessibility_pause_video">Posar videu</string>
+  <string name="accessibility_reload_video">Volver a cargar videu</string>
+  <string name="accessibility_time_bar">Barra de tiempu del reproductor de videu</string>
+  <string name="capital_on">SÍ</string>
+  <string name="capital_off">NON</string>
+  <string name="pref_video_time_lapse_frame_interval_off">Desactiváu</string>
+  <string name="pref_video_time_lapse_frame_interval_500">0,5 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_1000">1 segundu</string>
+  <string name="pref_video_time_lapse_frame_interval_1500">1,5 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_2000">2 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_2500">2,5 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_3000">3 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_4000">4 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_5000">5 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_6000">6 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_10000">10 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_12000">12 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_15000">15 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_24000">24 segundos</string>
+  <string name="pref_video_time_lapse_frame_interval_30000">0,5 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minutu</string>
+  <string name="pref_video_time_lapse_frame_interval_90000">1,5 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_150000">2,5 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minutos</string>
+  <string name="pref_video_time_lapse_frame_interval_1800000">0,5 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 hora</string>
+  <string name="pref_video_time_lapse_frame_interval_5400000">1,5 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_9000000">2,5 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 hores</string>
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 hores</string>
+  <string name="time_lapse_seconds">segundos</string>
+  <string name="time_lapse_minutes">minutos</string>
+  <string name="time_lapse_hours">hores</string>
+  <string name="time_lapse_interval_set">Fecho</string>
+  <string name="set_time_interval">Afita intervalu de tiempu</string>
+  <string name="set_time_interval_help">L\'intervalu de tiempu ta desactiváu. Activa esta función p\'afitar un intervalu.</string>
+  <string name="set_timer_help">El temporizador de cuenta atrás ta desactiváu. Activa esta opción pa ver la cuenta atrás enantes de facer una semeya.</string>
+  <string name="set_duration">Definir duración en segundos</string>
+  <string name="count_down_title_text">Cuenta atrás pa facer una semeya</string>
+  <string name="remember_location_title">¿Recordar llocalizaciones de les semeyes?</string>
+  <string name="remember_location_prompt">Etiqueta les tos semeyes y vídeos coles llocalizaciones au se fexeron.\n\nOtres aplicaciones puen acceder a esta información, asina como a les imáxenes guardaes.</string>
+  <string name="remember_location_no">Non, gracies</string>
+  <string name="remember_location_yes">Sí</string>
+  <string name="menu_camera">Cámara</string>
+  <string name="menu_search">Guetar</string>
+  <string name="tab_photos">Semeyes</string>
+  <string name="tab_albums">Álbumes</string>
+  <string name="camera_menu_more_label">MÁS OPCIONES</string>
+  <string name="camera_menu_settings_label">AXUSTES</string>
+  <plurals name="number_of_photos">
+    <item quantity="one">%1$d semeya</item>
+    <item quantity="other">%1$d semeyes</item>
+  </plurals>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-az-rAZ/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-az-rAZ/cm_strings.xml
index dfc7592..f626bfa 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Səsyazma vaxtı</string>
+</resources>
diff --git a/res/values-az-rAZ/codeaurora_strings.xml b/res/values-az-rAZ/codeaurora_strings.xml
new file mode 100644
index 0000000..5132017
--- /dev/null
+++ b/res/values-az-rAZ/codeaurora_strings.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_three_second">3 saniyə</string>
+  <string name="setp_option_six_second">6 saniyə</string>
+  <string name="single">"Tək"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Səsucaldan AÇIQ</string>
+  <string name="speaker_off">Səsucaldan QAPALI</string>
+  <string name="speaker_need_headset">Bu özəllikdən istifadə etmək üçün qulaqlıq taxın.</string>
+  <string name="single_track">"Tək parça"</string>
+  <string name="input_url">"URL daxil edin"</string>
+  <string name="streaming_settings">"Axın tənzimləmələri"</string>
+  <string name="next">"Sonrakı"</string>
+  <string name="previous">"Əvvəlki"</string>
+  <string name="buffer_size">Bufer ölçüsü</string>
+  <string name="apn">Üstünlük verilən APN</string>
+  <string name="rtp_min_port">Min. bağlantı nöqtəsi</string>
+  <string name="rtp_max_port">Maks. bağlantı nöqtəsi</string>
+  <string name="set_rtp_min_port">Min bağlantı nöqtəsini tənzimlə</string>
+  <string name="set_rtp_max_port">Max bağlantı nöqtəsini tənzimlə</string>
+  <string name="set_buffer_size">Bufer ölçüsünü tənzimlə</string>
+  <string name="set_apn">Üstünlük verilən APN\'i seçin</string>
+  <string name="setting">Tənzimləmələr</string>
+  <string name="server_timeout_title">"Serverə qoyulan vaxt"</string>
+  <string name="server_timeout_message">"Videonu oynatmaq üçün serverə yenidən bağlansın?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Bağlanma xətası, %1$d üçün yenidən bağlantı yaradılır\u2026"</string>
+  <string name="media_controller_live">Canlı</string>
+  <string name="media_controller_playing">Oynadılır</string>
+  <string name="media_controller_connecting">Bağlanır\u2026</string>
+  <string name="bookmark_add">"Əlfəcin əlavə et"</string>
+  <string name="bookmark_display">"Əlfəcinləri göstər"</string>
+  <string name="bookmark_empty">"Əlfəcin yoxdur"</string>
+  <string name="bookmark_exist">"Əlfəcin artıq mövcuddur"</string>
+  <string name="bookmark_add_success">"Əlfəcin əlavə edildi"</string>
+  <string name="bookmark_list">"Əlfəcinlər"</string>
+  <string name="bookmark_title">"Başlıq"</string>
+  <string name="bookmark_location">"Yer"</string>
+  <string name="delete_all">"Hamısını sil"</string>
+  <string name="default_title">"Standart başlıq"</string>
+  <string name="more_image">Daha çox təsvir</string>
+  <string name="mute_nosupport">Səsi kəsilə bilmir : video dəstəklənmir</string>
+  <string name="map_activity_not_found_err">Yeri göstərmək üçün quraşdırılmış xəritə tətbiqetməsi yoxdur.</string>
+  <string name="bass_boost_strength">Bas yüksəldici</string>
+  <string name="virtualizer_strength">3D effekti</string>
+  <string name="audio_effects">Səs effekti</string>
+  <string name="headset_plug">Bu effektlər üçün qulaqcıq taxın.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Bağışlayın, bu video fayl kəsilə bilməz</string>
+  <string name="no_permission_for_drm">Bağışlayın, DRM qorumalı fayllar paylaşıla bilməz</string>
+  <string name="drm_license_info">DRM lisenziya məlumatı</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-bn-rBD/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-bn-rBD/cm_strings.xml
index dfc7592..5f852f7 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">রেকর্ডের সময়</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-ca/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-ca/cm_strings.xml
index dfc7592..0205720 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Temps de gravació</string>
+</resources>
diff --git a/res/values-ca/codeaurora_strings.xml b/res/values-ca/codeaurora_strings.xml
new file mode 100644
index 0000000..e2e8fa0
--- /dev/null
+++ b/res/values-ca/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Pas</string>
+  <string name="step_option_desc">Personalitza el pas endavant/rebobina ràpid</string>
+  <string name="setp_option_three_second">3 segons</string>
+  <string name="setp_option_six_second">6 segons</string>
+  <string name="loop">"Bucle"</string>
+  <string name="single">"Individual"</string>
+  <string name="stereo">"Estèreo"</string>
+  <string name="speaker_on">Altaveu Activat</string>
+  <string name="speaker_off">Altaveu Desactivat</string>
+  <string name="speaker_need_headset">Endolla els auriculars per utilitzar aquesta característica.</string>
+  <string name="single_track">"Una pista"</string>
+  <string name="input_url">"Introdueix URL"</string>
+  <string name="streaming_settings">"Ajustaments del flux de dades"</string>
+  <string name="next">"Següent"</string>
+  <string name="previous">"Anterior"</string>
+  <string name="buffer_size">Mida del buffer</string>
+  <string name="apn">APN preferida</string>
+  <string name="rtp_min_port">Port min</string>
+  <string name="rtp_max_port">Port max</string>
+  <string name="set_rtp_min_port">Estableix el port min</string>
+  <string name="set_rtp_max_port">Estableix el port max</string>
+  <string name="set_buffer_size">Estableix la mida del buffer</string>
+  <string name="set_apn">Selecciona l\'APN preferida</string>
+  <string name="setting">Ajustaments</string>
+  <string name="server_timeout_title">"Temps d'espera del servidor"</string>
+  <string name="server_timeout_message">"vols tornar a connectar amb el servidor per reproduir el vídeo?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"La connexió ha fallat, intentant tornar a connectar a %1$d\u2026"</string>
+  <string name="media_controller_live">En directe</string>
+  <string name="media_controller_playing">S\'està reproduïnt</string>
+  <string name="media_controller_connecting">S\'està connectant\u2026</string>
+  <string name="bookmark_add">"Afegeix un marcador"</string>
+  <string name="bookmark_display">"Mostra els marcadors"</string>
+  <string name="bookmark_empty">"Sense marcadors"</string>
+  <string name="bookmark_exist">"El marcador ja existeix"</string>
+  <string name="bookmark_add_success">"S'ha afegit un marcador"</string>
+  <string name="bookmark_list">"Marcadors"</string>
+  <string name="bookmark_title">"Títol"</string>
+  <string name="bookmark_location">"Ubicació"</string>
+  <string name="delete_all">"Esborrar-ho tot"</string>
+  <string name="default_title">"Títol predefinit"</string>
+  <string name="more_image">Més imatges</string>
+  <string name="mute_nosupport">No s\'ha pogut silenciar: vídeo no suportat</string>
+  <string name="map_activity_not_found_err">No hi ha cap aplicació de mapes instal·lada per mostrar la ubicació.</string>
+  <string name="bass_boost_strength">Amplificació de greus</string>
+  <string name="virtualizer_strength">Efecte 3D</string>
+  <string name="audio_effects">Efectes de so</string>
+  <string name="headset_plug">Endolla els auriculars per aquests efectes.</string>
+  <string name="audio_effects_dialog_title">So Snapdragon+</string>
+  <string name="fail_trim">Ho sento, aquest fitxer de vídeo no es pot retallar</string>
+  <string name="no_permission_for_drm">Ho sento, no es poden compartir arxius DRM protegits</string>
+  <string name="drm_license_info">Informació de llicència DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-cs/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-cs/cm_strings.xml
index dfc7592..92563d0 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Čas nahrávky</string>
+</resources>
diff --git a/res/values-cs/codeaurora_strings.xml b/res/values-cs/codeaurora_strings.xml
new file mode 100644
index 0000000..e7fc5a3
--- /dev/null
+++ b/res/values-cs/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Krok</string>
+  <string name="step_option_desc">Přizpůsobit krok vpřed/vzad</string>
+  <string name="setp_option_three_second">3 sekundy</string>
+  <string name="setp_option_six_second">6 sekund</string>
+  <string name="loop">"Opakování"</string>
+  <string name="single">"Jednou"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Reproduktor zapnut</string>
+  <string name="speaker_off">Reproduktor vypnut</string>
+  <string name="speaker_need_headset">Pro využití této funkce připojte sluchátka.</string>
+  <string name="single_track">"Jedna stopa"</string>
+  <string name="input_url">"Zadejte URL"</string>
+  <string name="streaming_settings">"Nastavení pro datové toky"</string>
+  <string name="next">"Další"</string>
+  <string name="previous">"Předchozí"</string>
+  <string name="buffer_size">Velikost vyrovnávací paměti</string>
+  <string name="apn">Upřednostňované APN</string>
+  <string name="rtp_min_port">Min. č. portu</string>
+  <string name="rtp_max_port">Max. č. portu</string>
+  <string name="set_rtp_min_port">Nastavit min. č. portu</string>
+  <string name="set_rtp_max_port">Nastavit max. č. portu</string>
+  <string name="set_buffer_size">Nastavit velikost vyrovnávací paměťi</string>
+  <string name="set_apn">Vyberte upřednostňovaný APN</string>
+  <string name="setting">Nastavení</string>
+  <string name="server_timeout_title">"Časový limit serveru"</string>
+  <string name="server_timeout_message">"Znovu připojit k serveru a spustit video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Připojení se nezdařilo, pokus o obnovení spojení k „%1$d“\u2026"</string>
+  <string name="media_controller_live">Živě</string>
+  <string name="media_controller_playing">Přehrávání</string>
+  <string name="media_controller_connecting">Připojování\u2026</string>
+  <string name="bookmark_add">"Přidat záložku"</string>
+  <string name="bookmark_display">"Zobrazit záložky"</string>
+  <string name="bookmark_empty">"Žádné záložky"</string>
+  <string name="bookmark_exist">"Záložka již existuje"</string>
+  <string name="bookmark_add_success">"Založka přidána"</string>
+  <string name="bookmark_list">"Záložky"</string>
+  <string name="bookmark_title">"Název"</string>
+  <string name="bookmark_location">"Poloha"</string>
+  <string name="delete_all">"Odstranit vše"</string>
+  <string name="default_title">"Výchozí název"</string>
+  <string name="more_image">Další obrázky</string>
+  <string name="mute_nosupport">Nelze ztlumit: video není podporované</string>
+  <string name="map_activity_not_found_err">Není nainstalována žádná mapová aplikace pro zobrazení polohy.</string>
+  <string name="bass_boost_strength">Zvýraznění basů</string>
+  <string name="virtualizer_strength">3D efekt</string>
+  <string name="audio_effects">Zvukové efekty</string>
+  <string name="headset_plug">Při připojení sluchátek použít tyto efekty.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Toto video nelze oříznout</string>
+  <string name="no_permission_for_drm">Omlouváme se, soubory chráněné DRM nelze sdílet</string>
+  <string name="drm_license_info">Informace o licenci DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-da/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-da/cm_strings.xml
index dfc7592..ec7e3b5 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-da/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Optagelsestidspunkt</string>
+</resources>
diff --git a/res/values-da/codeaurora_strings.xml b/res/values-da/codeaurora_strings.xml
new file mode 100644
index 0000000..22613b7
--- /dev/null
+++ b/res/values-da/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Trin</string>
+  <string name="step_option_desc">Tilpas trin for hurtig frem- og tilbagespoling</string>
+  <string name="setp_option_three_second">3 sekunder</string>
+  <string name="setp_option_six_second">6 sekunder</string>
+  <string name="loop">"Gentagelse"</string>
+  <string name="single">"Enkel"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Højttaler TIL</string>
+  <string name="speaker_off">Højttaler FRA</string>
+  <string name="speaker_need_headset">Tilslut hovedtelefonerne for at bruge denne funktion.</string>
+  <string name="single_track">"Enkelt spor"</string>
+  <string name="input_url">"Angiv URL"</string>
+  <string name="streaming_settings">"Streaming-indstillinger"</string>
+  <string name="next">"Næste"</string>
+  <string name="previous">"Forrige"</string>
+  <string name="buffer_size">Bufferstørrelse</string>
+  <string name="apn">Foretrukne APN</string>
+  <string name="rtp_min_port">Min. port</string>
+  <string name="rtp_max_port">Maks. port</string>
+  <string name="set_rtp_min_port">Angiv min. port</string>
+  <string name="set_rtp_max_port">Angiv maks. port</string>
+  <string name="set_buffer_size">Angiv Bufferstørrelse</string>
+  <string name="set_apn">Vælg foretrukne APN</string>
+  <string name="setting">Indstillinger</string>
+  <string name="server_timeout_title">"Servertimeout"</string>
+  <string name="server_timeout_message">"Genopret forbindelsen til serveren for at afspille videoen?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Tilslutning mislykkedes, forsøger at genoprette forbindelsen til %1$d\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Afspiller</string>
+  <string name="media_controller_connecting">Forbinder\u2026</string>
+  <string name="bookmark_add">"Tilføj bogmærke"</string>
+  <string name="bookmark_display">"Vis bogmærker"</string>
+  <string name="bookmark_empty">"Ingen bogmærker"</string>
+  <string name="bookmark_exist">"Bogmærket findes allerede"</string>
+  <string name="bookmark_add_success">"Bogmærke tilføjet"</string>
+  <string name="bookmark_list">"Bogmærker"</string>
+  <string name="bookmark_title">"Titel"</string>
+  <string name="bookmark_location">"Lokation"</string>
+  <string name="delete_all">"Slet alt"</string>
+  <string name="default_title">"Standardtitel"</string>
+  <string name="more_image">Flere billeder</string>
+  <string name="mute_nosupport">Kan ikke slå lyden fra : video understøttes ikke</string>
+  <string name="map_activity_not_found_err">Der er ikke installeret en kort-app til at vise placeringen.</string>
+  <string name="bass_boost_strength">Basforstærkning</string>
+  <string name="virtualizer_strength">3D-effekt</string>
+  <string name="audio_effects">Lydeffekter</string>
+  <string name="headset_plug">Tilslut hovedtelefoner for disse effekter.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Desværre, denne videofil kan ikke trimmes</string>
+  <string name="no_permission_for_drm">Beklager, DRM-beskyttede filer ikke kan deles</string>
+  <string name="drm_license_info">DRM licens info</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-de/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-de/cm_strings.xml
index dfc7592..7c20ceb 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-de/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Aufnahmezeit</string>
+</resources>
diff --git a/res/values-de/codeaurora_strings.xml b/res/values-de/codeaurora_strings.xml
new file mode 100644
index 0000000..2612ccd
--- /dev/null
+++ b/res/values-de/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Schritt</string>
+  <string name="step_option_desc">Vor- und Zurückspul-Schritt anpassen</string>
+  <string name="setp_option_three_second">3 Sekunden</string>
+  <string name="setp_option_six_second">6 Sekunden</string>
+  <string name="loop">"Endlosschleife"</string>
+  <string name="single">"Einzeln"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Lautsprecher an</string>
+  <string name="speaker_off">Lautsprecher aus</string>
+  <string name="speaker_need_headset">Für diese Funktionen müssen Sie Kopfhörer verwenden.</string>
+  <string name="single_track">"Einzelner Titel"</string>
+  <string name="input_url">"Geben Sie eine URL ein"</string>
+  <string name="streaming_settings">"Streaming-Einstellungen"</string>
+  <string name="next">"Weiter"</string>
+  <string name="previous">"Zurück"</string>
+  <string name="buffer_size">Puffergröße</string>
+  <string name="apn">Bevorzugter APN</string>
+  <string name="rtp_min_port">Min. Port</string>
+  <string name="rtp_max_port">Max. Port</string>
+  <string name="set_rtp_min_port">Min. Port festlegen</string>
+  <string name="set_rtp_max_port">Max. Port festlegen</string>
+  <string name="set_buffer_size">Puffergröße einstellen</string>
+  <string name="set_apn">Bevorzugten APN wählen</string>
+  <string name="setting">Einstellungen</string>
+  <string name="server_timeout_title">"Zeitüberschreitung beim Server"</string>
+  <string name="server_timeout_message">"Erneut zum Server verbinden, um das Video abzuspielen?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Verbindung fehlgeschlagen, neuer Verbindungsversuch zu %1$d\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Derzeit läuft</string>
+  <string name="media_controller_connecting">Verbinde\u2026</string>
+  <string name="bookmark_add">"Lesezeichen hinzufügen"</string>
+  <string name="bookmark_display">"Lesezeichen anzeigen"</string>
+  <string name="bookmark_empty">"Keine Lesezeichen"</string>
+  <string name="bookmark_exist">"Lesezeichen ist bereits vorhanden"</string>
+  <string name="bookmark_add_success">"Lesezeichen hinzugefügt"</string>
+  <string name="bookmark_list">"Lesezeichen"</string>
+  <string name="bookmark_title">"Titel"</string>
+  <string name="bookmark_location">"Ort"</string>
+  <string name="delete_all">"Alle löschen"</string>
+  <string name="default_title">"Standardtitel"</string>
+  <string name="more_image">Weitere Bilder</string>
+  <string name="mute_nosupport">Stummschalten nicht möglich – das Video wird nicht unterstützt</string>
+  <string name="map_activity_not_found_err">Es ist keine Karten-App installiert, um die Position anzuzeigen.</string>
+  <string name="bass_boost_strength">Bassverstärkung</string>
+  <string name="virtualizer_strength">3D-Effekt</string>
+  <string name="audio_effects">Audioeffekte</string>
+  <string name="headset_plug">Schließen Sie Kopfhörer für diese Effekte an.</string>
+  <string name="audio_effects_dialog_title">Snapdragon-Audio+</string>
+  <string name="fail_trim">Diese Videodatei kann nicht gekürzt werden</string>
+  <string name="no_permission_for_drm">Durch DRM geschützte Dateien können leider nicht geteilt werden</string>
+  <string name="drm_license_info">DRM-Lizenzinformationen</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-el/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-el/cm_strings.xml
index dfc7592..6559778 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-el/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Ημερομηνία καταγραφής</string>
+</resources>
diff --git a/res/values-el/codeaurora_strings.xml b/res/values-el/codeaurora_strings.xml
new file mode 100644
index 0000000..0152370
--- /dev/null
+++ b/res/values-el/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Βήμα</string>
+  <string name="step_option_desc">Προσαρμόστε το βήμα fast forward/rewind</string>
+  <string name="setp_option_three_second">3 δευτερόλεπτα</string>
+  <string name="setp_option_six_second">6 δευτερόλεπτα</string>
+  <string name="loop">"Επανάληψη"</string>
+  <string name="single">"Μονό"</string>
+  <string name="stereo">"Στερεοφωνικό"</string>
+  <string name="speaker_on">Ηχείο ενεργό</string>
+  <string name="speaker_off">Ηχείο ανενεργό</string>
+  <string name="speaker_need_headset">Συνδέστε ακουστικά για να χρησιμοποιήσετε αυτή τη δυνατότητα.</string>
+  <string name="single_track">"Μονό κομμάτι"</string>
+  <string name="input_url">"Εισάγετε URL"</string>
+  <string name="streaming_settings">"Ρυθµίσεις ροής"</string>
+  <string name="next">"Επόμενο"</string>
+  <string name="previous">"Προηγούμενο"</string>
+  <string name="buffer_size">Μέγεθος buffer</string>
+  <string name="apn">Προτιμώμενο APN</string>
+  <string name="rtp_min_port">Ελάχιστη θύρα</string>
+  <string name="rtp_max_port">Μέγιστη θύρα</string>
+  <string name="set_rtp_min_port">Ορισμός ελάχιστης θύρας</string>
+  <string name="set_rtp_max_port">Ορισμός μέγιστης θύρας</string>
+  <string name="set_buffer_size">Ορισμός μεγέθους buffer</string>
+  <string name="set_apn">Επιλογή προτιμώμενου APN</string>
+  <string name="setting">Ρυθμίσεις</string>
+  <string name="server_timeout_title">"Χρονικό όριο διακομιστή"</string>
+  <string name="server_timeout_message">"Επανασύνδεση με το διακομιστή για αναπαραγωγή του βίντεο;"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Η σύνδεση απέτυχε, προσπάθεια επανασύνδεσης με το %1$d\u2026"</string>
+  <string name="media_controller_live">Ζωντανά</string>
+  <string name="media_controller_playing">Γίνεται αναπαραγωγή</string>
+  <string name="media_controller_connecting">Σύνδεση\u2026</string>
+  <string name="bookmark_add">"Προσθήκη σελιδοδείκτη"</string>
+  <string name="bookmark_display">"Εμφάνιση σελιδοδεικτών"</string>
+  <string name="bookmark_empty">"Δεν υπάρχουν σελιδοδείκτες"</string>
+  <string name="bookmark_exist">"Ο σελιδοδείκτης υπάρχει ήδη"</string>
+  <string name="bookmark_add_success">"Ο σελιδοδείκτης προστέθηκε"</string>
+  <string name="bookmark_list">"Σελιδοδείκτες"</string>
+  <string name="bookmark_title">"Τίτλος"</string>
+  <string name="bookmark_location">"Τοποθεσία"</string>
+  <string name="delete_all">"Διαγραφή όλων"</string>
+  <string name="default_title">"Προεπιλεγμένος τίτλος"</string>
+  <string name="more_image">Περισσότερες εικόνες</string>
+  <string name="mute_nosupport">Δεν είναι δυνατή η σίγαση: το βίντεο δεν υποστηρίζεται</string>
+  <string name="map_activity_not_found_err">Δεν υπάρχει εγκατεστημένη καμία εφαρμογή χαρτών ώστε να δείτε την τοποθεσία.</string>
+  <string name="bass_boost_strength">Ενίσχυση μπάσου</string>
+  <string name="virtualizer_strength">Εφέ 3D</string>
+  <string name="audio_effects">Ηχητικά εφέ</string>
+  <string name="headset_plug">Συνδέστε ακουστικά για αυτά τα εφέ.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Δυστυχώς δεν είναι δυνατή η περικοπή αυτού του αρχείου βίντεο</string>
+  <string name="no_permission_for_drm">Συγγνώμη, δεν είναι δυνατή η κοινή χρήση αρχείων με προστασία DRM</string>
+  <string name="drm_license_info">Πληροφορίες άδειας DRM</string>
+</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 507b210..0a1be14 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -70,17 +70,17 @@
     <string name="switch_to_camera" msgid="7280111806675169992">"Φωτογραφική μηχανή"</string>
   <plurals name="number_of_items_selected">
     <item quantity="zero" msgid="2142579311530586258">"Επιλέχθηκαν %1$d"</item>
-    <item quantity="one" msgid="2478365152745637768">"Επιλέχθηκαν %1$d"</item>
+    <item quantity="one" msgid="2478365152745637768">"Επιλέχθηκε %1$d"</item>
     <item quantity="other" msgid="754722656147810487">"Επιλέχθηκαν %1$d"</item>
   </plurals>
   <plurals name="number_of_albums_selected">
     <item quantity="zero" msgid="749292746814788132">"Επιλέχθηκαν %1$d"</item>
-    <item quantity="one" msgid="6184377003099987825">"Επιλέχθηκαν %1$d"</item>
+    <item quantity="one" msgid="6184377003099987825">"Επιλέχθηκε %1$d"</item>
     <item quantity="other" msgid="53105607141906130">"Επιλέχθηκαν %1$d"</item>
   </plurals>
   <plurals name="number_of_groups_selected">
     <item quantity="zero" msgid="3466388370310869238">"Επιλέχθηκαν %1$d"</item>
-    <item quantity="one" msgid="5030162638216034260">"Επιλέχθηκαν %1$d"</item>
+    <item quantity="one" msgid="5030162638216034260">"Επιλέχθηκε %1$d"</item>
     <item quantity="other" msgid="3512041363942842738">"Επιλέχθηκαν %1$d"</item>
   </plurals>
     <string name="show_on_map" msgid="6157544221201750980">"Εμφάνιση στον χάρτη"</string>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-en-rAU/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-en-rAU/cm_strings.xml
index dfc7592..9b8df02 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Record time</string>
+</resources>
diff --git a/res/values-en-rAU/codeaurora_strings.xml b/res/values-en-rAU/codeaurora_strings.xml
new file mode 100644
index 0000000..e71a8ed
--- /dev/null
+++ b/res/values-en-rAU/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Step</string>
+  <string name="step_option_desc">Customise fast forward/rewind step</string>
+  <string name="setp_option_three_second">3 seconds</string>
+  <string name="setp_option_six_second">6 seconds</string>
+  <string name="loop">"Loop"</string>
+  <string name="single">"Single"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Speaker ON</string>
+  <string name="speaker_off">Speaker OFF</string>
+  <string name="speaker_need_headset">Plug in headphones to use this feature.</string>
+  <string name="single_track">"Single track"</string>
+  <string name="input_url">"Enter URL"</string>
+  <string name="streaming_settings">"Streaming settings"</string>
+  <string name="next">"Next"</string>
+  <string name="previous">"Previous"</string>
+  <string name="buffer_size">Buffer size</string>
+  <string name="apn">Preferred APN</string>
+  <string name="rtp_min_port">Min port</string>
+  <string name="rtp_max_port">Max port</string>
+  <string name="set_rtp_min_port">Set min port</string>
+  <string name="set_rtp_max_port">Set max port</string>
+  <string name="set_buffer_size">Set buffer size</string>
+  <string name="set_apn">Select preferred APN</string>
+  <string name="setting">Settings</string>
+  <string name="server_timeout_title">"Server timeout"</string>
+  <string name="server_timeout_message">"Reconnect to the server to play the video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Connection failed, trying to reconnect to %1$d\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Playing</string>
+  <string name="media_controller_connecting">Connecting\u2026</string>
+  <string name="bookmark_add">"Add bookmark"</string>
+  <string name="bookmark_display">"Show bookmarks"</string>
+  <string name="bookmark_empty">"No bookmarks"</string>
+  <string name="bookmark_exist">"Bookmark already exists"</string>
+  <string name="bookmark_add_success">"Bookmark added"</string>
+  <string name="bookmark_list">"Bookmarks"</string>
+  <string name="bookmark_title">"Title"</string>
+  <string name="bookmark_location">"Location"</string>
+  <string name="delete_all">"Delete all"</string>
+  <string name="default_title">"Default title"</string>
+  <string name="more_image">More images</string>
+  <string name="mute_nosupport">Can not mute : video not supported</string>
+  <string name="map_activity_not_found_err">There is no maps app installed to show the location.</string>
+  <string name="bass_boost_strength">Bass boost</string>
+  <string name="virtualizer_strength">3D effect</string>
+  <string name="audio_effects">Audio effects</string>
+  <string name="headset_plug">Plug in headphones for these effects.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Sorry, this video file can not be trimmed</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-en-rIN/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-en-rIN/cm_strings.xml
index dfc7592..9b8df02 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Record time</string>
+</resources>
diff --git a/res/values-en-rIN/codeaurora_strings.xml b/res/values-en-rIN/codeaurora_strings.xml
new file mode 100644
index 0000000..25c446f
--- /dev/null
+++ b/res/values-en-rIN/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Step</string>
+  <string name="step_option_desc">Customize fast forward/rewind step</string>
+  <string name="setp_option_three_second">3 seconds</string>
+  <string name="setp_option_six_second">6 seconds</string>
+  <string name="loop">"Loop"</string>
+  <string name="single">"Single"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Speaker ON</string>
+  <string name="speaker_off">Speaker OFF</string>
+  <string name="speaker_need_headset">Plug in headphones to use this feature.</string>
+  <string name="single_track">"Single track"</string>
+  <string name="input_url">"Enter URL"</string>
+  <string name="streaming_settings">"Streaming settings"</string>
+  <string name="next">"Next"</string>
+  <string name="previous">"Previous"</string>
+  <string name="buffer_size">Buffer size</string>
+  <string name="apn">Preferred APN</string>
+  <string name="rtp_min_port">Min port</string>
+  <string name="rtp_max_port">Max port</string>
+  <string name="set_rtp_min_port">Set min port</string>
+  <string name="set_rtp_max_port">Set max port</string>
+  <string name="set_buffer_size">Set buffer size</string>
+  <string name="set_apn">Select preferred APN</string>
+  <string name="setting">Settings</string>
+  <string name="server_timeout_title">"Server timeout"</string>
+  <string name="server_timeout_message">"Reconnect to the server to play the video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Connection failed, trying to reconnect to %1$d\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Playing</string>
+  <string name="media_controller_connecting">Connecting\u2026</string>
+  <string name="bookmark_add">"Add bookmark"</string>
+  <string name="bookmark_display">"Show bookmarks"</string>
+  <string name="bookmark_empty">"No bookmarks"</string>
+  <string name="bookmark_exist">"Bookmark already exists"</string>
+  <string name="bookmark_add_success">"Bookmark added"</string>
+  <string name="bookmark_list">"Bookmarks"</string>
+  <string name="bookmark_title">"Title"</string>
+  <string name="bookmark_location">"Location"</string>
+  <string name="delete_all">"Delete all"</string>
+  <string name="default_title">"Default title"</string>
+  <string name="more_image">More images</string>
+  <string name="mute_nosupport">Can not mute : video not supported</string>
+  <string name="map_activity_not_found_err">There is no maps app installed to show the location.</string>
+  <string name="bass_boost_strength">Bass boost</string>
+  <string name="virtualizer_strength">3D effect</string>
+  <string name="audio_effects">Audio effects</string>
+  <string name="headset_plug">Plug in headphones for these effects.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Sorry, this video file can not be trimmed</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-eo/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-eo/cm_strings.xml
index dfc7592..10d5b34 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-eo/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Rikordotempo</string>
+</resources>
diff --git a/res/values-eo/codeaurora_strings.xml b/res/values-eo/codeaurora_strings.xml
new file mode 100644
index 0000000..57438a6
--- /dev/null
+++ b/res/values-eo/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Paŝo</string>
+  <string name="step_option_desc">Agordi rapidan aantaŭ-/re-iron</string>
+  <string name="setp_option_three_second">3 sekundoj</string>
+  <string name="setp_option_six_second">6 sekundoj</string>
+  <string name="loop">"Buklo"</string>
+  <string name="single">"Unuopaĵo"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Laŭtilo ŝaltita</string>
+  <string name="speaker_off">Laŭtilo malŝaltita</string>
+  <string name="speaker_need_headset">Konektu kapaŭskultilojn por uzi tiun eblecon.</string>
+  <string name="single_track">"Unuopaĵa muziko"</string>
+  <string name="input_url">"Tajpu URL"</string>
+  <string name="streaming_settings">"Elsendflua agordo"</string>
+  <string name="next">"Sekvonta"</string>
+  <string name="previous">"Antaŭa"</string>
+  <string name="buffer_size">Bufra grandeco</string>
+  <string name="apn">Plej ŝatata APN</string>
+  <string name="rtp_min_port">Minimuma konektejo</string>
+  <string name="rtp_max_port">Maksimuma konektejo</string>
+  <string name="set_rtp_min_port">Agordi minimuman konektejon</string>
+  <string name="set_rtp_max_port">Agordi maksimuman konektejon</string>
+  <string name="set_buffer_size">Agordi bufran grandecon</string>
+  <string name="set_apn">Elekti plej ŝatatan APN</string>
+  <string name="setting">Agordoj</string>
+  <string name="server_timeout_title">"Servila tempolimo"</string>
+  <string name="server_timeout_message">"Ĉu rekonekti al la servilo por ludi filmon?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Konektado fiaskis, provante denove konekti al %1$d\u2026"</string>
+  <string name="media_controller_live">Rekta</string>
+  <string name="media_controller_playing">Ludado</string>
+  <string name="media_controller_connecting">Konektiĝas\u2026</string>
+  <string name="bookmark_add">"Aldoni legosignon"</string>
+  <string name="bookmark_display">"Montri legosignojn"</string>
+  <string name="bookmark_empty">"Neniu legosigno"</string>
+  <string name="bookmark_exist">"Legosigno jam ekzistas"</string>
+  <string name="bookmark_add_success">"Legosigno aldonita"</string>
+  <string name="bookmark_list">"Legosignoj"</string>
+  <string name="bookmark_title">"Titolo"</string>
+  <string name="bookmark_location">"Loko"</string>
+  <string name="delete_all">"Forigi ĉion"</string>
+  <string name="default_title">"Defaŭlta titolo"</string>
+  <string name="more_image">Pli da bildoj</string>
+  <string name="mute_nosupport">Ne eblas silentigi : filmo ne subtenata</string>
+  <string name="map_activity_not_found_err">Neniu mapa aplikaĵo por montri lokon.</string>
+  <string name="bass_boost_strength">Basa amplifikilo</string>
+  <string name="virtualizer_strength">3D efekto</string>
+  <string name="audio_effects">Aŭdaj efektoj</string>
+  <string name="headset_plug">Konektu kapaŭskultilojn por tiuj efektoj.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Bedaŭrinde, tiu filmo ne tondeteblas</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-es/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-es/cm_strings.xml
index dfc7592..696c009 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-es/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Hora de grabación</string>
+</resources>
diff --git a/res/values-es/codeaurora_strings.xml b/res/values-es/codeaurora_strings.xml
new file mode 100644
index 0000000..38341b3
--- /dev/null
+++ b/res/values-es/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Paso</string>
+  <string name="step_option_desc">Personalizar el salto rápido hacia adelante o hacia atrás</string>
+  <string name="setp_option_three_second">3 segundos</string>
+  <string name="setp_option_six_second">6 segundos</string>
+  <string name="loop">"Bucle"</string>
+  <string name="single">"Simple"</string>
+  <string name="stereo">"Estéreo"</string>
+  <string name="speaker_on">Altavoz encendido</string>
+  <string name="speaker_off">Altavoz apagado</string>
+  <string name="speaker_need_headset">Conecta unos auriculares para usar esta característica.</string>
+  <string name="single_track">"Pista sencilla"</string>
+  <string name="input_url">"Introducir URL"</string>
+  <string name="streaming_settings">"Ajustes de transmisión"</string>
+  <string name="next">"Siguiente"</string>
+  <string name="previous">"Anterior"</string>
+  <string name="buffer_size">Tamaño de memoria intermedia</string>
+  <string name="apn">APN preferido</string>
+  <string name="rtp_min_port">Puerto inferior</string>
+  <string name="rtp_max_port">Puerto superior</string>
+  <string name="set_rtp_min_port">Establecer puerto inferior</string>
+  <string name="set_rtp_max_port">Establecer puerto superior</string>
+  <string name="set_buffer_size">Establecer tamaño de memoria intermedia</string>
+  <string name="set_apn">Seleccionar APN preferido</string>
+  <string name="setting">Ajustes</string>
+  <string name="server_timeout_title">"Tiempo de espera del servidor"</string>
+  <string name="server_timeout_message">"¿Volver a conectar al servidor para reproducir el vídeo?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Falló la conexión. Intentando volver a conectar con %1$d\u2026"</string>
+  <string name="media_controller_live">En directo</string>
+  <string name="media_controller_playing">Reproduciendo</string>
+  <string name="media_controller_connecting">Conectando\u2026</string>
+  <string name="bookmark_add">"Agregar marcador"</string>
+  <string name="bookmark_display">"Mostrar marcadores"</string>
+  <string name="bookmark_empty">"No hay marcadores"</string>
+  <string name="bookmark_exist">"Este marcador ya existe"</string>
+  <string name="bookmark_add_success">"Marcador añadido"</string>
+  <string name="bookmark_list">"Marcadores"</string>
+  <string name="bookmark_title">"Título"</string>
+  <string name="bookmark_location">"Ubicación"</string>
+  <string name="delete_all">"Eliminar todo"</string>
+  <string name="default_title">"Título por defecto"</string>
+  <string name="more_image">Más imágenes</string>
+  <string name="mute_nosupport">No se puede silenciar: vídeo no soportado</string>
+  <string name="map_activity_not_found_err">No hay ninguna aplicación de mapas instalada para mostrar la ubicación.</string>
+  <string name="bass_boost_strength">Refuerzo de graves</string>
+  <string name="virtualizer_strength">Efecto 3D</string>
+  <string name="audio_effects">Efectos de sonido</string>
+  <string name="headset_plug">Conecta unos auriculares para estos efectos.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Este vídeo no puede ser recortado</string>
+  <string name="no_permission_for_drm">Lo sentimos, pero no se pueden compartir los archivos protegidos por DRM</string>
+  <string name="drm_license_info">Información de la licencia DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-et-rEE/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-et-rEE/cm_strings.xml
index dfc7592..f430f18 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Salvestusaeg</string>
+</resources>
diff --git a/res/values-et-rEE/codeaurora_strings.xml b/res/values-et-rEE/codeaurora_strings.xml
new file mode 100644
index 0000000..049b7d8
--- /dev/null
+++ b/res/values-et-rEE/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Samm</string>
+  <string name="step_option_desc">Kohanda kiirkerimise edasi/tagasi sammu</string>
+  <string name="setp_option_three_second">3 sekundit</string>
+  <string name="setp_option_six_second">6 sekundit</string>
+  <string name="loop">"Kordamine"</string>
+  <string name="single">"Üksik"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Kõlar sees</string>
+  <string name="speaker_off">Kõlar väljas</string>
+  <string name="speaker_need_headset">Ühendage kõrvaklapid et seda funktsiooni kasutada.</string>
+  <string name="single_track">"Üksik lugu"</string>
+  <string name="input_url">"Sisesta URL"</string>
+  <string name="streaming_settings">"Voogesituse seaded"</string>
+  <string name="next">"Järgmine"</string>
+  <string name="previous">"Eelmine"</string>
+  <string name="buffer_size">Puhvri suurus</string>
+  <string name="apn">Eelistatud APN</string>
+  <string name="rtp_min_port">Min. port</string>
+  <string name="rtp_max_port">Maks. port</string>
+  <string name="set_rtp_min_port">Sea min. port</string>
+  <string name="set_rtp_max_port">Sea maks. port</string>
+  <string name="set_buffer_size">Määra puhvri suurus</string>
+  <string name="set_apn">Vali eelistatud APN</string>
+  <string name="setting">Seaded</string>
+  <string name="server_timeout_title">"Serveri päring hangus"</string>
+  <string name="server_timeout_message">"Taasühenda serveriga video mängimiseks?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Ühendus ebaõnnestus, taasühendan %1$d\u2026"</string>
+  <string name="media_controller_live">Otse</string>
+  <string name="media_controller_playing">Mängin</string>
+  <string name="media_controller_connecting">Ühendun\u2026</string>
+  <string name="bookmark_add">"Lisa järjehoidja"</string>
+  <string name="bookmark_display">"Kuva järjehoidjad"</string>
+  <string name="bookmark_empty">"Järjehoidjad puuduvad"</string>
+  <string name="bookmark_exist">"Järjehoidja juba eksisteerib"</string>
+  <string name="bookmark_add_success">"Järjehoidja lisatud"</string>
+  <string name="bookmark_list">"Järjehoidjad"</string>
+  <string name="bookmark_title">"Pealkiri"</string>
+  <string name="bookmark_location">"Asukoht"</string>
+  <string name="delete_all">"Kustuta kõik"</string>
+  <string name="default_title">"Vaikimisi pealkiri"</string>
+  <string name="more_image">Rohkem pilte</string>
+  <string name="mute_nosupport">Ei saa vaigistada : video pole toetatud</string>
+  <string name="map_activity_not_found_err">Kaardirakendust pole installeeritud asukoha näitamiseks.</string>
+  <string name="bass_boost_strength">Bassivõimendi</string>
+  <string name="virtualizer_strength">3D efekt</string>
+  <string name="audio_effects">Heliefektid</string>
+  <string name="headset_plug">Ühenda kõrvaklapid nende efektide jaoks.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Vabandust, seda videofaili ei saa kärpida</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-eu-rES/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-eu-rES/cm_strings.xml
index dfc7592..61d21bf 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Grabaketaren ordua</string>
+</resources>
diff --git a/res/values-eu-rES/codeaurora_strings.xml b/res/values-eu-rES/codeaurora_strings.xml
new file mode 100644
index 0000000..1db493b
--- /dev/null
+++ b/res/values-eu-rES/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Urratsa</string>
+  <string name="step_option_desc">Pertsonalizatu aurrera/atzerako jauziak</string>
+  <string name="setp_option_three_second">3 segundo</string>
+  <string name="setp_option_six_second">6 segundo</string>
+  <string name="loop">"Bigiztatu"</string>
+  <string name="single">"Bakarra"</string>
+  <string name="stereo">"Estereoa"</string>
+  <string name="speaker_on">Bozgorailua piztuta</string>
+  <string name="speaker_off">Bozgorailua itzalita</string>
+  <string name="speaker_need_headset">Konektatu aurikularrak ezaugarri hau erabiltzeko.</string>
+  <string name="single_track">"Pista bakarra"</string>
+  <string name="input_url">"Sartu URLa"</string>
+  <string name="streaming_settings">"Transmisio jarraituaren ezarpenak"</string>
+  <string name="next">"Hurrengoa"</string>
+  <string name="previous">"Aurrekoa"</string>
+  <string name="buffer_size">Buffer neurria</string>
+  <string name="apn">APN hobetsia</string>
+  <string name="rtp_min_port">Gutxieneko ataka</string>
+  <string name="rtp_max_port">Gehieneko ataka</string>
+  <string name="set_rtp_min_port">Ezarri gutxieneko ataka</string>
+  <string name="set_rtp_max_port">Ezarri gehieneko ataka</string>
+  <string name="set_buffer_size">Ezarri buffer neurria</string>
+  <string name="set_apn">Ezarri APN hobetsia</string>
+  <string name="setting">Ezarpenak</string>
+  <string name="server_timeout_title">"Zerbitzariaren denbora-muga"</string>
+  <string name="server_timeout_message">"Zerbitzarira birkonektatu bideoa ikusteko?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Konexioak huts egin du, %1$d birkonektatzen\u2026"</string>
+  <string name="media_controller_live">Zuzenean</string>
+  <string name="media_controller_playing">Erreproduzitzen</string>
+  <string name="media_controller_connecting">Konektatzen\u2026</string>
+  <string name="bookmark_add">"Gehitu laster-marka"</string>
+  <string name="bookmark_display">"Erakutsi Laster-markak"</string>
+  <string name="bookmark_empty">"Ez dago laster-markarik"</string>
+  <string name="bookmark_exist">"Laster-marka badago aurretik"</string>
+  <string name="bookmark_add_success">"Laster-marka gehitu da"</string>
+  <string name="bookmark_list">"Laster-markak"</string>
+  <string name="bookmark_title">"Izenburua"</string>
+  <string name="bookmark_location">"Kokalekua"</string>
+  <string name="delete_all">"Ezabatu guztiak"</string>
+  <string name="default_title">"Izenburu lehenetsia"</string>
+  <string name="more_image">Irudi gehiago</string>
+  <string name="mute_nosupport">Ezin da mututu: bideoa ez da onartzen</string>
+  <string name="map_activity_not_found_err">Ez dago kokalekua bistaratu dezakeen mapa aplikaziorik instalatuta.</string>
+  <string name="bass_boost_strength">Baxuen indartzea</string>
+  <string name="virtualizer_strength">3D efektua</string>
+  <string name="audio_effects">Audio efektuak</string>
+  <string name="headset_plug">Konektatu aurikularrak efektu hauentzako .</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Barkatu, bideo hau ezin da ebaki</string>
+  <string name="no_permission_for_drm">Barkatu, DRM bidez babestutako fitxategiak ezin dira partekatu</string>
+  <string name="drm_license_info">DRM lizentziaren informazioa</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-fa/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-fa/cm_strings.xml
index dfc7592..5dcbfb0 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-fa/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">زمان ضبط</string>
+</resources>
diff --git a/res/values-fa/codeaurora_strings.xml b/res/values-fa/codeaurora_strings.xml
new file mode 100644
index 0000000..fc5d3f6
--- /dev/null
+++ b/res/values-fa/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">گام</string>
+  <string name="step_option_desc">سفارشی کردن گام رو به جلو/عقب سریع</string>
+  <string name="setp_option_three_second">۳ ثانیه</string>
+  <string name="setp_option_six_second">۶ ثانیه</string>
+  <string name="loop">"تکرار"</string>
+  <string name="single">"تکی"</string>
+  <string name="stereo">"استریو"</string>
+  <string name="speaker_on">بلندگو روشن</string>
+  <string name="speaker_off">بلندگو خاموش</string>
+  <string name="speaker_need_headset">برای استفاده از این قابلیت هدفون را وصل کنید.</string>
+  <string name="single_track">"تک‌آهنگ"</string>
+  <string name="input_url">"آدرس را وارد کنید"</string>
+  <string name="streaming_settings">"تنظیمات پخش"</string>
+  <string name="next">"بعدی"</string>
+  <string name="previous">"قبلی"</string>
+  <string name="buffer_size">اندازه بافر</string>
+  <string name="apn">APN ترجیحی</string>
+  <string name="rtp_min_port">پورت min</string>
+  <string name="rtp_max_port">پورت max</string>
+  <string name="set_rtp_min_port">تنظیم پورت min</string>
+  <string name="set_rtp_max_port">تنظیم پورت max</string>
+  <string name="set_buffer_size">تنظیم اندازه بافر</string>
+  <string name="set_apn">انتخاب APN ترجیحی</string>
+  <string name="setting">تنظیمات</string>
+  <string name="server_timeout_title">"پایان زمان سرور"</string>
+  <string name="server_timeout_message">"برای پخش مجدد ویدیو دوباره به سرور متصل می‌شوید؟"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"اتصال ناموفق بود، تلاش مجدد برای اتصال به %1$d\u2026"</string>
+  <string name="media_controller_live">زنده</string>
+  <string name="media_controller_playing">در حال پخش</string>
+  <string name="media_controller_connecting">اتصال\u2026</string>
+  <string name="bookmark_add">"افزودن نشانک"</string>
+  <string name="bookmark_display">"نمایش نشانک‌ها"</string>
+  <string name="bookmark_empty">"بدون نشانک"</string>
+  <string name="bookmark_exist">"نشانک از قبل وجود دارد"</string>
+  <string name="bookmark_add_success">"نشانک اضافه شد"</string>
+  <string name="bookmark_list">"نشانک‌ها"</string>
+  <string name="bookmark_title">"عنوان"</string>
+  <string name="bookmark_location">"مکان"</string>
+  <string name="delete_all">"حذف همه"</string>
+  <string name="default_title">"عنوان پیش‌فرض"</string>
+  <string name="more_image">تصاویر بیشتر</string>
+  <string name="mute_nosupport">نمی‌توان قطع کرد: ویدیو پشتیبانی نمی‌شود</string>
+  <string name="map_activity_not_found_err">برنامه‌ی نقشه‌ای برای نمایش مکان نصب نشده است.</string>
+  <string name="bass_boost_strength">تقویت صدای بم</string>
+  <string name="virtualizer_strength">جلوه سه‌بعدی</string>
+  <string name="audio_effects">جلوه‌های صوتی</string>
+  <string name="headset_plug">برای استفاده از این جلوه‌ها هدفون را وصل کنید.</string>
+  <string name="audio_effects_dialog_title">صدای اسنپدراگون+</string>
+  <string name="fail_trim">متأسفانه این ویدیو بریده نمی‌شود</string>
+  <string name="no_permission_for_drm">با عرض پوزش فایل محافظت شده DRM را نمی‌توان به اشتراک گذاشت</string>
+  <string name="drm_license_info">اطلاعات مجوز DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-fi/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-fi/cm_strings.xml
index dfc7592..f79a983 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tallennusaika</string>
+</resources>
diff --git a/res/values-fi/codeaurora_strings.xml b/res/values-fi/codeaurora_strings.xml
new file mode 100644
index 0000000..64fb6ba
--- /dev/null
+++ b/res/values-fi/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Kelaus</string>
+  <string name="step_option_desc">Mukauta kelauksen nopeutta</string>
+  <string name="setp_option_three_second">3 sekuntia</string>
+  <string name="setp_option_six_second">6 sekuntia</string>
+  <string name="loop">"Jatkuva"</string>
+  <string name="single">"Yksittäinen"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Kaiutin KÄYTÖSSÄ</string>
+  <string name="speaker_off">Kaiutin POIS KÄYTÖSTÄ</string>
+  <string name="speaker_need_headset">Kytke kuulokkeet käyttääksesi tätä toimintoa.</string>
+  <string name="single_track">"Yksi kappale"</string>
+  <string name="input_url">"Syötä linkki"</string>
+  <string name="streaming_settings">"Suoratoistoasetukset"</string>
+  <string name="next">"Seuraava"</string>
+  <string name="previous">"Edellinen"</string>
+  <string name="buffer_size">Puskurin koko</string>
+  <string name="apn">Ensisijainen APN</string>
+  <string name="rtp_min_port">Min port</string>
+  <string name="rtp_max_port">Max port</string>
+  <string name="set_rtp_min_port">Aseta min port</string>
+  <string name="set_rtp_max_port">Aseta max port</string>
+  <string name="set_buffer_size">Aseta puskurin koko</string>
+  <string name="set_apn">Valitse ensisijainen APN</string>
+  <string name="setting">Asetukset</string>
+  <string name="server_timeout_title">"Palvelimen aikakatkaisu"</string>
+  <string name="server_timeout_message">"Yhdistä uudelleen palvelimeen toistaaksesi videon?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Yhteys epäonnistui, uudelleenyhdistetään %1$d\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Toistetaan</string>
+  <string name="media_controller_connecting">Yhdistetään\u2026</string>
+  <string name="bookmark_add">"Lisää kirjanmerkki"</string>
+  <string name="bookmark_display">"Näytä kirjanmerkit"</string>
+  <string name="bookmark_empty">"Ei kirjanmerkkejä"</string>
+  <string name="bookmark_exist">"Kirjanmerkki on jo olemassa"</string>
+  <string name="bookmark_add_success">"Kirjanmerkki lisätty"</string>
+  <string name="bookmark_list">"Kirjanmerkit"</string>
+  <string name="bookmark_title">"Nimi"</string>
+  <string name="bookmark_location">"Sijainti"</string>
+  <string name="delete_all">"Poista kaikki"</string>
+  <string name="default_title">"Oletusnimi"</string>
+  <string name="more_image">Lisää kuvia</string>
+  <string name="mute_nosupport">Ei voi mykistää: video ei tuettu</string>
+  <string name="map_activity_not_found_err">Karttasovellusta ei asennettu näyttämään sijaintia.</string>
+  <string name="bass_boost_strength">Basson korostus</string>
+  <string name="virtualizer_strength">3D-efekti</string>
+  <string name="audio_effects">Äänitehosteet</string>
+  <string name="headset_plug">Kytke kuulokkeet käyttääksesi näitä tehosteita.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Videotiedostoa ei voi leikata</string>
+  <string name="no_permission_for_drm">Valitettavasti DRM-suojattuja tiedostoja ei voi jakaa</string>
+  <string name="drm_license_info">DRM-lisenssin tiedot</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-fr/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-fr/cm_strings.xml
index dfc7592..0b30b60 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Temps d\'enregistrement</string>
+</resources>
diff --git a/res/values-fr/codeaurora_strings.xml b/res/values-fr/codeaurora_strings.xml
new file mode 100644
index 0000000..1c383bd
--- /dev/null
+++ b/res/values-fr/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Étape</string>
+  <string name="step_option_desc">Personnaliser le pas de l\'avance/retour rapide</string>
+  <string name="setp_option_three_second">3 secondes</string>
+  <string name="setp_option_six_second">6 secondes</string>
+  <string name="loop">"Boucle"</string>
+  <string name="single">"Simple"</string>
+  <string name="stereo">"Stéréo"</string>
+  <string name="speaker_on">Haut-parleur activé</string>
+  <string name="speaker_off">Haut-parleur désactivé</string>
+  <string name="speaker_need_headset">Brancher un casque pour utiliser cette fonctionnalité.</string>
+  <string name="single_track">"Piste simple"</string>
+  <string name="input_url">"Entrez l'URL"</string>
+  <string name="streaming_settings">"Paramètres de transmission"</string>
+  <string name="next">"Suivant"</string>
+  <string name="previous">"Précédent"</string>
+  <string name="buffer_size">Taille du tampon</string>
+  <string name="apn">APN préféré</string>
+  <string name="rtp_min_port">Port minimum</string>
+  <string name="rtp_max_port">Port maximum</string>
+  <string name="set_rtp_min_port">Paramétrer le port minimal</string>
+  <string name="set_rtp_max_port">Paramétrer le port maximal</string>
+  <string name="set_buffer_size">Paramétrer la taille du tampon</string>
+  <string name="set_apn">Sélectionner l\'APN préféré</string>
+  <string name="setting">Paramètres</string>
+  <string name="server_timeout_title">"Délai du serveur"</string>
+  <string name="server_timeout_message">"Se reconnecter au serveur pour lire la vidéo ?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Connexion échouée, tentative de reconnexion à %1$d\u2026"</string>
+  <string name="media_controller_live">En direct</string>
+  <string name="media_controller_playing">Lecture</string>
+  <string name="media_controller_connecting">Connexion\u2026</string>
+  <string name="bookmark_add">"Ajouter un favori"</string>
+  <string name="bookmark_display">"Afficher les favoris"</string>
+  <string name="bookmark_empty">"Aucun favori"</string>
+  <string name="bookmark_exist">"Le favori existe déja"</string>
+  <string name="bookmark_add_success">"Favori ajouté"</string>
+  <string name="bookmark_list">"Favoris"</string>
+  <string name="bookmark_title">"Titre"</string>
+  <string name="bookmark_location">"Localisation"</string>
+  <string name="delete_all">"Tout supprimer"</string>
+  <string name="default_title">"Titre par défaut"</string>
+  <string name="more_image">Plus d\'images</string>
+  <string name="mute_nosupport">Coupure du son impossible : vidéo non pris en charge</string>
+  <string name="map_activity_not_found_err">Il n\'y a aucune application de cartographie installée pour afficher la position.</string>
+  <string name="bass_boost_strength">Amplification des basses</string>
+  <string name="virtualizer_strength">Effet 3D</string>
+  <string name="audio_effects">Effets audio</string>
+  <string name="headset_plug">Brancher un casque pour ces effets.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Désolé, cette vidéo ne peut pas être coupé</string>
+</resources>
diff --git a/res/values-fy-rNL/codeaurora_strings.xml b/res/values-fy-rNL/codeaurora_strings.xml
new file mode 100644
index 0000000..ae4d284
--- /dev/null
+++ b/res/values-fy-rNL/codeaurora_strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setting">Ynstellingen</string>
+  <string name="bookmark_location">"Lokaasje"</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-hi/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-hi/cm_strings.xml
index dfc7592..bbbc06f 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-hi/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">रिकॉर्ड करने का समय</string>
+</resources>
diff --git a/res/values-hi/codeaurora_strings.xml b/res/values-hi/codeaurora_strings.xml
new file mode 100644
index 0000000..567f9e3
--- /dev/null
+++ b/res/values-hi/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">चरण</string>
+  <string name="step_option_desc">फ़ास्ट फॉरवर्ड/रीवाइंड चरण को मनपसंद बनाएँ</string>
+  <string name="setp_option_three_second">3 सेकंड</string>
+  <string name="setp_option_six_second">6 सेकंड</string>
+  <string name="loop">"लूप"</string>
+  <string name="single">"एकल"</string>
+  <string name="stereo">"स्टीरियो"</string>
+  <string name="speaker_on">स्पीकर चालू</string>
+  <string name="speaker_off">स्पीकर बंद</string>
+  <string name="speaker_need_headset">इस सुविधा का उपयोग करने के लिए हेडफ़ोन लगाएँ।</string>
+  <string name="single_track">"एकल ट्रैक"</string>
+  <string name="input_url">"यूआरएल दर्ज करें"</string>
+  <string name="streaming_settings">"स्ट्रीमिंग सेटिंग"</string>
+  <string name="next">"अगला"</string>
+  <string name="previous">"पिछला"</string>
+  <string name="buffer_size">बफ़र आमाप</string>
+  <string name="apn">पसंदीदा एपीएन</string>
+  <string name="rtp_min_port">न्यूनतम पोर्ट</string>
+  <string name="rtp_max_port">अधिकतम पोर्ट</string>
+  <string name="set_rtp_min_port">न्यूनतम पोर्ट सेट करें</string>
+  <string name="set_rtp_max_port">अधिकतम पोर्ट सेट करें</string>
+  <string name="set_buffer_size">बफ़र आमाप सेट करें</string>
+  <string name="set_apn">पसंदीदा एपीएन चुनें</string>
+  <string name="setting">सेटिंग</string>
+  <string name="server_timeout_title">"सर्वर समय समाप्त"</string>
+  <string name="server_timeout_message">"वीडियो बजाने के लिए सर्वर के साथ फिर से जुड़ जाएँ?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"कनेक्शन विफल हुआ। %1$d के साथ फिर से कनेक्ट करने की कोशिश कर रहे हैं\u2026"</string>
+  <string name="media_controller_live">सजीव</string>
+  <string name="media_controller_playing">बजा रहे हैं</string>
+  <string name="media_controller_connecting">कनेक्ट कर रहे हैं\u2026</string>
+  <string name="bookmark_add">"बुकमार्क जोड़ें"</string>
+  <string name="bookmark_display">"बुकमार्क दिखाएँ"</string>
+  <string name="bookmark_empty">"कोई बुकमार्क नहीं"</string>
+  <string name="bookmark_exist">"बुकमार्क पहले से ही मौजूद है"</string>
+  <string name="bookmark_add_success">"बुकमार्क जोड़ा गया"</string>
+  <string name="bookmark_list">"बुकमार्क"</string>
+  <string name="bookmark_title">"शीर्षक"</string>
+  <string name="bookmark_location">"स्थान"</string>
+  <string name="delete_all">"सब हटाएँ"</string>
+  <string name="default_title">"डिफ़ॉल्ट शीर्षक"</string>
+  <string name="more_image">और छवियाँ</string>
+  <string name="mute_nosupport">मूक नहीं कर सके : वीडियो समर्थित नहीं है</string>
+  <string name="map_activity_not_found_err">स्थान दर्शाने के लिए कोई नक्शा ऐप स्थापित नहीं है।</string>
+  <string name="bass_boost_strength">मंद्र वर्धन</string>
+  <string name="virtualizer_strength">3डी प्रभाव</string>
+  <string name="audio_effects">ऑडियो प्रभाव</string>
+  <string name="headset_plug">इन प्रभावों के लिए हेडफ़ोन डालें।</string>
+  <string name="audio_effects_dialog_title">स्नैपड्रैगन ऑडियो+</string>
+  <string name="fail_trim">क्षमा करें, इस वीडियो फ़ाइल को ट्रिम नहीं कर सकते</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-hu/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-hu/cm_strings.xml
index dfc7592..f4cd037 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Felvétel ideje</string>
+</resources>
diff --git a/res/values-hu/codeaurora_strings.xml b/res/values-hu/codeaurora_strings.xml
new file mode 100644
index 0000000..5b7b079
--- /dev/null
+++ b/res/values-hu/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Lépés</string>
+  <string name="step_option_desc">Gyors előre-/hátralépés testreszabása</string>
+  <string name="setp_option_three_second">3 másodperc</string>
+  <string name="setp_option_six_second">6 másodperc</string>
+  <string name="loop">"Ismétlés"</string>
+  <string name="single">"Egyszerű"</string>
+  <string name="stereo">"Sztereó"</string>
+  <string name="speaker_on">Hangszóró BE</string>
+  <string name="speaker_off">Hangszóró KI</string>
+  <string name="speaker_need_headset">Ezen funkció használatához csatlakoztasson fejhallgatót.</string>
+  <string name="single_track">"Egyetlen szám"</string>
+  <string name="input_url">"URL megadása"</string>
+  <string name="streaming_settings">"Műsorszórás beállításai"</string>
+  <string name="next">"Következő"</string>
+  <string name="previous">"Előző"</string>
+  <string name="buffer_size">Bufferméret</string>
+  <string name="apn">Előnyben részesített APN</string>
+  <string name="rtp_min_port">Min port</string>
+  <string name="rtp_max_port">Max port</string>
+  <string name="set_rtp_min_port">Min port beállítása</string>
+  <string name="set_rtp_max_port">Max port beállítása</string>
+  <string name="set_buffer_size">Pufferméret beállítása</string>
+  <string name="set_apn">Válassza ki a kívánt APN-t</string>
+  <string name="setting">Beállítások</string>
+  <string name="server_timeout_title">"Kiszolgálói időtúllépés"</string>
+  <string name="server_timeout_message">"Újracsatlakozzon a szerverhez a videó lejátszásához?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Sikertelen csatlakozás, újracsatlakozási kísérlet a következőhöz: %1$d\u2026"</string>
+  <string name="media_controller_live">Élő</string>
+  <string name="media_controller_playing">Lejátszás</string>
+  <string name="media_controller_connecting">Csatlakozás\u2026</string>
+  <string name="bookmark_add">"Könyvjelző hozzáadása"</string>
+  <string name="bookmark_display">"Könyvjelzők megjelenítése"</string>
+  <string name="bookmark_empty">"Nincs könyvjelző"</string>
+  <string name="bookmark_exist">"Könyvjelző már létezik"</string>
+  <string name="bookmark_add_success">"Könyvjelző hozzáadva"</string>
+  <string name="bookmark_list">"Könyvjelzők"</string>
+  <string name="bookmark_title">"Név"</string>
+  <string name="bookmark_location">"Hely"</string>
+  <string name="delete_all">"Összes törlése"</string>
+  <string name="default_title">"Alapértelmezett név"</string>
+  <string name="more_image">További képek</string>
+  <string name="mute_nosupport">Nem némítható: videó nem támogatott</string>
+  <string name="map_activity_not_found_err">Nincs telepítve térkép alkalmazás a hely megjelenítéséhez.</string>
+  <string name="bass_boost_strength">Mélyhang kiemelése</string>
+  <string name="virtualizer_strength">3D hatás</string>
+  <string name="audio_effects">Hangeffektek</string>
+  <string name="headset_plug">Csatlakoztassa a fejhallgatót az effektek használatához.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Sajnáljuk, de ez a videófájl nem vágható</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-in/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-in/cm_strings.xml
index dfc7592..6353d04 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-in/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Catatan waktu</string>
+</resources>
diff --git a/res/values-in/codeaurora_strings.xml b/res/values-in/codeaurora_strings.xml
new file mode 100644
index 0000000..95d8e9a
--- /dev/null
+++ b/res/values-in/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Langkah</string>
+  <string name="step_option_desc">Sesuaikan tahap maju cepat/mundur</string>
+  <string name="setp_option_three_second">3 detik</string>
+  <string name="setp_option_six_second">6 detik</string>
+  <string name="loop">"Ulang"</string>
+  <string name="single">"Tunggal"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Speaker ON</string>
+  <string name="speaker_off">Speaker OFF</string>
+  <string name="speaker_need_headset">Pasang headphone untuk menggunakan fitur ini.</string>
+  <string name="single_track">"Trek tunggal"</string>
+  <string name="input_url">"Masukkan URL"</string>
+  <string name="streaming_settings">"Pengaturan streaming"</string>
+  <string name="next">"Berikutnya"</string>
+  <string name="previous">"Sebelumnya"</string>
+  <string name="buffer_size">Ukuran buffer</string>
+  <string name="apn">Pilihan APN</string>
+  <string name="rtp_min_port">Port min</string>
+  <string name="rtp_max_port">Port maks</string>
+  <string name="set_rtp_min_port">Atur port min</string>
+  <string name="set_rtp_max_port">Atur port maks</string>
+  <string name="set_buffer_size">Atur ukuran buffer</string>
+  <string name="set_apn">Pilih pilihan APN</string>
+  <string name="setting">Pengaturan</string>
+  <string name="server_timeout_title">"Batas waktu server"</string>
+  <string name="server_timeout_message">"Menyambung ulang ke server untuk memutar video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Koneksi gagal, mencoba untuk menyambung ulang ke %1$d\u2026"</string>
+  <string name="media_controller_live">Langsung</string>
+  <string name="media_controller_playing">Memutar</string>
+  <string name="media_controller_connecting">Menyambungkan\u2026</string>
+  <string name="bookmark_add">"Tambah ke bookmark"</string>
+  <string name="bookmark_display">"Tampilkan bookmark"</string>
+  <string name="bookmark_empty">"Tidak ada bookmark"</string>
+  <string name="bookmark_exist">"Bookmark sudah ada"</string>
+  <string name="bookmark_add_success">"Bookmark ditambahkan"</string>
+  <string name="bookmark_list">"Bookmark"</string>
+  <string name="bookmark_title">"Judul"</string>
+  <string name="bookmark_location">"Lokasi"</string>
+  <string name="delete_all">"Hapus semua"</string>
+  <string name="default_title">"Judul standar"</string>
+  <string name="more_image">Lebih banyak gambar</string>
+  <string name="mute_nosupport">Tidak bisa mendiamkan : video tidak didukung</string>
+  <string name="map_activity_not_found_err">Tidak ada aplikasi peta yang dipasang untuk menunjukkan lokasi.</string>
+  <string name="bass_boost_strength">Peningkatan bass</string>
+  <string name="virtualizer_strength">Efek 3D</string>
+  <string name="audio_effects">Efek audio</string>
+  <string name="headset_plug">Pasang headphone untuk efek ini.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Maaf, berkas video ini tidak dapat dipotong</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-it/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-it/cm_strings.xml
index dfc7592..107d60a 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-it/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tempo di ripresa</string>
+</resources>
diff --git a/res/values-it/codeaurora_strings.xml b/res/values-it/codeaurora_strings.xml
new file mode 100644
index 0000000..cf46a6d
--- /dev/null
+++ b/res/values-it/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Passo</string>
+  <string name="step_option_desc">Personalizza l\'avanzamento/riavvolgimento rapido</string>
+  <string name="setp_option_three_second">3 secondi</string>
+  <string name="setp_option_six_second">6 secondi</string>
+  <string name="loop">"Ripeti"</string>
+  <string name="single">"Singolo"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Altoparlante ON</string>
+  <string name="speaker_off">Altoparlante OFF</string>
+  <string name="speaker_need_headset">Inserisci gli auricolari per utilizzare questa funzionalità.</string>
+  <string name="single_track">"Traccia singola"</string>
+  <string name="input_url">"Inserisci URL"</string>
+  <string name="streaming_settings">"Impostazioni streaming"</string>
+  <string name="next">"Successivo"</string>
+  <string name="previous">"Precedente"</string>
+  <string name="buffer_size">Dimensione buffer</string>
+  <string name="apn">APN preferito</string>
+  <string name="rtp_min_port">Porta min</string>
+  <string name="rtp_max_port">Porta max</string>
+  <string name="set_rtp_min_port">Imposta porta min</string>
+  <string name="set_rtp_max_port">Imposta porta max</string>
+  <string name="set_buffer_size">Imposta dimensione del buffer</string>
+  <string name="set_apn">Imposta APN preferito</string>
+  <string name="setting">Impostazioni</string>
+  <string name="server_timeout_title">"Timeout del server"</string>
+  <string name="server_timeout_message">"Riconnettersi al server per riprodurre il video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Connessione fallita, provando a riconnettersi a %1$d\u2026"</string>
+  <string name="media_controller_live">Dal vivo</string>
+  <string name="media_controller_playing">In riproduzione</string>
+  <string name="media_controller_connecting">Connessione\u2026</string>
+  <string name="bookmark_add">"Aggiungi segnalibro"</string>
+  <string name="bookmark_display">"Visualizza segnalibri"</string>
+  <string name="bookmark_empty">"Nessun segnalibro"</string>
+  <string name="bookmark_exist">"Il segnalibro esiste già"</string>
+  <string name="bookmark_add_success">"Segnalibro aggiunto"</string>
+  <string name="bookmark_list">"Segnalibri"</string>
+  <string name="bookmark_title">"Titolo"</string>
+  <string name="bookmark_location">"Posizione"</string>
+  <string name="delete_all">"Elimina tutto"</string>
+  <string name="default_title">"Titolo predefinito"</string>
+  <string name="more_image">Altre immagini</string>
+  <string name="mute_nosupport">Impossibile disattivare l\'audio: video non supportato</string>
+  <string name="map_activity_not_found_err">Non non c\'è nessuna app mappe installata per mostrare la posizione.</string>
+  <string name="bass_boost_strength">Amplificazione bassi</string>
+  <string name="virtualizer_strength">Effetto 3D</string>
+  <string name="audio_effects">Effetti audio</string>
+  <string name="headset_plug">Collega le cuffie per questi effetti.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Questo file video non può essere tagliato</string>
+  <string name="no_permission_for_drm">Spiacente, i file protetti da DRM non possono essere condivisi</string>
+  <string name="drm_license_info">Info licenza DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-iw/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-iw/cm_strings.xml
index dfc7592..e815131 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">זמן הקלטה</string>
+</resources>
diff --git a/res/values-iw/codeaurora_strings.xml b/res/values-iw/codeaurora_strings.xml
new file mode 100644
index 0000000..d99daf4
--- /dev/null
+++ b/res/values-iw/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">דילוג</string>
+  <string name="step_option_desc">התאם אישית דילוג מהיר קדימה/אחורה</string>
+  <string name="setp_option_three_second">3 שניות</string>
+  <string name="setp_option_six_second">6 שניות</string>
+  <string name="loop">"לולאה"</string>
+  <string name="single">"יחיד"</string>
+  <string name="stereo">"סטריאו"</string>
+  <string name="speaker_on">רמקול פעיל</string>
+  <string name="speaker_off">רמקול כבוי</string>
+  <string name="speaker_need_headset">חבר אוזניות כדי להשתמש בתכונה זו.</string>
+  <string name="single_track">"מסלול יחיד"</string>
+  <string name="input_url">"הזן כתובת URL"</string>
+  <string name="streaming_settings">"הגדרות שידור"</string>
+  <string name="next">"הבא"</string>
+  <string name="previous">"הקודם"</string>
+  <string name="buffer_size">גודל המאגר</string>
+  <string name="apn">APN מועדף</string>
+  <string name="rtp_min_port">פורט מינימאלי</string>
+  <string name="rtp_max_port">פורט מקסימלי</string>
+  <string name="set_rtp_min_port">הגדר פורט מינימלי</string>
+  <string name="set_rtp_max_port">נגדר פורט מקסימלי</string>
+  <string name="set_buffer_size">הגדר גודל המאגר</string>
+  <string name="set_apn">בחר APN מועדף</string>
+  <string name="setting">הגדרות</string>
+  <string name="server_timeout_title">"זמן חכייה לשרת"</string>
+  <string name="server_timeout_message">"להתחבר מחדש לשרת כדי להפעיל את הווידאו?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"החיבור נכשל, מנסה להתחבר מחדש ל- %1$d\u2026"</string>
+  <string name="media_controller_live">חי</string>
+  <string name="media_controller_playing">מנגן</string>
+  <string name="media_controller_connecting">מתחבר\u2026</string>
+  <string name="bookmark_add">"הוסף סימניה"</string>
+  <string name="bookmark_display">"הצג סימניות"</string>
+  <string name="bookmark_empty">"אין סימניות"</string>
+  <string name="bookmark_exist">"סימניה כבר קיימת"</string>
+  <string name="bookmark_add_success">"סימניה נוספה"</string>
+  <string name="bookmark_list">"סימניות"</string>
+  <string name="bookmark_title">"כותרת"</string>
+  <string name="bookmark_location">"מיקום"</string>
+  <string name="delete_all">"מחק הכל"</string>
+  <string name="default_title">"כותרת ברירת המחדל"</string>
+  <string name="more_image">תמונות נוספות</string>
+  <string name="mute_nosupport">לא ניתן להשתיק: וידאו לא נתמך</string>
+  <string name="map_activity_not_found_err">אין אף יישום \"מפות\" כדי להראות את המיקום בעזרתו.</string>
+  <string name="bass_boost_strength">הגברת בס</string>
+  <string name="virtualizer_strength">אפקט 3D</string>
+  <string name="audio_effects">אפקטי שמע</string>
+  <string name="headset_plug">חבר אוזניות לאפקטים אלה.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">סליחה, קובץ וידאו זה לא יכול להיגזר</string>
+  <string name="no_permission_for_drm">סליחה, לא ניתן לשתף קבצי DRM מוגנים</string>
+  <string name="drm_license_info">פרטי רישיון DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-ja/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-ja/cm_strings.xml
index dfc7592..a875246 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-ja/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">録画時間</string>
+</resources>
diff --git a/res/values-ja/codeaurora_strings.xml b/res/values-ja/codeaurora_strings.xml
new file mode 100644
index 0000000..09fd7d1
--- /dev/null
+++ b/res/values-ja/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">間隔</string>
+  <string name="step_option_desc">早送り/巻き戻しのステップをカスタマイズする</string>
+  <string name="setp_option_three_second">3秒</string>
+  <string name="setp_option_six_second">6秒</string>
+  <string name="loop">"ループ"</string>
+  <string name="single">"シングル"</string>
+  <string name="stereo">"ステレオ"</string>
+  <string name="speaker_on">スピーカーON</string>
+  <string name="speaker_off">スピーカーOFF</string>
+  <string name="speaker_need_headset">この機能を使用するにはヘッドホンを接続してください。</string>
+  <string name="single_track">"シングルトラック"</string>
+  <string name="input_url">"URLを入力"</string>
+  <string name="streaming_settings">"ストリーミングの設定"</string>
+  <string name="next">"次へ"</string>
+  <string name="previous">"前へ"</string>
+  <string name="buffer_size">バッファサイズ</string>
+  <string name="apn">優先APN</string>
+  <string name="rtp_min_port">最小ポート</string>
+  <string name="rtp_max_port">最大ポート</string>
+  <string name="set_rtp_min_port">最小ポートを設定</string>
+  <string name="set_rtp_max_port">最大ポートを設定</string>
+  <string name="set_buffer_size">バッファサイズを設定</string>
+  <string name="set_apn">優先APNを選択</string>
+  <string name="setting">設定</string>
+  <string name="server_timeout_title">"サーバーのタイムアウト"</string>
+  <string name="server_timeout_message">"動画を再生するためにサーバーに再接続しますか?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"接続できませんでした。%1$dに再接続を試みています\u2026"</string>
+  <string name="media_controller_live">ライブ</string>
+  <string name="media_controller_playing">再生中</string>
+  <string name="media_controller_connecting">接続中\u2026</string>
+  <string name="bookmark_add">"ブックマークを追加"</string>
+  <string name="bookmark_display">"ブックマークを表示"</string>
+  <string name="bookmark_empty">"ブックマークがありません"</string>
+  <string name="bookmark_exist">"ブックマークが既に存在しています"</string>
+  <string name="bookmark_add_success">"ブックマークを追加しました"</string>
+  <string name="bookmark_list">"ブックマーク"</string>
+  <string name="bookmark_title">"タイトル"</string>
+  <string name="bookmark_location">"場所"</string>
+  <string name="delete_all">"すべて削除"</string>
+  <string name="default_title">"デフォルトのタイトル"</string>
+  <string name="more_image">他の画像</string>
+  <string name="mute_nosupport">ミュートにできません: 動画がサポートされていません</string>
+  <string name="map_activity_not_found_err">位置情報を表示するマップアプリがインストールされていません。</string>
+  <string name="bass_boost_strength">バスブースト</string>
+  <string name="virtualizer_strength">3D効果</string>
+  <string name="audio_effects">オーディオ効果</string>
+  <string name="headset_plug">これらの効果を使用するにはヘッドホンを接続してください。</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">申し訳ありませんが、このビデオファイルはトリミングできません</string>
+  <string name="no_permission_for_drm">申し訳ありませんが、DRMで保護されたファイルは共有できません</string>
+  <string name="drm_license_info">DRMライセンス情報</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-kn-rIN/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-kn-rIN/cm_strings.xml
index dfc7592..92bd9cb 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">ರಿಕಾರ್ಡ್ ಸಮಯ</string>
+</resources>
diff --git a/res/values-kn-rIN/codeaurora_strings.xml b/res/values-kn-rIN/codeaurora_strings.xml
new file mode 100644
index 0000000..d09b40f
--- /dev/null
+++ b/res/values-kn-rIN/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">ಹಂತ</string>
+  <string name="step_option_desc">ಫಾಸ್ಟ್ ಫಾರ್ವರ್ಡ್/ರಿವೈಂಡ್ ಹಂತವನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ</string>
+  <string name="setp_option_three_second">3 ಸೆಕೆಂಡ್‍ಗಳು</string>
+  <string name="setp_option_six_second">6 ಸೆಕೆಂಡ್‍ಗಳು</string>
+  <string name="loop">"ಸುತ್ತುಹಾಕು"</string>
+  <string name="single">"ಏಕ"</string>
+  <string name="stereo">"ಸ್ಟೀರಿಯೋ"</string>
+  <string name="speaker_on">ಧ್ವನಿವರ್ಧಕ ಆನ್</string>
+  <string name="speaker_off">ಧ್ವನಿವರ್ಧಕ ಆಫ್</string>
+  <string name="speaker_need_headset">ಈ ವೈಷಿಷ್ಟ್ಯವನ್ನು ಉಪಯೋಗಿಸಲು ಹೇಡ್‍ಫೋನ್ಸ್ ಪ್ಲಗ್ ಇನ್ ಮಾಡಿ.</string>
+  <string name="single_track">"ಏಕೈಕ ಟ್ರಾಕ್"</string>
+  <string name="input_url">"URL ಬರೆಯಿರಿ"</string>
+  <string name="streaming_settings">"ಸ್ಟ್ರೀಮಿಂಗ್ ಸೆಟ್ಟಿಂಗ್ಸ್"</string>
+  <string name="next">"ಮುಂದಿನ"</string>
+  <string name="previous">"ಹಿಂದಿನ"</string>
+  <string name="buffer_size">ಬಫ್ಫರ್ ಗಾತ್ರ</string>
+  <string name="apn">ಆದ್ಯತೆಯ ಎಪಿಎನ್</string>
+  <string name="rtp_min_port">ಕನಿಷ್ಟ ಪೋರ್ಟ್</string>
+  <string name="rtp_max_port">ಗರಿಷ್ಠ ಪೋರ್ಟ್</string>
+  <string name="set_rtp_min_port">ಕನಿಷ್ಠ ಪೋರ್ಟ್ ಹೊಂದಿಸಿ</string>
+  <string name="set_rtp_max_port">ಗರಿಷ್ಠ ಪೋರ್ಟ್ ಹೊಂದಿಸಿ</string>
+  <string name="set_buffer_size">ಬಫ್ಫರ್ ಗಾತ್ರ ಹೊಂದಿಸಿ</string>
+  <string name="set_apn">ಆದ್ಯತೆಯ ಎ‍ಪಿಎನ್ ಆಯ್ಕೆಮಾಡಿ</string>
+  <string name="setting">ಸೆಟ್ಟಿಂಗ್ಸ್</string>
+  <string name="server_timeout_title">"ಸರ್ವರ್ ಅವಧಿಮುಗಿದಿದೆ"</string>
+  <string name="server_timeout_message">"ವೀಡಿಯೋ ಪ್ಲೇಮಾಡಲು ಸರ್ವರ್‍ಗೆ ಮರುಸಂಪರ್ಕಿಸುವುದೇ?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"ಸಂಪರ್ಕ ವಿಫಲವಾಗಿದೆ. %1$d\u2026 ಗೆ ಮರುಸಂಪರ್ಕಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ"</string>
+  <string name="media_controller_live">ಲೈವ್</string>
+  <string name="media_controller_playing">ಪ್ಲೇ ಆಗುತ್ತಿದೆ</string>
+  <string name="media_controller_connecting">ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ\u2026</string>
+  <string name="bookmark_add">"ಬುಕ್‍ಮಾರ್ಕ್ ಸೇರಿಸು"</string>
+  <string name="bookmark_display">"ಬುಕ್‍ಮಾರ್ಕ್ ತೋರಿಸು"</string>
+  <string name="bookmark_empty">"ಯಾವುದೇ ಬುಕ್‍ಮಾರ್ಕ್‍ಗಳಿಲ್ಲ"</string>
+  <string name="bookmark_exist">"ಬುಕ್‍ಮಾರ್ಕ್ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"</string>
+  <string name="bookmark_add_success">"ಬುಕ್‍ಮಾರ್ಕ್ ಸೇರಿಸಲಾಗಿದೆ"</string>
+  <string name="bookmark_list">"ಬುಕ್‍ಮಾರ್ಕ್‍ಗಳು"</string>
+  <string name="bookmark_title">"ಶೀರ್ಷಿಕೆ"</string>
+  <string name="bookmark_location">"ಸ್ಥಳ"</string>
+  <string name="delete_all">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸು"</string>
+  <string name="default_title">"ಡೀಫಾಲ್ಟ್ ಶೀರ್ಷಿಕೆ"</string>
+  <string name="more_image">ಮತ್ತಷ್ಟು ಚಿತ್ರಗಳು</string>
+  <string name="mute_nosupport">ಮೌನಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ : ವೀಡಿಯೋ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ</string>
+  <string name="map_activity_not_found_err">ಸ್ಥಳವನ್ನು ಪ್ರದರ್ಶಿಸಲು ಯಾವುದೇ ನಕ್ಷೆ ಆಪ್ ಸ್ಥಾಪಿತವಾಗಿಲ್ಲ.</string>
+  <string name="bass_boost_strength">ಬಾಸ್ ವರ್ಧನೆ</string>
+  <string name="virtualizer_strength">3D ಪ್ರಭಾವ</string>
+  <string name="audio_effects">ಆಡಿಯೋ ಪ್ರಭಾವ</string>
+  <string name="headset_plug">ಈ ಪ್ರಭಾವಗಳಿಗಾಗಿ ಹೆಡ್‍ಫೋನ್ಸನ್ನು ಪ್ಲಗ್ ಇನ್ ಮಾಡಿ.</string>
+  <string name="audio_effects_dialog_title">Snapdragon ಆಡಿಯೋ+</string>
+  <string name="fail_trim">ಕ್ಷಮಿಸಿ, ಈ ವೀಡಿಯೋ ಕಡತವನ್ನು ಕತ್ತರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-ko/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-ko/cm_strings.xml
index dfc7592..9b096dc 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">녹화 시간</string>
+</resources>
diff --git a/res/values-ko/codeaurora_strings.xml b/res/values-ko/codeaurora_strings.xml
new file mode 100644
index 0000000..7a3c59d
--- /dev/null
+++ b/res/values-ko/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">간격</string>
+  <string name="step_option_desc">빨리 감기/되감기 간격 사용자 지정</string>
+  <string name="setp_option_three_second">3초</string>
+  <string name="setp_option_six_second">6초</string>
+  <string name="loop">"반복"</string>
+  <string name="single">"단일"</string>
+  <string name="stereo">"스테레오"</string>
+  <string name="speaker_on">스피커 켬</string>
+  <string name="speaker_off">스피커 끔</string>
+  <string name="speaker_need_headset">이 기능을 사용하려면 헤드폰을 연결하세요.</string>
+  <string name="single_track">"단일 트랙"</string>
+  <string name="input_url">"URL 입력"</string>
+  <string name="streaming_settings">"스트리밍 설정"</string>
+  <string name="next">"다음"</string>
+  <string name="previous">"이전"</string>
+  <string name="buffer_size">버퍼 크기</string>
+  <string name="apn">선호 APN</string>
+  <string name="rtp_min_port">최저 포트</string>
+  <string name="rtp_max_port">최고 포트</string>
+  <string name="set_rtp_min_port">최저 포트 설정</string>
+  <string name="set_rtp_max_port">최고 포트 설정</string>
+  <string name="set_buffer_size">버퍼 크기 설정</string>
+  <string name="set_apn">선호 APN 설정</string>
+  <string name="setting">설정</string>
+  <string name="server_timeout_title">"서버 시간 초과"</string>
+  <string name="server_timeout_message">"서버에 다시 접속하여 동영상을 재생할까요?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"연결 실패, %1$d(으)로 다시 연결 중\u2026"</string>
+  <string name="media_controller_live">라이브</string>
+  <string name="media_controller_playing">재생 중</string>
+  <string name="media_controller_connecting">연결 중\u2026</string>
+  <string name="bookmark_add">"즐겨찾기에 추가"</string>
+  <string name="bookmark_display">"즐겨찾기 보기"</string>
+  <string name="bookmark_empty">"즐겨찾기 없음"</string>
+  <string name="bookmark_exist">"즐겨찾기에 이미 존재합니다"</string>
+  <string name="bookmark_add_success">"즐겨찾기에 추가되었습니다"</string>
+  <string name="bookmark_list">"즐겨찾기"</string>
+  <string name="bookmark_title">"제목"</string>
+  <string name="bookmark_location">"위치"</string>
+  <string name="delete_all">"모두 삭제"</string>
+  <string name="default_title">"기본 제목"</string>
+  <string name="more_image">더 많은 이미지</string>
+  <string name="mute_nosupport">음소거할 수 없음: 지원되지 않는 동영상</string>
+  <string name="map_activity_not_found_err">위치를 표시할 지도 앱이 설치되어 있지 않습니다.</string>
+  <string name="bass_boost_strength">베이스 부스트</string>
+  <string name="virtualizer_strength">3D 효과</string>
+  <string name="audio_effects">음향 효과</string>
+  <string name="headset_plug">음향 효과를 사용하려면 헤드폰을 연결하세요.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">죄송합니다. 이 동영상은 잘라낼 수 없습니다.</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-ku/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-ku/cm_strings.xml
index dfc7592..3c4578e 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-ku/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">تۆمارکردنی کات</string>
+</resources>
diff --git a/res/values-ku/codeaurora_strings.xml b/res/values-ku/codeaurora_strings.xml
new file mode 100644
index 0000000..c824295
--- /dev/null
+++ b/res/values-ku/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">هەنگاو</string>
+  <string name="step_option_desc">بەکەسیکردنی پلەی خێراییی پێشخستن/دواخستن</string>
+  <string name="setp_option_three_second">3 چرکە</string>
+  <string name="setp_option_six_second">6 چرکە</string>
+  <string name="loop">"كلو"</string>
+  <string name="single">"تاک"</string>
+  <string name="stereo">"stereo"</string>
+  <string name="speaker_on">چالاکردنی بڵندگۆ</string>
+  <string name="speaker_off">لەکارخستنی بڵندگۆ</string>
+  <string name="speaker_need_headset">بیستۆکەکان پێوە بکە بۆ بەکارهێنانی ئەم توانستە.</string>
+  <string name="single_track">"تاکە تراک"</string>
+  <string name="input_url">"ناونیشانی ئینتەرنێتی بنووسە"</string>
+  <string name="streaming_settings">"ڕێکخستنەکانی لێشاو (Stream)"</string>
+  <string name="next">"دواتر"</string>
+  <string name="previous">"پێشتر"</string>
+  <string name="buffer_size">قەبارەی نێوانگر</string>
+  <string name="apn">APNی بەباشزانراو</string>
+  <string name="rtp_min_port">کەمترین دەرگا</string>
+  <string name="rtp_max_port">زۆرترین دەرگا</string>
+  <string name="set_rtp_min_port">کەمترین دەرگا دابنێ</string>
+  <string name="set_rtp_max_port">زۆرترین دەرگا دابنێ</string>
+  <string name="set_buffer_size">قەبارەی نێوانگر دابنێ</string>
+  <string name="set_apn">APNی بەباشزانراو دیاری بکە</string>
+  <string name="setting">ڕێکخستنه‌کان</string>
+  <string name="server_timeout_title">"وچانی ڕاژەکار"</string>
+  <string name="server_timeout_message">"ببەستێتەوە بە ڕاژەکارەوە بۆ لێدانی ڤیدیۆکە؟"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"بەستنەوە سەرکەوتوو نەبوو، هەوڵدان بۆ بەستنەوە بە %1$d\u2026"</string>
+  <string name="media_controller_live">ڕاستەوخۆ</string>
+  <string name="media_controller_playing">لێدان</string>
+  <string name="media_controller_connecting">بەستنەوە\u2026</string>
+  <string name="bookmark_add">"نیشانەکردنی وێبگە"</string>
+  <string name="bookmark_display">"پیشاندانی وێبگە نیشانەکراوەکان"</string>
+  <string name="bookmark_empty">"وێبگەی نیشانەکراو نییە"</string>
+  <string name="bookmark_exist">"وێبگەی نیشانەکراو پێشتر هەیە"</string>
+  <string name="bookmark_add_success">"وێبگەکە نیشانە کرا"</string>
+  <string name="bookmark_list">"وێبگە نیشانەکراوەکان"</string>
+  <string name="bookmark_title">"سەردێڕ"</string>
+  <string name="bookmark_location">"شوێن"</string>
+  <string name="delete_all">"سڕینەوەی هەموو"</string>
+  <string name="default_title">"سەردێڕی بنەڕەت"</string>
+  <string name="more_image">وێنەی زیاتر</string>
+  <string name="mute_nosupport">ناتوانێت کپ بکرێت : ڤیدیۆ پشتگیری ناکرێت</string>
+  <string name="map_activity_not_found_err">هیچ بەرنامەیەکی نەخشە نیە بۆ پیشاندانی ناوچە.</string>
+  <string name="bass_boost_strength">بەهێزکردنی بنچینەی دەنگ</string>
+  <string name="virtualizer_strength">کاریگەریی 3D</string>
+  <string name="audio_effects">کاریگه‌رییەکانی ده‌نگ</string>
+  <string name="headset_plug">بیستۆکەکانت پێوە بکە بۆ ئەم کاریگەرییانە.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">بەداخەوە، ئەم پەڕگە ڤیدیۆیییە ناتوانرێت ببڕدرێت</string>
+</resources>
diff --git a/res/values-ku/filtershow_strings.xml b/res/values-ku/filtershow_strings.xml
new file mode 100644
index 0000000..921ebb6
--- /dev/null
+++ b/res/values-ku/filtershow_strings.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <string name="title_activity_filter_show">ده‌ستکاری کردنی وێنه‌</string>
+  <string name="cannot_load_image">ناتوانێت وێنەکە بار بکات!</string>
+  <string name="cannot_edit_original">نه‌توانرا وێنه‌ی بنێڕه‌ت ده‌ستکاریبکرێت</string>
+  <string name="setting_wallpaper">دانانی وێنەی سەر ڕوونما</string>
+  <string name="download_failure">نه‌توانرا وێنه‌ دابگیرێت.هێڵ ئاماده‌نییه‌.</string>
+  <string name="original">ڕەسەن</string>
+  <string name="custom_border">تایبەت بە خۆ</string>
+  <string name="filtershow_undo">پاشگەزبوون</string>
+  <string name="filtershow_redo">گه‌ڕانه‌وه‌ بۆ هه‌نگاوی داهاتوو</string>
+  <string name="show_imagestate_panel">نیشاندانی کاریگه‌رییه‌ جێبه‌جێکراوه‌کان</string>
+  <string name="hide_imagestate_panel">شاردنه‌وه‌ی کاریگه‌رییه‌ جێبه‌جێکراوه‌کان</string>
+  <string name="export_image">ناردن</string>
+  <string name="print_image">چاپکردن</string>
+  <string name="export_flattened">ناردنی وێنه‌ی ته‌خت</string>
+  <string name="select_output_settings">وێنه‌ی نێردراو له‌به‌رده‌گیرێته‌وه‌ به‌بێ تۆمار.</string>
+  <string name="quality">کوالێتی</string>
+  <string name="size">قه‌باره‌</string>
+  <string name="x">x</string>
+  <string name="menu_settings">ڕێکخستنه‌کان</string>
+  <string name="unsaved">چه‌ند گۆڕانێکی پاشه‌که‌وت نه‌کراو هه‌یه‌ بۆ ئه‌م وێنه‌یه‌.</string>
+  <string name="save_before_exit">ئه‌ته‌وێ پاشه‌که‌وتی بکه‌یت پێش چوونه‌ده‌ره‌وه‌؟</string>
+  <string name="save_and_exit">پاشه‌که‌وتکردن و چوونه‌ ده‌ره‌وه‌</string>
+  <string name="save_and_processing">پرۆسه‌ی پڕ کوالێتی وێنه‌...</string>
+  <string name="exit">ده‌رچوون</string>
+  <string name="history">ڕێکخستنەوە</string>
+  <string name="reset">ڕێکخستنەوە</string>
+  <string name="imageState">کاریگه‌ری جێبه‌جێکراو</string>
+  <string name="compare_original">بەراوردکردن</string>
+  <string name="apply_effect">جێبه‌جێکردن</string>
+  <string name="reset_effect">ڕێکخستنەوە</string>
+  <string name="aspect">لا</string>
+  <string name="aspect1to1_effect">1:1</string>
+  <string name="aspect4to3_effect">4:3</string>
+  <string name="aspect3to4_effect">3:4</string>
+  <string name="aspect4to6_effect">4:6</string>
+  <string name="aspect5to7_effect">5:7</string>
+  <string name="aspect7to5_effect">7:5</string>
+  <string name="aspect9to16_effect">16:9</string>
+  <string name="aspectNone_effect">هیچیان</string>
+  <string name="Fixed">چاره‌سه‌رکراو</string>
+  <string name="tinyplanet">ورده‌ هه‌ساره‌</string>
+  <string name="exposure" msgid="1229093066434614811">ڕووناکیپێدان</string>
+  <string name="sharpness">زبری</string>
+  <string name="contrast">کۆنتراست</string>
+  <string name="vibrance">وزه‌ ڕه‌نگ</string>
+  <string name="saturation">تێرایی</string>
+  <string name="bwfilter">کاریگه‌ری BW</string>
+  <string name="wbalance">خۆکارانه‌ ڕه‌نگ</string>
+  <string name="hue">ڕه‌نگ</string>
+  <string name="shadow_recovery">سێبه‌ره‌کان</string>
+  <string name="highlight_recovery">به‌رچاوه‌کان</string>
+  <string name="curvesRGB">لاری</string>
+  <string name="vignette">تۆخی</string>
+  <string name="vignette_main">شێوە</string>
+  <string name="vignette_exposure">ڕووناکیپێدان</string>
+  <string name="vignette_saturation">تێریی ڕەنگ</string>
+  <string name="vignette_contrast">کۆنتراست</string>
+  <string name="vignette_falloff">که‌وته‌ڕه‌نگ</string>
+  <string name="redeye">چاوی سوور</string>
+  <string name="imageDraw">کێشان</string>
+  <string name="straighten" msgid="5217801513491493491">هێزی</string>
+  <string name="crop" msgid="5584000454518174632">قرتاندن</string>
+  <string name="rotate" msgid="460017689320955494">سووڕاندنەوە</string>
+  <string name="mirror">ئاوێنه‌</string>
+  <string name="negative">پێچه‌وانه‌</string>
+  <string name="none" msgid="3601545724573307541">هیچیان</string>
+  <string name="edge">که‌ناری</string>
+  <string name="kmeans">پاشکه‌وتوو</string>
+  <string name="downsample">خواره‌نمونه‌</string>
+  <string name="grad">وه‌رگیراو</string>
+  <string name="editor_grad_brightness">ڕۆشنایی</string>
+  <string name="editor_grad_contrast">کۆنتراست</string>
+  <string name="editor_grad_saturation">تێریی ڕەنگ</string>
+  <string name="editor_chan_sat_main">سەرەکی</string>
+  <string name="editor_chan_sat_red">سوور</string>
+  <string name="editor_chan_sat_yellow">زەرد</string>
+  <string name="editor_chan_sat_green">سەوز</string>
+  <string name="editor_chan_sat_cyan">شینی ئاسمانی</string>
+  <string name="editor_chan_sat_blue">شین</string>
+  <string name="editor_chan_sat_magenta">سووری ئەرخەوانی</string>
+  <string name="editor_grad_style">شێواز</string>
+  <string name="editor_grad_new">نوێ</string>
+  <string name="curves_channel_rgb">RGB</string>
+  <string name="curves_channel_red">سوور</string>
+  <string name="curves_channel_green">سه‌وز</string>
+  <string name="curves_channel_blue">شین</string>
+  <string name="draw_style">شێواز</string>
+  <string name="draw_size">قه‌باره‌</string>
+  <string name="draw_hue">ڕه‌نگ</string>
+  <string name="draw_saturation">تێریی ڕەنگ</string>
+  <string name="draw_value">ڕۆشنایی</string>
+  <string name="draw_color">ڕەنگ</string>
+  <string name="draw_style_line">هێله‌کان</string>
+  <string name="draw_style_brush_spatter">دیاریکه‌ره‌کان</string>
+  <string name="draw_style_brush_marker">لیکاوی</string>
+  <string name="draw_clear">پاککردنه‌وه‌</string>
+  <string name="color_border_size">ئه‌ستووری</string>
+  <string name="color_border_corner_size">قه‌باره‌ی سوچه‌کان</string>
+  <string name="color_border_color">ڕەنگ</string>
+  <string name="color_border_clear">پاککردنه‌وه‌</string>
+  <string name="color_pick_select">دیاریکردنی ڕه‌نگی دڵخواز</string>
+  <string name="color_pick_title">دیاریکردنی ڕه‌نگ</string>
+  <string name="draw_size_title">دیاریکردنی قه‌باره‌</string>
+  <string name="draw_size_accept">باشه‌</string>
+  <string name="state_panel_original">ڕەسەن</string>
+  <string name="state_panel_result">ئه‌نجام</string>
+  <string name="filtershow_notification_label">پاشه‌که‌وتکردنی وێنه‌</string>
+  <string name="filtershow_notification_message">پرۆسە...</string>
+  <string name="filtershow_save_preset">پاشه‌که‌وتکردنی ئاماده‌کراوی ئێستا</string>
+  <string name="filtershow_manage_preset">به‌ڕێوه‌بردنی ئاماده‌کراوی به‌کارهێنه‌ر</string>
+  <string name="filtershow_new_preset">ئاماده‌کراوێکی نوێ</string>
+  <string name="filtershow_preset_name">ناوی ئاماده‌کراو</string>
+  <string name="filtershow_show_info_panel">زانیاری</string>
+  <string name="filtershow_show_info_panel_name">ناوی وێنه‌</string>
+  <string name="filtershow_show_info_panel_size">قه‌باره‌ی وێنه‌</string>
+  <string name="filtershow_show_info_panel_histogram">مێژوویی</string>
+  <string name="filtershow_show_info_panel_exif">داتای EXIF </string>
+  <string name="filtershow_add_button_looks">ئاماده‌کراو</string>
+  <string name="filtershow_add_button_versions">وه‌شان</string>
+  <string name="filtershow_version_original">ڕەسەن</string>
+  <string name="filtershow_version_current">ئێستا</string>
+  <string name="filtershow_exif_model">مۆدێل</string>
+  <string name="filtershow_exif_aperture">دیافراگم</string>
+  <string name="filtershow_exif_focal_length">درێژیی تیشکۆیی</string>
+  <string name="filtershow_exif_iso">ISO</string>
+  <string name="filtershow_exif_subject_distance">ماوه‌ی دێڕ</string>
+  <string name="filtershow_exif_date">ڕۆژی گرتنی وێنه‌که‌</string>
+  <string name="filtershow_exif_f_stop">F وه‌ستان</string>
+  <string name="filtershow_exif_exposure_time">كاتى كەوتنەبەر</string>
+  <string name="filtershow_exif_copyright">مافی له‌به‌رگرتنه‌وه‌</string>
+</resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
new file mode 100644
index 0000000..df779a0
--- /dev/null
+++ b/res/values-ku/strings.xml
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">پێشەنگا</string>
+  <string name="gadget_title">چوارچێوه‌ی وێنه‌</string>
+  <string name="details_ms">%1$02d:%2$02d</string>
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
+  <string name="movie_view_label">لێده‌ری ڤیدیۆ</string>
+  <string name="loading_video">بارکردنی ڤیدیۆ\u2026</string>
+  <string name="loading_image">کردنه‌وه‌ی وێنه‌\u2026</string>
+  <string name="loading_account">کردنه‌وه‌ی هه‌ژمار\u2026</string>
+  <string name="resume_playing_title">ڤيديۆكه‌ دەست پێ بكەوە</string>
+  <string name="resume_playing_message">ڤیدیۆ ده‌ستپێبکاته‌وه‌ له‌ %s ؟ ?</string>
+  <string name="resume_playing_resume">ده‌ستپێکردنه‌وه‌</string>
+  <string name="loading">ئامادەکردن\u2026</string>
+  <string name="fail_to_load">نەتوانى بار بكه‌یت</string>
+  <string name="fail_to_load_image">ناتوانی وێنه‌كه‌ باربكه‌یت</string>
+  <string name="no_thumbnail">هیچ کورته‌ وێنه‌یه‌ک نییه‌</string>
+  <string name="resume_playing_restart">دەست پێ بكەوە</string>
+  <string name="crop_save_text">باشه‌</string>
+  <string name="ok">باشه‌</string>
+  <string name="multiface_crop_help">په‌نجه‌ بنێ به‌ ڕوودا بۆ ده‌ستپێکردن.</string>
+  <string name="saving_image">پاشه‌که‌وتکردنی وێنه‌\u2026</string>
+  <string name="filtershow_saving_image">پاشه‌که‌وتکردنی وێنه‌ بۆ <xliff:g id="album_name">%1$s</xliff:g>\u2026</string>
+  <string name="save_error">نه‌توانرا وێنه‌ی بڕدراو پاشه‌که‌وت بکرێت.</string>
+  <string name="crop_label">بڕینی وێنه‌</string>
+  <string name="trim_label">بڕینی ڤیدیۆ</string>
+  <string name="select_image">دیاریکردنی وێنه‌</string>
+  <string name="select_video">دیاریکردنی ڤیدیۆ</string>
+  <string name="select_item">دیاریکردنی دانه‌یه‌ک</string>
+  <string name="select_album">دیاریکردنی ئه‌لبوم</string>
+  <string name="select_group">دیاریکردنی گروپ</string>
+  <string name="set_image">دانانی وێنە وەکوو</string>
+  <string name="set_wallpaper">دانانی وێنەی پشتەوە</string>
+  <string name="wallpaper">دانانی دیوارپۆش\u2026</string>
+  <string name="camera_setas_wallpaper">دیوارپۆش</string>
+  <string name="delete">سڕینه‌وه‌</string>
+  <plurals name="delete_selection">
+    <item quantity="one">سڕینەوەی بڕگه‌ی دیاریکراو؟</item>
+    <item quantity="other">سڕینەوەی بڕگه‌ دیاریکراوەکان؟</item>
+  </plurals>
+  <string name="confirm">دووپاتکردنەوە</string>
+  <string name="cancel">لابردن</string>
+  <string name="share">به‌شداری پێکردن</string>
+  <string name="share_panorama">هاوبەشیکردنی پانۆراما</string>
+  <string name="share_as_photo">هاوبەشیکردن وەکوو وێنە</string>
+  <string name="deleted">سڕایەوە</string>
+  <string name="undo">پاشگەزبوونەوە</string>
+  <string name="select_all">دیاریکردنی هەموو</string>
+  <string name="deselect_all">دیاری نەکردنی هەموو</string>
+  <string name="slideshow">نیشاندانی سلاید</string>
+  <string name="details">زانیاری زیاتر</string>
+  <string name="details_title">%1$d له‌ %2$d دانه‌:</string>
+  <string name="close">داخستن</string>
+  <string name="switch_to_camera">گۆڕین بۆ كامێرا</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d دیاریکرا</item>
+    <item quantity="other">%1$d دیاریکراون</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d دیاریکرا</item>
+    <item quantity="other">%1$d دیاریکراون</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d دیاریکرا</item>
+    <item quantity="other">%1$d دیاریکراون</item>
+  </plurals>
+  <string name="show_on_map">پیشاندانی لەسەر نەخشە</string>
+  <string name="rotate_left">سووڕاندنەوە بۆ چەپ</string>
+  <string name="rotate_right">سووڕاندنەوە بۆ ڕاست</string>
+  <string name="no_such_item">نه‌توانرا دانه‌ بدۆزرێته‌وه‌.</string>
+  <string name="edit">دەستکاری</string>
+  <string name="simple_edit">ده‌ستكاری كرنی سادە</string>
+  <string name="process_caching_requests">دەستكاريكردنی داواكارى هەڵگرتن</string>
+  <string name="caching_label">هەڵگرتن\u2026</string>
+  <string name="crop_action">قرتاندن</string>
+  <string name="trim_action">بڕین</string>
+  <string name="mute_action">کپکردن</string>
+  <string name="set_as">دانان وەکوو</string>
+  <string name="video_mute_err">ناتوانیت ڤیدیۆكه‌ بێده‌نگ بكه‌یت</string>
+  <string name="video_err">ناتوانرێت ڤیدۆکە لێبدرێت.</string>
+  <string name="group_by_location">له‌لایه‌ن شوێنه‌وه‌</string>
+  <string name="group_by_time">له‌لایه‌ن كاته‌وه‌</string>
+  <string name="group_by_tags">له‌لایه‌ن تاگه‌كانه‌وه‌</string>
+  <string name="group_by_faces">له‌لایه‌ن خه‌ڵكه‌وه‌</string>
+  <string name="group_by_album">له‌لایه‌ن ئه‌لبومه‌وه‌</string>
+  <string name="group_by_size">به‌پێی قه‌باره‌</string>
+  <string name="untagged">ئاراسته‌بۆنه‌کراو</string>
+  <string name="no_location">شوێن نییه‌</string>
+  <string name="no_connectivity">هه‌ندێ شوێن نه‌توانرا بناسرێته‌وه‌ له‌ کاتی کێشه‌کانی هێڵ.</string>
+  <string name="sync_album_error">نه‌توانرا وێنه‌ دابگیرێت بۆ ئه‌لبوومه‌که‌. دواتر هه‌وڵبده‌ره‌وه‌.</string>
+  <string name="show_images_only">ته‌نها وێنه‌</string>
+  <string name="show_videos_only">ته‌نها ڤیدیۆ</string>
+  <string name="show_all">وێنه‌ وamp; ڤیدیۆ</string>
+  <string name="appwidget_title">پێشەنگای وێنە</string>
+  <string name="appwidget_empty_text">وێنه‌ نییه‌.</string>
+  <string name="crop_saved">
+        وێنەی قرتێنراو پاشەکەوت کرا بۆ <xliff:g id="folder_name">%s</xliff:g>.</string>
+  <string name="no_albums_alert">هیچ ئه‌لبومێک ئاماده‌ نییه‌.</string>
+  <string name="empty_album">0 وێنه‌/ڤیدیۆ ئاماده‌یه‌.</string>
+  <string name="picasa_posts">په‌یامه‌کان</string>
+  <string name="make_available_offline">کردن بە دەرهێڵ</string>
+  <string name="sync_picasa_albums">تازەکردنەوە</string>
+  <string name="done">ئه‌نجام درا</string>
+  <string name="sequence_in_set">%1$d of %2$d items:</string>
+  <string name="title">سەردێڕ</string>
+  <string name="description">پێناسه</string>
+  <string name="time">کات</string>
+  <string name="location">شوێن</string>
+  <string name="path">ڕێچکە</string>
+  <string name="width">پانی</string>
+  <string name="height">بەرزی</string>
+  <string name="orientation">ڕووتێکەری</string>
+  <string name="duration">ماوه‌</string>
+  <string name="mimetype">جۆری MIME</string>
+  <string name="file_size">ئەندازە پەڕگە</string>
+  <string name="maker">دروستکەر</string>
+  <string name="model">مۆدێل</string>
+  <string name="flash">فلاش</string>
+  <string name="aperture">دیافراگم</string>
+  <string name="focal_length">درێژیی تیشکۆیی</string>
+  <string name="white_balance">هاوسەنگیی سپی</string>
+  <string name="exposure_time">کاتی ڕووناککردنەوە</string>
+  <string name="iso">ISO</string>
+  <string name="unit_mm">م‌م</string>
+  <string name="manual">دەستکارانە</string>
+  <string name="auto">خۆکارانه</string>
+  <string name="flash_on">فلاش لێدرا</string>
+  <string name="flash_off">بێ فلاش</string>
+  <string name="unknown">نەزانراو</string>
+  <string name="ffx_original">ڕەسەن</string>
+  <string name="ffx_vintage">بەپەرۆش</string>
+  <string name="ffx_instant">دەستبەجێ</string>
+  <string name="ffx_bleach">سپی دەکاتەوە</string>
+  <string name="ffx_blue_crush">شین</string>
+  <string name="ffx_bw_contrast">B/W</string>
+  <string name="ffx_punch">كۆن كردنی كاغه‌ز</string>
+  <string name="ffx_x_process">كرداری X</string>
+  <string name="ffx_washout">ژاوەژاو</string>
+  <string name="ffx_washout_color">Litho</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one">دروستکردنی ئه‌لبومی ده‌رهێڵی</item>
+    <item quantity="other">دروستکردنی ئه‌لبومی ده‌رهێڵی</item>
+  </plurals>
+  <string name="try_to_set_local_album_available_offline">
+        ئەم بڕگەیە له‌ ناوخۆدا پاشەکەوتکراوە و به‌بێ هێڵیش به‌رده‌سته‌.</string>
+  <string name="set_label_all_albums">هه‌موو ئه‌لبومه‌كانم</string>
+  <string name="set_label_local_albums">شوێنی ئه‌لبومه‌كان</string>
+  <string name="set_label_mtp_devices">ئامێری MTP</string>
+  <string name="set_label_picasa_albums">Picasa albums</string>
+  <string name="free_space_format"><xliff:g id="bytes">%s</xliff:g> free</string>
+  <string name="size_below"><xliff:g id="size">%1$s</xliff:g> or below</string>
+  <string name="size_above"><xliff:g id="size">%1$s</xliff:g> or above</string>
+  <string name="size_between"><xliff:g id="min_size">%1$s</xliff:g> to <xliff:g id="max_size">%2$s</xliff:g></string>
+  <string name="Import">هێنان</string>
+  <string name="import_complete">به‌سه‌ركه‌وتوی هێندرا</string>
+  <string name="import_fail">هێنان سه‌ركه‌وتوو نه‌بوو</string>
+  <string name="camera_connected">كامێرای پەیوەندیدار</string>
+  <string name="camera_disconnected">كامێرای په‌یوه‌ندیدار.</string>
+  <string name="click_import">دەست لێدان لێرە بۆ هێنان</string>
+  <string name="widget_type_album">ئه‌لبومێك هه‌ڵبژێره‌</string>
+  <string name="widget_type_shuffle">تێکەڵکردنی هه‌موو وێنه‌كان</string>
+  <string name="widget_type_photo">وێنه‌یه‌ك هه‌ڵبژێره‌</string>
+  <string name="widget_type">هەڵبژاردنی وێنه‌</string>
+  <string name="slideshow_dream_name">نیشانده‌ری</string>
+  <string name="albums">ئەلبوم</string>
+  <string name="times">کەڕەت</string>
+  <string name="locations">شوێن</string>
+  <string name="people">خەڵک</string>
+  <string name="tags">تاگەکان</string>
+  <string name="group_by">له‌لایه‌ن گروپه‌وه‌</string>
+  <string name="settings">ڕێکخستنه‌کان</string>
+  <string name="add_account">دانانی هەژمار</string>
+  <string name="folder_camera">کامێرا</string>
+  <string name="folder_download">داگرتن</string>
+  <string name="folder_edited_online_photos">وێنه‌ی سه‌رهێڵ دەستکاری کراوە</string>
+  <string name="folder_imported">دانان</string>
+  <string name="folder_screenshot">وێنەی شاشە</string>
+  <string name="help">یارمەتی</string>
+  <string name="no_external_storage_title">هیچ هه‌ڵنه‌گیراوه‌</string>
+  <string name="no_external_storage">هیچ هه‌ڵگیراوێكی ده‌ره‌كی نییه‌</string>
+  <string name="switch_photo_filmstrip">پیشاندانی بە شێوەی ئەڵقەی فیلم</string>
+  <string name="switch_photo_grid">پیشاندانی خانه‌یی</string>
+  <string name="switch_photo_fullscreen">بینینی پڕ شاشە</string>
+  <string name="trimming">زیانبەخش</string>
+  <string name="muting">بێ دەنگ</string>
+  <string name="please_wait">تکایه‌ چاوه‌ڕێ بکە</string>
+  <string name="save_into">Saving video to <xliff:g id="album_name">%1$s</xliff:g> \u2026</string>
+  <string name="trim_too_short">ناتوانیت هه‌ڵی بگریت:ڤیدیۆی دیاری كراو زۆر كورته‌</string>
+  <string name="pano_progress_text">نواندنی پانۆرامایی</string>
+  <string name="save" msgid="8140440041190264400">پاشەکەوتکردن</string>
+  <string name="ingest_scanning" msgid="2048262851775139720">پشكنینی ناوه‌ڕۆك...</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="one">%1$d بڕگە پشکنرا</item>
+    <item quantity="other">%1$d بڕگە پشکنرا</item>
+  </plurals>
+  <string name="ingest_sorting" msgid="624687230903648118">جیاكردنه‌وه‌...</string>
+  <string name="ingest_scanning_done">پشكنین ته‌واو بوو</string>
+  <string name="ingest_importing">دانان...</string>
+  <string name="ingest_empty_device">هيچ ناوەرۆكى بەردەست بۆ دانان لەسەر ئەمە ئامراز نيە.</string>
+  <string name="ingest_no_device">هیچ ئامێرێكی MTP په‌یوه‌ست نییه‌</string>
+  <string name="camera_error_title">هەڵەی کامێرا</string>
+  <string name="cannot_connect_camera">ناتوانێت ببەسترێتەوە بە کامێراوە.</string>
+  <string name="camera_disabled">کامێرا بە هۆکاری پلانی پاراستنەوە  نەتوانا کراوە.</string>
+  <string name="camera_label">کامێرا</string>
+  <string name="wait">تکایە چاوەڕێ بکە\u2026</string>
+  <string name="no_storage" product="nosdcard">ده‌رکردنی بیرگه‌ی USB پێش به‌کارهێنانی کامێرا.</string>
+  <string name="no_storage" product="default">پێش بەکارهێنانی کامێرا بیرگەی دەرەکی تێبخە.</string>
+  <string name="preparing_sd" product="nosdcard">ئاماده‌کردنی بیرگه‌ی USB\u2026</string>
+  <string name="preparing_sd" product="default">ئامادەکردنی بیرگەی دەرەکی\u2026</string>
+  <string name="access_sd_fail" product="nosdcard">ده‌سته‌ڵات نه‌شكێنرایه‌وه‌ به‌سه‌ر بیرگه‌ی USB.</string>
+  <string name="access_sd_fail" product="default">نەتوانرا دەست بگەیەنێتە بیرگەی دەرەکی.</string>
+  <string name="review_cancel">لابردن</string>
+  <string name="review_ok">ته‌واوبوو</string>
+  <string name="time_lapse_title">تۆمارکردنی تێپەڕبوونی کات</string>
+  <string name="pref_camera_id_title">کامێرا هەڵبژێرە</string>
+  <string name="pref_camera_id_entry_back">دواوە</string>
+  <string name="pref_camera_id_entry_front">پێشەوە</string>
+  <string name="pref_camera_recordlocation_title">کۆگاکردنی شوێن</string>
+  <string name="pref_camera_location_label">شوێن</string>
+  <string name="pref_camera_timer_title">کاتژمێری بەرەوژێرژمار</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">١ چرکە</item>
+    <item quantity="other">%d چرکە</item>
+  </plurals>
+  <string name="pref_camera_timer_sound_default">@string/setting_on_value</string>
+  <string name="pref_camera_timer_sound_title">توتە لە ماوەی ژماردنی بەرەوژێر</string>
+  <string name="setting_off">کوژاندن</string>
+  <string name="setting_on">هەڵکردن</string>
+  <string name="pref_video_quality_title">جۆرایه‌تیی کامێرا</string>
+  <string name="pref_video_quality_entry_high">به‌رز</string>
+  <string name="pref_video_quality_entry_low">نزم</string>
+  <string name="pref_video_time_lapse_frame_interval_title">کات تێپەڕبوون</string>
+  <string name="pref_camera_settings_category">ڕێکخستنەکانی کامێرا</string>
+  <string name="pref_camcorder_settings_category">ڕێکخستنەکانی کامێرای هەڵگرتەنی</string>
+  <string name="pref_camera_picturesize_title">قەبارەی وێنە</string>
+  <string name="pref_camera_picturesize_entry_13mp">١٣ مێگاپێکسڵ</string>
+  <string name="pref_camera_picturesize_entry_8mp">٨ مێگاپێکسڵ</string>
+  <string name="pref_camera_picturesize_entry_5mp">٥ مێگاپێکسڵ</string>
+  <string name="pref_camera_picturesize_entry_4mp">4 مێگاپێکسڵ</string>
+  <string name="pref_camera_picturesize_entry_3mp">٣ مێگاپێکسڵ</string>
+  <string name="pref_camera_picturesize_entry_2mp">٢ مێگاپێکسڵ</string>
+  <string name="pref_camera_picturesize_entry_2mp_wide">٢ مێگاپێکسڵ (١٦ لەسەر ٩)</string>
+  <string name="pref_camera_picturesize_entry_1_3mp">١.٣ مێگاپێکسڵ</string>
+  <string name="pref_camera_picturesize_entry_1mp">١ مێگاپێکسڵ</string>
+  <string name="pref_camera_picturesize_entry_vga">VGA</string>
+  <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
+  <string name="pref_camera_focusmode_title">شێوازی سەرنجدان</string>
+  <string name="pref_camera_focusmode_entry_auto">خۆکار</string>
+  <string name="pref_camera_focusmode_entry_infinity">Infinity</string>
+  <string name="pref_camera_focusmode_entry_macro">Macro</string>
+  <string name="pref_camera_focusmode_label_auto">خۆکارانە</string>
+  <string name="pref_camera_focusmode_label_infinity">INFINITY</string>
+  <string name="pref_camera_focusmode_label_macro">MACRO</string>
+  <string name="pref_camera_flashmode_title">شێوازی فلاش</string>
+  <string name="pref_camera_flashmode_label">شێوازی فلاش</string>
+  <string name="pref_camera_flashmode_entry_auto">خۆکارانه‌</string>
+  <string name="pref_camera_flashmode_entry_on">هەڵکردن</string>
+  <string name="pref_camera_flashmode_entry_off">کوژاندنه‌وه‌</string>
+  <string name="pref_camera_flashmode_label_auto">فلاشی خۆکار</string>
+  <string name="pref_camera_flashmode_label_on">فلاش هەڵە</string>
+  <string name="pref_camera_flashmode_label_off">فلاش کوژاوەیە</string>
+  <string name="pref_camera_whitebalance_title">هاوسەنگیی سپی</string>
+  <string name="pref_camera_whitebalance_label">هاوسه‌نگیی سپێتی</string>
+  <string name="pref_camera_whitebalance_entry_auto">خۆکار</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">درەوشاوە</string>
+  <string name="pref_camera_whitebalance_entry_daylight">ڕۆژی ڕووناک</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">تيشكاوى</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">هەوری</string>
+  <string name="pref_camera_whitebalance_label_auto">خۆکار</string>
+  <string name="pref_camera_whitebalance_label_incandescent">درەوشاوە</string>
+  <string name="pref_camera_whitebalance_label_daylight">ڕۆژی ڕووناک</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">تيشكاوى</string>
+  <string name="pref_camera_whitebalance_label_cloudy">هەوری</string>
+  <string name="pref_camera_scenemode_title">شێوازی دیمەن</string>
+  <string name="pref_camera_scenemode_entry_auto">خۆکار</string>
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
+  <string name="pref_camera_scenemode_entry_action">چالاکی</string>
+  <string name="pref_camera_scenemode_entry_night">شەو</string>
+  <string name="pref_camera_scenemode_entry_sunset">خۆراوابوون</string>
+  <string name="pref_camera_scenemode_entry_party">میوانی</string>
+  <string name="pref_camera_scenemode_label_auto">هیچیان</string>
+  <string name="pref_camera_scenemode_label_action">چالاکی</string>
+  <string name="pref_camera_scenemode_label_night">شەو</string>
+  <string name="pref_camera_scenemode_label_sunset">خۆراوابوون</string>
+  <string name="pref_camera_scenemode_label_party">میوانی</string>
+  <string name="pref_camera_countdown_label">ژمێره‌ری کات</string>
+  <string name="pref_camera_countdown_label_off">کوژاندنەوەی کاتڕاگر</string>
+  <string name="pref_camera_countdown_label_one">١ چرکە</string>
+  <string name="pref_camera_countdown_label_three">٣ چرکە</string>
+  <string name="pref_camera_countdown_label_ten">١٠ چرکە</string>
+  <string name="pref_camera_countdown_label_fifteen">١٥ چرکە</string>
+  <string name="not_selectable_in_scene_mode">لە شیوازی دیمەندا دیارینەکراوەیە.</string>
+  <string name="pref_exposure_title">ڕووناکیپێدان</string>
+  <string name="pref_exposure_label">ڕۆشنایی پێدان</string>
+  <string name="pref_camera_hdr_default">@string/setting_off_value</string>
+  <string name="pref_camera_hdr_label">HDR</string>
+  <string name="pref_camera_id_label_back">کامێرای پێشەوە</string>
+  <string name="pref_camera_id_label_front">کامێرای دواوە</string>
+  <string name="dialog_ok">باشه‌</string>
+  <string name="spaceIsLow_content" product="nosdcard">بیرگەکەت پڕ بوە تکایە لەپێشدا کەمێك زانیاری بسڕەوە و پاشان هەوڵ بدەرەوە.</string>
+  <string name="spaceIsLow_content" product="default">بۆشاییی بیرگەی دەرەکیت بەرەو تەواوبوون دەڕوات. ڕێکخستنەکانی جۆرێتی بگۆڕە یان هەندێک وێنە یان دیکەی پەڕگەکان بسڕەوە.</string>
+  <string name="video_reach_size_limit">قەبارە گەیشتۆتە سنوور.</string>
+  <string name="pano_too_fast_prompt">زۆر خێرا</string>
+  <string name="pano_dialog_prepare_preview">ئامادەکردنی پانۆراما</string>
+  <string name="pano_dialog_panorama_failed">نەیتوانی پانۆراما پاشەکەوت بکات.</string>
+  <string name="pano_dialog_title">پانۆراما</string>
+  <string name="pano_capture_indication">گرتنی پانۆراما</string>
+  <string name="pano_dialog_waiting_previous">چاوەڕێکردن بۆ پانۆرامای پێشوو</string>
+  <string name="pano_review_saving_indication_str">پاشەکەوتکردن\u2026</string>
+  <string name="pano_review_rendering">نواندنی پانۆرامایی</string>
+  <string name="tap_to_focus">بیسوو بۆ سەرنجدان.</string>
+  <string name="pref_video_effect_title">کاریگه‌رییه‌کان</string>
+  <string name="effect_none">هیچیان</string>
+  <string name="effect_goofy_face_squeeze">گوشین</string>
+  <string name="effect_goofy_face_big_eyes">چاوی گەورە</string>
+  <string name="effect_goofy_face_big_mouth">دەمی گەورە</string>
+  <string name="effect_goofy_face_small_mouth">دەمی بچوک</string>
+  <string name="effect_goofy_face_big_nose">لوتی گەورە</string>
+  <string name="effect_goofy_face_small_eyes">چاوی بچوک</string>
+  <string name="effect_backdropper_space">لە بۆشایی</string>
+  <string name="effect_backdropper_sunset">خۆراوابوون</string>
+  <string name="effect_backdropper_gallery">ڤیدیۆکه‌ت</string>
+  <string name="bg_replacement_message">دانانی ئامێر بۆ وه‌ستان.\nهه‌نگاوێک له‌ بینینی کات.</string>
+  <string name="video_snapshot_hint">له‌ کاتی تۆمارکردندا بیسوو بۆ وێنه‌گرتن.</string>
+  <string name="video_recording_started">تۆمارکردنی ڤیدیۆ دەستی پێکردووه‌.</string>
+  <string name="video_recording_stopped">تۆمارکردنی ڤیدیۆ وەستاوه‌.</string>
+  <string name="disable_video_snapshot_hint">گرتنی ڤیدیۆ ئاماده‌نییه‌ کاتێک کاریگه‌ری تایبه‌تی کارده‌کات.</string>
+  <string name="clear_effects">پاککردنەوەی کاریگەرییەکان</string>
+  <string name="effect_silly_faces">ڕووخساری گەمژانه‌</string>
+  <string name="effect_background">پاشبنەما</string>
+  <string name="accessibility_shutter_button">دوگمه‌ی خێرایی لێنس</string>
+  <string name="accessibility_menu_button">دوگمەی پێڕست</string>
+  <string name="accessibility_review_thumbnail">تازه‌ترین وێنه‌</string>
+  <string name="accessibility_camera_picker">گۆڕینی پێش و دواوه‌ی کامێرا</string>
+  <string name="accessibility_mode_picker">کامێرا، ڤیدیۆ یان هەڵبژێرەری پانۆراما</string>
+  <string name="accessibility_second_level_indicators">ڕێکخستنی زیاتری سه‌رپه‌رشتی</string>
+  <string name="accessibility_back_to_first_level">داخستنی ڕێکخستنی سه‌رپه‌رشتی</string>
+  <string name="accessibility_zoom_control">سه‌رپه‌رشتی هێنانه‌ پێشه‌وه‌</string>
+  <string name="accessibility_decrement">که‌مکردن%1$s</string>
+  <string name="accessibility_increment">زیادکردن%1$s</string>
+  <string name="accessibility_check_box">%1$s خانه‌ی پیاچوونه‌وه‌</string>
+  <string name="accessibility_switch_to_camera">گۆڕان بۆ وێنە</string>
+  <string name="accessibility_switch_to_video">گۆڕان بۆ ڤیدیۆ</string>
+  <string name="accessibility_switch_to_panorama">گۆڕان بۆ پانۆراما</string>
+  <string name="accessibility_switch_to_new_panorama">گۆڕین بوێ پانۆرامای نوێ</string>
+  <string name="accessibility_switch_to_refocus">گۆڕین بۆ دووباره‌ فۆکس</string>
+  <string name="accessibility_review_cancel">چاوپێداگێڕانەوەی هەڵوەشاندنەوە</string>
+  <string name="accessibility_review_ok">چاوپێداگێڕانەوە کرا</string>
+  <string name="accessibility_review_retake">چاوپێداگێڕانەوەی وێنەگرتنەوە</string>
+  <string name="accessibility_play_video">لێدانی ڤیدیۆ</string>
+  <string name="accessibility_pause_video">ڕاگرتنی ڤیدیۆ</string>
+  <string name="accessibility_reload_video">دووباره‌کردنه‌وه‌ی ڤیدیۆ</string>
+  <string name="accessibility_time_bar">شریتی کاتی لێده‌ری ڤیدیۆ</string>
+  <string name="capital_on">هەڵکردن</string>
+  <string name="capital_off">کوژاندن</string>
+  <string name="pref_video_time_lapse_frame_interval_off">کوژاندن</string>
+  <string name="pref_video_time_lapse_frame_interval_500">٠.٥ چرکه‌</string>
+  <string name="pref_video_time_lapse_frame_interval_1000">١ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_1500">١.٥ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_2000">٢ چرکه‌</string>
+  <string name="pref_video_time_lapse_frame_interval_2500">٢.٥  چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_3000">٣ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_4000">٤ چرکه‌</string>
+  <string name="pref_video_time_lapse_frame_interval_5000">٥ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_6000">٦ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_10000">١٠ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_12000">١٢ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_15000">١٥ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_24000">٢٤ چرکە</string>
+  <string name="pref_video_time_lapse_frame_interval_30000">٠.٥ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_60000">١ خوله‌ک</string>
+  <string name="pref_video_time_lapse_frame_interval_90000">١.٥ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_120000">٢ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_150000">٢.٥ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_180000">٣ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_240000">٤ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_300000">٥ خوله‌ک</string>
+  <string name="pref_video_time_lapse_frame_interval_360000">٦ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_600000">١٠ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_720000">١٢ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_900000">١٥ خوله‌ک</string>
+  <string name="pref_video_time_lapse_frame_interval_1440000">٢٤ خولەک</string>
+  <string name="pref_video_time_lapse_frame_interval_1800000">٠.٥ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_3600000">١ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_5400000">١.٥ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_7200000">٢ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_9000000">٢.٥ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_10800000">٣ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_14400000">٤ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_18000000">٥ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_21600000">٦ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_36000000">١٠ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_43200000">١٢ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_54000000">١٥ کاژێر</string>
+  <string name="pref_video_time_lapse_frame_interval_86400000">٢٤ کاژێر</string>
+  <string name="time_lapse_seconds">چرکە</string>
+  <string name="time_lapse_minutes">خولەک</string>
+  <string name="time_lapse_hours">کاژێر</string>
+  <string name="time_lapse_interval_set">کرا</string>
+  <string name="set_time_interval">دانانی مەودای کات</string>
+  <string name="set_time_interval_help">تایبەتمەندیی تێپەڕینی کات کوژاوەیە. هەڵی بکە بۆ دانانی مەودای کات.</string>
+  <string name="set_timer_help">کات پێوه‌ر کوژاوه‌ته‌وه‌.دایبگیرسێنه‌ ئه‌گه‌ر بۆ ژماردنته‌ پێش گرتنی وێنه‌.</string>
+  <string name="set_duration">دانانی ماوە لە چەند چرکەدا</string>
+  <string name="count_down_title_text">ژماردنی بەرەوژێر تاوەکوو گرتنی وێنە</string>
+  <string name="remember_location_title">شوێنی وێنه‌کانت له‌ یاده‌؟</string>
+  <string name="remember_location_prompt">وێنە و ڤيديۆکانت به شوێنی گرتنه‌کانیانه‌وه‌ پینە بکە. \n\nبەرنامەکانی تر دەتوانن دەست پێ راگەیەنن به‌م زانیارییه‌وه‌ کە له‌گه‌ڵ وێنه‌ پاشه‌که‌وتکراوه‌کانتدایە.</string>
+  <string name="remember_location_no">نا سپاس</string>
+  <string name="remember_location_yes">بەڵێ</string>
+  <string name="menu_camera">کامێرا</string>
+  <string name="menu_search">گه‌ڕان</string>
+  <string name="tab_photos">وێنه‌کان</string>
+  <string name="tab_albums">ئەلبوم</string>
+  <string name="camera_menu_more_label">بەربژاردەی زیاتر</string>
+  <string name="camera_menu_settings_label">ڕێکخستنەکان</string>
+  <plurals name="number_of_photos">
+    <item quantity="one">%1$d وێنه‌</item>
+    <item quantity="other">%1$d وێنه‌</item>
+  </plurals>
+</resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 6ca7e91..dac58a2 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -35,7 +35,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_marginRight">@dimen/setting_popup_right_margin</item>
+        <item name="android:layout_marginEnd">@dimen/setting_popup_right_margin</item>
         <item name="android:visibility">gone</item>
     </style>
     <style name="PopupTitleText">
@@ -45,14 +45,14 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:singleLine">true</item>
         <item name="android:textColor">@color/popup_title_color</item>
-        <item name="android:layout_marginLeft">10dp</item>
-        <item name="android:paddingLeft">16dp</item>
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:paddingStart">16dp</item>
     </style>
     <style name="ViewfinderLabelLayout">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_marginLeft">13dp</item>
-        <item name="android:layout_marginRight">@dimen/indicator_bar_width</item>
+        <item name="android:layout_marginStart">13dp</item>
+        <item name="android:layout_marginEnd">@dimen/indicator_bar_width</item>
         <item name="android:layout_marginBottom">13dp</item>
         <item name="android:layout_marginTop">13dp</item>
     </style>
@@ -67,8 +67,8 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_alignParentRight">true</item>
-        <item name="android:layout_marginRight">@dimen/setting_popup_right_margin</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_marginEnd">@dimen/setting_popup_right_margin</item>
         <item name="android:visibility">gone</item>
     </style>
 
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-lb/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-lb/cm_strings.xml
index dfc7592..d4439ce 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-lb/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Opnamezäit</string>
+</resources>
diff --git a/res/values-lb/codeaurora_strings.xml b/res/values-lb/codeaurora_strings.xml
new file mode 100644
index 0000000..77e27a3
--- /dev/null
+++ b/res/values-lb/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Schrëtt</string>
+  <string name="step_option_desc">Vir- an Zréckspull-Schrëtter upassen</string>
+  <string name="setp_option_three_second">3 Sekonnen</string>
+  <string name="setp_option_six_second">6 Sekonnen</string>
+  <string name="loop">"Widderhuelen"</string>
+  <string name="single">"Eenzel"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Lautsprecher UN</string>
+  <string name="speaker_off">Lautsprecher AUS</string>
+  <string name="speaker_need_headset">Schléis Kopfhörer u fir dës Funktioun ze benotzen.</string>
+  <string name="single_track">"Eenzel Spur"</string>
+  <string name="input_url">"URL aginn"</string>
+  <string name="streaming_settings">"Streamingastellungen"</string>
+  <string name="next">"Weider"</string>
+  <string name="previous">"Zréck"</string>
+  <string name="buffer_size">Tëschespäicher-Gréisst</string>
+  <string name="apn">Preferéierten APN</string>
+  <string name="rtp_min_port">Min. Port</string>
+  <string name="rtp_max_port">Max. Port</string>
+  <string name="set_rtp_min_port">Min. Port festleeën</string>
+  <string name="set_rtp_max_port">Max. Port festleeën</string>
+  <string name="set_buffer_size">Tëschespäichergréisst definéieren</string>
+  <string name="set_apn">Preferéierten APN auswielen</string>
+  <string name="setting">Astellungen</string>
+  <string name="server_timeout_title">"Zäitiwwerschreidung beim Server"</string>
+  <string name="server_timeout_message">"Nees mam Server verbanne fir de Video ofzespillen?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Connectioun feelgeschloen, probéieren nees mat %1$d ze verbannen\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Gëtt ofgespillt</string>
+  <string name="media_controller_connecting">Connectéieren\u2026</string>
+  <string name="bookmark_add">"Lieszeechen dobäisetzen"</string>
+  <string name="bookmark_display">"Lieszeechen uweisen"</string>
+  <string name="bookmark_empty">"Keng Lieszeechen"</string>
+  <string name="bookmark_exist">"Lieszeechen existéiert schonn"</string>
+  <string name="bookmark_add_success">"Lieszeechen dobäigesat"</string>
+  <string name="bookmark_list">"Lieszeechen"</string>
+  <string name="bookmark_title">"Titel"</string>
+  <string name="bookmark_location">"Standuert"</string>
+  <string name="delete_all">"All läschen"</string>
+  <string name="default_title">"Standardtitel"</string>
+  <string name="more_image">Méi Biller</string>
+  <string name="mute_nosupport">Kann net roueg schalten: Video net ënnerstëtzt</string>
+  <string name="map_activity_not_found_err">Et ass keng Kaarten-App installéiert fir d\'Positioun unzeweisen.</string>
+  <string name="bass_boost_strength">Bassunhiewung</string>
+  <string name="virtualizer_strength">3D-Effekt</string>
+  <string name="audio_effects">Toun-Effekter</string>
+  <string name="headset_plug">Schléiss Kopfhörer u fir dës Effekter.</string>
+  <string name="audio_effects_dialog_title">Snapdragon-Audio+</string>
+  <string name="fail_trim">Dëse Video ka leider net geschnidde ginn</string>
+</resources>
diff --git a/res/values-lb/filtershow_strings.xml b/res/values-lb/filtershow_strings.xml
new file mode 100644
index 0000000..696ba46
--- /dev/null
+++ b/res/values-lb/filtershow_strings.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <string name="title_activity_filter_show">Fotoediteur</string>
+  <string name="cannot_load_image">D\'Bild kann net geluede ginn!</string>
+  <string name="cannot_edit_original">Original kann net geännert ginn</string>
+  <string name="setting_wallpaper">Als Hannergrondbild setzen</string>
+  <string name="download_failure">Konnt d\'Foto net eroflueden. D\'Netzwierk ass net disponibel.</string>
+  <string name="original">Original</string>
+  <string name="borders" msgid="4461692156695893616">Rumm</string>
+  <string name="custom_border">Personaliséiert</string>
+  <string name="filtershow_undo">Réckgängeg maachen</string>
+  <string name="filtershow_redo">Widderhuelen</string>
+  <string name="show_imagestate_panel">Applizéiert Effekter uweisen</string>
+  <string name="hide_imagestate_panel">Applizéiert Effekter verstoppen</string>
+  <string name="export_image">Exportéieren</string>
+  <string name="print_image">Drécken</string>
+  <string name="export_flattened">Plattgemaacht Bild exportéieren</string>
+  <string name="select_output_settings">Das exportéiert Bild gëtt als Kopie gespäichert, ouni Historique.</string>
+  <string name="quality">Qualitéit</string>
+  <string name="size">Gréisst</string>
+  <string name="x">x</string>
+  <string name="menu_settings">Astellungen</string>
+  <string name="unsaved">Et ginn ongespäichert Ännerungen un dësem Bild.</string>
+  <string name="save_before_exit">Wëlls du d\'Bild virum Zoumaache späicheren?</string>
+  <string name="save_and_exit">Späicheren an zoumaachen</string>
+  <string name="save_and_processing">Bild mat voller Opléisung gëtt beaarbecht...</string>
+  <string name="exit">Verloossen</string>
+  <string name="history">Historique</string>
+  <string name="reset">Zrécksetzen</string>
+  <string name="history_original">@string/original</string>
+  <string name="imageState">Applizéiert Effekter</string>
+  <string name="compare_original">Vergläichen</string>
+  <string name="apply_effect">Applizéieren</string>
+  <string name="reset_effect">Zrécksetzen</string>
+  <string name="aspect">Aspekt</string>
+  <string name="aspect1to1_effect">1:1</string>
+  <string name="aspect4to3_effect">4:3</string>
+  <string name="aspect3to4_effect">3:4</string>
+  <string name="aspect4to6_effect">4:6</string>
+  <string name="aspect5to7_effect">5:7</string>
+  <string name="aspect7to5_effect">7:5</string>
+  <string name="aspect9to16_effect">16:9</string>
+  <string name="aspectNone_effect">Keen</string>
+  <string name="Fixed">Fixéiert</string>
+  <string name="tinyplanet">Klenge Planéit</string>
+  <string name="exposure" msgid="1229093066434614811">Beliichtung</string>
+  <string name="sharpness">Schäerft</string>
+  <string name="contrast">Kontrast</string>
+  <string name="vibrance">Intensitéit</string>
+  <string name="saturation">Sättegung</string>
+  <string name="bwfilter">SW-Filter</string>
+  <string name="wbalance">Automatesch Faarwen</string>
+  <string name="hue">Faarftoun</string>
+  <string name="shadow_recovery">Déiften</string>
+  <string name="highlight_recovery">Héichten</string>
+  <string name="curvesRGB">Kurven</string>
+  <string name="vignette">Vignettéierung</string>
+  <string name="vignette_main">Vignettéierung</string>
+  <string name="vignette_exposure">Beliichtung</string>
+  <string name="vignette_saturation">Sättegung</string>
+  <string name="vignette_contrast">Kontrast</string>
+  <string name="vignette_falloff">Luuchtoffall</string>
+  <string name="redeye">Rout Aen</string>
+  <string name="imageDraw">Zeechnen</string>
+  <string name="straighten" msgid="5217801513491493491">Ausriichten</string>
+  <string name="crop" msgid="5584000454518174632">Schneiden</string>
+  <string name="rotate" msgid="460017689320955494">Rotéieren</string>
+  <string name="mirror">Spiggelen</string>
+  <string name="negative">Negativ</string>
+  <string name="none" msgid="3601545724573307541">Keen</string>
+  <string name="edge">Kanten</string>
+  <string name="kmeans">Posteriséiert</string>
+  <string name="downsample">Verklengeren</string>
+  <string name="grad">Ofgestuft</string>
+  <string name="editor_grad_brightness">Hellegkeet</string>
+  <string name="editor_grad_contrast">Kontrast</string>
+  <string name="editor_grad_saturation">Sättegung</string>
+  <string name="editor_chan_sat_main">Haapt</string>
+  <string name="editor_chan_sat_red">Rout</string>
+  <string name="editor_chan_sat_yellow">Giel</string>
+  <string name="editor_chan_sat_green">Gréng</string>
+  <string name="editor_chan_sat_cyan">Cyan</string>
+  <string name="editor_chan_sat_blue">Blo</string>
+  <string name="editor_chan_sat_magenta">Magenta</string>
+  <string name="editor_grad_style">Stil</string>
+  <string name="editor_grad_new">nei</string>
+  <string name="curves_channel_rgb">RGB</string>
+  <string name="curves_channel_red">Rout</string>
+  <string name="curves_channel_green">Gréng</string>
+  <string name="curves_channel_blue">Blo</string>
+  <string name="draw_style">Stil</string>
+  <string name="draw_size">Gréisst</string>
+  <string name="draw_hue">Faarftoun</string>
+  <string name="draw_saturation">Sättegung</string>
+  <string name="draw_value">Hellegkeet</string>
+  <string name="draw_color">Faarf</string>
+  <string name="draw_style_line">Linnen</string>
+  <string name="draw_style_brush_spatter">Filzstëft</string>
+  <string name="draw_style_brush_marker">Sprëtzer</string>
+  <string name="draw_clear">Eidel maachen</string>
+  <string name="color_border_size">Randstäerkt</string>
+  <string name="color_border_corner_size">Eckegréisst</string>
+  <string name="color_border_color">Faarf</string>
+  <string name="color_border_clear">Eidel maachen</string>
+  <string name="color_pick_select">Eege Faarf auswielen</string>
+  <string name="color_pick_title">Faarf auswielen</string>
+  <string name="draw_size_title">Gréisst auswielen</string>
+  <string name="draw_size_accept">OK</string>
+  <string name="state_panel_original">Original</string>
+  <string name="state_panel_result">Resultat</string>
+  <string name="filtershow_notification_label">Bild gëtt gespäichert</string>
+  <string name="filtershow_notification_message">Gëtt beaarbecht...</string>
+  <string name="filtershow_save_preset">Aktuell Virastellung späicheren</string>
+  <string name="filtershow_manage_preset">Benotzervirastellungen</string>
+  <string name="filtershow_new_preset">Nei Virastellung</string>
+  <string name="filtershow_preset_name">Virastellungsnumm</string>
+  <string name="filtershow_show_info_panel">Informatioun</string>
+  <string name="filtershow_show_info_panel_name">Bildnumm</string>
+  <string name="filtershow_show_info_panel_size">Bildgréisst</string>
+  <string name="filtershow_show_info_panel_histogram">Histogramm</string>
+  <string name="filtershow_show_info_panel_exif">EXIF-Daten</string>
+  <string name="filtershow_add_button_looks">Virastellung</string>
+  <string name="filtershow_add_button_versions">Versioun</string>
+  <string name="filtershow_version_original">Original</string>
+  <string name="filtershow_version_current">Aktuell</string>
+  <string name="filtershow_exif_model">Modell</string>
+  <string name="filtershow_exif_aperture">Blend</string>
+  <string name="filtershow_exif_focal_length">Brennwäit</string>
+  <string name="filtershow_exif_iso">ISO</string>
+  <string name="filtershow_exif_subject_distance">Distanz zum Sujet</string>
+  <string name="filtershow_exif_date">Ophueldatum</string>
+  <string name="filtershow_exif_f_stop">Blendenzuel</string>
+  <string name="filtershow_exif_exposure_time">Beliichtungszäit</string>
+  <string name="filtershow_exif_copyright">Auteursrecht</string>
+</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
new file mode 100644
index 0000000..334596e
--- /dev/null
+++ b/res/values-lb/strings.xml
@@ -0,0 +1,442 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Galerie</string>
+  <string name="gadget_title">Billerrumm</string>
+  <string name="details_ms">%1$02d:%2$02d</string>
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
+  <string name="movie_view_label">Videoofspiller</string>
+  <string name="loading_video">Video gëtt gelueden\u2026</string>
+  <string name="loading_image">Bild gëtt gelueden\u2026</string>
+  <string name="loading_account">Kont gëtt gelueden\u2026</string>
+  <string name="resume_playing_title">Video weiderspillen</string>
+  <string name="resume_playing_message">Bei %s weider ofspillen?</string>
+  <string name="resume_playing_resume">Weider ofspillen</string>
+  <string name="loading">Gëtt gelueden\u2026</string>
+  <string name="fail_to_load">Konnt net lueden</string>
+  <string name="fail_to_load_image">D\'Bild konnt net geluede ginn</string>
+  <string name="no_thumbnail">Kee Virschaubild</string>
+  <string name="resume_playing_restart">Vu vir ufänken</string>
+  <string name="crop_save_text">OK</string>
+  <string name="ok">OK</string>
+  <string name="multiface_crop_help">E Gesiicht drécke fir unzefänken.</string>
+  <string name="saving_image">Bild gëtt gespäichert\u2026</string>
+  <string name="filtershow_saving_image">D\'Bild gëtt an den Album <xliff:g id="album_name">%1$s</xliff:g> gespäichert\u2026</string>
+  <string name="save_error">Konnt dat geschniddent Bild net späicheren.</string>
+  <string name="crop_label">Bild schneiden</string>
+  <string name="trim_label">Video kierzen</string>
+  <string name="select_image">Foto auswielen</string>
+  <string name="select_video">Video auswielen</string>
+  <string name="select_item">Element auswielen</string>
+  <string name="select_album">Album auswielen</string>
+  <string name="select_group">Grupp auswielen</string>
+  <string name="set_image">Bild setzen als</string>
+  <string name="set_wallpaper">Hannergrondbild setzen</string>
+  <string name="wallpaper">Hannergrondbild gëtt gesat\u2026</string>
+  <string name="camera_setas_wallpaper">Hannergrondbild</string>
+  <string name="delete">Läschen</string>
+  <plurals name="delete_selection">
+    <item quantity="one">Ausgewielt Element läschen?</item>
+    <item quantity="other">Ausgewielt Elementer läschen?</item>
+  </plurals>
+  <string name="confirm">Bestätegen</string>
+  <string name="cancel">Ofbriechen</string>
+  <string name="share">Deelen</string>
+  <string name="share_panorama">Panorama deelen</string>
+  <string name="share_as_photo">Als Foto deelen</string>
+  <string name="deleted">Geläscht</string>
+  <string name="undo">RÉCKGÄNGEG</string>
+  <string name="select_all">All auswielen</string>
+  <string name="deselect_all">Auswiel ophiewen</string>
+  <string name="slideshow">Diashow</string>
+  <string name="details">Detailer</string>
+  <string name="details_title">%1$d / %2$d Elementer:</string>
+  <string name="close">Zoumaachen</string>
+  <string name="switch_to_camera">Op d\'Kamera wiesselen</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d ausgewielt</item>
+    <item quantity="other">%1$d ausgewielt</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d ausgewielt</item>
+    <item quantity="other">%1$d ausgewielt</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d ausgewielt</item>
+    <item quantity="other">%1$d ausgewielt</item>
+  </plurals>
+  <string name="show_on_map">Op der Kaart uweisen</string>
+  <string name="rotate_left">Lénks rotéieren</string>
+  <string name="rotate_right">Riets rotéieren</string>
+  <string name="no_such_item">Konnt d\'Element net fannen.</string>
+  <string name="edit">Beaarbechten</string>
+  <string name="simple_edit">Einfach Beaarbechtung</string>
+  <string name="process_caching_requests">Tëschespäicherungsufroe gi veraarbecht</string>
+  <string name="caching_label">Tëschespäicherung leeft\u2026</string>
+  <string name="crop_action">Schneiden</string>
+  <string name="trim_action">Trimmen</string>
+  <string name="mute_action">Roueg</string>
+  <string name="set_as">Setzen als</string>
+  <string name="video_mute_err">Kann de Video net roueg schalten.</string>
+  <string name="video_err">Video kann net ofgespillt ginn.</string>
+  <string name="group_by_location">No Plaz</string>
+  <string name="group_by_time">No Zäit</string>
+  <string name="group_by_tags">No Etiketten</string>
+  <string name="group_by_faces">No Leit</string>
+  <string name="group_by_album">No Album</string>
+  <string name="group_by_size">No Gréisst</string>
+  <string name="untagged">Ouni Etikett</string>
+  <string name="no_location">Keng Plaz</string>
+  <string name="no_faces">Keng Gesiichter</string>
+  <string name="no_connectivity">E puer Plaze konnte wéinst Netzwierkproblemer net identifizéiert ginn.</string>
+  <string name="sync_album_error">Konnt d\'Fotoen aus dësem Album net eroflueden. Probéier méi spéit nees.</string>
+  <string name="show_images_only">Just Biller</string>
+  <string name="show_videos_only">Just Videoen</string>
+  <string name="show_all">Biller a Videoen</string>
+  <string name="appwidget_title">Fotogalerie</string>
+  <string name="appwidget_empty_text">Keng Fotoen.</string>
+  <string name="crop_saved">Geschniddent Bild gespäichert ënner <xliff:g id="folder_name">%s</xliff:g>.</string>
+  <string name="no_albums_alert">Keng Alben disponibel.</string>
+  <string name="empty_album">O Biller/Videoen disponibel.</string>
+  <string name="picasa_posts">Posts</string>
+  <string name="make_available_offline">Offline disponibel maachen</string>
+  <string name="sync_picasa_albums">Opfrëschen</string>
+  <string name="done">Fäerdeg</string>
+  <string name="sequence_in_set">%1$d / %2$d Elementer:</string>
+  <string name="title">Titel</string>
+  <string name="description">Beschreiwung</string>
+  <string name="time">Zäit</string>
+  <string name="location">Standuert</string>
+  <string name="path">Pad</string>
+  <string name="width">Breet</string>
+  <string name="height">Héicht</string>
+  <string name="orientation">Orientéierung</string>
+  <string name="duration">Dauer</string>
+  <string name="mimetype">MIME-Typ</string>
+  <string name="file_size">Fichiersgréisst</string>
+  <string name="maker">Hiersteller</string>
+  <string name="model">Modell</string>
+  <string name="flash">Blëtz</string>
+  <string name="aperture">Blend</string>
+  <string name="focal_length">Brennwäit</string>
+  <string name="white_balance">Wäissofgläich</string>
+  <string name="exposure_time">Beliichtungszäit</string>
+  <string name="iso">ISO</string>
+  <string name="unit_mm">mm</string>
+  <string name="manual">Manuell</string>
+  <string name="auto">Automatesch</string>
+  <string name="flash_on">Blëtz ausgeléist</string>
+  <string name="flash_off">Kee Blëtz</string>
+  <string name="unknown">Onbekannt</string>
+  <string name="ffx_original">Original</string>
+  <string name="ffx_vintage">Almoudesch</string>
+  <string name="ffx_instant">Direktbild</string>
+  <string name="ffx_bleach">Verbleecht</string>
+  <string name="ffx_blue_crush">Blo</string>
+  <string name="ffx_bw_contrast">S/W</string>
+  <string name="ffx_punch">Punch</string>
+  <string name="ffx_x_process">X Process</string>
+  <string name="ffx_washout">Latte</string>
+  <string name="ffx_washout_color">Litho</string>
+  <plurals name="make_albums_available_offline">
+    <item quantity="one">Den Album gëtt offline disponibel gemaach.</item>
+    <item quantity="other">D\'Albe ginn offline disponibel gemaach.</item>
+  </plurals>
+  <string name="try_to_set_local_album_available_offline">Dëst Element ass lokal gespäichert an och offiline disponibel.</string>
+  <string name="set_label_all_albums">All d\'Alben</string>
+  <string name="set_label_local_albums">Lokal Alben</string>
+  <string name="set_label_mtp_devices">MTP-Apparater</string>
+  <string name="set_label_picasa_albums">Picasa-Alben</string>
+  <string name="free_space_format"><xliff:g id="bytes">%s</xliff:g> fräi</string>
+  <string name="size_below"><xliff:g id="size">%1$s</xliff:g> oder drënner</string>
+  <string name="size_above"><xliff:g id="size">%1$s</xliff:g> oder driwwer</string>
+  <string name="size_between"><xliff:g id="min_size">%1$s</xliff:g> bis <xliff:g id="max_size">%2$s</xliff:g></string>
+  <string name="Import">Importéieren</string>
+  <string name="import_complete">Import ofgeschloss</string>
+  <string name="import_fail">Import feelgeschloen</string>
+  <string name="camera_connected">Kamera connectéiert.</string>
+  <string name="camera_disconnected">Kamera deconnectéiert.</string>
+  <string name="click_import">Hei drécke fir z\'importéieren</string>
+  <string name="widget_type_album">En Album auswielen</string>
+  <string name="widget_type_shuffle">All d\'Biller mëschen</string>
+  <string name="widget_type_photo">E Bild auswielen</string>
+  <string name="widget_type">Biller auswielen</string>
+  <string name="slideshow_dream_name">Diashow</string>
+  <string name="albums">Alben</string>
+  <string name="times">Zäiten</string>
+  <string name="locations">Plazen</string>
+  <string name="people">Leit</string>
+  <string name="tags">Etiketten</string>
+  <string name="group_by">Gruppéieren no</string>
+  <string name="settings">Astellungen</string>
+  <string name="add_account">Kont dobäisetzen</string>
+  <string name="folder_camera">Fotoapparat</string>
+  <string name="folder_download">Erofgelueden</string>
+  <string name="folder_edited_online_photos">Beaarbecht Online-Fotoen</string>
+  <string name="folder_imported">Importéiert</string>
+  <string name="folder_screenshot">Schiermfoto</string>
+  <string name="help">Hëllef</string>
+  <string name="no_external_storage_title">Kee Späicher</string>
+  <string name="no_external_storage">Keen externe Späicher disponibel</string>
+  <string name="switch_photo_filmstrip">Als Filmsträif uweisen</string>
+  <string name="switch_photo_grid">Gitterusiicht</string>
+  <string name="switch_photo_fullscreen">Vollschierm-Usiicht</string>
+  <string name="trimming">Gëtt geschnidden</string>
+  <string name="muting">Toun gëtt ausgeschalt</string>
+  <string name="please_wait">W.e.g. waarden</string>
+  <string name="save_into">De Video gëtt an den Album <xliff:g id="album_name">%1$s</xliff:g> gespäichert\u2026</string>
+  <string name="trim_too_short">Kann net kierzen: den Zilvideo ass ze kuerz</string>
+  <string name="pano_progress_text">Panorama gëtt gerendert</string>
+  <string name="save" msgid="8140440041190264400">Späicheren</string>
+  <string name="ingest_scanning" msgid="2048262851775139720">Inhalt gëtt gescannt...</string>
+  <plurals name="ingest_number_of_items_scanned">
+    <item quantity="one">%1$d Element gescannt</item>
+    <item quantity="other">%1$d Elementer gescannt</item>
+  </plurals>
+  <plurals name="ingest_number_of_items_selected">
+    <item quantity="one">%1$d Element ausgewielt</item>
+    <item quantity="other">%1$d Elementer ausgewielt</item>
+  </plurals>
+  <string name="ingest_sorting" msgid="624687230903648118">Gëtt zortéiert...</string>
+  <string name="ingest_scanning_done">Scannen ofgeschloss</string>
+  <string name="ingest_importing">Gëtt importéiert...</string>
+  <string name="ingest_empty_device">Et ass keen Inhalt op dësem Apparat disponibel deen importéiert ka ginn.</string>
+  <string name="ingest_no_device">Et si keng MTP-Apparater connectéiert</string>
+  <string name="camera_error_title">Kamerafeeler</string>
+  <string name="cannot_connect_camera">Keng Connectioun zur Kamera méiglech.</string>
+  <string name="camera_disabled">D\'Kamera gouf wéinst Sécherheetsriichtlinnen desaktivéiert.</string>
+  <string name="camera_label">Fotoapparat</string>
+  <string name="wait">Waart w.e.g.\u2026</string>
+  <string name="no_storage" product="nosdcard">Bann den USB-Späicher an ier s de d\'Kamera benotz.</string>
+  <string name="no_storage" product="default">Maach eng SD-Kaart dran ier s du d\'Kamera benotzt.</string>
+  <string name="preparing_sd" product="nosdcard">USB-Späicher gëtt preparéiert\u2026</string>
+  <string name="preparing_sd" product="default">SD-Kaart gëtt preparéiert\u2026</string>
+  <string name="access_sd_fail" product="nosdcard">Keen Zougrëff op den USB-Späicher méiglech.</string>
+  <string name="access_sd_fail" product="default">Keen Zougrëff op d\'SD-Kaart méiglech.</string>
+  <string name="review_cancel">OFBRIECHEN</string>
+  <string name="review_ok">FÄERDEG</string>
+  <string name="time_lapse_title">Zäitrafferopnam</string>
+  <string name="pref_camera_id_title">Kamera wielen</string>
+  <string name="pref_camera_id_entry_back">Hannen</string>
+  <string name="pref_camera_id_entry_front">Vir</string>
+  <string name="pref_camera_recordlocation_title">Plaz späicheren</string>
+  <string name="pref_camera_location_label">PLAZ</string>
+  <string name="pref_camera_timer_title">Countdown-Timer</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">1 Sekonn</item>
+    <item quantity="other">%d Sekonnen</item>
+  </plurals>
+  <string name="pref_camera_timer_sound_default">@string/setting_on_value</string>
+  <string name="pref_camera_timer_sound_title">Piipse während dem Countdown</string>
+  <string name="setting_off">Aus</string>
+  <string name="setting_on">Un</string>
+  <string name="pref_video_quality_title">Videoqualitéit</string>
+  <string name="pref_video_quality_entry_high">Héich</string>
+  <string name="pref_video_quality_entry_low">Niddreg</string>
+  <string name="pref_video_time_lapse_frame_interval_title">Zäitraffer</string>
+  <string name="pref_camera_settings_category">Kameraastellungen</string>
+  <string name="pref_camcorder_settings_category">Kameraastellungen</string>
+  <string name="pref_camera_picturesize_title">Fotogréisst</string>
+  <string name="pref_camera_picturesize_entry_13mp">13M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_8mp">8M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_5mp">5M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_4mp">4M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_3mp">3M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_2mp">2M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_2mp_wide">2M Pixelen (16:9)</string>
+  <string name="pref_camera_picturesize_entry_1_3mp">1,3M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_1mp">1M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_vga">VGA</string>
+  <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
+  <string name="pref_camera_focusmode_title">Fokusmodus</string>
+  <string name="pref_camera_focusmode_entry_auto">Automatesch</string>
+  <string name="pref_camera_focusmode_entry_infinity">Onendlech</string>
+  <string name="pref_camera_focusmode_entry_macro">Makro</string>
+  <string name="pref_camera_focusmode_label_auto">AUTO</string>
+  <string name="pref_camera_focusmode_label_infinity">ONENDLECH</string>
+  <string name="pref_camera_focusmode_label_macro">MAKRO</string>
+  <string name="pref_camera_flashmode_title">Blëtzmodus</string>
+  <string name="pref_camera_flashmode_label">BLËTZMODUS</string>
+  <string name="pref_camera_flashmode_entry_auto">Automatesch</string>
+  <string name="pref_camera_flashmode_entry_on">Un</string>
+  <string name="pref_camera_flashmode_entry_off">Aus</string>
+  <string name="pref_camera_flashmode_label_auto">BLËTZ AUTO</string>
+  <string name="pref_camera_flashmode_label_on">BLËTZ UN</string>
+  <string name="pref_camera_flashmode_label_off">BLËTZ AUS</string>
+  <string name="pref_camera_whitebalance_title">Wäissofgläich</string>
+  <string name="pref_camera_whitebalance_label">WÄISSOFGLÄICH</string>
+  <string name="pref_camera_whitebalance_entry_auto">Automatesch</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">Glousluucht</string>
+  <string name="pref_camera_whitebalance_entry_daylight">Dagesliicht</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">Fluoreszent</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">Wollekeg</string>
+  <string name="pref_camera_whitebalance_label_auto">AUTO</string>
+  <string name="pref_camera_whitebalance_label_incandescent">GLOUSLUUCHT</string>
+  <string name="pref_camera_whitebalance_label_daylight">DAGESLIICHT</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESZENT</string>
+  <string name="pref_camera_whitebalance_label_cloudy">WOLLEKEG</string>
+  <string name="pref_camera_scenemode_title">Zeenemodus</string>
+  <string name="pref_camera_scenemode_entry_auto">Automatesch</string>
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
+  <string name="pref_camera_scenemode_entry_action">Aktioun</string>
+  <string name="pref_camera_scenemode_entry_night">Nuecht</string>
+  <string name="pref_camera_scenemode_entry_sunset">Sonnenënnergank</string>
+  <string name="pref_camera_scenemode_entry_party">Party</string>
+  <string name="pref_camera_scenemode_label_auto">KEEN</string>
+  <string name="pref_camera_scenemode_label_action">AKTIOUN</string>
+  <string name="pref_camera_scenemode_label_night">NUECHT</string>
+  <string name="pref_camera_scenemode_label_sunset">SONNENËNNERGANK</string>
+  <string name="pref_camera_scenemode_label_party">PARTY</string>
+  <string name="pref_camera_countdown_label">SANDAUER</string>
+  <string name="pref_camera_countdown_label_off">TIMER AUS</string>
+  <string name="pref_camera_countdown_label_one">1 SEKONN</string>
+  <string name="pref_camera_countdown_label_three">3 SEKONNEN</string>
+  <string name="pref_camera_countdown_label_ten">10 SEKONNEN</string>
+  <string name="pref_camera_countdown_label_fifteen">15 SEKONNEN</string>
+  <string name="not_selectable_in_scene_mode">Dës Astellung kann am Zeenemodus net ausgewielt ginn.</string>
+  <string name="pref_exposure_title">Beliichtung</string>
+  <string name="pref_exposure_label">BELIICHTUNG</string>
+  <string name="pref_camera_hdr_default">@string/setting_off_value</string>
+  <string name="pref_camera_hdr_label">HDR</string>
+  <string name="pref_camera_id_label_back">VIISCHT KAMERA</string>
+  <string name="pref_camera_id_label_front">HËNNESCHT KAMERA</string>
+  <string name="dialog_ok">OK</string>
+  <string name="spaceIsLow_content" product="nosdcard">Däin USB-Späicher huet geschwë keng Plaz méi. Änner d\'Qualitéitsastellungen oder läsch e puer Fotoen oder aner Fichieren.</string>
+  <string name="spaceIsLow_content" product="default">Deng SD-Kaart huet geschwë keng Plaz méi. Änner d\'Qualitéitsastellungen oder läsch e puer Fotoen oder Fichieren.</string>
+  <string name="video_reach_size_limit">Gréisstelimitt ass erreecht.</string>
+  <string name="pano_too_fast_prompt">Ze séier</string>
+  <string name="pano_dialog_prepare_preview">Panorama gëtt preparéiert</string>
+  <string name="pano_dialog_panorama_failed">De Panorama konnt net gespäichert ginn.</string>
+  <string name="pano_dialog_title">Panorama</string>
+  <string name="pano_capture_indication">Panorama gëtt opgeholl</string>
+  <string name="pano_dialog_waiting_previous">Waarden op dee Panorama virdrun</string>
+  <string name="pano_review_saving_indication_str">Gëtt gespäichert\u2026</string>
+  <string name="pano_review_rendering">Panorama gëtt gerendert</string>
+  <string name="tap_to_focus">Drécke fir schaarf ze stellen.</string>
+  <string name="pref_video_effect_title">Effekter</string>
+  <string name="effect_none">Keen</string>
+  <string name="effect_goofy_face_squeeze">Quëtschen</string>
+  <string name="effect_goofy_face_big_eyes">Grouss Aen</string>
+  <string name="effect_goofy_face_big_mouth">Grousse Mond</string>
+  <string name="effect_goofy_face_small_mouth">Klenge Mond</string>
+  <string name="effect_goofy_face_big_nose">Grouss Nues</string>
+  <string name="effect_goofy_face_small_eyes">Kleng Aen</string>
+  <string name="effect_backdropper_space">Am Weltraum</string>
+  <string name="effect_backdropper_sunset">Sonnenënnergank</string>
+  <string name="effect_backdropper_gallery">Däi Video</string>
+  <string name="bg_replacement_message">Lee däin Apparat of.\nTriet e Moment aus dem Siichtberäich.</string>
+  <string name="video_snapshot_hint">Drécke fir Fotoen ze maache während s du films.</string>
+  <string name="video_recording_started">Videoopnam gouf gestart.</string>
+  <string name="video_recording_stopped">Videoopnam gouf opgehalen.</string>
+  <string name="disable_video_snapshot_hint">Video-Schnappschoss ass bei Spezialeffekter desaktivéiert.</string>
+  <string name="clear_effects">Effekter ewechhuelen</string>
+  <string name="effect_silly_faces">LËSCHTEG GESIICHTER</string>
+  <string name="effect_background">HANNERGROND</string>
+  <string name="accessibility_shutter_button">Ausléisknäppchen</string>
+  <string name="accessibility_menu_button">Menü-Knäppchen</string>
+  <string name="accessibility_review_thumbnail">Rezentst Foto</string>
+  <string name="accessibility_camera_picker">Tëscht de Kamerae vir an hanne wiesselen</string>
+  <string name="accessibility_mode_picker">Auswiel fir Fotoapparat, Video oder Panorama</string>
+  <string name="accessibility_second_level_indicators">Weider Astellungen</string>
+  <string name="accessibility_back_to_first_level">Astellungen zoumaachen</string>
+  <string name="accessibility_zoom_control">Zoomsteierung</string>
+  <string name="accessibility_decrement">%1$s erofsetzen</string>
+  <string name="accessibility_increment">%1$s eropsetzen</string>
+  <string name="accessibility_check_box">%1$s Ukräizfeld</string>
+  <string name="accessibility_switch_to_camera">Op de Foto-Modus wiesselen</string>
+  <string name="accessibility_switch_to_video">Op de Video-Modus wiesselen</string>
+  <string name="accessibility_switch_to_panorama">Op de Panorama-Modus wiesselen</string>
+  <string name="accessibility_switch_to_new_panorama">Bei den neie Panorama wiesselen</string>
+  <string name="accessibility_switch_to_refocus">Bei d\'Auswiel vun engem neie Fokus wiesselen</string>
+  <string name="accessibility_review_cancel">Iwwerpréiwung ofbriechen</string>
+  <string name="accessibility_review_ok">Iwwerpréiwung ofgeschloss</string>
+  <string name="accessibility_review_retake">Iwwerpréiwung - Nei Ophuelen</string>
+  <string name="accessibility_play_video">Video ofspillen</string>
+  <string name="accessibility_pause_video">Video pauséieren</string>
+  <string name="accessibility_reload_video">Video nei lueden</string>
+  <string name="accessibility_time_bar">Zäitlinn vum Videoofspiller</string>
+  <string name="capital_on">UN</string>
+  <string name="capital_off">AUS</string>
+  <string name="pref_video_time_lapse_frame_interval_off">Aus</string>
+  <string name="pref_video_time_lapse_frame_interval_500">0,5 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_1000">1 Sekonn</string>
+  <string name="pref_video_time_lapse_frame_interval_1500">1,5 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_2000">2 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_2500">2,5 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_3000">3 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_4000">4 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_5000">5 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_6000">6 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_10000">10 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_12000">12 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_15000">15 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_24000">24 Sekonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_30000">0,5 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_60000">1 Minutt</string>
+  <string name="pref_video_time_lapse_frame_interval_90000">1,5 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_120000">2 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_150000">2,5 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_180000">3 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_240000">4 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_300000">5 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_360000">6 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_600000">10 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_720000">12 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_900000">15 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 Minutten</string>
+  <string name="pref_video_time_lapse_frame_interval_1800000">0,5 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 Stonn</string>
+  <string name="pref_video_time_lapse_frame_interval_5400000">1,5 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_9000000">2,5 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 Stonnen</string>
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 Stonnen</string>
+  <string name="time_lapse_seconds">Sekonnen</string>
+  <string name="time_lapse_minutes">Minutten</string>
+  <string name="time_lapse_hours">Stonnen</string>
+  <string name="time_lapse_interval_set">Fäerdeg</string>
+  <string name="set_time_interval">Zäitintervall setzen</string>
+  <string name="set_time_interval_help">Zäitrafferfunktioun ass aus. Maach s\'u fir den Zäitintervall ze setzen.</string>
+  <string name="set_timer_help">D\'Sandauer ass aus. Schalt s\'u fir erofzezielen ier eng Foto gemaach gëtt.</string>
+  <string name="set_duration">Dauer a Sekonne festleeën</string>
+  <string name="count_down_title_text">Countdown fir eng Foto ze schéissen</string>
+  <string name="remember_location_title">De Fotostanduert späicheren?</string>
+  <string name="remember_location_prompt">Fotoen a Videoe mam Standuert späichere wou s\'opgeholl gi sinn.\n\nAner Appe kënnen zesumme mat de gespäicherte Biller op dës Informatioun zougräifen.</string>
+  <string name="remember_location_no">Nee Merci</string>
+  <string name="remember_location_yes">Jo</string>
+  <string name="menu_camera">Fotoapparat</string>
+  <string name="menu_search">Sichen</string>
+  <string name="tab_photos">Fotoen</string>
+  <string name="tab_albums">Alben</string>
+  <string name="camera_menu_more_label">MÉI OPTIOUNEN</string>
+  <string name="camera_menu_settings_label">ASTELLUNGEN</string>
+  <plurals name="number_of_photos">
+    <item quantity="one">%1$d Foto</item>
+    <item quantity="other">%1$d Fotoen</item>
+  </plurals>
+  <string name="can_not_trim">Just MP4 an 3GP-Fichiere kënne geschnidde ginn</string>
+  <string name="text_makeup_whiten">Wäiss maachen</string>
+  <string name="text_makeup_Soften">Mëll maachen</string>
+  <string name="text_makeup_trimface">Gesiicht schneiden</string>
+  <string name="text_makeup_bigeye">Déck Aen</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-lt/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-lt/cm_strings.xml
index dfc7592..8d6ff9c 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-lt/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Įrašo laikas</string>
+</resources>
diff --git a/res/values-lt/codeaurora_strings.xml b/res/values-lt/codeaurora_strings.xml
new file mode 100644
index 0000000..bb8db8a
--- /dev/null
+++ b/res/values-lt/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Žingsnis</string>
+  <string name="step_option_desc">Tinkinti greito prasukimo / atsukimo žingsnį</string>
+  <string name="setp_option_three_second">3 sek.</string>
+  <string name="setp_option_six_second">6 sek.</string>
+  <string name="loop">"Ciklas"</string>
+  <string name="single">"Vientisas"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Garsiakalbis ĮJUNGTAS</string>
+  <string name="speaker_off">Garsiakalbis IŠJUNGTAS</string>
+  <string name="speaker_need_headset">Prijunkite ausines, kad naudotumėtes šia funkcija.</string>
+  <string name="single_track">"Vienas takelis"</string>
+  <string name="input_url">"Įveskite URL"</string>
+  <string name="streaming_settings">"Srautinių transliacijų nustatymai"</string>
+  <string name="next">"Kitas"</string>
+  <string name="previous">"Ankstesnis"</string>
+  <string name="buffer_size">Buferio dydis</string>
+  <string name="apn">Pageidaujamas APN</string>
+  <string name="rtp_min_port">Mažiausias prievadas</string>
+  <string name="rtp_max_port">Didžiausias prievadas</string>
+  <string name="set_rtp_min_port">Nustatyti mažiausią prievadą</string>
+  <string name="set_rtp_max_port">Nustatyti didžiausią prievadą</string>
+  <string name="set_buffer_size">Nustatyti buferio dydį</string>
+  <string name="set_apn">Pasirinkti pageidaujamą APN</string>
+  <string name="setting">Nustatymai</string>
+  <string name="server_timeout_title">"Serverio skirtasis laikas"</string>
+  <string name="server_timeout_message">"Prisijungti prie serverio, kad paleisti vaizdo įrašą?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Prisijungimas nepavyko, bandoma prisijungti prie %1$d\u2026"</string>
+  <string name="media_controller_live">Tiesiogiai</string>
+  <string name="media_controller_playing">Leidžiama</string>
+  <string name="media_controller_connecting">Jungiamasi\u2026</string>
+  <string name="bookmark_add">"Pridėti žymę"</string>
+  <string name="bookmark_display">"Rodyti žymes"</string>
+  <string name="bookmark_empty">"Žymių nėra"</string>
+  <string name="bookmark_exist">"Žymė jau egzistuoja"</string>
+  <string name="bookmark_add_success">"Žymė pridėta"</string>
+  <string name="bookmark_list">"Žymės"</string>
+  <string name="bookmark_title">"Pavadinimas"</string>
+  <string name="bookmark_location">"Vietovė"</string>
+  <string name="delete_all">"Ištrinti visas"</string>
+  <string name="default_title">"Numatytasis pavadinimas"</string>
+  <string name="more_image">Daugiau vaizdų</string>
+  <string name="mute_nosupport">Negalima nutildyti: vaizdo įrašas nepalaikomas</string>
+  <string name="map_activity_not_found_err">Nėra įdiegtos žemėlapių programos tam, kad parodyti vietovę.</string>
+  <string name="bass_boost_strength">Žemų tonų išryškinimas</string>
+  <string name="virtualizer_strength">3D efektas</string>
+  <string name="audio_effects">Garso efektai</string>
+  <string name="headset_plug">Prijunkite ausines dėl šių efektų.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Atsiprašome, šis vaizdo įrašas negali būti apkarpytas</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-lv/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-lv/cm_strings.xml
index dfc7592..54f3d5c 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-lv/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Ieraksta laiks</string>
+</resources>
diff --git a/res/values-lv/codeaurora_strings.xml b/res/values-lv/codeaurora_strings.xml
new file mode 100644
index 0000000..70cf9af
--- /dev/null
+++ b/res/values-lv/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Solis</string>
+  <string name="step_option_desc">Pielāgot ātro pārtīšanu turp/atpakaļ</string>
+  <string name="setp_option_three_second">3 sekundes</string>
+  <string name="setp_option_six_second">6 sekundes</string>
+  <string name="loop">"Cilpa"</string>
+  <string name="single">"Viens"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Skaļrunis ieslēgts</string>
+  <string name="speaker_off">Skaļrunis izslēgts</string>
+  <string name="speaker_need_headset">Lai lietotu šo iespēju, pievienojiet austiņas.</string>
+  <string name="single_track">"Viens kanāls"</string>
+  <string name="input_url">"Ievadiet URL"</string>
+  <string name="streaming_settings">"Straumēšanas iestatījumi"</string>
+  <string name="next">"Nākamais"</string>
+  <string name="previous">"Iepriekšējais"</string>
+  <string name="buffer_size">Bufera lielums</string>
+  <string name="apn">Vēlamais APN</string>
+  <string name="rtp_min_port">Min. ports</string>
+  <string name="rtp_max_port">Maks. ports</string>
+  <string name="set_rtp_min_port">Iestatīt min. portu</string>
+  <string name="set_rtp_max_port">Iestatīt maks. portu</string>
+  <string name="set_buffer_size">Iestatīt bufera lielumu</string>
+  <string name="set_apn">Izvēlieties vēlamo APN</string>
+  <string name="setting">Iestatījumi</string>
+  <string name="server_timeout_title">"Servera noildze"</string>
+  <string name="server_timeout_message">"Pārsavienoties ar serveri, lai atskaņotu video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Savienojus neizdevās, mēģinot pieslēgties %1$d\u2026"</string>
+  <string name="media_controller_live">Dzīvajā</string>
+  <string name="media_controller_playing">Spēlē</string>
+  <string name="media_controller_connecting">Savienojas\u2026</string>
+  <string name="bookmark_add">"Pievienot grāmatzīmi"</string>
+  <string name="bookmark_display">"Rādīt grāmatzīmes"</string>
+  <string name="bookmark_empty">"Nav grāmatzīmju"</string>
+  <string name="bookmark_exist">"Grāmatzīme jau pastāv"</string>
+  <string name="bookmark_add_success">"Grāmatzīme pievienota"</string>
+  <string name="bookmark_list">"Grāmatzīmes"</string>
+  <string name="bookmark_title">"Virsraksts"</string>
+  <string name="bookmark_location">"Atrašanās vieta"</string>
+  <string name="delete_all">"Dzēst visu"</string>
+  <string name="default_title">"Noklusētais virsraksts"</string>
+  <string name="more_image">Vairāk attēlu</string>
+  <string name="mute_nosupport">Nevar atslēgt skaņu: video nav atbalstīts</string>
+  <string name="map_activity_not_found_err">Atrašanās vietu nevar parādīt, jo nav uzstādīta kartes lietotne.</string>
+  <string name="bass_boost_strength">Basu pastiprināšana</string>
+  <string name="virtualizer_strength">3D efekts</string>
+  <string name="audio_effects">Audio efekti</string>
+  <string name="headset_plug">Šo efekte lietošanai jāpievieno austiņas.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Atvainojiet, šo video failu nevar apgriezt</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-nb/cm_strings.xml
similarity index 70%
rename from res/drawable/filtershow_tiled_background.xml
rename to res/values-nb/cm_strings.xml
index dfc7592..5c7e5c7 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Opptakstid</string>
+</resources>
diff --git a/res/values-nb/codeaurora_strings.xml b/res/values-nb/codeaurora_strings.xml
new file mode 100644
index 0000000..8c81861
--- /dev/null
+++ b/res/values-nb/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Steg</string>
+  <string name="step_option_desc">TIlpassing av spoling frem/tilbake</string>
+  <string name="setp_option_three_second">3 sekunder</string>
+  <string name="setp_option_six_second">6 sekunder</string>
+  <string name="loop">"Sløyfe"</string>
+  <string name="single">"Enkel"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Høytaler PÅ</string>
+  <string name="speaker_off">Høytaler AV</string>
+  <string name="speaker_need_headset">Plugg i hodetelefoner for å bruke denne funksjonen.</string>
+  <string name="single_track">"Enkelt spor"</string>
+  <string name="input_url">"Angi URL-adressen"</string>
+  <string name="streaming_settings">"Streaming innstillinger"</string>
+  <string name="next">"Neste"</string>
+  <string name="previous">"Forrige"</string>
+  <string name="buffer_size">Buffer Størrelse</string>
+  <string name="apn">Foretrukket APN</string>
+  <string name="rtp_min_port">Min port</string>
+  <string name="rtp_max_port">Max port</string>
+  <string name="set_rtp_min_port">Angi min port</string>
+  <string name="set_rtp_max_port">Angi maks port</string>
+  <string name="set_buffer_size">Angi størrelse på hurtigbuffer</string>
+  <string name="set_apn">Velg foretrukket APN</string>
+  <string name="setting">Innstillinger</string>
+  <string name="server_timeout_title">"Tidsavbrudd for serveren"</string>
+  <string name="server_timeout_message">"Koble til serveren på nytt for å spille av videoen?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Tilkoblingen mislyktes, prøver å koble til %1$d\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Spiller</string>
+  <string name="media_controller_connecting">Kobler til\u2026</string>
+  <string name="bookmark_add">"Legg til bokmerke"</string>
+  <string name="bookmark_display">"Vis bokmerker"</string>
+  <string name="bookmark_empty">"Ingen bokmerker"</string>
+  <string name="bookmark_exist">"Bokmerket finnes allerede"</string>
+  <string name="bookmark_add_success">"Bokmerke lagt til"</string>
+  <string name="bookmark_list">"Bokmerker"</string>
+  <string name="bookmark_title">"Tittel"</string>
+  <string name="bookmark_location">"Posisjon"</string>
+  <string name="delete_all">"Slett alle"</string>
+  <string name="default_title">"Standardtittel"</string>
+  <string name="more_image">Flere bilder</string>
+  <string name="mute_nosupport">Kan ikke slå av lyd: videoen støttes ikke</string>
+  <string name="map_activity_not_found_err">Det er ingen kart app installert for å vise plasseringen.</string>
+  <string name="bass_boost_strength">Bassforsterkning</string>
+  <string name="virtualizer_strength">3D effekt</string>
+  <string name="audio_effects">Lydeffekter</string>
+  <string name="headset_plug">Plugg inn hodetelefoner for effekter.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio +</string>
+  <string name="fail_trim">Beklager, denne videofilen kan ikke trimmes</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-nl/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-nl/cm_strings.xml
index dfc7592..f317f23 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tijd van opname</string>
+</resources>
diff --git a/res/values-nl/codeaurora_strings.xml b/res/values-nl/codeaurora_strings.xml
new file mode 100644
index 0000000..8264497
--- /dev/null
+++ b/res/values-nl/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Stap</string>
+  <string name="step_option_desc">Stapgrootte vooruitspoelen/terugspoelen aanpassen</string>
+  <string name="setp_option_three_second">3 seconden</string>
+  <string name="setp_option_six_second">6 seconden</string>
+  <string name="loop">"Herhalen"</string>
+  <string name="single">"Enkel"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Luidspreker AAN</string>
+  <string name="speaker_off">Luidspreker UIT</string>
+  <string name="speaker_need_headset">Sluit een koptelefoon aan om deze functie te gebruiken.</string>
+  <string name="single_track">"Enkel nummer"</string>
+  <string name="input_url">"URL invoeren"</string>
+  <string name="streaming_settings">"Instellingen voor streaming"</string>
+  <string name="next">"Volgende"</string>
+  <string name="previous">"Vorige"</string>
+  <string name="buffer_size">Buffergrootte</string>
+  <string name="apn">Voorkeurs-APN</string>
+  <string name="rtp_min_port">Min. poort</string>
+  <string name="rtp_max_port">Max. poort</string>
+  <string name="set_rtp_min_port">Minimale poort instellen</string>
+  <string name="set_rtp_max_port">Maximale poort instellen</string>
+  <string name="set_buffer_size">Buffergrootte instellen</string>
+  <string name="set_apn">Voorkeurs-APN selecteren</string>
+  <string name="setting">Instellingen</string>
+  <string name="server_timeout_title">"Time-out van de server"</string>
+  <string name="server_timeout_message">"Opnieuw verbinding maken met de server om de video af te spelen?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Verbinding mislukt, probeert opnieuw verbinding te maken met %1$d\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Afspelen</string>
+  <string name="media_controller_connecting">Verbinding maken\u2026</string>
+  <string name="bookmark_add">"Favoriet toevoegen"</string>
+  <string name="bookmark_display">"Favorieten weergeven"</string>
+  <string name="bookmark_empty">"Geen favorieten"</string>
+  <string name="bookmark_exist">"Favoriet bestaat al"</string>
+  <string name="bookmark_add_success">"Favoriet toegevoegd"</string>
+  <string name="bookmark_list">"Favorieten"</string>
+  <string name="bookmark_title">"Titel"</string>
+  <string name="bookmark_location">"Locatie"</string>
+  <string name="delete_all">"Alles verwijderen"</string>
+  <string name="default_title">"Standaardtitel"</string>
+  <string name="more_image">Meer afbeeldingen</string>
+  <string name="mute_nosupport">Kan geluid niet dempen: video niet ondersteund</string>
+  <string name="map_activity_not_found_err">Er is geen kaartenapp geïnstalleerd om de locatie weer te geven.</string>
+  <string name="bass_boost_strength">Basversterker</string>
+  <string name="virtualizer_strength">3D-effect</string>
+  <string name="audio_effects">Geluidseffecten</string>
+  <string name="headset_plug">Sluit een koptelefoon aan voor deze effecten.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Kan deze video niet bijsnijden</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-pl/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-pl/cm_strings.xml
index dfc7592..73d9461 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-pl/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Czas nagrania</string>
+</resources>
diff --git a/res/values-pl/codeaurora_strings.xml b/res/values-pl/codeaurora_strings.xml
new file mode 100644
index 0000000..0a5dbbb
--- /dev/null
+++ b/res/values-pl/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Krok</string>
+  <string name="step_option_desc">Dostosuj stopnie przewijania/cofania</string>
+  <string name="setp_option_three_second">3 sekundy</string>
+  <string name="setp_option_six_second">6 sekund</string>
+  <string name="loop">"Pętla"</string>
+  <string name="single">"Pojedynczy"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Głośnik włączony</string>
+  <string name="speaker_off">Głośnik wyłączony</string>
+  <string name="speaker_need_headset">Podłącz słuchawki, aby skorzystać z tej funkcji.</string>
+  <string name="single_track">"Pojedynczy utwór"</string>
+  <string name="input_url">"Wprowadź adres URL"</string>
+  <string name="streaming_settings">"Ustawienia strumieniowania"</string>
+  <string name="next">"Następny"</string>
+  <string name="previous">"Poprzedni"</string>
+  <string name="buffer_size">Rozmiar bufora</string>
+  <string name="apn">Preferowany APN</string>
+  <string name="rtp_min_port">Min port</string>
+  <string name="rtp_max_port">Max port</string>
+  <string name="set_rtp_min_port">Ustaw min port</string>
+  <string name="set_rtp_max_port">Ustaw max port</string>
+  <string name="set_buffer_size">Ustaw rozmiar bufora</string>
+  <string name="set_apn">Wybierz preferowany APN</string>
+  <string name="setting">Ustawienia</string>
+  <string name="server_timeout_title">"Limit czasu serwera"</string>
+  <string name="server_timeout_message">"Połączyć ponownie się z serwerem, aby odtworzyć wideo?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Połączenie nie powiodło się, próba odnowienia połączenia do %1$d\u2026"</string>
+  <string name="media_controller_live">Na żywo</string>
+  <string name="media_controller_playing">Odtwarzanie</string>
+  <string name="media_controller_connecting">Łączenie\u2026</string>
+  <string name="bookmark_add">"Dodaj zakładkę"</string>
+  <string name="bookmark_display">"Pokaż zakładki"</string>
+  <string name="bookmark_empty">"Brak zakładek"</string>
+  <string name="bookmark_exist">"Zakładka już istnieje"</string>
+  <string name="bookmark_add_success">"Dodano zakładkę"</string>
+  <string name="bookmark_list">"Zakładki"</string>
+  <string name="bookmark_title">"Tytuł"</string>
+  <string name="bookmark_location">"Lokalizacja"</string>
+  <string name="delete_all">"Usuń wszystkie"</string>
+  <string name="default_title">"Domyślny tytuł"</string>
+  <string name="more_image">Więcej zdjęć</string>
+  <string name="mute_nosupport">Nie można wyciszyć: film nieobsługiwany</string>
+  <string name="map_activity_not_found_err">Nie ma aplikacji mapy zainstalowanej, aby zobaczyć lokalizację.</string>
+  <string name="bass_boost_strength">Podbicie basu</string>
+  <string name="virtualizer_strength">Efekt 3D</string>
+  <string name="audio_effects">Efekty dźwiękowe</string>
+  <string name="headset_plug">Podłącz słuchawki dla tych efektów.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Niestety, ten plik wideo nie może zostać przycięty</string>
+  <string name="no_permission_for_drm">Wybacz, ale pliki chronione DRM nie mogą być udostępniane</string>
+  <string name="drm_license_info">Informacje o licencji DRM</string>
+</resources>
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
index 46871c6..319b0a6 100644
--- a/res/values-port/styles.xml
+++ b/res/values-port/styles.xml
@@ -37,15 +37,15 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:singleLine">true</item>
         <item name="android:textColor">@color/popup_title_color</item>
-        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginStart">10dp</item>
     </style>
     <style name="ViewfinderLabelLayout">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_marginTop">13dp</item>
         <item name="android:layout_marginBottom">@dimen/indicator_bar_width</item>
-        <item name="android:layout_marginLeft">13dp</item>
-        <item name="android:layout_marginRight">13dp</item>
+        <item name="android:layout_marginStart">13dp</item>
+        <item name="android:layout_marginEnd">13dp</item>
     </style>
     <style name="PanoViewHorizontalBar">
         <item name="android:background">#000000</item>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-pt-rBR/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-pt-rBR/cm_strings.xml
index dfc7592..6c991bb 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tempo de gravação</string>
+</resources>
diff --git a/res/values-pt-rBR/codeaurora_strings.xml b/res/values-pt-rBR/codeaurora_strings.xml
new file mode 100644
index 0000000..10ad72b
--- /dev/null
+++ b/res/values-pt-rBR/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Passo</string>
+  <string name="step_option_desc">Personalizar o avanço/retrocesso rápido</string>
+  <string name="setp_option_three_second">3 segundos</string>
+  <string name="setp_option_six_second">6 segundos</string>
+  <string name="loop">"Repetir"</string>
+  <string name="single">"Único"</string>
+  <string name="stereo">"Estéreo"</string>
+  <string name="speaker_on">Alto-falante ligado</string>
+  <string name="speaker_off">Alto-falante desligado</string>
+  <string name="speaker_need_headset">Conecte fones de ouvido para usar este recurso.</string>
+  <string name="single_track">"Única faixa"</string>
+  <string name="input_url">"Insira a URL"</string>
+  <string name="streaming_settings">"Configurações de streaming"</string>
+  <string name="next">"Próximo"</string>
+  <string name="previous">"Anterior"</string>
+  <string name="buffer_size">Tamanho do buffer</string>
+  <string name="apn">APN preferencial</string>
+  <string name="rtp_min_port">Porta mínima</string>
+  <string name="rtp_max_port">Porta máxima</string>
+  <string name="set_rtp_min_port">Definir a porta mínima</string>
+  <string name="set_rtp_max_port">Definir a porta máxima</string>
+  <string name="set_buffer_size">Definir o tamanho do buffer</string>
+  <string name="set_apn">Selecione a APN preferida</string>
+  <string name="setting">Configurações</string>
+  <string name="server_timeout_title">"Tempo de espera do servidor"</string>
+  <string name="server_timeout_message">"Reconectar ao servidor para reproduzir o vídeo?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Falha na conexão, tentando reconectar ao %1$d\u2026"</string>
+  <string name="media_controller_live">Ao vivo</string>
+  <string name="media_controller_playing">Reproduzindo</string>
+  <string name="media_controller_connecting">Conectando\u2026</string>
+  <string name="bookmark_add">"Adicionar favorito"</string>
+  <string name="bookmark_display">"Visualizar favoritos"</string>
+  <string name="bookmark_empty">"Não há favoritos"</string>
+  <string name="bookmark_exist">"O favorito já existe"</string>
+  <string name="bookmark_add_success">"Favorito adicionado"</string>
+  <string name="bookmark_list">"Favoritos"</string>
+  <string name="bookmark_title">"Título"</string>
+  <string name="bookmark_location">"Localização"</string>
+  <string name="delete_all">"Apagar tudo"</string>
+  <string name="default_title">"Título padrão"</string>
+  <string name="more_image">Mais imagens</string>
+  <string name="mute_nosupport">Impossivel silenciar: vídeo não suportado</string>
+  <string name="map_activity_not_found_err">Não há aplicativo de mapas instalado para mostrar o local.</string>
+  <string name="bass_boost_strength">Ganho de grave</string>
+  <string name="virtualizer_strength">Efeito 3D</string>
+  <string name="audio_effects">Efeitos de áudio</string>
+  <string name="headset_plug">Conecte fones de ouvido para estes efeitos.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Desculpe, o arquivo de vídeo não pode ser cortado</string>
+  <string name="no_permission_for_drm">Desculpe, arquivos protegidos por DRM não podem ser compartilhados</string>
+  <string name="drm_license_info">Informação de licença DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-pt-rPT/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-pt-rPT/cm_strings.xml
index dfc7592..6c991bb 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Tempo de gravação</string>
+</resources>
diff --git a/res/values-pt-rPT/codeaurora_strings.xml b/res/values-pt-rPT/codeaurora_strings.xml
new file mode 100644
index 0000000..0eae84d
--- /dev/null
+++ b/res/values-pt-rPT/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Intervalo</string>
+  <string name="step_option_desc">Personalizar o avanço/retrocesso rápido</string>
+  <string name="setp_option_three_second">3 segundos</string>
+  <string name="setp_option_six_second">6 segundos</string>
+  <string name="loop">"Repetir"</string>
+  <string name="single">"Simples"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Altifalante ligado</string>
+  <string name="speaker_off">Altifalante desligado</string>
+  <string name="speaker_need_headset">Conectar o auricular para usar este recurso.</string>
+  <string name="single_track">"Única faixa"</string>
+  <string name="input_url">"Insira a URL"</string>
+  <string name="streaming_settings">"Definições de transmissão"</string>
+  <string name="next">"Próximo"</string>
+  <string name="previous">"Anterior"</string>
+  <string name="buffer_size">Tamanho do buffer</string>
+  <string name="apn">APN preferida</string>
+  <string name="rtp_min_port">Porta mínima</string>
+  <string name="rtp_max_port">Porta máxima</string>
+  <string name="set_rtp_min_port">Definir a porta mínima</string>
+  <string name="set_rtp_max_port">Definir a porta máxima</string>
+  <string name="set_buffer_size">Definir o tamanho do buffer</string>
+  <string name="set_apn">Selecionar a APN preferida</string>
+  <string name="setting">Definições</string>
+  <string name="server_timeout_title">"Tempo de espera do servidor"</string>
+  <string name="server_timeout_message">"Reconectar ao servidor para reproduzir o vídeo?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Falha na ligação, a tentar reconectar-se a %1$d\u2026"</string>
+  <string name="media_controller_live">Ao vivo</string>
+  <string name="media_controller_playing">A reproduzir</string>
+  <string name="media_controller_connecting">A ligar\u2026</string>
+  <string name="bookmark_add">"Adicionar favorito"</string>
+  <string name="bookmark_display">"Visualizar favoritos"</string>
+  <string name="bookmark_empty">"Sem favoritos"</string>
+  <string name="bookmark_exist">"O favorito já existe"</string>
+  <string name="bookmark_add_success">"Favorito adicionado"</string>
+  <string name="bookmark_list">"Favoritos"</string>
+  <string name="bookmark_title">"Título"</string>
+  <string name="bookmark_location">"Localização"</string>
+  <string name="delete_all">"Apagar tudo"</string>
+  <string name="default_title">"Título padrão"</string>
+  <string name="more_image">Mais imagens</string>
+  <string name="mute_nosupport">Não pode silenciar: vídeo não suportado</string>
+  <string name="map_activity_not_found_err">Não há nenhuma aplicaçação de mapas instalada para mostrar o local.</string>
+  <string name="bass_boost_strength">Aumento dos Baixos</string>
+  <string name="virtualizer_strength">Efeito 3D</string>
+  <string name="audio_effects">Efeitos Áudio</string>
+  <string name="headset_plug">Ligar o auricular para utilizar estes efeitos.</string>
+  <string name="audio_effects_dialog_title">Audio+ Snapdragon</string>
+  <string name="fail_trim">Desculpe , este vídeo não pode ser cortado</string>
+  <string name="no_permission_for_drm">Desculpe, ficheiros protegidos por DRM não podem ser compartilhados</string>
+  <string name="drm_license_info">Informação da licença DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-ro/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-ro/cm_strings.xml
index dfc7592..96313de 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-ro/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Timp de înregistrare</string>
+</resources>
diff --git a/res/values-ro/codeaurora_strings.xml b/res/values-ro/codeaurora_strings.xml
new file mode 100644
index 0000000..82cc71d
--- /dev/null
+++ b/res/values-ro/codeaurora_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Pas</string>
+  <string name="step_option_desc">Personalizează pasul derulării/înaintării rapide</string>
+  <string name="setp_option_three_second">3 secunde</string>
+  <string name="setp_option_six_second">6 secunde</string>
+  <string name="loop">"Buclă"</string>
+  <string name="single">"Singur"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Difuzor pornit</string>
+  <string name="speaker_off">Difuzor oprit</string>
+  <string name="speaker_need_headset">Conectați căștile pentru a utiliza această caracteristică.</string>
+  <string name="single_track">"Linie singulară"</string>
+  <string name="input_url">"Introduceți URL-ul"</string>
+  <string name="streaming_settings">"Setările de streaming"</string>
+  <string name="next">"Următoarea"</string>
+  <string name="previous">"Înapoi"</string>
+  <string name="buffer_size">Dimensiune tampon</string>
+  <string name="apn">APN preferat</string>
+  <string name="rtp_min_port">Port minim</string>
+  <string name="rtp_max_port">Port maxim</string>
+  <string name="set_rtp_min_port">Setează portul minim</string>
+  <string name="set_rtp_max_port">Setează portul maxim</string>
+  <string name="set_buffer_size">Setează dimensiune tampon</string>
+  <string name="set_apn">Selectați APN preferat</string>
+  <string name="setting">Setări</string>
+  <string name="server_timeout_title">"Expirare server"</string>
+  <string name="server_timeout_message">"Reconectați la server pentru a reda video?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Conexiunea a eşuat, încercând să se reconecteze la %1$d\u2026"</string>
+  <string name="media_controller_live">Live</string>
+  <string name="media_controller_playing">Redând</string>
+  <string name="media_controller_connecting">Se conectează\u2026</string>
+  <string name="bookmark_add">"Adaugă semn de carte"</string>
+  <string name="bookmark_display">"Arată semne de carte"</string>
+  <string name="bookmark_empty">"Fără semne de carte"</string>
+  <string name="bookmark_exist">"Semnul de carte există deja"</string>
+  <string name="bookmark_add_success">"Semn de carte adăugat"</string>
+  <string name="bookmark_list">"Semne de carte"</string>
+  <string name="bookmark_title">"Titlu"</string>
+  <string name="bookmark_location">"Locație"</string>
+  <string name="delete_all">"Șterge toate"</string>
+  <string name="default_title">"Titlul implicit"</string>
+  <string name="more_image">Mai multe imagini</string>
+  <string name="mute_nosupport">Nu puteți dezactiva volumul: videoul nu este acceptat</string>
+  <string name="map_activity_not_found_err">Nu există nicio aplicație cu hărți instalată care să arate locația.</string>
+  <string name="bass_boost_strength">Amplificare Bas</string>
+  <string name="virtualizer_strength">Efect 3D</string>
+  <string name="audio_effects">Efecte audio</string>
+  <string name="headset_plug">Conectați căști pentru aceste efecte.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Ne pare rău, acest fișier video nu poate fi tăiat</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-ru/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-ru/cm_strings.xml
index dfc7592..a9cec0a 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Время записи</string>
+</resources>
diff --git a/res/values-ru/codeaurora_strings.xml b/res/values-ru/codeaurora_strings.xml
new file mode 100644
index 0000000..158376f
--- /dev/null
+++ b/res/values-ru/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Шаг перемотки</string>
+  <string name="step_option_desc">Настройка интервала для быстрого просмотра вперёд или назад</string>
+  <string name="setp_option_three_second">3 секунды</string>
+  <string name="setp_option_six_second">6 секунд</string>
+  <string name="loop">"Зациклить"</string>
+  <string name="single">"Однократно"</string>
+  <string name="stereo">"Стерео"</string>
+  <string name="speaker_on">Вкл. динамик</string>
+  <string name="speaker_off">Выкл. динамик</string>
+  <string name="speaker_need_headset">Подключите наушники для использования этой функции.</string>
+  <string name="single_track">"Одна дорожка"</string>
+  <string name="input_url">"Введите URL"</string>
+  <string name="streaming_settings">"Потоковая передача"</string>
+  <string name="next">"След. трек"</string>
+  <string name="previous">"Пред. трек"</string>
+  <string name="buffer_size">Размер буфера</string>
+  <string name="apn">Точка доступа по умолчанию</string>
+  <string name="rtp_min_port">Минимальный порт</string>
+  <string name="rtp_max_port">Максимальный порт</string>
+  <string name="set_rtp_min_port">Установка минимального номера порта</string>
+  <string name="set_rtp_max_port">Установка максимального номера порта</string>
+  <string name="set_buffer_size">Установка размера буфера передачи</string>
+  <string name="set_apn">Предпочтительная точка доступа</string>
+  <string name="setting">Настройки</string>
+  <string name="server_timeout_title">"Тайм-аут сервера"</string>
+  <string name="server_timeout_message">"Переподключиться к серверу для воспроизведения видеофайла?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Сбой связи. Повторное подключение к %1$d\u2026"</string>
+  <string name="media_controller_live">Прямой эфир</string>
+  <string name="media_controller_playing">Воспроизведение</string>
+  <string name="media_controller_connecting">Подключение\u2026</string>
+  <string name="bookmark_add">"Добавить закладку"</string>
+  <string name="bookmark_display">"Показать закладки"</string>
+  <string name="bookmark_empty">"Нет закладок"</string>
+  <string name="bookmark_exist">"Закладка уже существует"</string>
+  <string name="bookmark_add_success">"Закладка добавлена"</string>
+  <string name="bookmark_list">"Закладки"</string>
+  <string name="bookmark_title">"Название"</string>
+  <string name="bookmark_location">"Местоположение"</string>
+  <string name="delete_all">"Удалить все"</string>
+  <string name="default_title">"Заголовок по умолчанию"</string>
+  <string name="more_image">Другие изображения</string>
+  <string name="mute_nosupport">Невозможно отключить звук: видеофайл не поддерживается</string>
+  <string name="map_activity_not_found_err">Приложение для работы с картами не установлено. Показ местоположения невозможен.</string>
+  <string name="bass_boost_strength">Усил. баса</string>
+  <string name="virtualizer_strength">3D-эффект</string>
+  <string name="audio_effects">Аудиоэффекты</string>
+  <string name="headset_plug">Подключите наушники для использования эффектов.</string>
+  <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+  <string name="fail_trim">Данный видеофайл не может быть обрезан</string>
+  <string name="no_permission_for_drm">Отправка защищённых DRM файлов невозможна</string>
+  <string name="drm_license_info">Сведения о лицензии DRM</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-si-rLK/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-si-rLK/cm_strings.xml
index dfc7592..43a849c 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">රෙකෝඩිත වේලාව</string>
+</resources>
diff --git a/res/values-si-rLK/codeaurora_strings.xml b/res/values-si-rLK/codeaurora_strings.xml
new file mode 100644
index 0000000..4d772fb
--- /dev/null
+++ b/res/values-si-rLK/codeaurora_strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="step_option_desc">ශීඝ්‍රව ඉදිරියට/පසුධාවන පියවර රිසිකරණය</string>
+  <string name="loop">"ලූපය"</string>
+  <string name="single">"තනිකඩ"</string>
+  <string name="stereo">"ත්‍රිමාන"</string>
+  <string name="speaker_on">ස්පීකරය සක්‍රීයයි</string>
+  <string name="speaker_off">ස්පීකරය අක්‍රීයයි</string>
+  <string name="speaker_need_headset">මෙම විශේෂාංගය භාවිතයට ඉස් බණුව පේනුගත කරන්න.</string>
+  <string name="single_track">"තනි ඛණ්ඩය"</string>
+  <string name="input_url">"URL ඇතුළත් කරන්න"</string>
+  <string name="streaming_settings">"ප්‍රවාහන සැකසීම්"</string>
+  <string name="next">"ඊළඟ"</string>
+  <string name="previous">"පෙර"</string>
+  <string name="buffer_size">බෆර ප්‍රමාණය</string>
+  <string name="apn">වඩා ලැදි APN ය</string>
+  <string name="rtp_min_port">අවම තොට</string>
+  <string name="rtp_max_port">උපරිම තොට</string>
+  <string name="set_rtp_min_port">අවම තොට සකසන්න</string>
+  <string name="set_rtp_max_port">උපරිම තොට සකසන්න</string>
+  <string name="set_buffer_size">බෆර ප්‍රමාණය සකසන්න</string>
+  <string name="set_apn">වඩා ලැදි APN ය තෝරන්න</string>
+  <string name="setting">සැකසීම්</string>
+  <string name="server_timeout_title">"සේවාදායකය කල්ඉකුත් විය"</string>
+  <string name="server_timeout_message">"වීඩියෝව ධාවනය සඳහා සේවාදායකයට යලි සම්බන්ධ වන්නද?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"සම්බන්ධය අසමත්විය, %1$d වෙත යලි සම්බන්ධවීමට උත්සාහ කරමින්\u2026"</string>
+  <string name="media_controller_live">සජීවී</string>
+  <string name="media_controller_playing">ධාවනය කරමින්</string>
+  <string name="media_controller_connecting">සම්බන්ධ වෙමින්\u2026</string>
+  <string name="bookmark_add">"පොත් යොමුවක් එක් කරන්න"</string>
+  <string name="bookmark_display">"පොත් යොමු පෙන්වන්න"</string>
+  <string name="bookmark_empty">"පොත් යොමු නැත"</string>
+  <string name="bookmark_exist">"පොත් යොමුව දැනටමත් පවතී"</string>
+  <string name="bookmark_add_success">"පොත් යොමුව එක් කෙරුණි"</string>
+  <string name="bookmark_list">"පොත් යොමු"</string>
+  <string name="bookmark_title">"පටබැඳිනාමය"</string>
+  <string name="bookmark_location">"ස්ථානය"</string>
+  <string name="delete_all">"සියල්ල මකන්න"</string>
+  <string name="default_title">"පෙරනිමි පටබැඳිනාමය"</string>
+  <string name="mute_nosupport">නිශ්ශබ්ද කල නොහැක : සහාය නොදක්වන වීඩියෝවකි</string>
+  <string name="bass_boost_strength">බේස් වැඩිවීම</string>
+  <string name="virtualizer_strength">3D බලපෑම</string>
+  <string name="audio_effects">ශ්‍රව්‍ය බලපෑම්</string>
+  <string name="headset_plug">මෙම බලපෑම් සඳහා ඉස් බණුව පේනුගත කරන්න.</string>
+  <string name="audio_effects_dialog_title">Snapdragon ශ්‍රව්‍ය+</string>
+  <string name="fail_trim">කනගාටුයි, මෙම වීඩියෝ ගොනුව කොට කල නොහැක</string>
+</resources>
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/values-sk/cm_strings.xml
similarity index 70%
copy from res/drawable/filtershow_tiled_background.xml
copy to res/values-sk/cm_strings.xml
index dfc7592..b13455c 100644
--- a/res/drawable/filtershow_tiled_background.xml
+++ b/res/values-sk/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
-     Copyright (C) 2013 The Android Open Source Project
+     Copyright (C) 2012-2014 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/filtershow_background_new"
-        android:tileMode="repeat"
-        android:dither="false" />
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="record_time">Čas nahrania</string>
+</resources>
diff --git a/res/values-sk/codeaurora_strings.xml b/res/values-sk/codeaurora_strings.xml
new file mode 100644
index 0000000..8347495
--- /dev/null
+++ b/res/values-sk/codeaurora_strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+Copyright (c) 2013-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 "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="setp_option_name">Krok</string>
+  <string name="step_option_desc">Prispôsobiť krok rýchleho pretočenia dopredu/dozadu</string>
+  <string name="setp_option_three_second">3 sekundy</string>
+  <string name="setp_option_six_second">6 sekúnd</string>
+  <string name="loop">"Opakovanie"</string>
+  <string name="single">"Jednoduchý"</string>
+  <string name="stereo">"Stereo"</string>
+  <string name="speaker_on">Zapnúť reproduktor</string>
+  <string name="speaker_off">Vypnúť reproduktor</string>
+  <string name="speaker_need_headset">Pripojte slúchadlá pre použitie tejto funkcie.</string>
+  <string name="single_track">"Jedna stopa"</string>
+  <string name="input_url">"Zadať adresu URL"</string>
+  <string name="streaming_settings">"Nastavenia streamovania"</string>
+  <string name="next">"Ďalšie"</string>
+  <string name="previous">"Predchádzajúce"</string>
+  <string name="buffer_size">Veľkosť vyrovnávacej pamäte</string>
+  <string name="apn">Uprednostňovaný prístupový bod</string>
+  <string name="rtp_min_port">Minimálny port</string>
+  <string name="rtp_max_port">Maximálny port</string>
+  <string name="set_rtp_min_port">Nastaviť minimálny port</string>
+  <string name="set_rtp_max_port">Nastaviť maximálny port</string>
+  <string name="set_buffer_size">Nastaviť veľkosť vyrovnávacej pamäte</string>
+  <string name="set_apn">Vybrať uprednostňovaný prístupový bod</string>
+  <string name="setting">Nastavenia</string>
+  <string name="server_timeout_title">"Časový limit servera"</string>
+  <string name="server_timeout_message">"Pripojiť sa znova k serveru pre prehrávanie videa?"</string>
+  <string name="videoview_error_text_cannot_connect_retry">"Pripojenie zlyhalo, pokúšanie sa o opätovné pripojenie k %1$d\u2026"</string>
+  <string name="media_controller_live">Naživo</string>
+  <string name="media_controller_playing">Prehrávanie</string>
+  <string name="media_controller_connecting">Pripájanie\u2026</string>
+  <string name="bookmark_add">"Pridať záložku"</string>
+  <string name="bookmark_display">"Zobraziť záložky"</string>
+  <string name="bookmark_empty">"Žiadne záložky"</string>
+  <string name="bookmark_exist">"Záložka už existuje"</string>
+  <string name="bookmark_add_success">"Záložka bola pridaná"</string>
+  <string name="bookmark_list">"Záložky"</string>
+  <string name="bookmark_title">"Názov"</string>
+  <string name="bookmark_location">"Poloha"</string>
+  <string name="delete_all">"Vymazať všetky"</string>