From 32331d73021a9b4a96c973e7f054666da31d653d Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Tue, 13 Nov 2012 01:57:16 +0100
Subject: [PATCH 01/11] CMFileManager: Fixes for non-rooted devices

Various fixes for non-rooted devices running under java console:

 * Improve navigation (caching unsused data on chrooted mode: aids, mountpoints, ...)
 * Editor: Don't ask user to gain privileges (non rooted devices never can gain privileged access)
 * Move common file operations to FileHelper
 * MoveCommand: As shell console, java console doesn't allow to move between filesystems. Use
   a copy-delete operation when renameTo is not allowed.
 * On non-rooted devices, not allow to change to other access mode.

Change-Id: I7ae8b4f4203fc8a20f498e43f45c0a956731b02e
---
 .../activities/EditorActivity.java            |   9 +-
 .../preferences/SettingsPreferences.java      |   2 +
 .../commands/java/CopyCommand.java            |  85 +-------------
 .../commands/java/DeleteDirCommand.java       |  27 +----
 .../commands/java/MoveCommand.java            |  33 +++++-
 .../ui/dialogs/FsoPropertiesDialog.java       |   2 +-
 .../filemanager/util/AIDHelper.java           |  76 ++++++------
 .../filemanager/util/ExceptionUtil.java       |   2 +-
 .../filemanager/util/FileHelper.java          | 109 ++++++++++++++++++
 .../filemanager/util/MountPointHelper.java    |  29 +++--
 10 files changed, 217 insertions(+), 157 deletions(-)

diff --git a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
index 9e6796689..912c0befb 100644
--- a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
@@ -42,6 +42,7 @@
 import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
+import com.cyanogenmod.filemanager.FileManagerApplication;
 import com.cyanogenmod.filemanager.R;
 import com.cyanogenmod.filemanager.commands.AsyncResultListener;
 import com.cyanogenmod.filemanager.commands.WriteExecutable;
@@ -49,6 +50,7 @@
 import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 import com.cyanogenmod.filemanager.console.RelaunchableException;
 import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.preferences.AccessMode;
 import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
 import com.cyanogenmod.filemanager.ui.ThemeManager;
 import com.cyanogenmod.filemanager.ui.ThemeManager.Theme;
