CMFM: Sync jellybean with upstreamjellybean

Added missing hungarian translation        Tamás Tóth       http://review.cyanogenmod.org/29947
CMFileManager: fixed typo in romanian tran Igor Sorocean    http://review.cyanogenmod.org/29974
CMFM: Fix typo                             Jorge Ruesga     http://review.cyanogenmod.org/29984
CMFM: Do not use cd and pwd commands       Jorge Ruesga     http://review.cyanogenmod.org/29921
CMFileManager: Dutch translations          Marco Brohet     http://review.cyanogenmod.org/29801
CMFM: Ignore stderr from stat list command Jorge Ruesga     http://review.cyanogenmod.org/29920
CMFM: Fix race condition                   Jorge Ruesga     http://review.cyanogenmod.org/29919
CMFM: Read hidden files with new stat list Jorge Ruesga     http://review.cyanogenmod.org/29849
CMFM: Fix FC caused by accessing ui outsid Jorge Ruesga     http://review.cyanogenmod.org/29842
CMFM: Fix AsyncResultProgram deadlock      Jorge Ruesga     http://review.cyanogenmod.org/29841
CMFM: es_ES - update missing translations  Jorge Ruesga     http://review.cyanogenmod.org/29802
CMFM: Fix sync object                      Jorge Ruesga     http://review.cyanogenmod.org/29777
CMFM: Fix NPE when parent dir is null      Jorge Ruesga     http://review.cyanogenmod.org/29775
CMFM: Fix navigation view fade effect      Jorge Ruesga     http://review.cyanogenmod.org/29762
CMFM: Display new fso datetimes props      Jorge Ruesga     http://review.cyanogenmod.org/29757
CMFM: Use filesystem type instead of auto  Jorge Ruesga     http://review.cyanogenmod.org/29763
CMFileManager: Dutch translations          Marco Brohet     http://review.cyanogenmod.org/29731
CMFM: Fix filesystem and fso dialog layout Jorge Ruesga     http://review.cyanogenmod.org/29738
CMFM: Fix name and parent for root directo Jorge Ruesga     http://review.cyanogenmod.org/29737
CMFM: Fixes and Improvements               Jorge Ruesga     http://review.cyanogenmod.org/29679
Update Russian Translation-CMFileManager-C Pavel Volkov     http://review.cyanogenmod.org/29644
Add mime type for exported settings of K9. Danny Baumann    http://review.cyanogenmod.org/29622
Fall back to showing all files for unknown Danny Baumann    http://review.cyanogenmod.org/29621
PT-BR: Fixes to translation                Gustavo Rosa     http://review.cyanogenmod.org/29612
CMFileManager: Updated menu strings to red Roman Barczynski http://review.cyanogenmod.org/29563
CMFileManager: Dutch translations          Marco Brohet     http://review.cyanogenmod.org/29249
CMFileManager: Add RealVideo and Matroska  Jorge Ruesga     http://review.cyanogenmod.org/28968
Fix german translation for disk usage warn Danny Baumann    http://review.cyanogenmod.org/28914

Change-Id: Ie9681313bbc95ed0b6cb1e0000c5ae5b61e7b5d1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

31 files changed, 481 insertions, 275 deletions

diff --git a/res/drawable-xhdpi/ic_holo_light_history.png b/res/drawable-xhdpi/ic_holo_light_history.png
index 1e7c5d01..1e7c5d01 100755..100644
--- a/res/drawable-xhdpi/ic_holo_light_history.png
+++ b/res/drawable-xhdpi/ic_holo_light_history.png
diff --git a/res/layout-sw600dp/theme_view.xml b/res/layout-sw600dp/theme_view.xml
new file mode 100644
index 00000000..356d1070
--- /dev/null
+++ b/res/layout-sw600dp/theme_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<com.cyanogenmod.filemanager.ui.preferences.ThemeView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="1dp"
+    android:layout_height="match_parent">
+
+    <TextView
+      android:id="@+id/theme_name"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentTop="true"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="true"
+      android:textAppearance="@style/primary_text_appearance" />
+
+    <TextView
+      android:id="@+id/theme_author"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/theme_name"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="true"
+      android:textAppearance="@style/primary_text_appearance_nohighlight" />
+
+    <TextView
+      android:id="@+id/theme_desc"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="false"
+      android:maxLines="2"
+      android:textAppearance="@style/secondary_text_appearance" />
+
+    <ImageView
+      android:id="@+id/theme_preview"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_above="@id/theme_desc"
+      android:layout_below="@id/theme_author"
+      android:padding="@dimen/extra_large_margin"
+      android:layout_gravity="center"
+      android:scaleType="centerInside"
+      android:contentDescription="@null" />
+
+</com.cyanogenmod.filemanager.ui.preferences.ThemeView>
diff --git a/res/layout-sw720dp/theme_view.xml b/res/layout-sw720dp/theme_view.xml
new file mode 100644
index 00000000..356d1070
--- /dev/null
+++ b/res/layout-sw720dp/theme_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<com.cyanogenmod.filemanager.ui.preferences.ThemeView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="1dp"
+    android:layout_height="match_parent">
+
+    <TextView
+      android:id="@+id/theme_name"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentTop="true"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="true"
+      android:textAppearance="@style/primary_text_appearance" />
+
+    <TextView
+      android:id="@+id/theme_author"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/theme_name"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="true"
+      android:textAppearance="@style/primary_text_appearance_nohighlight" />
+
+    <TextView
+      android:id="@+id/theme_desc"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:gravity="center"
+      android:ellipsize="end"
+      android:singleLine="false"
+      android:maxLines="2"
+      android:textAppearance="@style/secondary_text_appearance" />
+
+    <ImageView
+      android:id="@+id/theme_preview"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_above="@id/theme_desc"
+      android:layout_below="@id/theme_author"
+      android:padding="@dimen/extra_large_margin"
+      android:layout_gravity="center"
+      android:scaleType="centerInside"
+      android:contentDescription="@null" />
+
+</com.cyanogenmod.filemanager.ui.preferences.ThemeView>
diff --git a/res/layout/bookmarks_item.xml b/res/layout/bookmarks_item.xml
index f1c7acca..fc8e4be5 100644
--- a/res/layout/bookmarks_item.xml
+++ b/res/layout/bookmarks_item.xml
@@ -17,7 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="wrap_content"
   android:layout_height="@dimen/default_row_height"
-  android:background="@drawable/holo_selector" >
+  android:background="@drawable/holo_list_selector_deselected" >
 
   <ImageView
     android:id="@+id/bookmarks_item_icon"
diff --git a/res/layout/editor.xml b/res/layout/editor.xml
index af78d622..177d377e 100644
--- a/res/layout/editor.xml
+++ b/res/layout/editor.xml
@@ -46,6 +46,7 @@
       android:gravity="top|left"
       android:cursorVisible="true"
       android:background="@null"
+      android:imeOptions="actionDone|flagNoFullscreen"
       android:inputType="textMultiLine|textImeMultiLine"
       android:text="@null"
       android:textAppearance="@style/secondary_text_appearance" />
diff --git a/res/layout/filesystem_info_dialog.xml b/res/layout/filesystem_info_dialog.xml
index b5c0aa81..4e46e1c0 100644
--- a/res/layout/filesystem_info_dialog.xml
+++ b/res/layout/filesystem_info_dialog.xml
@@ -128,6 +128,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -152,6 +153,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -176,6 +178,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -200,6 +203,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:maxLines="5"
@@ -225,6 +229,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
diff --git a/res/layout/fso_properties_dialog.xml b/res/layout/fso_properties_dialog.xml
index 65c962ff..45c38450 100644
--- a/res/layout/fso_properties_dialog.xml
+++ b/res/layout/fso_properties_dialog.xml
@@ -102,6 +102,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -126,6 +127,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:maxLines="5"
@@ -151,6 +153,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -176,6 +179,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -202,6 +206,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -226,6 +231,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -252,30 +258,82 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
       </TableRow>
 
-      <!-- Date -->
+      <!-- Last Accessed Time -->
       <TableRow
         android:layout_marginLeft="@dimen/extra_large_margin"
         android:layout_marginRight="@dimen/extra_large_margin" >
 
         <TextView
-          android:id="@+id/fso_properties_date_label"
+          android:id="@+id/fso_properties_last_accessed_label"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
           android:gravity="left|center_vertical"
-          android:text="@string/fso_properties_dialog_date"
+          android:text="@string/fso_properties_dialog_last_accessed_date"
           android:textAppearance="@style/primary_text_appearance" />
 
         <TextView
-          android:id="@+id/fso_properties_date"
+          android:id="@+id/fso_properties_last_accessed"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
+          android:gravity="left|center_vertical"
+          android:singleLine="false"
+          android:textAppearance="@style/secondary_text_appearance" />
+      </TableRow>
+
+      <!-- Last Modified Time -->
+      <TableRow
+        android:layout_marginLeft="@dimen/extra_large_margin"
+        android:layout_marginRight="@dimen/extra_large_margin" >
+
+        <TextView
+          android:id="@+id/fso_properties_last_modified_label"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/default_margin"
+          android:gravity="left|center_vertical"
+          android:text="@string/fso_properties_dialog_last_modified_date"
+          android:textAppearance="@style/primary_text_appearance" />
+
+        <TextView
+          android:id="@+id/fso_properties_last_modified"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
+          android:gravity="left|center_vertical"
+          android:singleLine="false"
+          android:textAppearance="@style/secondary_text_appearance" />
+      </TableRow>
+
+      <!-- Last Changed Time -->
+      <TableRow
+        android:layout_marginLeft="@dimen/extra_large_margin"
+        android:layout_marginRight="@dimen/extra_large_margin" >
+
+        <TextView
+          android:id="@+id/fso_properties_last_changed_label"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/default_margin"
+          android:gravity="left|center_vertical"
+          android:text="@string/fso_properties_dialog_last_changed_date"
+          android:textAppearance="@style/primary_text_appearance" />
+
+        <TextView
+          android:id="@+id/fso_properties_last_changed"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
           android:gravity="left|center_vertical"
           android:singleLine="false"
           android:textAppearance="@style/secondary_text_appearance" />
@@ -283,7 +341,7 @@
     </TableLayout>
   </ScrollView>
 
-  <!-- Permissions -->
+  <!-- Owner/Permissions -->
   <ScrollView
     android:id="@+id/fso_tab_permissions"
     android:layout_width="match_parent"
@@ -367,194 +425,199 @@
       <TableLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
-
-        <!-- Title -->
         <TableRow
           android:layout_marginLeft="@dimen/extra_large_margin"
           android:layout_marginRight="@dimen/extra_large_margin" >
 
-          <TextView
+          <!-- Labels -->
+          <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin"
-            android:gravity="left|center_vertical"
-            android:text="@null"
-            android:textAppearance="@style/primary_text_appearance" />
-
-          <TextView
-            android:id="@+id/fso_properties_permissions_special_label"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin"
-            android:gravity="center"
-            android:text="@string/fso_properties_dialog_special"
-            android:textAppearance="@style/primary_text_appearance" />
-
-          <TextView
-            android:id="@+id/fso_properties_permissions_read_label"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin"
-            android:gravity="center"
-            android:text="@string/fso_properties_dialog_read"
-            android:textAppearance="@style/primary_text_appearance" />
-
-          <TextView
-            android:id="@+id/fso_properties_permissions_write_label"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin"
-            android:gravity="center"
-            android:text="@string/fso_properties_dialog_write"
-            android:textAppearance="@style/primary_text_appearance" />
-
-          <TextView
-            android:id="@+id/fso_properties_permissions_execute_label"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin"
-            android:gravity="center"
-            android:text="@string/fso_properties_dialog_execute"
-            android:textAppearance="@style/primary_text_appearance" />
-        </TableRow>
-
-        <!-- Owner -->
-        <TableRow
-          android:layout_marginLeft="@dimen/extra_large_margin"
-          android:layout_marginRight="@dimen/extra_large_margin" >
-
-          <TextView
-            android:id="@+id/fso_properties_permissions_owner_label"
+            android:orientation="vertical">
+            <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin"
+              android:gravity="left|center_vertical"
+              android:text="@null"
+              android:textAppearance="@style/primary_text_appearance" />
+            <LinearLayout
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content">
+              <CheckBox
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/default_margin"
+                android:layout_marginBottom="@dimen/default_margin"
+                android:visibility="invisible" />
+              <TextView
+                android:id="@+id/fso_properties_permissions_owner_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/default_margin"
+                android:gravity="left|center_vertical"
+                android:text="@string/fso_properties_dialog_owner"
+                android:textAppearance="@style/primary_text_appearance" />
+            </LinearLayout>
+            <LinearLayout
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content">
+              <CheckBox
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/default_margin"
+                android:layout_marginBottom="@dimen/default_margin"
+                android:visibility="invisible" />
+              <TextView
+                android:id="@+id/fso_properties_permissions_group_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/default_margin"
+                android:gravity="left|center_vertical"
+                android:text="@string/fso_properties_dialog_group"
+                android:textAppearance="@style/primary_text_appearance" />
+            </LinearLayout>
+            <LinearLayout
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content">
+              <CheckBox
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/default_margin"
+                android:layout_marginBottom="@dimen/default_margin"
+                android:visibility="invisible" />
+              <TextView
+                android:id="@+id/fso_properties_permissions_others_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/default_margin"
+                android:gravity="left|center_vertical"
+                android:text="@string/fso_properties_dialog_others"
+                android:textAppearance="@style/primary_text_appearance" />
+            </LinearLayout>
+          </LinearLayout>
+
+          <!-- Special -->
+          <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin"
-            android:gravity="left|center_vertical"
-            android:text="@string/fso_properties_dialog_owner"
-            android:textAppearance="@style/primary_text_appearance" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_owner_read"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_owner_write"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_owner_execute"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_owner_special"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-        </TableRow>
-
-        <!-- Group -->
-        <TableRow
-          android:layout_marginLeft="@dimen/extra_large_margin"
-          android:layout_marginRight="@dimen/extra_large_margin" >
-
-          <TextView
-            android:id="@+id/fso_properties_permissions_group_label"
+            android:orientation="vertical">
+            <TextView
+              android:id="@+id/fso_properties_permissions_special_label"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin"
+              android:layout_gravity="center"
+              android:text="@string/fso_properties_dialog_special"
+              android:textAppearance="@style/primary_text_appearance" />
+            <CheckBox
+              android:id="@+id/fso_permissions_owner_special"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+            <CheckBox
+              android:id="@+id/fso_permissions_group_special"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+            <CheckBox
+              android:id="@+id/fso_permissions_others_special"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+          </LinearLayout>
+
+          <!-- Read -->
+          <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin"
-            android:gravity="left|center_vertical"
-            android:text="@string/fso_properties_dialog_group"
-            android:textAppearance="@style/primary_text_appearance" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_group_read"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_group_write"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_group_execute"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_group_special"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-        </TableRow>
-
-        <!-- Others -->
-        <TableRow
-          android:layout_marginLeft="@dimen/extra_large_margin"
-          android:layout_marginRight="@dimen/extra_large_margin" >
-
-          <TextView
-            android:id="@+id/fso_properties_permissions_others_label"
+            android:orientation="vertical">
+            <TextView
+              android:id="@+id/fso_properties_permissions_read_label"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin"
+              android:layout_gravity="center"
+              android:text="@string/fso_properties_dialog_read"
+              android:textAppearance="@style/primary_text_appearance" />
+            <CheckBox
+              android:id="@+id/fso_permissions_owner_read"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+            <CheckBox
+              android:id="@+id/fso_permissions_group_read"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+            <CheckBox
+              android:id="@+id/fso_permissions_others_read"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+          </LinearLayout>
+
+          <!-- Write -->
+          <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin"
-            android:gravity="left|center_vertical"
-            android:text="@string/fso_properties_dialog_others"
-            android:textAppearance="@style/primary_text_appearance" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_others_read"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_others_write"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
-
-          <CheckBox
-            android:id="@+id/fso_permissions_others_execute"
-            android:layout_width="0dip"
+            android:orientation="vertical">
+            <TextView
+              android:id="@+id/fso_properties_permissions_write_label"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin"
+              android:layout_gravity="center"
+              android:text="@string/fso_properties_dialog_write"
+              android:textAppearance="@style/primary_text_appearance" />
+            <CheckBox
+              android:id="@+id/fso_permissions_owner_write"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+            <CheckBox
+              android:id="@+id/fso_permissions_group_write"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+            <CheckBox
+              android:id="@+id/fso_permissions_others_write"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+          </LinearLayout>
+
+          <!-- Execute -->
+          <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
+            android:orientation="vertical">
+            <TextView
+              android:id="@+id/fso_properties_permissions_execute_label"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin"
+              android:layout_gravity="center"
+              android:text="@string/fso_properties_dialog_execute"
+              android:textAppearance="@style/primary_text_appearance" />
+            <CheckBox
+              android:id="@+id/fso_permissions_owner_execute"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+            <CheckBox
+              android:id="@+id/fso_permissions_group_execute"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+            <CheckBox
+              android:id="@+id/fso_permissions_others_execute"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/default_margin" />
+          </LinearLayout>
 