@@ -550,9 +552,12 @@ public void onProgress(int progress) {
                         // Check if the read was successfully
                         if (this.mReader.mCause != null) {
                             // Check if we can't read the file because we don't the require
-                            // permissions
+                            // permissions. If we are in a ChRooted environment, resolve the
+                            // error without doing anymore
                             if (this.mReader.mCause instanceof InsufficientPermissionsException) {
-                                if (!ConsoleBuilder.isPrivileged()) {
+                                if (!ConsoleBuilder.isPrivileged() &&
+                                    FileManagerApplication.getAccessMode().
+                                                compareTo(AccessMode.SAFE) != 0) {
                                     // We don't have a privileged console, we can't ask the user
                                     // to gain privileges and relauch the command again
                                     askGainAccessAndRead(
diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java b/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java
index 438e8c109..b78aafc28 100644
--- a/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java
@@ -304,6 +304,8 @@ public void onCreate(Bundle savedInstanceState) {
                                 FileManagerSettings.SETTINGS_ACCESS_MODE.getId(),
                                 defaultValue);
             this.mOnChangeListener.onPreferenceChange(this.mAccessMode, value);
+            // If device is not rooted, this setting cannot be changed
+            this.mAccessMode.setEnabled(FileManagerApplication.isDeviceRooted());
 
             // Capture Debug traces
             this.mDebugTraces =
diff --git a/src/com/cyanogenmod/filemanager/commands/java/CopyCommand.java b/src/com/cyanogenmod/filemanager/commands/java/CopyCommand.java
index 3e1e316fd..0c7832cc8 100644
--- a/src/com/cyanogenmod/filemanager/commands/java/CopyCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/CopyCommand.java
@@ -23,13 +23,10 @@
 import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.FileHelper;
 import com.cyanogenmod.filemanager.util.MountPointHelper;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 
 
 /**
@@ -84,7 +81,7 @@ public void execute()
         }
 
         //Copy recursively
-        if (!copyRecursive(s, d)) {
+        if (!FileHelper.copyRecursive(s, d, getBufferSize())) {
             if (isTrace()) {
                 Log.v(TAG, "Result: FAIL. InsufficientPermissionsException"); //$NON-NLS-1$
             }
@@ -111,82 +108,4 @@ public MountPoint getSrcWritableMountPoint() {
     public MountPoint getDstWritableMountPoint() {
         return MountPointHelper.getMountPointFromDirectory(this.mDst);
     }
-
-    /**
-     * Method that copies recursively to the destination
-     *
-     * @param src The source file or folder
-     * @param dst The destination file or folder
-     * @return boolean If the operation complete successfully
-     * @throws ExecutionException If a problem was detected in the operation
-     */
-    public boolean copyRecursive(final File src, final File dst) throws ExecutionException {
-        if (src.isDirectory()) {
-            // Create the directory
-            if (dst.exists() && !dst.isDirectory()) {
-                Log.e(TAG,
-                        String.format("Failed to check destionation dir: %s", dst)); //$NON-NLS-1$
-                throw new ExecutionException("the path exists but is not a folder"); //$NON-NLS-1$
-            }
-            if (!dst.exists()) {
-                if (!dst.mkdir()) {
-                    Log.e(TAG, String.format("Failed to create directory: %s", dst)); //$NON-NLS-1$
-                    return false;
-                }
-            }
-            File[] files = src.listFiles();
-            if (files != null) {
-                for (int i = 0; i < files.length; i++) {
-                    if (!copyRecursive(files[i], new File(dst, files[i].getName()))) {
-                        return false;
-                    }
-                }
-            }
-        } else {
-            // Copy the directory
-            if (!bufferedCopy(src, dst)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Method that copies a file
-     *
-     * @param src The source file
-     * @param dst The destination file
-     * @return boolean If the operation complete successfully
-     */
-    public boolean bufferedCopy(final File src, final File dst) {
-        BufferedInputStream bis = null;
-        BufferedOutputStream bos = null;
-        try {
-            bis = new BufferedInputStream(new FileInputStream(src), getBufferSize());
-            bos = new BufferedOutputStream(new FileOutputStream(dst), getBufferSize());
-            int read = 0;
-            byte[] data = new byte[getBufferSize()];
-            while ((read = bis.read(data, 0, getBufferSize())) != -1) {
-                bos.write(data, 0, read);
-            }
-            return true;
-
-        } catch (Throwable e) {
-            Log.e(TAG,
-                    String.format(TAG, "Failed to copy from %s to %d", src, dst), e); //$NON-NLS-1$
-            return false;
-        } finally {
-            try {
-                if (bis != null) {
-                    bis.close();
-                }
-            } catch (Throwable e) {/**NON BLOCK**/}
-            try {
-                if (bos != null) {
-                    bos.close();
-                }
-            } catch (Throwable e) {/**NON BLOCK**/}
-        }
-
-    }
 }
diff --git a/src/com/cyanogenmod/filemanager/commands/java/DeleteDirCommand.java b/src/com/cyanogenmod/filemanager/commands/java/DeleteDirCommand.java
index 07e9498da..04b8e20c2 100644
--- a/src/com/cyanogenmod/filemanager/commands/java/DeleteDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/DeleteDirCommand.java
@@ -23,6 +23,7 @@
 import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.FileHelper;
 import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.io.File;
@@ -84,7 +85,7 @@ public void execute()
         }
 
         // Delete the file
-        if (!deleteFolder(f)) {
+        if (!FileHelper.deleteFolder(f)) {
             if (isTrace()) {
                 Log.v(TAG, "Result: FAIL. InsufficientPermissionsException"); //$NON-NLS-1$
             }
@@ -111,28 +112,4 @@ public MountPoint getSrcWritableMountPoint() {
     public MountPoint getDstWritableMountPoint() {
         return MountPointHelper.getMountPointFromDirectory(this.mPath);
     }
-
-    /**
-     * Method that deletes a folder recursively
-     *
-     * @param folder The folder to delete
-     * @return boolean If the folder was deleted
-     */
-    private boolean deleteFolder(File folder) {
-        File[] files = folder.listFiles();
-        if (files != null) {
-            for (int i = 0; i < files.length; i++) {
-                if (files[i].isDirectory()) {
-                    if (!deleteFolder(files[i])) {
-                        return false;
-                    }
-                } else {
-                    if (!files[i].delete()) {
-                        return false;
-                    }
-                }
-            }
-        }
-        return folder.delete();
-    }
 }
diff --git a/src/com/cyanogenmod/filemanager/commands/java/MoveCommand.java b/src/com/cyanogenmod/filemanager/commands/java/MoveCommand.java
index f94e7f1fe..b0c85fb38 100644
--- a/src/com/cyanogenmod/filemanager/commands/java/MoveCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/MoveCommand.java
@@ -23,6 +23,7 @@
 import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.FileHelper;
 import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.io.File;
@@ -78,12 +79,34 @@ public void execute()
             throw new NoSuchFileOrDirectory(this.mSrc);
         }
 
-        //Copy recursively
-        if (!s.renameTo(d)) {
-            if (isTrace()) {
-                Log.v(TAG, "Result: FAIL. InsufficientPermissionsException"); //$NON-NLS-1$
+        //Move or copy recursively
+        if (d.exists()) {
+            if (!FileHelper.copyRecursive(s, d, getBufferSize())) {
+                if (isTrace()) {
+                    Log.v(TAG, "Result: FAIL. InsufficientPermissionsException"); //$NON-NLS-1$
+                }
+                throw new InsufficientPermissionsException();
+            }
+            if (!FileHelper.deleteFolder(s)) {
+                if (isTrace()) {
+                    Log.v(TAG, "Result: OK. WARNING. Source not deleted."); //$NON-NLS-1$
+                }
+            }
+        } else {
+            // Move between filesystem is not allow. If rename fails then use copy operation
+            if (!s.renameTo(d)) {
+                if (!FileHelper.copyRecursive(s, d, getBufferSize())) {
+                    if (isTrace()) {
+                        Log.v(TAG, "Result: FAIL. InsufficientPermissionsException"); //$NON-NLS-1$
+                    }
+                    throw new InsufficientPermissionsException();
+                }
+                if (!FileHelper.deleteFolder(s)) {
+                    if (isTrace()) {
+                        Log.v(TAG, "Result: OK. WARNING. Source not deleted."); //$NON-NLS-1$
+                    }
+                }
             }
-            throw new InsufficientPermissionsException();
         }
 
         if (isTrace()) {
diff --git a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
index 44c980059..4a5a06a87 100644
--- a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
@@ -347,7 +347,7 @@ private void loadAIDs() {
                         new AsyncTask<Void, Void, SparseArray<AID>>() {
             @Override
             protected SparseArray<AID> doInBackground(Void...params) {
-                return AIDHelper.getAIDs(FsoPropertiesDialog.this.mContext);
+                return AIDHelper.getAIDs(FsoPropertiesDialog.this.mContext, true);
             }
 
             @Override
diff --git a/src/com/cyanogenmod/filemanager/util/AIDHelper.java b/src/com/cyanogenmod/filemanager/util/AIDHelper.java
index c94cf2d38..50b3efef1 100644
--- a/src/com/cyanogenmod/filemanager/util/AIDHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/AIDHelper.java
@@ -36,6 +36,8 @@ public final class AIDHelper {
 
     private static final String TAG = "AIDHelper"; //$NON-NLS-1$
 
+    private static SparseArray<AID> sAids;
+
     /**
      * Constructor of <code>AIDHelper</code>.
      */
@@ -47,45 +49,51 @@ private AIDHelper() {
      * Method that returns the Android IDs (system + application AID)
      *
      * @param context The current context
+     * @param force Force the reload of the AIDs
      * @return SparseArray<AID> The array of {@link AID}
      */
-    public static SparseArray<AID> getAIDs(Context context) {
-        Properties systemAIDs = null;
-        try {
-            // Load the default known system identifiers
-            systemAIDs = new Properties();
-            systemAIDs.load(context.getResources().openRawResource(R.raw.aid));
-        } catch (Exception e) {
-            Log.e(TAG, "Fail to load AID raw file.", e); //$NON-NLS-1$
-            return null;
-        }
+    public synchronized static SparseArray<AID> getAIDs(Context context, boolean force) {
+        if (sAids == null || force) {
+            Properties systemAIDs = null;
+            try {
+                // Load the default known system identifiers
+                systemAIDs = new Properties();
+                systemAIDs.load(context.getResources().openRawResource(R.raw.aid));
+            } catch (Exception e) {
+                Log.e(TAG, "Fail to load AID raw file.", e); //$NON-NLS-1$
+                return null;
+            }
 
-        // Add the default known system identifiers
-        SparseArray<AID> aids = new SparseArray<AID>();
-        Iterator<Object> it = systemAIDs.keySet().iterator();
-        while (it.hasNext()) {
-            String key = (String)it.next();
-            String value = systemAIDs.getProperty(key);
-            int uid = Integer.parseInt(key);
-            aids.put(uid, new AID(uid, value));
-        }
+            // Add the default known system identifiers
+            SparseArray<AID> aids = new SparseArray<AID>();
+            Iterator<Object> it = systemAIDs.keySet().iterator();
+            while (it.hasNext()) {
+                String key = (String)it.next();
+                String value = systemAIDs.getProperty(key);
+                int uid = Integer.parseInt(key);
+                aids.put(uid, new AID(uid, value));
+            }
 
-        // Now, retrieve all AID of installed applications
-        final PackageManager pm = context.getPackageManager();
-        List<ApplicationInfo> packages =
-                pm.getInstalledApplications(PackageManager.GET_META_DATA);
-        int cc = packages.size();
-        for (int i = 0; i < cc; i++) {
-            ApplicationInfo info = packages.get(i);
-            int uid = info.uid;
-            if (aids.indexOfKey(uid) < 0) {
-                String name = pm.getNameForUid(uid);
-                aids.put(uid, new AID(uid, name));
+            // Now, retrieve all AID of installed applications
+            final PackageManager pm = context.getPackageManager();
+            List<ApplicationInfo> packages =
+                    pm.getInstalledApplications(PackageManager.GET_META_DATA);
+            int cc = packages.size();
+            for (int i = 0; i < cc; i++) {
+                ApplicationInfo info = packages.get(i);
+                int uid = info.uid;
+                if (aids.indexOfKey(uid) < 0) {
+                    String name = pm.getNameForUid(uid);
+                    aids.put(uid, new AID(uid, name));
+                }
             }
+
+            // Save to cached aids
+            sAids = aids;
         }
 
         // Return the list of AIDs found
-        return aids;
+        return sAids;
     }
 
     /**
@@ -96,7 +104,9 @@ public static SparseArray<AID> getAIDs(Context context) {
      * @return AID The AID
      */
     public static AID getAIDFromName(Context ctx, String name) {
-        SparseArray<AID> aids = getAIDs(ctx);
+        // This method is only used by java console under chrooted mode, so
+        // is safe to caching aids, because sdcards only allow known aids
+        SparseArray<AID> aids = getAIDs(ctx, false);
         int len = aids.size();
         for (int i = 0; i < len; i++) {
             AID aid = aids.valueAt(i);
@@ -104,7 +114,7 @@ public static AID getAIDFromName(Context ctx, String name) {
                 return aid;
             }
         }
-        return null;
+        return new AID(-1, ""); //$NON-NLS-1$
     }
 
 }
diff --git a/src/com/cyanogenmod/filemanager/util/ExceptionUtil.java b/src/com/cyanogenmod/filemanager/util/ExceptionUtil.java
index 213f4dc7c..84821f92d 100644
--- a/src/com/cyanogenmod/filemanager/util/ExceptionUtil.java
+++ b/src/com/cyanogenmod/filemanager/util/ExceptionUtil.java
@@ -256,7 +256,7 @@ static void askUser(
         }
 
         // If console is privileged there is not need to change
-        // If we are in a ChRooted environment, resolve the error without do anymore
+        // If we are in a ChRooted environment, resolve the error without doing anymore
         if (relaunchable instanceof InsufficientPermissionsException &&
                 (isPrivileged ||
                  FileManagerApplication.getAccessMode().compareTo(AccessMode.SAFE) == 0)) {
diff --git a/src/com/cyanogenmod/filemanager/util/FileHelper.java b/src/com/cyanogenmod/filemanager/util/FileHelper.java
index ba6c05e7f..bd9049799 100644
--- a/src/com/cyanogenmod/filemanager/util/FileHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/FileHelper.java
@@ -24,6 +24,7 @@
 import com.cyanogenmod.filemanager.FileManagerApplication;
 import com.cyanogenmod.filemanager.R;
 import com.cyanogenmod.filemanager.commands.shell.ResolveLinkCommand;
+import com.cyanogenmod.filemanager.console.ExecutionException;
 import com.cyanogenmod.filemanager.model.AID;
 import com.cyanogenmod.filemanager.model.BlockDevice;
 import com.cyanogenmod.filemanager.model.CharacterDevice;
@@ -43,7 +44,11 @@
 import com.cyanogenmod.filemanager.preferences.ObjectIdentifier;
 import com.cyanogenmod.filemanager.preferences.Preferences;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
@@ -836,4 +841,108 @@ public static FileSystemObject createFileSystemObject(Context ctx, File file) {
         }
         return null;
     }
+
+    /**
+     * Method that copies recursively to the destination
+     *
+     * @param src The source file or folder
+     * @param dst The destination file or folder
+     * @param bufferSize The buffer size for the operation
+     * @return boolean If the operation complete successfully
+     * @throws ExecutionException If a problem was detected in the operation
+     */
+    public static boolean copyRecursive(
+            final File src, final File dst, int bufferSize) throws ExecutionException {
+        if (src.isDirectory()) {
+            // Create the directory
+            if (dst.exists() && !dst.isDirectory()) {
+                Log.e(TAG,
+                        String.format("Failed to check destionation dir: %s", dst)); //$NON-NLS-1$
+                throw new ExecutionException("the path exists but is not a folder"); //$NON-NLS-1$
+            }
+            if (!dst.exists()) {
+                if (!dst.mkdir()) {
+                    Log.e(TAG, String.format("Failed to create directory: %s", dst)); //$NON-NLS-1$
+                    return false;
+                }
+            }
+            File[] files = src.listFiles();
+            if (files != null) {
+                for (int i = 0; i < files.length; i++) {
+                    if (!copyRecursive(files[i], new File(dst, files[i].getName()), bufferSize)) {
+                        return false;
+                    }
+                }
+            }
+        } else {
+            // Copy the directory
+            if (!bufferedCopy(src, dst,bufferSize)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Method that copies a file
+     *
+     * @param src The source file
+     * @param dst The destination file
+     * @param bufferSize The buffer size for the operation
+     * @return boolean If the operation complete successfully
+     */
+    public static boolean bufferedCopy(final File src, final File dst, int bufferSize) {
+        BufferedInputStream bis = null;
+        BufferedOutputStream bos = null;
+        try {
+            bis = new BufferedInputStream(new FileInputStream(src), bufferSize);
+            bos = new BufferedOutputStream(new FileOutputStream(dst), bufferSize);
+            int read = 0;
+            byte[] data = new byte[bufferSize];
+            while ((read = bis.read(data, 0, bufferSize)) != -1) {
+                bos.write(data, 0, read);
+            }
+            return true;
+
+        } catch (Throwable e) {
+            Log.e(TAG,
+                    String.format(TAG, "Failed to copy from %s to %d", src, dst), e); //$NON-NLS-1$
+            return false;
+        } finally {
+            try {
+                if (bis != null) {
+                    bis.close();
+                }
+            } catch (Throwable e) {/**NON BLOCK**/}
+            try {
+                if (bos != null) {
+                    bos.close();
+                }
+            } catch (Throwable e) {/**NON BLOCK**/}
+        }
+    }
+
+    /**
+     * Method that deletes a folder recursively
+     *
+     * @param folder The folder to delete
+     * @return boolean If the folder was deleted
+     */
+    public static boolean deleteFolder(File folder) {
+        File[] files = folder.listFiles();
+        if (files != null) {
+            for (int i = 0; i < files.length; i++) {
+                if (files[i].isDirectory()) {
+                    if (!deleteFolder(files[i])) {
+                        return false;
+                    }
+                } else {
+                    if (!files[i].delete()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return folder.delete();
+    }
 }
diff --git a/src/com/cyanogenmod/filemanager/util/MountPointHelper.java b/src/com/cyanogenmod/filemanager/util/MountPointHelper.java
index 97036188b..a91affacd 100644
--- a/src/com/cyanogenmod/filemanager/util/MountPointHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/MountPointHelper.java
@@ -45,6 +45,11 @@ public final class MountPointHelper {
                                                 "ext4"    //$NON-NLS-1$
                                                     });
 
+    private static final long MAX_CACHED_TIME = 60000L * 5;
+
+    private static List<MountPoint> sMountPoints;
+    private static long sLastCachedTime;
+
     /**
      * Constructor of <code>MountPointHelper</code>.
      */
@@ -84,15 +89,25 @@ public static MountPoint getMountPointFromDirectory(String dir) {
      * @param dir The directory of which recovers his mount point information
      * @return MountPoint The mount point information
      */
-    public static MountPoint getMountPointFromDirectory(Console console, String dir) {
+    public synchronized static MountPoint getMountPointFromDirectory(Console console, String dir) {
         try {
-            //Retrieve the mount points
-            List<MountPoint> mps =
-                    CommandHelper.getMountPoints(null, console);
+            // For non-rooted devices, which console is java and runs under a chrooted
+            // device, mount point info mustn't be a main objective. Caching the status
+            // should be enough and operation runs smoothly.
+            // Refresh mount points after some time (5 minutes should be enough)
+            long now = System.currentTimeMillis();
+            if (sMountPoints == null || (now - sLastCachedTime) > MAX_CACHED_TIME ||
+                FileManagerApplication.isDeviceRooted()) {
+                //Retrieve the mount points
+                List<MountPoint> mps =
+                        CommandHelper.getMountPoints(null, console);
+                sMountPoints = mps;
+                sLastCachedTime = now;
+            }
 
             //Sort mount points in reverse order, needed for avoid
             //found an incorrect that matches the name
-            Collections.sort(mps, new Comparator<MountPoint>() {
+            Collections.sort(sMountPoints, new Comparator<MountPoint>() {
                 @Override
                 public int compare(MountPoint lhs, MountPoint rhs) {
                     return lhs.compareTo(rhs) * -1;
@@ -100,9 +115,9 @@ public int compare(MountPoint lhs, MountPoint rhs) {
             });
 
             //Search for the mount point information
-            int cc = mps.size();
+            int cc = sMountPoints.size();
             for (int i = 0; i < cc; i++) {
-                MountPoint mp = mps.get(i);
+                MountPoint mp = sMountPoints.get(i);
                 if (dir.startsWith(mp.getMountPoint())) {
                     return mp;
                 }

From f506bb982bf5ef5782800696bba7b8c1387794b5 Mon Sep 17 00:00:00 2001
From: igoriok <igor_sorocean@hotmail.com>
Date: Mon, 12 Nov 2012 18:36:35 +0200
Subject: [PATCH 02/11] CMFileManager: updated romanian translation

Change-Id: Ief7f6e63dd1f1eeacbbd55670a58e08e45fc1ed9
Signed-off-by: igoriok <igor_sorocean@hotmail.com>
---
 res/values-ro/strings.xml        |  7 +++++++
 themes/res/values-ro/strings.xml | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 themes/res/values-ro/strings.xml

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ec7a2c33f..b168bca17 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -285,6 +285,13 @@
   <string name="pref_remove_saved_search_terms">Eliminaţi termenii de căutare salvaţi</string>
   <string name="pref_remove_saved_search_terms_summary">Apăsaţi pentru eliminarea tuturor termenilor de căutare salvaţi</string>
   <string name="pref_remove_saved_search_terms_msg">Toţi termenii de căutare salvaţi au fost eliminaţi.</string>
+  <string name="pref_themes_selection_category">Teme</string>
+  <string name="pref_themes_set_theme">Aplicaţi tema</string>
+  <string name="pref_themes_no_preview">Nici o previzualizare\ndisponibilă</string>
+  <string name="pref_themes_confirmation">Tema a fost aplicată cu succes.</string>
+  <string name="pref_themes_not_found">Tema nu a fost găsită.</string>
+  <string name="theme_default_name">Temă \"deschisă\"</string>
+  <string name="theme_default_description">Temă \"deschisă\" pentru Managerul de Fişiere CyanogenMod.</string>
   <string name="security_warning_extract">Avertizare!\n\nExtragerea unui fişier arhivă cu căi relative sau absolute poate cauza defecţiuni dispozitivului Dvs. prin suprascrierea fişierelor de sistem.\n\nDoriţi să continuaţi?</string>
   </resources>
 
diff --git a/themes/res/values-ro/strings.xml b/themes/res/values-ro/strings.xml
new file mode 100644
index 000000000..36555253c
--- /dev/null
+++ b/themes/res/values-ro/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <string name="app_name">Teme Manager Fișiere</string>
+  <string name="app_description">Teme pentru Managerul de Fișiere CyanogenMod.</string>
+  <string name="dark_theme_name">Temă \"întunecată\"</string>
+  <!-- The dark theme description -->
+  <string name="dark_theme_desc">Temă \"întunecată\" pentru Managerul de Fișiere CyanogenMod.</string>
+
+</resources>

From c5ad23bdb34051cb26429cade8f4e97cd8186aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Buga=20D=C3=A1niel?= <bugadani@gmail.com>
Date: Wed, 14 Nov 2012 18:15:49 +0100
Subject: [PATCH 03/11] Update Hungarian translations

Updated some Hungarian strings to be a bit easier to understand.
Added Dark Theme strings.

Change-Id: Id1469ee5a6f042ee875712e976775ce8e7c51720
---
 res/values-hu/strings.xml        | 82 ++++++++++++++++----------------
 themes/res/values-hu/strings.xml | 29 +++++++++++
 2 files changed, 70 insertions(+), 41 deletions(-)
 create mode 100644 themes/res/values-hu/strings.xml

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e5650b732..aa2838c92 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -71,7 +71,7 @@
     <!-- The selected setting was not applied or stored -->
     <string name="msgs_settings_save_failure">A beállítást nem lehet alkalmazni, vagy elmenteni.</string>
     <!-- The initial directory has an invalid or inaccessible reference -->
-    <string name="msgs_settings_invalid_initial_directory">A kezdő könyvtár "<xliff:g id="initial_dir">%1$s</xliff:g>" helytelen. Váltás a gyökérkönyvtárra.</string>
+    <string name="msgs_settings_invalid_initial_directory">A kezdő könyvtár "<xliff:g id="initial_dir">%1$s</xliff:g>" érvénytelen. Váltás a gyökérkönyvtárra.</string>
 
     <!-- Success -->
     <string name="msgs_success">A művelet sikeresen befejeződött.</string>
@@ -82,7 +82,7 @@
     <!-- The file or directory was not found -->
     <string name="msgs_file_not_found">A fájl vagy a könyvtár nem található.</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">A műveleti parancs nem található, vagy érvénytelen definíció.</string>
+    <string name="msgs_command_not_found">A műveleti parancs nem található, vagy érvénytelen.</string>
     <!-- I/O exception -->
     <string name="msgs_io_failed">Olvasási / írási hiba.</string>
     <!-- Operation timeout detected -->
@@ -106,13 +106,13 @@
     <string name="msgs_push_again_to_exit">Nyomja meg mégegyszer a kilépéshez.</string>
 
     <!-- There is no registered application that can handle the mime-type -->
-    <string name="msgs_not_registered_app">Nincs társítva alkalmazás a kijelölt fájltípus kezelésére.</string>
+    <string name="msgs_not_registered_app">A kijelölt fájltípushoz nincs alkalmazás társítva.</string>
 
     <!-- Overwrite files? -->
-    <string name="msgs_overwrite_files">Néhány fájl létezik a cél könyvtárban.\n\nFelülírja?</string>
+    <string name="msgs_overwrite_files">Néhány fájl már létezik a célkönyvtárban.\n\nFelülírja?</string>
 
     <!-- The association of an action to the application failed -->
-    <string name="msgs_action_association_failed">Sikertelen a művelet társítása az alkalmazáshoz.</string>
+    <string name="msgs_action_association_failed">A műveletet nem sikerült társítani az alkalmazáshoz.</string>
 
     <!-- An operation requires elevated privileged. Ask the user. -->
     <string name="advise_insufficient_permissions">A művelet elvégzéséhez nincs megfelelő jogosultsága.\n\nÁtvált rendszergazda módra?</string>
@@ -179,17 +179,17 @@
     <!-- Filesystem Info (no data). Dialog message -->
     <string name="filesystem_info_warning_msg">Nincs elérhető információ a fájlrendszerről.</string>
     <!-- Filesystem Info * Filesystem couldn't be mounted -->
-    <string name="filesystem_info_cant_be_mounted_msg">A fájlrendszer nem csatolható/lecsatolható.</string>
+    <string name="filesystem_info_cant_be_mounted_msg">A fájlrendszer nem csatolható.</string>
     <!-- Filesystem Info * Not allowed message -->
-    <string name="filesystem_info_mount_not_allowed_msg">Fájlrendszer csatolási műveletek nincsenek engedélyezve a biztonságos módban. Érintse meg a rendszergazda módba való váltáshoz.</string>
+    <string name="filesystem_info_mount_not_allowed_msg">Fájlrendszer-csatolási műveletek nincsenek engedélyezve a biztonságos módban. Érintse meg a rendszergazda módba való váltáshoz.</string>
     <!-- Filesystem Info * Mount failed -->
-    <string name="filesystem_info_mount_failed_msg">Fájlrendszer csatolási művelet sikertelen. Néhány fájlrendszer, mint bizonyos SD-kártyák fizikailag nem írhatóak.</string>
+    <string name="filesystem_info_mount_failed_msg">Fájlrendszer-csatolási művelet sikertelen. Néhány fájlrendszer, mint bizonyos SD-kártyák fizikailag nem írhatóak.</string>
     <!-- Filesystem Info Dialog * Title -->
-    <string name="filesystem_info_dialog_title">Fájlrendszer információ</string>
+    <string name="filesystem_info_dialog_title">Fájlrendszer-információ</string>
     <!-- Filesystem Info Dialog * Tab * Info -->
     <string name="filesystem_info_dialog_tab_info">Információ</string>
     <!-- Filesystem Info Dialog * Tab * Disk Usage -->
-    <string name="filesystem_info_dialog_tab_disk_usage">Tárhely használat</string>
+    <string name="filesystem_info_dialog_tab_disk_usage">Tárhelyhasználat</string>
     <!-- Filesystem Info Dialog * Status Label -->
     <string name="filesystem_info_dialog_status">Státusz:</string>
     <!-- Filesystem Info Dialog * Mount Point Label -->
@@ -212,11 +212,11 @@
     <!-- Fso Properties * Not allowed message -->
     <string name="fso_properties_permissions_not_allowed_msg">A jogosultság állítása nem engedélyezett biztonságos módban. Érintse meg a rendszergazda módba való váltáshoz.</string>
     <!-- Fso Properties * Failed to change owner to fso -->
-    <string name="fso_properties_failed_to_change_owner_msg">A tulajdonos váltása sikertelen.\n\nBiztonsági okoból, néhány fájlrendszer, mint az SD-kártyák, nem engedélyezik a tulajdonos megváltoztatását.</string>
+    <string name="fso_properties_failed_to_change_owner_msg">A tulajdonos váltása sikertelen.\n\nBiztonsági okoból néhány fájlrendszer, mint az SD-kártyák, nem engedélyezik a tulajdonos megváltoztatását.</string>
     <!-- Fso Properties * Failed to change group to fso -->
-    <string name="fso_properties_failed_to_change_group_msg">A csoport váltása sikertelen.\n\nBiztonsági okoból, néhány fájlrendszer, mint az SD-kártyák, nem engedélyezik a csoport megváltoztatását.</string>
+    <string name="fso_properties_failed_to_change_group_msg">A csoport váltása sikertelen.\n\nBiztonsági okoból néhány fájlrendszer, mint az SD-kártyák, nem engedélyezik a csoport megváltoztatását.</string>
     <!-- Fso Properties * Failed to change group to fso -->
-    <string name="fso_properties_failed_to_change_permission_msg">A jogosultság megváltoztatása sikertelen.\n\nBiztonsági okoból, néhány fájlrendszer, mint az SD-kártyák, nem engedélyezik a jogosultságok megváltoztatását.</string>
+    <string name="fso_properties_failed_to_change_permission_msg">A jogosultság megváltoztatása sikertelen.\n\nBiztonsági okoból néhány fájlrendszer, mint az SD-kártyák, nem engedélyezik a jogosultságok megváltoztatását.</string>
     <!-- Fso Properties Dialog * Title -->
     <string name="fso_properties_dialog_title">Tulajdonságok</string>
     <!-- Fso Properties Dialog * Tab * Info -->
@@ -248,14 +248,14 @@
 
     <!-- Fso Properties Dialog * Folders -->
     <plurals name="fso_properties_dialog_folders">
-      <item quantity="zero">0 könyvtár</item>
-      <item quantity="one">1 könyvtár</item>
+      <!--<item quantity="zero">0 könyvtár</item>
+      <item quantity="one">1 könyvtár</item>-->
       <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> könyvtár</item>
     </plurals>
     <!-- Fso Properties Dialog * Files -->
     <plurals name="fso_properties_dialog_files">
-      <item quantity="zero">0 fájl</item>
-      <item quantity="one">1 fájl</item>
+      <!--<item quantity="zero">0 fájl</item>
+      <item quantity="one">1 fájl</item>-->
       <item quantity="other"><xliff:g id="files">%1$d</xliff:g> fájl</item>
     </plurals>
 
@@ -273,13 +273,13 @@
     <!-- Search * Voice search hint message -->
     <string name="search_voice_hint">Mondja ki a keresést</string>
     <!-- Search * Search error message -->
-    <string name="search_error_msg">A keresés közben hiba történt. Nincs találat.</string>
+    <string name="search_error_msg">Hiba történt keresés közben. Nincs találat.</string>
     <!-- Search * Search no results message -->
     <string name="search_no_results_msg">Nincs találat.</string>
     <!-- Search * Search found items -->
     <plurals name="search_found_items">
       <item quantity="zero">Nem található elem</item>
-      <item quantity="one">1 találat</item>
+      <!--<item quantity="one">1 találat</item>-->
       <item quantity="other"><xliff:g id="count">%d</xliff:g> találat</item>
     </plurals>
     <!-- Search * Number of items found in directory -->
@@ -289,7 +289,7 @@
     <!-- Search * Confirm search -->
     <string name="search_few_characters_title">Keresés megerősítése</string>
     <!-- Search * Some terms of the search are too small. The operation could be very costly -->
-    <string name="search_few_characters_msg">Néhány keresési kifejezés kevés számú karaktert tartalmaz. A művelet sokáig eltarthat és megterhelheti a rendszert.\n\nBiztosan folytatja?</string>
+    <string name="search_few_characters_msg">Néhány keresési kifejezés túl rövid. A művelet sokáig eltarthat és megterhelheti a rendszert.\n\nBiztosan folytatja?</string>
     <!-- Search * Searching dialog title -->
     <string name="searching">Kérem várjon\u2026</string>
     <!-- Search * Searching label -->
@@ -303,17 +303,17 @@
     <!-- Editor * Invalid file message -->
     <string name="editor_invalid_file_msg">Érvénytelen fájl.</string>
     <!-- Editor * File not found message -->
-    <string name="editor_file_not_found_msg">Fájl nem található.</string>
+    <string name="editor_file_not_found_msg">A fájl nem található.</string>
     <!-- Editor * File size exceed the limit -->
-    <string name="editor_file_exceed_size_msg">A fájl túl nagy ahhoz, hogy ezen az eszközön megnyithassa.</string>
+    <string name="editor_file_exceed_size_msg">A fájl túl nagy, ezen az eszközön nem megnyitható.</string>
     <!-- Editor * Editor is dirty, ask the user * Dialog title -->
     <string name="editor_dirty_ask_title">Kilépés megerősítése</string>
     <!-- Editor * Editor is dirty, ask the user * Dialog message -->
-    <string name="editor_dirty_ask_msg">El nem mentett módosítások.\n\nKilép mentés nélkül?</string>
+    <string name="editor_dirty_ask_msg">Nem mentette el a módosításokat.\n\nMindenképpen kilép?</string>
     <!-- Editor * Save operation success -->
     <string name="editor_successfully_saved">A fájl sikeresen elmentve.</string>
     <!-- Editor * Read-only file mode -->
-    <string name="editor_read_only_mode">A fájl csak olvashatóként van megnyitva.</string>
+    <string name="editor_read_only_mode">A fájl csak olvasható.</string>
 
     <!-- Bookmarks * Bookmarks activity title -->
     <string name="bookmarks">Könyvjelzők</string>
@@ -335,7 +335,7 @@
     <!-- Initial directory label -->
     <string name="initial_directory_label">Válasszon kezdőkonyvtárat:</string>
     <!-- Initial directory is relative -->
-    <string name="initial_directory_relative_msg">A relatív útvonal nem engedélyezett.</string>
+    <string name="initial_directory_relative_msg">Relatív útvonalak nem használhatóak.</string>
     <!-- Initial directory error message -->
     <string name="initial_directory_error_msg">Hiba történt a kezdőkönyvtár mentésekor.</string>
 
@@ -380,9 +380,9 @@
     <!-- Waiting dialog * Initializing the dialog -->
     <string name="waiting_dialog_analizing_msg"><![CDATA[<b>Elemzés\u2026</b>]]></string>
     <!-- Extracting * Success message -->
-    <string name="msgs_extracting_success">A kitömörítés sikeresen befejeződött. Az adatokat a következő helyen találja <xliff:g id="destination">%1$s</xliff:g>.</string>
+    <string name="msgs_extracting_success">A kitömörítés sikeresen befejeződött. Az adatokat a következő helyen találja: <xliff:g id="destination">%1$s</xliff:g>.</string>
     <!-- Compressing * Success message -->
-    <string name="msgs_compressing_success">A tömörítés sikeresen befejeződött. Az adatokat a következő helyen találja <xliff:g id="destination">%1$s</xliff:g>.</string>
+    <string name="msgs_compressing_success">A tömörítés sikeresen befejeződött. Az adatokat a következő helyen találja: <xliff:g id="destination">%1$s</xliff:g>.</string>
 
     <!-- Actions Dialog * Title -->
     <string name="actions_dialog_title">Műveletek</string>
@@ -447,9 +447,9 @@
     <!-- Enter Name Dialog * Message * Empty name -->
     <string name="input_name_dialog_message_empty_name">A név mező nem lehet üres.</string>
     <!-- Enter Name Dialog * Message * Invalid name -->
-    <string name="input_name_dialog_message_invalid_path_name">Helytelen név. A \'<xliff:g id="invalid_characters">%1$s</xliff:g>\' karakterek nincsenek engedélyezve.</string>
+    <string name="input_name_dialog_message_invalid_path_name">Helytelen név. A \'<xliff:g id="invalid_characters">%1$s</xliff:g>\' karakterek nem megengedettek.</string>
     <!-- Enter Name Dialog * Message * Invalid name -->
-    <string name="input_name_dialog_message_invalid_name">Helytelen név. A \'.\' és a \'..\' nincs enegélyezve.</string>
+    <string name="input_name_dialog_message_invalid_name">Helytelen név. A \'.\' és a \'..\' nem megengedett.</string>
     <!-- Enter Name Dialog * Message * Name exists -->
     <string name="input_name_dialog_message_name_exists">A név már létezik.</string>
 
@@ -536,18 +536,18 @@
     <!-- Preferences * About title -->
     <string name="pref_about">Névjegy</string>
     <!-- Preferences * About summary -->
-    <string name="pref_about_summary">Fájl kezelő v<xliff:g id="version">%1$s</xliff:g> \nCopyright \u00A9 2012 The CyanogenMod Project</string>
+    <string name="pref_about_summary">Fájlkezelő v<xliff:g id="version">%1$s</xliff:g> \nCopyright \u00A9 2012 The CyanogenMod Project</string>
 
     <!-- Preferences * General * Behaviour category -->
     <string name="pref_general_behaviour_category">Általános</string>
     <!-- Preferences * General * Case sensitive sort title -->
     <string name="pref_case_sensitive_sort">Kis-/nagybetű helyes rendezés</string>
     <!-- Preferences * General *Disk usage warning level title -->
-    <string name="pref_disk_usage_warning_level">Tárterület telítettség figyelmeztetés</string>
+    <string name="pref_disk_usage_warning_level">Figyelmeztetés kevés tárterületnél</string>
     <!-- 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">Tárterület használat megjelenítése más színnel, amikor a szabad hely eléri a <xliff:g id="level">%1$s</xliff:g> százalékot.</string>
+    <string name="pref_disk_usage_warning_level_summary" formatted="false">Tárterület-használat megjelenítése más színnel, amikor az eléri a <xliff:g id="level">%1$s</xliff:g> százalékot.</string>
     <!-- Preferences * General * Compute folder statistics title -->
     <string name="pref_compute_folder_statistics">Mappa statisztika számítása</string>
     <!-- Preferences * General * Compute folder statistics summary on -->
@@ -567,11 +567,11 @@
     <!-- Preferences * General * Prompt user mode -->
     <string name="pref_access_mode_prompt">Rákérdezéses mód</string>
     <!-- Preferences * General * Prompt user mode summary -->
-    <string name="pref_access_mode_prompt_summary">Rákérdezés a felhasználótól.\n\nAz alkalmazás teljes jogkörrel hozzáfér a fájlrendszerhez, de a művelet végrehajtása előtt rákérdez a felhasználótól.</string>
+    <string name="pref_access_mode_prompt_summary">Rákérdezéses mód\n\nAz alkalmazás teljes jogkörrel hozzáfér a fájlrendszerhez, de kényes művelet végrehajtása előtt engedélyt kér a felhasználótól.</string>
     <!-- Preferences * General * Root access mode -->
     <string name="pref_access_mode_root">Rendszergazda mód</string>
     <!-- Preferences * General * Root access mode summary -->
-    <string name="pref_access_mode_root_summary">Rendszergazda mód\n\nFigyelmeztetés! Ez a mód lehetővé teszi, hogy károsítsa az eszközt. Az Ön felelőssége annak biztosítása, hogy a művelet biztonságos legyen</string>
+    <string name="pref_access_mode_root_summary">Rendszergazda mód\n\nFigyelem! Ebben a módban semmi nem akadályozza meg, hogy egy helytelen művelet tönkretegye az eszközét. Csak saját felelősségére használja!</string>
     <!-- Preferences * Search * Results category -->
     <string name="pref_search_results_category">Találatok</string>
     <!-- Preferences * Search * Show relevance widget -->
@@ -585,15 +585,15 @@
     <!-- Preferences * Search * Sort results mode. None -->
     <string name="pref_sort_search_results_mode_name">Név szerint</string>
     <!-- Preferences * Search * Sort results mode. Relevance -->
-    <string name="pref_sort_search_results_mode_relevance">Relevancia szerint</string>
+    <string name="pref_sort_search_results_mode_relevance">Találati pontosság szerint</string>
     <!-- Preferences * Search * Privacity category -->
     <string name="pref_search_privacity_category">Titoktartás</string>
     <!-- Preferences * Search * Save search terms -->
     <string name="pref_save_search_terms">Keresési feltételek elmentése</string>
     <!-- Preferences * Search * Save search terms summary on -->
-    <string name="pref_save_search_terms_on">Keresési feltételek el lesznek mentve a használható javaslatok érdekében</string>
+    <string name="pref_save_search_terms_on">A keresési feltételek el lesznek mentve a használható javaslatok érdekében</string>
     <!-- Preferences * Search * Save search terms summary off -->
-    <string name="pref_save_search_terms_off">Keresési feltételek nem lesznek elmentve</string>
+    <string name="pref_save_search_terms_off">A keresési feltételek nem lesznek elmentve</string>
     <!-- Preferences * Search * Remove saved search terms -->
     <string name="pref_remove_saved_search_terms">Keresési feltételek törlése</string>
     <!-- Preferences * Search * Remove saved search terms summary -->
@@ -605,9 +605,9 @@
     <!-- Preferences * Themes * Set theme button -->
     <string name="pref_themes_set_theme">Téma beállítása</string>
     <!-- Preferences * Themes * No preview -->
-    <string name="pref_themes_no_preview">Nincs előnézeti\nkép</string>
+    <string name="pref_themes_no_preview">Nincs előnézeti kép</string>
     <!-- Preferences * Themes * Confirmation message -->
-    <string name="pref_themes_confirmation">Téma sikeresen beállítva.</string>
+    <string name="pref_themes_confirmation">Téma beállítva.</string>
     <!-- Preferences * Themes * Theme not found message -->
     <string name="pref_themes_not_found">Nem található téma.</string>
 
@@ -615,7 +615,7 @@
     <string name="pref_debug_traces">Hibakeresési napló</string>
 
     <!-- Themes * Default theme name -->
-    <string name="theme_default_name">Világos Theme</string>
+    <string name="theme_default_name">Világos téma</string>
     <!-- Themes * Default theme description -->
     <string name="theme_default_description">Világos téma a CyanogenMod Fájlkezelőhöz.</string>
     <!-- Themes * Default theme author -->
@@ -630,6 +630,6 @@
     <!-- Welcome Dialog * Title -->
     <string name="welcome_title">Üdvözöljük</string>
     <!-- Welcome Dialog * Message -->
-    <string name="welcome_msg">Üdvözöli a CyanogenMod fájlkezelő.\n\nEz az alkalmazás lehetővé teszi a fájlrendszer tallózását és olyan műveletek végrehajtását is, mellyel károsodhat az eszköz. A károsodás elkerülése érdekében az alkalmazás védett, alacsony jogosultsággal indul.\n\nLehetősége van a speciális beállításoknál a teljes privilegizált módú futtatásra is. Az Ön felelőssége annak biztosítása, hogy a művelet ne károsítsa a rendszert.\n\nA CyanogenMod csapata.\n</string>
+    <string name="welcome_msg">Üdvözöli a CyanogenMod fájlkezelő.\n\nEz az alkalmazás lehetővé teszi a fájlrendszer böngészését és olyan műveletek végrehajtását is, melyek esetleg károsíthatják az eszköz. A károsodás elkerülése érdekében az alkalmazás védett, alacsony jogosultsággal indul.\n\nLehetősége van a speciális beállításoknál a teljes privilegizált módú futtatásra is. Az Ön felelőssége annak biztosítása, hogy az egyes műveletek ne károsítsák a rendszert.\n\nA CyanogenMod csapata.\n</string>
 
 </resources>
diff --git a/themes/res/values-hu/strings.xml b/themes/res/values-hu/strings.xml
new file mode 100644
index 000000000..a2ef24858
--- /dev/null
+++ b/themes/res/values-hu/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!-- The name of the application -->
+  <string name="app_name">Fájlkezelő témák</string>
+  <!-- The description of the application -->
+  <string name="app_description">Témák a CyanogenMod Fájlkezelőhöz.</string>
+
+  <!-- The dark theme name -->
+  <string name="dark_theme_name">Sötét téma</string>
+  <!-- The dark theme description -->
+  <string name="dark_theme_desc">Sötét téma a CyanogenMod Fájlkezelőhöz.</string>
+
+</resources>

From b3d9e642a5f1d7483d579c18f74255a830aa4a2c Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Thu, 15 Nov 2012 21:52:00 +0100
Subject: [PATCH 04/11] Issue 6624: CM File manager: Mount RW does not work if
 i slide the slider from ro to rw.

Issue: http://code.google.com/p/cyanogenmod/issues/detail?id=6624
Changed onClickListener for OnCheckedChangeListener for the switch control.
The OnCheckedChangeListener listener handles both events: click and slide.

Change-Id: I9b8c81d4d7489fce2cbef1f4799a12266cb14acf
---
 .../ui/dialogs/FilesystemInfoDialog.java      | 73 +++++++++++--------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java
index 19ca29342..b9752df4d 100644
--- a/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java
@@ -23,6 +23,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -46,7 +48,7 @@
  * A class that wraps a dialog for showing information about a mount point.<br />
  * This class display information like mount point name, device name, size, type, ...
  */
-public class FilesystemInfoDialog implements OnClickListener {
+public class FilesystemInfoDialog implements OnClickListener, OnCheckedChangeListener {
 
     /**
      * An interface to communicate when the user change the mount state
@@ -178,7 +180,7 @@ private void fillData(View contentView) {
 
         //Gets text views
         this.mSwStatus = (Switch)contentView.findViewById(R.id.filesystem_info_status);
-        this.mSwStatus.setOnClickListener(this);
+        this.mSwStatus.setOnCheckedChangeListener(this);
         TextView tvMountPoint =
                 (TextView)contentView.findViewById(R.id.filesystem_info_mount_point);
         TextView tvDevice = (TextView)contentView.findViewById(R.id.filesystem_info_device);
@@ -290,14 +292,50 @@ public void run() {
                 });
                 break;
 
+            case R.id.filesystem_info_msg:
+                //Change the console
+                boolean superuser = ConsoleBuilder.changeToPrivilegedConsole(this.mContext);
+                if (superuser) {
+                    this.mInfoMsgView.setOnClickListener(null);
+
+                    // Is filesystem able to be mounted?
+                    boolean mountAllowed = MountPointHelper.isMountAllowed(this.mMountPoint);
+                    if (mountAllowed) {
+                        this.mInfoMsgView.setVisibility(View.GONE);
+                        this.mInfoMsgView.setBackground(null);
+                        this.mSwStatus.setEnabled(true);
+                        this.mIsMountAllowed = true;
+                        break;
+                    }
+
+                    // Show the message
+                    this.mInfoMsgView.setText(
+                            this.mContext.getString(
+                                    R.string.filesystem_info_cant_be_mounted_msg));
+                    this.mInfoMsgView.setVisibility(View.VISIBLE);
+                    this.mIsMountAllowed = false;
+                }
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        switch (buttonView.getId()) {
             case R.id.filesystem_info_status:
                 //Mount the filesystem
-                Switch sw = (Switch)v;
+                Switch sw = (Switch)buttonView;
                 boolean ret = false;
                 try {
                     ret = CommandHelper.remount(
                             this.mContext,
-                            this.mMountPoint, sw.isChecked(), null);
+                            this.mMountPoint, isChecked, null);
                     //Hide warning message
                     this.mInfoMsgView.setVisibility(View.GONE);
                     //Communicate the mount change
@@ -315,32 +353,7 @@ public void run() {
                     //Show warning message
                     this.mInfoMsgView.setText(R.string.filesystem_info_mount_failed_msg);
                     this.mInfoMsgView.setVisibility(View.VISIBLE);
-                    sw.setChecked(!sw.isChecked());
-                }
-                break;
-
-            case R.id.filesystem_info_msg:
-                //Change the console
-                boolean superuser = ConsoleBuilder.changeToPrivilegedConsole(this.mContext);
-                if (superuser) {
-                    this.mInfoMsgView.setOnClickListener(null);
-
-                    // Is filesystem able to be mounted?
-                    boolean mountAllowed = MountPointHelper.isMountAllowed(this.mMountPoint);
-                    if (mountAllowed) {
-                        this.mInfoMsgView.setVisibility(View.GONE);
-                        this.mInfoMsgView.setBackground(null);
-                        this.mSwStatus.setEnabled(true);
-                        this.mIsMountAllowed = true;
-                        break;
-                    }
-
-                    // Show the message
-                    this.mInfoMsgView.setText(
-                            this.mContext.getString(
-                                    R.string.filesystem_info_cant_be_mounted_msg));
-                    this.mInfoMsgView.setVisibility(View.VISIBLE);
-                    this.mIsMountAllowed = false;
+                    sw.setChecked(!isChecked);
                 }
                 break;
 

From 41caa1499be93e47e89de175e2562272caa38e21 Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Thu, 15 Nov 2012 23:47:31 +0100
Subject: [PATCH 05/11] CMFileManager: Overlay activity must use overlay style

Use FileManager.Theme.Holo.Light.Overlay and FileManager.Theme.Holo.Overlay for overlay
activities

Change-Id: I722b77e85753a81d360c87abc6b377acdbd147fd
---
 .../cyanogenmod/filemanager/activities/ChangeLogActivity.java   | 2 +-
 src/com/cyanogenmod/filemanager/activities/PickerActivity.java  | 2 +-
 .../cyanogenmod/filemanager/activities/ShortcutActivity.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java b/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
index 889b6512d..ae3a7c8f1 100644
--- a/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
@@ -160,7 +160,7 @@ public void onCancel(DialogInterface dialog) {
      */
     void applyTheme() {
         Theme theme = ThemeManager.getCurrentTheme(this);
-        theme.setBaseTheme(this, false);
+        theme.setBaseTheme(this, true);
     }
 
 }
diff --git a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
index d40dcba65..e40106411 100644
--- a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
@@ -366,7 +366,7 @@ public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
      */
     void applyTheme() {
         Theme theme = ThemeManager.getCurrentTheme(this);
-        theme.setBaseTheme(this, false);
+        theme.setBaseTheme(this, true);
 
         // View
         theme.setBackgroundDrawable(this, this.mRootView, "background_drawable"); //$NON-NLS-1$
diff --git a/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java b/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java
index 4578ce6b7..cf4377066 100644
--- a/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java
@@ -238,7 +238,7 @@ public void onCancel(DialogInterface dialog) {
      */
     void applyTheme() {
         Theme theme = ThemeManager.getCurrentTheme(this);
-        theme.setBaseTheme(this, false);
+        theme.setBaseTheme(this, true);
     }
 
 }

From 467118952ad95f800ec3f2be753ae59e8177fd4e Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Thu, 15 Nov 2012 23:56:40 +0100
Subject: [PATCH 06/11] CMFileManager: Fix invalid resource on create shortcut

Resource must be drawable and not string. Otherwise the resource is not found
and shortcut is not created.
activities

Change-Id: I6f526b2e8ca4458e6fa8b1bd80667e153f664cec
---
 .../filemanager/ui/policy/IntentsActionPolicy.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java
index be0533b7e..004719b0e 100644
--- a/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java
@@ -265,7 +265,7 @@ public static void createShortcut(Context ctx, FileSystemObject fso) {
             String resid = MimeTypeHelper.getIcon(ctx, fso);
             int dwid =
                     ResourcesHelper.getIdentifier(
-                            ctx.getResources(), "string", resid); //$NON-NLS-1$
+                            ctx.getResources(), "drawable", resid); //$NON-NLS-1$
 
             // The intent to send to broadcast for register the shortcut intent
             Intent intent = new Intent();
@@ -324,4 +324,4 @@ private static List<Intent> createEditorIntent(Context ctx, FileSystemObject fso
 
         return intents;
     }
-}
\ No newline at end of file
+}

From 5056c53f5893ea8a103459cccdb490bde6a61e70 Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Sat, 17 Nov 2012 02:04:40 +0100
Subject: [PATCH 07/11] CMFileManager: Remove duplicate code

Remove duplicate code for creation of privileged console

Change-Id: I124286f6f33385f8c0faa98406b12fba67310775
---
 .../filemanager/console/ConsoleBuilder.java      | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java b/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java
index 34ff8c4e1..331e82450 100644
--- a/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java
+++ b/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java
@@ -375,19 +375,9 @@ public static Console createAndCheckPrivilegedConsole(
             throws FileNotFoundException, IOException, InvalidCommandDefinitionException,
             ConsoleAllocException, InsufficientPermissionsException {
         try {
-            PrivilegedConsole console = new PrivilegedConsole(initialDirectory);
-            console.setBufferSize(context.getResources().getInteger(R.integer.buffer_size));
-            console.alloc();
-            if (console.getIdentity().getUser().getId() != ROOT_UID) {
-                //The console is not a privileged console
-                try {
-                    console.dealloc();
-                } catch (Throwable ex) {
-                    /**NON BLOCK**/
-                }
-                throw new InsufficientPermissionsException(null);
-            }
-            return console;
+            // Create the privileged console
+            return createPrivilegedConsole(context, initialDirectory);
+
         } catch (ConsoleAllocException caEx) {
             //Show a message with the problem?
             Log.w(TAG, context.getString(R.string.msgs_privileged_console_alloc_failed), caEx);

From 9c866c8abc9b3dcfd7d31a469a49968f1e6e968a Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date: Sat, 17 Nov 2012 01:47:24 +0100
Subject: [PATCH 08/11] Fix possible NPE, and log path of "not found" commands

Patchset 2: Added more log from https://github.com/tpruvot/android_packages_apps_CMFileManager/commit/6634611ba820f2a2c90f6ed9a7658f1d076bb32c

Change-Id: I1612e16b7e144f688909501434230f7e55d5d459
---
 .../filemanager/commands/shell/IdentityCommand.java           | 3 ++-
 src/com/cyanogenmod/filemanager/commands/shell/Shell.java     | 4 ++++
 src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java   | 4 ++--
 src/com/cyanogenmod/filemanager/util/ParseHelper.java         | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/com/cyanogenmod/filemanager/commands/shell/IdentityCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/IdentityCommand.java
index 339637a60..e87a90eca 100644
--- a/src/com/cyanogenmod/filemanager/commands/shell/IdentityCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/IdentityCommand.java
@@ -89,7 +89,8 @@ public void parse(String in, String err) throws ParseException {
             //At least uid and gid must be present
             if (!p.containsKey(UID) && !p.containsKey(GID)) {
                 throw new ParseException(
-                        String.format("no %s or %s present", UID, GID), 0); //$NON-NLS-1$
+                        String.format(
+                                "no %s or %s present in %s", UID, GID, szLine), 0); //$NON-NLS-1$
             }
 
             //1.- Extract user
diff --git a/src/com/cyanogenmod/filemanager/commands/shell/Shell.java b/src/com/cyanogenmod/filemanager/commands/shell/Shell.java
index 648dcfd13..779796d77 100644
--- a/src/com/cyanogenmod/filemanager/commands/shell/Shell.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/Shell.java
@@ -24,6 +24,7 @@
 import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 import com.cyanogenmod.filemanager.console.ReadOnlyFilesystemException;
 
+import android.util.Log;
 
 /**
  * An abstract class that represents a command to wrap others commands,
@@ -33,6 +34,8 @@ public abstract class Shell extends Command {
 
     private int mPid;
 
+    private final String TAG = "Shell";
+
     /**
      * @Constructor of <code>Shell</code>
      *
@@ -72,6 +75,7 @@ public void checkExitCode(int exitCode)
             throws InsufficientPermissionsException, CommandNotFoundException, ExecutionException {
         //Command not found
         if (exitCode == 127) {
+            Log.w(TAG, getCommand() + " " + getArguments() + ": error");
             throw new CommandNotFoundException(getId());
         }
         //No exit code
diff --git a/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java b/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java
index 331e82450..1552abd95 100644
--- a/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java
+++ b/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java
@@ -115,7 +115,7 @@ public static Console getConsole(Context context, boolean createIfNotExists)
     public static boolean changeToNonPrivilegedConsole(Context context) {
 
         //Check the current console
-        if (sHolder.getConsole() instanceof NonPriviledgeConsole) {
+        if (sHolder != null && sHolder.getConsole() instanceof NonPriviledgeConsole) {
             //The current console is non-privileged. Not needed
             return true;
         }
@@ -147,7 +147,7 @@ public static boolean changeToNonPrivilegedConsole(Context context) {
     public static boolean changeToPrivilegedConsole(Context context) {
 
         //Destroy and create the new console
-        if (sHolder.getConsole() instanceof PrivilegedConsole) {
+        if (sHolder != null && sHolder.getConsole() instanceof PrivilegedConsole) {
             //The current console is privileged. Not needed
             return true;
         }
diff --git a/src/com/cyanogenmod/filemanager/util/ParseHelper.java b/src/com/cyanogenmod/filemanager/util/ParseHelper.java
index f59b98008..43c4b6e7e 100644
--- a/src/com/cyanogenmod/filemanager/util/ParseHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/ParseHelper.java
@@ -152,7 +152,8 @@ public static FileSystemObject toFileSystemObject(
         Pattern pattern = Pattern.compile(DATE_PATTERN);
         Matcher matcher = pattern.matcher(raw);
         if (!matcher.find()) {
-            throw new ParseException("last modification date not found", 0); //$NON-NLS-1$
+            throw new ParseException(
+                    "last modification date not found in " + raw, 0); //$NON-NLS-1$
         }
         Date dLastModified = null;
         try {

From 660bb5d8e7f7d43fc9d8b6aa8497d197b6f4a902 Mon Sep 17 00:00:00 2001
From: DelPETER <delphinpeter@gmail.com>
Date: Tue, 13 Nov 2012 23:15:45 +0100
Subject: [PATCH 09/11] CMFileManager : French translation correction

Patch 5: No-break spaces, update typo, more understandable, ...
Patch 6: Add themes
Patch 7: Dark theme, fichiers, ...

Change-Id: I092625fe29534c24f02476c8cafc9a81d79d67f1
---
 res/values-fr/strings.xml        | 305 ++++++++++++++++---------------
 themes/res/values-fr/strings.xml |  32 ++++
 2 files changed, 194 insertions(+), 143 deletions(-)
 create mode 100644 themes/res/values-fr/strings.xml

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4e2f329d3..a613de70a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,9 +16,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <!-- The name of the application -->
-  <string name="app_name">Explorateur de fichier</string>
+  <string name="app_name">Explorateur de fichiers</string>
   <!-- The description of the application -->
-  <string name="app_description">Explorateur de fichier CyanogenMod.</string>
+  <string name="app_description">Explorateur de fichiers CyanogenMod</string>
 
 <!-- I don't know if I must translate this section -->
   <!-- Devices types -->
@@ -34,20 +34,20 @@
   <string name="overwrite">Ecraser</string>
 
    <!-- The search result name -->
-  <string name="search_result_name">Rechercher: <xliff:g id="terms">%1$s</xliff:g></string>
+  <string name="search_result_name">Rechercher\u00A0: <xliff:g id="terms">%1$s</xliff:g></string>
 
   <!-- Loading waiting message -->
-  <string name="loading_message">Chargement \u2026;</string>
+  <string name="loading_message">Chargement\u2026</string>
 
   <!-- Cancelled message -->
-  <string name="cancelled_message">Annulé.</string>
+  <string name="cancelled_message">Annulé</string>
   <!-- Error message -->
-  <string name="error_message">Erreur.</string>
+  <string name="error_message">Erreur</string>
 
   <!-- Warning dialog title -->
   <string name="warning_title">Attention</string>
   <!-- Error dialog title -->
-  <string name="error_title">Erreur detecté</string>
+  <string name="error_title">Erreur detectée</string>
   <!-- Confirm operation dialog title -->
   <string name="confirm_operation">Confirmer l\'opération</string>
   <!-- Confirm overwrite dialog title -->
@@ -58,64 +58,64 @@
   <!--  A console couldn't be created. Ask the user to change the access mode. Dialog Title -->
   <string name="msgs_change_to_prompt_access_mode_title">Confirmer le changement</string>
   <!--  A console couldn't be created. Ask the user to change the access mode. Dialog Message -->
-  <string name="msgs_change_to_prompt_access_mode_msg">Impossible de passer en mode Root. Retour au mode normal.\n\nEffectuer le changement?</string>
+  <string name="msgs_change_to_prompt_access_mode_msg">Impossible de passer en mode Root. Retour au mode normal.\n\nEffectuer le changement\u00A0?</string>
 
   <!-- A console couldn't be created. Without privileges, the application won't work -->
-  <string name="msgs_cant_create_console">Impossible d\'obtenir les privilèges requis pour fonctionner.</string>
+  <string name="msgs_cant_create_console">Impossible d\'obtenir les privilèges requis pour fonctionner</string>
   <!-- The message shown when an allocation of a privileged console fails, and a non privileged is allocated -->
   <string name="msgs_privileged_console_alloc_failed">Impossible de passer en mode Root. Retour au mode normal.</string>
   <!-- The selected setting was not applied or stored -->
-  <string name="msgs_settings_save_failure">Le réglage ne ​​peut être appliqué ou enregistré.</string>
+  <string name="msgs_settings_save_failure">Impossible d\'appliquer ou d\'enregistrer le réglage</string>
   <!-- The initial directory has an invalid or inaccessible reference -->
-  <string name="msgs_settings_invalid_initial_directory">Le dossier d\'acceuil "<xliff:g id="initial_dir">%1$s</xliff:g>" est invalide. Changement vers le dossier Root.</string>
+  <string name="msgs_settings_invalid_initial_directory">Le dossier d\'accueil "<xliff:g id="initial_dir">%1$s</xliff:g>" est invalide. Changement vers le dossier Root.</string>
 
   <!-- Success -->
-  <string name="msgs_success">L\'opération a réussie.</string>
+  <string name="msgs_success">Opération réussie</string>
   <!-- Unknown error -->
-  <string name="msgs_unknown">Une erreur a été détecté. L\'opération n\'a pas réussi.</string>
+  <string name="msgs_unknown">Une erreur a été détectée. L\'opération a échoué</string>
   <!-- When an operation requires elevated privileged (normally caused for the use of a non-privileged console) -->
-  <string name="msgs_insufficient_permissions">Cette opération nécessite une élévation des droits. Tentative d\'accés Root.</string>
+  <string name="msgs_insufficient_permissions">Cette opération nécessite une élévation des droits. Tentative d\'accès Root.</string>
   <!-- The file or directory was not found -->
-  <string name="msgs_file_not_found">Le fichier ou le dossier n\'a pas été trouvé.</string>
+  <string name="msgs_file_not_found">Fichier ou dossier introuvable</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">La commande n\'a pas été trouvé ou a une définition non valide.</string>
+  <string name="msgs_command_not_found">Commande introuvable ou définition invalide</string>
   <!-- I/O exception -->
-  <string name="msgs_io_failed">Lecture/Ecriture échouée.</string>
+  <string name="msgs_io_failed">Lecture/Ecriture échouée</string>
   <!-- Operation timeout detected -->
-  <string name="msgs_operation_timeout">L\'opération a expiré.</string>
+  <string name="msgs_operation_timeout">Opération expirée</string>
   <!-- The operation returns an invalid exit code -->
-  <string name="msgs_operation_failure">L\'opération a échoué.</string>
+  <string name="msgs_operation_failure">Opération échouée</string>
   <!-- A console couldn't be allocated -->
-  <string name="msgs_console_alloc_failure">Une erreur interne s\'est produite.</string>
+  <string name="msgs_console_alloc_failure">Erreur interne</string>
   <!-- An operation can't be cancelled -->
-  <string name="msgs_operation_can_not_be_cancelled">L\'opération ne peut pas être annulé.</string>
+  <string name="msgs_operation_can_not_be_cancelled">Impossible d\'annuler l\'opération</string>
   <!-- The operation requieres mount the file system prior to execute the command -->
   <string name="msgs_read_only_filesystem">Le système de fichiers est en lecture seul. Essayez de monter le système de fichiers en lecture-écriture avant de retenter l\'opération.</string>
   <!-- Illegal argument (normally caused by a development error when calling internal api) -->
-  <string name="msgs_illegal_argument">Argument illégal. invocation échoué.</string>
+  <string name="msgs_illegal_argument">Argument illégal. Invocation échouée.</string>
   <!-- The operation will cause inconsistencies -->
-  <string name="msgs_unresolved_inconsistencies">L\'opération n\'est pas autorisée car cela créerait des incohérences.</string>
+  <string name="msgs_unresolved_inconsistencies">Opération non autorisée pour cause d\'incohérences</string>
   <!-- Operation not permitted in current directory -->
-  <string name="msgs_operation_not_allowed_in_current_directory">L\'opération n\'est pas autorisée dans le dossier actuel.</string>
+  <string name="msgs_operation_not_allowed_in_current_directory">Opération non autorisée dans le dossier actuel</string>
 
   <!-- The advice message prior to exit the application -->
-  <string name="msgs_push_again_to_exit">Appuyez encore pour sortir.</string>
+  <string name="msgs_push_again_to_exit">Appuyer encore pour sortir</string>
 
   <!-- There is no registered application that can handle the mime-type -->
-  <string name="msgs_not_registered_app">Il n\'y a pas d\'application enregistré pour ouvrir le fichier sélectionné.</string>
+  <string name="msgs_not_registered_app">Aucune application disponible pour ouvrir le fichier sélectionné</string>
 
   <!-- Overwrite files? -->
-  <string name="msgs_overwrite_files">Certains fichiers existent déjà dans le dossier de destination.\n\nEcraser?</string>
+  <string name="msgs_overwrite_files">Certains fichiers existent déjà dans le dossier de destination.\n\nEcraser\u00A0?</string>
 
   <!-- The association of an action to the application failed -->
-  <string name="msgs_action_association_failed">Associer l\'action à l\'application a échoué.</string>
+  <string name="msgs_action_association_failed">Impossible d\'associer l\'action à l\'application</string>
 
   <!-- An operation requires elevated privileged. Ask the user. -->
-  <string name="advise_insufficient_permissions">L\'opération nécessite une élévation des priviléges.\n\nVoulez-vous passer en mode Root?</string>
+  <string name="advise_insufficient_permissions">L\'opération nécessite une élévation des privilèges.\n\nVoulez-vous passer en mode Root\u00A0?</string>
 
 
   <!-- The parent directory of the current directory in navigation view -->
-  <string name="parent_dir">Dossier parents</string>
+  <string name="parent_dir">Dossier parent</string>
   <!-- External storage descripton -->
   <string name="external_storage">Stockage externe</string>
   <!-- Usb storage descripton -->
@@ -128,7 +128,7 @@
   <!-- ActionBar Buttons * Layout Mode -->
   <string name="actionbar_button_layout_mode_cd">Mode d\'affichage</string>
   <!-- ActionBar Buttons * Other View Options -->
-  <string name="actionbar_button_other_view_options_cd">Autre option d\'affichage</string>
+  <string name="actionbar_button_other_view_options_cd">Autres options d\'affichage</string>
   <!-- ActionBar Buttons * Done -->
   <string name="actionbar_button_selection_done_cd">Terminé</string>
   <!-- ActionBar Buttons * Actions -->
@@ -163,24 +163,24 @@
   <string name="layout_details">Détails</string>
 
   <!-- Navigation View * View * Show folders first -->
-  <string name="cm_filemanager_show_dirs_first">Afficher les dossiers en premier</string>
+  <string name="cm_filemanager_show_dirs_first">Dossiers en premier</string>
   <!-- Navigation View * View * Show hidden files option -->
-  <string name="cm_filemanager_show_hidden">Afficher les fichiers cachés</string>
+  <string name="cm_filemanager_show_hidden">Fichiers cachés</string>
   <!-- Navigation View * View * Show system files option -->
-  <string name="cm_filemanager_show_system">Afficher les fichiers systèmes</string>
+  <string name="cm_filemanager_show_system">Fichiers systèmes</string>
   <!-- Navigation View * View * Show symlinks option -->
-  <string name="cm_filemanager_show_symlinks">Afficher les raccourcis</string>
+  <string name="cm_filemanager_show_symlinks">Raccourcis</string>
 
   <!-- Filesystem Info (no data). Dialog title -->
-  <string name="filesystem_info_warning_title">Pas d\'information</string>
+  <string name="filesystem_info_warning_title">Aucune information</string>
   <!-- Filesystem Info (no data). Dialog message -->
-  <string name="filesystem_info_warning_msg">Il n\'y a pas d\'information disponible pour le système de fichiers.</string>
+  <string name="filesystem_info_warning_msg">Aucune information disponible pour le système de fichiers</string>
   <!-- Filesystem Info * Filesystem couldn't be mounted -->
-  <string name="filesystem_info_cant_be_mounted_msg">Le système de fichier ne peut pas être monté/démonté.</string>
+  <string name="filesystem_info_cant_be_mounted_msg">Impossible de monter/démonter le système de fichiers</string>
   <!-- Filesystem Info * Not allowed message -->
-  <string name="filesystem_info_mount_not_allowed_msg">Les opérations de montage du système de fichiers ne sont pas autorisés en mode sécurisé. Appuyez pour passer en mode  Root.</string>
+  <string name="filesystem_info_mount_not_allowed_msg">Les opérations de montage du système de fichiers ne sont pas autorisées en mode sécurisé. Appuyez pour passer en mode Root.</string>
   <!-- Filesystem Info * Mount failed -->
-  <string name="filesystem_info_mount_failed_msg">L\'opération de montage du système de fichiers a échoué. Certains système de fichiers, comme les cartes SD, ne peuvent pas être monté car ils intégrent un système de fichier en lecture seul.</string>
+  <string name="filesystem_info_mount_failed_msg">Opération de montage du système de fichiers échouée. Certains systèmes de fichiers, comme les cartes SD, ne peuvent pas être monté car ils intègrent un système de fichier en lecture seul.</string>
   <!-- Filesystem Info Dialog * Title -->
   <string name="filesystem_info_dialog_title">Information du système de fichiers</string>
   <!-- Filesystem Info Dialog * Tab * Info -->
@@ -188,27 +188,27 @@
   <!-- Filesystem Info Dialog * Tab * Disk Usage -->
   <string name="filesystem_info_dialog_tab_disk_usage">Utilisation du disque</string>
   <!-- Filesystem Info Dialog * Status Label -->
-  <string name="filesystem_info_dialog_status">Statut:</string>
+  <string name="filesystem_info_dialog_status">Statut\u00A0:</string>
   <!-- Filesystem Info Dialog * Mount Point Label -->
-  <string name="filesystem_info_dialog_mount_point">Point de montage:</string>
+  <string name="filesystem_info_dialog_mount_point">Point de montage\u00A0:</string>
   <!-- Filesystem Info Dialog * Device Label -->
-  <string name="filesystem_info_dialog_device">Appareil:</string>
+  <string name="filesystem_info_dialog_device">Appareil\u00A0:</string>
   <!-- Filesystem Info Dialog * Type Label -->
-  <string name="filesystem_info_dialog_type">Type:</string>
+  <string name="filesystem_info_dialog_type">Type\u00A0:</string>
   <!-- Filesystem Info Dialog * Options Label -->
-  <string name="filesystem_info_dialog_options">Options:</string>
+  <string name="filesystem_info_dialog_options">Options\u00A0:</string>
   <!-- Filesystem Info Dialog * Dump/Pass Label -->
-  <string name="filesystem_info_dialog_dump_pass">Dump / Pass:</string>
+  <string name="filesystem_info_dialog_dump_pass">Dump/Pass\u00A0:</string>
   <!-- Filesystem Info Dialog * Total Disk Usage -->
-  <string name="filesystem_info_dialog_total_disk_usage">Total:</string>
+  <string name="filesystem_info_dialog_total_disk_usage">Total\u00A0:</string>
   <!-- Filesystem Info Dialog * Used Disk Usage -->
-  <string name="filesystem_info_dialog_used_disk_usage">Utilisé:</string>
+  <string name="filesystem_info_dialog_used_disk_usage">Utilisé\u00A0:</string>
   <!-- Filesystem Info Dialog * Free Disk Usage -->
-  <string name="filesystem_info_dialog_free_disk_usage">Libre:</string>
+  <string name="filesystem_info_dialog_free_disk_usage">Libre\u00A0:</string>
 
 
   <!-- Fso Properties * Not allowed message -->
-  <string name="fso_properties_permissions_not_allowed_msg">Les opération sur les permissions ne sont pas autorisé en mode sécurisé. Appuyez pour passer en mode Root.</string>
+  <string name="fso_properties_permissions_not_allowed_msg">Les opérations sur les permissions ne sont pas autorisées en mode sécurisé. Appuyez pour passer en mode Root.</string>
   <!-- Fso Properties * Failed to change owner to fso -->
   <string name="fso_properties_failed_to_change_owner_msg">Le changement de propriétaire a échoué.\n\nPour des raisons de sécurité, certains systèmes de fichiers, comme les cartes SD, ne permettent pas de changer de propriétaire.</string>
   <!-- Fso Properties * Failed to change group to fso -->
@@ -222,27 +222,27 @@
   <!-- Fso Properties Dialog * Tab * Permissions -->
   <string name="fso_properties_dialog_tab_permissions">Permissions</string>
   <!-- Fso Properties Dialog * Name Label -->
-  <string name="fso_properties_dialog_name">Nom:</string>
+  <string name="fso_properties_dialog_name">Nom\u00A0:</string>
   <!-- Fso Properties Dialog * Parent Folder Label -->
-  <string name="fso_properties_dialog_parent">Parent:</string>
+  <string name="fso_properties_dialog_parent">Parent\u00A0:</string>
   <!-- Fso Properties Dialog * Type Label -->
-  <string name="fso_properties_dialog_type">Type:</string>
+  <string name="fso_properties_dialog_type">Type\u00A0:</string>
   <!-- Fso Properties Dialog * Category Label -->
-  <string name="fso_properties_dialog_category">Categorie:</string>
+  <string name="fso_properties_dialog_category">Catégorie\u00A0:</string>
   <!-- Fso Properties Dialog * Link Label -->
-  <string name="fso_properties_dialog_link">Lien:</string>
+  <string name="fso_properties_dialog_link">Lien\u00A0:</string>
   <!-- Fso Properties Dialog * Size Label -->
-  <string name="fso_properties_dialog_size">Taille:</string>
+  <string name="fso_properties_dialog_size">Taille\u00A0:</string>
   <!-- Fso Properties Dialog * Contains Label -->
-  <string name="fso_properties_dialog_contains">Contenu:</string>
+  <string name="fso_properties_dialog_contains">Contenu\u00A0:</string>
   <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Dernière accés:</string>
+  <string name="fso_properties_dialog_date">Dernier accès\u00A0:</string>
   <!-- Fso Properties Dialog * Owner Label -->
-  <string name="fso_properties_dialog_owner">Propriétaire:</string>
+  <string name="fso_properties_dialog_owner">Propriétaire\u00A0:</string>
   <!-- Fso Properties Dialog * Group Label -->
-  <string name="fso_properties_dialog_group">Groupe:</string>
+  <string name="fso_properties_dialog_group">Groupe\u00A0:</string>
   <!-- Fso Properties Dialog * Others Label -->
-  <string name="fso_properties_dialog_others">Autres:</string>
+  <string name="fso_properties_dialog_others">Autres\u00A0:</string>
 
   <!-- Fso Properties Dialog * Folders -->
   <plurals name="fso_properties_dialog_folders">
@@ -260,12 +260,12 @@
   <!-- History * History activity title -->
   <string name="history">Historique</string>
   <!-- History * The history is empty -->
-  <string name="msgs_history_empty">L\'historique est vide.</string>
+  <string name="msgs_history_empty">Aucun historique</string>
   <!-- History * The history reference is not in the actual history list -->
-  <string name="msgs_history_unknown">Elément de l\'historique inconnu.</string>
+  <string name="msgs_history_unknown">Elément de l\'historique inconnu</string>
 
   <!-- Search * Search activity title -->
-  <string name="search">Résultat de la recherche</string>
+  <string name="search">Résultats de la recherche</string>
   <!-- Search * Search hint message -->
   <string name="search_hint">Recherche</string>
   <!-- Search * Voice search hint message -->
@@ -273,23 +273,23 @@
   <!-- Search * Search error message -->
   <string name="search_error_msg">Une erreur s\'est produite lors de la recherche. Aucun résultat trouvé.</string>
   <!-- Search * Search no results message -->
-  <string name="search_no_results_msg">Pas de résultat trouvé.</string>
+  <string name="search_no_results_msg">Aucun résultat trouvé</string>
   <!-- Search * Search found items -->
   <plurals name="search_found_items">
-    <item quantity="zero">Pas d\'éléments trouvés</item>
+    <item quantity="zero">Aucun élément trouvé</item>
     <item quantity="one">1 élément trouvé</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> éléments trouvés</item>
   </plurals>
   <!-- Search * Number of items found in directory -->
   <string name="search_found_items_in_directory"><xliff:g id="items">%1$s</xliff:g> dans <xliff:g id="path">%2$s</xliff:g></string>
   <!-- Search * Search query terms -->
-  <string name="search_terms"><![CDATA[<b>Termes:</b>]]> <xliff:g id="terms">%1$s</xliff:g></string>
+  <string name="search_terms"><![CDATA[<b>Termes :</b>]]> <xliff:g id="terms">%1$s</xliff:g></string>
   <!-- Search * Confirm search -->
   <string name="search_few_characters_title">Confirmer la recherche</string>
   <!-- Search * Some terms of the search are too small. The operation could be very costly -->
-  <string name="search_few_characters_msg">Certains des termes de recherche dispose d\'un petit nombre de caractères. L\'opération pourrait être très coûteux en temps et en ressources système.\n\nVoulez-vous continuer?</string>
+  <string name="search_few_characters_msg">Certains des termes de recherche disposent d\'un petit nombre de caractères. L\'opération pourrait être très coûteuse en temps et en ressources système.\n\nVoulez-vous continuer\u00A0?</string>
   <!-- Search * Searching dialog title -->
-  <string name="searching">Patientez \u2026;</string>
+  <string name="searching">Veuillez Patienter\u2026</string>
   <!-- Search * Searching label -->
   <string name="searching_action_label">Recherche en cours\u2026</string>
 
@@ -299,43 +299,43 @@
   <!-- Editor * Editor activity title -->
   <string name="editor">Editeur</string>
   <!-- Editor * Invalid file message -->
-  <string name="editor_invalid_file_msg">Fichier non valide.</string>
+  <string name="editor_invalid_file_msg">Fichier non valide</string>
   <!-- Editor * File not found message -->
-  <string name="editor_file_not_found_msg">Fichier non trouvé.</string>
+  <string name="editor_file_not_found_msg">Fichier non trouvé</string>
   <!-- Editor * File size exceed the limit -->
-  <string name="editor_file_exceed_size_msg">Le fichier est trop volumineux pour être ouvert sur votre appareil.</string>
+  <string name="editor_file_exceed_size_msg">Fichier trop volumineux pour être ouvert sur votre appareil</string>
   <!-- Editor * Editor is dirty, ask the user * Dialog title -->
   <string name="editor_dirty_ask_title">Quitter</string>
   <!-- Editor * Editor is dirty, ask the user * Dialog message -->
-  <string name="editor_dirty_ask_msg">Il y a des changements non enregistrés.\n\nQuitter sans enregistrer?</string>
+  <string name="editor_dirty_ask_msg">Le fichier a été modifié.\n\nQuitter sans enregistrer\u00A0?</string>
   <!-- Editor * Save operation success -->
-  <string name="editor_successfully_saved">Le fichier a été enregistré.</string>
+  <string name="editor_successfully_saved">Modifications enregistrées</string>
   <!-- Editor * Read-only file mode -->
-  <string name="editor_read_only_mode">Le fichier ouvert est en lecture seul.</string>
+  <string name="editor_read_only_mode">Fichier ouvert en lecture seule</string>
 
   <!-- Bookmarks * Bookmarks activity title -->
   <string name="bookmarks">Favoris</string>
   <!-- Bookmarks * Bookmark name * Home -->
-  <string name="bookmarks_home">Acceuil</string>
+  <string name="bookmarks_home">Accueil</string>
   <!-- Bookmarks * Bookmark name * Root folder -->
   <string name="bookmarks_root_folder">Dossier Root</string>
   <!-- Bookmarks * Bookmark name * System folder -->
   <string name="bookmarks_system_folder">Dossier système</string>
   <!-- Bookmarks * Bookmark name * Button * Initial directory content description -->
-  <string name="bookmarks_button_config_cd">Choisir le dossier d\'acceuil.</string>
+  <string name="bookmarks_button_config_cd">Choisir le dossier d\'accueil.</string>
   <!-- Bookmarks * Bookmark name * Button * Remove bookmark content description -->
-  <string name="bookmarks_button_remove_bookmark_cd">Supprimer le favoris.</string>
+  <string name="bookmarks_button_remove_bookmark_cd">Supprimer le favori</string>
   <!-- Bookmarks * Bookmarks * Actions * Bookmark successfully added -->
-  <string name="bookmarks_msgs_add_success">Le favori a été ajouté.</string>
+  <string name="bookmarks_msgs_add_success">Favori ajouté</string>
 
   <!-- Initial directory dialog title -->
-  <string name="initial_directory_dialog_title">Dossier d\'acceuil</string>
+  <string name="initial_directory_dialog_title">Dossier d\'accueil</string>
   <!-- Initial directory label -->
-  <string name="initial_directory_label">Choisir le dossier d\'acceuil:</string>
+  <string name="initial_directory_label">Choisir le dossier d\'accueil</string>
   <!-- Initial directory is relative -->
-  <string name="initial_directory_relative_msg">Les chemins relatifs ne sont pas autorisés.</string>
+  <string name="initial_directory_relative_msg">Chemins relatifs non autorisés</string>
   <!-- Initial directory error message -->
-  <string name="initial_directory_error_msg">Une erreur s\'est produite lors de l\'enregistrement du dossier d\'acceuil.</string>
+  <string name="initial_directory_error_msg">Erreur lors de l\'enregistrement du dossier d\'accueil</string>
 
   <!-- Menu * Navigation * History -->
   <string name="menu_history">Historique</string>
@@ -356,41 +356,41 @@
     <xliff:g id="name">%1$s</xliff:g> - nouveau<xliff:g id="extension">%2$s</xliff:g></string>
 
   <!-- Waiting dialog * Performing operation message -->
-  <string name="waiting_dialog_msg">Effectuer l\'opération \u2026;</string>
+  <string name="waiting_dialog_msg">Opération en cours\u2026</string>
   <!-- Waiting dialog * Copying title -->
-  <string name="waiting_dialog_copying_title">Copie \u2026;</string>
+  <string name="waiting_dialog_copying_title">Copie</string>
   <!-- Waiting dialog * Copying message -->
   <string name="waiting_dialog_copying_msg">
     <![CDATA[<b>De</b>]]> <xliff:g id="from">%1$s</xliff:g><![CDATA[<br/>]]>
     <![CDATA[<b>à</b>]]> <xliff:g id="to">%2$s</xliff:g></string>
   <!-- Waiting dialog * Moving title -->
-  <string name="waiting_dialog_moving_title">Déplacement \u2026;</string>
+  <string name="waiting_dialog_moving_title">Déplacement</string>
   <!-- Waiting dialog * Moving message -->
   <string name="waiting_dialog_moving_msg">
     <![CDATA[<b>De</b>]]> <xliff:g id="from">%1$s</xliff:g><![CDATA[<br/>]]>
     <![CDATA[<b>à</b>]]> <xliff:g id="to">%2$s</xliff:g></string>
   <!-- Waiting dialog * Deleting title -->
-  <string name="waiting_dialog_deleting_title">Suppression \u2026;</string>
+  <string name="waiting_dialog_deleting_title">Suppression</string>
   <!-- Waiting dialog * Deleting message -->
   <string name="waiting_dialog_deleting_msg">
     <![CDATA[<b>Fichier</b>]]> <xliff:g id="file">%1$s</xliff:g></string>
   <!-- Waiting dialog * Extracting title -->
-  <string name="waiting_dialog_extracting_title">Extraction \u2026;</string>
+  <string name="waiting_dialog_extracting_title">Extraction</string>
   <!-- Waiting dialog * Extracting message -->
   <string name="waiting_dialog_extracting_msg">
     <![CDATA[<b>Fichier</b>]]> <xliff:g id="file">%1$s</xliff:g></string>
   <!-- Waiting dialog * Extracting title -->
-  <string name="waiting_dialog_compressing_title">Compression \u2026;</string>
+  <string name="waiting_dialog_compressing_title">Compression</string>
   <!-- Waiting dialog * Extracting message -->
   <string name="waiting_dialog_compressing_msg">
     <![CDATA[<b>Fichier</b>]]> <xliff:g id="file">%1$s</xliff:g></string>
   <!-- Waiting dialog * Initializing the dialog -->
   <string name="waiting_dialog_analizing_msg">
-    <![CDATA[<b>Analyse \u2026;</b>]]></string>
+    <![CDATA[<b>Analyse\u2026</b>]]></string>
   <!-- Extracting * Success message -->
-  <string name="msgs_extracting_success">L\'extraction s\'est terminée correctement. Les donnéees ont été extraite dans <xliff:g id="destination">%1$s</xliff:g>.</string>
+  <string name="msgs_extracting_success">Extraction correctement terminée. Les donnéees ont été extraite dans <xliff:g id="destination">%1$s</xliff:g>.</string>
   <!-- Compressing * Success message -->
-  <string name="msgs_compressing_success">La compression s\'est terminée correctement. Les donnéees ont été compressé dans <xliff:g id="destination">%1$s</xliff:g>.</string>
+  <string name="msgs_compressing_success">Compression correctement terminée. Les donnéees ont été compressé dans <xliff:g id="destination">%1$s</xliff:g>.</string>
 
   <!-- Actions Dialog * Title -->
   <string name="actions_dialog_title">Actions</string>
@@ -405,11 +405,11 @@
   <!-- Actions Dialog * Menu * Select all -->
   <string name="actions_menu_select_all">Tout sélectionner</string>
   <!-- Actions Dialog * Menu * Deselect all -->
-  <string name="actions_menu_deselect_all">Tout dé-sélectionner</string>
+  <string name="actions_menu_deselect_all">Tout désélectionner</string>
   <!-- Actions Dialog * Menu * Select -->
-  <string name="actions_menu_select">Selectionner</string>
+  <string name="actions_menu_select">Sélectionner</string>
   <!-- Actions Dialog * Menu * Deselect -->
-  <string name="actions_menu_deselect">Dé-sélectionner</string>
+  <string name="actions_menu_deselect">Désélectionner</string>
   <!-- Actions Dialog * Menu * Paste selection -->
   <string name="actions_menu_paste_selection">Coller la sélection</string>
   <!-- Actions Dialog * Menu * Move selection -->
@@ -425,7 +425,7 @@
   <!-- Actions Dialog * Menu * Open with -->
   <string name="actions_menu_open_with">Ouvrir avec</string>
   <!-- Actions Dialog * Menu * Execute -->
-  <string name="actions_menu_execute">Executer</string>
+  <string name="actions_menu_execute">Exécuter</string>
   <!-- Actions Dialog * Menu * Send -->
   <string name="actions_menu_send">Envoyer</string>
   <!-- Actions Dialog * Menu * Compress -->
@@ -437,9 +437,9 @@
   <!-- Actions Dialog * Menu * Rename -->
   <string name="actions_menu_rename">Renommer</string>
   <!-- Actions Dialog * Menu * Create copy -->
-  <string name="actions_menu_create_copy">Créer une copie</string>
+  <string name="actions_menu_create_copy">Dupliquer</string>
   <!-- Actions Dialog * Menu * Properties -->
-  <string name="actions_menu_properties">Propriété</string>
+  <string name="actions_menu_properties">Propriétés</string>
   <!-- Actions Dialog * Menu * Add to bookmarks -->
   <string name="actions_menu_add_to_bookmarks">Ajouter aux favoris</string>
   <!-- Actions Dialog * Menu * Add shortcut -->
@@ -448,18 +448,18 @@
   <string name="actions_menu_open_parent_folder">Ouvrir le dossier parent</string>
 
   <!-- Actions * Ask user prior to do an undone operation. Dialog message -->
-  <string name="actions_ask_undone_operation_msg">Cette action ne peut pas être annulé. Voulez-vous continuer?</string>
+  <string name="actions_ask_undone_operation_msg">Cette action ne peut pas être annulée. Voulez-vous continuer\u00A0?</string>
 
   <!-- Enter Name Dialog * Label -->
-  <string name="input_name_dialog_label">Nom:</string>
+  <string name="input_name_dialog_label">Nom\u00A0:</string>
   <!-- Enter Name Dialog * Message * Empty name -->
-  <string name="input_name_dialog_message_empty_name">Le nom ne pas être vide.</string>
+  <string name="input_name_dialog_message_empty_name">Nom requis</string>
   <!-- Enter Name Dialog * Message * Invalid name -->
-  <string name="input_name_dialog_message_invalid_path_name">Le nom n\'est pas valide. Les caractères \'<xliff:g id="invalid_characters">%1$s</xliff:g>\' ne sont pas autorisés.</string>
+  <string name="input_name_dialog_message_invalid_path_name">Nom invalide. Les caractères \'<xliff:g id="invalid_characters">%1$s</xliff:g>\' ne sont pas autorisés.</string>
   <!-- Enter Name Dialog * Message * Invalid name -->
-  <string name="input_name_dialog_message_invalid_name">Le nom n\'est pas valide. Les noms \'.\' et \'..\' ne sont pas autorisés.</string>
+  <string name="input_name_dialog_message_invalid_name">Nom invalide. Les noms \'.\' et \'..\' ne sont pas autorisés.</string>
   <!-- Enter Name Dialog * Message * Name exists -->
-  <string name="input_name_dialog_message_name_exists">Le nom existe déjà.</string>
+  <string name="input_name_dialog_message_name_exists">Nom déjà attribué</string>
 
   <!-- Associations Dialog * Title -->
   <string name="associations_dialog_title">Association</string>
@@ -475,17 +475,17 @@
   <string name="associations_dialog_sendwith_action">Envoyer</string>
 
   <!-- Inline Autocomplete Widget * Tab message nothing to complete -->
-  <string name="inline_autocomplete_tab_nothing_to_complete_msg">Rien à compléter.</string>
+  <string name="inline_autocomplete_tab_nothing_to_complete_msg">Rien à compléter</string>
 
 <!-- I don't know if I must translation this section -->
   <!-- Execution console * Title -->
   <string name="execution_console_title">Console</string>
   <!-- Execution console * The script name label -->
-  <string name="execution_console_script_name_label">Scripts:</string>
+  <string name="execution_console_script_name_label">Scripts\u00A0:</string>
   <!-- Execution console * The script execution time label -->
-  <string name="execution_console_script_execution_time_label">Time:</string>
+  <string name="execution_console_script_execution_time_label">Durée\u00A0:</string>
   <!-- Execution console * The script exit code label -->
-  <string name="execution_console_script_exitcode_label">Exit code:</string>
+  <string name="execution_console_script_exitcode_label">Code de sortie\u00A0:</string>
   <!-- Execution console * The script execution time seconds string -->
   <string name="execution_console_script_execution_time_text">
     <xliff:g id="seconds">%1$s</xliff:g> sec.</string>
@@ -500,13 +500,13 @@
   <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
      >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
      Avoid using plural item because is more complex to achieved all strings -->
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> dossier sélectionné.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> dossiers sélectionnés.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> fichier sélectionné.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> fichiers sélectionnés.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> dossier et <xliff:g id="files">%2$s</xliff:g> fichier sélectionnés.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> dossier et <xliff:g id="file2">%2$s</xliff:g> fichiers sélectionnés.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> dossiers et <xliff:g id="files">%2$s</xliff:g> fichiers sélectionnés.</string>
+  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> dossier sélectionné</string>
+  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> dossiers sélectionnés</string>
+  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> fichier sélectionné</string>
+  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> fichiers sélectionnés</string>
+  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> dossier et <xliff:g id="files">%2$s</xliff:g> fichier sélectionnés</string>
+  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> dossier et <xliff:g id="file2">%2$s</xliff:g> fichiers sélectionnés</string>
+  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> dossiers et <xliff:g id="files">%2$s</xliff:g> fichiers sélectionnés</string>
 
 <!-- I don't know if I must translation this section -->
   <!-- Category descriptions -->
@@ -530,20 +530,22 @@
   <string name="compression_mode_title">Mode de compression</string>
 
   <!-- Shortcut. Failed to handle the shortcut -->
-  <string name="shortcut_failed_msg">Impossible d\'atteindre le raccourci.</string>
+  <string name="shortcut_failed_msg">Impossible d\'atteindre le raccourci</string>
   <!-- Shortcut. The shortcut was created -->
-  <string name="shortcut_creation_success_msg">La création du raccourci a réussi.</string>
+  <string name="shortcut_creation_success_msg">Raccourci créé</string>
   <!-- Shortcut. The shortcut wasn't created -->
-  <string name="shortcut_creation_failed_msg">La création du raccourci a échoué.</string>
+  <string name="shortcut_creation_failed_msg">Création du raccourci échouée</string>
 
   <!-- Preferences title -->
-  <string name="pref">Paramétres</string>
+  <string name="pref">Paramètres</string>
   <!-- Preferences * General title -->
-  <string name="pref_general">Paramétres généraux</string>
+  <string name="pref_general">Paramètres généraux</string>
   <!-- Preferences * Search title -->
   <string name="pref_search">Options de recherche</string>
+  <!-- Preferences * Themes title -->
+  <string name="pref_themes">Thèmes</string>
   <!-- Preferences * About title -->
-  <string name="pref_about">A propos</string>
+  <string name="pref_about">À propos</string>
   <!-- Preferences * About summary -->
   <string name="pref_about_summary">File Manager v<xliff:g id="version">%1$s</xliff:g>
     \nCopyright \u00A9 2012 The CyanogenMod Project</string>
@@ -551,47 +553,47 @@
   <!-- Preferences * General * Behaviour category -->
   <string name="pref_general_behaviour_category">Général</string>
   <!-- Preferences * General * Case sensitive sort title -->
-  <string name="pref_case_sensitive_sort">Utiliser la casse dans les tris</string>
+  <string name="pref_case_sensitive_sort">Tenir compte de la casse</string>
   <!-- Preferences * General *Disk usage warning level title -->
-  <string name="pref_disk_usage_warning_level">Avertissement d\'utilisation du disque</string>
+  <string name="pref_disk_usage_warning_level">Avertissement d\'utilisation disque</string>
   <!-- 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">Afficher une couleur différente dans la barre d\'utilisation du disque quand il atteint <xliff:g id="level">%1$s</xliff:g> pourcent d\'espace libre</string>
+  <string name="pref_disk_usage_warning_level_summary" formatted="false">Afficher une couleur différente dans la barre d\'utilisation de l\'espace disque lorsque <xliff:g id="level">%1$s</xliff:g> pourcent d\'espace est utilisé</string>
   <!-- Preferences * General * Compute folder statistics title -->
   <string name="pref_compute_folder_statistics">Calculer les statistiques de dossiers</string>
   <!-- Preferences * General * Compute folder statistics summary on -->
-  <string name="pref_compute_folder_statistics_on">Attention! Le calcul des statistiques de dossiers est coûteuse en temps et en ressources système</string>
+  <string name="pref_compute_folder_statistics_on">Attention\u00A0! Le calcul des statistiques de dossiers est coûteux en temps et en ressources système.</string>
   <!-- Preferences * General * Use flinger detection -->
   <string name="pref_use_flinger">Utiliser les mouvements de glissement</string>
   <!-- Preferences * General * Use flinger detection summary -->
-  <string name="pref_use_flinger_summary">Utiliser le mouvement de gauche à droite pour supprimer un fichier ou un dossier.</string>
+  <string name="pref_use_flinger_summary">Utiliser le mouvement de gauche à droite pour supprimer un fichier ou un dossier</string>
   <!-- Preferences * General * Advanced settings category -->
   <string name="pref_general_advanced_settings_category">Avancé</string>
   <!-- Preferences * General * Access mode -->
-  <string name="pref_access_mode">Mode d\'accés</string>
+  <string name="pref_access_mode">Mode d\'accès</string>
   <!-- Preferences * General * Safe mode -->
   <string name="pref_access_mode_safe">Mode sécurisé</string>
   <!-- Preferences * General * Safe mode summary -->
-  <string name="pref_access_mode_safe_summary">Mode sécurisé\n\nL\'application fonctionne sans privilèges et les systèmes de fichiers accessibles sont les volumes de stockage (cartes SD et USB).</string>
+  <string name="pref_access_mode_safe_summary">Mode sécurisé\n\nL\'application fonctionne sans privilège et les systèmes de fichiers accessibles sont les volumes de stockage (cartes SD et USB).</string>
   <!-- Preferences * General * Prompt user mode -->
   <string name="pref_access_mode_prompt">Demander le mode</string>
   <!-- Preferences * General * Prompt user mode summary -->
-  <string name="pref_access_mode_prompt_summary">Demander le mode\n\nL\'application fonctionne avec un accès complet au système de fichiers, mais vous demandera la permission avant d\'exécuter toutes les actions avec priviléges</string>
+  <string name="pref_access_mode_prompt_summary">Demander le mode\n\nL\'application fonctionne avec un accès complet au système de fichiers, mais demandera la permission avant d\'exécuter toutes les actions avec privilèges.</string>
   <!-- Preferences * General * Root access mode -->
   <string name="pref_access_mode_root">Mode Root</string>
   <!-- Preferences * General * Root access mode summary -->
-  <string name="pref_access_mode_root_summary">Mode Root\n\nAttention! Ce mode permet des opérations qui pourraient endommager votre appareil. Il est de votre responsabilité de veiller à ce que les opérations effectuées soient sures</string>
+  <string name="pref_access_mode_root_summary">Mode Root\n\nAttention\u00A0! Ce mode permet des opérations qui pourraient endommager votre appareil. Il est de votre responsabilité de veiller à ce que les opérations effectuées soient sûres.</string>
   <!-- Preferences * Search * Results category -->
   <string name="pref_search_results_category">Résultats</string>
   <!-- Preferences * Search * Show relevance widget -->
   <string name="pref_show_relevance_widget">Afficher le widget des pertinences</string>
   <!-- Preferences * Search * Highlight search terms -->
-  <string name="pref_highlight_terms">Mettre les termes de recherche en surbrillance</string>
+  <string name="pref_highlight_terms">Surbrillance des termes de recherche</string>
   <!-- Preferences * Search * Sort results mode -->
   <string name="pref_sort_search_results_mode">Mode de tri des résultats</string>
   <!-- Preferences * Search * Sort results mode. None -->
-  <string name="pref_sort_search_results_mode_none">Pas de tri</string>
+  <string name="pref_sort_search_results_mode_none">Aucun tri</string>
   <!-- Preferences * Search * Sort results mode. None -->
   <string name="pref_sort_search_results_mode_name">Par nom</string>
   <!-- Preferences * Search * Sort results mode. Relevance -->
@@ -601,21 +603,38 @@
   <!-- Preferences * Search * Save search terms -->
   <string name="pref_save_search_terms">Sauvergarder les termes de recherche</string>
   <!-- Preferences * Search * Save search terms summary on -->
-  <string name="pref_save_search_terms_on">Les termes de recherche ont été sauvegardé et seront suggérés dans les recherches futures</string>
+  <string name="pref_save_search_terms_on">Les termes de recherche seront sauvegardés et seront suggérés dans les recherches futures</string>
   <!-- Preferences * Search * Save search terms summary off -->
-  <string name="pref_save_search_terms_off">Les termes de recherche n\'ont pas été sauvegardé</string>
+  <string name="pref_save_search_terms_off">Les termes de recherche n\'ont pas été sauvegardés</string>
   <!-- Preferences * Search * Remove saved search terms -->
-  <string name="pref_remove_saved_search_terms">Supprimer les termes de recherche</string>
+  <string name="pref_remove_saved_search_terms">Effacer l\'historique de recherche</string>
   <!-- Preferences * Search * Remove saved search terms summary -->
-  <string name="pref_remove_saved_search_terms_summary">Appuyez pour supprimer tout les termes de recherche sauvergardés</string>
+  <string name="pref_remove_saved_search_terms_summary">Appuyer pour supprimer tous les termes de recherche sauvergardés</string>
   <!-- Preferences * Search * Suggestions were truncated -->
-  <string name="pref_remove_saved_search_terms_msg">Tout les termes de recherche ont été supprimé.</string>
+  <string name="pref_remove_saved_search_terms_msg">Historique de recherche effacé</string>
+  <!-- Preferences * Themes * Themes selection category -->
+  <string name="pref_themes_selection_category">Thèmes</string>
+  <!-- Preferences * Themes * Set theme button -->
+  <string name="pref_themes_set_theme">Appliquer le thème</string>
+  <!-- Preferences * Themes * No preview -->
+  <string name="pref_themes_no_preview">Aucune prévisualisation\ndisponible</string>
+  <!-- Preferences * Themes * Confirmation message -->
+  <string name="pref_themes_confirmation">Thème appliqué avec succès</string>
+  <!-- Preferences * Themes * Theme not found message -->
+  <string name="pref_themes_not_found">Thème introuvable</string>
 
   <!-- Preferences * Debug * Capture debug traces -->
-  <string name="pref_debug_traces">Information de débogage</string>
+  <string name="pref_debug_traces">Informations de débogage</string>
+
+  <!-- Themes * Default theme name -->
+  <string name="theme_default_name">Thème Clair</string>
+  <!-- Themes * Default theme description -->
+  <string name="theme_default_description">Un thème clair pour l\'Explorateur de fichiers CyanogenMod.</string>
+  <!-- Themes * Default theme author -->
+  <string name="themes_author">CyanogenMod</string>
 
   <!-- Security * Extract relative or absolute files -->
-  <string name="security_warning_extract">Attention!\n\n Extraire une archive vers un chemin absolu ou relatif peut causer des dommages sur votre appareil en écrasant des fichiers système.\n\nVoulez-vous continuer?</string>
+  <string name="security_warning_extract">Attention\u00A0!\n\n Extraire une archive vers un chemin absolu ou relatif peut causer des dommages sur votre appareil en écrasant des fichiers système.\n\nVoulez-vous continuer\u00A0?</string>
 
   <!-- ChangeLog * Dialog title -->
   <string name="changelog_title">Note de version</string>
@@ -624,9 +643,9 @@
   <string name="welcome_title">Bienvenue</string>
   <!-- Welcome Dialog * Message -->
   <string name="welcome_msg">
-    Bienvenue dans l\'explorateur de fichier CyanogenMod.
-    \n\nCette application vous permet d\'explorer le système de fichiers et effectuer des opérations qui pourraient endommager votre appareil. Pour éviter tout dommage, l\'application va démarrer dans un mode sécurisé.
-    \n\nVous pouvez avoir un accés complet, en mode Root via le menu paramètre. Il est de votre responsabilité de veiller à ce que les opérations effectués n\'endommagent pas votre système.
-    \n\nLa Team CyanogenMod.\n</string>
+      Bienvenue dans l\'Explorateur de fichiers CyanogenMod.
+      \n\nCette application vous permet d\'explorer le système de fichiers et d\'effectuer des opérations qui pourraient endommager votre appareil. Pour éviter tout dommage, l\'application va démarrer dans un mode sécurisé.
+      \n\nVous pouvez avoir un accés complet, en mode Root via les paramètres de l\'application. Il est de votre responsabilité de veiller à ce que les opérations effectuées n\'endommagent pas votre système.
+      \n\nL\'Équipe CyanogenMod\n</string>
 
 </resources>
diff --git a/themes/res/values-fr/strings.xml b/themes/res/values-fr/strings.xml
new file mode 100644
index 000000000..b28dbe631
--- /dev/null
+++ b/themes/res/values-fr/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!-- The name of the application -->
+  <string name="app_name">Thèmes de l\'Explorateur de fichier</string>
+  <!-- The description of the application -->
+  <string name="app_description">Thèmes pour l\'Explorateur de fichier CyanogenMod</string>
+
+  <!-- The author of the themes -->
+  <string name="themes_author" translatable="false">CyanogenMod</string>
+
+  <!-- The dark theme name -->
+  <string name="dark_theme_name">Thème Sombre</string>
+  <!-- The dark theme description -->
+  <string name="dark_theme_desc">Un thème sombre pour l\'Explorateur de fichier CyanogenMod.</string>
+
+</resources>

From 8e5fabfb19c43689d776be3abbf2d0f114fa9ab0 Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Sun, 18 Nov 2012 03:41:18 +0100
Subject: [PATCH 10/11] CMFileManager: fr_FR - Remove unnecessary translatable
 tag

See comment on http://review.cyanogenmod.org/#/c/26417/8

Change-Id: I493dd23bc6987aa23d4c2758cc68733e27696fba
---
 themes/res/values-fr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/res/values-fr/strings.xml b/themes/res/values-fr/strings.xml
index b28dbe631..69b6fcffe 100644
--- a/themes/res/values-fr/strings.xml
+++ b/themes/res/values-fr/strings.xml
@@ -22,7 +22,7 @@
   <string name="app_description">Thèmes pour l\'Explorateur de fichier CyanogenMod</string>
 
   <!-- The author of the themes -->
-  <string name="themes_author" translatable="false">CyanogenMod</string>
+  <string name="themes_author">CyanogenMod</string>
 
   <!-- The dark theme name -->
   <string name="dark_theme_name">Thème Sombre</string>

From 6bf70025107ad61f7cdfca911e4e6361f55a1331 Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Sun, 18 Nov 2012 04:35:48 +0100
Subject: [PATCH 11/11] CMFileManager: fr_FR - Remove unnecessary translatable
 string

See comment on http://review.cyanogenmod.org/#/c/26616/

Change-Id: I71eafaad82c41bed56166518490f4dcd4d4d20a9
---
 themes/res/values-fr/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/themes/res/values-fr/strings.xml b/themes/res/values-fr/strings.xml
index 69b6fcffe..6c665640f 100644
--- a/themes/res/values-fr/strings.xml
+++ b/themes/res/values-fr/strings.xml
@@ -21,9 +21,6 @@
   <!-- The description of the application -->
   <string name="app_description">Thèmes pour l\'Explorateur de fichier CyanogenMod</string>
 
-  <!-- The author of the themes -->
-  <string name="themes_author">CyanogenMod</string>
-
   <!-- The dark theme name -->
   <string name="dark_theme_name">Thème Sombre</string>
   <!-- The dark theme description -->