-          <CheckBox
-            android:id="@+id/fso_permissions_others_special"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/default_margin" />
         </TableRow>
-
       </TableLayout>
 
       <!-- Info message -->
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index 4fca6ff1..2ef5fe97 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -17,7 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="wrap_content"
   android:layout_height="@dimen/default_row_height"
-  android:background="@drawable/holo_selector" >
+  android:background="@drawable/holo_list_selector_deselected" >
 
   <ImageView
     android:id="@+id/history_item_icon"
diff --git a/res/layout/inline_autocomplete.xml b/res/layout/inline_autocomplete.xml
index 3938cb40..e6d1c518 100644
--- a/res/layout/inline_autocomplete.xml
+++ b/res/layout/inline_autocomplete.xml
@@ -27,6 +27,7 @@
     android:gravity="top"
     android:hint="@null"
     android:inputType="none"
+    android:imeOptions="actionDone|flagNoFullscreen"
     android:paddingLeft="@dimen/small_buttom_width"
     android:singleLine="false"
     android:textColor="@android:color/darker_gray"
@@ -46,7 +47,7 @@
     android:gravity="top"
     android:hint="@null"
     android:inputType="textNoSuggestions|textImeMultiLine"
-    android:imeOptions="actionDone"
+    android:imeOptions="actionDone|flagNoFullscreen"
     android:paddingLeft="@dimen/small_buttom_width"
     android:singleLine="false"
     android:textColor="@color/black_transparent"
diff --git a/res/layout/input_name_dialog.xml b/res/layout/input_name_dialog.xml
index 3ff195f2..2ec64d78 100644
--- a/res/layout/input_name_dialog.xml
+++ b/res/layout/input_name_dialog.xml
@@ -40,7 +40,7 @@
     android:layout_marginLeft="@dimen/extra_large_margin"
     android:layout_marginRight="@dimen/extra_large_margin"
     android:ems="@integer/default_edit_text_ems"
-    android:imeOptions="actionDone"
+    android:imeOptions="actionDone|flagNoFullscreen"
     android:scrollHorizontally="true"
     android:selectAllOnFocus="true"
     android:inputType="textNoSuggestions">
diff --git a/res/layout/navigation.xml b/res/layout/navigation.xml
index f77033c7..68df9c4f 100644
--- a/res/layout/navigation.xml
+++ b/res/layout/navigation.xml
@@ -17,6 +17,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager"
+  android:id="@+id/navigation_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
diff --git a/res/raw/mime_types.properties b/res/raw/mime_types.properties
index db2d295e..2d3a53cb 100644
--- a/res/raw/mime_types.properties
+++ b/res/raw/mime_types.properties
@@ -75,6 +75,7 @@ java  = TEXT     | text/x-java-source                 | fso_type_source_drawable
 jnlp  = TEXT     | application/x-java-jnlp-file       | fso_type_source_drawable
 js    = TEXT     | application/javascript             | fso_type_source_drawable
 json  = TEXT     | application/json                   | fso_type_source_drawable
+k9s   = TEXT     | application/x-k9settings           | fso_type_markup_document_drawable
 list  = TEXT     | text/plain                         | fso_type_text_drawable
 log   = TEXT     | text/plain                         | fso_type_text_drawable
 mathml= TEXT     | application/mathml+xml             | fso_type_markup_document_drawable
@@ -260,6 +261,7 @@ ra    = AUDIO    | audio/x-pn-realaudio             | fso_type_audio_drawable
 ram   = AUDIO    | audio/x-pn-realaudio             | fso_type_audio_drawable
 rmp   = AUDIO    | audio/x-pn-realaudio-plugin      | fso_type_audio_drawable
 wav   = AUDIO    | audio/x-wav                      | fso_type_audio_drawable
+mka   = AUDIO    | audio/x-matroska                 | fso_type_audio_drawable
 
 # Video
 3gp   = VIDEO    | video/3gpp                       | fso_type_video_drawable
@@ -303,6 +305,8 @@ wmv   = VIDEO    | video/x-ms-wmv                   | fso_type_video_drawable
 wmx   = VIDEO    | video/x-ms-wmx                   | fso_type_video_drawable
 wvx   = VIDEO    | video/x-ms-wvx                   | fso_type_video_drawable
 movie = VIDEO    | video/x-sgi-movie                | fso_type_video_drawable
+rmvb  = VIDEO    | video/rmvb                       | fso_type_video_drawable
+mkv   = VIDEO    | video/x-matroska                 | fso_type_video_drawable
 
 # Security
 asc   = SECURITY | application/pgp-signature        | fso_type_security_drawable
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8e2fdee4..5d045d51 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -255,8 +255,6 @@
   <string name="fso_properties_dialog_size">Velikost:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Obsah:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Poslední přístup:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Vlastník:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 912d6136..50dff863 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -240,8 +240,6 @@
   <string name="fso_properties_dialog_size">Størrelse:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Indeholder:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Sidst tilgået:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Ejer:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a7093d53..771c466a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -244,8 +244,6 @@
   <string name="fso_properties_dialog_size">Größe:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Beinhaltet:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Letzter Zugriff:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Besitzer:</string>
   <!-- Fso Properties Dialog * Group Label -->
@@ -557,7 +555,7 @@
   <!-- Preferences * General * Disk usage warning level summary -->
   <!-- FIXME Use "percent" instead of "%" symbol, because it make crash the app on getSummary
        of ListPreference. This should be fixed in frameworks base prior to be added here. -->
-  <string name="pref_disk_usage_warning_level_summary" formatted="false">Eine andere Farbe verwenden, wenn nur noch <xliff:g id="level">%1$s</xliff:g> Prozent des Speichers frei sind.</string>
+  <string name="pref_disk_usage_warning_level_summary" formatted="false">Eine andere Farbe verwenden, wenn mehr als <xliff:g id="level">%1$s</xliff:g> Prozent des Speichers belegt sind.</string>
   <!-- Preferences * General * Compute folder statistics title -->
   <string name="pref_compute_folder_statistics">Verzeichnisstatistiken</string>
   <!-- Preferences * General * Compute folder statistics summary on -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 07498439..054735e7 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -252,8 +252,6 @@
   <string name="fso_properties_dialog_size">Μέγεθος:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Περιέχει:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Τελ. προσπέλαση:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Ιδιοκτήτης:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 40f2ada4..89c7a147 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -51,7 +51,7 @@
   <string name="msgs_read_only_filesystem">El sistema de archivos es de solo-lectura. Intente montarlo como lectura-escritura antes de repetir la operación.</string>
   <string name="msgs_illegal_argument">Argumento ilegal. Invocación fallida.</string>
   <string name="msgs_unresolved_inconsistencies">La operación no está permitida porque podría crear inconsistencias.</string>
-  <string name="msgs_operation_not_allowed_in_current_directory">La operación no está permitida en la carpeta actual.</string>
+  <string name="msgs_operation_not_allowed_in_current_directory">La operación no está permitida en la carpeta actual.\n\nLa carpeta de destino no puede ser una subcarpeta de la actual o ser la misma que la actual.</string>
   <string name="msgs_push_again_to_exit">Pulse de nuevo para salir.</string>
   <string name="msgs_not_registered_app">No hay ninguna aplicación registrada para abrir el tipo de archivo seleccionado.</string>
   <string name="msgs_overwrite_files">Alguno de los archivos existe en la carpeta de destino. \n\n¿Sobrescribir?</string>
@@ -85,7 +85,7 @@
   <string name="cm_filemanager_show_symlinks">Ver accesos directos</string>
   <string name="filesystem_info_warning_title">Sin información</string>
   <string name="filesystem_info_warning_msg">No hay información disponible para el sistema de archivos.</string>
-  <string name="filesystem_info_cant_be_mounted_msg">El sistema de archivos no ha podido ser montado/desmontado.</string>
+  <string name="filesystem_info_cant_be_mounted_msg">El sistema de archivos no puede ser montado/desmontado.</string>
   <string name="filesystem_info_mount_not_allowed_msg">La operación de montaje del sistema de archivos no está permitida en modo seguro. Tocar aquí para cambiar a modo superusuario.</string>
   <string name="filesystem_info_mount_failed_msg">La operación de montaje del sistema de archivos ha fallado. Algunos sistemas de archivos, como las tarjetas SD, no pueden ser montados o desmontados porque están diseñados como sistemas de solo-lectura.</string>
   <string name="filesystem_info_dialog_title">Información del sistema de archivos</string>
@@ -114,7 +114,9 @@
   <string name="fso_properties_dialog_link">Enlace:</string>
   <string name="fso_properties_dialog_size">Tamaño:</string>
   <string name="fso_properties_dialog_contains">Contenido:</string>
-  <string name="fso_properties_dialog_date">Último acceso:</string>
+  <string name="fso_properties_dialog_last_accessed_date">Accedido:</string>
+  <string name="fso_properties_dialog_last_modified_date">Modificado:</string>
+  <string name="fso_properties_dialog_last_changed_date">Cambiado:</string>
   <string name="fso_properties_dialog_owner">Propietario:</string>
   <string name="fso_properties_dialog_group">Grupo:</string>
   <string name="fso_properties_dialog_others">Otros:</string>
@@ -208,8 +210,8 @@
   <string name="actions_menu_deselect_all">Desmarcar todo</string>
   <string name="actions_menu_select">Marcar</string>
   <string name="actions_menu_deselect">Desmarcar</string>
-  <string name="actions_menu_paste_selection">Pegar selección</string>
-  <string name="actions_menu_move_selection">Mover selección</string>
+  <string name="actions_menu_paste_selection">Pegar aquí</string>
+  <string name="actions_menu_move_selection">Mover aquí</string>
   <string name="actions_menu_delete_selection">Borrar selección</string>
   <string name="actions_menu_compress_selection">Comprimir selección</string>
   <string name="actions_menu_create_link">Crear enlace</string>
@@ -281,7 +283,7 @@
   <string name="pref_about_summary">File Manager v<xliff:g id="version">%1$s</xliff:g>
     \nCopyright \u00A9 2012 The CyanogenMod Project</string>
   <string name="pref_general_behaviour_category">General</string>
-  <string name="pref_case_sensitive_sort">Distinción mayúsc. y minúsc.</string>
+  <string name="pref_case_sensitive_sort">Ordenación sensible</string>
   <string name="pref_disk_usage_warning_level">Aviso de uso de disco</string>
   <string name="pref_disk_usage_warning_level_summary" formatted="false">Mostrar un color diferente para los widgets de uso de disco, cuando el espacio ocupado supere el <xliff:g id="level">%1$s</xliff:g> por ciento del total</string>
   <string name="pref_compute_folder_statistics">Estadísticas de carpetas</string>
@@ -297,7 +299,7 @@
   <string name="pref_access_mode_root">Modo superusuario</string>
   <string name="pref_access_mode_root_summary">Modo superusuario\n\n¡Aviso! Este modo permite operaciones que pueden bloquear el dispositivo. Será su responsabilidad asegurarse de que la operación sea segura</string>
   <string name="pref_search_results_category">Resultados</string>
-  <string name="pref_show_relevance_widget">Mostrar widget de relevancia</string>
+  <string name="pref_show_relevance_widget">Mostrar relevancia</string>
   <string name="pref_highlight_terms">Resaltar términos de búsqueda</string>
   <string name="pref_sort_search_results_mode">Ordenación de resultados</string>
   <string name="pref_sort_search_results_mode_none">Sin ordenar</string>
@@ -315,7 +317,7 @@
   <string name="pref_themes_no_preview">Vista previa\nno disponible</string>
   <string name="pref_themes_confirmation">Tema aplicado satisfactoriamente.</string>
   <string name="pref_themes_not_found">Tema no encontrado.</string>
-  <string name="pref_debug_traces">Habilitar registro de depuración</string>
+  <string name="pref_debug_traces">Habilitar depuración</string>
   <string name="theme_default_name">Tema claro</string>
   <string name="theme_default_description">Un tema en colores claros para File Manager.</string>
   <string name="security_warning_extract">¡Aviso!\n\nExtraer archivos comprimidos que contienen rutas absolutas o relativas puede causar daños en su dispositivo por la posible sobrescritura de archivos de sistema.\n\n¿Continuar?</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a613de70..6168b209 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -235,8 +235,6 @@
   <string name="fso_properties_dialog_size">Taille\u00A0:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Contenu\u00A0:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Dernier accès\u00A0:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Propriétaire\u00A0:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ff1c00e5..365c5d35 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -100,7 +100,7 @@
     <!-- The operation will cause inconsistencies -->
     <string name="msgs_unresolved_inconsistencies">A művelet nem engedélyezett, mert következetlenséget okozna.</string>
     <!-- Operation not permitted in current directory -->
-    <string name="msgs_operation_not_allowed_in_current_directory">A művelet nem engedélyezett a jelenlegi mappában.</string>
+    <string name="msgs_operation_not_allowed_in_current_directory">A művelet nem engedélyezett a jelenlegi mappában.\n\nA célmappa nem lehet azonos a forrásmappával, és nem lehet annak almappája.</string>
 
     <!-- The advice message prior to exit the application -->
     <string name="msgs_push_again_to_exit">Nyomja meg mégegyszer a kilépéshez.</string>
@@ -237,8 +237,12 @@
     <string name="fso_properties_dialog_size">Méret:</string>
     <!-- Fso Properties Dialog * Contains Label -->
     <string name="fso_properties_dialog_contains">Tartalmaz:</string>
-    <!-- Fso Properties Dialog * Date Label -->
-    <string name="fso_properties_dialog_date">Utolsó hozzáférés:</string>
+    <!-- Fso Properties Dialog * Last Accessed Time Label -->
+    <string name="fso_properties_dialog_last_accessed_date">Elérés ideje:</string>
+    <!-- Fso Properties Dialog * Last Modified Time Label -->
+    <string name="fso_properties_dialog_last_modified_date">Módosítás ideje:</string>
+    <!-- Fso Properties Dialog * Last Changed Time -->
+    <string name="fso_properties_dialog_last_changed_date">Adatváltozás ideje:</string>
     <!-- Fso Properties Dialog * Owner Label -->
     <string name="fso_properties_dialog_owner">Tulajdonos:</string>
     <!-- Fso Properties Dialog * Group Label -->
@@ -333,7 +337,7 @@
     <!-- Initial directory dialog title -->
     <string name="initial_directory_dialog_title">Kezdőkönyvtár</string>
     <!-- Initial directory label -->
-    <string name="initial_directory_label">Válasszon kezdőkonyvtárat:</string>
+    <string name="initial_directory_label">Válasszon kezdőkönyvtárat:</string>
     <!-- Initial directory is relative -->
     <string name="initial_directory_relative_msg">Relatív útvonalak nem használhatóak.</string>
     <!-- Initial directory error message -->
@@ -403,9 +407,9 @@
     <!-- Actions Dialog * Menu * Deselect -->
     <string name="actions_menu_deselect">Elvet</string>
     <!-- Actions Dialog * Menu * Paste selection -->
-    <string name="actions_menu_paste_selection">Kijelöltek beillesztése</string>
+    <string name="actions_menu_paste_selection">Kijelöltek beillesztése ide</string>
     <!-- Actions Dialog * Menu * Move selection -->
-    <string name="actions_menu_move_selection">Kijelöltek mozgatása</string>
+    <string name="actions_menu_move_selection">Kijelöltek mozgatása ide</string>
     <!-- Actions Dialog * Menu * Delete selection -->
     <string name="actions_menu_delete_selection">Kijelöltek törlése</string>
     <!-- Actions Dialog * Menu * Compress selection -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b77007d2..09aa6d29 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -121,7 +121,6 @@
   <string name="fso_properties_dialog_link">Link:</string>
   <string name="fso_properties_dialog_size">Dimensioni:</string>
   <string name="fso_properties_dialog_contains">Contiene:</string>
-  <string name="fso_properties_dialog_date">Ultimo accesso:</string>
   <string name="fso_properties_dialog_owner">Proprietario:</string>
   <string name="fso_properties_dialog_group">Gruppo:</string>
   <string name="fso_properties_dialog_others">Altri:</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9fd13bf6..b08fbac5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -255,8 +255,6 @@
   <string name="fso_properties_dialog_size">サイズ:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">内包数:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">最終アクセス:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">オーナー:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index cb1d3ba5..7b345bb3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -80,14 +80,14 @@
   <string name="msgs_unknown">Er is een fout opgetreden. De bewerking is niet succesvol voltooid.</string>
   <!-- When an operation requires elevated privileged (normally caused for the use of a
        non-privileged console) -->
-  <string name="msgs_insufficient_permissions">Deze bewerking heeft verhoogde machtigingen nodig. Probeer naar root-toegangsmodus om te schakelen.</string>
+  <string name="msgs_insufficient_permissions">Deze bewerking heeft verhoogde machtigingen nodig. Probeer naar root-toegangsmodus te schakelen.</string>
   <!-- The file or directory was not found -->
   <string name="msgs_file_not_found">Het bestand of de map is niet gevonden.</string>
   <!-- The command reference couldn't be created (not found or invalid definition)
        (normally caused by a development error) -->
   <string name="msgs_command_not_found">Het bewerkingscommando is niet gevonden of is ongeldig.</string>
   <!-- I/O exception -->
-  <string name="msgs_io_failed">Lees/schrijffout.</string>
+  <string name="msgs_io_failed">Lees-/schrijffout.</string>
   <!-- Operation timeout detected -->
   <string name="msgs_operation_timeout">Bewerkingstime-out.</string>
   <!-- The operation returns an invalid exit code -->
@@ -97,7 +97,7 @@
   <!-- An operation can't be cancelled -->
   <string name="msgs_operation_can_not_be_cancelled">De bewerking kan niet worden geannuleerd.</string>
   <!-- The operation requieres mount the file system prior to execute the command -->
-  <string name="msgs_read_only_filesystem">Het bestandssysteem is gekoppeld als alleen-schrijven. Probeer het bestandssysteem als beschrijfbaar te koppelen voorafgaand aan het uitvoeren van de bewerking.</string>
+  <string name="msgs_read_only_filesystem">Het bestandssysteem is gekoppeld als alleen-lezen. Probeer het bestandssysteem als beschrijfbaar te koppelen alvorens de bewerking uit te voeren.</string>
   <!-- Illegal argument (normally caused by a development error when calling internal api) -->
   <string name="msgs_illegal_argument">Ongeldig argument. Activering mislukt.</string>
   <!-- The operation will cause inconsistencies -->
@@ -109,7 +109,7 @@
   <string name="msgs_push_again_to_exit">Tik nogmaals om af te sluiten.</string>
 
   <!-- There is no registered application that can handle the mime-type -->
-  <string name="msgs_not_registered_app">Er is geen app geïnstalleerd om het geselecteerde type bestand te hanteren.</string>
+  <string name="msgs_not_registered_app">Er is geen app geïnstalleerd om het geselecteerde bestandstype te openen.</string>
 
   <!-- Overwrite files? -->
   <string name="msgs_overwrite_files">Een aantal bestanden bestaat al in de doelmap.\n\nOverschrijven?</string>
@@ -217,17 +217,17 @@
   <!-- Fso Properties * Not allowed message -->
   <string name="fso_properties_permissions_not_allowed_msg">Machtigingsbewerking is niet toegestaan in veilige modus. Tik om naar root-toegangsmodus te schakelen.</string>
   <!-- Fso Properties * Failed to change owner to fso -->
-  <string name="fso_properties_failed_to_change_owner_msg">De wijziging van eigenaar is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een eigenaarswijziging niet toe.</string>
+  <string name="fso_properties_failed_to_change_owner_msg">Het wijzigen van eigenaar is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een eigenaarswijziging niet toe.</string>
   <!-- Fso Properties * Failed to change group to fso -->
-  <string name="fso_properties_failed_to_change_group_msg">De wijziging van groep is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een groepswijziging niet toe.</string>
+  <string name="fso_properties_failed_to_change_group_msg">Het wijzigen van groep is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een groepswijziging niet toe.</string>
   <!-- Fso Properties * Failed to change group to fso -->
-  <string name="fso_properties_failed_to_change_permission_msg">De wijziging van machtigingen is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een wijziging van rechten niet toe.</string>
+  <string name="fso_properties_failed_to_change_permission_msg">Het wijzigen van machtigingen is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een wijziging van rechten niet toe.</string>
   <!-- Fso Properties Dialog * Title -->
   <string name="fso_properties_dialog_title">Eigenschappen</string>
   <!-- Fso Properties Dialog * Tab * Info -->
   <string name="fso_properties_dialog_tab_info">Info</string>
   <!-- Fso Properties Dialog * Tab * Permissions -->
-  <string name="fso_properties_dialog_tab_permissions">Rechten</string>
+  <string name="fso_properties_dialog_tab_permissions">Machtigingen</string>
   <!-- Fso Properties Dialog * Name Label -->
   <string name="fso_properties_dialog_name">Naam:</string>
   <!-- Fso Properties Dialog * Parent Folder Label -->
@@ -242,8 +242,12 @@
   <string name="fso_properties_dialog_size">Grootte:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Inhoud:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Recente toegang:</string>
+  <!-- Fso Properties Dialog * Last Accessed Time Label -->
+  <string name="fso_properties_dialog_last_accessed_date">Geopend:</string>
+  <!-- Fso Properties Dialog * Last Modified Time Label -->
+  <string name="fso_properties_dialog_last_modified_date">Bewerkt:</string>
+  <!-- Fso Properties Dialog * Last Changed Time -->
+  <string name="fso_properties_dialog_last_changed_date">Gewijzigd:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Eigenaar:</string>
   <!-- Fso Properties Dialog * Group Label -->
@@ -293,9 +297,9 @@
   <!-- Search * Confirm search -->
   <string name="search_few_characters_title">Zoeken bevestigen</string>
   <!-- Search * Some terms of the search are too small. The operation could be very costly -->
-  <string name="search_few_characters_msg">Sommige zoektermen hebben een klein aantal karakters. De bewerking zou te veel tijd of systeembronnen in beslag kunnen nemen.\n\nWil je doorgaan?</string>
+  <string name="search_few_characters_msg">Sommige zoektermen hebben een klein aantal karakters. De bewerking zou te veel tijd of systeembronnen in beslag kunnen nemen.\n\nWeet u zeker dat u door wilt gaan?</string>
   <!-- Search * Searching dialog title -->
-  <string name="searching">Een ogenblik a.u.b.\u2026</string>
+  <string name="searching">Een ogenblik a.u.b.</string>
   <!-- Search * Searching label -->
   <string name="searching_action_label">Bezig met zoeken</string>
 
@@ -313,7 +317,7 @@
   <!-- Editor * Editor is dirty, ask the user * Dialog title -->
   <string name="editor_dirty_ask_title">Afsluiten bevestigen</string>
   <!-- Editor * Editor is dirty, ask the user * Dialog message -->
-  <string name="editor_dirty_ask_msg">Er zijn onopgeslagen wijzigingen.\n\nAfsluiten zonder opslaan?</string>
+  <string name="editor_dirty_ask_msg">Het bestand is gewijzigd.\n\nAfsluiten zonder opslaan?</string>
   <!-- Editor * Save operation success -->
   <string name="editor_successfully_saved">Het bestand is succesvol opgeslagen.</string>
   <!-- Editor * Read-only file mode -->
@@ -384,9 +388,9 @@
   <!-- Waiting dialog * Initializing the dialog -->
   <string name="waiting_dialog_analizing_msg"><![CDATA[<b>Analyseren\u2026</b>]]></string>
   <!-- Extracting * Success message -->
-  <string name="msgs_extracting_success">Het uitpakken is succesvol afgerond. De gegevens zijn uitgepakt naar <xliff:g id="destination">%1$s</xliff:g>.</string>
+  <string name="msgs_extracting_success">Het uitpakken is succesvol voltooid. De gegevens zijn uitgepakt naar <xliff:g id="destination">%1$s</xliff:g>.</string>
   <!-- Compressing * Success message -->
-  <string name="msgs_compressing_success">Het comprimeren is succesvol afgerond. De gegevens zijn gecomprimeerd naar <xliff:g id="destination">%1$s</xliff:g>.</string>
+  <string name="msgs_compressing_success">Het comprimeren is succesvol voltooid. De gegevens zijn gecomprimeerd naar <xliff:g id="destination">%1$s</xliff:g>.</string>
 
   <!-- Actions Dialog * Title -->
   <string name="actions_dialog_title">Acties</string>
@@ -415,7 +419,7 @@
   <!-- Actions Dialog * Menu * Compress selection -->
   <string name="actions_menu_compress_selection">Selectie comprimeren</string>
   <!-- Actions Dialog * Menu * Create link -->
-  <string name="actions_menu_create_link">Verwijzing maken</string>
+  <string name="actions_menu_create_link">Symlink maken</string>
   <!-- Actions Dialog * Menu * Open -->
   <string name="actions_menu_open">Openen</string>
   <!-- Actions Dialog * Menu * Open with -->
@@ -444,7 +448,7 @@
   <string name="actions_menu_open_parent_folder">Bovenliggende map openen</string>
 
   <!-- Actions * Ask user prior to do an undone operation. Dialog message -->
-  <string name="actions_ask_undone_operation_msg">Deze actie kan niet ongedaan gemaakt worden. Weet u zeker dat u door wilt gaan?</string>
+  <string name="actions_ask_undone_operation_msg">Deze actie kan niet ongedaan worden gemaakt. Weet u zeker dat u door wilt gaan?</string>
 
   <!-- Enter Name Dialog * Label -->
   <string name="input_name_dialog_label">Naam:</string>
@@ -455,7 +459,7 @@
   <!-- Enter Name Dialog * Message * Invalid name -->
   <string name="input_name_dialog_message_invalid_name">Ongeldige naam. De namen \'.\' en \'..\' zijn niet toegestaan.</string>
   <!-- Enter Name Dialog * Message * Name exists -->
-  <string name="input_name_dialog_message_name_exists">De naam bestaat al.</string>
+  <string name="input_name_dialog_message_name_exists">Deze naam bestaat al.</string>
 
   <!-- Associations Dialog * Title -->
   <string name="associations_dialog_title">Gekoppelde apps</string>
@@ -543,7 +547,7 @@
   <!-- Preferences * General * Behaviour category -->
   <string name="pref_general_behaviour_category">Algemeen</string>
   <!-- Preferences * General * Case sensitive sort title -->
-  <string name="pref_case_sensitive_sort">Hoofdletter en kleine letter gebruiken bij sorteren</string>
+  <string name="pref_case_sensitive_sort">Hoofdlettergevoelig sorteren</string>
   <!-- Preferences * General *Disk usage warning level title -->
   <string name="pref_disk_usage_warning_level">Schijfgebruikswaarschuwing</string>
   <!-- Preferences * General * Disk usage warning level summary -->
@@ -553,7 +557,7 @@
   <!-- Preferences * General * Compute folder statistics title -->
   <string name="pref_compute_folder_statistics">Mapstatistieken berekenen</string>
   <!-- Preferences * General * Compute folder statistics summary on -->
-  <string name="pref_compute_folder_statistics_on">Let op! Het berekenen van mapstatistieken kost tijd en systeembronnen</string>
+  <string name="pref_compute_folder_statistics_on">Let op: het berekenen van mapstatistieken kost tijd en systeembronnen</string>
   <!-- Preferences * General * Use flinger detection -->
   <string name="pref_use_flinger">Veegbewegingen gebruiken</string>
   <!-- Preferences * General * Use flinger detection summary -->
@@ -567,23 +571,23 @@
   <!-- Preferences * General * Safe mode summary -->
   <string name="pref_access_mode_safe_summary">Veilige modus\n\nDe app werkt zonder machtigingen en alleen opslagvolumes (SD-kaart en USB) zijn toegankelijk</string>
   <!-- Preferences * General * Prompt user mode -->
-  <string name="pref_access_mode_prompt">Naar toegangsmodus vragen</string>
+  <string name="pref_access_mode_prompt">Vragen naar toegangsmodus</string>
   <!-- Preferences * General * Prompt user mode summary -->
-  <string name="pref_access_mode_prompt_summary">Naar toegangsmodus vragen\n\nDe app heeft volledige toegang tot het bestandssysteem, maar zal vragen om toestemming voorafgaand aan acties waarvoor machtigingen nodig zijn</string>
+  <string name="pref_access_mode_prompt_summary">Vragen naar toegangsmodus\n\nDe app heeft volledige toegang tot het bestandssysteem, maar zal toestemming vragen voor bewerking waarvoor machtigingen nodig zijn</string>
   <!-- Preferences * General * Root access mode -->
   <string name="pref_access_mode_root">Root-toegangsmodus</string>
   <!-- Preferences * General * Root access mode summary -->
-  <string name="pref_access_mode_root_summary">Root-toegangsmodus\n\nLet op! Deze modus staat bewerkingen toe die het apparaat kunnen beschadingen. Het is je eigen verantwoordelijk om te zorgen dat een bewerking veilig is</string>
+  <string name="pref_access_mode_root_summary">Root-toegangsmodus\n\nLet op! Deze modus staat bewerkingen toe die het apparaat kunnen beschadingen. Het is uw eigen verantwoordelijk om te zorgen dat een bewerking veilig is</string>
   <!-- Preferences * Search * Results category -->
   <string name="pref_search_results_category">Resultaten</string>
   <!-- Preferences * Search * Show relevance widget -->
-  <string name="pref_show_relevance_widget">Relevantie widget tonen</string>
+  <string name="pref_show_relevance_widget">Relevantiepictogram tonen</string>
   <!-- Preferences * Search * Highlight search terms -->
   <string name="pref_highlight_terms">Zoektermen markeren</string>
   <!-- Preferences * Search * Sort results mode -->
-  <string name="pref_sort_search_results_mode">Resultatenmodus sorteren</string>
+  <string name="pref_sort_search_results_mode">Resultaten sorteren</string>
   <!-- Preferences * Search * Sort results mode. None -->
-  <string name="pref_sort_search_results_mode_none">Geen sortering</string>
+  <string name="pref_sort_search_results_mode_none">Niet sorteren</string>
   <!-- Preferences * Search * Sort results mode. None -->
   <string name="pref_sort_search_results_mode_name">Op naam</string>
   <!-- Preferences * Search * Sort results mode. Relevance -->
@@ -593,9 +597,9 @@
   <!-- Preferences * Search * Save search terms -->
   <string name="pref_save_search_terms">Zoektermen opslaan</string>
   <!-- Preferences * Search * Save search terms summary on -->
-  <string name="pref_save_search_terms_on">Zoektermen zullen worden opgeslagen en gebruikt als suggesties voor toekomstige zoekopdrachten</string>
+  <string name="pref_save_search_terms_on">Zoektermen worden opgeslagen en gebruikt als suggesties voor toekomstige zoekopdrachten</string>
   <!-- Preferences * Search * Save search terms summary off -->
-  <string name="pref_save_search_terms_off">Zoektermen zullen niet worden opgeslagen</string>
+  <string name="pref_save_search_terms_off">Zoektermen worden niet opgeslagen</string>
   <!-- Preferences * Search * Remove saved search terms -->
   <string name="pref_remove_saved_search_terms">Opgeslagen zoektermen verwijderen</string>
   <!-- Preferences * Search * Remove saved search terms summary -->
@@ -617,4 +621,12 @@
   <!-- Welcome Dialog * Message -->
   <string name="welcome_msg">Welkom bij de bestandsbeheerder van CyanogenMod\n\nHiermee kunt u het bestandssystem bekijken en bewerkingen uitvoeren die schadelijk kunnen zijn voor uw apparaat. Om dit te voorkomen opent de app in een veilige modus zonder machtigingen.\n\nU kunt naar de geavanceerde modus met volledige machtigingen gaan via Instellingen. De bewerkingen die u uitvoert gebeuren op eigen verantwoordelijkheid.\n\nDe ontwikkelaars van CyanogenMod.\n</string>
 
+  <string name="pref_themes_selection_category">Thema\'s</string>
+  <string name="pref_themes_set_theme">Thema instellen</string>
+  <string name="pref_themes_no_preview">Geen voorbeeld\nbeschikbaar</string>
+  <string name="pref_themes_confirmation">Thema succesvol toegepast</string>
+  <string name="pref_themes_not_found">Kan thema niet vinden</string>
+  <string name="theme_default_name">Licht thema</string>
+  <string name="theme_default_description">Lichte kleuren voor de bestandsbeheerder</string>
+  <string name="themes_author">CyanogenMod</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index b2193dac..c32e2e50 100755..100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Gerenciador de Arquivos</string>
+    <string name="app_name">G. de Arquivos</string>
     <string name="app_description">Um gerenciador de arquivos por CyanogenMod</string>
     <string name="device_blockdevice">Bloquear dispositivo</string>
     <string name="device_characterdevice">Dispositivo de caracter</string>
@@ -53,7 +53,7 @@
     <string name="msgs_read_only_filesystem">O sistema de arquivos é leitura somente. Tente montar o sistema de arquivos como leitura-escrita antes de tentar a operação</string>
     <string name="msgs_illegal_argument">Argumento ilegal. Falha na chamada</string>
     <string name="msgs_unresolved_inconsistencies">A operação não é permitida pois ela pode criar inconsistências</string>
-    <string name="msgs_operation_not_allowed_in_current_directory">A operação não é permitida na pasta atual</string>
+    <string name="msgs_operation_not_allowed_in_current_directory">A operação não é permitida na pasta atual.\n\nPasta de destino não pode ser subpasta da origem ou ser igual à origem.</string>
     <string name="msgs_push_again_to_exit">Pressione novamente para sair</string>
     <string name="msgs_not_registered_app">Não há aplicação registrada para abrir o tipo de arquivo selecionado</string>
     <string name="msgs_overwrite_files">Alguns dos arquivos já existem na pasta de destino.\n\nSobrescrever?</string>
@@ -116,7 +116,6 @@
     <string name="fso_properties_dialog_link">Vínculo:</string>
     <string name="fso_properties_dialog_size">Tamanho:</string>
     <string name="fso_properties_dialog_contains">Contém:</string>
-    <string name="fso_properties_dialog_date">Último acesso:</string>
     <string name="fso_properties_dialog_owner">Proprietário:</string>
     <string name="fso_properties_dialog_group">Grupo:</string>
     <string name="fso_properties_dialog_others">Outros:</string>
@@ -199,8 +198,8 @@
     <string name="actions_menu_deselect_all">Desselecionar tudo</string>
     <string name="actions_menu_select">Selecionar</string>
     <string name="actions_menu_deselect">Desselecionar</string>
-    <string name="actions_menu_paste_selection">Colar seleção</string>
-    <string name="actions_menu_move_selection">Mover seleção</string>
+    <string name="actions_menu_paste_selection">Colar seleção aqui</string>
+    <string name="actions_menu_move_selection">Mover seleção aqui</string>
     <string name="actions_menu_delete_selection">Excluir seleção</string>
     <string name="actions_menu_compress_selection">Comprimir seleção</string>
     <string name="actions_menu_create_link">Criar atalho</string>
@@ -273,14 +272,14 @@
     <string name="pref_case_sensitive_sort">Usar ordenação sensível a maiúsculas/minúsculas</string>
     <string name="pref_disk_usage_warning_level">Aviso sobre o uso do disco</string>
     <string name="pref_disk_usage_warning_level_summary" formatted="false">Exibir uma cor diferente nos widgets de uso de disco quando chegar a <xliff:g id="level" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> porcentos de espaço disponível</string>
-    <string name="pref_compute_folder_statistics">Computar estatísticas da pasta</string>
+    <string name="pref_compute_folder_statistics">Gerar estatísticas da pasta</string>
     <string name="pref_compute_folder_statistics_on">Aviso! A computação das estatísticas da pasta gasta tempo e recursos do sistema</string>
     <string name="pref_use_flinger">Usar gestos</string>
     <string name="pref_use_flinger_summary">Usar detecção de gestos de delizar para esquerda e direita para excluir arquivos e pastas</string>
     <string name="pref_general_advanced_settings_category">Avançado</string>
     <string name="pref_access_mode">Modo de acesso</string>
     <string name="pref_access_mode_safe">Modo de seguro</string>
-    <string name="pref_access_mode_safe_summary">Modo seguro\n\nO aplicativo está rodando sem privilégios e somente os sistemas de arquivos que são acessíveis são os volumes (Cartões SD e USB)</string>
+    <string name="pref_access_mode_safe_summary">Modo seguro\n\nO aplicativo está rodando sem privilégios, e somente os sistemas de arquivos que são acessíveis são os volumes: Cartões SD e USB</string>
     <string name="pref_access_mode_prompt">Modo de usuário</string>
     <string name="pref_access_mode_prompt_summary">Modo de usuário\n\nO aplicativo está rodando com total acesso ao sistema de arquivo mas irá perguntar por permissão antes de executar algum ação que requer previlégios</string>
     <string name="pref_access_mode_root">Modo de acesso root</string>
@@ -299,7 +298,7 @@
     <string name="pref_remove_saved_search_terms">Remover termos de busca salvos</string>
     <string name="pref_remove_saved_search_terms_summary">Pressione para remover todos os termos de busca salvos</string>
     <string name="pref_remove_saved_search_terms_msg">Todos os termos de busca foram removidos</string>
-    <string name="pref_debug_traces">Logar informações de depuração</string>
+    <string name="pref_debug_traces">Registrar informações de depuração</string>
     <string name="security_warning_extract">Aviso!\n\nO dispositivo pode ser danificado se, ao extrair arquivos com caminhos relativos ou absolutos, arquivos de sistema forem sobrescritos.\n\nVocê deseja continuar?</string>
     <string name="changelog_title">Registro de mudanças</string>
     <string name="welcome_title">Bem vindo</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0d1cb33f..27f96133 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -256,8 +256,6 @@
   <string name="fso_properties_dialog_size">Tamanho:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Contém:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Último acesso:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Dono:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f2d174fa..058a1137 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -110,7 +110,6 @@
   <string name="fso_properties_dialog_link">Link:</string>

   <string name="fso_properties_dialog_size">Dimensiune:</string>

   <string name="fso_properties_dialog_contains">Conţin:</string>

-  <string name="fso_properties_dialog_date">Ultima accesare:</string>

   <string name="fso_properties_dialog_owner">Proprietar:</string>

   <string name="fso_properties_dialog_group">Grup:</string>

   <string name="fso_properties_dialog_others">Altele:</string>

@@ -270,7 +269,7 @@
   <string name="pref_access_mode_prompt">Mod interogare</string>

   <string name="pref_access_mode_prompt_summary">Mod interogare\n\nAplicaţia se execută cu acces total la fişierele de sistem, dar va solicita permisiuni pentru a efectua operaţiuni privelegiate</string>

   <string name="pref_access_mode_root">Mod acces Root</string>

-  <string name="pref_access_mode_root_summary">Mod cccess Root\n\nAvertizare! Acest mod permite operaţiuni ce pot duce la defectarea dispozitivului Dvs. Este responsabilitatea Dvs. să vă asigurați ce operațiune este sigură</string>

+  <string name="pref_access_mode_root_summary">Mod acces Root\n\nAvertizare! Acest mod permite operaţiuni ce pot duce la defectarea dispozitivului Dvs. Este responsabilitatea Dvs. să vă asigurați ce operațiune este sigură</string>

   <string name="pref_search_results_category">Rezultate</string>

   <string name="pref_show_relevance_widget">Afişare widget relevanţă</string>

   <string name="pref_highlight_terms">Evidenţiere termeni de căutare</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 293aa628..28f7d33a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -64,7 +64,7 @@
   <string name="msgs_read_only_filesystem">Файловая система доступна только для чтения. Попробуйте смонтировать файловую систему для чтения/записи</string>
   <string name="msgs_illegal_argument">Недопустимый аргумент. Вызов не удался</string>
   <string name="msgs_unresolved_inconsistencies">Операция не допускается, поскольку это создаст несоответствия</string>
-  <string name="msgs_operation_not_allowed_in_current_directory">Операция не допускается в текущей папке</string>
+  <string name="msgs_operation_not_allowed_in_current_directory">Операция не допускается в текущей папке. \n\nПапка назначения не может быть вложенной папкой источника или самим источником.</string>
 
   <string name="msgs_push_again_to_exit">Нажмите ещё раз для выхода</string>
 
@@ -139,7 +139,6 @@
   <string name="fso_properties_dialog_link">Ссылка:</string>
   <string name="fso_properties_dialog_size">Размер:</string>
   <string name="fso_properties_dialog_contains">Содержит:</string>
-  <string name="fso_properties_dialog_date">Посл. доступ:</string>
   <string name="fso_properties_dialog_owner">Владелец:</string>
   <string name="fso_properties_dialog_group">Группа:</string>
   <string name="fso_properties_dialog_others">Другое:</string>
@@ -225,8 +224,8 @@
   <string name="actions_menu_deselect_all">Снять выбор</string>
   <string name="actions_menu_select">Выбор</string>
   <string name="actions_menu_deselect">Снять выбор</string>
-  <string name="actions_menu_paste_selection">Вставить выбранное</string>
-  <string name="actions_menu_move_selection">Переместить выбранное</string>
+  <string name="actions_menu_paste_selection">Вставить выбранное сюда</string>
+  <string name="actions_menu_move_selection">Переместить выбранное сюда</string>
   <string name="actions_menu_delete_selection">Удалить выбранное</string>
   <string name="actions_menu_compress_selection">Сжать выбранное</string>
   <string name="actions_menu_create_link">Создать ссылку</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 23e322a0..c7478a12 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -252,8 +252,6 @@
   <string name="fso_properties_dialog_size">大小:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">包含:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">最后一次访问:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">拥有者:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 0278d310..253fbdfc 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -40,6 +40,8 @@
   <dimen name="extra_margin">8dp</dimen>
   <!-- An extra margin -->
   <dimen name="extra_large_margin">16dp</dimen>
+  <!-- Double margin -->
+  <dimen name="double_margin">24dp</dimen>
   <!-- A small margin -->
   <dimen name="small_margin">2dp</dimen>
   <!-- The minimal margin -->
@@ -106,7 +108,8 @@
   <!-- Theme button min width -->
   <dimen name="themes_min_width_button">300dp</dimen>
 
-  <!-- Theme width -->
+  <!-- Theme width/height -->
   <dimen name="theme_max_width">300dip</dimen>
+  <dimen name="theme_max_height">600dip</dimen>
 
 </resources>
diff --git a/res/values/overlay.xml b/res/values/overlay.xml
index 1a68d534..8d591964 100644
--- a/res/values/overlay.xml
+++ b/res/values/overlay.xml
@@ -60,6 +60,7 @@
     /system/xbin/gunzip,
     /system/xbin/pwd,
     /system/xbin/readlink,
+    /system/xbin/stat,
     /system/xbin/su,
     /system/xbin/tar,
     /system/xbin/uncompress,
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2db9749a..070e3dc2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -124,7 +124,8 @@
     The operation is not permitted because it would create inconsistencies.</string>
   <!-- Operation not permitted in current directory -->
   <string name="msgs_operation_not_allowed_in_current_directory">
-    The operation is not permitted in current folder.</string>
+    The operation is not permitted in current folder.\n\nDestination folder cannot be subfolder
+    of source or be same as source.</string>
 
   <!-- The advice message prior to exit the application -->
   <string name="msgs_push_again_to_exit">Press again to exit.</string>
@@ -275,8 +276,12 @@
   <string name="fso_properties_dialog_size">Size:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Contains:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Last access:</string>
+  <!-- Fso Properties Dialog * Last Accessed Time Label -->
+  <string name="fso_properties_dialog_last_accessed_date">Accessed:</string>
+  <!-- Fso Properties Dialog * Last Modified Time Label -->
+  <string name="fso_properties_dialog_last_modified_date">Modified:</string>
+  <!-- Fso Properties Dialog * Last Changed Time -->
+  <string name="fso_properties_dialog_last_changed_date">Changed:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Owner:</string>
   <!-- Fso Properties Dialog * Group Label -->
@@ -469,9 +474,9 @@
   <!-- Actions Dialog * Menu * Deselect -->
   <string name="actions_menu_deselect">Deselect</string>
   <!-- Actions Dialog * Menu * Paste selection -->
-  <string name="actions_menu_paste_selection">Paste selection</string>
+  <string name="actions_menu_paste_selection">Paste selection here</string>
   <!-- Actions Dialog * Menu * Move selection -->
-  <string name="actions_menu_move_selection">Move selection</string>
+  <string name="actions_menu_move_selection">Move selection here</string>
   <!-- Actions Dialog * Menu * Delete selection -->
   <string name="actions_menu_delete_selection">Delete selection</string>
   <!-- Actions Dialog * Menu * Compress selection -->
diff --git a/res/xml/command_list.xml b/res/xml/command_list.xml
index caa288ac..1e42cdc7 100644
--- a/res/xml/command_list.xml
+++ b/res/xml/command_list.xml
@@ -31,32 +31,28 @@
 -->
 <CommandList xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager">
   <!-- Start code (append to commands; for retrieve the exit code) -->
-  <startcode commandId="startcode" commandPath="/system/xbin/echo %1$s0%2$s ; " />
+  <startcode commandId="startcode" commandPath="/system/xbin/echo -n %1$s0%2$s ; " />
   <!-- Exit code (append to commands; for retrieve the exit code) -->
-  <exitcode commandId="exitcode" commandPath=" ; /system/xbin/echo %1$s$?%2$s" />
+  <exitcode commandId="exitcode" commandPath=" ; /system/xbin/echo -n %1$s$?%2$s" />
 
   <!-- Shell commands -->
   <command commandId="bash" commandPath="/system/bin/sh" commandArgs="" />
   <command commandId="su" commandPath="/system/xbin/su" commandArgs="" />
 
-  <!-- Directory -->
-  <command commandId="cd" commandPath="cd" commandArgs="%1$s" />
-  <command commandId="pwd" commandPath="/system/xbin/pwd" commandArgs="-P" />
-
   <!-- Console info -->
   <command commandId="groups" commandPath="/system/xbin/groups" commandArgs="" />
   <command commandId="id" commandPath="/system/bin/id" commandArgs="-Gn" />
 
   <!-- FileSystem -->
-  <command commandId="mount" commandPath="/system/bin/mount" commandArgs="-o %1$s,remount -t auto %2$s %3$s" />
-  <command commandId="mountpointinfo" commandPath="/system/bin/cat" commandArgs="/proc/mounts" />
+  <command commandId="mount" commandPath="/system/bin/mount" commandArgs="-o %1$s,remount -t %2$s %3$s" />
+  <command commandId="mountpointinfo" commandPath="/system/bin/mount" commandArgs="" />
 
   <!-- List/Find/Info -->
-  <command commandId="ls" commandPath="cd" commandArgs="%1$s &amp;&amp; /system/bin/ls -al %1$s | { /system/xbin/grep -v -e '^l' || true; } &amp;&amp; /system/xbin/echo '>SIMLINKS>' &amp;&amp; /system/bin/ls -al %1$s | { /system/xbin/grep -e '^l' || true; } &amp;&amp; /system/xbin/echo '>SIMLINKS_DATA>' &amp;&amp; /system/bin/ls -aF %1$s | /system/xbin/grep -e '^l' | /system/xbin/cut -d ' ' -f2- &amp;&amp; /system/bin/ls -aF %1$s | /system/xbin/grep -e '^l' | /system/xbin/cut -d ' ' -f2- | /system/xbin/awk '{print &quot;\\&quot;&quot;$0&quot;\\&quot;&quot;}' | /system/xbin/xargs -r -n1 /system/xbin/readlink -f &amp;&amp; /system/bin/ls -F %1$s | /system/xbin/grep -e '^l' | /system/xbin/cut -d ' ' -f2- | /system/xbin/awk '{print &quot;\\&quot;&quot;$0&quot;\\&quot;&quot;}' | /system/xbin/xargs -r -n1 /system/xbin/readlink -f | /system/xbin/awk '{print &quot;\\&quot;&quot;$0&quot;\\&quot;&quot;}' | { /system/xbin/xargs -r /system/bin/ls -ald || /system/xbin/echo; }" />
-  <command commandId="fileinfo" commandPath="/system/bin/ls" commandArgs="-ald %1$s" />
-  <command commandId="find" commandPath="/system/xbin/find" commandArgs="%1$s \\( -name %2$s -o -name %3$s -o -name %4$s -o -name %5$s -o -name %6$s \\) -exec /system/xbin/echo {} \\; -exec /system/bin/ls -ald {} \\;" />
+  <command commandId="ls" commandPath="/system/bin/ls" commandArgs="%1$s 1&gt; /dev/null &amp;&amp; /system/xbin/stat -t %1$s.* %1$s* 2&gt; /dev/null" />
+  <command commandId="fileinfo" commandPath="/system/xbin/stat" commandArgs="-t %1$s 2&gt;&amp;1" />
+  <command commandId="find" commandPath="/system/xbin/find" commandArgs="%1$s \\( -name %2$s -o -name %3$s -o -name %4$s -o -name %5$s -o -name %6$s \\) -exec /system/xbin/stat -t {} 2&gt;&amp;1 \\;" />
   <command commandId="quickfoldersearch" commandPath="/system/bin/ls" commandArgs="-aFd %1$s.* %1$s* 2&gt; /dev/null | /system/xbin/grep -e '^d' -e '^ld' | /system/xbin/cut -d&quot; &quot; -f2-" />
-  <command commandId="readlink" commandPath="cd" commandArgs="%2$s &amp;&amp; /system/xbin/readlink -f %1$s | /system/xbin/awk -F// '{print &quot;\\&quot;&quot;$1&quot;\\&quot;&quot;}' | /system/xbin/xargs -n1 /system/xbin/dirname &amp;&amp; /system/xbin/readlink -f %1$s | /system/xbin/awk -F// '{print &quot;\\&quot;&quot;$1&quot;\\&quot;&quot;}' | /system/xbin/xargs -n1 /system/bin/ls -ald" />
+  <command commandId="readlink" commandPath="/system/bin/ls" commandArgs="%1$s 1&gt; /dev/null &amp;&amp; /system/xbin/stat -tL %1$s 2&gt;&amp;1" />
 
   <!-- Operational -->
   <command commandId="chmod" commandPath="/system/bin/chmod" commandArgs="%1$s %2$s" />
@@ -71,7 +67,7 @@
   <!-- Usage -->
   <command commandId="diskusage" commandPath="/system/bin/df" commandArgs="%1$s" />
   <command commandId="diskusageall" commandPath="/system/bin/df" commandArgs="" />
-  <command commandId="folderusage" commandPath="/system/bin/ls" commandArgs="-alR %1$s" />
+  <command commandId="folderusage" commandPath="/system/bin/ls" commandArgs="-alR %1$s 2&gt; /dev/null" />
 
   <!-- I/O -->
   <command commandId="read" commandPath="/system/bin/cat" commandArgs="%1$s" />