diff --git a/.classpath b/.classpath
index 3f9691c5..e4189868 100644
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index 1a6ec64c..4ff05312 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,6 @@ lint.xml
 .checkstyle
 
 #IntelliJ IDEA
-.idea
-*.iml
 *.ipr
 *.iws
 classes
diff --git a/.gitmodules b/.gitmodules
index 322417e6..6dc8f0d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 path = ActionBarSherlock
 url = git@github.com:BrandroidTools/ActionBarSherlock.git
 ignore = dirty
+[submodule "Volley"]
+	path = Volley
+	url = https://android.googlesource.com/platform/frameworks/volley.git
diff --git a/ActionBarSherlock b/ActionBarSherlock
index bd396614..5196487b 160000
--- a/ActionBarSherlock
+++ b/ActionBarSherlock
@@ -1 +1 @@
-Subproject commit bd396614fc242b511853c05cea54051b6f06604e
+Subproject commit 5196487bbd5c4798e354ed4c933ea2cb66edac40
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 194755d0..ab538c1d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.brandroid.openmanager"
     android:installLocation="auto"
-    android:versionCode="228"
-    android:versionName="0.228" >
+    android:versionCode="254"
+    android:versionName="0.254" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -60,7 +60,7 @@
         android:name="org.brandroid.openmanager.activities.OpenApplication"
         android:allowBackup="true"
         android:icon="@drawable/icon_flat"
-	android:label="@string/app_name"
+		android:label="@string/app_name"
         android:largeHeap="true"
         android:theme="@style/AppTheme.Dark" >
         <activity
@@ -129,6 +129,8 @@
         <activity
             android:name="org.brandroid.openmanager.activities.ServerSetupActivity"
       		android:uiOptions="none"
+            android:theme="@style/AppTheme.Dialog"
+            android:exported="true"
             android:configChanges="screenSize|keyboard|keyboardHidden" >
         </activity>
         <activity
@@ -158,22 +160,28 @@
         <activity
             android:name="org.brandroid.openmanager.activities.FolderPickerActivity"
             android:configChanges="screenSize|keyboard|keyboardHidden"
-            android:label="@string/s_title_picker" >
+            android:exported="true" >
+			<intent-filter>
+				<action android:name="android.intent.action.GET_CONTENT" />
+				<category android:name="android.intent.category.OPENABLE" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<data android:mimeType="*/*" />
+			</intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PICK" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="file" />
-                <data android:mimeType="*/*" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+		        <data android:scheme="file" />
+		        <data android:scheme="folder" />
+		        <data android:scheme="directory" />
             </intent-filter>
             <intent-filter>
                 <action android:name="org.openintents.action.PICK_FILE" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="file" />
-                <data android:mimeType="*/*" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+		        <data android:scheme="file" />
+		        <data android:scheme="folder" />
+		        <data android:scheme="directory" />
             </intent-filter>
         </activity>
 
@@ -215,6 +223,7 @@
         <activity
             android:name="org.brandroid.openmanager.activities.SettingsActivity"
             android:exported="false"
+            android:theme="@style/AppTheme.Dark"
             android:label="@string/s_menu_prefs_global" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
diff --git a/OpenExplorer.iml b/OpenExplorer.iml
new file mode 100644
index 00000000..688fa65f
--- /dev/null
+++ b/OpenExplorer.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <notImportedProperties>
+          <property>MANIFEST_FILE_PATH</property>
+          <property>RESOURCES_DIR_PATH</property>
+          <property>ASSETS_DIR_PATH</property>
+          <property>NATIVE_LIBS_DIR_PATH</property>
+        </notImportedProperties>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..e617e2fd
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,35 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.4'
+    }
+}
+apply plugin: 'android'
+
+dependencies {
+}
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion "17"
+
+    defaultConfig {
+        minSdkVersion 1
+        targetSdkVersion 1
+    }
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+
+        instrumentTest.setRoot('tests')
+    }
+}
diff --git a/custom_rules.xml b/custom_rules.xml
index 6a974ff4..80c2a7bb 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -17,9 +17,6 @@
 
     <!-- Custom tasks -->
     <taskdef resource="anttasks.properties" classpathref="android.antlibs" />
-    <taskdef name="xpath"
-        classname="com.android.ant.XPathTask"
-        classpathref="android.antlibs" />
 
     <property name="out.release.dir" location="releases" />
 
@@ -194,12 +191,12 @@
                         in.package="${out.unaligned.file}"
                         out.package="${out.final.file}" />
                 <echo level="info">Release Package: ${out.final.file}</echo>
-		<echo level="info">Uploading to release server</echo>
+		<!--<echo level="info">Uploading to release server</echo>
 		<ftp server="${ftp.server}" port="21" remotedir="www/releases/" userid="${ftp.user}" password="${ftp.password}" binary="yes" verbose="yes">
 		    <fileset dir="releases">
 			<include name="**/${ant.project.name}${mymanifest.manifest.android:versionCode}.apk" />
 		    </fileset>
-		</ftp>
+		</ftp>-->
             </sequential>
         </do-only-if-not-library>
         <record-build-info />
diff --git a/libs/commons-logging-1.1.1.jar b/libs/commons-logging-1.1.1.jar
deleted file mode 100644
index 1deef144..00000000
Binary files a/libs/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/res/drawable-hdpi/ic_drawer.png b/res/drawable-hdpi/ic_drawer.png
new file mode 100644
index 00000000..ff7b1def
Binary files /dev/null and b/res/drawable-hdpi/ic_drawer.png differ
diff --git a/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png
new file mode 100644
index 00000000..fb681ba2
Binary files /dev/null and b/res/drawable-mdpi/ic_drawer.png differ
diff --git a/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png
new file mode 100644
index 00000000..b9bc3d70
Binary files /dev/null and b/res/drawable-xhdpi/ic_drawer.png differ
diff --git a/res/layout-large-port/main_fragments.xml b/res/layout-large-port/main_fragments.xml
index b1b5eb11..ba26336e 100644
--- a/res/layout-large-port/main_fragments.xml
+++ b/res/layout-large-port/main_fragments.xml
@@ -28,7 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentLeft="true"
-        android:layout_below="@+id/content_pager_indicator_frame"
         android:baselineAligned="false"
         android:orientation="horizontal" >
 
diff --git a/res/layout-large-port/title_bar.xml b/res/layout-large-port/title_bar.xml
index 97c4ab1c..2cc96cd6 100644
--- a/res/layout-large-port/title_bar.xml
+++ b/res/layout-large-port/title_bar.xml
@@ -38,7 +38,7 @@
 
     <TextView
         android:id="@+id/title_title"
-        style="@style/Text.Large"
+        style="@style/Text.Large.Dialog"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/title_icon_holder"
         android:layout_alignParentTop="true"
@@ -107,6 +107,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignWithParentIfMissing="true"
         android:nextFocusRight="@+id/title_icon_holder"
+        android:orientation="horizontal"
         android:showDividers="middle" >
     </LinearLayout>
 
diff --git a/res/layout/heatmap_row.xml b/res/layout/heatmap_row.xml
index 28e7b3b7..c8f47ce9 100644
--- a/res/layout/heatmap_row.xml
+++ b/res/layout/heatmap_row.xml
@@ -18,16 +18,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@android:id/progress"
+        android:layout_toLeftOf="@+id/content_progress_container"
         android:layout_toRightOf="@+id/content_icon"
         android:padding="4dp"
+        android:maxLines="2"
+        style="@style/Text.Small"
         android:text="Title" />
 
     <LinearLayout
-        android:layout_width="120dp"
+        android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
+        android:id="@+id/content_progress_container"
         android:orientation="vertical" >
 
         <TextView
@@ -42,8 +45,10 @@
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="match_parent"
             android:layout_height="10dp"
+            android:indeterminate="true"
             android:max="100"
             android:progress="50" />
+
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/picker_pager.xml b/res/layout/picker_pager.xml
index 723f139d..eb0906c1 100644
--- a/res/layout/picker_pager.xml
+++ b/res/layout/picker_pager.xml
@@ -4,68 +4,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <View
+    <GridView
+        android:id="@android:id/list"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/blue" />
-
-    <org.brandroid.openmanager.views.OpenViewPager
-        android:id="@+id/picker_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/blue" />
-
-    <LinearLayout
-        android:id="@+id/pick_path_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="4dp" >
-
-        <TextView
-            style="@style/Text.Mid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="left"
-            android:paddingRight="4dp"
-            android:text="@string/selected_path" />
-
-        <TextView
-            android:id="@+id/pick_path"
-            style="@style/Text.Mid"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="left" />
-    </LinearLayout>
-
-    <EditText
-        android:id="@+id/pick_filename"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/filename" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@android:id/button1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@android:string/ok" />
-
-        <Button
-            android:id="@android:id/button2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@android:string/cancel" />
-    </LinearLayout>
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/picker_widget.xml b/res/layout/picker_widget.xml
index c9db726d..74a927d3 100644
--- a/res/layout/picker_widget.xml
+++ b/res/layout/picker_widget.xml
@@ -2,8 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/dialogBackgroundColorPrimary"
     android:orientation="vertical" >
+    
+    <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone">
+        <CheckBox android:id="@+id/check_folders" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Only show folders" />
+    </LinearLayout>
 
     <View
         android:layout_width="match_parent"
diff --git a/res/layout/server.xml b/res/layout/server.xml
index 7e72183b..6a2912d6 100644
--- a/res/layout/server.xml
+++ b/res/layout/server.xml
@@ -19,6 +19,13 @@
         android:layout_marginTop="2dp"
         android:layout_marginBottom="3dp" 
         />
+    
+    <WebView
+        android:id="@+id/server_webview"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="visible" />
 
     <ScrollView
         android:layout_width="match_parent"
@@ -27,6 +34,7 @@
         android:scrollbarStyle="outsideOverlay"
     	android:paddingLeft="5dp"
     	android:paddingRight="5dp"
+        android:id="@+id/server_text_scroller"
         android:scrollbars="vertical" >
 
         <LinearLayout
@@ -185,11 +193,6 @@
                 android:hint="@string/s_pref_server_name"
                 android:inputType="textNoSuggestions"
                 android:singleLine="true" />
-
-            <include
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                layout="@layout/server_auth_stub" />
         </LinearLayout>
     </ScrollView>
 
diff --git a/res/layout/server_auth_stub.xml b/res/layout/server_auth_stub.xml
index adcc3307..ee4129bc 100644
--- a/res/layout/server_auth_stub.xml
+++ b/res/layout/server_auth_stub.xml
@@ -9,8 +9,9 @@
     <WebView
         android:id="@+id/server_webview"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="visible" />
 
     <Button
         android:id="@+id/server_authenticate"
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index 1ac2ccbc..3690db10 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -132,6 +132,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignWithParentIfMissing="true"
         android:nextFocusRight="@+id/title_icon_holder"
+        android:orientation="vertical"
         android:showDividers="middle" >
     </LinearLayout>
 
diff --git a/res/layout/title_bar_dialog.xml b/res/layout/title_bar_dialog.xml
index 1744c149..55a7c17e 100644
--- a/res/layout/title_bar_dialog.xml
+++ b/res/layout/title_bar_dialog.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/abs__action_bar_default_height"
     android:id="@+id/title_bar"
+    android:background="?attr/dialogBackgroundColorPrimary"
     android:orientation="horizontal" >
 
     <ImageView
@@ -14,7 +15,8 @@
         android:padding="3dp"
         android:paddingRight="8dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/icon" />
+        android:src="@drawable/icon"
+        android:contentDescription="@string/app_name"/>
 
     <TextView
         android:id="@+id/title_text"
@@ -32,14 +34,6 @@
         android:layout_height="match_parent"
         android:orientation="horizontal" >
 
-        <ImageView
-            android:id="@+id/menu_close"
-            style="@style/ActionBarCompatHomeItem"
-            android:layout_width="@dimen/abs__action_bar_default_height"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:scaleType="center"
-            android:src="?attr/actionIconCancel" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/toolbar_button.xml b/res/layout/toolbar_button.xml
index e82d2087..889a6ca6 100644
--- a/res/layout/toolbar_button.xml
+++ b/res/layout/toolbar_button.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/ActionBarCompatItem"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_width="@dimen/abs__action_bar_default_height"
+    android:layout_height="@dimen/abs__action_bar_default_height"
     android:background="@android:drawable/list_selector_background"
     android:clickable="true"
-    android:contentDescription="@string/app_name"
     android:minWidth="@dimen/actionbar_compat_button_width"
     android:padding="@dimen/actionbar_compat_button_padding"
     android:scaleType="center"
+    android:layout_gravity="center"
     android:src="@android:drawable/ic_menu_search" />
diff --git a/res/menu/content_full.xml b/res/menu/content_full.xml
index e221778e..77a8903b 100644
--- a/res/menu/content_full.xml
+++ b/res/menu/content_full.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item
-        android:id="@+id/menu_search"
-        android:icon="?attr/actionIconSearch"
-        android:showAsAction="ifRoom|collapseActionView"
-        android:actionViewClass="com.actionbarsherlock.widget.SearchView"
-        android:title="@android:string/search_go"/>
     <item
         android:id="@+id/menu_context_share"
         android:icon="?attr/actionIconShare"
@@ -102,16 +96,6 @@
         android:showAsAction="always"
         android:title="@string/s_title_operations">
         <menu>
-            <item
-                android:id="@+id/menu_new_folder"
-                android:alphabeticShortcut="c"
-                android:icon="@drawable/ic_menu_new_folder"
-                android:title="@string/s_menu_new_folder"/>
-            <item
-                android:id="@+id/menu_new_file"
-                android:alphabeticShortcut="v"
-                android:icon="@drawable/ic_menu_new_file"
-                android:title="@string/s_menu_new_file"/>
             <item
                 android:id="@+id/menu_context_info"
                 android:alphabeticShortcut="i"
@@ -148,10 +132,17 @@
         </menu>
     </item>
     <item
-        android:id="@+id/menu_refresh"
-        android:alphabeticShortcut="r"
-        android:icon="?attr/actionIconRefresh"
+        android:id="@+id/menu_new_file"
+        android:icon="@drawable/ic_menu_add"
         android:showAsAction="ifRoom"
-        android:title="@string/s_menu_refresh"/>
+        android:title="@string/s_menu_new_file"
+        />
+    
+    <item
+        android:id="@+id/menu_search"
+        android:icon="?attr/actionIconSearch"
+        android:showAsAction="ifRoom|collapseActionView"
+        android:actionViewClass="com.actionbarsherlock.widget.SearchView"
+        android:title="@android:string/search_go"/>
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/context_heatmap.xml b/res/menu/context_heatmap.xml
new file mode 100644
index 00000000..fd0db727
--- /dev/null
+++ b/res/menu/context_heatmap.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_context_copy"
+        android:alphabeticShortcut="c"
+        android:icon="@drawable/ic_menu_copy"
+        android:showAsAction="always|withText"
+        android:title="@android:string/copy"/>
+    <item
+        android:id="@+id/menu_context_delete"
+        android:alphabeticShortcut="*"
+        android:icon="@drawable/ic_menu_delete"
+        android:showAsAction="ifRoom|withText"
+        android:title="@string/s_menu_delete"/>
+    <item
+        android:id="@+id/menu_context_bookmark"
+        android:icon="@drawable/ic_menu_star"
+        android:showAsAction="always|withText"
+        android:title="@string/s_menu_bookmark"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
old mode 100644
new mode 100755
index 86462e64..a2fcb440
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
     <string name="app_name">مستعرض الملفات</string>
     <string name="s_photos">الصور</string>
     <string name="s_videos">الفيديو</string>
@@ -9,7 +8,7 @@
     <string name="s_external">الذاكرة الخارجية</string>
     <string name="s_internal">الذاكرة الداخلية</string>
     <string name="s_view">عرض</string>
-    <string name="s_bookmarks">علامات</string>
+    <string name="s_bookmarks">العلامات</string>
     <string name="s_menu_favorites">ثبت العلامات</string>
     <string name="s_menu_sort">ترتيب</string>
     <string name="s_menu_sort_name_asc">حسب الإسم تصاعديا</string>
@@ -54,8 +53,7 @@
     <string name="s_pref_thumbs">عرض مصغرات الصور</string>
     <string name="s_pref_thumbs_summary">عرض مصغرات للصور والفيديو والبرامج </string>
     <string name="s_pref_view">طريقة العرض</string>
-    <string name="s_pref_view_summary">عرض الملفات على شكل شبكة أو قائمة أو دائري 
-\nفقط في نظام أندرويد هوني كومب</string>
+    <string name="s_pref_view_summary">عرض الملفات على شكل شبكة أو قائمة أو دائري \nفقط في نظام أندرويد هوني كومب</string>
     <string name="s_pref_sort">ترتيب</string>
     <string name="s_pref_sort_summary">إختر كيف يتم ترتيب الملفات والمجلدات</string>
     <string name="s_pref_advanced">خيارات متقدمة</string>
@@ -75,7 +73,7 @@
     <string name="s_pref_server_type">نوع السيرفر</string>
     <string name="s_files">الملفات</string>
     <string name="s_create">إنشاء</string>
-    <string name="s_title_holding_x_files">معالجة % ملف</string>
+    <string name="s_title_holding_x_files" formatted="false">معالجة % ملف</string>
     <string name="s_title_newfolder">إنشاء مجلد جديد</string>
     <string name="s_title_send">إرسال xxx</string>
     <string name="s_title_unzip">فك ضغط xxx</string>
@@ -88,10 +86,10 @@
     <string name="s_title_zipping">جاري الضغط</string>
     <string name="s_title_unzipping">جاري فك الضغط</string>
     <string name="s_title_wait">الرجاء الإنتظار ...</string>
-    <string name="s_alert_confirm_delete">حذف % لا يمكن التراجع عنه, هل أنت متأكد من أختيارك هذا؟</string>
+    <string name="s_alert_confirm_delete" formatted="false">حذف % لا يمكن التراجع عنه, هل أنت متأكد من أختيارك هذا؟</string>
     <string name="s_alert_rename">إدخل إسم جديد لهذا الملف</string>
     <string name="s_alert_newfolder">أكتب إسم المجلد الذي تريد إنشاءه</string>
-    <string name="s_alert_unzip">هل ترغب في فك ضغط % هنا أو في مجلد آخر</string>
+    <string name="s_alert_unzip" formatted="false">هل ترغب في فك ضغط % هنا أو في مجلد آخر</string>
     <string name="s_button_unzip_here">فك الضغط هنا</string>
     <string name="s_button_unzip_else">فك الضغط في مجلد آخر</string>
     <string name="s_msg_none">لايمكن إجراء الـ</string>
@@ -125,8 +123,6 @@
     <string name="s_pref_start_summary">يحدد ماهو المجلد الإفتراضي للبرنامج</string>
     <string name="s_custom">مخصص</string>
     <string name="s_text_intro_top">مرحبا بك في  OpenExplorer</string>
-    <string name="s_text_intro_body">الرجاء أختيار مسار البدء
-\nترجمة: شمسان العماري</string>
     <string name="s_info_num_folders">عدد المجلدات</string>
     <string name="s_info_num_files">عدد الملفات</string>
     <string name="s_info_last_modified">آخر تعديل</string>
@@ -145,7 +141,7 @@
     <string name="s_menu_delete_all">حذف الكل</string>
     <string name="s_menu_move_all">تحريك إلى هنا</string>
     <string name="s_menu_copy_all">نسخ إلى هنا</string>
-    <string name="s_confirm_delete">هل أنت متأكد أنك تريد حذف %s</string>
+    <string name="s_confirm_delete" formatted="false">هل أنت متأكد أنك تريد حذف %s</string>
     <string name="s_error_same_destination">المجلد الوجهة نفس المصدر</string>
     <string name="s_sample_notification">نسخ للذاكرة</string>
     <string name="s_pref_fullscreen">ملء الشاشة</string>
@@ -183,7 +179,7 @@
     <string name="s_pref_honeyplus">فقط في أندرويد 3 أو ما فوق</string>
     <string name="s_pref_actionmode">إسلوب الأداء</string>
     <string name="s_pref_actionmode_enabled">إستخدم أسلوب الأداء</string>
-    <string name="s_pref_actionmode_disabled">إستخدم قوائم إفتراضية</string>
+    <string name="s_pref_actionmode_disabled">استخدم القوائم العاديه</string>
     <string name="s_server_smb">SMB/Windows</string>
     <string name="s_bookmark_drives">الأقراص</string>
     <string name="s_bookmark_smart">ملفات ذكية</string>
@@ -214,12 +210,9 @@
     <string name="s_pref_fancy_menus">قوائم جميلة</string>
     <string name="s_pref_fancy_context">القوائم الجميلة</string>
     <string name="s_search_files">بحث في ملفات النظام</string>
-    <string name="search_summary" formatted="false">جاري البحث عن %s في (%d)...</string>
-    <string name="search_results" formatted="false">تم إيجاد %d نتيجة عن &quot;%s&quot; \n في &quot;%s&quot;</string>
     <string name="s_menu_exit">خروج</string>
     <string name="s_warn_wtf_message">أوووبز! يبدو أن هناك أخطاء غير متوقعة قد حصلت! ولأن هذا أمر قد يحدث في أي تطبيق تحت التجربة .. نرجوا منك مساعدتنا بإرسال تقرير لنا عن هذا الخطأ علماً أنه معلوماتك الشخصية لن تصل إلينا.</string>
-    <string name="s_warn_wtf_ps">الرجاء ملاحظة أن هذا البرنامج مازال تجريبي وتحت التطوير.
-\nنرجوا منكم عدم وضع تقييم سيء . إذا أزعجك البرنامج قم بإزالته من جهازك</string>
+    <string name="s_warn_wtf_ps">الرجاء ملاحظة أن هذا البرنامج مازال تجريبي وتحت التطوير.\nنرجوا منكم عدم وضع تقييم سيء . إذا أزعجك البرنامج قم بإزالته من جهازك</string>
     <string name="s_yes">نعم</string>
     <string name="s_no">لا</string>
     <string name="s_wtf_preview">عرض معلومات التقرير</string>
@@ -243,24 +236,9 @@
     <string name="menu_view_font_small">خط صغير الحجم</string>
     <string name="menu_view_font_medium">خط متوسط الحجم</string>
     <string name="menu_view_font_large">خط كبير الحجم</string>
-    <string name="app_description">OpenExplorer - افتح إدارة ملف مصدر لجميع الأجهزة! (أقراص، هواتف، وأجهزة تلفاز جوجل، والسندويشات!)
-\n- استكمال نظام إدارة الملف
-\n- USB، والتنمية المستدامة وغيرها من وسائل الإعلام الخارجية
-\n- للربط الشبكة (FTP، SFTP، SMB / سامبا / ويندوز / LAN / WIFI)
-\n- نص محرر
-\n- سمارت المجلدات التي تفحص لأنواع مختلفة من وسائل الاعلام (فيديو، صور، موسيقى، التحميل)
-\n- مشاهدة بيجر دليل الملاحة (انتقاد حق لترتفع دليل)
-\n- المستعملين المتميزين / الجذر القدرة على قائمة / قراءة مجلدات النظام (أي نظام الكتابة حتى الآن)
-\n
-\nميزات ليأتي:
-\n- كلفه محرر النص
-\n- القدرة على المزيد من الشبكات (دروببوإكس، Box.net، السماء محرك الأقراص)
-\n- غير متصل مخبأ بنية الملف، وسوف تذكر الملفات التي لديك في أماكن مختلفة دون الحاجة للاتصال
-\n- خريطة مساحة القرص حرارة يظهر فيها الملفات الخاصة بك هي أكبر
-\n
-\n* يرجى ملاحظة: هذا التطبيق هو في بيتا. لا تزال هناك العديد من البق. إذا كنت لا ترغب في أن تشهد هذه الأخطاء، من فضلك لا تحميل هذا التطبيق. إذا كنت ترغب في مساعدتي في العثور على هذه الحشرات، يرجى الكتابة لي أو تعاون معي على GitHub (https://github.com/BrandoCommando/OpenExplorer/). يرجى تذكر تقييمات سيئة مساعدة أحد.</string>
-    <string name="alert_translate_google">مرحبا، وتقدم هذه الترجمة بواسطة مترجم جوجل. إذا كنت تعرف اللغة الإنجليزية، فضلا عن%s، وترغب في المساعدة في تقديم أفضل ترجمة، يرجى النقر على هذا الزر:</string>
-    <string name="alert_translate_none">مرحبا، يبدو أنك تستخدم لغة غير مدعومة. هل تعرف ق الإنجليزية %s إذا كنت تريد أن تساعد في توفير الترجمة الصحيحة، انقر هنا:</string>
+    <string name="app_description">OpenExplorer - افتح إدارة ملف مصدر لجميع الأجهزة! (أقراص، هواتف، وأجهزة تلفاز جوجل، والسندويشات!)\n- استكمال نظام إدارة الملف\n- USB، والتنمية المستدامة وغيرها من وسائل الإعلام الخارجية\n- للربط الشبكة (FTP، SFTP، SMB / سامبا / ويندوز / LAN / WIFI)\n- نص محرر\n- سمارت المجلدات التي تفحص لأنواع مختلفة من وسائل الاعلام (فيديو، صور، موسيقى، التحميل)\n- مشاهدة بيجر دليل الملاحة (انتقاد حق لترتفع دليل)\n- المستعملين المتميزين / الجذر القدرة على قائمة / قراءة مجلدات النظام (أي نظام الكتابة حتى الآن)\n\nميزات ليأتي:\n- كلفه محرر النص\n- القدرة على المزيد من الشبكات (دروببوإكس، Box.net، السماء محرك الأقراص)\n- غير متصل مخبأ بنية الملف، وسوف تذكر الملفات التي لديك في أماكن مختلفة دون الحاجة للاتصال\n- خريطة مساحة القرص حرارة يظهر فيها الملفات الخاصة بك هي أكبر\n\n* يرجى ملاحظة: هذا التطبيق هو في بيتا. لا تزال هناك العديد من البق. إذا كنت لا ترغب في أن تشهد هذه الأخطاء، من فضلك لا تحميل هذا التطبيق. إذا كنت ترغب في مساعدتي في العثور على هذه الحشرات، يرجى الكتابة لي أو تعاون معي على GitHub (https://github.com/BrandoCommando/OpenExplorer/). يرجى تذكر تقييمات سيئة مساعدة أحد.</string>
+    <string name="alert_translate_google" formatted="false">مرحبا، وتقدم هذه الترجمة بواسطة مترجم جوجل. إذا كنت تعرف اللغة الإنجليزية، فضلا عن%s، وترغب في المساعدة في تقديم أفضل ترجمة، يرجى النقر على هذا الزر:</string>
+    <string name="alert_translate_none" formatted="false">مرحبا، يبدو أنك تستخدم لغة غير مدعومة. هل تعرف ق الإنجليزية %s إذا كنت تريد أن تساعد في توفير الترجمة الصحيحة، انقر هنا:</string>
     <string name="button_translate">ترجمة</string>
     <string name="httpError">حدث خطأ في الشبكة</string>
     <string name="httpErrorAuth">نجحت المصادقة</string>
@@ -317,5 +295,51 @@
     <string name="s_alert_clipboard">تم النسخ للذاكرة المؤقتة</string>
     <string name="s_alert_restart">إعادة التشغيل. الرجاء الإنتظار</string>
     <string name="language">اللغة</string>
-
-</resources>
\ No newline at end of file
+    <string name="s_menu_download">تنزيل</string>
+    <string name="scan">مسح</string>
+    <string name="test">تجربة</string>
+    <string name="test_success">اتصل بنجاح</string>
+    <string name="theme">نمط</string>
+    <string name="theme_dark">معتم</string>
+    <string name="theme_light">مضيئ</string>
+    <string name="chooser_remember">تذكر اختياري</string>
+    <string name="use_system">؟استخدم النظام &gt;&gt;</string>
+    <string name="activity_resolver_use_always">دائماَ</string>
+    <string name="activity_resolver_use_once">فقط لمرة</string>
+    <string name="s_pref_bookmarks_summary">اظهر العلامات</string>
+    <string name="apply_to_all">هل تريد تطبيقه على كافة المجلدات</string>
+    <string name="s_pref_view_folders">تفضيلات المجلدات</string>
+    <string name="s_pref_view_general">تفضيلات عامة</string>
+    <string name="s_msg_folder_none">لايمكن انشاء المجلد</string>
+    <string name="s_privacy">سياسة الخصوصية</string>
+    <string name="s_menu_system_mount">اجعل ملف النظام قابل للكتابة (خطر) </string>
+    <string name="s_menu_system_mount_on">النظام قابل للكتابة</string>
+    <string name="s_menu_system_mount_off">النظام للقراءة فقط</string>
+    <string name="s_pref_servers_private_summary">تخزين إعدادات السيرفر في في منطقة تخزين خاصةهذا سيتسبب في مسح الاعدادات عند مسح التطبيق لاتختر هذا الخيار اذا كنت ستثبت التطبيق مرة اخرى وترغب في استعادة اعداداتك.</string>
+    <string name="s_menu_rate">قَيّمْ</string>
+    <string name="s_alert_destination_exists">الدليل موجود مسبقاً .ماذا تريد ان تفعل؟</string>
+    <string name="s_overwrite">إعادة الكتابة</string>
+    <string name="s_skip">تخطي</string>
+    <string name="s_msg_file_exists">بعض المل\nفات موجودة مسبقاَ .هل ترغب بالكتابة فوقها ؟</string>
+    <string name="s_title_file_exists">الملف تم استخراجة مسبقاَ</string>
+    <string name="s_msg_pref_archives">هل تريد تصفح السجل او استخراجه؟</string>
+    <string name="s_browse">تصفح مواقع النت</string>
+    <string name="s_extracted">تم الاستخراج</string>
+    <string name="s_extracting">استخراجززنتعفغججع</string>
+    <string name="s_extract_with">استخرج نت</string>
+    <string name="s_ask_again">اسأل كل مرة</string>
+    <string name="s_archives">السجلات</string>
+    <string name="s_compress">اضغط</string>
+    <string name="s_compress_type">نوع الضغط</string>
+    <string name="s_compressed">مضغوط</string>
+    <string name="s_delete_after">امسح المصدر بعد الانتهاء</string>
+    <string name="s_pass_old">ادخل كلمة المرور القديمة</string>
+    <string name="s_pass_new">188877776666</string>
+    <string name="s_logout">تسجيل الخروج</string>
+    <string name="s_bookmark_history">سجل</string>
+    <string name="s_server_account_title">حساب</string>
+    <string name="s_folders">مجلداتforex</string>
+    <string name="s_hidden">مخفي</string>
+    <string name="s_total">مجمل</string>
+    <string name="s_custom_account">حساب مخصص</string>
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
new file mode 100755
index 00000000..e034c2d4
--- /dev/null
+++ b/res/values-bg/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="warn_text_editor">Firefox</string>
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
new file mode 100755
index 00000000..4a6690ce
--- /dev/null
+++ b/res/values-ca/strings.xml
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="app_name">Obriu l\'Explorador</string>
+    <string name="s_photos" auto="1">Fotos</string>
+    <string name="s_videos" auto="1">Videos</string>
+    <string name="s_music" auto="1">Música</string>
+    <string name="s_downloads" auto="1">Descàrregues</string>
+    <string name="s_external" auto="1">Extern</string>
+    <string name="s_internal" auto="1">Intern</string>
+    <string name="s_view" auto="1">Veure</string>
+    <string name="s_bookmarks" auto="1">Marcadors</string>
+    <string name="s_menu_favorites" auto="1">Marcadors Toggle</string>
+    <string name="s_menu_sort">Ordenament</string>
+    <string name="s_menu_sort_name_asc" auto="1">Ordenar per nom (A-Z)</string>
+    <string name="s_menu_sort_name_desc" auto="1">Ordenar per Nom (Z-A)</string>
+    <string name="s_menu_sort_date_asc" auto="1">Ordena per Les més recent</string>
+    <string name="s_menu_sort_date_desc" auto="1">Ordenar per més vell</string>
+    <string name="s_menu_sort_size_asc" auto="1">Ordenar de major a</string>
+    <string name="s_menu_sort_size_desc" auto="1">Ordenar per més petit</string>
+    <string name="s_menu_sort_type" auto="1">Ordenar per tipus de fitxer</string>
+    <string name="s_menu_multi" auto="1">De selecció múltiple</string>
+    <string name="s_menu_grid">Vista de Quadricula</string>
+    <string name="s_menu_list" auto="1">Veure la llista de</string>
+    <string name="s_menu_carousel" auto="1">Carrusel</string>
+    <string name="s_menu_hidden" auto="1">Mostra fitxers ocults</string>
+    <string name="s_menu_thumbs" auto="1">Mostra miniatures d\'imatge</string>
+    <string name="s_menu_new_folder" auto="1">Carpeta nova</string>
+    <string name="s_menu_other" auto="1">Altres ajustos</string>
+    <string name="s_menu_flush" auto="1">Buidar memòria cau</string>
+    <string name="s_menu_root" auto="1">Arrel</string>
+    <string name="s_menu_prefs_folder" auto="1">Preferències de carpeta</string>
+    <string name="s_menu_prefs_global" auto="1">Preferències globals</string>
+    <string name="s_menu_info" auto="1">Info</string>
+    <string name="s_menu_copy" auto="1">Copiar</string>
+    <string name="s_menu_cut" auto="1">Tallar</string>
+    <string name="s_menu_paste" auto="1">Enganxar</string>
+    <string name="s_menu_delete" auto="1">Esborrar</string>
+    <string name="s_menu_share" auto="1">Enviar / Compartir ...</string>
+    <string name="s_menu_zip">Comprimeix amb zip els-fitxer(s) ...</string>
+    <string name="s_menu_unzip" auto="1">Descomprimir ...</string>
+    <string name="s_menu_rename" auto="1">Canviar el nom de ...</string>
+    <string name="s_menu_bookmark" auto="1">Afegir a Favorits</string>
+    <string name="s_save">Desa</string>
+    <string name="s_saveas" auto="1">Guardar com ...</string>
+    <string name="s_cancel" auto="1">Cancel · lar</string>
+    <string name="s_size" auto="1">Mida</string>
+    <string name="s_none" auto="1">Cap</string>
+    <string name="s_pref_servers" auto="1">Servidors addicionals</string>
+    <string name="s_pref_server_add" auto="1">+ Afegir nou servidor</string>
+    <string name="s_pref_display" auto="1">Preferències de visualització</string>
+    <string name="s_pref_hidden" auto="1">Mostra fitxers ocults</string>
+    <string name="s_pref_hidden_summary" auto="1">Mostra fitxers i carpetes ocults</string>
+    <string name="s_pref_thumbs" auto="1">Mostra miniatures d\'imatge</string>
+    <string name="s_pref_thumbs_summary" auto="1">Mostra una vista en miniatura dels arxius d\'imatge / vídeo i / o Aplicacions</string>
+    <string name="s_pref_view" auto="1">Mode de visualització</string>
+    <string name="s_pref_view_summary" auto="1">Mostra els fitxers en una xarxa, llista o carrusel (Bresca només)</string>
+    <string name="s_pref_sort" auto="1">Classificació</string>
+    <string name="s_pref_sort_summary" auto="1">Tria la forma d\'ordenar els arxius i carpetes</string>
+    <string name="s_pref_advanced" auto="1">Avançat</string>
+    <string name="s_pref_server_name" auto="1">Nom del servidor</string>
+    <string name="s_pref_server_name_summary" auto="1">Introduïu el nom del servidor</string>
+    <string name="s_pref_server_url" auto="1">URL del servidor</string>
+    <string name="s_pref_server_url_summary" auto="1">Escriviu la URL completa del servidor</string>
+    <string name="s_pref_server_host" auto="1">Servidor host</string>
+    <string name="s_pref_server_user" auto="1">Usuari</string>
+    <string name="s_pref_server_user_summary" auto="1">Nom d\'usuari</string>
+    <string name="s_pref_server_password" auto="1">Contrasenya</string>
+    <string name="s_pref_server_password_summary" auto="1">Inici de sessió Contrasenya</string>
+    <string name="s_pref_server_path" auto="1">Subdirectori</string>
+    <string name="s_pref_server_path_summary" auto="1">Introduïu el camí per defecte d\'inici de sessió</string>
+    <string name="s_pref_server_extras" auto="1">Configuració extra</string>
+    <string name="s_pref_server_update" auto="1">Afegir / Actualitzar servidor</string>
+    <string name="s_pref_server_type" auto="1">Tipus de servidor</string>
+    <string name="s_files" auto="1">arxius</string>
+    <string name="s_create">Crea</string>
+    <string name="s_title_holding_x_files" formatted="false" auto="1">Celebració dels arxius %s</string>
+    <string name="s_title_newfolder" auto="1">Creeu una nova carpeta</string>
+    <string name="s_title_send" formatted="false" auto="1">Enviar %s</string>
+    <string name="s_title_unzip" formatted="false" auto="1">Descomprimir %s</string>
+    <string name="s_title_zip" formatted="false" auto="1">Zip %s</string>
+    <string name="s_title_executing" auto="1">Execució</string>
+    <string name="s_title_deleting" auto="1">Eliminació de</string>
+    <string name="s_title_searching" auto="1">Cerca</string>
+    <string name="s_title_moving" auto="1">Moure</string>
+    <string name="s_title_copying" auto="1">Còpia</string>
+    <string name="s_title_zipping" auto="1">Comprimir</string>
+    <string name="s_title_unzipping" auto="1">Descomprimir</string>
+    <string name="s_title_wait" auto="1">Si us plau, espereu ...</string>
+    <string name="s_alert_confirm_delete" formatted="false" auto="1">Eliminar %s no es pot desfer. Esteu segur que voleu continuar?</string>
+    <string name="s_alert_rename" auto="1">Si us plau, escriviu el nou nom d\'aquest arxiu</string>
+    <string name="s_alert_newfolder" auto="1">Escriviu el nom de la carpeta que voleu crear.</string>
+    <string name="s_alert_unzip" formatted="false" auto="1">T\'agradaria descomprimir %s aquí o alguna altra carpeta?</string>
+    <string name="s_button_unzip_here" auto="1">Descomprimir aquí</string>
+    <string name="s_button_unzip_else" auto="1">Descomprimir en altres llocs ...</string>
+    <string name="s_msg_none" auto="1">Arxiu (s) no pot ser</string>
+    <string name="s_msg_some" auto="1">Alguns d\'arxiu (s) no pot ser</string>
+    <string name="s_msg_all" auto="1">Arxiu (s) amb èxit</string>
+    <string name="s_msg_deleted" auto="1">eliminat</string>
+    <string name="s_msg_moved" auto="1">es va traslladar</string>
+    <string name="s_msg_copied" auto="1">copiat</string>
+    <string name="s_remove" auto="1">Treure</string>
+    <string name="s_eject" auto="1">Expulsar</string>
+    <string name="s_update" auto="1">Actualitzar</string>
+    <string name="s_alert_bookmark_rename" auto="1">Canviar el títol del seu marcador.</string>
+    <string name="s_title_bookmark_prefix" auto="1">Administrar Preferits:</string>
+    <string name="s_alert_remove_safe" auto="1">Ara pot retirar de forma segura la unitat.</string>
+    <string name="s_alert_remove_error" auto="1">No es pot expulsar.</string>
+    <string name="s_menu_about" auto="1">Sobre</string>
+    <string name="s_about_version" auto="1">Versió</string>
+    <string name="s_about_author" auto="1">Autor</string>
+    <string name="s_about_site" auto="1">Lloc web</string>
+    <string name="s_about_email" auto="1">Correu electrònic</string>
+    <string name="s_about_recent" auto="1">Actualitzacions recents</string>
+    <string name="s_chooser_email" auto="1">Envieu les vostres ...</string>
+    <string name="s_status_loading" auto="1">Carregant ...</string>
+    <string name="s_menu_open" auto="1">Obre amb ...</string>
+    <string name="s_menu_edit" auto="1">Edita amb ...</string>
+    <string name="s_pref_stats_title" auto="1">Ajudar a millorar OpenExplorer</string>
+    <string name="s_pref_stats_summary" auto="1">Notificar estadístiques anònimes d\'ús. Això no inclou cap informació que pugui ser utilitzat per identificar l\'usuari.</string>
+    <string name="s_error_no_intents" auto="1">No hi ha aplicacions instal · lades poden llegir aquest tipus de fitxer.</string>
+    <string name="s_menu_root_disabled" auto="1">Arrel de discapacitats</string>
+    <string name="s_pref_start" auto="1">A partir de carpetes</string>
+    <string name="s_pref_start_summary" auto="1">Indica en quina carpeta s\'inicia en OpenExplorer</string>
+    <string name="s_custom" auto="1">Personalitza ...</string>
+    <string name="s_text_intro_top" auto="1">Benvingut a OpenExplorer!</string>
+    <string name="s_text_intro_body" auto="1">L\'objectiu de OpenExplorer és fer més productiu dins del sistema d\'arxius Android i en el núvol. Ja sigui que necessiti per gestionar vídeos o fotos des de diverses ubicacions o gestionar el seu web de forma remota via FTP, OpenExplorer pot adaptar a les seves necessitats  n  nSi us plau, seleccioneu la ruta de sortida.:</string>
+    <string name="s_info_num_folders" auto="1">Nombre de carpetes:</string>
+    <string name="s_info_num_files" auto="1">Nombre d\'arxius:</string>
+    <string name="s_info_last_modified" auto="1">Darrera modificació:</string>
+    <string name="s_info_permissions" auto="1">Els permisos d\'arxius:</string>
+    <string name="s_info_permission_read" auto="1">Llegiu:</string>
+    <string name="s_info_permission_write" auto="1">Escriu:</string>
+    <string name="s_info_permission_execute" auto="1">Executar:</string>
+    <string name="s_toggle_keyboard" auto="1">Teclat</string>
+    <string name="s_show_password" auto="1">Mostra la contrasenya</string>
+    <string name="s_error_ftp" auto="1">Error en connectar amb FTP</string>
+    <string name="s_prompt_zip" auto="1">Introduïu el nom de fitxer nou fitxer Zip:</string>
+    <string name="app_edit" auto="1">Edita amb OpenExplorer</string>
+    <string name="s_menu_more" auto="1">Més opcions ...</string>
+    <string name="s_msg_low_memory" auto="1">Poca memòria!</string>
+    <string name="s_clear" auto="1">Esborrar</string>
+    <string name="s_menu_delete_all" auto="1">Elimina tot</string>
+    <string name="s_menu_move_all" auto="1">Moure aquí</string>
+    <string name="s_menu_copy_all" auto="1">Copiar aquí</string>
+    <string name="s_confirm_delete" formatted="false" auto="1">Segur que voleu suprimir %s?</string>
+    <string name="s_error_same_destination" auto="1">El directori de destí és el mateix.</string>
+    <string name="s_sample_notification" auto="1">Còpia -&gt; sdcard:  n 3 Arxius</string>
+    <string name="s_pref_fullscreen" auto="1">Pantalla completa</string>
+    <string name="s_pref_fullscreen_summary_on" auto="1">Oculta la barra de notificació</string>
+    <string name="s_pref_fullscreen_summary_off" auto="1">Mostra la barra de notificació</string>
+    <string name="s_pref_pagers" auto="1">Veure Buscapersones</string>
+    <string name="s_pref_pagers_summary_on" auto="1">Lliscar horitzontal = Directori de Navegació</string>
+    <string name="s_pref_pagers_summary_off" auto="1">Horitzontal pispar persones de mobilitat reduïda</string>
+    <string name="s_alert_new_media" auto="1">Nous mitjans de comunicació inserit!</string>
+    <string name="s_warn_pager_title" auto="1">Nova funció: Visualització Buscapersones</string>
+    <string name="s_warn_pager" auto="1">Pas a l\'esquerra a la dreta per pujar un directori i de dreta a esquerra per anar cap enrere. Això hauria de fer que sigui més fàcil de navegar. Intenteu-ho cap a fora (en suports externs)!</string>
+    <string name="s_warn_confirm" auto="1">Ho entens?</string>
+    <string name="s_warn_disable" auto="1">Inhabilita</string>
+    <string name="s_pref_intent_internal" auto="1">Intencions interns</string>
+    <string name="s_pref_intent_internal_on" auto="1">Utilitzeu l\'Administrador de OpenExplorer Intenció</string>
+    <string name="s_pref_intent_internal_off" auto="1">Utilitzeu l\'Administrador de Sistema d\'Intenció</string>
+    <string name="s_pref_text_internal" auto="1">Utilitzeu l\'Editor de text intern</string>
+    <string name="s_text_editor_title" auto="1">Editor de text</string>
+    <string name="s_pref_show_root" auto="1">Mostra l\'arrel del sistema de fitxers (/)</string>
+    <string name="s_pref_show_internal" auto="1">Mostra Mitjans de Comunicació Interna</string>
+    <string name="s_pref_show_external" auto="1">Mostra els mitjans externs</string>
+    <string name="s_error_no_media" auto="1">Sembla que no hi ha cap mitjà inserit. Si us plau, desactivar l\'ús compartit de mitjans USB o re-inserció.</string>
+    <string name="s_prompt_password" auto="1">Introduïu la contrasenya</string>
+    <string name="s_add" auto="1">Afegir</string>
+    <string name="s_server_ftp" auto="1">FTP</string>
+    <string name="s_server_sftp" auto="1">SFTP</string>
+    <string name="s_pref_server_port" auto="1">Port</string>
+    <string name="s_about_buildtime" auto="1">Data de compilació</string>
+    <string name="s_default" auto="1">Defecte</string>
+    <string name="s_pref_timeout" auto="1">Temps d\'espera</string>
+    <string name="s_pref_timeout_summary" auto="1">Temps d\'espera en segons</string>
+    <string name="s_menu_up" auto="1">Pujar</string>
+    <string name="s_prompt_unzip" auto="1">Introduïu el camí per a descomprimir en:</string>
+    <string name="s_pref_hardware_accel" auto="1">Habilitar acceleració de maquinari</string>
+    <string name="s_pref_honeyplus" auto="1">Android 3.0 + Configuració</string>
+    <string name="s_pref_actionmode" auto="1">Mode d\'acció</string>
+    <string name="s_pref_actionmode_enabled" auto="1">Utilitzeu el mode d\'acció</string>
+    <string name="s_pref_actionmode_disabled" auto="1">L\'ús de menús estàndard de context</string>
+    <string name="s_server_smb" auto="1">SMB / Windows</string>
+    <string name="s_bookmark_drives" auto="1">Unitats</string>
+    <string name="s_bookmark_smart" auto="1">Carpetes intel · ligents</string>
+    <string name="s_bookmark_favorites" auto="1">Favorits</string>
+    <string name="s_bookmark_servers" auto="1">Servidors</string>
+    <string name="s_bookmark_cache" auto="1">Cache</string>
+    <string name="s_info_totalspace" auto="1">Espai total en disc:</string>
+    <string name="s_info_freespace" auto="1">Disc Espai lliure:</string>
+    <string name="s_status_rate" auto="1">Tarifa:</string>
+    <string name="s_about_hardware" auto="1">Maquinari</string>
+    <string name="s_menu_refresh" auto="1">Actualitzar Carpeta</string>
+    <string name="s_pref_reset" auto="1">Restablir Vistes</string>
+    <string name="s_toast_complete" auto="1">Operació completa!</string>
+    <string name="s_pref_reset_summary" auto="1">Feu clic aquí per eliminar tota la configuració de la vista de carpetes específiques, tornant a un estat predeterminat.</string>
+    <string name="s_prompt_path" auto="1">Introduïu el camí:</string>
+    <string name="s_prompt_search" auto="1">Cercar:</string>
+    <string name="s_prompt_search_within" auto="1">Allotjament a:</string>
+    <string name="s_pref_view_category" auto="1">Afegir a favorits Preferències Veure</string>
+    <string name="s_pref_show_videos" auto="1">Mostra vídeos</string>
+    <string name="s_pref_show_photos" auto="1">Mostrar fotos</string>
+    <string name="s_pref_show_music" auto="1">Mostra Música</string>
+    <string name="s_pref_show_downloads" auto="1">Mostra baixades</string>
+    <string name="s_hide" auto="1">Amaga</string>
+    <string name="s_show" auto="1">Mostra</string>
+    <string name="s_msg_event_cancelled" auto="1">Esdeveniment cancel · lat.</string>
+    <string name="s_alert_newfolder_folder" auto="1">Crear una nova carpeta a:</string>
+    <string name="s_pref_fancy_category" auto="1">Configuració de pantalla de fantasia</string>
+    <string name="s_pref_fancy_menus" auto="1">Menús de luxe</string>
+    <string name="s_pref_fancy_context" auto="1">Els menús de context de fantasia</string>
+    <string name="s_search_files" auto="1">Cerca sistema de fitxers</string>
+    <string name="search_summary" formatted="false" auto="1">La cerca de &quot; %s&quot;  n a &quot; %s&quot; ( %d) ...</string>
+    <string name="search_results" formatted="false" auto="1">Es va trobar %d resultats per a &quot; %s&quot;  n a &quot; %s&quot;</string>
+    <string name="s_menu_exit" auto="1">Sortida</string>
+    <string name="s_warn_wtf_message" auto="1">Ui! Sembla que un error no controlat ha passat! Com que aquest és un tema comú en moltes aplicacions beta, l\'única manera de resoldre aquests problemes consisteix a rebre els informes dels diversos dispositius, com la seva, amb la finalitat de determinar la forma de solucionar el problema. Podem enviar aquest informe, que conté només dades anònimes, a la promotora?</string>
+    <string name="s_warn_wtf_ps" auto="1">*** Recordeu que aquesta aplicació està en beta. Si us plau, no donar a aquesta aplicació una qualificació dolenta, simplement perquè es bloqueja. Només desinstal · lar si realment et molesta. Gràcies!</string>
+    <string name="s_yes" auto="1">Sí</string>
+    <string name="s_no" auto="1">No</string>
+    <string name="s_wtf_preview" auto="1">Vista prèvia de dades dels informes</string>
+    <string name="s_wtf_remember" auto="1">No tornar a preguntar</string>
+    <string name="s_pref_basebar" auto="1">Dividir Barra d\'acció</string>
+    <string name="s_pref_basebar_on" auto="1">Els botons d\'acció en la part inferior de la pantalla en la manera vertical</string>
+    <string name="s_pref_basebar_off" auto="1">Els botons d\'acció en la part superior de la pantalla (si està disponible)</string>
+    <string name="s_pref_autowtf" auto="1">Auto-enviar informes d\'errors</string>
+    <string name="s_pref_autowtf_summary" auto="1">Quan una excepció no controlada es produeix, automàticament enviar l\'informe.</string>
+    <string name="s_split_auto" auto="1">Automàtic</string>
+    <string name="s_split_top" auto="1">Botons de la Força a la part superior</string>
+    <string name="s_split_top_single" auto="1">Forçar un sol botó a la part superior</string>
+    <string name="s_split_bottom" auto="1">Botons de la Força cap avall</string>
+    <string name="s_split_none" auto="1">Col · loqueu tots els botons al menú del sistema</string>
+    <string name="s_about_screensize" auto="1">Mida de la pantalla</string>
+    <string name="s_about_density" auto="1">Densitat</string>
+    <string name="s_menu_location_int" auto="1">Ruta de la memòria interna</string>
+    <string name="s_menu_location_ext" auto="1">Ruta d\'accés de memòria externa</string>
+    <string name="s_wtf_context" auto="1">Si us plau, descrigui el context de l\'accident:</string>
+    <string name="thanks" auto="1">Gràcies!</string>
+    <string name="menu_view_font_small">Mida de lletra petita</string>
+    <string name="menu_view_font_medium" auto="1">Font Mitjana</string>
+    <string name="menu_view_font_large" auto="1">Mida de la Font Gran</string>
+    <string name="app_description" auto="1">Obriu l\'Explorador - gestor de fitxers de codi obert per a tots els dispositius! (Tabletes, telèfons, televisors de pantalla de Google, entrepans!)  N-complet sistema de gestió d\'arxiu  n-USB, SD i altres mitjans externs  n de la xarxa per a connexió (FTP, SFTP, SMB / Samba / Windows / LAN / Wi-Fi)  n - Editor de text  n-Smart Folders que exploren els diferents tipus de mitjans (vídeos, fotos, música, descàrregues)  n-View Pager directori de navegació (a la dreta passi per pujar un directori)  n-a root / root capacitat per a la llista / llegir les carpetes del sistema (sense sistema d\'escriptura encara)  n  nFeatures per venir:  n-amb pestanyes Editor de text  n-Més capacitat de xarxa (Dropbox, Box.net, Sky Drive)  n-memòria cau de l\'estructura d\'arxius sense connexió, es recorda que els arxius que té en diferents llocs fora de línia  n-Disk mapa de l\'espai de calor mostra on són els seus arxius són més grans  n  n * NOTA: Aquesta aplicació està en beta. Encara hi ha molts errors. Si vostè no desitja experimentar aquests errors, si us plau, no descarregar aquesta aplicació. Si li agradaria que m\'ajudés a trobar aquests errors, si us plau envieu-me un correu electrònic, o que col · laboren amb mi en GitHub (https://github.com/BrandoCommando/OpenExplorer/). Si us plau, recordeu males qualificacions ajuden a ningú.</string>
+    <string name="alert_translate_google" formatted="false" auto="1">Hola, aquesta traducció és proporcionada per Google Translate. Si saps anglès, així com %s, i m\'agradaria ajudar a proporcionar una millor traducció, si us plau feu clic en aquest botó:</string>
+    <string name="alert_translate_none" formatted="false" auto="1">Hola, sembla que vostè està utilitzant un llenguatge no compatible. Sap vostè s Anglès i %s? Si vols ajudar a proporcionar una traducció correcta, feu clic aquí:</string>
+    <string name="button_translate" auto="1">Traduir</string>
+    <string name="httpError">S\'ha produït un error de xarxa.</string>
+    <string name="httpErrorAuth">Autenticació incorrecta.</string>
+    <string name="httpErrorProxyAuth">L\'autenticació mitjançant el servidor intermediari no ha estat correcta.</string>
+    <string name="httpErrorConnect">No s\'ha pogut establir la connexió al servidor.</string>
+    <string name="httpErrorIO">El servidor no s\'ha pogut comunicar. Torna-ho a provar més tard.</string>
+    <string name="httpErrorTimeout">La connexió al servidor ha esgotat el temps d\'espera.</string>
+    <string name="httpErrorFile">No s\'ha pogut accedir al fitxer.</string>
+    <string name="httpErrorFileNotFound">No s\'ha trobat el fitxer sol·licitat.</string>
+    <string name="contentServiceSync">Sincronització</string>
+    <string name="keyguard_password_enter_pin_code">Introduïu el codi PIN</string>
+    <string name="keyguard_password_enter_password_code">Introduïu la contrasenya per desbloquejar-lo</string>
+    <string name="keyguard_password_enter_pin_password_code">Introdueix el PIN per desbloquejar</string>
+    <string name="lockscreen_password_wrong">Torna-ho a provar</string>
+    <string name="whichApplication">Completa l\'acció mitjançant</string>
+    <string name="noApplications">No hi ha cap aplicació que pugui dur a terme aquesta acció.</string>
+    <string name="report">Informe</string>
+    <string name="sim_restart_button">Reinicia</string>
+    <string name="extmedia_format_button_format">Formata</string>
+    <string name="ext_media_nofs_notification_message">Emmagatzematge USB buit o sistema de fitxers no admès.</string>
+    <string name="activity_list_empty">La targeta SD és buida o té un sistema de fitxers incompatible.</string>
+    <string name="ime_action_go">No s\'ha trobat cap activitat coincident</string>
+    <string name="ime_action_send">Vés</string>
+    <string name="ime_action_done">Envia</string>
+    <string name="ime_action_default">Fet</string>
+    <string name="upload_file">Executa</string>
+    <string name="no_file_chosen">Trieu un fitxer</string>
+    <string name="reset">No s\'ha escollit cap fitxer</string>
+    <string name="back_button_label">Reinicia</string>
+    <string name="next_button_label">Enrere</string>
+    <string name="no_matches">Següent</string>
+    <string name="find_on_page">Cap coincidència</string>
+    <string name="find">Troba-ho a la pàgina</string>
+    <string name="activitychooserview_choose_application">Cerca</string>
+    <string name="shareactionprovider_share_with">Selecciona una aplicació</string>
+    <string name="storage_internal">Comparteix amb</string>
+    <string name="storage_sd_card">Emmagatzematge intern</string>
+    <string name="storage_usb">Targeta SD</string>
+    <string name="extract_edit_menu_button">Emmagatzematge USB</string>
+    <string name="activity_chooser_view_see_all">Edita...</string>
+    <string name="s_title_picker">Si us plau, escull un directori</string>
+    <string name="selected_path">Camí sel·leccionat:</string>
+    <string name="filename">Nom d\'arxiu:</string>
+    <string name="s_msg_saved">guardat</string>
+    <string name="s_menu_view_line_numbers">Números de línia</string>
+    <string name="warn_text_editor">Benvingut a l\'editor de texte. Si us plau, pressiona i manté per entrar a mode d\'edició.</string>
+    <string name="warn_networking">Benvingut a Xarxa.Si us plau, tingues en compte que aquesta funció encara s\'està desenvolupant i pot contenir errors. Si us plau, no ens penalitzis al mercat si en trobes un.</string>
+    <string name="s_menu_new_file">Nou arxiu de texte</string>
+    <string name="s_msg_created">creat</string>
+    <string name="s_title_newfile">Nou arxiu</string>
+    <string name="s_alert_newfile_folder">Crea el nou arxiu a:</string>
+    <string name="s_alert_newfile">Escriu el nom del nou arxiu:</string>
+    <string name="s_alert_exit">Estas segur que vols-tancar el-programa?</string>
+    <string name="s_alert_clipboard">Copiat al porta retalls</string>
+    <string name="s_alert_restart">Reiniciant. Sigues tant amable d\'esperar un xic ...</string>
+    <string name="language">Idioma</string>
+    <string name="s_menu_download">Descarregar</string>
+    <string name="scan">Escanejar</string>
+    <string name="test">Provar</string>
+    <string name="test_success">Connexió amb èxit!</string>
+    <string name="no_items">Sense elements.</string>
+    <string name="clipboard">Portapapers</string>
+    <string name="theme">Tema</string>
+    <string name="theme_dark">IU Fosca</string>
+    <string name="theme_light">IU Clara</string>
+    <string name="chooser_remember">Recordar la meva elecció</string>
+    <string name="use_system">Usar Sistema &gt;&gt;</string>
+    <string name="activity_resolver_use_always">Sempre</string>
+    <string name="activity_resolver_use_once">Només una vegada</string>
+    <string name="s_pref_bookmarks_summary">Mostrar Marcadors</string>
+    <string name="apply_to_all">T\'agradaria aplicar-ho a totes les carpetes?</string>
+    <string name="s_pref_view_folders">Preferències de Carpeta</string>
+    <string name="s_pref_view_general">Preferències Generals</string>
+    <string name="s_pref_text_wrap">Envolcallar text</string>
+    <string name="s_pref_thumbs_crop">Retallar/Centrar Miniatures</string>
+    <string name="s_pref_thumbs_cache_clear">Esborrar Cache de Miniatures</string>
+    <string name="s_msg_folder_none">No s\'ha pogut crear la Carpeta.</string>
+    <string name="s_privacy">Política de privacitat</string>
+    <string name="s_theme_lightdark">Clar i Fosc</string>
+    <string name="s_ask_again">Pregunta cada cop</string>
+    <string name="s_compress_type">Tipus de compressio</string>
+    <string name="s_compressed">Comprimid</string>
+    <string name="s_pass_old">Entra la contrasenya vella</string>
+    <string name="s_pass_new">Entra nova contrasenya</string>
+    <string name="s_logout">Desconectar</string>
+    <string name="s_authenticating">Autentificant</string>
+    <string name="s_bookmark_history">Historial</string>
+    <string name="s_server_account_title">Compte</string>
+    <string name="s_pref_thumbs_cache_summary">Aixo incrementara la pujada de carpetes amb fotos i videos</string>
+    <string name="s_folders">carpetes</string>
+    <string name="s_custom_account">Compte del client</string>
+</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
new file mode 100755
index 00000000..50038f20
--- /dev/null
+++ b/res/values-cs/strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="app_name">Open Explorer</string>
+    <string name="s_photos">Fotografie</string>
+    <string name="s_videos">Videa</string>
+    <string name="s_music">Hudba</string>
+    <string name="s_downloads">Stažené</string>
+    <string name="s_external">Externí</string>
+    <string name="s_internal">Interní</string>
+    <string name="s_view">Zobrazit</string>
+    <string name="s_bookmarks">Záložky</string>
+    <string name="s_menu_favorites">Přepnout Záložky</string>
+    <string name="s_menu_sort">Řadit</string>
+    <string name="s_menu_sort_name_asc">Řadit podle Názvu (A-Z)</string>
+    <string name="s_menu_sort_name_desc">Řadit podle Názvu (Z-A)</string>
+    <string name="s_menu_sort_date_asc">Řadit od Nejnovějších</string>
+    <string name="s_menu_sort_date_desc">Řadit od Nejstarších</string>
+    <string name="s_menu_sort_size_asc">Řadit od Největších</string>
+    <string name="s_menu_sort_size_desc">Řadit od Nejmenších</string>
+    <string name="s_menu_sort_type">Řadit podle Typu Souboru</string>
+    <string name="s_menu_multi">Zvolit Více</string>
+    <string name="s_menu_grid">Zobrazit v Mřížce</string>
+    <string name="s_menu_list">Zobrazit v Seznamu</string>
+    <string name="s_menu_new_folder">Nová Složka</string>
+    <string name="s_menu_other">Další Nastavení</string>
+    <string name="s_menu_root">ROOT</string>
+    <string name="s_menu_info">Info</string>
+    <string name="s_menu_copy">Kopírovat</string>
+    <string name="s_menu_cut">Vyjmout</string>
+    <string name="s_menu_paste">Vložit</string>
+    <string name="s_menu_delete">Smazat</string>
+    <string name="s_menu_share">Poslat/Sdílet...</string>
+    <string name="s_menu_zip">zaZIPovat soubor(y)</string>
+    <string name="s_menu_unzip">Rozbalit...</string>
+    <string name="s_menu_rename">Přejmenovat...</string>
+    <string name="s_menu_bookmark">Přidat Záložku</string>
+    <string name="s_save">Uložit</string>
+    <string name="s_saveas">Uložit jako...</string>
+    <string name="s_cancel">Zrušit</string>
+    <string name="s_size">Velikost</string>
+    <string name="s_none">Nic</string>
+    <string name="s_pref_servers">Další Servery</string>
+    <string name="s_pref_server_add">+Přidat Nový Server</string>
+    <string name="s_pref_display">Nastavení Zobrazení</string>
+    <string name="s_pref_hidden">Zobrazit Skryté Soubory</string>
+    <string name="s_pref_hidden_summary">Zobrazit skryté soubory a složky</string>
+    <string name="s_pref_thumbs">Zobrazit Miniatury Obrázků</string>
+    <string name="s_pref_thumbs_summary">Zobrazit miniaturu u Obrázků/Videí/Aplikací</string>
+    <string name="s_pref_view">Mod Zobrazení</string>
+    <string name="s_menu_about">Info</string>
+    <string name="s_menu_open">Otevřít s...</string>
+    <string name="s_menu_edit">Editovat s...</string>
+    <string name="s_menu_root_disabled">Root vypnut</string>
+    <string name="s_text_intro_body">Cílem OpenExploreru je učinit Vás víc produkivním při správě souborů v Androidu a cloudu. Když potřebujete spravovat videa nebo fotografie z různých zdrojů nebo potřebujete spravovat váš webserver před FTP, tak by Vám OpenExplorer mohl vyhovovat.</string>
+    <string name="s_menu_more">Více možností...</string>
+    <string name="s_menu_delete_all">Smazat Vše</string>
+    <string name="s_menu_move_all">Přesunout Sem</string>
+    <string name="s_menu_copy_all">Kopírovat Sem</string>
+    <string name="s_menu_up">Výše</string>
+    <string name="s_menu_refresh">Aktualizovat Složku</string>
+    <string name="s_pref_fancy_menus">Přitažlivé Meny</string>
+    <string name="s_menu_exit">Exit</string>
+    <string name="s_menu_location_int">Cesta k Interní Paměti</string>
+    <string name="s_menu_location_ext">Cesta k Externí Paměti</string>
+    <string name="menu_view_font_small">Malá Velikost Fontu</string>
+    <string name="menu_view_font_medium">Střední Velikost Fontu</string>
+    <string name="menu_view_font_large">Velká Velikost Fontu</string>
+    <string name="warn_text_editor">Vítejte v Text Editoru. Podržte prst na textu pro vstup do Edit módu.</string>
+    <string name="warn_networking">Vítejte v Sítích. Pamatujte prosím, že tato funkce se stále vyvíjí a může obsahovat chyby. Prosím, nedávejte v Marketu špatné hodnocení kvůli těmto chybám.</string>
+</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
new file mode 100755
index 00000000..c187f3e7
--- /dev/null
+++ b/res/values-da/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_photos">Billeders</string>
+    <string name="s_external">Billeder</string>
+    <string name="s_menu_new_folder">Ny Mappe gggh</string>
+    <string name="s_menu_exit">Afslut</string>
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
old mode 100644
new mode 100755
index ae55d9fe..593731d7
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="app_name">Explorer öffnen</string>
-    <string name="s_photos" auto="1">Fotos</string>
+    <string name="app_name">Open Explorer</string>
+    <string name="s_photos">Bilder</string>
     <string name="s_videos">Videos</string>
     <string name="s_music" auto="1">Musik</string>
     <string name="s_downloads" auto="1">Downloads</string>
@@ -13,24 +13,24 @@
     <string name="s_menu_sort">Sortieren </string>
     <string name="s_menu_sort_name_asc">Nach Name sortieren (A-Z)</string>
     <string name="s_menu_sort_name_desc">Nach Name sortieren (Z-A)</string>
-    <string name="s_menu_sort_date_asc">Neuste zuerst anzeigen</string>
-    <string name="s_menu_sort_date_desc">Älteste zuerst anzeigen</string>
-    <string name="s_menu_sort_size_asc">Größte zuerst anzeigen</string>
-    <string name="s_menu_sort_size_desc">Kleinste zuerst anzeigen</string>
-    <string name="s_menu_sort_type">Nach Dateityp sortieren</string>
+    <string name="s_menu_sort_date_asc">Neueste zuerst</string>
+    <string name="s_menu_sort_date_desc">Älteste zuerst</string>
+    <string name="s_menu_sort_size_asc">Größte zuerst</string>
+    <string name="s_menu_sort_size_desc">Kleinste zuerst</string>
+    <string name="s_menu_sort_type">Nach Dateityp</string>
     <string name="s_menu_multi">Mehrfachauswahl</string>
     <string name="s_menu_grid">Rasteransicht</string>
     <string name="s_menu_list">Listenansicht</string>
-    <string name="s_menu_carousel" auto="1">Karussell</string>
-    <string name="s_menu_hidden">Versteckte Dateien zeigen</string>
+    <string name="s_menu_carousel">Karussell</string>
+    <string name="s_menu_hidden">Versteckte Dateien anzeigen </string>
     <string name="s_menu_thumbs">Miniaturbilder anzeigen</string>
     <string name="s_menu_new_folder">Neuer Ordner</string>
-    <string name="s_menu_other">Weitere Einstellungen</string>
+    <string name="s_menu_other">Sonstige Einstellungen</string>
     <string name="s_menu_flush">Cache leeren</string>
     <string name="s_menu_root">Root</string>
     <string name="s_menu_prefs_folder">Ordner-Einstellungen</string>
     <string name="s_menu_prefs_global">Allgemeine Einstellungen</string>
-    <string name="s_menu_info"> Info</string>
+    <string name="s_menu_info">Info</string>
     <string name="s_menu_copy">Kopieren</string>
     <string name="s_menu_cut">Ausschneiden</string>
     <string name="s_menu_paste">Einfügen</string>
@@ -39,38 +39,38 @@
     <string name="s_menu_zip">Zip-Datei(en)...</string>
     <string name="s_menu_unzip">Entpacken...</string>
     <string name="s_menu_rename">Umbenennen...</string>
-    <string name="s_menu_bookmark" auto="1">Lesezeichen hinzufügen</string>
+    <string name="s_menu_bookmark">Lesezeichen hinzufügen</string>
     <string name="s_save">Speichern</string>
     <string name="s_saveas">Speichern unter...</string>
     <string name="s_cancel">Abbrechen</string>
-    <string name="s_size">Grösse</string>
+    <string name="s_size">Größe</string>
     <string name="s_none">Nichts</string>
     <string name="s_pref_servers">Weitere Server</string>
-    <string name="s_pref_server_add">Neuen Server hinzufügen</string>
-    <string name="s_pref_display">Anzeigeneinstellungen</string>
-    <string name="s_pref_hidden">versteckte Dateien anzeigen</string>
-    <string name="s_pref_hidden_summary">Versteckte Dateien und Verzeichnisse anzeigen</string>
+    <string name="s_pref_server_add">+ Neuen Server hinzufügen</string>
+    <string name="s_pref_display">Anzeigeeinstellungen</string>
+    <string name="s_pref_hidden">Versteckte Dateien anzeigen</string>
+    <string name="s_pref_hidden_summary">Versteckte Dateien und Ordner anzeigen</string>
     <string name="s_pref_thumbs">Miniaturbilder anzeigen</string>
-    <string name="s_pref_thumbs_summary">Zeigen Sie eine Vorschau für Bild/Video/App-Dateien</string>
+    <string name="s_pref_thumbs_summary">Zeigt Vorschaubilder für Fotos, Videos und App-Dateien</string>
     <string name="s_pref_view">Ansicht</string>
     <string name="s_pref_view_summary">Dateien in einem Raster, einer Liste oder einem Karussell (nur Honeycomb) anzeigen</string>
     <string name="s_pref_sort" auto="1">Sortierung</string>
-    <string name="s_pref_sort_summary">Wählen Sie, wie Dateien und Ordner sortiert werden</string>
-    <string name="s_pref_advanced">Erweitert</string>
-    <string name="s_pref_server_name">Server-Name</string>
-    <string name="s_pref_server_name_summary">Geben Sie den Server-Namen ein</string>
+    <string name="s_pref_sort_summary">Datei- und Ordnersortierung wählen Sie</string>
+    <string name="s_pref_advanced">Erweitert </string>
+    <string name="s_pref_server_name">Servername</string>
+    <string name="s_pref_server_name_summary">Geben Sie den Servernamen ein</string>
     <string name="s_pref_server_url">Server-URL</string>
-    <string name="s_pref_server_url_summary">Geben Sie die vollständige URL des Servers ein</string>
+    <string name="s_pref_server_url_summary">Geben Sie die vollständige URL des Servers an</string>
     <string name="s_pref_server_host">Server-Host</string>
-    <string name="s_pref_server_user">Nutzer</string>
-    <string name="s_pref_server_user_summary">Nutzername </string>
+    <string name="s_pref_server_user">Benutzer</string>
+    <string name="s_pref_server_user_summary">Benutzername </string>
     <string name="s_pref_server_password">Passwort</string>
     <string name="s_pref_server_password_summary">Login-Passwort</string>
     <string name="s_pref_server_path" auto="1">Unterverzeichnis</string>
     <string name="s_pref_server_path_summary">Standard-Login-Pfad eingeben</string>
-    <string name="s_pref_server_extras" auto="1">Weitere Einstellungen</string>
+    <string name="s_pref_server_extras">Zusätzliche Einstellungen</string>
     <string name="s_pref_server_update">Server hinzufügen oder bearbeiten</string>
-    <string name="s_pref_server_type" auto="1">Server-Typ</string>
+    <string name="s_pref_server_type">Typ des Servers</string>
     <string name="s_files" auto="1">Dateien</string>
     <string name="s_create">Erstellen</string>
     <string name="s_title_holding_x_files" formatted="false">Enthält %s Dateien</string>
@@ -78,19 +78,19 @@
     <string name="s_title_send">Sende xxx</string>
     <string name="s_title_unzip">Entpacke xxx</string>
     <string name="s_title_zip">Packe in Zip Archiv xxx</string>
-    <string name="s_title_executing">Ausführen</string>
-    <string name="s_title_deleting">Löschen</string>
-    <string name="s_title_searching">Suchen</string>
-    <string name="s_title_moving">Verschieben</string>
-    <string name="s_title_copying">Kopieren</string>
-    <string name="s_title_zipping">Packen</string>
-    <string name="s_title_unzipping">Entpacken</string>
+    <string name="s_title_executing">Führe aus</string>
+    <string name="s_title_deleting">Lösche</string>
+    <string name="s_title_searching">Suche</string>
+    <string name="s_title_moving">Verschiebe</string>
+    <string name="s_title_copying">Kopiere</string>
+    <string name="s_title_zipping">Packe</string>
+    <string name="s_title_unzipping">Entpacke</string>
     <string name="s_title_wait">Bitte warten...</string>
     <string name="s_alert_confirm_delete" formatted="false">Wenn %s gelöscht wird, kann dies nicht mehr rückgängig gemacht werden. Sind Sie sicher, dass Sie den Vorgang fortsetzen möchten?</string>
     <string name="s_alert_rename">Bitte geben Sie den neuen Namen dieser Datei ein</string>
     <string name="s_alert_newfolder">Wie soll der neue Ordner heißen?</string>
     <string name="s_alert_unzip" formatted="false">Möchten Sie %s hier oder in einem anderen Ordner entpacken?</string>
-    <string name="s_button_unzip_here">Hierhin entpacken</string>
+    <string name="s_button_unzip_here">Hier entpacken</string>
     <string name="s_button_unzip_else">In einen anderen Ordner entpacken...</string>
     <string name="s_msg_none">Datei(en) konnte(n) nicht</string>
     <string name="s_msg_some">Einige Datei(en) konnte(n) nicht</string>
@@ -98,32 +98,32 @@
     <string name="s_msg_deleted" auto="1">gelöscht</string>
     <string name="s_msg_moved" auto="1">verschoben</string>
     <string name="s_msg_copied" auto="1">kopiert</string>
-    <string name="s_remove" auto="1">Entfernen</string>
+    <string name="s_remove">Löschen</string>
     <string name="s_eject" auto="1">Auswerfen</string>
     <string name="s_update">Aktualisieren</string>
     <string name="s_alert_bookmark_rename">Titel des Lesezeichens ändern</string>
     <string name="s_title_bookmark_prefix">Lesezeichen verwalten:</string>
-    <string name="s_alert_remove_safe">Sie können das Laufwerk nun sicher entfernen.</string>
+    <string name="s_alert_remove_safe">Sie können den Datenträger nun sicher entfernen.</string>
     <string name="s_alert_remove_error">Auswerfen nicht möglich.</string>
-    <string name="s_menu_about" auto="1">Über</string>
+    <string name="s_menu_about">Über</string>
     <string name="s_about_version" auto="1">Version</string>
-    <string name="s_about_author" auto="1">Autor</string>
-    <string name="s_about_site" auto="1">Webseite</string>
-    <string name="s_about_email" auto="1">E-Mail</string>
-    <string name="s_about_recent">Neue Aktualisierung en</string>
+    <string name="s_about_author">Autor</string>
+    <string name="s_about_site">Website</string>
+    <string name="s_about_email">Email</string>
+    <string name="s_about_recent">Letze Aktualisierungen</string>
     <string name="s_chooser_email">Feedback senden...</string>
-    <string name="s_status_loading">Laden...</string>
+    <string name="s_status_loading">Lade...</string>
     <string name="s_menu_open">Öffnen mit...</string>
     <string name="s_menu_edit">Bearbeiten mit...</string>
     <string name="s_pref_stats_title">Helfen Sie, OpenExplorer zu verbessern</string>
-    <string name="s_pref_stats_summary">Senden Sie anonyme Nutzungsstatistiken. Diese beinhalten keine Informationen, die zur Identifizierung des Nutzers genutzt werden könnten.</string>
+    <string name="s_pref_stats_summary">Anonyme Nutzungsstatistiken senden. Diese beinhalten keine Informationen, die zur Identifizierung des Nutzers verwendet werden könnten.</string>
     <string name="s_error_no_intents">Keine der installierten Anwendungen kann diesen Dateityp lesen.</string>
-    <string name="s_menu_root_disabled" auto="1">Root deaktiviert</string>
+    <string name="s_menu_root_disabled">Root (Stammverzeichnis)deaktiviert</string>
     <string name="s_pref_start">Start-Ordner</string>
     <string name="s_pref_start_summary">Gibt an, mit welchem Ordner OpenExplorer gestartet wird</string>
     <string name="s_custom">Eigene...</string>
-    <string name="s_text_intro_top" auto="1">Willkommen bei OpenExplorer!</string>
-    <string name="s_text_intro_body">Das Ziel von OpenExplorer ist es, noch produktiver mit dem Android-Dateisystem und der Cloud zu arbeiten. Egal, ob Sie Videos oder Fotos von mehreren Orten aus verwalten möchten oder Sie einen Remotezugriff über FTP auf Ihren Webserver benötigen, OpenExplorer kann Ihnen dabei helfen.\n\nBitte wählen Sie Ihren Start-Pfad:</string>
+    <string name="s_text_intro_top">Willkommen im OpenExplorer</string>
+    <string name="s_text_intro_body">Das Ziel von Open Explorer ist es, die Produktivität bei Dateioperationen unter Android wie auch in der Cloud zu verbessern. Egal ob Sie Videos oder Fotos von mehreren Orten aus verwalten möchten oder einen Fernzugriff über FTP auf Ihren Webserver benötigen, OpenExplorer kann Ihnen dabei helfen.\n\nBitte wählen Sie den Ausgangspunkt:</string>
     <string name="s_info_num_folders">Anzahl Ordner:</string>
     <string name="s_info_num_files">Anzahl Dateien:</string>
     <string name="s_info_last_modified">Zuletzt geändert:</string>
@@ -132,19 +132,19 @@
     <string name="s_info_permission_write">Schreiben:</string>
     <string name="s_info_permission_execute">Ausführen:</string>
     <string name="s_toggle_keyboard" auto="1">Tastatur</string>
-    <string name="s_show_password">Passwörter anzeigen</string>
+    <string name="s_show_password">Passwort anzeigen</string>
     <string name="s_error_ftp">Fehler in der Netzwerkverbindung</string>
     <string name="s_prompt_zip">Geben Sie den Namen der neuen ZIP-Datei ein:</string>
-    <string name="app_edit">mit OpenExplorer bearbeiten</string>
+    <string name="app_edit">Mit OpenExplorer bearbeiten</string>
     <string name="s_menu_more">Weitere Optionen...</string>
-    <string name="s_msg_low_memory">Wenig Speicher</string>
-    <string name="s_clear">leer</string>
+    <string name="s_msg_low_memory">Wenig Speicher!</string>
+    <string name="s_clear">Leer</string>
     <string name="s_menu_delete_all">Alle löschen</string>
-    <string name="s_menu_move_all">Hierhin verschieben</string>
+    <string name="s_menu_move_all">Hierher verschieben</string>
     <string name="s_menu_copy_all">Hierher kopieren</string>
-    <string name="s_confirm_delete">Wollen Sie %s wirklich löschen?</string>
+    <string name="s_confirm_delete" formatted="false">Wollen Sie %s wirklich löschen?</string>
     <string name="s_error_same_destination">Das Zielverzeichnis ist gleich dem Quellverzeichnis.</string>
-    <string name="s_sample_notification">Kopieren -> SD-Karte:  \\n3 Dateien</string>
+    <string name="s_sample_notification">Kopiere -&gt; SD-Karte:  \\n3 Dateien</string>
     <string name="s_pref_fullscreen">Vollbild</string>
     <string name="s_pref_fullscreen_summary_on">Benachrichtigungsleiste ausblenden</string>
     <string name="s_pref_fullscreen_summary_off">Benachrichtigungsleiste anzeigen</string>
@@ -152,96 +152,96 @@
     <string name="s_pref_pagers_summary_on">Horizontales Wischen = Verzeichnis-Navigation</string>
     <string name="s_pref_pagers_summary_off">Horizontales Wischen ausgeschaltet</string>
     <string name="s_alert_new_media">Neues Medium eingelegt!</string>
-    <string name="s_warn_pager_title">Neues Feature: Pager anzeigen</string>
-    <string name="s_warn_pager">Wischen Sie von Links nach Rechts, um ein Verzeichnis hoch zu gehen und von Rechts nach Links, um zurückzugehen. Dies sollte die Navigation vereinfachen. Probieren Sie es aus (auf externen Medien)!</string>
+    <string name="s_warn_pager_title">Neue Funktion: Pager anzeigen</string>
+    <string name="s_warn_pager">Wischen Sie von Links nach Rechts, um ein Verzeichnis hoch zu gehen und von Rechts nach Links, um zurückzugehen. Dies soll die Navigation vereinfachen. Probieren Sie es aus (auf externen Medien)!</string>
     <string name="s_warn_confirm">Verstehen Sie?</string>
     <string name="s_warn_disable" auto="1">Deaktivieren</string>
-    <string name="s_pref_intent_internal">interne Gründe</string>
+    <string name="s_pref_intent_internal">Interne Zwecke</string>
     <string name="s_pref_intent_internal_on">Verwende den OpenExplorer Intent-Manager</string>
-    <string name="s_pref_intent_internal_off">Den System-Intent-Manager verwenden</string>
+    <string name="s_pref_intent_internal_off">Den systemeigenen Intent-Manager verwenden</string>
     <string name="s_pref_text_internal">Den internen Texteditor verwenden</string>
     <string name="s_text_editor_title">Textbearbeitungsprogramm </string>
     <string name="s_pref_show_root">Zeige Rootverzeichnis (/)</string>
     <string name="s_pref_show_internal" auto="1">Interne Medien anzeigen</string>
     <string name="s_pref_show_external">Externe Medien anzeigen</string>
     <string name="s_error_no_media">Es scheint, als sei kein Medium eingelegt. Bitte deaktivieren Sie die USB-Freigabe oder legen Sie das Medium wieder ein.</string>
-    <string name="s_prompt_password">Passwort eingeben</string>
+    <string name="s_prompt_password">Passwort eingebe</string>
     <string name="s_add">Hinzufügen</string>
-    <string name="s_server_ftp" auto="1">FTP</string>
+    <string name="s_server_ftp">FTP</string>
     <string name="s_server_sftp" auto="1">SFTP</string>
     <string name="s_pref_server_port" auto="1">Port</string>
     <string name="s_about_buildtime" auto="1">Erstellungsdatum</string>
     <string name="s_default">Standard</string>
-    <string name="s_pref_timeout">Zeitueberschreitung </string>
+    <string name="s_pref_timeout">Zeitüberschreitung </string>
     <string name="s_pref_timeout_summary">Zeitüberschreitung in Sekunden</string>
-    <string name="s_menu_up">nach oben</string>
+    <string name="s_menu_up">Nach oben</string>
     <string name="s_prompt_unzip">Den Pfad eingeben, in den entpackt werden soll:</string>
     <string name="s_pref_hardware_accel" auto="1">Hardwarebeschleunigung aktivieren</string>
     <string name="s_pref_honeyplus">Android 3.0+ Einstellungen</string>
-    <string name="s_pref_actionmode">Aktionsmodus</string>
-    <string name="s_pref_actionmode_enabled">Action Modus verwenden</string>
+    <string name="s_pref_actionmode">Action-Modus</string>
+    <string name="s_pref_actionmode_enabled">Action-Modus verwenden</string>
     <string name="s_pref_actionmode_disabled">Standard-Kontextmenüs verwenden</string>
     <string name="s_server_smb">SMB/Windows</string>
     <string name="s_bookmark_drives">Laufwerke</string>
     <string name="s_bookmark_smart">Smart Folders</string>
-    <string name="s_bookmark_favorites" auto="1">Favoriten</string>
+    <string name="s_bookmark_favorites">Lesezeichen</string>
     <string name="s_bookmark_servers" auto="1">Server</string>
     <string name="s_bookmark_cache">Zwischenspeicher</string>
     <string name="s_info_totalspace">Gesamter Speicherplatz:</string>
     <string name="s_info_freespace">Freier Speicherplatz:</string>
     <string name="s_status_rate">Bewertung:</string>
     <string name="s_about_hardware" auto="1">Hardware</string>
-    <string name="s_menu_refresh" auto="1">Ordner aktualisieren</string>
+    <string name="s_menu_refresh">Verzeichnis aktualisieren</string>
     <string name="s_pref_reset">Ansichten zurücksetzen</string>
     <string name="s_toast_complete">Vorgang abgeschlossen!</string>
-    <string name="s_pref_reset_summary">Klicken Sie hier, um alle Einstellungen dieses Ordners zu entfernen und auf Standard-Einstellungen zurückzusetzen.</string>
+    <string name="s_pref_reset_summary">Klicken Sie hier, um alle Einstellungen dieses Ordners zu entfernen und auf die Standard-Einstellungen zurückzusetzen.</string>
     <string name="s_prompt_path">Pfad eingeben:</string>
     <string name="s_prompt_search">Suchen nach:</string>
     <string name="s_prompt_search_within">Suche innerhalb von:</string>
     <string name="s_pref_view_category">Anzeige-Einstellungen speichern</string>
-    <string name="s_pref_show_videos" auto="1">Videos anzeigen</string>
+    <string name="s_pref_show_videos">Videos anzeigen</string>
     <string name="s_pref_show_photos">Fotos anzeigen</string>
     <string name="s_pref_show_music">Musik anzeigen</string>
     <string name="s_pref_show_downloads" auto="1">Downloads anzeigen</string>
-    <string name="s_hide" auto="1">Verbergen</string>
+    <string name="s_hide">Verstecken</string>
     <string name="s_show">Anzeigen</string>
     <string name="s_msg_event_cancelled">Vorgang abgebrochen.</string>
     <string name="s_alert_newfolder_folder">Erstelle neuen Ordner in:</string>
     <string name="s_pref_fancy_category">Schicke Anzeige-Einstellungen</string>
-    <string name="s_pref_fancy_menus">Hübsche Menüs</string>
+    <string name="s_pref_fancy_menus">Menüdarstellung</string>
     <string name="s_pref_fancy_context">Schicke Kontext-Menüs</string>
     <string name="s_search_files">Suche im Dateisystem</string>
-    <string name="search_summary" formatted="false">Suche nach \" %s  \" in \" %s \" (%d)...</string>
-    <string name="search_results" formatted="false">Es wurden %d Ergebnisse für \" %s \" in \" %s \" gefunden</string>
+    <string name="search_summary" formatted="false">Suche nach \&quot; %s  \&quot; in \&quot; %s \&quot; (%d)...</string>
+    <string name="search_results" formatted="false">Es wurden %d Ergebnisse für \&quot; %s \&quot; in \&quot; %s \&quot; gefunden</string>
     <string name="s_menu_exit">Beenden</string>
     <string name="s_warn_wtf_message">Hoppla! Es ist ein unerwarteter Fehler aufgetreten! Bei OpenExplorer handelt es sich um eine Software im Beta-Stadium. Das Auftreten solcher Fehler ist hier noch üblich. Der Fehler kann behoben werden, wenn Sie einen Bericht darüber an den Entwickler von OpenExplorer senden. Stimmen Sie zu, einen solchen Bericht (welcher ausschließlich anonyme Daten enthält) an den Entwickler von OpenExplorer zu senden?</string>
-    <string name="s_warn_wtf_ps">*** Bitte beachten Sie, dass sich diese Anwendung im Beta-Stadium befindet. Bitte geben Sie dieser App keine schlechte Bewertung, nur weil Sie gelegentlich abstürzt. Sollte es Sie wirklich stören, deinstallieren Sie die Anwendung einfach. Vielen Dank!</string>
+    <string name="s_warn_wtf_ps">*** Bitte beachten Sie, dass sich diese Anwendung im Beta-Stadium befindet. Bitte geben Sie dieser App keine schlechte Bewertung, nur weil sie gelegentlich abstürzt. Sollte es Sie wirklich stören, deinstallieren Sie die Anwendung einfach. Vielen Dank!</string>
     <string name="s_yes" auto="1">Ja</string>
     <string name="s_no">Nein</string>
     <string name="s_wtf_preview">Vorschau des Berichts</string>
-    <string name="s_wtf_remember">Nicht erneut fragen</string>
+    <string name="s_wtf_remember">Nicht wieder fragen</string>
     <string name="s_pref_basebar">Geteilte Aktionsleiste</string>
     <string name="s_pref_basebar_on">Schaltflächen im Portrait-Modus am unteren Bildschirmrand</string>
-    <string name="s_pref_basebar_off">Schaltflächen am oberen Bildschirmrand (falls verfügbar)</string>
-    <string name="s_pref_autowtf">Absturzreports automatisch senden</string>
-    <string name="s_pref_autowtf_summary">Wenn eine unerwartete Ausnahme auftritt, automatisch Bericht senden.</string>
+    <string name="s_pref_basebar_off">Schaltflächen am oberen Bildschirmrand (wenn verfügbar)</string>
+    <string name="s_pref_autowtf">Absturzberichte automatisch senden</string>
+    <string name="s_pref_autowtf_summary">Wenn ein unerwarteter Fehler auftritt, automatisch einen Bericht senden.</string>
     <string name="s_split_auto" auto="1">Automatisch</string>
     <string name="s_split_top">Schaltflächen immer oben anzeigen</string>
     <string name="s_split_top_single">Einzelne Schaltfläche immer oben anzeigen</string>
     <string name="s_split_bottom">Schaltflächen immer unten anzeigen</string>
     <string name="s_split_none">Alle Schaltflächen ins System-Menü platzieren</string>
-    <string name="s_about_screensize">Bildschirmgrösse</string>
-    <string name="s_about_density">Intensität</string>
-    <string name="s_menu_location_int">Interner Speicherpfad</string>
-    <string name="s_menu_location_ext">externer Speicherpfad</string>
+    <string name="s_about_screensize">Bildschirmgröße</string>
+    <string name="s_about_density">Pixeldichte</string>
+    <string name="s_menu_location_int">Pfad zum internen Speicher</string>
+    <string name="s_menu_location_ext">Pfad zum externen Speicher</string>
     <string name="s_wtf_context">Bitte beschreiben Sie, wie der Fehler auftrat:</string>
     <string name="thanks" auto="1">Vielen Dank!</string>
-    <string name="menu_view_font_small">Kleine Schriftgrösse</string>
-    <string name="menu_view_font_medium">Mittelgroße Schrift</string>
+    <string name="menu_view_font_small">Kleine Schrift</string>
+    <string name="menu_view_font_medium">Mittlere Schrift</string>
     <string name="menu_view_font_large">Große Schrift</string>
-    <string name="app_description">Open Explorer - Open-Source-Dateimanager für alle Geräte! (Tablets, Smartphones, Google TVs, Sandwiches!) \n- Vollständige Dateisystem-Verwaltung\n- USB, SD und weitere externe Medien\n- Verbindung mit Netzwerk möglich (FTP, SFTP, SMB/Samba/Windows/LAN/WiFi)\n- Text-Editor\n- Smart-Verzeichnisse, die nach verschiedenen Medien durchsuchen (Videos, Fotos, Musik, Downloads)\n- View Pager-Verzeichnis-Navigation (Swipe rechts hinauf ein Verzeichnis)\n- Möglichkeit als Root/Superuser Systemverzeichnise anzuzeigen (noch nicht beschreibbar)\n \nKommende Funktionen:\n- Tabs im Text-Editor\n- Mehr Netzwerkfähigkeit (Dropbox, Box.net, SkyDrive)\n- Cache für Verzeichnisstruktur, merkt sich Dateien in Verzeichnissen, ohne eine Verbindung aufbauen zu müssen\n- Speicherplatz-Heat-Map, zeigt Verzeichnisse mit den Größten Dateien dar\n \n* HINWEIS: Diese App ist im Beta-Stadium. Es gibt noch VIELE Bugs. Wenn Sie nicht möchten, dass diese Fehler auftreten, laden Sie diese App bitte nicht herunter. Falls Sie mir helfen möchten, diese Bugs aufzuspüren, schicken Sie mir eine E-Mail oder setzen Sie sich mit mir via GitHub in Verbindung (https://github.com/BrandoCommando/OpenExplorer/). Und bitte daran denken: Schlechte Bewertungen helfen niemandem!</string>
-    <string name="alert_translate_google" formatted="false">Hallo, diese Übersetzung wird durch Google Translate zur Verfügung gestellt. Wenn Sie Englisch genau so gut sprechen wie %s und Sie an einer besseren Übersetzung beteiligt sein möchten, tippen Sie bitte auf folgende Schaltfläche:</string>
-    <string name="alert_translate_none" formatted="false">Hallo, es scheint, dass Sie eine nicht unterstützte Sprache nutzen. Sprechen Sie Englisch und %s? Wenn Sie helfen möchten, eine korrekte Übersetzung zur Verfügung zu stellen, tippen Sie bitte hier:</string>
+    <string name="app_description">Open Explorer - Open-Source-Dateimanager für alle Geräte! (Tablets, Smartphones, Google TVs, Sandwiches!) \n- Vollständige Dateisystem-Verwaltung\n- USB, SD und weitere externe Medien\n- Verbindung mit Netzwerk möglich (FTP, SFTP, SMB/Samba/Windows/LAN/WiFi)\n- Text-Editor\n- \'Schlaue Ordner\', die nach bestimmten Inhalten durchsucht werden (Videos, Fotos, Musik, Downloads)\n- View Pager-Verzeichnis-Navigation (Swipe rechts hinauf ein Verzeichnis)\n- Möglichkeit als Root/Superuser Systemverzeichnise anzuzeigen (noch nicht beschreibbar)\n \nKommende Funktionen:\n- Tabs im Text-Editor\n- Mehr Netzwerkfähigkeit (Dropbox, Box.net, SkyDrive)\n- Cache für Verzeichnisstruktur, merkt sich Dateien in Verzeichnissen, ohne eine Verbindung aufbauen zu müssen\n- Speicherfresser-Übersicht - zeigt, wo die größten Dateien liegen\n \n* HINWEIS: Diese App ist im Beta-Stadium. Es gibt noch VIELE Bugs. Wenn Sie nicht möchten, dass diese Fehler auftreten, laden Sie diese App bitte nicht herunter. Falls Sie mir helfen möchten, diese Bugs aufzuspüren, schicken Sie mir eine E-Mail oder setzen Sie sich mit mir via GitHub in Verbindung (https://github.com/BrandoCommando/OpenExplorer/). Und bitte daran denken: Schlechte Bewertungen helfen niemandem!</string>
+    <string name="alert_translate_google" formatted="false">Hallo, diese Übersetzung wird durch Google Translate zur Verfügung gestellt. Wenn Sie Englisch genau so gut sprechen wie %s und Sie an einer besseren Übersetzung beteiligt sein möchten, klicken Sie bitte hier:</string>
+    <string name="alert_translate_none" formatted="false">Hallo, es scheint, daß Sie eine nicht unterstützte Sprache nutzen. Sprechen Sie Englisch und %s? Wenn Sie helfen möchten, eine korrekte Übersetzung zur Verfügung zu stellen, kklicken\n\n\n\n\n\n\n   \n Sie bitte hier:</string>
     <string name="button_translate">Übersetzen</string>
     <string name="httpError">Es ist ein Netzwerkfehler aufgetreten.</string>
     <string name="httpErrorAuth">Authentifizierung ist fehlgeschlagen.</string>
@@ -253,14 +253,14 @@
     <string name="httpErrorFileNotFound">Die angeforderte Datei wurde nicht gefunden.</string>
     <string name="contentServiceSync">Synchronisierung</string>
     <string name="keyguard_password_enter_pin_code">PIN-Code eingeben</string>
-    <string name="keyguard_password_enter_password_code">Passwort zum Entsperren eingeben</string>
+    <string name="keyguard_password_enter_password_code">Passwort zum Entsperren eingebenwegely1</string>
     <string name="keyguard_password_enter_pin_password_code">PIN zum Entsperren eingeben</string>
     <string name="lockscreen_password_wrong">Bitte versuchen Sie es erneut.</string>
-    <string name="whichApplication">Aktion durchführen mit</string>
+    <string name="whichApplication">Aktion fertigstellen mit</string>
     <string name="noApplications">Diese Aktion kann von keiner Anwendung ausgeführt werden.</string>
     <string name="report">Bericht</string>
     <string name="sim_restart_button">Neu starten</string>
-    <string name="extmedia_format_button_format">Format</string>
+    <string name="extmedia_format_button_format">Formatieren</string>
     <string name="ext_media_nofs_notification_message">USB-Speicher ist leer oder sein Dateisystem nicht unterstützt.</string>
     <string name="activity_list_empty">Keine passenden Aktivitäten gefunden</string>
     <string name="ime_action_go">Los</string>
@@ -272,7 +272,7 @@
     <string name="reset">Zurücksetzen</string>
     <string name="back_button_label">Zurück</string>
     <string name="next_button_label">Weiter</string>
-    <string name="no_matches">Keine Ergebnisse</string>
+    <string name="no_matches">Keine Übereinstimmung</string>
     <string name="find_on_page">Suche auf Seite</string>
     <string name="find">Suchen</string>
     <string name="activitychooserview_choose_application">App wählen</string>
@@ -282,91 +282,89 @@
     <string name="storage_usb">USB-Speicher</string>
     <string name="extract_edit_menu_button">Bearbeiten...</string>
     <string name="activity_chooser_view_see_all">Alles anzeigen... </string>
-    <string name="s_title_picker">Bitte Verzeichnis auswählen</string>
-    <string name="selected_path">Ausgewählter Pfad:</string>
+    <string name="s_title_picker">Bitte Ordner wählen</string>
+    <string name="selected_path">Gewählter Ordner:</string>
     <string name="filename" auto="1">Dateiname</string>
-    <string name="s_msg_saved" auto="1">gespeichert</string>
-    <string name="s_menu_view_line_numbers" auto="1">Zeilennummern</string>
-    <string name="warn_text_editor">Willkommen im Text-Editor. Bitte klicken sie auf den Text und halten diesen gedrückt um in den Bearbeitungsmodus zu wechseln.</string>
-    <string name="warn_networking">Willkommen bei der Netzwerkübersicht . Bitte beachten Sie, dass dieses Feature noch in der Entwicklung ist und Fehler enthalten kann. Bitte geben Sie keine schlechte Bewertung ab, wenn dieses Feature noch nicht ordnungsgemäß funktioniert</string>
-    <string name="s_menu_new_file" auto="1">Neue Textdatei</string>
+    <string name="s_msg_saved">gespeichert</string>
+    <string name="s_menu_view_line_numbers">Zeilennummern</string>
+    <string name="warn_text_editor">Willkommen im Text-Editor. Tippen Sie bitte lange auf den Text, um in den Bearbeitungsmodus zu gelangen. \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n</string>
+    <string name="warn_networking">Willkommen in der Netzwerkübersicht. Bitte beachten Sie, dass sich dieses Feature noch in der Entwicklung befindet und Fehler enthalten kann. Bitte geben Sie keine schlechte Bewertung ab, wenn etwas hier noch nicht ordnungsgemäß funktioniert.</string>
+    <string name="s_menu_new_file">Neue Text-Datei</string>
     <string name="s_msg_created" auto="1">erstellt</string>
-    <string name="s_title_newfile" auto="1">Neue Datei</string>
-    <string name="s_alert_newfile_folder" auto="1">Neue Datei anlegen in:</string>
+    <string name="s_title_newfile">Neue Datei</string>
+    <string name="s_alert_newfile_folder">Erstelle neue Datei in:</string>
     <string name="s_alert_newfile">Namen der neuen Datei eingeben:</string>
     <string name="s_alert_exit">Sind Sie sicher, dass Sie beenden möchten? </string>
     <string name="s_alert_clipboard">In die Zwischenablage kopiert</string>
     <string name="s_alert_restart">Starte neu. Bitte warten.</string>
-    <string name="language" auto="1">Sprache</string>
+    <string name="language">Sprache</string>
     <string name="s_menu_download">Herunterladen</string>
     <string name="scan">Durchsuchen</string>
-    <string name="test">Prüfen</string>
+    <string name="test">Prüfung</string>
     <string name="test_success">Verbindung erfolgreich hergestellt!</string>
     <string name="no_items">Keine Einträge.</string>
-    <string name="clipboard">Zwischenspeicher</string>
-    <string name="theme">Thema</string>
-    <string name="theme_dark">Dunkler Bildschirm</string>
-    <string name="theme_light">Heller Bildschirm</string>
-    <string name="chooser_remember">Einstellungen speichern</string>
-    <string name="use_system">Nutze System >></string>
+    <string name="clipboard">Zwischenablage</string>
+    <string name="theme">Design</string>
+    <string name="theme_dark">Dunkel</string>
+    <string name="theme_light">Hell</string>
+    <string name="chooser_remember">Auswahl merken</string>
+    <string name="use_system">Nutze System &gt;&gt;</string>
     <string name="activity_resolver_use_always">Immer</string>
-    <string name="activity_resolver_use_once">Einmal</string>
-    <string name="s_pref_bookmarks_summary">Lesezeichen zeigen</string>
-    <string name="s_menu_heatmap">Wärmebild</string>
+    <string name="activity_resolver_use_once">Nur einmal</string>
+    <string name="s_pref_bookmarks_summary">Lesezeichen anzeigen</string>
+    <string name="s_menu_heatmap">Speicherbelegung</string>
     <string name="apply_to_all">Auf alle Ordner anwenden?</string>
-    <string name="s_pref_view_folders">Verzeichnis Voreinstellungen</string>
-    <string name="s_pref_view_general">Allgemeine Voreinstellungen</string>
-    <string name="s_pref_text_wrap">Textumbruch</string>
-    <string name="s_pref_thumbs_crop">Beschneiden/zentrieren Miniaturbilder</string>
-    <string name="s_pref_thumbs_cache_clear">Miniaturbilder Zwischenverzeichnis löschen</string>
+    <string name="s_pref_view_folders">Ordnereinstellungen</string>
+    <string name="s_pref_view_general">Allgemeine Einstellungen</string>
+    <string name="s_pref_text_wrap">Zeilenumbruch</string>
+    <string name="s_pref_thumbs_crop">Miniaturbilder zurechtschneiden</string>
+    <string name="s_pref_thumbs_cache_clear">Miniaturbilder-Cache leeren</string>
     <string name="s_msg_folder_none">Verzeichnis kann nicht erstellt werden</string>
-    <string name="msg_nook_donate2" auto="1">Hola usuario Nook! Espero que disfruten Abra el Explorador de Nook. He intentado con todas mis fuerzas para asegurar una alta compatibilidad con los dispositivos Nook. Gracias a las donaciones recientes, tuve la oportunidad de comprar un Nook Color! ¡Gracias a todos los que han donado! \n \n A continuación, me gustaría ser capaz de comprar una nueva generación Nook dispositivo de alta definición. \n \n Si usted encuentra esta aplicación útil, por favor considere hacer una donación, ya sea seleccionando la botón de abajo, o mediante la activación de la "donación" del menú. Gracias, y explorar feliz!</string>
-    <string name="msg_bb_donate" auto="1">Hola usuario de BlackBerry! Espero que disfruten Abra el Explorador. He intentado con todas mis fuerzas para asegurar una alta compatibilidad con los dispositivos BlackBerry. Sin embargo, parece que hay algunas diferencias que son difíciles de manejar sin un dispositivo BlackBerry real. Por esta razón, estoy tratando de reunir suficientes donaciones para comprar un BlackBerry dispositivo 10 con el fin de mejorar la compatibilidad. Si usted encuentra esta aplicación útil, por favor considere hacer una donación, ya sea seleccionando el botón de abajo, o mediante la activación de la "donación" del menú. Gracias, y explorar feliz!</string>
-    <string name="msg_donate" auto="1">Hola usuario de Android! Esperamos que disfrute Abra el Explorador. Hemos tratado de hacer lo mejor para asegurar una alta compatibilidad con todos los dispositivos Android. Sin embargo, dados los informes de fallos recibidos, sólo podemos suponer que existen diferencias entre los distintos tipos que causan problemas específicos. Por esta razón, estamos tratando de reunir suficientes donaciones para la compra de algunos dispositivos Nexus con el fin de mejorar la compatibilidad. Si usted encuentra esta aplicación útil, por favor considere hacer una donación, ya sea seleccionando el botón de abajo, o mediante la activación de la "donación" del menú. Gracias, y explorar feliz!</string>
-    <string name="s_privacy" auto="1">Política de privacidad</string>
-    <string name="s_menu_system_mount" auto="1">Marca / sistema Writable - Peligroso</string>
-    <string name="s_menu_system_mount_on">System ist VERÄNDERBAR</string>
-    <string name="s_menu_system_mount_off">System kann nur lesen</string>
-    <string name="s_pref_servers_private" auto="1">Sigue Private Servers</string>
-    <string name="s_pref_servers_private_summary" auto="1">Guarde la configuración del servidor en el área de almacenamiento privado. Esto hará que la configuración del servidor que desea eliminar si se desinstala la aplicación. Si vuelve a instalar en el futuro, dejando esto no se tienen que evitar.</string>
-    <string name="s_theme_lightdark">Licht und Dunkelheit</string>
-    <string name="s_theme_custom" auto="1">Nadelstreifen</string>
-    
-    <string name="s_menu_rate">Rate</string>
-	<string name="s_alert_destination_exists">Destination existiert bereits. Was möchten Sie tun?</string>
-	<string name="s_overwrite">überschreiben</string>
-	<string name="s_skip">überspringen</string>
-	<string name="s_msg_file_exists">Einige Zieldateien bereits vorhanden sein kann. Ok zu überschreiben?</string>
-	<string name="s_title_file_exists">Datei existiert bereits.</string>
-	<string name="s_msg_pref_archives">Möchten Sie durchsuchen oder das Archiv entpacken?</string>
-	<string name="s_browse">blättern</string>
-	<string name="s_extract">extrahieren</string>
-	<string name="s_extracted">extrahiert</string>
-	<string name="s_extracting">Extrahieren</string>
-	<string name="s_extract_with">Auszug mit ...</string>
-	<string name="s_title_archive_handler">Archive Handler</string>
-	<string name="s_ask_again">Fragen Sie jedes Mal</string>
-	<string name="s_archives">Archiv</string>
-	<string name="s_compress">komprimieren</string>
-	<string name="s_compress_type">Compression Type</string>
-	<string name="s_compressed">Druckluft</string>
-	<string name="s_delete_after">Löschen Quelle nach Abschluss</string>
-	<string name="s_master_pass">Master-Passwort</string>
-	<string name="s_master_pass_warning">Sie können einen Master-Passwort als Schlüssel für alle gespeicherten Passwörter verwendet. Wenn Sie dieses Feld leer lassen, wird Kennwörter weiterhin verschlüsselt werden, und die Standard-Master-Passwort verwendet werden. Bitte beachten Sie, dass, wenn Sie Ihr Passwort zu aktualisieren mit gespeicherten Netzwerk-Passwörter, werden Sie wahrscheinlich benötigen, um Passwörter zurückzusetzen und authentifizieren Cloud-Server nach dem Zurücksetzen dieses Passwort.</string>
-	<string name="s_pass_old">Altes Passwort eingeben:</string>
-	<string name="s_pass_new">Neues Passwort eingeben:</string>
-	<string name="s_logout">ausloggen</string>
-	<string name="s_authenticate">authentifizieren</string>
-	<string name="s_authenticating">Authentifizierung</string>
-	<string name="s_bookmark_history">Geschichte</string>
-	<string name="s_server_account_title">Konto:</string>
-	<string name="s_authenticate_success">Authentifizierung erfolgreich</string>
-	<string name="s_authenticate_refresh">Aktualisieren Authentication</string>
-	<string name="s_pref_thumbs_cache">Pre-Cache Thumbnails</string>
-	<string name="s_pref_thumbs_cache_summary">Dies wird zu einer Beschleunigung der Be-Ordner mit Fotos und Videos.</string>
-	<string name="s_folders">Ordner</string>
-	<string name="s_hidden">versteckt</string>
-	<string name="s_total">gesamt</string>
-	<string name="s_custom_account">benutzerdefinierten Kontos</string>
-	    
+    <string name="msg_nook_donate2">Hallo, Nook-Benutzer! Ich hoffe, Ihnen gefällt Open Explorer für Nook. Ich habe mein Bestes gegeben, hohe Kompatibilität mit Nook-Geräten zu gewährleisten. Dank kürzlicher Spenden konnte ich ein Nook Color erstehen! Vielen Dank an alle, die gespendet haben!\n\nAls nächsten Schritt hätte ich gerne die Möglichkeit, ein Nook HD Gerät zu erstehen.\n\nWenn Sie diese App nützlich finden, erwägen Sie bitte eine Spende, indem Sie entweder die Schaltfläche unten oder die &quot;Spenden&quot;-Menüoption benutzen. Danke und viel Spaß beim \'Exploren\'!</string>
+    <string name="msg_bb_donate">Hallo, Blackberry-Benutzer! Ich hoffe, Ihnen gefällt Open Explorer. Ich habe mein Bestes gegeben, hohe Kompatibilität mit BlackBerry-Geräten zu gewährleisten. Jedoch scheint es einige Unterschiede zu geben, die ohne ein richtiges BlackBerry-Gerät schwer nachzuvollziehen sind. Daher versuche ich, genügend Spendengelder für den Kauf eines BlackBerry-10-Gerätes zu sammeln, um die Kompatibilität zu verbessern. Wenn Sie diese App nützlich finden, erwägen Sie bitte eine Spende, indem Sie entweder die Schaltfläche unten oder die &quot;Spenden&quot;-Menüoption benutzen. Danke und viel Spaß beim \'Exploren\'!</string>
+    <string name="msg_donate">Hallo Android-Benutzer! Wir hoffen, Ihnen gefällt Open Explorer. Wir haben unser Bestes gegeben, hohe Kompatibilität mit allen Android-Geräten zu gewährleisten. Anhand eingesandter Bug-Reports gehen wir allerdings davon aus, daß Unterschiede zwischen einzelnen Modellen bestimmte Probleme verursachen. Daher versuchen wir, genügend Spenden zum Kauf von Nexus-Geräten zu sammeln, um die Kompatibilität zu verbessern. Wenn Sie diese App nützlich finden, erwägen Sie bitte eine Spende, indem Sie entweder die Schaltfläche unten oder die &quot;Spenden&quot;-Menüoption benutzen. Danke und viel Spaß beim Erkunden!</string>
+    <string name="s_privacy">Datenschutzerklärung</string>
+    <string name="s_menu_system_mount">Erlaube Schreibzugriff auf /system (Vorsicht!)</string>
+    <string name="s_menu_system_mount_on">System BESCHREIBBAR</string>
+    <string name="s_menu_system_mount_off">System nur lesbar</string>
+    <string name="s_pref_servers_private">Server privat belassen</string>
+    <string name="s_pref_servers_private_summary">Server-Einstellungen im privaten Speicherbereich ablegen. Diese werden entfernt, falls die App deinstalliert wird. Setzen Sie keinen Haken, wenn die Einstellungen bei einer Neuinstallation erhalten bleiben sollen.</string>
+    <string name="s_theme_lightdark">Hell und dunkel</string>
+    <string name="s_theme_custom">Nadelstreifen</string>
+    <string name="s_menu_rate">Bewerten</string>
+    <string name="s_alert_destination_exists"> Ziel bereits vorhanden. Was wollen Sie tun?\n</string>
+    <string name="s_overwrite">Überschreiben</string>
+    <string name="s_skip">Überspringen</string>
+    <string name="s_msg_file_exists">Zieldateien existieren möglicherweise bereits. Wählen Sie OK zum Überschreiben.</string>
+    <string name="s_title_file_exists" auto="1">Datei existiert bereits.</string>
+    <string name="s_msg_pref_archives">Möchten Sie das Archiv durchsuchen oder entpacken?</string>
+    <string name="s_browse">Durchsuchen</string>
+    <string name="s_extract">Entpacken</string>
+    <string name="s_extracted">entpackt</string>
+    <string name="s_extracting">Entpacke</string>
+    <string name="s_extract_with">Entpacke mit...</string>
+    <string name="s_title_archive_handler">Archiv Verwalter</string>
+    <string name="s_ask_again">Jedes Mal fragen</string>
+    <string name="s_archives">Archive</string>
+    <string name="s_compress">Komprimieren</string>
+    <string name="s_compress_type">Komprimierungs-Art</string>
+    <string name="s_compressed">komprimiert</string>
+    <string name="s_delete_after">Quelle nach Abschluss löschen </string>
+    <string name="s_master_pass" auto="1">Master-Passwort</string>
+    <string name="s_master_pass_warning">Sie können ein Master Passwort zum verschlüsseln von gespeicherten Passwörtern verwenden.\nWenn Sie dies leer lassen wird dazu das Standardpasswort verwendet. Beim ändern des Passwortes, müssen Sie sich unter Umständen bei Clouddiensten neu anmelden.</string>
+    <string name="s_pass_old">Altes Passwort eingeben:</string>
+    <string name="s_pass_new">Neues Passwort eingeben:</string>
+    <string name="s_logout">Abmelden</string>
+    <string name="s_authenticate" auto="1">authentifizieren</string>
+    <string name="s_authenticating" auto="1">Authentifizierung</string>
+    <string name="s_bookmark_history">Verlauf</string>
+    <string name="s_server_account_title" auto="1">Konto:</string>
+    <string name="s_authenticate_success" auto="1">Authentifizierung erfolgreich</string>
+    <string name="s_authenticate_refresh">Authentifizierung wiederholen</string>
+    <string name="s_pref_thumbs_cache">Pre-Cache Vorschau</string>
+    <string name="s_pref_thumbs_cache_summary">Dies wird das Laden von Bild- und Videoordnern beschleunigen.</string>
+    <string name="s_folders" auto="1">Ordner</string>
+    <string name="s_hidden">Versteckte</string>
+    <string name="s_total">Gesamt</string>
+    <string name="s_custom_account">Benutzerdefiniertes Konto</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
old mode 100644
new mode 100755
index e53d2c7d..be568e30
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
     <string name="app_name">Open Explorer</string>
     <string name="s_photos">Φωτογραφίες </string>
     <string name="s_videos">Βίντεο </string>
@@ -74,7 +73,7 @@
     <string name="s_pref_server_type">Τύπος διακομιστή </string>
     <string name="s_files">Αρχεία </string>
     <string name="s_create">Δημιουργία </string>
-    <string name="s_title_holding_x_files">Κράτηση %s αρχείων </string>
+    <string name="s_title_holding_x_files" formatted="false">Κράτηση %s αρχείων </string>
     <string name="s_title_newfolder">Δημιουργία νέου φακέλου </string>
     <string name="s_title_send">Αποστόλη xxx</string>
     <string name="s_title_unzip">Αποσυμπίεση xxx</string>
@@ -87,10 +86,10 @@
     <string name="s_title_zipping">Συμπίεση σε εξελιξης</string>
     <string name="s_title_unzipping">Αποσυμπίεση σε εξέλιξη </string>
     <string name="s_title_wait">Παρακαλώ περιμένετε...</string>
-    <string name="s_alert_confirm_delete">Η διαγραφή %s δεν είναι αναστρέψιμη.Είστε σίγουροι ότι θέλετε να συνεχίσετε;</string>
+    <string name="s_alert_confirm_delete" formatted="false">Η διαγραφή %s δεν είναι αναστρέψιμη.Είστε σίγουροι ότι θέλετε να συνεχίσετε;</string>
     <string name="s_alert_rename">Παρακαλώ πληκτρολογηστε το νέο όνομα για το αρχείο </string>
     <string name="s_alert_newfolder">Πληκτρολογηστε το όνομα του νέου φακέλου που θα δημιουργησετε.</string>
-    <string name="s_alert_unzip">Θέλετε να αποσυμπιεστει το %s εδώ ή σε κάποιον άλλο φάκελο;</string>
+    <string name="s_alert_unzip" formatted="false">Θέλετε να αποσυμπιεστει το %s εδώ ή σε κάποιον άλλο φάκελο;</string>
     <string name="s_button_unzip_here">Αποσυμπιεση εδώ </string>
     <string name="s_button_unzip_else">Επιλογή φακέλου αποσυμπίεσης </string>
     <string name="s_msg_none">Αδύνατη δημιουργία αρχείου(-ων)</string>
@@ -124,7 +123,7 @@
     <string name="s_pref_start_summary">Δηλώνει σε ποιον φάκελο θα εκκινεί ο Open Explorer</string>
     <string name="s_custom">Άλλο...</string>
     <string name="s_text_intro_top">Καλώς ορίσατε στον Open Explorer!</string>
-    <string name="s_text_intro_body">Επιλογή αρχικού καταλόγου:</string>
+    <string name="s_text_intro_body" auto="1">Ο στόχος του είναι να OpenExplorer να σας κάνει πιο παραγωγικοί στο σύστημα αρχείων Android και στο cloud. Είτε θα πρέπει να διαχειρίζονται τα βίντεο ή τις φωτογραφίες από πολλαπλές τοποθεσίες ή να διαχειριστεί ο διακομιστής σας από απόσταση μέσω FTP, OpenExplorer να ταιριάζει στις ανάγκες σας  n  nΕπιλέξτε ξεκινώντας την πορεία σας.:</string>
     <string name="s_info_num_folders">Αριθμός φακέλων:</string>
     <string name="s_info_num_files">Αριθμός αρχείων:</string>
     <string name="s_info_last_modified">Τελευταία τροποποίηση:</string>
@@ -143,14 +142,14 @@
     <string name="s_menu_delete_all">Διαγραφή όλων </string>
     <string name="s_menu_move_all">Μετακίνηση εδώ </string>
     <string name="s_menu_copy_all">Αντιγραφή εδώ </string>
-    <string name="s_confirm_delete">Είστε σίγουροι ότι θέλετε να διαγράψετε %s ;</string>
+    <string name="s_confirm_delete" formatted="false">Είστε σίγουροι ότι θέλετε να διαγράψετε %s ;</string>
     <string name="s_error_same_destination">Ο φάκελος προορισμού είναι ο ίδιος.</string>
     <string name="s_sample_notification">Αντιγραφή -&gt; κάρτα μνήμης: 3 αρχεία </string>
     <string name="s_pref_fullscreen">Πλήρης οθόνη </string>
     <string name="s_pref_fullscreen_summary_on">Απόκρυψη μπάρας πληροφόρησης </string>
     <string name="s_pref_fullscreen_summary_off">Προβολή μπάρας πληροφόρησης </string>
     <string name="s_pref_pagers">Προβολή δεικτών </string>
-    <string name="s_pref_pagers_summary_on">Οριζόντιο </string>
+    <string name="s_pref_pagers_summary_on" auto="1">Οριζόντια περνώντας = Κατάλογος Πλοήγηση</string>
     <string name="s_pref_pagers_summary_off">Το οριζόντιο συρσιμο είναι απενεργοποιημενο</string>
     <string name="s_alert_new_media">Προστέθηκε νέο μέσο! </string>
     <string name="s_warn_pager_title">Νέα λειτουργία: προβολή δεικτών </string>
@@ -212,6 +211,8 @@
     <string name="s_pref_fancy_menus">Εντυπωσιακό μενού </string>
     <string name="s_pref_fancy_context">Εφέ στα μενού πλαισίου </string>
     <string name="s_search_files">Αναζήτηση στο σύστημα αρχείων </string>
+    <string name="search_summary" formatted="false">Αναζήτηση για \&quot; %s \&quot; μέσα σε \&quot; %s \&quot; (%d)...</string>
+    <string name="search_results" formatted="false" auto="1">Βρέθηκαν %d αποτελέσματα για &quot; %s&quot;  n στο &quot; %s&quot;</string>
     <string name="s_menu_exit">Έξοδος </string>
     <string name="s_warn_wtf_message">Ωπ! Εμφανίστηκε ένα απρόσμενο σφάλμα! Αυτό είναι σύνηθες σε πολλές εφαρμογές που βρίσκονται σε στάδιο εξέλιξης, ο μόνος τρόπος απασφαλματωσης είναι η λήψη αναφορών από διαφορετικές συσκευές, όπως και η δική σας, για να μπορέσουμε να διορθώσουμε το πρόβλημα.Θα θέλατε να αποστείλετε μια αναφορά του προβληματος,χωρίς να συμπεριλαμβανονται προσωπικές πληροφορίες,στον προγραμματιστη της εφαρμογής;</string>
     <string name="s_warn_wtf_ps">***Παρακαλώ σημειώστε ότι αυτή η εφαρμογή είναι ακόμη σε στάδιο εξέλιξης.Μην αφήνετε αρνητικές βαθμολογίες λόγω του οτι δεν είναι σταθερή.Αν σας ενοχλεί απλά διαγράψτε τη.</string>
@@ -239,8 +240,8 @@
     <string name="menu_view_font_medium">Μεσαία γραμματοσειρα </string>
     <string name="menu_view_font_large">Μεγάλη γραματοσειρα </string>
     <string name="app_description" auto="1">Άνοιγμα Explorer - Ανοικτή πηγή διαχειριστής αρχείων για όλες τις συσκευές! (Δισκία, τηλέφωνα, τηλεοράσεις Google, σάντουιτς!)  N-Πλήρης φάκελος του συστήματος διαχείρισης  n-USB, SD και άλλα εξωτερικά μέσα  n-Δίκτυο Συνδεόμενο (FTP, SFTP, SMB / Samba / Windows / LAN / WiFi)  n - Επεξεργαστής κειμένου  n-Smart Φάκελοι ότι σάρωση για διαφορετικούς τύπους μέσων (βίντεο, φωτογραφίες, μουσική, downloads)  n-Προβολή Pager κατάλογο πλοήγησης (περάστε το δικαίωμα να ανεβεί ένα κατάλογο)  n-Υπερχρήστη / Root ικανότητα στη λίστα / διαβάσετε φακέλους συστήματος (σύστημα δεν γράφουν ακόμη)  n  nFeatures να έρθει:  n-καρτέλες Επεξεργαστής κειμένου  n-Περισσότερες δυνατότητες δικτύωσης (Dropbox, Box.net, Sky Drive)  n-Χωρίς μνήμη cache δομή του αρχείου, το οποίο θα θυμόμαστε τα αρχείαέχετε σε διαφορετικά μέρη χωρίς να χρειάζεται να συνδεθεί  n-χώρου στο δίσκο χάρτη θερμότητας δείχνει πού είναι μεγαλύτερα αρχεία σας  n  n * ΣΗΜΕΙΩΣΗ: Η εφαρμογή αυτή είναι σε Beta. Υπάρχουν ακόμα πολλά σφάλματα. Εάν δεν θέλετε να αντιμετωπίσετε αυτά τα σφάλματα, παρακαλούμε να μην κατεβάσετε αυτό το app. Αν θέλετε να με βοηθήσει να βρω αυτά τα σφάλματα, παρακαλώ στείλτε μου ή να συνεργαστούν μαζί μου για GitHub (https://github.com/BrandoCommando/OpenExplorer/). Παρακαλώ θυμηθείτε κακή βαθμολογία βοηθούν κανέναν.</string>
-    <string name="alert_translate_google">Γειά σας, αυτή η μετάφραση έγινε από το Google Translate.Αν γνωρίζετε Αγγλικά και %s , και θέλετε να βοηθήσετε στη μετάφραση, παρακαλώ πατήστε εδώ:</string>
-    <string name="alert_translate_none">Γειά σας,φαίνεται πως χρησιμοποιεί μια γλώσσα που δεν υποστηρίζετε.Μιλάτε Αγγλικά και %s; θα θέλατε να βοηθήσετε στο να δώσετε μια σωστή μετάφραση; Αν ναι κανέτε κλικ εδώ:</string>
+    <string name="alert_translate_google" formatted="false">Γειά σας, αυτή η μετάφραση έγινε από το Google Translate.Αν γνωρίζετε Αγγλικά και %s , και θέλετε να βοηθήσετε στη μετάφραση, παρακαλώ πατήστε εδώ:</string>
+    <string name="alert_translate_none" formatted="false">Γειά σας,φαίνεται πως χρησιμοποιεί μια γλώσσα που δεν υποστηρίζετε.Μιλάτε Αγγλικά και %s; θα θέλατε να βοηθήσετε στο να δώσετε μια σωστή μετάφραση; Αν ναι κανέτε κλικ εδώ:</string>
     <string name="button_translate">Μετάφραση </string>
     <string name="httpError">Παρουσιάστηκε σφάλμα δικτύου.</string>
     <string name="httpErrorAuth">Ο έλεγχος ταυτότητας δεν ήταν επιτυχής.</string>
@@ -286,8 +287,8 @@
     <string name="filename" auto="1">Όνομα</string>
     <string name="s_msg_saved" auto="1">αποθηκευτεί</string>
     <string name="s_menu_view_line_numbers" auto="1">Αριθμοί γραμμής</string>
-    <string name="warn_text_editor" auto="1">Καλώς ήρθατε στο Επεξεργαστής κειμένου. Παρακαλώ πολύ πιέστε το κείμενο να τεθεί σε κατάσταση επεξεργασίας.</string>
-    <string name="warn_networking" auto="1">Καλώς ήρθατε στο Δίκτυο. Παρακαλώ σημειώστε ότι το χαρακτηριστικό αυτό είναι ακόμα υπό ανάπτυξη και μπορεί να περιέχει σφάλματα. Παρακαλώ μην δώσει μια κακή αξιολόγηση της αγοράς, αν βρείτε κάποιο από αυτά τα σφάλματα.</string>
+    <string name="warn_text_editor">Καλώς ήρθατε στον Επεξεργαστή κειμένου. Παρακαλώ πολύ πιέστε το κείμενο να τεθεί σε κατάσταση επεξεργασίας.</string>
+    <string name="warn_networking">Καλώς ήρθατε στο Δίκτυο. Παρακαλώ σημειώστε ότι το χαρακτηριστικό αυτό είναι ακόμα υπό ανάπτυξη και μπορεί να περιέχει σφάλματα. Παρακαλώ μην δώσετε μια κακή αξιολόγηση της αγοράς, αν βρείτε κάποιο από αυτά τα σφάλματα.</string>
     <string name="s_menu_new_file" auto="1">Νέο αρχείο κειμένου</string>
     <string name="s_msg_created" auto="1">δημιουργήθηκε</string>
     <string name="s_title_newfile" auto="1">Νέα Αρχείο</string>
@@ -297,5 +298,51 @@
     <string name="s_alert_clipboard" auto="1">Αντιγραφεί στο πρόχειρο</string>
     <string name="s_alert_restart" auto="1">Επανεκκίνηση. Παρακαλώ περιμένετε.</string>
     <string name="language" auto="1">γλώσσα</string>
-
-</resources>
\ No newline at end of file
+    <string name="msg_nook_donate2" auto="1">Nook χρήστη Hello! Ελπίζω να απολαύσετε Open Explorer για Nook. Έχω προσπαθήσει σκληρότερα μου για να διασφαλιστεί η συμβατότητα με συσκευές υψηλής Nook. Χάρη στις πρόσφατες δωρεές, ήμουν σε θέση να αγοράσει ένα Nook Color! Σας ευχαριστώ σε όλους που έχουν δωρίσει! \n \n Στη συνέχεια, θα ήθελα να είναι σε θέση να αγοράσει μια νεότερη γενιά HD Nook συσκευή. \n \n Αν βρείτε χρήσιμο αυτό το app, Παρακαλούμε να εξετάσει κάνοντας μια δωρεά, είτε με την επιλογή του κουμπί κάτω, ή από την ενεργοποίηση της &quot;δωρίσουν&quot; μενού επιλογών. Σας ευχαριστώ, και ευτυχής να εξερευνήσετε!</string>
+    <string name="msg_bb_donate" auto="1">Γεια σας BlackBerry χρήστη! Ελπίζω να απολαύσετε Open Explorer. Έχω προσπαθήσει σκληρότερα μου για να διασφαλιστεί η συμβατότητα με συσκευές υψηλής BlackBerry. Ωστόσο, υπάρχουν κάποιες διαφορές φαίνεται που είναι δύσκολο να χειριστεί χωρίς μια πραγματική συσκευή BlackBerry. Για το λόγο αυτό, είμαι προσπαθεί να συλλέξει αρκετές δωρεές, προκειμένου να αγοράσει ένα BlackBerry συσκευή 10, προκειμένου να βελτιωθεί η συμβατότητα. Αν βρείτε χρήσιμο αυτό το app, Παρακαλούμε να εξετάσει κάνοντας μια δωρεά, είτε με το κουμπί Επιλογή κάτω, ή από την ενεργοποίηση της &quot;δωρίσουν&quot; μενού επιλογών. Σας ευχαριστώ, και ευτυχής να εξερευνήσετε!</string>
+    <string name="msg_donate" auto="1">Γεια σας Android χρήστη! Ελπίζουμε να απολαύσετε Open Explorer. Έχουμε προσπαθήσει σκληρότερα μας για να διασφαλιστεί η συμβατότητα με όλες τις συσκευές υψηλής Android. Ωστόσο, έλαβε υπόψη τις αναφορές σφαλμάτων, μπορούμε μόνο να υποθέσουμε ότι υπάρχουν διαφορετικοί τύποι προκαλούν διαφορές μεταξύ συγκεκριμένων θεμάτων. Για το λόγο αυτό, προσπαθούμε να συλλέξουμε αρκετά δωρεές προκειμένου να αγοράσει κάποιες συσκευές Nexus, προκειμένου να βελτιωθεί η συμβατότητα. Αν βρείτε χρήσιμο αυτό το app, Παρακαλούμε να εξετάσει κάνοντας μια δωρεά, είτε με το κουμπί Επιλογή κάτω, ή από την ενεργοποίηση της &quot;δωρίσουν&quot; μενού επιλογών. Σας ευχαριστώ, και ευτυχής να εξερευνήσετε!</string>
+    <string name="s_privacy" auto="1">Πολιτική Προστασίας Προσωπικών Δεδομένων</string>
+    <string name="s_menu_system_mount" auto="1">Βεβαιωθείτε / σύστημα Εγγράψιμο - Επικίνδυνο</string>
+    <string name="s_menu_system_mount_on" auto="1">Το σύστημα είναι εγγράψιμος!</string>
+    <string name="s_menu_system_mount_off" auto="1">Το σύστημα είναι μόνο για ανάγνωση.</string>
+    <string name="s_pref_servers_private" auto="1">Κρατήστε Private Servers</string>
+    <string name="s_pref_servers_private_summary" auto="1">Αποθηκεύστε τις ρυθμίσεις του διακομιστή στον ιδιωτικό χώρο αποθήκευσης. Αυτό θα προκαλέσει τις ρυθμίσεις του διακομιστή πρέπει να αφαιρεθεί, εάν η εφαρμογή θα απεγκατασταθεί. Αν εγκαταστήσετε ξανά στο μέλλον, θα αποτρέψει Αφήνοντας Αυτή η ανεξέλεγκτη αυτό.</string>
+    <string name="s_theme_lightdark" auto="1">Φως και σκοτάδι</string>
+    <string name="s_theme_custom" auto="1">pin ρίγες</string>
+    <string name="s_menu_rate" auto="1">τιμή</string>
+    <string name="s_alert_destination_exists" auto="1">Προορισμός υπάρχει ήδη. Τι θα θέλατε να κάνετε;</string>
+    <string name="s_overwrite" auto="1">Αντικατάσταση</string>
+    <string name="s_skip" auto="1">Μετάβαση</string>
+    <string name="s_msg_file_exists" auto="1">Ορισμένα αρχεία προορισμού μπορεί να υπάρχουν ήδη. OK για να αντικαταστήσετε;</string>
+    <string name="s_title_file_exists" auto="1">Το αρχείο υπάρχει ήδη.</string>
+    <string name="s_msg_pref_archives" auto="1">Θα θέλατε να δείτε ή να εξαγάγετε το αρχείο;</string>
+    <string name="s_browse" auto="1">Αναζήτηση</string>
+    <string name="s_extract" auto="1">εκχύλισμα</string>
+    <string name="s_extracted" auto="1">εξάγονται</string>
+    <string name="s_extracting" auto="1">Εξαγωγή</string>
+    <string name="s_extract_with" auto="1">Απόσπασμα με ...</string>
+    <string name="s_title_archive_handler" auto="1">Handler Αρχείο</string>
+    <string name="s_ask_again" auto="1">Ρωτήστε κάθε φορά</string>
+    <string name="s_archives" auto="1">αρχεία</string>
+    <string name="s_compress" auto="1">κομπρέσα</string>
+    <string name="s_compress_type" auto="1">Τύπος συμπίεσης</string>
+    <string name="s_compressed" auto="1">συμπιεσμένο</string>
+    <string name="s_delete_after" auto="1">Διαγραφή πηγή μετά την ολοκλήρωση</string>
+    <string name="s_master_pass" auto="1">κύριο κωδικό</string>
+    <string name="s_master_pass_warning" auto="1">Μπορείτε να εισάγετε έναν κωδικό πρόσβασης κύριος, που χρησιμοποιείται ως κλειδί κρυπτογράφησης για τυχόν αποθηκευμένοι κωδικοί πρόσβασης. Αν αφήσετε αυτό το κενό, οι κωδικοί πρόσβασης θα εξακολουθεί να είναι κρυπτογραφημένα, και ο κύριος κωδικός πρόσβασης θα χρησιμοποιηθεί ο προεπιλεγμένος. Παρακαλώ σημειώστε ότι αν αλλάξετε τον κωδικό σας με αποθηκευμένους κωδικούς πρόσβασης του δικτύου, μάλλον θα χρειαστεί να επαναφέρετε τους κωδικούς πρόσβασης ταυτότητας και διακομιστές σύννεφο μετά την επαναφορά αυτού του κωδικού πρόσβασης.</string>
+    <string name="s_pass_old" auto="1">Εισάγετε τον παλιό κωδικό πρόσβασης:</string>
+    <string name="s_pass_new" auto="1">Πληκτρολογήστε το νέο κωδικό πρόσβασης:</string>
+    <string name="s_logout" auto="1">Αποσύνδεση</string>
+    <string name="s_authenticate" auto="1">Πιστοποίηση</string>
+    <string name="s_authenticating" auto="1">Έλεγχος ταυτότητας</string>
+    <string name="s_bookmark_history" auto="1">ιστορία</string>
+    <string name="s_server_account_title" auto="1">Λογαριασμός:</string>
+    <string name="s_authenticate_success" auto="1">ταυτότητας επιτυχής</string>
+    <string name="s_authenticate_refresh" auto="1">Ανανέωση ταυτότητας</string>
+    <string name="s_pref_thumbs_cache" auto="1">Προ-Cache Μικρογραφίες</string>
+    <string name="s_pref_thumbs_cache_summary" auto="1">Αυτό θα βοηθήσει στην επιτάχυνση της φόρτωσης φακέλους που περιέχουν εικόνες και βίντεο.</string>
+    <string name="s_folders" auto="1">φακέλους</string>
+    <string name="s_hidden" auto="1">κρυμμένο</string>
+    <string name="s_total" auto="1">σύνολο</string>
+    <string name="s_custom_account" auto="1">Προσαρμοσμένη Λογαριασμός</string>
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
new file mode 100755
index 00000000..3a650960
--- /dev/null
+++ b/res/values-fa/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_theme_lightdark">کتاب</string>
+    <string name="s_theme_custom">کتاب</string>
+</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
new file mode 100755
index 00000000..35b1f900
--- /dev/null
+++ b/res/values-fi/strings.xml
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="app_name">Avaa tiedostoselain</string>
+    <string name="s_photos">Valokuvat</string>
+    <string name="s_videos">Videot</string>
+    <string name="s_music">Musiikki</string>
+    <string name="s_downloads">Lataukset</string>
+    <string name="s_external">Ulkoinen</string>
+    <string name="s_internal">Sisäinen</string>
+    <string name="s_view">Näkymä</string>
+    <string name="s_bookmarks">Kirjanmerkit</string>
+    <string name="s_menu_favorites">Vaihda kirjanmerkit</string>
+    <string name="s_menu_sort">Järjestä</string>
+    <string name="s_menu_sort_name_asc">Aakkosjärjestyksessä (A-Z) </string>
+    <string name="s_menu_sort_name_desc">Aakkosjärjestys (Z-A) </string>
+    <string name="s_menu_sort_date_asc">Uusin ensin</string>
+    <string name="s_menu_sort_date_desc">Vanhin ensin</string>
+    <string name="s_menu_sort_size_asc">Suurin ensin</string>
+    <string name="s_menu_sort_size_desc">Pienin ensin</string>
+    <string name="s_menu_sort_type">Tiedostotyypeittäin</string>
+    <string name="s_menu_multi">Monivalinta </string>
+    <string name="s_menu_grid">Ruutunäkymä</string>
+    <string name="s_menu_list">Listanäkymä</string>
+    <string name="s_menu_carousel">Karuselli</string>
+    <string name="s_menu_hidden">Piilotiedostot näkyviin</string>
+    <string name="s_menu_thumbs">Näytä pienoiskuvat</string>
+    <string name="s_menu_new_folder">Uusi kansio</string>
+    <string name="s_menu_other">Muut asetukset</string>
+    <string name="s_menu_flush">Tyhjennä välimuisti</string>
+    <string name="s_menu_root">Juuri</string>
+    <string name="s_menu_prefs_folder">Kansion asetukset</string>
+    <string name="s_menu_prefs_global">Yleiset asetukset</string>
+    <string name="s_menu_info">Tietoja</string>
+    <string name="s_menu_copy">Kopioi</string>
+    <string name="s_menu_cut">Leikkaa</string>
+    <string name="s_menu_paste">Liitä</string>
+    <string name="s_menu_delete">Poista</string>
+    <string name="s_menu_share">Lähetä/Jaa... </string>
+    <string name="s_menu_zip">Pakkaa tiedostoja</string>
+    <string name="s_menu_unzip">Pura... </string>
+    <string name="s_menu_rename">Uudelleennimeä... </string>
+    <string name="s_menu_bookmark">Lisää kirjanmerkki</string>
+    <string name="s_save">Tallenna</string>
+    <string name="s_saveas">Tallenna nimellä... </string>
+    <string name="s_cancel">Peruuta</string>
+    <string name="s_size">Koko</string>
+    <string name="s_none">Ei mitään</string>
+    <string name="s_pref_servers">Muut palvelimet</string>
+    <string name="s_pref_server_add">+ Lisää uusi palvelin</string>
+    <string name="s_pref_display">Näytä asetukset</string>
+    <string name="s_pref_hidden">Näytä piilotiedostot</string>
+    <string name="s_pref_hidden_summary">Näytä piilotiedostot ja -kansiot</string>
+    <string name="s_pref_thumbs">Näytä pikkukuvat</string>
+    <string name="s_pref_thumbs_summary">Pikkukuvanäkymä kuva-, video- ja ohjelmatiedostoille</string>
+    <string name="s_pref_view">Näkymä</string>
+    <string name="s_pref_view_summary">Näytä tiedostot ruudukkona, listana tai Karusellina (vain Honeycomb ja uudempi Android) </string>
+    <string name="s_pref_sort">Järjestäminen</string>
+    <string name="s_pref_sort_summary">Valitse tiedostojen ja kansioiden järjestystapa</string>
+    <string name="s_pref_advanced">Edishtynyt</string>
+    <string name="s_pref_server_name">Palvelimen nimi</string>
+    <string name="s_pref_server_name_summary">Anna palvelimen nimi</string>
+    <string name="s_pref_server_url">Palvelimen URL</string>
+    <string name="s_pref_server_url_summary">Anna palvelimen koko URL</string>
+    <string name="s_pref_server_host">Palvelimen isäntä</string>
+    <string name="s_pref_server_user">Käyttäjä</string>
+    <string name="s_pref_server_user_summary">Käyttäjänimi</string>
+    <string name="s_pref_server_password">Salasana</string>
+    <string name="s_pref_server_password_summary">Kirjautumissalasana</string>
+    <string name="s_pref_server_path">Alihakemisto</string>
+    <string name="s_pref_server_path_summary">Anna oletuskirjautumispolku</string>
+    <string name="s_pref_server_extras">Lisäasetukset</string>
+    <string name="s_pref_server_update">Lisää/Päivitä palvelin</string>
+    <string name="s_pref_server_type">Palvelintyyppi</string>
+    <string name="s_files">Tiedostot</string>
+    <string name="s_create">Luo</string>
+    <string name="s_title_holding_x_files" formatted="false">Säilytetään % tiedostoa</string>
+    <string name="s_title_newfolder">Luo uusi kansio</string>
+    <string name="s_title_send">Lähetä xxx</string>
+    <string name="s_title_unzip">Pura xxx</string>
+    <string name="s_title_zip">Pakkaa xxx</string>
+    <string name="s_title_executing">Suoritetaan</string>
+    <string name="s_title_deleting">Poistetaan</string>
+    <string name="s_title_searching">Etsitään</string>
+    <string name="s_title_moving">Siirretään</string>
+    <string name="s_title_copying">Kopioidaan</string>
+    <string name="s_title_zipping">Pakataan</string>
+    <string name="s_title_unzipping">Puretaan</string>
+    <string name="s_title_wait">Ole hyvä ja odota... </string>
+    <string name="s_alert_confirm_delete" formatted="false">Poistoa (%) ei voi peruuttaa myöhemmin. Haluatko jatkaa? </string>
+    <string name="s_alert_rename">Kirjoita tiedostolle uusi nimi</string>
+    <string name="s_alert_newfolder">Anna luotavan kansion nimi. </string>
+    <string name="s_alert_unzip">Haluatko purkaa tiedostot tähän vai johonkin muuhun kansioon? </string>
+    <string name="s_button_unzip_here">Pura tähän</string>
+    <string name="s_button_unzip_else">Pura muualle... </string>
+    <string name="s_msg_none">Tiedostoja ei voitu</string>
+    <string name="s_msg_some">Joitakin tiedostoja ei voitu</string>
+    <string name="s_msg_all">Tiedostot onnistuneesti</string>
+    <string name="s_msg_deleted">poistettu </string>
+    <string name="s_msg_moved">siirretty</string>
+    <string name="s_msg_copied">kopioitu</string>
+    <string name="s_remove">Poista</string>
+    <string name="s_eject">Irroita</string>
+    <string name="s_update">Päivitä</string>
+    <string name="s_alert_bookmark_rename">Muuta kirjanmerkin otsikkoa</string>
+    <string name="s_title_bookmark_prefix">Hallinnoi kirjanmerkiä:</string>
+    <string name="s_alert_remove_safe">Nyt voit turvallisesti irrottaa aseman. </string>
+    <string name="s_alert_remove_error">Ei voitu irrottaa. </string>
+    <string name="s_menu_about">Tietoja</string>
+    <string name="s_about_version">Versio</string>
+    <string name="s_about_author">Luoja</string>
+    <string name="s_about_site">Internetsivu</string>
+    <string name="s_about_email">Sähköposti</string>
+    <string name="s_about_recent">Viimeiset päivitykset</string>
+    <string name="s_chooser_email">Lähetä palautetta... </string>
+    <string name="s_status_loading">Ladataan... </string>
+    <string name="s_menu_open">Avaa xxx kanssa</string>
+    <string name="s_menu_edit">Muokkaa  xxx kanssa</string>
+    <string name="s_pref_stats_title">Auta kehittämään OpenExploreria</string>
+    <string name="s_pref_stats_summary">Lähetä anonyymisti käyttötilastoja. Tämä ei sisällä mitään käyttäjään liittyvää tunnistustietoa. </string>
+    <string name="s_error_no_intents">Mikään asennettu ohjelma ei osaa lukea tätä tiedostotyyppiä. </string>
+    <string name="s_menu_root_disabled">Root ei käytössä</string>
+    <string name="s_pref_start">Lähtökansio</string>
+    <string name="s_pref_start_summary">Open Explorer in aloitus- eli oletuskansio. </string>
+    <string name="s_custom">Muokattu... </string>
+    <string name="s_text_intro_top">Tervetuloa OpenExploreriin! </string>
+    <string name="s_text_intro_body">OpenExplorerin tavoite on yhdistää saumattomasti paikallinen ja pilvipalvelun tiedostojärjestelmä. Voit hallita mediatiedostojasi mistä tahansa tai ylläpitää FTP-verkkopalvelusta. \n\nValitse aloituspolku:</string>
+    <string name="s_info_num_folders">Kansioiden määrä:</string>
+    <string name="s_info_num_files">Tiedostojen määrä:</string>
+    <string name="s_info_last_modified">Viimeksi muokattu:</string>
+    <string name="s_info_permissions">Tiedostojen oikeudet:</string>
+    <string name="s_info_permission_read">Lue:</string>
+    <string name="s_info_permission_write">Kirjoita:</string>
+    <string name="s_info_permission_execute">Suorita:</string>
+    <string name="s_toggle_keyboard">Näppäimistö</string>
+    <string name="s_show_password">Näytä salasana</string>
+    <string name="s_error_ftp">Virhe liityttäessä verkkoon</string>
+    <string name="s_prompt_zip">Anna uuden ZIP-tiedoston nimi:</string>
+    <string name="app_edit">Muokkaa OpenExplorerilla</string>
+    <string name="s_menu_more">Lisää valintoja</string>
+    <string name="s_msg_low_memory">Alhainen muisti! </string>
+    <string name="s_clear">Tyhjennä</string>
+    <string name="s_menu_delete_all">Poista kaikki</string>
+    <string name="s_menu_move_all">Siirrä tähän</string>
+    <string name="s_menu_copy_all">Kopioi tähän</string>
+    <string name="s_confirm_delete" formatted="false">Haluatko varmasti poistaa %t? </string>
+    <string name="s_error_same_destination">Kohdehakemisto on sama.</string>
+    <string name="s_sample_notification">Kopioidaan - &gt; SD-kortille tai vastaavaa muistiin: 3 tiedostoa</string>
+    <string name="s_pref_fullscreen">Koko näyttö</string>
+    <string name="s_pref_fullscreen_summary_on">Piilota ilmoituspalkki</string>
+    <string name="s_pref_fullscreen_summary_off">Näytä ilmoituspalkki</string>
+    <string name="s_pref_pagers">Näytä välilehdet</string>
+    <string name="s_pref_pagers_summary_on">Hakemistoissa siirrytään vaakasuuntaisesti pyyhkimällä</string>
+    <string name="s_pref_pagers_summary_off">Vaakasuuntainen pyyhintä poistettu käytöstä</string>
+    <string name="s_alert_new_media">Uusi tallennusväline liitetty! </string>
+    <string name="s_warn_pager_title">Uusi ominaisuus: näkymäerottimet</string>
+    <string name="s_warn_pager">Pyyhi vasemmalta oikealle kun haluat siirtyä ylempään hakemistoon ja oikealta vasemmalle halutessasi palata takaisin. Tämän pitäisi helpottaa siirtymistä. Kokeile (ulkoisella tallennusvälineellä)! </string>
+    <string name="s_warn_confirm">Oletko ymmärtänyt? </string>
+    <string name="s_warn_disable">Poista käytöstä</string>
+    <string name="s_pref_intent_internal">Sisäinen ennakointi</string>
+    <string name="s_pref_intent_internal_on">Käytä OpenExplorerin ennakointikonetta</string>
+    <string name="s_pref_intent_internal_off">Käytä järjestelmän ennakointikonetta </string>
+    <string name="s_pref_text_internal">Käytä sisäistä tekstieditoria</string>
+    <string name="s_text_editor_title">Tekstieditori</string>
+    <string name="s_pref_show_root">Näytä tiedostojärjestelmän juuri (/) </string>
+    <string name="s_pref_show_internal">Näytä sisäinen tallennusväline</string>
+    <string name="s_pref_show_external">Näytä ulkoinen tallennusväline</string>
+    <string name="s_error_no_media">Näyttää siltä, ettei tallennusvälinettä ole liitetty. Poista USB jakaminen käytöstä tai liitä media uudelleen. </string>
+    <string name="s_prompt_password">Anna salasana</string>
+    <string name="s_add">Lisää</string>
+    <string name="s_server_ftp">FTP</string>
+    <string name="s_server_sftp">SFTP</string>
+    <string name="s_pref_server_port">Portti</string>
+    <string name="s_about_buildtime">Version päiväys</string>
+    <string name="s_default">Oletus</string>
+    <string name="s_pref_timeout">Odotusaika</string>
+    <string name="s_pref_timeout_summary">Odotusaika sekunneissa</string>
+    <string name="s_menu_up">Siirry ylös</string>
+    <string name="s_prompt_unzip">Anna polku, mihin tiedostot puretaan:</string>
+    <string name="s_pref_hardware_accel">Käytä prosessoripohjaista kiihdytystä</string>
+    <string name="s_pref_honeyplus">Android 3.0+ asetukset</string>
+    <string name="s_pref_actionmode">Toimintamoodi</string>
+    <string name="s_pref_actionmode_enabled">Käytä toimintamoodia</string>
+    <string name="s_pref_actionmode_disabled">Käytä normaalia valikoita</string>
+    <string name="s_server_smb">SMB/Windows</string>
+    <string name="s_bookmark_drives">Asemat</string>
+    <string name="s_bookmark_smart">Älykkäät kansiot</string>
+    <string name="s_bookmark_favorites">Suosikit</string>
+    <string name="s_bookmark_servers">Palvelimet</string>
+    <string name="s_bookmark_cache">Välimuisti</string>
+    <string name="s_info_totalspace">Aseman koko tila:</string>
+    <string name="s_info_freespace">Aseman vapaa tila:</string>
+    <string name="s_status_rate">Arvioi:</string>
+    <string name="s_about_hardware">Laitteisto</string>
+    <string name="s_menu_refresh">Päivitä kansio</string>
+    <string name="s_pref_reset">Palauta oletusnäkymät</string>
+    <string name="s_toast_complete">Tehtävä valmis! </string>
+    <string name="s_pref_reset_summary">Kansioiden oletusasetukset. Klikkaa tästä poistaaksesi kaikki kansiokohtaiset asetukset. </string>
+    <string name="s_prompt_path">Anna polku:</string>
+    <string name="s_prompt_search">Etsi tätä:</string>
+    <string name="s_prompt_search_within">Etsi sijainnista:</string>
+    <string name="s_pref_view_category">Kirjanmerkkinäkymän asetukset</string>
+    <string name="s_pref_show_videos">Näytä videot</string>
+    <string name="s_pref_show_photos">Näytä valokuvat</string>
+    <string name="s_pref_show_music">Näytä musiikki</string>
+    <string name="s_pref_show_downloads">Näytä lataukset</string>
+    <string name="s_hide">Piilota</string>
+    <string name="s_show">Näytä</string>
+    <string name="s_msg_event_cancelled">Tapahtuma peruutettu. </string>
+    <string name="s_alert_newfolder_folder">Luo kansio sijaintiin:</string>
+    <string name="s_pref_fancy_category">Laajat näyttöasetukset</string>
+    <string name="s_pref_fancy_menus">Laajemmat valikot</string>
+    <string name="s_pref_fancy_context">Laajat valikot</string>
+    <string name="s_search_files">Etsi tiedostojärjestelmästä</string>
+    <string name="search_summary" formatted="false">Etsitään \&quot; %s \&quot; sijainnista \&quot; %s \&quot; (%d)...</string>
+    <string name="search_results" formatted="false">Löydetty %d tulosta \&quot; %s \&quot; lle \&quot; %s \&quot; sisältä</string>
+    <string name="s_menu_exit">Poistu</string>
+    <string name="s_warn_wtf_ps">***Huomaa, että ohjelma on yhä esiversio. Älä anna huonoa arviota missään vain kaatumisen vuoksi. Lähetä pikemmin palautetta. Jos ne vaivaavat, on parempi poistaa ohjelma. Kiitos! </string>
+    <string name="s_yes">Kyllä</string>
+    <string name="s_no">Ei</string>
+    <string name="s_wtf_preview">Esikatselu raportin tietoja</string>
+    <string name="s_wtf_remember">Älä kysy uudelleen</string>
+    <string name="s_pref_basebar">Jaa toimintovalikko</string>
+    <string name="s_pref_basebar_on">Toimintovalikon painikkeet näytön alaosassa kun pystyasennossa</string>
+    <string name="s_pref_basebar_off">Toimintopainikkeet näytön yläosassa (aina) </string>
+    <string name="s_pref_autowtf">Lähetä automaattisesti kaatumisraportit</string>
+    <string name="s_pref_autowtf_summary">Lähetä automaattinen raportti, kun ohjelma ei onnistu käsittelemään virhetilannetta.</string>
+    <string name="s_split_auto">Automaattinen</string>
+    <string name="s_split_top">Siirrä painikkeet ylös</string>
+    <string name="s_split_top_single">Siirrä yksittäinen painike ylimmäksi</string>
+    <string name="s_split_bottom">Siirrä painikkeet alas</string>
+    <string name="s_split_none">Siirrä kaikki painikkeet Järjestelmävalikkoon</string>
+    <string name="s_about_screensize">Näytön koko</string>
+    <string name="s_about_density">Tiiviys</string>
+    <string name="s_menu_location_int">Sisäisen muistin polku</string>
+    <string name="s_menu_location_ext">Ulkoisen muistin polku</string>
+    <string name="s_wtf_context">Kuvaa missä yhteydessä ohjelma kastui:</string>
+    <string name="thanks">Kiitos! </string>
+    <string name="menu_view_font_small">Kirjasinkoko pieni</string>
+    <string name="menu_view_font_medium">Kirjasinkoko keski</string>
+    <string name="menu_view_font_large">Kirjasinkoko suuri</string>
+    <string name="alert_translate_none">Hei, käytät kieltä jota ohjelma ei vielä tue. Jos haluat auttaa kääntämään ohjelman osaamallesi kielelle, niin klikkaa tästä:</string>
+    <string name="button_translate">Käännä</string>
+    <string name="httpError">Tapahtui verkkovirhe. </string>
+    <string name="httpErrorAuth">Tunnistautuminen ei onnistunut. </string>
+    <string name="httpErrorProxyAuth">Tunnistautuminen välityspalvelimen kautta ei onnistunut.</string>
+    <string name="httpErrorConnect">Yhteydenotto palvelimeen ei onnistunut.</string>
+    <string name="httpErrorIO">Palvelin ei vastaa. Yritä myöhemmin uudelleen.</string>
+    <string name="httpErrorTimeout">Palvelinyhteys aikakatkaistiin.</string>
+    <string name="httpErrorFile">Tiedostoa ei voitu avata.</string>
+    <string name="httpErrorFileNotFound">Etsimääsi tiedostoa ei löytynyt.</string>
+    <string name="contentServiceSync">Synkronoi</string>
+    <string name="keyguard_password_enter_pin_code">Anna PIN-koodi</string>
+    <string name="keyguard_password_enter_password_code">Anna salasana lukituksen poistamiseksi.</string>
+    <string name="keyguard_password_enter_pin_password_code">Anna PIN poistaaksesi lukituksen.</string>
+    <string name="lockscreen_password_wrong">Anteeksi. Yritä uudelleen</string>
+    <string name="whichApplication">Viimeistele toiminto käyttäen</string>
+    <string name="noApplications">Mikään asennettu ohjelma ei osaa tätä toimintoa.</string>
+    <string name="report">Raportoi</string>
+    <string name="sim_restart_button">Käynnistä uudelleen</string>
+    <string name="extmedia_format_button_format">Alusta</string>
+    <string name="ext_media_nofs_notification_message">USB tallennusväline on tyhjä tai tiedostojärjestelmää ei tueta.</string>
+    <string name="activity_list_empty">Vastaavaa toimintoa ei löydy</string>
+    <string name="ime_action_go">Siirry</string>
+    <string name="ime_action_send">Lähetä</string>
+    <string name="ime_action_done">Valmis</string>
+    <string name="ime_action_default">Suorita</string>
+    <string name="upload_file">Valitse tiedosto</string>
+    <string name="no_file_chosen">Yhtään tiedostoa ei valittu</string>
+    <string name="reset">Palauta alkutilaan</string>
+    <string name="back_button_label">Takaisin</string>
+    <string name="next_button_label">Seuraava</string>
+    <string name="no_matches">Ei löytynyt vastaavuuksia</string>
+    <string name="find_on_page">Etsi sivulta</string>
+    <string name="find">Etsi</string>
+    <string name="activitychooserview_choose_application">Valitse sovellus</string>
+    <string name="shareactionprovider_share_with">Jaa tämä</string>
+    <string name="storage_internal">Sisäinen tallenusväline</string>
+    <string name="storage_sd_card">SD-kortti</string>
+    <string name="storage_usb">USB tallennusväline</string>
+    <string name="extract_edit_menu_button">Muokkaa...</string>
+    <string name="activity_chooser_view_see_all">Näytä kaikki...</string>
+    <string name="s_title_picker">Valitse hakemisto</string>
+    <string name="selected_path">Valittu polku:</string>
+    <string name="filename">Tiedoston nimi</string>
+    <string name="s_msg_saved">talletettu</string>
+    <string name="s_menu_view_line_numbers">Rivinumerot</string>
+    <string name="warn_text_editor">Olet tekstieditorissa. Pitkällä painalluksella voit muokata tekstiä. </string>
+    <string name="warn_networking">Olet verkko-osiossa. Huomaa, että osio on vielä keskeneräinen ja voi sisältää virheitä. Anna mieluiten palautetta meille kuin jättämällä huonon arvion markettiin. </string>
+    <string name="s_menu_new_file">Uusi tekstitiedosto</string>
+    <string name="s_msg_created">luotu</string>
+    <string name="s_title_newfile">Uusi tiedosto</string>
+    <string name="s_alert_newfile_folder">Luo uusi tiedosto tänne:</string>
+    <string name="s_alert_newfile">Anna nimi uudelle tiedostolle:</string>
+    <string name="s_alert_exit">Haluatko varmasti poista ohjelmasta?</string>
+    <string name="s_alert_clipboard">Kopioitiin leikepöydälle</string>
+    <string name="s_alert_restart">Käynnistetään uudelleen. Odota.</string>
+    <string name="language">Kieli</string>
+    <string name="s_menu_download">Lataa</string>
+    <string name="scan">Etsi yhteyksiä</string>
+    <string name="test">Testaa</string>
+    <string name="test_success">Yhteys onnistui!</string>
+    <string name="no_items">Ei löytynyt mitään.</string>
+    <string name="clipboard">Leikepöytä</string>
+    <string name="theme">Teema</string>
+    <string name="theme_dark">Tumma käyttöliittymä</string>
+    <string name="theme_light">Vaalea käyttöliittymä</string>
+    <string name="chooser_remember">Muista valintani</string>
+    <string name="use_system">Käytä järjestelmän &gt;&gt;</string>
+    <string name="activity_resolver_use_always">Aina</string>
+    <string name="activity_resolver_use_once">Vain kerran</string>
+    <string name="s_pref_bookmarks_summary">Näytä kirjanmerkit</string>
+    <string name="s_pref_view_folders">Kansioiden asetukset</string>
+    <string name="s_pref_view_general">Yleiset asetukset</string>
+    <string name="s_pref_text_wrap">Rajaa teksti oikealta</string>
+    <string name="s_pref_thumbs_crop">Rajaa/keskitä kuvakkeet</string>
+    <string name="s_pref_thumbs_cache_clear">Tyhjennä pikkukuvasäilö</string>
+    <string name="s_msg_folder_none">Kansiota ei voitu luoda</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
old mode 100644
new mode 100755
index 7285d74c..2fe7d8f1
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="app_name">Open Explorer</string>
+    <string name="app_name">Ouvrir Explorer</string>
     <string name="s_photos" auto="1">Photos</string>
     <string name="s_videos" auto="1">Vidéos</string>
     <string name="s_music">Musique</string>
     <string name="s_downloads" auto="1">Téléchargements</string>
     <string name="s_external">Externe</string>
     <string name="s_internal" auto="1">Interne</string>
-    <string name="s_view">Affichage</string>
-    <string name="s_bookmarks">Signets</string>
+    <string name="s_view">vue</string>
+    <string name="s_bookmarks" auto="1">Favoris</string>
     <string name="s_menu_favorites">Sélect. signets</string>
     <string name="s_menu_sort">Trier</string>
     <string name="s_menu_sort_name_asc">Trier par nom (de A à Z)</string>
@@ -25,7 +25,7 @@
     <string name="s_menu_hidden" auto="1">Afficher les fichiers cachés</string>
     <string name="s_menu_thumbs">Afficher les vignettes</string>
     <string name="s_menu_new_folder" auto="1">Nouveau dossier</string>
-    <string name="s_menu_other" auto="1">Autres paramètres</string>
+    <string name="s_menu_other">options avancées</string>
     <string name="s_menu_flush">Vider le cache</string>
     <string name="s_menu_root">Racine</string>
     <string name="s_menu_prefs_folder">Préférences de dossier</string>
@@ -39,7 +39,7 @@
     <string name="s_menu_zip">Fichier(s) compressés ...</string>
     <string name="s_menu_unzip">Décompresser...</string>
     <string name="s_menu_rename">Renommer...</string>
-    <string name="s_menu_bookmark">Ajouter un signet</string>
+    <string name="s_menu_bookmark">Ajouter marque page</string>
     <string name="s_save" auto="1">Enregistrer</string>
     <string name="s_saveas">Enregistrer sous...</string>
     <string name="s_cancel" auto="1">Annuler</string>
@@ -54,7 +54,7 @@
     <string name="s_pref_thumbs_summary">Affichage une miniature pour les fichiers Images / Vidéos / Application</string>
     <string name="s_pref_view">Mode d\'affichage</string>
     <string name="s_pref_view_summary">Afficher les fichiers sous forme de grille, liste ou carrousel (seulement avec Honeycomb)</string>
-    <string name="s_pref_sort" auto="1">Tri</string>
+    <string name="s_pref_sort">Tri en cours</string>
     <string name="s_pref_sort_summary">Choisir la méthode de tri des fichiers et dossiers</string>
     <string name="s_pref_advanced">Avancé</string>
     <string name="s_pref_server_name" auto="1">Nom du serveur</string>
@@ -71,7 +71,7 @@
     <string name="s_pref_server_extras" auto="1">Réglages supplémentaires</string>
     <string name="s_pref_server_update">Ajouter / Mettre à jour un serveur</string>
     <string name="s_pref_server_type" auto="1">Type de serveur</string>
-    <string name="s_files">Fichiers</string>
+    <string name="s_files" auto="1">fichiers</string>
     <string name="s_create" auto="1">Créer</string>
     <string name="s_title_holding_x_files" formatted="false">Contient %s fichiers</string>
     <string name="s_title_newfolder">Créer un nouveau dossier</string>
@@ -79,12 +79,12 @@
     <string name="s_title_unzip">Décompresser xxx</string>
     <string name="s_title_zip">Compresser xxx</string>
     <string name="s_title_executing">Execution</string>
-    <string name="s_title_deleting" auto="1">Suppression</string>
-    <string name="s_title_searching" auto="1">Recherche</string>
-    <string name="s_title_moving" auto="1">Déplacement</string>
-    <string name="s_title_copying" auto="1">Copie</string>
+    <string name="s_title_deleting">Suppression en cours</string>
+    <string name="s_title_searching">Recherche en cours</string>
+    <string name="s_title_moving">Déplacement en cours</string>
+    <string name="s_title_copying">Copie en cours</string>
     <string name="s_title_zipping">Compression</string>
-    <string name="s_title_unzipping" auto="1">Décompression</string>
+    <string name="s_title_unzipping">Décompression en cours</string>
     <string name="s_title_wait">Merci de patienter...</string>
     <string name="s_alert_confirm_delete" formatted="false">La suppression de %s est définitive. Êtes-vous certain de vouloir continuer ?</string>
     <string name="s_alert_rename">Merci de saisir le nouveau nom de ce fichier</string>
@@ -98,18 +98,18 @@
     <string name="s_msg_deleted">supprimé(s)</string>
     <string name="s_msg_moved">déplacé(s)</string>
     <string name="s_msg_copied">copié(s)</string>
-    <string name="s_remove" auto="1">Retirer</string>
+    <string name="s_remove">Supprimer</string>
     <string name="s_eject" auto="1">Éjecter</string>
-    <string name="s_update" auto="1">Mise à jour</string>
+    <string name="s_update">Mise à jour</string>
     <string name="s_alert_bookmark_rename">Renommer le signet.</string>
     <string name="s_title_bookmark_prefix">Gérer les signets :</string>
     <string name="s_alert_remove_safe">Vous pouvez maintenant retirer le lecteur en toute sécurité.</string>
     <string name="s_alert_remove_error" auto="1">Impossible d\'éjecter.</string>
     <string name="s_menu_about">À propos de</string>
-    <string name="s_about_version" auto="1">Version</string>
+    <string name="s_about_version">Version</string>
     <string name="s_about_author" auto="1">Auteur</string>
     <string name="s_about_site" auto="1">Site Web</string>
-    <string name="s_about_email">Courriel</string>
+    <string name="s_about_email" auto="1">Email</string>
     <string name="s_about_recent" auto="1">Mises à jour récentes</string>
     <string name="s_chooser_email">Envoyer une remarque...</string>
     <string name="s_status_loading">Chargement en cours...</string>
@@ -124,46 +124,46 @@
     <string name="s_custom">Personnalisé...</string>
     <string name="s_text_intro_top">Bienvenue dans OpenExplorer</string>
     <string name="s_text_intro_body">Le but d\'OpenExplorer est de vous rendre plus productif au sein de votre système de fichiers Android et dans le cloud. \nOpenExplorer peut convenir à vos besoins, que vous ayez besoin de gérer des vidéos ou des photos à partir d\'emplacements multiples ou de gérer votre serveur web à distance via FTP.\n\nVeuillez choisir votre chemin de départ :</string>
-    <string name="s_info_num_folders">Nombre de dossiers :</string>
-    <string name="s_info_num_files">Nombre de fichiers :</string>
+    <string name="s_info_num_folders">Nombre de dossiers :</string>
+    <string name="s_info_num_files">Nombre de fichiers :</string>
     <string name="s_info_last_modified">Dernière mise à jour :</string>
-    <string name="s_info_permissions">Autorisations sur les fichiers :</string>
+    <string name="s_info_permissions">Autorisations des fichiers :</string>
     <string name="s_info_permission_read">Lire :</string>
     <string name="s_info_permission_write">Écrire :</string>
     <string name="s_info_permission_execute">Exécuter :</string>
     <string name="s_toggle_keyboard">Clavier</string>
-    <string name="s_show_password">Montrer le mot de passe</string>
-    <string name="s_error_ftp">Erreur de connexion au réseau</string>
-    <string name="s_prompt_zip">Saisir le nom du nouveau fichier Zip :</string>
-    <string name="app_edit" auto="1">Modifier avec OpenExplorer</string>
+    <string name="s_show_password">Montrer le mot de passe</string>
+    <string name="s_error_ftp">Erreur de connexion au réseau</string>
+    <string name="s_prompt_zip">Saisir le nom du nouveau fichier Zip :</string>
+    <string name="app_edit" auto="1">Modifier avec OpenExplorer</string>
     <string name="s_menu_more">Plus d\'options...</string>
     <string name="s_msg_low_memory">Mémoire faible !</string>
     <string name="s_clear">Effacer</string>
     <string name="s_menu_delete_all">Tout supprimer</string>
-    <string name="s_menu_move_all" auto="1">Déplacer ici</string>
+    <string name="s_menu_move_all">Déplacer ici </string>
     <string name="s_menu_copy_all">Copier ici</string>
-    <string name="s_confirm_delete" formatted="false">Êtes-vous sûr de vouloir supprimer %s ?</string>
+    <string name="s_confirm_delete" formatted="false">Êtes-vous sûr de vouloir supprimer %s ?</string>
     <string name="s_error_same_destination">Le répertoire de destination est identique. </string>
-    <string name="s_sample_notification">Copie -> sdcard : 3 fichiers</string>
+    <string name="s_sample_notification">Copie -&gt; sdcard : 3 fichiers</string>
     <string name="s_pref_fullscreen">Pein écran</string>
-    <string name="s_pref_fullscreen_summary_on" auto="1">Masquer la barre de notification</string>
-    <string name="s_pref_fullscreen_summary_off" auto="1">Afficher la barre de notification</string>
+    <string name="s_pref_fullscreen_summary_on" auto="1">Masquer la barre de notification</string>
+    <string name="s_pref_fullscreen_summary_off" auto="1">Afficher la barre de notification</string>
     <string name="s_pref_pagers">Vue paginée</string>
-    <string name="s_pref_pagers_summary_on">Balayage horizontal = Navigation par dossiers</string>
+    <string name="s_pref_pagers_summary_on">Balayage horizontal = Navigation par dossiers</string>
     <string name="s_pref_pagers_summary_off">Balayage horizontal désactivé </string>
-    <string name="s_alert_new_media">Nouveau média inséré !</string>
-    <string name="s_warn_pager_title">Nouvelle fonctionnalité : vue paginée</string>
-    <string name="s_warn_pager">Balayez de gauche à droite pour accéder au répertoire suivant et de droite à gauche pour accéder au précédent. Cela devrait rendre la navigation plus facile. Essayez-le (sur un média externe) !</string>
+    <string name="s_alert_new_media">Nouveau média inséré !</string>
+    <string name="s_warn_pager_title">Nouvelle fonctionnalité : vue paginée</string>
+    <string name="s_warn_pager">Balayez de gauche à droite pour accéder au répertoire suivant et de droite à gauche pour accéder au précédent. Cela devrait rendre la navigation plus facile. Essayez-le (sur un média externe) !</string>
     <string name="s_warn_confirm">Comprenez-vous ?</string>
     <string name="s_warn_disable">Désactiver</string>
     <string name="s_pref_intent_internal">Intentions Internes</string>
-    <string name="s_pref_intent_internal_on">Utiliser le Gestionnaire d\'intention de OpenExplorer</string>
-    <string name="s_pref_intent_internal_off">Utiliser le gestionnaire d\'intentions système</string>
+    <string name="s_pref_intent_internal_on">Utiliser le Gestionnaire d\'intention de OpenExplorer</string>
+    <string name="s_pref_intent_internal_off">Utiliser le gestionnaire d\'intentions système</string>
     <string name="s_pref_text_internal">Utiliser l\'éditeur de texte intégré</string>
     <string name="s_text_editor_title" auto="1">Éditeur de texte</string>
     <string name="s_pref_show_root">Afficher le dossier racine du systéme (/)</string>
-    <string name="s_pref_show_internal">Afficher les médias internes</string>
-    <string name="s_pref_show_external" auto="1">Afficher les médias externes</string>
+    <string name="s_pref_show_internal">Afficher les médias internes</string>
+    <string name="s_pref_show_external">Montrer les supports externes</string>
     <string name="s_error_no_media">Il semblerait qu\'aucun média ne soit inséré. Merci de désactiver le partage USB ou de réinsérer un média.</string>
     <string name="s_prompt_password">Saisir le mot de passe</string>
     <string name="s_add">Ajouter</string>
@@ -178,20 +178,20 @@
     <string name="s_prompt_unzip">Saisir le chemin du dossier de décompression :</string>
     <string name="s_pref_hardware_accel" auto="1">Activer l\'accélération matérielle</string>
     <string name="s_pref_honeyplus">Réglages Android 3.0 +</string>
-    <string name="s_pref_actionmode">Mode d\'action</string>
-    <string name="s_pref_actionmode_enabled" auto="1">Utilisez le mode d\'action</string>
+    <string name="s_pref_actionmode">Mode l\'action</string>
+    <string name="s_pref_actionmode_enabled">Utiliser le mode action</string>
     <string name="s_pref_actionmode_disabled">Utiliser les menus contextuels standard</string>
-    <string name="s_server_smb" auto="1">SMB / Windows</string>
-    <string name="s_bookmark_drives">Lecteurs</string>
+    <string name="s_server_smb">SMB/windows</string>
+    <string name="s_bookmark_drives">Supports de stockage</string>
     <string name="s_bookmark_smart">Dossiers intelligents</string>
     <string name="s_bookmark_favorites" auto="1">Favoris</string>
-    <string name="s_bookmark_servers" auto="1">Serveurs</string>
+    <string name="s_bookmark_servers">Serveurs</string>
     <string name="s_bookmark_cache">Tampon </string>
     <string name="s_info_totalspace">Espace disque total :</string>
     <string name="s_info_freespace">Espace disque libre :</string>
-    <string name="s_status_rate">Taux :</string>
+    <string name="s_status_rate">Évaluer  :</string>
     <string name="s_about_hardware" auto="1">Matériel</string>
-    <string name="s_menu_refresh" auto="1">Actualiser le dossier</string>
+    <string name="s_menu_refresh">actualiser</string>
     <string name="s_pref_reset">Réinitialiser les vues</string>
     <string name="s_toast_complete">Opération terminée !</string>
     <string name="s_pref_reset_summary">Cliquez ici pour supprimer tous les paramètres d\'affichage de dossiers spécifiques, retour à l\'état initial.</string>
@@ -205,14 +205,14 @@
     <string name="s_pref_show_downloads" auto="1">Afficher les téléchargements</string>
     <string name="s_hide" auto="1">Cacher</string>
     <string name="s_show">Afficher</string>
-    <string name="s_msg_event_cancelled" auto="1">Événement annulé.</string>
+    <string name="s_msg_event_cancelled">Évènement annulé.</string>
     <string name="s_alert_newfolder_folder">Créer un nouveau dossier dans :</string>
-    <string name="s_pref_fancy_category">Paramètres d\'affichage de fantaisie</string>
-    <string name="s_pref_fancy_menus">Menus décorés</string>
-    <string name="s_pref_fancy_context">Menus contextuels de fantasie</string>
+    <string name="s_pref_fancy_category">Paramètres d\'affichage fantaisie</string>
+    <string name="s_pref_fancy_menus">Menus fantaisie </string>
+    <string name="s_pref_fancy_context">Menus contextuels fantaisie</string>
     <string name="s_search_files">Rechercher dans le système de fichiers</string>
-    <string name="search_summary" formatted="false">Recherche de \" %s \" dans \" %s \" (%d)...</string>
-    <string name="search_results" formatted="false">%d résultats trouvés pour \" %s \" dans \" %s \"</string>
+    <string name="search_summary" formatted="false">Recherche de \&quot; %s \&quot; dans \&quot; %s \&quot; (%d)...</string>
+    <string name="search_results" formatted="false">%d résultats trouvés pour \&quot; %s \&quot; dans \&quot; %s \&quot;</string>
     <string name="s_menu_exit">Quitter</string>
     <string name="s_warn_wtf_message">Oups ! Il semble qu\'une erreur non gérée se soit produite ! Comme il s\'agit d\'une beta, cela arrive qu\'il y ait des problèmes. La seule façon de résoudre ces problèmes consiste à recevoir des rapports de divers appareils tels que le vôtre. Afin de trouver comment résoudre le problème, pouvons-nous envoyer au développeur ce rapport qui contient uniquement des données anonymes ?</string>
     <string name="s_warn_wtf_ps">*** Veuillez noter que cette application est en version beta. S\'il vous plait, ne donnez pas une mauvaise note à cette application simplement parce qu\'elle se bloque. Désinstallez-la simplement si cela vous gêne vraiment. Merci !</string>
@@ -223,20 +223,20 @@
     <string name="s_pref_basebar" auto="1">Diviser la barre d\'action</string>
     <string name="s_pref_basebar_on">Boutons d\'action au bas de l\'écran en mode portrait</string>
     <string name="s_pref_basebar_off">Boutons d\'action en haut de l\'écran (si disponible)</string>
-    <string name="s_pref_autowtf">Envoyer automatiquement les rapports d\'erreur</string>
+    <string name="s_pref_autowtf">Envoyer automatiquement les rapports l\'erreur</string>
     <string name="s_pref_autowtf_summary">Quand une exception non gérée se produit, envoyer automatiquement un rapport.</string>
     <string name="s_split_auto" auto="1">Automatique</string>
     <string name="s_split_top">Forcer les boutons en haut</string>
-    <string name="s_split_top_single" auto="1">Forcer un seul bouton en haut</string>
+    <string name="s_split_top_single">Forcer bouton unique en haut</string>
     <string name="s_split_bottom">Forcer les boutons en bas</string>
     <string name="s_split_none">Placer tous les boutons dans le menu système</string>
-    <string name="s_about_screensize" auto="1">Taille de l\'écran</string>
+    <string name="s_about_screensize">Taille de l\'écran </string>
     <string name="s_about_density" auto="1">Densité</string>
     <string name="s_menu_location_int">Chemin vers la mémoire interne</string>
     <string name="s_menu_location_ext">Chemin vers la mémoire externe</string>
-    <string name="s_wtf_context">Veuillez décrire le contexte de l\'erreur:</string>
+    <string name="s_wtf_context">Veuillez décrire le contexte de l\'erreur :</string>
     <string name="thanks">Merci !</string>
-    <string name="menu_view_font_small" auto="1">Police de petite taille</string>
+    <string name="menu_view_font_small">police petite taille</string>
     <string name="menu_view_font_medium">Police de taille moyenne</string>
     <string name="menu_view_font_large">Police de grande taille</string>
     <string name="app_description">Open Explorer - Gestionnaire de fichiers open source pour tous les appareils ! (Tablettes, téléphones, Google TV, sandwiches !) \n- Gestionnaire de fichiers complet\n- USB, SD et autres médias externes \n- Connexions réseau (FTP, SFTP, SMB / Samba / Windows / Lan / WIFI)\n- Editeur de texte\n- Dossiers intelligents qui analysent les différents types de médias (vidéos, photos, musiques, téléchargements)\n- Vue paginée des dossiers (Balayage de gauche à droite)\n- Droits superutilisateur en lecture des dossiers/fichiers système (pas d\'écriture système pour le moment)\n \nFonctionnalités à venir: \n- Éditeur de texte avec onglets\n- Plus de fonctionnalités réseau (Dropbox, Box.net, Sky drive) \n- Cache hors-ligne des fichiers, se souviendra des fichiers qui vous avez à différents endroits sans avoir besoin de se connecter \n- Graphe d\'usage des disques, indique où sont vos plus gros fichiers\n \n * NOTE : Cette application est en développement. Il y a encore BEAUCOUP de bugs. Si vous ne voulez pas rencontrer ces bugs, s\'il vous plait, ne téléchargez pas cette application. Si vous voulez m\'aider à trouver ces bugs, envoyez-moi un e-mail ou aidez-moi sur GitHib (https://github.com/BrandoCommando/OpenExplorer/). Une mauvaise note n\'aide personne.</string>
@@ -245,7 +245,7 @@
     <string name="button_translate">Traduire</string>
     <string name="httpError">Une erreur réseau s\'est produite.</string>
     <string name="httpErrorAuth">Échec de l\'authentification.</string>
-    <string name="httpErrorProxyAuth">Échec de l\'authentification via le serveur mandataire.</string>
+    <string name="httpErrorProxyAuth">Échec de l\'authentification via le serveur proxy. </string>
     <string name="httpErrorConnect">Échec de la connexion au serveur.</string>
     <string name="httpErrorIO">Impossible de communiquer avec le serveur. Veuillez réessayer ultérieurement.</string>
     <string name="httpErrorTimeout">Délai de connexion au serveur dépassé.</string>
@@ -290,15 +290,15 @@
     <string name="warn_text_editor">Bienvenue dans l\'éditeur de texte. Appuyez longuement sur le texte pour passer en mode édition.</string>
     <string name="warn_networking">Bienvenue dans l\'interface réseau. Veuillez noter que cette fonctionnalité est encore en développement et peut contenir des bugs. Merci de ne pas donner une note défavorable sur Google play si vous rencontrez un de ces bugs.</string>
     <string name="s_menu_new_file">Nouveau fichier texte</string>
-    <string name="s_msg_created" auto="1">créé</string>
+    <string name="s_msg_created">Créé</string>
     <string name="s_title_newfile">Nouveau Fichier</string>
     <string name="s_alert_newfile_folder">Créer un nouveau fichier dans :</string>
     <string name="s_alert_newfile">Saisir le nom du nouveau fichier :</string>
     <string name="s_alert_exit">Etes-vous sûr de vouloir quitter ?</string>
     <string name="s_alert_clipboard">Copié dans le presse-papiers</string>
     <string name="s_alert_restart">Redémarrage. Veuillez patienter.</string>
-    <string name="language" auto="1">Langue</string>
-    <string name="s_menu_download">Télécharger</string>
+    <string name="language">langue</string>
+    <string name="s_menu_download">télécharger</string>
     <string name="scan">Scanner</string>
     <string name="test">Tester</string>
     <string name="test_success">Connecté avec succès !</string>
@@ -308,7 +308,7 @@
     <string name="theme_dark">Interface sombre</string>
     <string name="theme_light">Interface claire</string>
     <string name="chooser_remember">Se souvenir de mon choix</string>
-    <string name="use_system">Utiliser le système >></string>
+    <string name="use_system">Utiliser le système &gt;&gt;</string>
     <string name="activity_resolver_use_always">Toujours</string>
     <string name="activity_resolver_use_once">Une seule fois</string>
     <string name="s_pref_bookmarks_summary">Afficher les signets</string>
@@ -317,12 +317,12 @@
     <string name="s_pref_view_folders">Préférences des dossiers</string>
     <string name="s_pref_view_general">Préférences globales</string>
     <string name="s_pref_text_wrap">Mettre en forme le texte</string>
-    <string name="s_pref_thumbs_crop">Tailler/Centrer les miniatures</string>
+    <string name="s_pref_thumbs_crop">Redimensionner/Centrer les miniatures</string>
     <string name="s_pref_thumbs_cache_clear">Vider le cache des miniatures</string>
     <string name="s_msg_folder_none">Le dossier n\'a pas pu être créé</string>
-    <string name="msg_nook_donate2">Bonjour utilisateur Nook ! J\'espère que vous appréciez Open Explorer pour Nook. J\'ai fait de mon mieux pour assurer la compatibilité avec les Nook. Grâce aux récents dons, j\'ai pu acheter un Nook Color ! Merci à tous ceux qui ont fait don ! \n \nPar la suite, je voudrais être en mesure d\'acheter la nouvelle génération du Nook HD. \n \nSi vous trouvez cette application utile, envisagez de faire un don, soit en sélectionnant le bouton ci-dessous, soit en sélectionnant l\'option "don" du menu. Merci, et bonne navigation !</string>
-    <string name="msg_bb_donate">Bonjour utilisateur de BlackBerry ! J\'espère que vous appréciez Open Explorer. J\'ai fait de mon mieux pour assurer une compatibilité avec les appareils BlackBerry. Cependant, il y a quelques différences qui sont difficiles à gérer sans posséder de BlackBerry. \nC\'est pourquoi, dans le but d\'améliorer la compatibilité, j\'essaie de recueillir suffisamment de dons afin de pouvoir acheter un BlackBerry 10. Si vous trouvez cette application utile, envisagez de faire un don, soit en sélectionnant le bouton ci-dessous, soit en sélectionnant l\'option "don" du menu. Merci, et bonne navigation !</string>
-    <string name="msg_donate">Bonjour utilisateur Android ! J\'espère que vous appréciez Open Explorer. J\'ai fait de mon mieux pour assurer une compatibilité avec les appareils Android. Toutefois, étant donné les rapports de bugs reçus, je ne peux que supposer qu\'il existe quelques différences entre les types d\'appareils. C\'est pourquoi, dans le but d\'éméliorer la compatibilité, j\'essaie de recueillir suffisamment de dons afin de pouvoir acheter quelques appareils Android. Si vous trouvez cette application utile, envisagez de faire un don, soit en sélectionnant le bouton ci-dessous, soit en sélectionnant l\'option "don" du menu. Merci, et bonne navigation !</string>
+    <string name="msg_nook_donate2">Bonjour utilisateur Nook ! J\'espère que vous appréciez Open Explorer pour Nook. J\'ai fait de mon mieux pour assurer la compatibilité avec les Nook. Grâce aux récents dons, j\'ai pu acheter un Nook Color ! Merci à tous ceux qui ont fait don ! \n \nPar la suite, je voudrais être en mesure d\'acheter la nouvelle génération du Nook HD. \n \nSi vous trouvez cette application utile, envisagez de faire un don, soit en sélectionnant le bouton ci-dessous, soit en sélectionnant l\'option &quot;don&quot; du menu. Merci, et bonne navigation !</string>
+    <string name="msg_bb_donate">Bonjour utilisateur de BlackBerry ! J\'espère que vous appréciez Open Explorer. J\'ai fait de mon mieux pour assurer une compatibilité avec les appareils BlackBerry. Cependant, il y a quelques différences qui sont difficiles à gérer sans posséder de BlackBerry. \nC\'est pourquoi, dans le but d\'améliorer la compatibilité, j\'essaie de recueillir suffisamment de dons afin de pouvoir acheter un BlackBerry 10. Si vous trouvez cette application utile, envisagez de faire un don, soit en sélectionnant le bouton ci-dessous, soit en sélectionnant l\'option &quot;don&quot; du menu. Merci, et bonne navigation !</string>
+    <string name="msg_donate">Bonjour cher utilisateur Android ! J\'espère que vous appréciez Open Explorer. J\'ai fait de mon mieux pour assurer une compatibilité avec les appareils Android. Toutefois, étant donné les rapports de bugs reçus, je ne peux que supposer qu\'il existe quelques différences entre les types d\'appareils. C\'est pourquoi, dans le but d\'éméliorer la compatibilité, j\'essaie de recueillir suffisamment de dons afin de pouvoir acheter quelques appareils Android. Si vous trouvez cette application utile, envisagez de faire un don, soit en sélectionnant le bouton ci-dessous, soit en \nsélectionnant l\'option &quot;don&quot; du menu. Merci, et bonne navigation !</string>
     <string name="s_privacy">Politique de confidentialité</string>
     <string name="s_menu_system_mount">Droit d\'écriture sur /system (Dangereux !)</string>
     <string name="s_menu_system_mount_on">Le système est accessible en écriture !</string>
@@ -332,39 +332,39 @@
     <string name="s_theme_lightdark">Stocker les paramètres de configuration des serveurs dans la zone de stockage privée. (Cocher cette option provoquera la suppression de la configuration des serveurs si l\'application est désinstallée. Si vous prévoyez une réinstallation, laissez cette option décochée afin d\'éviter ce désagrément.)</string>
     <string name="s_theme_custom">Rayures</string>
     <string name="s_menu_rate">Noter</string>
-    <string name="s_alert_destination_exists">existe déjà. Que voulez-vous faire ?</string>
+    <string name="s_alert_destination_exists">La destination existe déjà. Que voulez-vous faire ?</string>
     <string name="s_overwrite">Écraser</string>
     <string name="s_skip">Passer</string>
-    <string name="s_msg_file_exists">Certains fichiers de destination semblent déjà exister. Faut il les écraser ?</string>
+    <string name="s_msg_file_exists">Certains fichiers de destination semblent déjà exister. Les écraser ?</string>
     <string name="s_title_file_exists">Ce fichier existe déjà.</string>
     <string name="s_msg_pref_archives">Voulez-vous parcourir ou extraire l\'archive ?</string>
     <string name="s_browse">Parcourir</string>
     <string name="s_extract">Extraire</string>
-    <string name="s_extracted" auto="1">extrait</string>
+    <string name="s_extracted">Extraction finie</string>
     <string name="s_extracting">Extraction en cours</string>
-    <string name="s_extract_with" auto="1">Extraire avec ...</string>
+    <string name="s_extract_with">extraire avec...</string>
     <string name="s_title_archive_handler">Gestion des archives</string>
-    <string name="s_ask_again" auto="1">Demander à chaque fois</string>
+    <string name="s_ask_again">toujours demander</string>
     <string name="s_archives">Archives</string>
     <string name="s_compress">Compresser</string>
     <string name="s_compress_type">Type de compression</string>
     <string name="s_compressed">compressé</string>
     <string name="s_delete_after">Supprimer la source à la fin de l\'opération</string>
-    <string name="s_master_pass" auto="1">Mot de passe principal</string>
+    <string name="s_master_pass">mot de passe principal </string>
     <string name="s_master_pass_warning">Vous devez entrer un mot de passe principal, qui sera utilisé comme clé de chiffrement pour l\'ensemble des mots de passe stockés. Si vous laissez ce champ vide, les mots de passe seront quand même chiffrés, et le mot de passe principal par défaut sera utilisé. Notez que si vous mettez à jour votre mot de passe avec des mots de passe réseau enregistrés, vous aurez probablement besoin de réinitialiser les mots de passe et l\'authentification des serveurs cloud après avoir réinitialisé le mot de passe principal.</string>
     <string name="s_pass_old">Ancien mot de passe :</string>
     <string name="s_pass_new">Nouveau mot de passe :</string>
-    <string name="s_logout" auto="1">Déconnexion</string>
+    <string name="s_logout">déconnection</string>
     <string name="s_authenticate">Authentifier</string>
-    <string name="s_authenticating" auto="1">Authentification</string>
+    <string name="s_authenticating">authentification</string>
     <string name="s_bookmark_history">Historique</string>
     <string name="s_server_account_title">Compte :</string>
     <string name="s_authenticate_success">Authentification réussie</string>
-    <string name="s_authenticate_refresh" auto="1">Actualiser l\'authentification</string>
+    <string name="s_authenticate_refresh">Re-authentification</string>
     <string name="s_pref_thumbs_cache">Précharge les miniatures</string>
-    <string name="s_pref_thumbs_cache_summary" auto="1">Cela aidera à accélérer le chargement des dossiers contenant des photos et vidéos.</string>
-    <string name="s_folders" auto="1">dossiers</string>
-    <string name="s_hidden" auto="1">caché</string>
-    <string name="s_total" auto="1">total</string>
+    <string name="s_pref_thumbs_cache_summary">cela accellerera le chargement des dossiers photos et vidéos</string>
+    <string name="s_folders">Répertoires</string>
+    <string name="s_hidden">caché</string>
+    <string name="s_total">total</string>
     <string name="s_custom_account">Compte personnalisé</string>
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
old mode 100644
new mode 100755
index 3def0d80..4f7a9ba7
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
     <string name="app_name">עכככם</string>
     <string name="s_photos" auto="1">תמונות</string>
     <string name="s_videos" auto="1">וידאו</string>
@@ -74,11 +73,11 @@
     <string name="s_pref_server_type">סוג שרת</string>
     <string name="s_files" auto="1">קבצים</string>
     <string name="s_create" auto="1">ליצור</string>
-    <string name="s_title_holding_x_files" auto="1">החזקת קבצים  %s </string>
+    <string name="s_title_holding_x_files" formatted="false" auto="1">החזקת קבצים  %s </string>
     <string name="s_title_newfolder" auto="1">יצירת תיקיה חדשה</string>
-    <string name="s_title_send" auto="1">שלח  %s </string>
-    <string name="s_title_unzip" auto="1">Unzip  %s </string>
-    <string name="s_title_zip" auto="1">מיקוד  %s </string>
+    <string name="s_title_send" formatted="false" auto="1">שלח  %s </string>
+    <string name="s_title_unzip" formatted="false" auto="1">Unzip  %s </string>
+    <string name="s_title_zip" formatted="false" auto="1">מיקוד  %s </string>
     <string name="s_title_executing" auto="1">מבצע</string>
     <string name="s_title_deleting" auto="1">מחיקת</string>
     <string name="s_title_searching" auto="1">חיפוש</string>
@@ -87,10 +86,10 @@
     <string name="s_title_zipping" auto="1">רכס</string>
     <string name="s_title_unzipping" auto="1">פתחתי את רוכסן</string>
     <string name="s_title_wait" auto="1">אנא המתן ...</string>
-    <string name="s_alert_confirm_delete" auto="1">מחיקת %s לא ניתן לבטל. האם אתה בטוח שאתה רוצה להמשיך?</string>
+    <string name="s_alert_confirm_delete" formatted="false" auto="1">מחיקת %s לא ניתן לבטל. האם אתה בטוח שאתה רוצה להמשיך?</string>
     <string name="s_alert_rename" auto="1">אנא הקלד את השם החדש קובץ זה</string>
     <string name="s_alert_newfolder" auto="1">הקלד את השם של התיקייה שאתה רוצה ליצור.</string>
-    <string name="s_alert_unzip" auto="1">היית רוצה לפתוח %s כאן או תיקיה אחרת?</string>
+    <string name="s_alert_unzip" formatted="false" auto="1">היית רוצה לפתוח %s כאן או תיקיה אחרת?</string>
     <string name="s_button_unzip_here" auto="1">Unzip כאן</string>
     <string name="s_button_unzip_else" auto="1">Unzip במקום אחר ...</string>
     <string name="s_msg_none" auto="1">קובץ (ים) לא יכול להיות</string>
@@ -143,9 +142,9 @@
     <string name="s_menu_delete_all" auto="1">מחק הכל</string>
     <string name="s_menu_move_all" auto="1">העבר לכאן</string>
     <string name="s_menu_copy_all" auto="1">העתק לכאן</string>
-    <string name="s_confirm_delete" auto="1">האם אתה בטוח שברצונך למחוק  %s ?</string>
+    <string name="s_confirm_delete" formatted="false" auto="1">האם אתה בטוח שברצונך למחוק  %s ?</string>
     <string name="s_error_same_destination" auto="1">מדריך יעד זהה.</string>
-    <string name="s_sample_notification" auto="1">העתקה -&gt; sdcard:  n 3 קבצים</string>
+    <string name="s_sample_notification" auto="1">העתקה -&gt; sdcard: \n 3 קבצים</string>
     <string name="s_pref_fullscreen" auto="1">מסך מלא</string>
     <string name="s_pref_fullscreen_summary_on" auto="1">הסתר בר דיווח</string>
     <string name="s_pref_fullscreen_summary_off" auto="1">הצג את סרגל ההודעות</string>
@@ -212,6 +211,8 @@
     <string name="s_pref_fancy_menus" auto="1">פנסי תפריטים</string>
     <string name="s_pref_fancy_context" auto="1">הקשר תפריטים מהודרים</string>
     <string name="s_search_files" auto="1">חיפוש מערכת קבצים</string>
+    <string name="search_summary" formatted="false" auto="1">חיפוש &quot; %s &quot; \n בתוך &quot; %s &quot; (%d) ...</string>
+    <string name="search_results" formatted="false" auto="1">%תוצאות נמצאו ברה &quot; %s &quot; \n בתוך &quot; %s &quot;</string>
     <string name="s_menu_exit" auto="1">יציאה</string>
     <string name="s_warn_wtf_message" auto="1">אופס! נראה כי לא מטופל שגיאה אירעה! ככל שמדובר בעניין נפוץ Apps בטא רבות, הדרך היחידה לפתור בעיות אלה היא לקבל דיווחים מכשירים שונים, כמו שלך, כדי לקבוע כיצד לפתור את הבעיה. אנו עשויים לשלוח דו&quot;ח כזה, המכיל רק נתונים אנונימיים, למפתח?</string>
     <string name="s_warn_wtf_ps" auto="1">*** שימו לב, יישום זה הוא בטא. נא לא לתת את היישום הזה דירוג רע, פשוט משום שהוא מתרסק. פשוט להסיר את ההתקנה אם זה באמת מפריע לך. תודה!</string>
@@ -239,8 +240,8 @@
     <string name="menu_view_font_medium" auto="1">גודל גופן בינוני</string>
     <string name="menu_view_font_large" auto="1">גודל גופן גדול</string>
     <string name="app_description" auto="1">פתח את Internet Explorer - קוד פתוח מנהל קבצים עבור כל המכשירים! (לוחות הברית, טלפונים, טלוויזיות גוגל, כריכים!) \n-Complete קובץ מערכת ניהול \n-USB, SD ו מדיה חיצוניים אחרים \n-לחיבור רשת (FTP, SFTP, SMB / Samba / Windows / LAN / WIFI) \n - עורך טקסט \n חכם תיקיות, כי סריקה עבור סוגים שונים של מדיה (וידאו, תמונות, מוסיקה, הורדות) \n-צפה זימונית המדריך ניווט (מימין לסחוב לעלות המדריך) \n-משתמש על / root היכולת ברשימה / לקרוא תיקיות מערכת (המערכת לא לכתוב עדיין) \n \nFeatures הבאים: \n-כרטיסיות עורך טקסט \n-יכולת רשת יותר (Dropbox, Box.net, כונן שמים) \n-Offline מבנה קובץ המטמון, יזכרו אילו קבצים יש לך במקומות שונים, ללא צורך להתחבר \n-Disk חום המפה מראה מקום שבו הקבצים הגדולים ביותר הם \n \n * שים לב: App היא בגרסת ביתא. יש עדיין הרבה באגים. אם אתה לא רוצה לחוות את הבאגים, בבקשה אל תוריד את היישום הזה. אם תרצה לעזור לי למצוא את הבאגים, אנא שלח לי או לשתף פעולה עם אלי GitHub (https://github.com/BrandoCommando/OpenExplorer/). יש לזכור דירוגים רעים לעזור לאף אחד.</string>
-    <string name="alert_translate_google" auto="1">שלום, תרגום זה מסופק על ידי Google Translate. אם אתה יודע אנגלית, כמו גם%s, ואת רוצה לסייע במתן תרגום טוב יותר, אנא לחץ על הכפתור הזה:</string>
-    <string name="alert_translate_none" auto="1">שלום, נראה כי אתה משתמש בשפה לא נתמכת. האם אתה יודע אנגלית של %s? אם הייתם רוצים לסייע במתן התרגום הנכון, לחצו כאן:</string>
+    <string name="alert_translate_google" formatted="false" auto="1">שלום, תרגום זה מסופק על ידי Google Translate. אם אתה יודע אנגלית, כמו גם%s, ואת רוצה לסייע במתן תרגום טוב יותר, אנא לחץ על הכפתור הזה:</string>
+    <string name="alert_translate_none" formatted="false" auto="1">שלום, נראה כי אתה משתמש בשפה לא נתמכת. האם אתה יודע אנגלית של %s? אם הייתם רוצים לסייע במתן התרגום הנכון, לחצו כאן:</string>
     <string name="button_translate" auto="1">לתרגם</string>
     <string name="httpError">אירעה שגיאת רשת.</string>
     <string name="httpErrorAuth">האימות נכשל.</string>
@@ -297,5 +298,51 @@
     <string name="s_alert_clipboard" auto="1">להעתיק את הלוח</string>
     <string name="s_alert_restart" auto="1">הפעלה מחדש. אנא המתן.</string>
     <string name="language" auto="1">שפה</string>
-
-</resources>
\ No newline at end of file
+    <string name="msg_nook_donate2" auto="1">משתמש Nook שלום! אני מקווה שאתה נהנה מExplorer הפתוח ל- Nook. ניסיתי הכי הקשה שלי, כדי להבטיח תאימות עם מכשירי Nook גבוהים. הודות לתרומות האחרונות, הייתי מסוגל לרכוש צבע Nook! תודה לכל מי שתרם! \n \n בשלב בא, אני רוצה להיות מסוגל לרכוש מכשיר דור חדש HD-Nook. \n \n אם אתה מוצא את היישום זה שימושי, אנא שקול לתרום, על ידי בחירה בכל מקרה כפתור למטה, או על ידי הפעלת התפריט &quot;התרומה&quot; האפשרות. תודה לך, ולחקור מאושרים!</string>
+    <string name="msg_bb_donate" auto="1">שלום משתמש בלקברי! אני מקווה שאתה נהנה מExplorer הפתוח. ניסיתי הכי הקשה שלי, כדי להבטיח תאימות עם מכשירי BlackBerry גבוהים. עם זאת, יש כמה הבדלים נראה שקשה להתמודד ללא מכשיר BlackBerry בפועל. מסיבה זו, אני מנסה לאסוף מספיק תרומות כדי לקנות מכשיר BlackBerry 10 כדי לשפר את התאימות. אם אתה מוצא את היישום זה שימושי, אנא שקול לתרום, על ידי בחירה בכפתור למטה בשניהם, או על ידי הפעלת התפריט &quot;התרומה&quot; האפשרות. תודה לך, ולחקור מאושרים!</string>
+    <string name="msg_donate" auto="1">שלום משתמש אנדרואיד! אנו מקווים שתיהנו Explorer הפתוח. יש לנו ניסינו הכי הקשה שלנו, כדי להבטיח תאימות עם כל מכשירי אנדרואיד הגבוהים. עם זאת, בהתחשב בדיווחי באגים שהתקבלו, אנחנו יכולים רק להניח שיש סוגים שונים גרימת הבדלים בין נושאים ספציפיים. מסיבה זו, אנחנו מנסים לאסוף מספיק תרומות כדי לקנות כמה מכשירי Nexus כדי לשפר את התאימות. אם אתה מוצא את היישום זה שימושי, אנא שקול לתרום, על ידי בחירה בכפתור למטה בשניהם, או על ידי הפעלת התפריט &quot;התרומה&quot; האפשרות. תודה לך, ולחקור מאושרים!</string>
+    <string name="s_privacy" auto="1">מדיניות פרטיות</string>
+    <string name="s_menu_system_mount" auto="1">להפוך את המערכת / כתיבה על - מסוכן</string>
+    <string name="s_menu_system_mount_on" auto="1">המערכת ניתנת לכתיבה!</string>
+    <string name="s_menu_system_mount_off" auto="1">המערכת היא לקריאה בלבד.</string>
+    <string name="s_pref_servers_private" auto="1">שמור על שרתים פרטיים</string>
+    <string name="s_pref_servers_private_summary" auto="1">אחסן את הגדרות שרת באזור האחסון פרטי. זה יגרום להגדרות של שרת שיש להסירו אם בקשת הסרה. אם אתה מתקין מחדש בעתיד, ימנע השארה זה לא בדוק את זה.</string>
+    <string name="s_theme_lightdark" auto="1">אור וחושך</string>
+    <string name="s_theme_custom" auto="1">סיכת פסים</string>
+    <string name="s_menu_rate" auto="1">קצב</string>
+    <string name="s_alert_destination_exists" auto="1">יעד כבר קיים. מה היית רוצה לעשות?</string>
+    <string name="s_overwrite" auto="1">דרוס</string>
+    <string name="s_skip" auto="1">לדלג</string>
+    <string name="s_msg_file_exists" auto="1">חלק מקבצי היעד עשויים כבר קיימים. אישור כדי להחליף?</string>
+    <string name="s_title_file_exists" auto="1">קובץ כבר קיים.</string>
+    <string name="s_msg_pref_archives" auto="1">האם אתה רוצה לגלוש או לחלץ את הארכיון?</string>
+    <string name="s_browse" auto="1">לדפדף</string>
+    <string name="s_extract" auto="1">להוציא</string>
+    <string name="s_extracted" auto="1">חילוץ</string>
+    <string name="s_extracting" auto="1">חילוץ</string>
+    <string name="s_extract_with" auto="1">לחלץ עם ...</string>
+    <string name="s_title_archive_handler" auto="1">הנדלר ארכיון</string>
+    <string name="s_ask_again" auto="1">שאל בכל פעם</string>
+    <string name="s_archives" auto="1">ארכיון</string>
+    <string name="s_compress" auto="1">לדחוס</string>
+    <string name="s_compress_type" auto="1">סוג הדחיסה</string>
+    <string name="s_compressed" auto="1">דחוס</string>
+    <string name="s_delete_after" auto="1">מחק את המקור לאחר השלים</string>
+    <string name="s_master_pass" auto="1">מאסטר סיסמא</string>
+    <string name="s_master_pass_warning" auto="1">אתה יכול להזין את סיסמא המאסטר, המשמשת כמפתח הצפנה לכל סיסמות מאוחסנות. אם תשאיר שדה זה ריק, סיסמות עדיין תהיינה מוצפנות, וסיסמא המאסטר ברירת המחדל תהיה בשימוש. שים לב שאם אתה מעדכן את הסיסמה שלך עם סיסמות רשת מאוחסן, סביר להניח שתצטרך לאפס סיסמות ולאמת שרתי ענן לאחר איפוס סיסמא זו.</string>
+    <string name="s_pass_old" auto="1">הזן את הסיסמה ישנה:</string>
+    <string name="s_pass_new" auto="1">הזן את הסיסמה חדשה:</string>
+    <string name="s_logout" auto="1">יציאה</string>
+    <string name="s_authenticate" auto="1">לאמת</string>
+    <string name="s_authenticating" auto="1">מאמת</string>
+    <string name="s_bookmark_history" auto="1">ההיסטוריה</string>
+    <string name="s_server_account_title" auto="1">חשבון:</string>
+    <string name="s_authenticate_success" auto="1">אימות מוצלחת</string>
+    <string name="s_authenticate_refresh" auto="1">רעננה אימות</string>
+    <string name="s_pref_thumbs_cache" auto="1">תמונות מוקטנות מראש מטמון</string>
+    <string name="s_pref_thumbs_cache_summary" auto="1">זה יעזור להאיץ את טעינת תיקיות המכילות תמונות וסרטי וידאו.</string>
+    <string name="s_folders" auto="1">תיקיות</string>
+    <string name="s_hidden" auto="1">נסתר</string>
+    <string name="s_total" auto="1">סך הכל</string>
+    <string name="s_custom_account" auto="1">חשבון מותאם אישית</string>
+</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
new file mode 100755
index 00000000..18f85475
--- /dev/null
+++ b/res/values-hi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_menu_root_disabled">enable</string>
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
new file mode 100755
index 00000000..9102ec82
--- /dev/null
+++ b/res/values-hr/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="app_name">Open Explorer</string>
+    <string name="s_menu_favorites">Isključi/uključi oznake</string>
+    <string name="s_menu_sort">Poredaj</string>
+    <string name="s_menu_sort_name_asc">Poredaj po imenu (A-Z)</string>
+    <string name="s_menu_sort_name_desc">Poredaj po imenu (Z-A)</string>
+    <string name="s_menu_sort_date_asc">Poredaj od najnovijih</string>
+    <string name="s_menu_sort_date_desc">Poredaj od nastarijih</string>
+    <string name="s_menu_sort_size_asc">Poredaj od najvećih</string>
+    <string name="s_menu_sort_size_desc">Poredaj od najmanjih</string>
+    <string name="s_menu_sort_type">Poredaj po vrsti datoteke</string>
+    <string name="s_menu_multi">Višestruko označavanje</string>
+    <string name="s_menu_grid">Prikaz kao rešetka</string>
+    <string name="s_menu_list">Prikaz kao lista</string>
+    <string name="s_menu_hidden">Prikaži skrivene datoteke</string>
+    <string name="s_menu_new_folder">Nova mapa</string>
+    <string name="s_menu_other">Druge postavke</string>
+    <string name="back_button_label">Vrati </string>
+    <string name="next_button_label">Slijedeće</string>
+    <string name="no_matches">Nema podudaranja</string>
+    <string name="find_on_page">Traži na stranici</string>
+    <string name="find">Traži</string>
+    <string name="extract_edit_menu_button">Izmijeni</string>
+    <string name="activity_chooser_view_see_all">Pogledaj sve</string>
+    <string name="s_title_picker">Molimo odaberite direktorij</string>
+    <string name="selected_path">Odabrana putanja</string>
+    <string name="filename">Ime datoteke</string>
+    <string name="s_msg_saved">Spremljeno</string>
+    <string name="s_menu_view_line_numbers">Brojevi linija</string>
+    <string name="warn_text_editor">Dobrodošli u uređivač teksta. Molimo dulje držite pritisnut tekst kako bi ušli u podsustav Uređivanje.</string>
+    <string name="warn_networking">Dobrodošli u mrežnu komunikaciju. Molimo imajte na umu da je ova značajka još u razvoju pa će možda biti pogrešaka. Molimo Vas da na stranici trgovine ne označavate lošom ocjenom ukoliko naiđete na jednu od grešaka.</string>
+    <string name="s_menu_new_file">Nova tekstualna datoteka</string>
+    <string name="s_msg_created">Stvoreno</string>
+    <string name="s_title_newfile">Nova datoteka</string>
+    <string name="language">Jezik</string>
+</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
old mode 100644
new mode 100755
index 5937ba2b..bd4715c2
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
     <string name="app_name">Open Explorer</string>
     <string name="s_photos">Fotók</string>
     <string name="s_videos">Videók</string>
@@ -74,7 +73,7 @@
     <string name="s_pref_server_type">Szerver típusa</string>
     <string name="s_files">Fájlok</string>
     <string name="s_create">Létrehozás</string>
-    <string name="s_title_holding_x_files">%s fájlt tartalmaz</string>
+    <string name="s_title_holding_x_files" formatted="false">%s fájlt tartalmaz</string>
     <string name="s_title_newfolder">Új mappa létrehozása</string>
     <string name="s_title_send">Küld xxx</string>
     <string name="s_title_unzip">Kicsomagol xxx</string>
@@ -87,10 +86,10 @@
     <string name="s_title_zipping">Becsomagolás</string>
     <string name="s_title_unzipping">Kicsomagolás</string>
     <string name="s_title_wait">Kérem várjon...</string>
-    <string name="s_alert_confirm_delete">Törölt %s nem visszaállítható! Biztosan folytatja?</string>
+    <string name="s_alert_confirm_delete" formatted="false">Törölt %s nem visszaállítható! Biztosan folytatja?</string>
     <string name="s_alert_rename">Kérem, adja meg az állomány új nevét!</string>
     <string name="s_alert_newfolder">Kérem, adja meg a létrehozandó mappa nevét!</string>
-    <string name="s_alert_unzip">Ide szeretné kicsomagolni a(z) %s -(oka)t, vagy egy másik mappába?</string>
+    <string name="s_alert_unzip" formatted="false">Ide szeretné kicsomagolni a(z) %s -(oka)t, vagy egy másik mappába?</string>
     <string name="s_button_unzip_here">Kicsomagolás ide</string>
     <string name="s_button_unzip_else">Kicsomagolás máshova...</string>
     <string name="s_msg_none">A fájl(oka)t nem lehet</string>
@@ -124,7 +123,7 @@
     <string name="s_pref_start_summary">Ez legyen az OpenExplorer alapértelmezetten megjelenített mappája</string>
     <string name="s_custom">Egyedi...</string>
     <string name="s_text_intro_top">Az OpenExplorer üdvözli Önt!</string>
-    <string name="s_text_intro_body">Az OpenExplorer célja, hogy hatékonyabbá tegye a fájl-szintű műveleteket az Android OS fájlrendszerében és a felhőben. Akár a több helyen fellelhető videóit, fotóit szeretné rendszerezni, akár a különböző tárhelyeit, távoli webszervereit szeretné menedzselni, az OpenExplorer segít Önnek ebben.
\n
\nKérjük, válassza ki az alapértelmezett mappát!</string>
+    <string name="s_text_intro_body">Az OpenExplorer célja, hogy hatékonyabbá tegye a fájl-szintű műveleteket az Android OS fájlrendszerében és a felhőben. Akár a több helyen fellelhető videóit, fotóit szeretné rendszerezni, akár a különböző tárhelyeit, távoli webszervereit szeretné menedzselni, az OpenExplorer segít Önnek ebben.\n\nKérjük, válassza ki az alapértelmezett mappát!</string>
     <string name="s_info_num_folders">Mappák száma:</string>
     <string name="s_info_num_files">Fájlok száma:</string>
     <string name="s_info_last_modified">Utoljára módosítva:</string>
@@ -143,7 +142,7 @@
     <string name="s_menu_delete_all">Összes törlése</string>
     <string name="s_menu_move_all">Mozgatás ide...</string>
     <string name="s_menu_copy_all">Másolád ide...</string>
-    <string name="s_confirm_delete">Biztos benne, hogy törli ez(eke)t a %s -(oka)t?</string>
+    <string name="s_confirm_delete" formatted="false">Biztos benne, hogy törli ez(eke)t a %s -(oka)t?</string>
     <string name="s_error_same_destination">A célkönyvtár azonos!</string>
     <string name="s_sample_notification">Másolás -&gt; SD kártyára: 3 fájl</string>
     <string name="s_pref_fullscreen">Teljes képernyő</string>
@@ -238,9 +237,9 @@
     <string name="menu_view_font_small">Kis betűméret</string>
     <string name="menu_view_font_medium">Közepes betűméret</string>
     <string name="menu_view_font_large">Nagy betűméret</string>
-    <string name="app_description">Open Explorer - nyílt forrású fájl menedzser minden eszközre! (Tábla PC-k, okostelefonok, Google TV-k, Android szendvicsek (ICS)!)
\n- teljes fájlrendszer menedzsment
\n- USB, SD kártya és egyéb külső adathordozók támogatása
\n- hálózat és szerver menedzsment (FTP, SecureFTP, SMB/Samba/Windows/LAN/WiFi)
\n- beépített szövegszerkesztő
\n- &quot;okos mappák&quot; a különböző médiatartalmak (videók, fotók, zenék, dokumentumok) jobb átláthatóságához
\n- &quot;csúsztatás böngészés&quot; a mappák közötti navigáláshoz (pl.: swipe-polás/csúsztatás jobb irányba egy szinttel feljebb lép)
\n- Superuser(Su)/Root hozzáférés a rendszermappák listázásához/olvasásához (az írási képesség még fejlesztés alatt)
\n
\nFunkciók fejlesztés alatt:
\n- &quot;többfüles&quot; szövegszerkesztő
\n- még nagyobb hálózatkezelési képesség (Dropbox, Box.net, SkyDrive)
\n- offline fájlrendszer cache, mely megjegyzi, milyen fájlokkal rendelkezik a távoli szervereken/tárhelyeken, a felhőben
\n- lemezkapacitás hőtérképes elemzése, mely megmutatja, hol találhatóak a nagyméretű fájlok az egyes adathordozókon
\n
\n*MEGJEGYZÉS: Ez az alkalmazás még béta állapotú! Egyelőre több hibát is tartalmaz. Ha nem szeretne az esetleges hibajelenségekkel találkozni, kérjük, ne töltse ezt az alkalmazást! Ha szeretne segíteni megtalálni a hibákat, és ezáltal tökéletesíteni az alkalmazást, úgy kérem írjon nekem emailt, vagy dolgozzon együtt velem a GitHub-on (https://github.com/BrandoCommando/OpenExplorer/). Kérem, vegye figyelembe, hogy a negatív értékelés önmagában nem segítség! Köszönöm!</string>
-    <string name="alert_translate_google">Üdvözöljük! Ez a fordítás a Google Translate-tel készült. Ha beszél angolul és %s -ul, és szeretne segíteni a fordítás javításában, kipontosításában, kérjük, kattintson ide:</string>
-    <string name="alert_translate_none">Üdvözöljük! Úgy tűnik, nem támogatott nyelvet használ. Beszél Ön angolul és %s -ul? Ha szeretne segíteni a fordításban, vagy annak javításában, kipontosításában, kérjük, kattintson ide:</string>
+    <string name="app_description">Open Explorer - nyílt forrású fájl menedzser minden eszközre! (Tábla PC-k, okostelefonok, Google TV-k, Android szendvicsek (ICS)!)\n- teljes fájlrendszer menedzsment\n- USB, SD kártya és egyéb külső adathordozók támogatása\n- hálózat és szerver menedzsment (FTP, SecureFTP, SMB/Samba/Windows/LAN/WiFi)\n- beépített szövegszerkesztő\n- &quot;okos mappák&quot; a különböző médiatartalmak (videók, fotók, zenék, dokumentumok) jobb átláthatóságához\n- &quot;csúsztatás böngészés&quot; a mappák közötti navigáláshoz (pl.: swipe-polás/csúsztatás jobb irányba egy szinttel feljebb lép)\n- Superuser(Su)/Root hozzáférés a rendszermappák listázásához/olvasásához (az írási képesség még fejlesztés alatt)\n\nFunkciók fejlesztés alatt:\n- &quot;többfüles&quot; szövegszerkesztő\n- még nagyobb hálózatkezelési képesség (Dropbox, Box.net, SkyDrive)\n- offline fájlrendszer cache, mely megjegyzi, milyen fájlokkal rendelkezik a távoli szervereken/tárhelyeken, a felhőben\n- lemezkapacitás hőtérképes elemzése, mely megmutatja, hol találhatóak a nagyméretű fájlok az egyes adathordozókon\n\n*MEGJEGYZÉS: Ez az alkalmazás még béta állapotú! Egyelőre több hibát is tartalmaz. Ha nem szeretne az esetleges hibajelenségekkel találkozni, kérjük, ne töltse ezt az alkalmazást! Ha szeretne segíteni megtalálni a hibákat, és ezáltal tökéletesíteni az alkalmazást, úgy kérem írjon nekem emailt, vagy dolgozzon együtt velem a GitHub-on (https://github.com/BrandoCommando/OpenExplorer/). Kérem, vegye figyelembe, hogy a negatív értékelés önmagában nem segítség! Köszönöm!</string>
+    <string name="alert_translate_google" formatted="false">Üdvözöljük! Ez a fordítás a Google Translate-tel készült. Ha beszél angolul és %s -ul, és szeretne segíteni a fordítás javításában, kipontosításában, kérjük, kattintson ide:</string>
+    <string name="alert_translate_none" formatted="false">Üdvözöljük! Úgy tűnik, nem támogatott nyelvet használ. Beszél Ön angolul és %s -ul? Ha szeretne segíteni a fordításban, vagy annak javításában, kipontosításában, kérjük, kattintson ide:</string>
     <string name="button_translate">Fordítás</string>
     <string name="httpError">Hálózati hiba jelentkezett!</string>
     <string name="httpErrorAuth">A hitelesítés sikertelen volt!</string>
@@ -281,5 +280,4 @@
     <string name="storage_usb">USB adathordozó</string>
     <string name="extract_edit_menu_button">Szerkesztés...</string>
     <string name="activity_chooser_view_see_all">Összes megtekintése...</string>
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
new file mode 100755
index 00000000..992aeb2c
--- /dev/null
+++ b/res/values-in/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="app_name">t</string>
+    <string name="s_menu_exit">o</string>
+    <string name="warn_networking">Good</string>
+</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
new file mode 100755
index 00000000..b34569ba
--- /dev/null
+++ b/res/values-is/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="warn_text_editor">What gives?</string>
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
old mode 100644
new mode 100755
index 13bd00ba..72b4f66a
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
     <string name="app_name">Open Explorer</string>
     <string name="s_photos">Foto</string>
     <string name="s_videos">Video</string>
@@ -10,7 +9,7 @@
     <string name="s_internal">Interna</string>
     <string name="s_view">Vista</string>
     <string name="s_bookmarks">Preferiti</string>
-    <string name="s_menu_favorites">Cambia preferiti</string>
+    <string name="s_menu_favorites">Alterna preferiti</string>
     <string name="s_menu_sort">Ordina</string>
     <string name="s_menu_sort_name_asc">Ordina per nome (A-Z)</string>
     <string name="s_menu_sort_name_desc">Ordina per nome (Z-A)</string>
@@ -40,7 +39,7 @@
     <string name="s_menu_zip">Comprimi file (zip)...</string>
     <string name="s_menu_unzip">Decomprimi file (unzip)...</string>
     <string name="s_menu_rename">Rinomina...</string>
-    <string name="s_menu_bookmark">Aggiungi preferito</string>
+    <string name="s_menu_bookmark">Aggiungi Preferito</string>
     <string name="s_save">Salva</string>
     <string name="s_saveas">Salva come...</string>
     <string name="s_cancel">Annulla</string>
@@ -54,27 +53,27 @@
     <string name="s_pref_thumbs">Mostra anteprima immagini</string>
     <string name="s_pref_thumbs_summary">Mostra anteprima per file immagine/video/apk</string>
     <string name="s_pref_view">Modalità vista</string>
-    <string name="s_pref_view_summary">Mostra file in un carosello (solo Android 3.0+), lista o griglia</string>
-    <string name="s_pref_sort">Ordinazione</string>
+    <string name="s_pref_view_summary">Mostra file in una griglia, lista o carosello (solo Android 3.0+), </string>
+    <string name="s_pref_sort">Ordinamento</string>
     <string name="s_pref_sort_summary">Scegli come ordinare file e cartelle</string>
     <string name="s_pref_advanced">Avanzate</string>
     <string name="s_pref_server_name">Nome server</string>
     <string name="s_pref_server_name_summary">Inserisci il nome del server</string>
-    <string name="s_pref_server_url">URL server</string>
+    <string name="s_pref_server_url">URL Server</string>
     <string name="s_pref_server_url_summary">Inserisci l\'URL completo del server</string>
-    <string name="s_pref_server_host">Host server</string>
+    <string name="s_pref_server_host">Host Server</string>
     <string name="s_pref_server_user">Utente</string>
     <string name="s_pref_server_user_summary">Nome utente</string>
     <string name="s_pref_server_password">Password</string>
-    <string name="s_pref_server_password_summary">Password di login</string>
-    <string name="s_pref_server_path">Sottodirectory</string>
+    <string name="s_pref_server_password_summary">Password di Accesso</string>
+    <string name="s_pref_server_path">Sottocartella</string>
     <string name="s_pref_server_path_summary">Inserisci il percorso predefinito di login</string>
     <string name="s_pref_server_extras">Impostazioni extra</string>
     <string name="s_pref_server_update">Aggiungi/Aggirona server</string>
     <string name="s_pref_server_type">Tipo server</string>
     <string name="s_files">File</string>
     <string name="s_create">Crea</string>
-    <string name="s_title_holding_x_files" auto="1">Tenendo Files %s</string>
+    <string name="s_title_holding_x_files" formatted="false">Trattenedo i file %s</string>
     <string name="s_title_newfolder">Crea una nuova cartella</string>
     <string name="s_title_send">Invia xxx</string>
     <string name="s_title_unzip">Decomprimi xxx</string>
@@ -83,19 +82,19 @@
     <string name="s_title_deleting">Cancellazione</string>
     <string name="s_title_searching">Ricerca</string>
     <string name="s_title_moving">Spostamento</string>
-    <string name="s_title_copying">Copiamento</string>
+    <string name="s_title_copying">Copiatura</string>
     <string name="s_title_zipping">Compressione</string>
     <string name="s_title_unzipping">Decompressione</string>
     <string name="s_title_wait">Attendi...</string>
-    <string name="s_alert_confirm_delete">L\'eliminazione non può essere annullata. Sei sicuro di volere continuare?</string>
+    <string name="s_alert_confirm_delete" formatted="false">L\'eliminazione di %s non può essere annullata. Sei sicuro di volere continuare?</string>
     <string name="s_alert_rename">Inserisci il nuovo nome del file</string>
     <string name="s_alert_newfolder">Inserisci il nome della cartella che vuoi creare</string>
-    <string name="s_alert_unzip">Vuoi decomprimere qui o in altre cartelle?</string>
+    <string name="s_alert_unzip" formatted="false">Vuoi decomprimere %s qui o in altre cartelle?</string>
     <string name="s_button_unzip_here">Decomprimi qui</string>
     <string name="s_button_unzip_else">Decomprimi ovunque...</string>
     <string name="s_msg_none">I file non possono essere </string>
     <string name="s_msg_some">Alcuni file non possono essere</string>
-    <string name="s_msg_all" auto="1">File (s) con successo</string>
+    <string name="s_msg_all">File con successo</string>
     <string name="s_msg_deleted">eliminati</string>
     <string name="s_msg_moved">spostati</string>
     <string name="s_msg_copied">copiati</string>
@@ -124,133 +123,135 @@
     <string name="s_pref_start_summary">Indica in che cartella si apre Open Explorer</string>
     <string name="s_custom">Personalizza...</string>
     <string name="s_text_intro_top">Benvenuto in Open Explorer!</string>
-    <string name="s_text_intro_body">L \'obbiettivo di OpenExplorer è di aumentare al produttività del filesystem di Android e nel cloud. se necessitate di gestire video o foto da più punti o il vostro server web via FTP, OpenExplorer fa al caso vostro.
\n
\nSelezionare la cartella iniziale</string>
+    <string name="s_text_intro_body">L\'obbiettivo di OpenExplorer è di aumentare la produttività con il filesystem di Android ed il cloud. Sia che abbiate bisogno di gestire video o foto da più fonti o di gestire il vostro server web in remoto via FTP, OpenExplorer fa al caso vostro.\n\nSelezionare il percorso iniziale:</string>
     <string name="s_info_num_folders">Numero di cartelle:</string>
-    <string name="s_info_num_files">Numero di file: </string>
+    <string name="s_info_num_files">Numero di file:</string>
     <string name="s_info_last_modified" auto="1">Ultima modifica:</string>
-    <string name="s_info_permissions" auto="1">File Autorizzazioni:</string>
+    <string name="s_info_permissions">Permessi del File:</string>
     <string name="s_info_permission_read">Leggi :</string>
     <string name="s_info_permission_write">Scrivi :</string>
     <string name="s_info_permission_execute">Esegui :</string>
     <string name="s_toggle_keyboard">Tastiera</string>
     <string name="s_show_password">Mostra Password </string>
     <string name="s_error_ftp">Errore connessione Rete</string>
-    <string name="s_prompt_zip" auto="1">Inserisci il nome del nuovo file Zip:</string>
-    <string name="app_edit" auto="1">Modifica con OpenExplorer</string>
-    <string name="s_menu_more">Ulteriori Opzioni</string>
+    <string name="s_prompt_zip">Inserisci il nome del nuovo file .zip:</string>
+    <string name="app_edit">Modifica con Open Explorer</string>
+    <string name="s_menu_more">Altre opzioni...</string>
     <string name="s_msg_low_memory" auto="1">Memoria insufficiente!</string>
     <string name="s_clear" auto="1">Cancella</string>
     <string name="s_menu_delete_all">Cancella Tutto</string>
-    <string name="s_menu_move_all">Muovi Qui</string>
+    <string name="s_menu_move_all">Sposta Qui</string>
     <string name="s_menu_copy_all">Copia Qui</string>
-    <string name="s_confirm_delete" auto="1">Sei sicuro di voler cancellare %s?</string>
-    <string name="s_error_same_destination" auto="1">La directory di destinazione è la stessa.</string>
-    <string name="s_sample_notification" auto="1">Copia -&gt; SDCard:  n 3 Files</string>
+    <string name="s_confirm_delete" formatted="false">Sei sicuro di voler cancellare %s ?</string>
+    <string name="s_error_same_destination">La cartella di destinazione è la stessa.</string>
+    <string name="s_sample_notification">Copia in -&gt; SDCard:  3 Files</string>
     <string name="s_pref_fullscreen" auto="1">Schermo intero</string>
-    <string name="s_pref_fullscreen_summary_on" auto="1">Nascondi barra di notifica</string>
-    <string name="s_pref_fullscreen_summary_off" auto="1">Mostra barra di notifica</string>
-    <string name="s_pref_pagers" auto="1">Visualizza Pagers</string>
+    <string name="s_pref_fullscreen_summary_on">Nascondi la barra di notifica</string>
+    <string name="s_pref_fullscreen_summary_off">Mostra la barra di notifica</string>
+    <string name="s_pref_pagers"> visualizza pagine</string>
     <string name="s_pref_pagers_summary_on">Swype orizzontale = directory di navigazione </string>
-    <string name="s_pref_pagers_summary_off" auto="1">Orizzontali disabili strisciata</string>
-    <string name="s_alert_new_media" auto="1">New Media inserito!</string>
-    <string name="s_warn_pager_title" auto="1">New Feature: Pagers View</string>
-    <string name="s_warn_pager" auto="1">Swipe sinistra a destra per salire una directory e da destra a sinistra per tornare indietro. Questo dovrebbe rendere più facile da navigare. Provalo (su supporti esterni)!</string>
-    <string name="s_warn_confirm" auto="1">Avete capito?</string>
+    <string name="s_pref_pagers_summary_off">Swiping orizzontale disattivato</string>
+    <string name="s_alert_new_media">Nuovo Media Inserito</string>
+    <string name="s_warn_pager_title"> Nuova caratteristica: Visualizzare le pagine</string>
+    <string name="s_warn_pager">Swipe sinistra a destra per salire una directory e da destra a sinistra per tornare indietro. Questo dovrebbe rendere più facile la navigazione. Provalo (su supporti esterni)!</string>
+    <string name="s_warn_confirm">Hai capito?</string>
     <string name="s_warn_disable" auto="1">Disabilita</string>
     <string name="s_pref_intent_internal" auto="1">Intenti interni</string>
-    <string name="s_pref_intent_internal_on" auto="1">Utilizzare Gestione Intent OpenExplorer</string>
-    <string name="s_pref_intent_internal_off" auto="1">Usare l\'intenzione e il Gestore di sistema</string>
-    <string name="s_pref_text_internal" auto="1">Utilizzare l\'editor interno di testo</string>
+    <string name="s_pref_intent_internal_on">Utilizza Intent OpenExplorer Manager</string>
+    <string name="s_pref_intent_internal_off">Usare il gestore Intenti di sistema</string>
+    <string name="s_pref_text_internal">Usa l\'editor di testo interno </string>
     <string name="s_text_editor_title" auto="1">Editor di testo</string>
-    <string name="s_pref_show_root" auto="1">Visualizza file system root (/)</string>
-    <string name="s_pref_show_internal" auto="1">Mostra supporti interni</string>
-    <string name="s_pref_show_external" auto="1">Mostra di supporti esterni</string>
-    <string name="s_error_no_media" auto="1">Sembra che non vi è inserito alcun supporto. Si prega di disattivare la condivisione USB o re-inserimento dei media.</string>
+    <string name="s_pref_show_root">Visualizza root (/) del file system </string>
+    <string name="s_pref_show_internal">Mostra Media interni</string>
+    <string name="s_pref_show_external">Mostra supporti esterni</string>
+    <string name="s_error_no_media">Sembra che non sia inserito alcun supporto di memoria. Si prega di disattivare la condivisione USB o provare a re-inserire i supporti.</string>
     <string name="s_prompt_password" auto="1">Immettere la password</string>
-    <string name="s_add" auto="1">Aggiungere</string>
+    <string name="s_add">Aggiungi </string>
     <string name="s_server_ftp" auto="1">FTP</string>
     <string name="s_server_sftp" auto="1">SFTP</string>
     <string name="s_pref_server_port" auto="1">Porta</string>
-    <string name="s_about_buildtime" auto="1">Costruire Data</string>
+    <string name="s_about_buildtime">Data di build</string>
     <string name="s_default" auto="1">Predefinito</string>
     <string name="s_pref_timeout" auto="1">Timeout</string>
     <string name="s_pref_timeout_summary" auto="1">Timeout in secondi</string>
     <string name="s_menu_up">Sali</string>
-    <string name="s_prompt_unzip" auto="1">Immettere il percorso per decomprimere in:</string>
+    <string name="s_prompt_unzip">Immettere il percorso in cui decomprimere:</string>
     <string name="s_pref_hardware_accel" auto="1">Attivare l\'accelerazione hardware</string>
-    <string name="s_pref_honeyplus" auto="1">Android 3.0 + Settings</string>
-    <string name="s_pref_actionmode" auto="1">Modalità di azione</string>
-    <string name="s_pref_actionmode_enabled" auto="1">Utilizzare la modalità d\'azione</string>
-    <string name="s_pref_actionmode_disabled" auto="1">Utilizzare menu di scelta rapida standard</string>
-    <string name="s_server_smb" auto="1">SMB / Windows</string>
-    <string name="s_bookmark_drives" auto="1">Unità</string>
-    <string name="s_bookmark_smart" auto="1">Cartelle smart</string>
+    <string name="s_pref_honeyplus">Impostazioni Android 3.0 +</string>
+    <string name="s_pref_actionmode">Modalità Azione</string>
+    <string name="s_pref_actionmode_enabled">Utilizzare la modalità &quot;azione&quot;</string>
+    <string name="s_pref_actionmode_disabled">Utilizzare menu di scelta rapida</string>
+    <string name="s_server_smb">SMB / Finestre</string>
+    <string name="s_bookmark_drives">Drives</string>
+    <string name="s_bookmark_smart">Smart Folders</string>
     <string name="s_bookmark_favorites" auto="1">Preferiti</string>
     <string name="s_bookmark_servers" auto="1">Servers</string>
     <string name="s_bookmark_cache" auto="1">Cache</string>
-    <string name="s_info_totalspace" auto="1">Spazio su disco totale:</string>
+    <string name="s_info_totalspace">Spazio totale su disco:</string>
     <string name="s_info_freespace" auto="1">Spazio libero su disco:</string>
-    <string name="s_status_rate" auto="1">Rate:</string>
+    <string name="s_status_rate">Valuta:</string>
     <string name="s_about_hardware" auto="1">Hardware</string>
     <string name="s_menu_refresh">Aggiorna Cartella</string>
-    <string name="s_pref_reset" auto="1">Ripristina Visto</string>
+    <string name="s_pref_reset">Ripristina Vista</string>
     <string name="s_toast_complete" auto="1">Operazione completata!</string>
-    <string name="s_pref_reset_summary" auto="1">Clicca qui per rimuovere tutte le cartelle specifiche impostazioni di visualizzazione, ritornando ad uno stato di default.</string>
+    <string name="s_pref_reset_summary">Per ripristinare la modalità di default di visualizzazione delle cartelle Clicca Qui</string>
     <string name="s_prompt_path" auto="1">Immettere il percorso:</string>
     <string name="s_prompt_search" auto="1">Cerca:</string>
     <string name="s_prompt_search_within" auto="1">Cerca all\'interno:</string>
-    <string name="s_pref_view_category" auto="1">Bookmark preferenze di visualizzazione</string>
+    <string name="s_pref_view_category">Preferenze di visualizzazione dei segnalibri</string>
     <string name="s_pref_show_videos" auto="1">Mostra Video</string>
-    <string name="s_pref_show_photos" auto="1">Mostra foto</string>
+    <string name="s_pref_show_photos">Mostra Foto</string>
     <string name="s_pref_show_music" auto="1">Mostra Musica</string>
-    <string name="s_pref_show_downloads" auto="1">Mostra Downloads</string>
-    <string name="s_hide" auto="1">Nascondere</string>
+    <string name="s_pref_show_downloads">Mostra scaricati</string>
+    <string name="s_hide">Nascondi</string>
     <string name="s_show" auto="1">Mostra</string>
-    <string name="s_msg_event_cancelled" auto="1">Evento annullato.</string>
+    <string name="s_msg_event_cancelled">Azione annullata.</string>
     <string name="s_alert_newfolder_folder" auto="1">Crea nuova cartella in:</string>
-    <string name="s_pref_fancy_category" auto="1">Impostazioni di visualizzazione Fantasia</string>
-    <string name="s_pref_fancy_menus" auto="1">Menù Fantasia</string>
-    <string name="s_pref_fancy_context" auto="1">Menu di scelta rapida Fantasia</string>
-    <string name="s_search_files" auto="1">Cerca Filesystem</string>
+    <string name="s_pref_fancy_category">Impostazioni di visualizzazione particolari</string>
+    <string name="s_pref_fancy_menus">Menu Fantasia</string>
+    <string name="s_pref_fancy_context">Menu di scelta rapida particolare</string>
+    <string name="s_search_files">Cerca nel Filesystem</string>
+    <string name="search_summary" formatted="false">Ricerca di &quot; %s &quot; con &quot; %s &quot; (%d)...</string>
+    <string name="search_results" formatted="false">Trovati %d risultati per &quot; %s &quot; con &quot; %s &quot;</string>
     <string name="s_menu_exit">Esci</string>
-    <string name="s_warn_wtf_message" auto="1">Oops! Sembra che un errore non gestito si è verificato! Poiché questo è un problema comune in molte applicazioni Beta, l\'unico modo per risolvere questi problemi è quello di ricevere segnalazioni anche da diversi dispositivi, come la vostra, al fine di determinare come risolvere il problema. Possiamo inviare tale relazione, che contiene solo dati anonimi, per lo sviluppatore?</string>
-    <string name="s_warn_wtf_ps" auto="1">*** Si prega di notare, questa applicazione è in Beta. Si prega di non dare questa applicazione una valutazione negativa, semplicemente perché si blocca. Basta disinstallare se cosa vi preoccupa veramente. Grazie!</string>
+    <string name="s_warn_wtf_message">Oops! Sembra si sia verificato un errore non gestibile! Essendo questo un problema comune delle applicazioni in beta, l\'unico modo di risolvere questi problemi è avere riscontri da diversi dispositivi, come il tuo, per determinare come aggiustare il problema. Possiamo inviare un rapporto, contente solo dati anonimi, allo sviluppatore?</string>
+    <string name="s_warn_wtf_ps">*** Si prega di notare che questa applicazione é in formato Beta. Per favore non dare a questa applicazione una valutazione negativa semplicemente perché non funziona come dovrebbe. Semplicemente disinstallala se ti disturba. Grazie!</string>
     <string name="s_yes" auto="1">Sì</string>
     <string name="s_no" auto="1">No</string>
-    <string name="s_wtf_preview" auto="1">Anteprima del report dei dati</string>
+    <string name="s_wtf_preview">Anteprima della segnalazione dati</string>
     <string name="s_wtf_remember" auto="1">Non chiedere di nuovo</string>
-    <string name="s_pref_basebar" auto="1">Split Bar Action</string>
-    <string name="s_pref_basebar_on" auto="1">I pulsanti di azione sul fondo dello schermo in modalità Ritratto</string>
-    <string name="s_pref_basebar_off" auto="1">I pulsanti di azione sulla parte superiore dello schermo (ove disponibili)</string>
-    <string name="s_pref_autowtf" auto="1">Auto-send Crash Reports</string>
-    <string name="s_pref_autowtf_summary" auto="1">Quando si verifica un\'eccezione non gestita, invia automaticamente report.</string>
+    <string name="s_pref_basebar">Dividi la barra di azione</string>
+    <string name="s_pref_basebar_on">Pulsanti di azione sul fondo dello schermo in modalità verticale</string>
+    <string name="s_pref_basebar_off">Pulsanti di azione sulla parte superiore dello schermo (quando disponibile)</string>
+    <string name="s_pref_autowtf">Invia automaticamente i Crash Reports</string>
+    <string name="s_pref_autowtf_summary">Quando si verifica un\'eccezione non gestita, invia automaticamente un rapporto.</string>
     <string name="s_split_auto" auto="1">Automatico</string>
-    <string name="s_split_top" auto="1">Pulsanti di forzare la Top</string>
+    <string name="s_split_top">Forza i pulsanti verso l\'alto</string>
     <string name="s_split_top_single" auto="1">Forza unico pulsante in alto</string>
-    <string name="s_split_bottom" auto="1">Pulsanti di forza verso il basso</string>
-    <string name="s_split_none" auto="1">Mettere tutti i tasti nel menu Sistema</string>
+    <string name="s_split_bottom">Forza i pulsanti verso il basso</string>
+    <string name="s_split_none">Mettere tutti i tasti nel menu di Sistema</string>
     <string name="s_about_screensize" auto="1">Dimensioni dello schermo</string>
     <string name="s_about_density" auto="1">Densità</string>
     <string name="s_menu_location_int">Cartella Memoria Interna </string>
     <string name="s_menu_location_ext">Cartella Memoria Esterna </string>
-    <string name="s_wtf_context" auto="1">Si prega di descrivere contesto di caduta:</string>
+    <string name="s_wtf_context">Si prega di descrivere il contesto del crash:</string>
     <string name="thanks" auto="1">Grazie!</string>
     <string name="menu_view_font_small">Caratteri Piccoli</string>
     <string name="menu_view_font_medium">Caratteri  Medi</string>
     <string name="menu_view_font_large">Caratteri Grandi</string>
-    <string name="app_description" auto="1">Apri Explorer - Open file manager di origine per tutti i dispositivi! (Compresse, telefoni, televisori Google, panini!)  N-completo file di sistema di gestione  n-USB, SD e altri supporti esterni  n-Network collegabili (FTP, SFTP, SMB / Samba / Windows / LAN / WIFI)  n - editor di testo  n-Smart Folders che la scansione per i diversi tipi di media (video, foto, musica, download)  n-View Pager directory di navigazione (a destra scorrere per salire di una directory)  n-Superuser / Root capacità di lista / leggere cartelle di sistema (non sistema scrivere ancora)  n  nFeatures a venire:  n-Tabbed Text Editor  funzionalità di rete n-More (Dropbox, Box.net, unità Sky)  n-Offline cache di struttura di file, si ricorderà che i file avete in luoghi diversi senza bisogno di collegare  n-Disk calore mappa dello spazio mostra dove i vostri file più grandi sono  n  n * NOTA BENE: Questa applicazione è in Beta. Ci sono ancora molti bug. Se non si desidera sperimentare questi bug, si prega di non scaricare questa applicazione. Se volete aiutarmi a trovare questi bug, prego email me o cooperare con me su GitHub (https://github.com/BrandoCommando/OpenExplorer/). Ricorda voti cattivi aiutano nessuno.</string>
-    <string name="alert_translate_google" auto="1">Ciao, questa traduzione è fornito da Google Translate. Se conoscete l\'inglese così come %s, e vorrei contribuire a fornire una traduzione migliore, fare clic su questo pulsante:</string>
-    <string name="alert_translate_none" auto="1">Ciao, sembra che si sta utilizzando una non-lingua supportata. Conoscete l\'inglese e %s? Se desiderate aiutare a fornire una traduzione corretta, clicca qui:</string>
+    <string name="app_description">Open Explorer - File manager open source per tutti i dispositivi! (Tablet, telefonini, Google TV, panini!)\n-completa getsione del filesystem\n-USB, scheda SD e altri supporti esterni\n-Collegamnto alla rete (FTP, SFTP, SMB / Samba / Windows / LAN / WIFI)\n- editor di testo\n-Smart Folders che mostrano i diversi tipi di media (video, foto, musica, download)\n-Modalità di navigazione nelle cartella (scorrere a destra per salire di una directory)\n-Capacità da Root/superuser di elencare / leggere cartelle di sistema (non ancora scrivere)\n\nFunzioni in arrivo: \n-Editor di Testo con le tab\n-Più funzionalità di rete (Dropbox, Box.net, Sky drive)\n-Caching della struttura dei file offline, si ricorderà che file avete in remoto senza bisogno di collegarsi\n-Mappa termometrica dello spazio, mostra dove sono i vostri file più grandi\n\n* NOTA BENE: Questa applicazione è in Beta. Ci sono ancora molti bug. Se non si desidera subire questi bug, si prega di non scaricare questa applicazione. Se volete aiutarmi a trovare questi bug, mandatemi una e-mail o coollaborate con me su GitHub (https://github.com/BrandoCommando/OpenExplorer). Ricordate che i voti bassi non aiutano nessuno.</string>
+    <string name="alert_translate_google" formatted="false">Ciao, questa traduzione è fornita dal Traduttore Google. Se conoscete l\'Inglese così come %s , e volete contribuire a fornire una traduzione migliore, fate clic su questo pulsante:</string>
+    <string name="alert_translate_none" formatted="false">Ciao, sembra che si stia utilizzando una lingua non supportata. Conoscete bene l\'Inglese e %s ? Se desiderate aiutare a fornire una traduzione corretta, cliccate qui:</string>
     <string name="button_translate" auto="1">Tradurre</string>
     <string name="httpError">Si è verificato un errore di rete.</string>
     <string name="httpErrorAuth">Autenticazione non riuscita.</string>
-    <string name="httpErrorProxyAuth">Autenticazione tramite il server proxy non riuscita.</string>
+    <string name="httpErrorProxyAuth">Autenticazione server proxy non riuscita</string>
     <string name="httpErrorConnect">Connessione al server non riuscita.</string>
     <string name="httpErrorIO">Errore di comunicazione del server. Riprova più tardi.</string>
     <string name="httpErrorTimeout">Tempo esaurito per la connessione al server.</string>
     <string name="httpErrorFile">Impossibile accedere al file.</string>
     <string name="httpErrorFileNotFound">Impossibile trovare il file richiesto.</string>
-    <string name="contentServiceSync">Sinc</string>
+    <string name="contentServiceSync">Sincronizza</string>
     <string name="keyguard_password_enter_pin_code">Inserisci il PIN</string>
     <string name="keyguard_password_enter_password_code">Inserisci password per sbloccare</string>
     <string name="keyguard_password_enter_pin_password_code">Inserisci PIN per sbloccare</string>
@@ -261,41 +262,109 @@
     <string name="sim_restart_button">Riavvia</string>
     <string name="extmedia_format_button_format">Formatta</string>
     <string name="ext_media_nofs_notification_message">Archivio USB vuoto o con filesystem non supportato.</string>
-    <string name="activity_list_empty">Scheda SD vuota o con filesystem non supportato.</string>
-    <string name="ime_action_go">Nessuna attività corrispondente trovata</string>
-    <string name="ime_action_send">Vai</string>
-    <string name="ime_action_done">Invia</string>
-    <string name="ime_action_default">Fine</string>
-    <string name="upload_file">Esegui</string>
-    <string name="no_file_chosen">Scegli file</string>
-    <string name="reset">Nessun file è stato scelto</string>
-    <string name="back_button_label">Reimposta</string>
-    <string name="next_button_label">Indietro</string>
-    <string name="no_matches">Avanti</string>
-    <string name="find_on_page">Nessuna corrispondenza</string>
-    <string name="find">Trova nella pagina</string>
-    <string name="activitychooserview_choose_application">Trova</string>
-    <string name="shareactionprovider_share_with">Scegli un\'applicazione</string>
-    <string name="storage_internal">Condividi con</string>
-    <string name="storage_sd_card">Archivio interno</string>
-    <string name="storage_usb">Scheda SD</string>
-    <string name="extract_edit_menu_button">Archivio USB</string>
-    <string name="activity_chooser_view_see_all">Modifica...</string>
-    <string name="s_title_picker" auto="1">Scegliere directory</string>
+    <string name="activity_list_empty">Nessuna attività corrispondente trovata</string>
+    <string name="ime_action_go">Vai</string>
+    <string name="ime_action_send">Invia</string>
+    <string name="ime_action_done">Fine</string>
+    <string name="ime_action_default">Esegui</string>
+    <string name="upload_file">Scegli file</string>
+    <string name="no_file_chosen">Nessun file è stato scelto</string>
+    <string name="reset">Reimposta</string>
+    <string name="back_button_label">Indietro</string>
+    <string name="next_button_label">Avanti</string>
+    <string name="no_matches">Nessuna corrispondenza</string>
+    <string name="find_on_page">Trova nella pagina</string>
+    <string name="find">Trova</string>
+    <string name="activitychooserview_choose_application">Scegli un applicazione</string>
+    <string name="shareactionprovider_share_with">Condividi con</string>
+    <string name="storage_internal">Archivio Interno</string>
+    <string name="storage_sd_card">Scheda SD</string>
+    <string name="storage_usb">Archivio USB</string>
+    <string name="extract_edit_menu_button">Modifica...</string>
+    <string name="activity_chooser_view_see_all">Vedi tutto...</string>
+    <string name="s_title_picker">Scegliere cartella</string>
     <string name="selected_path" auto="1">Percorso selezionato:</string>
     <string name="filename" auto="1">Nome del file</string>
-    <string name="s_msg_saved" auto="1">salvati</string>
-    <string name="s_menu_view_line_numbers" auto="1">Numeri di riga</string>
-    <string name="warn_text_editor" auto="1">Welcome to Text Editor. Si prega di premere a lungo il testo per entrare in modalità Edit.</string>
-    <string name="warn_networking" auto="1">Benvenuti alla configurazione di rete. Si prega di notare che questa funzione è ancora in sviluppo e può contenere bug. Si prega di non dare un voto cattivo mercato, se si trova uno di questi bug.</string>
-    <string name="s_menu_new_file" auto="1">File di testo Nuovo</string>
+    <string name="s_msg_saved">salvato</string>
+    <string name="s_menu_view_line_numbers">Numero di righe</string>
+    <string name="warn_text_editor">Benvenuto nell\'Editor di Testo. Premi a lungo il testo per passare in modalità modifica.\n</string>
+    <string name="warn_networking">Benvenuto nella Rete. Fai attenzione perché questa funzione é ancora in fase di sviluppo e può contenere degli errori. Per favore non dare dei giudizi negativi nel Market se trovi uno di questi errori. </string>
+    <string name="s_menu_new_file">Nuovo File di Testo</string>
     <string name="s_msg_created" auto="1">creato</string>
-    <string name="s_title_newfile" auto="1">Nuovo file</string>
+    <string name="s_title_newfile">Nuovo File</string>
     <string name="s_alert_newfile_folder" auto="1">Creare un nuovo file in:</string>
     <string name="s_alert_newfile" auto="1">Digitare il nome del nuovo file:</string>
     <string name="s_alert_exit" auto="1">Sei sicuro di voler uscire?</string>
-    <string name="s_alert_clipboard" auto="1">Copiato negli appunti</string>
-    <string name="s_alert_restart" auto="1">Riavvio. Si prega di attendere.</string>
+    <string name="s_alert_clipboard">Copiato negli Appunti</string>
+    <string name="s_alert_restart">Riavvio in corso. Si prega di attendere.</string>
     <string name="language" auto="1">Lingua</string>
-
-</resources>
\ No newline at end of file
+    <string name="s_menu_download">Scarica</string>
+    <string name="scan">Esegui scansione</string>
+    <string name="test">Test</string>
+    <string name="test_success">Connessione effettuata!</string>
+    <string name="no_items">Nessun elemento.</string>
+    <string name="clipboard">Appunti</string>
+    <string name="theme">Tema</string>
+    <string name="theme_dark">Interfaccia scura</string>
+    <string name="theme_light">Interfaccia chiara</string>
+    <string name="chooser_remember">Ricorda la mia scelta</string>
+    <string name="use_system">Usa sistema &gt;&gt;</string>
+    <string name="activity_resolver_use_always">Sempre</string>
+    <string name="activity_resolver_use_once">Solo una volta</string>
+    <string name="s_pref_bookmarks_summary">Mostra Segnalibri</string>
+    <string name="s_menu_heatmap">Mappa termica</string>
+    <string name="apply_to_all">Vuoi applicarlo a tutte le cartelle?</string>
+    <string name="s_pref_view_folders">Preferenze delle cartelle</string>
+    <string name="s_pref_view_general">Preferenze Generali</string>
+    <string name="s_pref_text_wrap">A capo automatico</string>
+    <string name="s_pref_thumbs_crop">Ritaglia/Centra Anteprime</string>
+    <string name="s_pref_thumbs_cache_clear">Cancella Cache delle Anteprime</string>
+    <string name="s_msg_folder_none">Impossibile creare la cartella</string>
+    <string name="msg_nook_donate2">Ciao utente Nook! Spero ti piaccia Open Explorer per Nook. Ho cercato di fare del mio meglio per assicurare la compatibilità con i dispositivi Nook. Grazie alle ultime donazioni, ho potuto acquistare un Nook Color. Un ringraziamento a tutti quelli che hanno effettuato una donazione!\n\nIn futuro, spero di riuscire ad acquistare un dispositivo Nook HD di nuova generazione.\n\nSe trovi utile questa applicazione, ti prego di fare una donazione selezionado il bottone quì sotto, oppure attivando l\'opzione &quot;Donare&quot; nel menù. Grazie! </string>
+    <string name="msg_bb_donate">Ciao utente BlackBerry! Spero che Open Explorer ti piaccia. Ho fatto del mio meglio per garantire la maggiore compatibilità con i dispositivi BlackBerry. Tuttavia, ci sono alcune differenze che sono difficili da gestire senza avere a disposizione un dispositivo BlackBerry. Per questo motivo sto cercando di raccogliere abbastanza donazioni per l\'acquisto di un dispositivo BlackBerry 10, al fine di migliorare la compatibilità. Se trovi utile questa applicazione, ti prego di fare una donazione selezionando il bottone qui sotto, oppure attivando l\'opzione &quot;Donazione&quot; nel menù. Grazie!</string>
+    <string name="msg_donate">Ciao utente Android! Speriamo che Open Explorer ti piaccia. Abbiamo fatto del nostro meglio per assicurare la maggiore compatibilità con tutti i dispositivi Android. Tuttavia, date le segnalazioni di bug ricevuti, possiamo solo supporre che ci siano diversi bug che causano errori specifici in alcuni dispositivi. Per questo motivo, stiamo cercando di raccogliere fondi sufficienti per l\'acquisto di alcuni dispositivi Nexus, al fine di migliorare la compatibilità. Se trovate utile questa applicazione, si prega di fare una donazione selezionando il bottone qui sotto, oppure attivando l\'opzione &quot;Donazione&quot; nel menù. Grazie!</string>
+    <string name="s_privacy">Privacy Policy</string>
+    <string name="s_menu_system_mount">Rendi /system Scrivibile (Pericoloso!)</string>
+    <string name="s_menu_system_mount_on">System è scrivibile!</string>
+    <string name="s_menu_system_mount_off">System è in Sola Lettura</string>
+    <string name="s_pref_servers_private">Mantieni i server privati</string>
+    <string name="s_pref_servers_private_summary">Memorizza i settaggi dei server nell\'area privata. In questo modo i settaggi dei server saranno automaticamente rimossi se l\'applicazione verrà disinstallata. Se la reinstallerai in futuro, lasciare disabilitata questa opzione eviterà questo problema.</string>
+    <string name="s_theme_lightdark">Chiaro e Scuro</string>
+    <string name="s_theme_custom">Strisce</string>
+    <string name="s_menu_rate">Tasso</string>
+    <string name="s_alert_destination_exists">La destinazione esiste già. Cosa desideri fare? </string>
+    <string name="s_overwrite">Sovrascrivi</string>
+    <string name="s_skip">Salta</string>
+    <string name="s_msg_file_exists">Nella destinazione scelta esistono già un file con questo nome. Ok per sovrascrivere</string>
+    <string name="s_title_file_exists">File già esistente.</string>
+    <string name="s_msg_pref_archives">Vuoi sfogliare o estrarre l\'archivio? </string>
+    <string name="s_browse">Sfoglia</string>
+    <string name="s_extract">Estrai</string>
+    <string name="s_extracted">Estratto</string>
+    <string name="s_extracting">Estrazione in corso</string>
+    <string name="s_extract_with">Estrai con... </string>
+    <string name="s_title_archive_handler">Gestore archivi</string>
+    <string name="s_ask_again" auto="1">Chiedi ogni volta</string>
+    <string name="s_archives">Archivi</string>
+    <string name="s_compress">Comprimi</string>
+    <string name="s_compress_type">Tipo di Conpressione</string>
+    <string name="s_compressed" auto="1">compressa</string>
+    <string name="s_delete_after">Elimina la sorgente dopo il completamento</string>
+    <string name="s_master_pass">Password Principale</string>
+    <string name="s_master_pass_warning">È possibile immettere una password principale, utilizzata come chiave di crittografia per tutte le password memorizzate. Se si lascia vuoto questo campo, le password saranno ancora criptate, e verrà utilizzata una password principale di default. Si prega di notare che se si aggiorna la propria password con le password di rete già memorizzate, si avrà probabilmente bisogno di reimpostare le password e autenticarsi al server cloud dopo aver resettato questa password.</string>
+    <string name="s_pass_old">Inserire la vecchia password:</string>
+    <string name="s_pass_new">Immettere la nuova password:</string>
+    <string name="s_logout">Esci</string>
+    <string name="s_authenticate">Autenticati </string>
+    <string name="s_authenticating" auto="1">Autenticazione</string>
+    <string name="s_bookmark_history">Cronologia</string>
+    <string name="s_server_account_title">Account :</string>
+    <string name="s_authenticate_success">Autenticazione effettuata</string>
+    <string name="s_authenticate_refresh">Ricarica Autenticazione </string>
+    <string name="s_pref_thumbs_cache">Pre-Carica Anteprime</string>
+    <string name="s_pref_thumbs_cache_summary">Questo contribuirà ad accelerare il caricamento delle cartelle contenenti Immagini e Video.</string>
+    <string name="s_folders" auto="1">cartelle</string>
+    <string name="s_hidden" auto="1">nascosto</string>
+    <string name="s_total" auto="1">totale</string>
+    <string name="s_custom_account">Account Personalizzato</string>
+</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
old mode 100644
new mode 100755
index a2ffe805..e4b3bd48
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1,55 +1,54 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
-    <string name="app_name" auto="1">פתח את Internet</string>
+    <string name="app_name">סייר פתוח</string>
     <string name="s_photos" auto="1">תמונות</string>
-    <string name="s_videos" auto="1">וידאו</string>
+    <string name="s_videos">סרטונים</string>
     <string name="s_music" auto="1">מוסיקה</string>
     <string name="s_downloads" auto="1">הורדות</string>
     <string name="s_external" auto="1">חיצוני</string>
     <string name="s_internal" auto="1">פנימי</string>
-    <string name="s_view" auto="1">נוף</string>
+    <string name="s_view">תצוגה</string>
     <string name="s_bookmarks" auto="1">סימניות</string>
-    <string name="s_menu_favorites" auto="1">Toggle Bookmarks</string>
-    <string name="s_menu_sort" auto="1">מין</string>
+    <string name="s_menu_favorites">החלף מצב סימניות</string>
+    <string name="s_menu_sort">מיין</string>
     <string name="s_menu_sort_name_asc" auto="1">מיין לפי שם (A-Z)</string>
     <string name="s_menu_sort_name_desc" auto="1">מיין לפי שם (Z-A)</string>
-    <string name="s_menu_sort_date_asc" auto="1">מיון לפי חדשים</string>
-    <string name="s_menu_sort_date_desc" auto="1">מיין לפי הכי ישנות</string>
-    <string name="s_menu_sort_size_asc" auto="1">לפי הגדול</string>
-    <string name="s_menu_sort_size_desc" auto="1">לפי הקטן</string>
-    <string name="s_menu_sort_type" auto="1">לפי FileType</string>
-    <string name="s_menu_multi" auto="1">Multi-Select</string>
-    <string name="s_menu_grid" auto="1">Grid View</string>
+    <string name="s_menu_sort_date_asc">מיין לפי החדש ביותר</string>
+    <string name="s_menu_sort_date_desc">מיין לפי הישן ביותר</string>
+    <string name="s_menu_sort_size_asc">מיין לפי הגדול ביותר</string>
+    <string name="s_menu_sort_size_desc">מיין לפי הקטן ביותר</string>
+    <string name="s_menu_sort_type">מיין לפי סוג הקובץ</string>
+    <string name="s_menu_multi">בחירה מרובה</string>
+    <string name="s_menu_grid">תצוגת רשת</string>
     <string name="s_menu_list" auto="1">תצוגת רשימה</string>
     <string name="s_menu_carousel" auto="1">קרוסלה</string>
-    <string name="s_menu_hidden" auto="1">הצגקבציםמוסתרים</string>
+    <string name="s_menu_hidden">הצג קבצים מוסתרים</string>
     <string name="s_menu_thumbs" auto="1">הצגת תמונות ממוזערות</string>
     <string name="s_menu_new_folder" auto="1">תיקיה חדשה</string>
     <string name="s_menu_other" auto="1">הגדרות אחרות</string>
     <string name="s_menu_flush" auto="1">ריקון מטמון</string>
-    <string name="s_menu_root" auto="1">שורש</string>
+    <string name="s_menu_root">רוט (Root)</string>
     <string name="s_menu_prefs_folder" auto="1">העדפות תיקייה</string>
-    <string name="s_menu_prefs_global" auto="1">גלובל העדפות</string>
+    <string name="s_menu_prefs_global">העדפות כלליות</string>
     <string name="s_menu_info" auto="1">מידע</string>
-    <string name="s_menu_copy" auto="1">עותק</string>
-    <string name="s_menu_cut" auto="1">לחתוך</string>
-    <string name="s_menu_paste" auto="1">להדביק</string>
-    <string name="s_menu_delete" auto="1">למחוק</string>
+    <string name="s_menu_copy">העתק</string>
+    <string name="s_menu_cut">חתוך</string>
+    <string name="s_menu_paste">הדבק</string>
+    <string name="s_menu_delete">מחק</string>
     <string name="s_menu_share" auto="1">שלח / שתף ...</string>
-    <string name="s_menu_zip" auto="1">Zip קובץ (ים) ...</string>
-    <string name="s_menu_unzip" auto="1">Unzip ...</string>
+    <string name="s_menu_zip">קובץ/קבצי zip...</string>
+    <string name="s_menu_unzip">חלץ</string>
     <string name="s_menu_rename" auto="1">שינוי שם ...</string>
     <string name="s_menu_bookmark" auto="1">הוסף סימנייה</string>
-    <string name="s_save" auto="1">להציל</string>
-    <string name="s_saveas" auto="1">שמור כ ...</string>
-    <string name="s_cancel" auto="1">לבטל</string>
+    <string name="s_save">שמור</string>
+    <string name="s_saveas">שמור בשם...</string>
+    <string name="s_cancel">ביטול</string>
     <string name="s_size" auto="1">גודל</string>
     <string name="s_none" auto="1">אף אחד</string>
     <string name="s_pref_servers" auto="1">שרתים נוספים</string>
     <string name="s_pref_server_add" auto="1">+ הוסף שרת חדש</string>
     <string name="s_pref_display" auto="1">הצגת העדפות</string>
-    <string name="s_pref_hidden" auto="1">הצגקבציםמוסתרים</string>
+    <string name="s_pref_hidden">הצג קבצים מוסתרים</string>
     <string name="s_pref_hidden_summary" auto="1">הצגת קבצים ותיקיות מוסתרים</string>
     <string name="s_pref_thumbs" auto="1">הצגת תמונות ממוזערות</string>
     <string name="s_pref_thumbs_summary" auto="1">הצגת תמונה ממוזערת של תמונה / וידאו / App קבצים</string>
@@ -58,39 +57,39 @@
     <string name="s_pref_sort" auto="1">מיון</string>
     <string name="s_pref_sort_summary" auto="1">בחר כיצד למיין קבצים ותיקיות</string>
     <string name="s_pref_advanced" auto="1">מתקדם</string>
-    <string name="s_pref_server_name" auto="1">שרת שם</string>
+    <string name="s_pref_server_name">שם השרת</string>
     <string name="s_pref_server_name_summary" auto="1">הזן שם שרת</string>
     <string name="s_pref_server_url" auto="1">שרת URL</string>
-    <string name="s_pref_server_url_summary" auto="1">הזן כתובת השרת מלא</string>
+    <string name="s_pref_server_url_summary">הזן כתובת מלאה של שרת הURL</string>
     <string name="s_pref_server_host" auto="1">שרת מארח</string>
     <string name="s_pref_server_user" auto="1">משתמש</string>
     <string name="s_pref_server_user_summary" auto="1">שם משתמש</string>
     <string name="s_pref_server_password" auto="1">סיסמה</string>
-    <string name="s_pref_server_password_summary" auto="1">התחברות סיסמה</string>
-    <string name="s_pref_server_path" auto="1">בתיקיית</string>
+    <string name="s_pref_server_password_summary">סיסמת התחברות</string>
+    <string name="s_pref_server_path">תת תיקיה</string>
     <string name="s_pref_server_path_summary" auto="1">הזן את שם המשתמש נתיב ברירת המחדל</string>
     <string name="s_pref_server_extras" auto="1">הגדרות נוספות</string>
     <string name="s_pref_server_update" auto="1">הוספה / עדכון שרת</string>
     <string name="s_pref_server_type" auto="1">שרת סוג</string>
     <string name="s_files" auto="1">קבצים</string>
-    <string name="s_create" auto="1">ליצור</string>
-    <string name="s_title_holding_x_files" auto="1">החזקת קבצים %s</string>
+    <string name="s_create">צור</string>
+    <string name="s_title_holding_x_files" formatted="false" auto="1">החזקת קבצים %s</string>
     <string name="s_title_newfolder" auto="1">יצירת תיקיה חדשה</string>
-    <string name="s_title_send" auto="1">שלח %s</string>
-    <string name="s_title_unzip" auto="1">Unzip %s</string>
-    <string name="s_title_zip" auto="1">מיקוד %s</string>
+    <string name="s_title_send" formatted="false" auto="1">שלח %s</string>
+    <string name="s_title_unzip" formatted="false" auto="1">Unzip %s</string>
+    <string name="s_title_zip" formatted="false" auto="1">מיקוד %s</string>
     <string name="s_title_executing" auto="1">מבצע</string>
-    <string name="s_title_deleting" auto="1">מחיקת</string>
-    <string name="s_title_searching" auto="1">חיפוש</string>
-    <string name="s_title_moving" auto="1">נע</string>
-    <string name="s_title_copying" auto="1">העתקה</string>
-    <string name="s_title_zipping" auto="1">רכס</string>
-    <string name="s_title_unzipping" auto="1">פתחתי את רוכסן</string>
+    <string name="s_title_deleting">מוחק</string>
+    <string name="s_title_searching">מחפש</string>
+    <string name="s_title_moving">מעביר</string>
+    <string name="s_title_copying">מעתיק</string>
+    <string name="s_title_zipping">דוחס</string>
+    <string name="s_title_unzipping">פורש</string>
     <string name="s_title_wait" auto="1">אנא המתן ...</string>
-    <string name="s_alert_confirm_delete" auto="1">מחיקת %s לא ניתן לבטל. האם אתה בטוח שאתה רוצה להמשיך?</string>
+    <string name="s_alert_confirm_delete" formatted="false" auto="1">מחיקת %s לא ניתן לבטל. האם אתה בטוח שאתה רוצה להמשיך?</string>
     <string name="s_alert_rename" auto="1">אנא הקלד את השם החדש קובץ זה</string>
     <string name="s_alert_newfolder" auto="1">הקלד את השם של התיקייה שאתה רוצה ליצור.</string>
-    <string name="s_alert_unzip" auto="1">היית רוצה לפתוח %s כאן או תיקיה אחרת?</string>
+    <string name="s_alert_unzip" formatted="false" auto="1">היית רוצה לפתוח %s כאן או תיקיה אחרת?</string>
     <string name="s_button_unzip_here" auto="1">Unzip כאן</string>
     <string name="s_button_unzip_else" auto="1">Unzip במקום אחר ...</string>
     <string name="s_msg_none" auto="1">קובץ (ים) לא יכול להיות</string>
@@ -106,7 +105,7 @@
     <string name="s_title_bookmark_prefix" auto="1">נהל הפוך:</string>
     <string name="s_alert_remove_safe" auto="1">כעת אתה יכול להסיר בבטחה את הכונן.</string>
     <string name="s_alert_remove_error" auto="1">לא ניתן להוציא.</string>
-    <string name="s_menu_about" auto="1">על</string>
+    <string name="s_menu_about">אודות</string>
     <string name="s_about_version" auto="1">גרסה</string>
     <string name="s_about_author" auto="1">מחבר</string>
     <string name="s_about_site" auto="1">אתר אינטרנט</string>
@@ -119,7 +118,7 @@
     <string name="s_pref_stats_title" auto="1">עזרה לשפר OpenExplorer</string>
     <string name="s_pref_stats_summary" auto="1">שלח סטטיסטיקת שימוש אנונימית. זה אינו כולל כל מידע שיכול לשמש כדי לזהות את המשתמש.</string>
     <string name="s_error_no_intents" auto="1">אין היישומים המותקנים יכול לקרוא קובץ מסוג זה.</string>
-    <string name="s_menu_root_disabled" auto="1">שורש נכים</string>
+    <string name="s_menu_root_disabled">שורש מבוטל</string>
     <string name="s_pref_start" auto="1">החל תיקייה</string>
     <string name="s_pref_start_summary" auto="1">מציין באיזו תיקייה OpenExplorer מתחיל</string>
     <string name="s_custom" auto="1">אישית ...</string>
@@ -143,7 +142,7 @@
     <string name="s_menu_delete_all">מחק הכל</string>
     <string name="s_menu_move_all">העבר לכאן</string>
     <string name="s_menu_copy_all">העתק לכאן</string>
-    <string name="s_confirm_delete" auto="1">האם אתה בטוח שברצונך למחוק %s?</string>
+    <string name="s_confirm_delete" formatted="false" auto="1">האם אתה בטוח שברצונך למחוק %s?</string>
     <string name="s_error_same_destination" auto="1">מדריך יעד זהה.</string>
     <string name="s_sample_notification" auto="1">העתקה -&gt; sdcard:  n 3 קבצים</string>
     <string name="s_pref_fullscreen" auto="1">מסך מלא</string>
@@ -175,7 +174,7 @@
     <string name="s_default" auto="1">ברירת מחדל</string>
     <string name="s_pref_timeout" auto="1">פסק זמן</string>
     <string name="s_pref_timeout_summary" auto="1">פסק זמן בשניות</string>
-    <string name="s_menu_up" auto="1">לעלות</string>
+    <string name="s_menu_up">עלה מעל</string>
     <string name="s_prompt_unzip" auto="1">הזן את הנתיב לפתוח את:</string>
     <string name="s_pref_hardware_accel" auto="1">לאפשר האצת חומרה</string>
     <string name="s_pref_honeyplus" auto="1">אנדרואיד 3.0 + הגדרות</string>
@@ -212,6 +211,8 @@
     <string name="s_pref_fancy_menus" auto="1">פנסי תפריטים</string>
     <string name="s_pref_fancy_context" auto="1">הקשר תפריטים מהודרים</string>
     <string name="s_search_files" auto="1">חיפוש מערכת קבצים</string>
+    <string name="search_summary" formatted="false" auto="1">חיפוש &quot;%s&quot; \n בתוך &quot;%s&quot; (%d) ...</string>
+    <string name="search_results" formatted="false" auto="1">%תוצאות נמצאו ברה &quot;%s&quot; \n בתוך &quot;%s&quot;</string>
     <string name="s_menu_exit">יציאה</string>
     <string name="s_warn_wtf_message" auto="1">אופס! נראה כי לא מטופל שגיאה אירעה! ככל שמדובר בעניין נפוץ Apps בטא רבות, הדרך היחידה לפתור בעיות אלה היא לקבל דיווחים מכשירים שונים, כמו שלך, כדי לקבוע כיצד לפתור את הבעיה. אנו עשויים לשלוח דו&quot;ח כזה, המכיל רק נתונים אנונימיים, למפתח?</string>
     <string name="s_warn_wtf_ps" auto="1">*** שימו לב, יישום זה הוא בטא. נא לא לתת את היישום הזה דירוג רע, פשוט משום שהוא מתרסק. פשוט להסיר את ההתקנה אם זה באמת מפריע לך. תודה!</string>
@@ -225,23 +226,23 @@
     <string name="s_pref_autowtf" auto="1">אוטומטית לשלוח ודוחות קריסה</string>
     <string name="s_pref_autowtf_summary" auto="1">כאשר חריג לא מטופל מתרחשת, באופן אוטומטי לשלוח דוח.</string>
     <string name="s_split_auto" auto="1">אוטומטי</string>
-    <string name="s_split_top" auto="1">חיל לחצנים עד למעלה</string>
-    <string name="s_split_top_single" auto="1">לכפות על לחצן יחיד למעלה</string>
-    <string name="s_split_bottom" auto="1">חיל לחצנים בתחתית הדף</string>
-    <string name="s_split_none" auto="1">מניחים את כל הכפתורים בתפריט מערכת</string>
+    <string name="s_split_top">אלץ לחצנים למעלה</string>
+    <string name="s_split_top_single">אלץ לחצן יחיד למעלה</string>
+    <string name="s_split_bottom">אלץ לחצנים בתחתית</string>
+    <string name="s_split_none">מקם את כל הלחצנים בתפריט המערכת</string>
     <string name="s_about_screensize" auto="1">גודל מסך</string>
     <string name="s_about_density" auto="1">צפיפות</string>
     <string name="s_menu_location_int" auto="1">זיכרון פנימי נתיב</string>
     <string name="s_menu_location_ext" auto="1">זיכרון חיצוני נתיב</string>
-    <string name="s_wtf_context" auto="1">אנא תאר בהקשר של קריסה:</string>
+    <string name="s_wtf_context">אנא פרט את נסיבות הקריסה</string>
     <string name="thanks" auto="1">תודה!</string>
     <string name="menu_view_font_small" auto="1">גודל גופן קטן</string>
     <string name="menu_view_font_medium" auto="1">גודל גופן בינוני</string>
     <string name="menu_view_font_large" auto="1">גודל גופן גדול</string>
     <string name="app_description" auto="1">פתח את Internet Explorer - קוד פתוח מנהל קבצים עבור כל המכשירים! (לוחות הברית, טלפונים, טלוויזיות גוגל, כריכים!) \n-Complete קובץ מערכת ניהול \n-USB, SD ו מדיה חיצוניים אחרים \n-לחיבור רשת (FTP, SFTP, SMB / Samba / Windows / LAN / WIFI) \n - עורך טקסט \n חכם תיקיות, כי סריקה עבור סוגים שונים של מדיה (וידאו, תמונות, מוסיקה, הורדות) \n-צפה זימונית המדריך ניווט (מימין לסחוב לעלות המדריך) \n-משתמש על / root היכולת ברשימה / לקרוא תיקיות מערכת (המערכת לא לכתוב עדיין) \n \nFeatures הבאים: \n-כרטיסיות עורך טקסט \n-יכולת רשת יותר (Dropbox, Box.net, כונן שמים) \n-Offline מבנה קובץ המטמון, יזכרו אילו קבצים יש לך במקומות שונים, ללא צורך להתחבר \n-Disk חום המפה מראה מקום שבו הקבצים הגדולים ביותר הם \n \n * שים לב: App היא בגרסת ביתא. יש עדיין הרבה באגים. אם אתה לא רוצה לחוות את הבאגים, בבקשה אל תוריד את היישום הזה. אם תרצה לעזור לי למצוא את הבאגים, אנא שלח לי או לשתף פעולה עם אלי GitHub (https://github.com/BrandoCommando/OpenExplorer/). יש לזכור דירוגים רעים לעזור לאף אחד.</string>
-    <string name="alert_translate_google" auto="1">שלום, תרגום זה מסופק על ידי Google Translate. אם אתה יודע אנגלית, כמו גם %s, ואת רוצה לסייע במתן תרגום טוב יותר, אנא לחץ על הכפתור הזה:</string>
-    <string name="alert_translate_none" auto="1">שלום, נראה כי אתה משתמש בשפה לא נתמכת. האם אתה יודע אנגלית %s? אם הייתם רוצים לסייע במתן התרגום הנכון, לחצו כאן:</string>
-    <string name="button_translate" auto="1">לתרגם</string>
+    <string name="alert_translate_google" formatted="false" auto="1">שלום, תרגום זה מסופק על ידי Google Translate. אם אתה יודע אנגלית, כמו גם %s, ואת רוצה לסייע במתן תרגום טוב יותר, אנא לחץ על הכפתור הזה:</string>
+    <string name="alert_translate_none" formatted="false" auto="1">שלום, נראה כי אתה משתמש בשפה לא נתמכת. האם אתה יודע אנגלית של %s? אם הייתם רוצים לסייע במתן התרגום הנכון, לחצו כאן:</string>
+    <string name="button_translate">תרגם</string>
     <string name="httpError">אירעה שגיאת רשת.</string>
     <string name="httpErrorAuth">האימות נכשל.</string>
     <string name="httpErrorProxyAuth">האימות דרך שרת ה-Proxy נכשל.</string>
@@ -261,25 +262,80 @@
     <string name="sim_restart_button">הפעל מחדש</string>
     <string name="extmedia_format_button_format">פרמוט</string>
     <string name="ext_media_nofs_notification_message">אחסון USB ריק או עם מערכת קבצים לא נתמכת.</string>
-    <string name="activity_list_empty">כרטיס SD ריק או שמערכת הקבצים שלו לא נתמכת.</string>
-    <string name="ime_action_go">לא נמצאו פעילויות תואמות</string>
-    <string name="ime_action_send">התחל</string>
-    <string name="ime_action_done">שלח</string>
+    <string name="activity_list_empty">לא נמצאו פעילויות מתאימות</string>
+    <string name="ime_action_go">התחל</string>
+    <string name="ime_action_send">שלח</string>
+    <string name="ime_action_done">נעשה</string>
     <string name="ime_action_default">סיום</string>
-    <string name="upload_file">בצע</string>
-    <string name="no_file_chosen">בחר קובץ</string>
-    <string name="reset">לא נבחר קובץ</string>
-    <string name="back_button_label">איפוס</string>
-    <string name="next_button_label">הקודם</string>
-    <string name="no_matches">הבא</string>
-    <string name="find_on_page">אין התאמות</string>
-    <string name="find">חפש בדף</string>
-    <string name="activitychooserview_choose_application">מצא</string>
-    <string name="shareactionprovider_share_with">בחר יישום</string>
-    <string name="storage_internal">שתף עם</string>
-    <string name="storage_sd_card">אחסון פנימי</string>
-    <string name="storage_usb">כרטיס SD</string>
-    <string name="extract_edit_menu_button">אחסון USB</string>
-    <string name="activity_chooser_view_see_all">ערוך...</string>
-
-</resources>
\ No newline at end of file
+    <string name="upload_file">בחר קובץ</string>
+    <string name="no_file_chosen">לא נבחר קובץ</string>
+    <string name="reset">אחזור</string>
+    <string name="back_button_label">הקודם</string>
+    <string name="next_button_label">הבא</string>
+    <string name="no_matches">אין התאמות</string>
+    <string name="find_on_page">חפש בדף</string>
+    <string name="find">מצא</string>
+    <string name="activitychooserview_choose_application">בחר יישום</string>
+    <string name="shareactionprovider_share_with">שתף עם</string>
+    <string name="storage_internal">אחסון פנימי</string>
+    <string name="storage_sd_card">כרטיס sd</string>
+    <string name="storage_usb">אחסון usb</string>
+    <string name="extract_edit_menu_button">ערוך</string>
+    <string name="activity_chooser_view_see_all">ראה הכל...</string>
+    <string name="s_title_picker">אנא בחר תיקיה</string>
+    <string name="selected_path">הנתיב שנבחר</string>
+    <string name="filename">שם הקובץ</string>
+    <string name="s_msg_saved">שמור</string>
+    <string name="s_menu_view_line_numbers">מספר שורות</string>
+    <string name="warn_text_editor">שלום, הגעת לעורך המלל. לחץ ארוכות בכדי לערוך אותו.</string>
+    <string name="s_menu_new_file">קובץ טקסט חדש</string>
+    <string name="s_msg_created">נוצר</string>
+    <string name="s_title_newfile">קובץ חדש</string>
+    <string name="s_alert_newfile_folder">צור קובץ חדש ב</string>
+    <string name="s_alert_newfile">הקלד שם חדש לקובץ:</string>
+    <string name="s_alert_exit">אתה בטוח שברצונך לצאת?</string>
+    <string name="s_alert_clipboard">הועתק ללוח</string>
+    <string name="s_alert_restart">מאתחל. אנא המתן</string>
+    <string name="language">שפה</string>
+    <string name="s_menu_download">הורדה</string>
+    <string name="scan">סרוק</string>
+    <string name="test">בדיקה</string>
+    <string name="test_success">חיבור הצליח!</string>
+    <string name="no_items">אין פריטים</string>
+    <string name="clipboard">לוח</string>
+    <string name="theme">ערכת נושא</string>
+    <string name="theme_dark">ממשק כהה</string>
+    <string name="theme_light">ממשק בהיר</string>
+    <string name="chooser_remember">זכור את הבחירה</string>
+    <string name="use_system">שימוש מערכת&lt;&lt;</string>
+    <string name="activity_resolver_use_always">תמיד</string>
+    <string name="activity_resolver_use_once">רק פעם אחת</string>
+    <string name="s_pref_bookmarks_summary">הצג מועדפים</string>
+    <string name="apply_to_all">האם ברצונך להחיל על כל התיקיות</string>
+    <string name="s_pref_view_folders">הגדרות תיקיה</string>
+    <string name="s_pref_view_general">הגדרות כלליות</string>
+    <string name="s_msg_folder_none">אין אפשרות ליצור תיקיה</string>
+    <string name="s_privacy">הצהרת פרטיות</string>
+    <string name="s_menu_system_mount_on">מערכת ניתנת לעריכה</string>
+    <string name="s_menu_system_mount_off">מערכת לקריאה בלבד</string>
+    <string name="s_pref_servers_private">שמור את השרתים בפרטי</string>
+    <string name="s_theme_lightdark">בהירות מסך</string>
+    <string name="s_menu_rate">דרג</string>
+    <string name="s_skip">דלג</string>
+    <string name="s_msg_file_exists">ייתכן כי חלק מיעד הקבצים קיים כבר,להמשיך בכל זאת?</string>
+    <string name="s_title_file_exists">קובץ קיים כבר</string>
+    <string name="s_browse">דפדפן</string>
+    <string name="s_ask_again">שאל תמיד</string>
+    <string name="s_archives">ארכיון</string>
+    <string name="s_delete_after">מחק מקור לאחר השלמת פעולה</string>
+    <string name="s_master_pass">סיסמה ראשית</string>
+    <string name="s_pass_old">הכנס סיסמה ישנה</string>
+    <string name="s_pass_new">הכנס סיסמה חדשה</string>
+    <string name="s_logout">התנתק</string>
+    <string name="s_bookmark_history">היסטוריה</string>
+    <string name="s_server_account_title">חשבון</string>
+    <string name="s_folders">תיקיות</string>
+    <string name="s_hidden">מותר</string>
+    <string name="s_total">סך הכל</string>
+    <string name="s_custom_account">חשבון לקוח</string>
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
old mode 100644
new mode 100755
index 090543c2..35c90447
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,55 +1,54 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-
-    <string name="s_search">検索</string>
-    <string name="s_photos">写真</string>
-    <string name="s_videos">ビデオ</string>
-    <string name="s_music">音楽</string>
-    <string name="s_downloads">ダウンロード</string>
-    <string name="s_external">外部</string>
-    <string name="s_internal">内部</string>
-    <string name="s_view">ビュー</string>
-    <string name="s_bookmarks">ブックマーク</string>
+<resources>
+    <string name="app_name">オープン エクスプローラー</string>
+    <string name="s_photos" auto="1">写真</string>
+    <string name="s_videos" auto="1">ビデオ</string>
+    <string name="s_music" auto="1">音楽</string>
+    <string name="s_downloads" auto="1">ダウンロード</string>
+    <string name="s_external" auto="1">外部</string>
+    <string name="s_internal" auto="1">内部</string>
+    <string name="s_view">閲覧</string>
+    <string name="s_bookmarks" auto="1">ブックマーク</string>
     <string name="s_menu_favorites">ブックマークに追加</string>
     <string name="s_menu_sort">並び替え</string>
-    <string name="s_menu_sort_name_asc">名前の昇順</string>
-    <string name="s_menu_sort_name_desc">名前の降順</string>
-    <string name="s_menu_sort_date_asc">新しい順</string>
-    <string name="s_menu_sort_date_desc">古い順</string>
-    <string name="s_menu_sort_size_asc">大きい順</string>
-    <string name="s_menu_sort_size_desc">小さい順</string>
-    <string name="s_menu_sort_type">ファイル形式</string>
+    <string name="s_menu_sort_name_asc">名前で並び替え(昇順)</string>
+    <string name="s_menu_sort_name_desc">名前で並び替え(降順)</string>
+    <string name="s_menu_sort_date_asc">新しい順に並び替え</string>
+    <string name="s_menu_sort_date_desc">古い順に並び替え</string>
+    <string name="s_menu_sort_size_asc">大きい順に並び替え</string>
+    <string name="s_menu_sort_size_desc">小さい順に並び替え</string>
+    <string name="s_menu_sort_type">ファイル形式で並び替え</string>
     <string name="s_menu_multi">複数選択</string>
     <string name="s_menu_grid">グリッド表示</string>
     <string name="s_menu_list">リスト表示</string>
-    <string name="s_menu_carousel">カルーセル表示</string>
+    <string name="s_menu_carousel" auto="1">カルーセル</string>
     <string name="s_menu_hidden">隠しファイルを表示</string>
     <string name="s_menu_thumbs">サムネイル画像を表示</string>
-    <string name="s_menu_new_folder">新しいフォルダー</string>
+    <string name="s_menu_new_folder">新しいフォルダ</string>
     <string name="s_menu_other">その他の設定</string>
     <string name="s_menu_flush">キャッシュ消去</string>
-    <string name="s_menu_root">ルート</string>
+    <string name="s_menu_root" auto="1">ルート</string>
     <string name="s_menu_prefs_folder">フォルダ設定</string>
-    <string name="s_menu_prefs_global">全般設定</string>
-    <string name="s_menu_info">情報</string>
-    <string name="s_menu_copy">コピー</string>
-    <string name="s_menu_cut">カット</string>
+    <string name="s_menu_prefs_global" auto="1">グローバル設定</string>
+    <string name="s_menu_info" auto="1">情報</string>
+    <string name="s_menu_copy" auto="1">コピー</string>
+    <string name="s_menu_cut">切り取り</string>
     <string name="s_menu_paste">貼り付け</string>
     <string name="s_menu_delete">削除</string>
     <string name="s_menu_share">送信/共有</string>
-    <string name="s_menu_zip">Zip圧縮</string>
+    <string name="s_menu_zip">Zipファイル(複数可)</string>
     <string name="s_menu_unzip">解凍</string>
-    <string name="s_menu_rename">名前の変更</string>
-    <string name="s_menu_bookmark">ブックマークに追加</string>
-    <string name="s_save">保存</string>
-    <string name="s_saveas">名前を付けて保存...</string>
-    <string name="s_cancel">キャンセル</string>
-    <string name="s_size">サイズ</string>
-    <string name="s_none">なし</string>
-    <string name="s_pref_servers">設定されているサーバー</string>
+    <string name="s_menu_rename" auto="1">名前の変更...</string>
+    <string name="s_menu_bookmark" auto="1">ブックマークに追加</string>
+    <string name="s_save" auto="1">保存</string>
+    <string name="s_saveas" auto="1">名前を付けて保存...</string>
+    <string name="s_cancel" auto="1">キャンセル</string>
+    <string name="s_size" auto="1">サイズ</string>
+    <string name="s_none" auto="1">なし</string>
+    <string name="s_pref_servers">追加されたサーバー</string>
     <string name="s_pref_server_add">+ 新しいサーバーを追加</string>
-    <string name="s_pref_display">表示設定</string>
-    <string name="s_pref_hidden">隠しファイルを表示</string>
+    <string name="s_pref_display" auto="1">表示設定</string>
+    <string name="s_pref_hidden" auto="1">隠しファイルを表示</string>
     <string name="s_pref_hidden_summary">隠しファイル/フォルダの表示</string>
     <string name="s_pref_thumbs">画像のサムネイルを表示</string>
     <string name="s_pref_thumbs_summary">画像/ビデオ/アプリのサムネイルを表示</string>
@@ -63,282 +62,297 @@
     <string name="s_pref_server_url">サーバーのURL</string>
     <string name="s_pref_server_url_summary">サーバーの完全なURL入力</string>
     <string name="s_pref_server_host">サーバーホスト</string>
-    <string name="s_pref_server_user">ユーザー</string>
+    <string name="s_pref_server_user" auto="1">ユーザー</string>
     <string name="s_pref_server_user_summary">ユーザー名</string>
-    <string name="s_pref_server_password">パスワード</string>
-    <string name="s_pref_server_password_summary">ログインパスワード</string>
-    <string name="s_pref_server_path">サブディレクトリ</string>
+    <string name="s_pref_server_password" auto="1">パスワード</string>
+    <string name="s_pref_server_password_summary" auto="1">ログインパスワード</string>
+    <string name="s_pref_server_path" auto="1">サブディレクトリ</string>
     <string name="s_pref_server_path_summary">デフォルトのログインディレクトリ入力</string>
     <string name="s_pref_server_extras">拡張設定</string>
-    <string name="s_pref_server_update">追加/更新サーバ</string>
+    <string name="s_pref_server_update" auto="1">追加/更新サーバ</string>
     <string name="s_pref_server_type">サーバーの種類</string>
-    <string name="s_files">ファイル</string>
+    <string name="s_files" auto="1">ファイル</string>
     <string name="s_create">作成</string>
-    <string name="s_title_holding_x_files">%sのファイルを保持</string>
+    <string name="s_title_holding_x_files" formatted="false">%sのファイルを保持</string>
     <string name="s_title_newfolder">新規フォルダ作成</string>
-    <string name="s_title_send">%sを送信</string>
-    <string name="s_title_unzip">%sを解凍</string>
-    <string name="s_title_zip">%sを圧縮</string>
-    <string name="s_title_executing">実行</string>
-    <string name="s_title_deleting">削除</string>
-    <string name="s_title_searching">検索</string>
-    <string name="s_title_moving">移動</string>
-    <string name="s_title_copying">コピー</string>
+    <string name="s_title_send" formatted="false">%sを送信</string>
+    <string name="s_title_unzip" formatted="false">%sを解凍</string>
+    <string name="s_title_zip" formatted="false">%sを圧縮</string>
+    <string name="s_title_executing">実行する</string>
+    <string name="s_title_deleting">削除する</string>
+    <string name="s_title_searching">検索する</string>
+    <string name="s_title_moving">移動する</string>
+    <string name="s_title_copying">コピーする</string>
     <string name="s_title_zipping">Zip圧縮する</string>
     <string name="s_title_unzipping">解凍中</string>
-    <string name="s_title_wait">しばらくお待ちください...</string>
-    <string name="s_alert_confirm_delete">%sを削除すると元に戻すことはできません。続行してもよろしいですか？</string>
-    <string name="s_alert_rename">このファイルの新しい名前を入力してください</string>
-    <string name="s_alert_newfolder">作成したいフォルダの名前を入力してくさだい</string>
-    <string name="s_alert_unzip">%sを解凍しますか？</string>
+    <string name="s_title_wait" auto="1">しばらくお待ちください...</string>
+    <string name="s_alert_confirm_delete" auto="1">％sを削除すると元に戻すことはできません。続行してもよろしいですか？</string>
+    <string name="s_alert_rename" auto="1">このファイルに新しい名前を入力してください</string>
+    <string name="s_alert_newfolder" auto="1">あなたが作成したいフォルダの名前を入力します。</string>
+    <string name="s_alert_unzip" formatted="false">%sをここへ、または幾つかのフォルダへ解凍しますか？</string>
     <string name="s_button_unzip_here">ここへ解凍</string>
     <string name="s_button_unzip_else">他の場所へ解凍</string>
-    <string name="s_msg_none">失敗しました</string>
-    <string name="s_msg_folder_exists">フォルダが既に存在しています</string>
-    <string name="s_msg_some">いくつかのファイルで失敗しました</string>
-    <string name="s_msg_all">成功しました</string>
-    <string name="s_msg_deleted">削除完了</string>
-    <string name="s_msg_moved">移動完了</string>
-    <string name="s_msg_copied">コピー完了</string>
+    <string name="s_msg_none">ファイル(複数の場合あり)はできません</string>
+    <string name="s_msg_some">幾つかのファイル(複数の場合あり)はできません</string>
+    <string name="s_msg_all">ファイル(複数の場合あり)は成功</string>
+    <string name="s_msg_deleted">削除済み</string>
+    <string name="s_msg_moved">移動済み</string>
+    <string name="s_msg_copied">コピー済み</string>
     <string name="s_remove">取り除く</string>
     <string name="s_eject">取り出し</string>
-    <string name="s_update">更新</string>
-    <string name="s_alert_bookmark_rename">ブックマークのタイトルを変更します</string>
-    <string name="s_title_bookmark_prefix">ブックマークの管理：</string>
-    <string name="s_alert_remove_safe">ドライブは安全に取り外す事が出来ます</string>
-    <string name="s_alert_remove_error">ドライブの安全な取り外しに失敗しました</string>
+    <string name="s_update" auto="1">更新</string>
+    <string name="s_alert_bookmark_rename" auto="1">ブックマークのタイトルを変更します。</string>
+    <string name="s_title_bookmark_prefix" auto="1">ブックマークの管理：</string>
+    <string name="s_alert_remove_safe">ドライブを安全に取り除く事が出来るようになりました</string>
+    <string name="s_alert_remove_error" auto="1">取り出すことができません。</string>
     <string name="s_menu_about">このアプリについて</string>
-    <string name="s_about_version">バージョン</string>
-    <string name="s_about_author">作者</string>
-    <string name="s_about_site">ウェブサイト</string>
-    <string name="s_about_email">メール</string>
-    <string name="s_about_recent">最近の更新</string>
-    <string name="s_chooser_email">フィードバックを送信...</string>
-    <string name="s_status_loading">読み込み中...</string>
-    <string name="s_menu_open">で開く</string>
-    <string name="s_menu_edit">で編集</string>
-    <string name="s_pref_stats_title">OpenExplorerを向上させる</string>
-    <string name="s_pref_stats_summary">匿名の使用統計を送信します ユーザーを識別することが出来る情報は含まれていません</string>
-    <string name="s_error_no_intents">この種類のファイルを開くことの出来るアプリケーションがインストールされていません</string>
-    <string name="s_menu_root_disabled">ルートを無効化</string>
-    <string name="s_pref_start">起動フォルダ</string>
-    <string name="s_pref_start_summary">OpenExplorerの起動時に表示するフォルダ</string>
-    <string name="s_custom">カスタム</string>
-    <string name="s_text_intro_top">OpenExplorerへようこそ！</string>
-    <string name="s_text_intro_body">OpenExplorerはあなたのファイルシステムやクラウド上での生産的な活動のサポートを目標としています。ビデオや写真を管理するなら、ローカルかネットワークかを問わずOpenExplorerは期待に応えられるでしょう。\n\n起動時フォルダを選択してください:</string>
-    <string name="s_info_num_folders">フォルダの数:</string>
-    <string name="s_info_num_files">ファイル数:</string>
-    <string name="s_info_last_modified">最終更新日:</string>
-    <string name="s_info_permissions">権限:</string>
-    <string name="s_info_permission_read">読み込み:</string>
-    <string name="s_info_permission_write">書き込み:</string>
-    <string name="s_info_permission_execute">実行:</string>
-    <string name="s_toggle_keyboard">キーボード</string>
+    <string name="s_about_version" auto="1">バージョン</string>
+    <string name="s_about_author" auto="1">作成者</string>
+    <string name="s_about_site" auto="1">ウェブサイト</string>
+    <string name="s_about_email" auto="1">メール</string>
+    <string name="s_about_recent" auto="1">最近の更新</string>
+    <string name="s_chooser_email" auto="1">フィードバックを送信...</string>
+    <string name="s_status_loading" auto="1">読み込み中...</string>
+    <string name="s_menu_open" auto="1">で開く...</string>
+    <string name="s_menu_edit" auto="1">で編集...</string>
+    <string name="s_pref_stats_title" auto="1">OpenExplorerを向上させる</string>
+    <string name="s_pref_stats_summary" auto="1">匿名の使用統計を送信します。これは、ユーザーを識別するために使用される可能性のある情報が含まれていません。</string>
+    <string name="s_error_no_intents" auto="1">インストール済みのアプリケーションは、この種類のファイルを読み取ることはできません。</string>
+    <string name="s_menu_root_disabled" auto="1">ルートを無効に</string>
+    <string name="s_pref_start" auto="1">起動フォルダ</string>
+    <string name="s_pref_start_summary">OpenExplorerの起動時フォルダを示します</string>
+    <string name="s_custom" auto="1">カスタム...</string>
+    <string name="s_text_intro_top" auto="1">OpenExplorerへようこそ！</string>
+    <string name="s_text_intro_body">OpenExplorerの開発目標は、Androidのファイルシステムやクラウド上であなたがより生産的になれるようにする事です。あなたが多くのフォルダやあなたのウェブサーバーからftpを介してビデオや写真を管理する必要があるなら、OpenExplorerはあなたの必要に適するでしょう。\n\n起動時フォルダを選択してください：</string>
+    <string name="s_info_num_folders" auto="1">フォルダの数：</string>
+    <string name="s_info_num_files" auto="1">ファイル数：</string>
+    <string name="s_info_last_modified" auto="1">最終更新日：</string>
+    <string name="s_info_permissions" auto="1">ファイルの権限：</string>
+    <string name="s_info_permission_read">読み込み：</string>
+    <string name="s_info_permission_write" auto="1">書き込み：</string>
+    <string name="s_info_permission_execute">実行：</string>
+    <string name="s_toggle_keyboard" auto="1">キーボード</string>
     <string name="s_show_password">パスワードを表示</string>
     <string name="s_error_ftp">ネットワークへの接続エラー</string>
-    <string name="s_prompt_zip">新しいZipファイルのファイル名</string>
-    <string name="app_edit">OpenExplorerで編集</string>
-    <string name="s_menu_more">その他のオプション...</string>
-    <string name="s_msg_low_memory">メモリ不足です！</string>
+    <string name="s_prompt_zip" auto="1">新しいZipファイルのファイル名を入力します。</string>
+    <string name="app_edit" auto="1">OpenExplorerで編集</string>
+    <string name="s_menu_more" auto="1">その他のオプション...</string>
+    <string name="s_msg_low_memory" auto="1">メモリ不足！</string>
     <string name="s_clear">消去</string>
     <string name="s_menu_delete_all">全削除</string>
-    <string name="s_menu_move_all">ここに移動</string>
-    <string name="s_menu_copy_all">ここにコピー</string>
-    <string name="s_confirm_delete">本当に%sを削除しても宜しいですか？</string>
-    <string name="s_error_same_destination">移動元とコピー先のディレクトリが同じです</string>
-    <string name="s_sample_notification">SDカードにコピー中</string>
+    <string name="s_menu_move_all">移動する</string>
+    <string name="s_menu_copy_all">コピーする</string>
+    <string name="s_confirm_delete" formatted="false">本当に%sを削除しても宜しいですか？</string>
+    <string name="s_error_same_destination" auto="1">コピー先のディレクトリは同じです。</string>
+    <string name="s_sample_notification">コピー中→SDカード:</string>
     <string name="s_pref_fullscreen">全画面</string>
     <string name="s_pref_fullscreen_summary_on">通知バーを非表示</string>
     <string name="s_pref_fullscreen_summary_off">通知バーを表示</string>
     <string name="s_pref_pagers">ページャーを表示</string>
-    <string name="s_pref_pagers_summary_on">水平方向のスワイプでディレクトリを移動する</string>
-    <string name="s_pref_pagers_summary_off">水平方向のスワイプを使用しない</string>
-    <string name="s_alert_new_media">新しいメディアが挿入されました！</string>
-    <string name="s_warn_pager_title">新機能:ビューページャ</string>
-    <string name="s_warn_pager">左右にスワイプすることでディレクトリの階層を移動することができます。ナビゲーションとして非常に有用です。是非試してみてください！</string>
-    <string name="s_warn_confirm">わかりましたか？</string>
-    <string name="s_warn_disable">無効にする</string>
+    <string name="s_pref_pagers_summary_on" auto="1">水平方向のスワイプ=ディレクトリのナビゲーション</string>
+    <string name="s_pref_pagers_summary_off">水平方向のスワイプは無効</string>
+    <string name="s_alert_new_media" auto="1">新しいメディアが挿入された！</string>
+    <string name="s_warn_pager_title" auto="1">新機能：ビューページャ</string>
+    <string name="s_warn_pager" auto="1">スワイプは、ディレクトリと戻るために右から左まで移動し、左から右へ。これは、ナビゲートしやすくする必要があります。 （外部メディア上の）それを試してみてください！</string>
+    <string name="s_warn_confirm" auto="1">わかりますか？</string>
+    <string name="s_warn_disable" auto="1">無効にする</string>
     <string name="s_pref_intent_internal">内部インテント</string>
     <string name="s_pref_intent_internal_on">OpenExplorerのインテントマネージャーを使う</string>
     <string name="s_pref_intent_internal_off">Androidのインテントマネージャーを使う</string>
     <string name="s_pref_text_internal">内部テキストエディタを使う</string>
-    <string name="s_text_editor_title">テキストエディタ</string>
+    <string name="s_text_editor_title" auto="1">テキストエディタ</string>
     <string name="s_pref_show_root">ルートファイルシステム(/)を表示</string>
     <string name="s_pref_show_internal">内部メディアを表示</string>
     <string name="s_pref_show_external">外部メディアを表示</string>
-    <string name="s_error_no_media">挿入したメディアが存在しないようです USB共有または再挿入するメディアを無効にしてください</string>
+    <string name="s_error_no_media" auto="1">挿入したメディアが存在しないように見えます。 USB共有または再挿入するメディアを無効にしてください。</string>
     <string name="s_prompt_password">パスワードを入力</string>
     <string name="s_add">追加</string>
     <string name="s_server_ftp">FTP</string>
-    <string name="s_server_sftp">SFTP</string>
-    <string name="s_pref_server_port">ポート</string>
-    <string name="s_about_buildtime">ビルド日</string>
-    <string name="s_default">デフォルト</string>
-    <string name="s_pref_timeout">タイムアウト</string>
-    <string name="s_pref_timeout_summary">秒単位のタイムアウト</string>
+    <string name="s_server_sftp" auto="1">SFTP</string>
+    <string name="s_pref_server_port" auto="1">ポート</string>
+    <string name="s_about_buildtime">更新日付</string>
+    <string name="s_default" auto="1">デフォルト</string>
+    <string name="s_pref_timeout" auto="1">タイムアウト</string>
+    <string name="s_pref_timeout_summary" auto="1">秒単位のタイムアウト</string>
     <string name="s_menu_up">上へ</string>
     <string name="s_prompt_unzip">解凍先を入力：</string>
-    <string name="s_pref_hardware_accel">ハードウェアアクセラレーションを有効にする</string>
-    <string name="s_pref_honeyplus">アンドロイド3.0 +の設定</string>
-    <string name="s_pref_actionmode">アクションモード</string>
-    <string name="s_pref_actionmode_enabled">アクションモードを使用</string>
+    <string name="s_pref_hardware_accel" auto="1">ハードウェアアクセラレーションを有効にする</string>
+    <string name="s_pref_honeyplus" auto="1">アンドロイド3.0 +の設定</string>
+    <string name="s_pref_actionmode" auto="1">アクションモード</string>
+    <string name="s_pref_actionmode_enabled" auto="1">アクションモードを使用</string>
     <string name="s_pref_actionmode_disabled">標準コンテキストメニューを使う</string>
-    <string name="s_server_smb">SMB / Windows</string>
-    <string name="s_bookmark_drives">ドライブ</string>
-    <string name="s_bookmark_smart">スマートフォルダ</string>
-    <string name="s_bookmark_favorites">お気に入り</string>
+    <string name="s_server_smb" auto="1">SMB / Windowsの</string>
+    <string name="s_bookmark_drives" auto="1">ドライブ</string>
+    <string name="s_bookmark_smart" auto="1">スマートフォルダ</string>
+    <string name="s_bookmark_favorites" auto="1">お気に入り</string>
     <string name="s_bookmark_servers">サーバー</string>
-    <string name="s_bookmark_cache">キャッシュ</string>
-    <string name="s_info_totalspace">ディスクの総空き容量;</string>
-    <string name="s_info_freespace">ディスクの空き容量:</string>
-    <string name="s_status_rate">転送速度:</string>
-    <string name="s_about_hardware">ハードウェア</string>
+    <string name="s_bookmark_cache" auto="1">キャッシュ</string>
+    <string name="s_info_totalspace">ディスクの総空き容量：</string>
+    <string name="s_info_freespace">ディスクの空き容量：</string>
+    <string name="s_status_rate" auto="1">レート：</string>
+    <string name="s_about_hardware" auto="1">ハードウェア</string>
     <string name="s_menu_refresh">フォルダ更新</string>
-    <string name="s_pref_reset">再生回数をリセットする</string>
+    <string name="s_pref_reset" auto="1">再生回数をリセットする</string>
     <string name="s_toast_complete">処理完了！</string>
-    <string name="s_pref_reset_summary">すべてのフォルダの固有の表示設定を削除し、デフォルトに戻すにはここをクリックしてください</string>
-    <string name="s_prompt_path">パスを入力してください</string>
-    <string name="s_prompt_search">検索:</string>
-    <string name="s_prompt_search_within">フォルダ内で検索:</string>
+    <string name="s_pref_reset_summary" auto="1">デフォルトの状態に戻って、すべてのフォルダに固有の表示設定を削除するにはここをクリックしてください。</string>
+    <string name="s_prompt_path" auto="1">パスを入力してください。</string>
+    <string name="s_prompt_search" auto="1">検索：</string>
+    <string name="s_prompt_search_within" auto="1">内で検索：</string>
     <string name="s_pref_view_category">ブックマークビューの設定</string>
     <string name="s_pref_show_videos">動画を表示</string>
-    <string name="s_pref_show_photos">写真を表示</string>
+    <string name="s_pref_show_photos" auto="1">写真を表示</string>
     <string name="s_pref_show_music">音楽を表示</string>
-    <string name="s_pref_show_downloads">ダウンロードを表示</string>
-    <string name="s_hide">隠す</string>
+    <string name="s_pref_show_downloads" auto="1">ダウンロードを表示</string>
+    <string name="s_hide" auto="1">隠す</string>
     <string name="s_show">表示</string>
-    <string name="s_msg_event_cancelled">イベントがキャンセルされました</string>
-    <string name="s_alert_newfolder_folder">新規フォルダの作成先:</string>
-    <string name="s_pref_fancy_category">ファンシーディスプレイの設定</string>
-    <string name="s_pref_fancy_menus">ファンシーメニュー</string>
-    <string name="s_pref_fancy_context">ファンシーコンテキストメニュー</string>
-    <string name="s_search_files">ファイルシステムを検索</string>
-    <string name="search_summary" formatted="false" tools:ignore="TypographyEllipsis">"%s"を%s(%d)の中で検索してます...</string>
-    <string name="search_results" tools:ignore="StringFormatMatches" formatted="false">"%s"は%sの中で%d個見つかりました</string>
+    <string name="s_msg_event_cancelled" auto="1">イベントがキャンセルされました。</string>
+    <string name="s_alert_newfolder_folder">新規フォルダの作成先：</string>
+    <string name="s_pref_fancy_category" auto="1">ファンシーディスプレイの設定</string>
+    <string name="s_pref_fancy_menus" auto="1">ファンシーメニュー</string>
+    <string name="s_pref_fancy_context" auto="1">ファンシーコンテキストメニュー</string>
+    <string name="s_search_files" auto="1">検索ファイルシステム</string>
+    <string name="search_summary" auto="1">％sを探します n &quot;％s&quot;は（％d）の中で...</string>
+    <string name="search_results" auto="1">％sの中で &quot;％s&quot;は nのが見つかりました％d個の結果</string>
     <string name="s_menu_exit">終了</string>
-    <string name="s_warn_wtf_message">おっと！未処理のエラーが発生したようです！多くのベータ版のアプリで共通の問題ですが、このような問題を解決する唯一の方法は、さまざまなデバイスからレポートを受信することです。私達開発者にのみ、匿名のデータを含むレポートを送信しまますか？</string>
-    <string name="s_warn_wtf_ps">注意***このアプリはベータ版です。クラッシュしたというだけの理由で、このアプリに悪い評価を与えないでください。本当にあなたを悩ませている場合だけアンインストールしてください。ありがとう！</string>
+    <string name="s_warn_wtf_message" auto="1">おっと！これは、未処理のエラーが発生したことが表示されます！これは多くのベータ版のアプリで共通の問題であるとして、これらの問題を解決する唯一の方法は、問題を解決する方法を決定するためには、このようなあなたのようなさまざまなデバイスからレポートを受信することである。私たちは開発者にのみ、匿名のデータを含む、そのようなレポートを送信できますか？</string>
+    <string name="s_warn_wtf_ps" auto="1">注意してください***このアプリはベータ版です。それがクラッシュしたというだけの理由で、このアプリに悪い評価を与えないでください。それは本当にあなたを悩ませている場合だけアンインストールしてください。ありがとう！</string>
     <string name="s_yes">はい</string>
     <string name="s_no">いいえ</string>
-    <string name="s_wtf_preview">プレビューレポートデータ</string>
-    <string name="s_wtf_remember">今後この質問を表示しない</string>
-    <string name="s_pref_basebar">アクションバーを分割</string>
-    <string name="s_pref_basebar_on">ポートレートモードで画面下部にアクションボタンを表示する</string>
-    <string name="s_pref_basebar_off">使用可能な場合は画面上部にアクションボタンを表示する</string>
-    <string name="s_pref_autowtf">クラッシュレポートの自動送信</string>
-    <string name="s_pref_autowtf_summary">未処理の例外が発生した場合、自動的にレポートを送信する</string>
-    <string name="s_split_auto">自動</string>
-    <string name="s_split_top">ボタンを強制的に上に配置</string>
-    <string name="s_split_top_single">ワンボタンを強制的に配置</string>
-    <string name="s_split_bottom">ボタンを強制的にを下に配置</string>
-    <string name="s_split_none">システムメニュー内のすべてのボタンを配置</string>
-    <string name="s_about_screensize">画面サイズ</string>
-    <string name="s_about_density">解像度</string>
-    <string name="s_menu_location_int">内部メモリのパス</string>
+    <string name="s_wtf_preview" auto="1">プレビューレポートデータ</string>
+    <string name="s_wtf_remember" auto="1">今後この質問を表示しない</string>
+    <string name="s_pref_basebar" auto="1">アクションバーを分割</string>
+    <string name="s_pref_basebar_on" auto="1">ポートレートモードで画面の下部にあるアクションボタン</string>
+    <string name="s_pref_basebar_off" auto="1">画面上部のアクションボタン（使用可能な場合）</string>
+    <string name="s_pref_autowtf" auto="1">自動送信クラッシュレポート</string>
+    <string name="s_pref_autowtf_summary" auto="1">未処理の例外が発生した場合、自動的にレポートを送信します。</string>
+    <string name="s_split_auto" auto="1">自動</string>
+    <string name="s_split_top">ボタンを押すとトップへ移動</string>
+    <string name="s_split_top_single">このボタンを押すとトップへ移動</string>
+    <string name="s_split_bottom">ボタンを押すと下へ移動</string>
+    <string name="s_split_none" auto="1">システムメニュー内のすべてのボタンを配置</string>
+    <string name="s_about_screensize" auto="1">画面サイズ</string>
+    <string name="s_about_density" auto="1">密度</string>
+    <string name="s_menu_location_int" auto="1">内部メモリのパス</string>
     <string name="s_menu_location_ext">外部メモリのパス</string>
-    <string name="s_wtf_context">クラッシュの概要を記述してください:</string>
-    <string name="thanks">ありがとうございました！</string>
+    <string name="s_wtf_context" auto="1">クラッシュのコンテキストを記述してください：</string>
+    <string name="thanks" auto="1">ありがとうございました！</string>
     <string name="menu_view_font_small">小フォント</string>
     <string name="menu_view_font_medium">中フォント</string>
     <string name="menu_view_font_large">大フォント</string>
-    <string name="app_description">Open Explorer - すべてのデバイスのためのオープンソースのファイルマネージャ！(タブレット・スマートフォン・Googleのテレビ、そしてサンドイッチ！)\nファイルシステムの完全な管理\n-USB、SDおよびその他の外部メディア\n - ネットワークへの接続(FTP、SFTP、SMB /のSamba / Windows / LAN / WIFI)\n - ビルトインテキストエディタ\n様々なメディアを自動的に読み込むスマートフォルダ(ビデオ、写真、音楽、ダウンロード)\n - ページャーディレクトリナビゲーション(左右のスワイプでフォルダの階層を移動)\nスーパユーザ/ルート機能/システムフォルダの読み込み(書き込みは未対応)\n\n特徴:\n-タブテキストエディタ\n-多くのネットワーク機能(Dropbox・Box.net・SkyDrive)\n - クラウドへの接続無しにファイルを記憶するオフラインファイルキャッシュ\n大きなファイルがどのくらいのスペースを使っているか、わかりやすく表示する容量グラフ\n\n*注意：このアプリはベータ版です。多くのバグが残っています。これらのバグを回避したい場合は、このアプリをダウンロードしないでください。私にこれらのバグを知らせたい場合は電子メールを送るか、またはGitHubの(https://github.com/BrandoCommando/OpenExplorer/)で私に協力してください。悪い評価をすることは誰も助けないと言うのを覚えておいてください。</string>
-    <string name="alert_translate_google">こんにちは、この翻訳はGoogle翻訳で提供されています。英語と%sを使えますか？よりよい翻訳にご協力くださる場合は、このボタンをクリックしてください:</string>
-    <string name="alert_translate_none">こんにちは、あなたはサポートされていない言語を使用しているようです。英語と%sを使えますか？正しい翻訳にご協力くださる場合は、ここをクリックしてください:</string>
+    <string name="app_description" auto="1">エクスプローラを開き - すべてのデバイスのオープンソースのファイルマネージャ！ （錠剤、携帯電話、Googleのテレビ、サンドイッチ！）に nコンプリートファイルシステムの管理 n-USB、SDおよびその他の外部メディアの n - ネットワーク接続可能（FTP、SFTP、SMB /のSamba / Windows / LAN / WIFI）を n - テキスト·エディタは、 n、スマートフォルダ、メディアの種類（ビデオ、写真、音楽、ダウンロードする） n - ビューベルディレクトリナビゲーション（ディレクトリを移動する強打の右）に nスーパユーザ/ルート機能/リストへのスキャンシステムフォルダを読んでない（システムがまだ書かない）に来るの n  nFeaturesます： n-タブテキストエディタに n-多くのネットワーク機能（Dropboxが、Box.net、スカイドライブ）に n - オフラインファイル構造のキャッシュは、どのファイルを覚えていますあなたが接続する必要が n型ディスク·スペースのヒートマップは、あなたの最大のファイルがどこにあるかを示していなくても、別の場所に持っているの nを n *ご注意：このアプリはベータ版です。多くのバグが残っています。あなたはこれらのバグを体験したくない場合は、どうぞ、このアプリをダウンロードしないでください。あなたは私がこれらのバグを見つけるために希望される場合は、私に電子メールを送るか、またはGitHubの（https://github.com/BrandoCommando/OpenExplorer/）で私に協力してください。悪い評価は誰も助けない覚えておいてください。</string>
+    <string name="alert_translate_google" auto="1">こんにちは、この翻訳はGoogle翻訳で提供されています。あなたが同様に％sは、英語を知って、よりよい翻訳を提供することを支援するためにご希望の場合は、このボタンをクリックしてください。</string>
+    <string name="alert_translate_none">あなたはサポートされていない言語を使用しているようです。あなたは英語と％sを知っていますか？正しい翻訳を提供する際に支援いただける場合は、ここをクリックしてください：</string>
     <string name="button_translate">翻訳</string>
-    <string name="s_status_remaining">時間</string>
-    <string name="s_pref_logview">ネットワークログ</string>
-    <string name="s_alert_dirty">%sは変更されています 保存しますか？</string>
-    <string name="s_menu_sort_folders">フォルダを前にソート</string>
-    <string name="s_alert_back_to_exit">もう一度戻るボタンを押すと終了します</string>
-    <string name="s_pref_zip_internal">Zipファイルの扱い方</string>
-    <string name="s_pref_zip_internal_on">Zipファイルをフォルダとして扱う</string>
-    <string name="s_pref_zip_internal_off">Zipファイルをファイルとして扱う</string>
-    <string name="s_menu_stop">停止</string>
-    <string name="s_menu_stop_all">すべて停止</string>
-    <string name="s_cancelled">キャンセルしました</string>
-    <string name="s_complete">完了</string>
-    <string name="s_view_font_size">フォントサイズ</string>
-    <string name="httpError">ネットワークエラーが発生しました</string>
-    <string name="httpErrorAuth">認証に失敗しました</string>
+    <string name="httpError">ネットワークエラーが発生しました。</string>
+    <string name="httpErrorAuth">認証できませんでした。</string>
     <string name="httpErrorProxyAuth">プロキシサーバーを使用した認証に失敗しました。</string>
-    <string name="httpErrorConnect">サーバーに接続できませんでした</string>
-    <string name="httpErrorIO">サーバーと通信できませんでした しばらくしてからもう一度試してください</string>
-    <string name="httpErrorTimeout">サーバーへの接続がタイムアウトになりました</string>
-    <string name="httpErrorFile">ファイルにアクセスできませんでした</string>
-    <string name="httpErrorFileNotFound">要求されたファイルが見つかりませんでした</string>
+    <string name="httpErrorConnect">サーバーに接続できませんでした。</string>
+    <string name="httpErrorIO">サーバーと通信できませんでした。しばらくしてからもう一度試してください。</string>
+    <string name="httpErrorTimeout">サーバーへの接続がタイムアウトになりました。</string>
+    <string name="httpErrorFile">ファイルにアクセスできませんでした。</string>
+    <string name="httpErrorFileNotFound">要求されたファイルが見つかりませんでした。</string>
     <string name="contentServiceSync">同期</string>
     <string name="keyguard_password_enter_pin_code">PINコードを入力</string>
     <string name="keyguard_password_enter_password_code">パスワードを入力</string>
     <string name="keyguard_password_enter_pin_password_code">PINを入力</string>
     <string name="lockscreen_password_wrong">やり直してください</string>
-    <string name="whichApplication">アプリケーションを選択</string>
-    <string name="noApplications">この操作を実行できるアプリケーションがありません</string>
+    <string name="whichApplication">操作を完了して下さい</string>
+    <string name="noApplications">この操作を実行できるアプリケーションはありません。</string>
     <string name="report">レポート</string>
     <string name="sim_restart_button">再起動</string>
     <string name="extmedia_format_button_format">フォーマット</string>
-    <string name="ext_media_nofs_notification_message" product="nosdcard">USBストレージが空であるか、サポートされていないファイルシステムを使用しています</string>
-    <string name="ext_media_nofs_notification_message" product="default">SDカードが空か、サポート対象外のファイルシステムを使用しています</string>
+    <string name="ext_media_nofs_notification_message">USBストレージが空であるか、サポートされていないファイルシステムを使用しています。</string>
     <string name="activity_list_empty">一致するアクティビティが見つかりません</string>
-    <string name="ime_action_go">移動</string>
-    <string name="ime_action_send">送信</string>
-    <string name="ime_action_done">完了</string>
-    <string name="ime_action_default">実行</string>
-    <string name="upload_file">ファイルを選択</string>
-    <string name="no_file_chosen">ファイルを選択してください</string>
+    <string name="ime_action_go">行く</string>
+    <string name="ime_action_send">移動</string>
+    <string name="ime_action_done">終了</string>
+    <string name="ime_action_default">完了</string>
+    <string name="upload_file">実行</string>
+    <string name="no_file_chosen">ファイルが選択されていませんファイルを選択</string>
     <string name="reset">リセット</string>
     <string name="back_button_label">戻る</string>
-    <string name="next_button_label">進む</string>
-    <string name="no_matches">マッチ無し</string>
+    <string name="next_button_label">次へ</string>
+    <string name="no_matches">該当なし</string>
     <string name="find_on_page">ページ内を検索</string>
     <string name="find">検索</string>
-    <string name="activitychooserview_choose_application">アプリケーションの選択</string>
+    <string name="activitychooserview_choose_application">アプリの選択</string>
     <string name="shareactionprovider_share_with">共有</string>
-    <string name="storage_internal">内部ストレージ</string>
+    <string name="storage_internal">内部メモリ</string>
     <string name="storage_sd_card">SDカード</string>
     <string name="storage_usb">USBストレージ</string>
     <string name="extract_edit_menu_button">編集...</string>
-    <string name="activity_chooser_view_see_all">すべて見る...</string>
-    <string name="s_pref_showup">常にフォルダを前にソートする</string>
-    <string name="close">閉じる</string>
+    <string name="activity_chooser_view_see_all">全て見る...</string>
     <string name="s_title_picker">ディレクトリを選択してください</string>
     <string name="selected_path">選択されたパス</string>
     <string name="filename">ファイル名</string>
-    <string name="s_msg_saved">保存完了</string>
+    <string name="s_msg_saved">保存済み</string>
     <string name="s_menu_view_line_numbers">行数</string>
-    <string name="s_pref_text_max_size">編集可能な最大ファイルサイズ</string>
-    <string name="warn_text_editor">Text Editorへようこそ テキストを長押しすると編集モードに入ります</string>
-    <string name="warn_networking">Networkingへようこそ これは開発中の機能です バグを含んでいるでしょうから、それによる悪い評価をGoogle playでしないでくださいね</string>
+    <string name="warn_text_editor">Text Editorへようこそ。テキストを長押しして編集モードに入ってください。</string>
+    <string name="warn_networking">Networkingへようこそ。開発中の機能でバグを含んでいるでしょうから、この機能によってGoogle playにて悪い評価をしないようお願いします。</string>
     <string name="s_menu_new_file">新規テキストファイル</string>
-    <string name="s_msg_created">作成完了</string>
+    <string name="s_msg_created">作成済み</string>
     <string name="s_title_newfile">新規ファイル</string>
     <string name="s_alert_newfile_folder">新しいファイルの作成先</string>
     <string name="s_alert_newfile">新しいファイルの名前を入力:</string>
     <string name="s_alert_exit">本当に終了しますか？</string>
-    <string name="s_alert_clipboard">クリップボードへコピーしました</string>
-    <string name="s_alert_restart">再起動中 しばらくお待ちください</string>
+    <string name="s_alert_clipboard">クリップボードへコピー済み</string>
+    <string name="s_alert_restart">再起動中。暫く待ってください。</string>
     <string name="language">言語</string>
     <string name="s_menu_download">ダウンロード</string>
     <string name="scan">スキャン</string>
     <string name="test">テスト</string>
     <string name="test_success">接続成功！</string>
-    <string name="no_items">アイテム無し</string>
+    <string name="no_items">アイテムが見つかりません</string>
     <string name="clipboard">クリップボード</string>
     <string name="theme">テーマ</string>
-    <string name="chooser_remember">選択を記憶</string>
+    <string name="chooser_remember">選択を保持</string>
     <string name="activity_resolver_use_always">常に</string>
-    <string name="activity_resolver_use_once">今回だけ</string>
-    <string name="s_pref_bookmarks_summary">ブックマークを表示</string>
-    <string name="s_menu_heatmap">容量グラフ</string>
-    <string name="apply_to_all">すべてのフォルダに変更を適用しますか？</string>
+    <string name="activity_resolver_use_once">一度だけ</string>
+    <string name="s_pref_bookmarks_summary">ブックマーク一覧</string>
+    <string name="apply_to_all">すべてのフォルダに対して処理しますか？</string>
     <string name="s_pref_view_folders">フォルダ設定</string>
-    <string name="s_pref_view_general">全般設定</string>
-    <string name="s_pref_text_wrap">テキストの自動改行表示</string>
-    <string name="s_pref_thumbs_cache_clear">サムネイルのキャッシュを削除</string>
-    <string name="s_msg_folder_none">フォルダを作成できませんでした</string>
-
-    <plurals name="num_selected">
-        <item quantity="one">1個のファイルを選択</item>
-        <item quantity="other"><xliff:g id="count">%d</xliff:g>個のファイルを選択</item>
-    </plurals>
-
-</resources>
\ No newline at end of file
+    <string name="s_pref_view_general">一般設定</string>
+    <string name="s_msg_folder_none">フォルダを作成できません</string>
+    <string name="s_privacy">プライバシーポリシー</string>
+    <string name="s_menu_system_mount">/systemを書込可とする(危険!)</string>
+    <string name="s_menu_system_mount_on">読込のみ可</string>
+    <string name="s_menu_system_mount_off">読込のみ</string>
+    <string name="s_theme_lightdark">光と影</string>
+    <string name="s_theme_custom">ピンストライプ</string>
+    <string name="s_menu_rate">評価</string>
+    <string name="s_alert_destination_exists" auto="1">宛先は、すでに存在しています。あなたは何がしたいの？</string>
+    <string name="s_overwrite" auto="1">上書きする</string>
+    <string name="s_skip" auto="1">スキップ</string>
+    <string name="s_msg_file_exists" auto="1">一部の接続先のファイルが既に存在する場合があります。上書きするには[OK？</string>
+    <string name="s_title_file_exists" auto="1">ファイルが既に存在します。</string>
+    <string name="s_msg_pref_archives" auto="1">アーカイブを参照したり、抽出したいですか？</string>
+    <string name="s_browse" auto="1">ブラウズ</string>
+    <string name="s_extract" auto="1">抽出する</string>
+    <string name="s_extracted" auto="1">抽出した</string>
+    <string name="s_extracting" auto="1">抽出</string>
+    <string name="s_extract_with" auto="1">で抽出...</string>
+    <string name="s_title_archive_handler" auto="1">アーカイブ·ハンドラ</string>
+    <string name="s_ask_again" auto="1">毎回頼む</string>
+    <string name="s_archives" auto="1">アーカイブズ</string>
+    <string name="s_compress" auto="1">圧縮する</string>
+    <string name="s_compress_type" auto="1">圧縮タイプ</string>
+    <string name="s_compressed" auto="1">圧縮された</string>
+    <string name="s_delete_after" auto="1">完成後のソースを削除</string>
+    <string name="s_master_pass" auto="1">マスターパスワード</string>
+    <string name="s_master_pass_warning" auto="1">任意の保存されたパスワードの暗号化キーとして使用されるマスターパスワードを入力することもできます。この空白のままにすると、パスワードは暗号化され、デフォルトのマスターパスワードが使用されます。あなたが保存されたネットワークパスワードを使用してパスワードを更新した場合、あなたはおそらく、パスワードをリセットして、このパスワードをリセットした後、クラウドサーバを認証する必要がありますのでご了承ください。</string>
+    <string name="s_pass_old" auto="1">古いパスワードを入力してください：</string>
+    <string name="s_pass_new" auto="1">新しいパスワードを入力してください：</string>
+    <string name="s_logout" auto="1">ログアウト</string>
+    <string name="s_authenticate" auto="1">認証</string>
+    <string name="s_authenticating" auto="1">認証</string>
+    <string name="s_bookmark_history" auto="1">歴史</string>
+    <string name="s_server_account_title" auto="1">アカウント：</string>
+    <string name="s_authenticate_success" auto="1">認証に成功しました。</string>
+    <string name="s_authenticate_refresh" auto="1">リフレッシュ認証</string>
+    <string name="s_pref_thumbs_cache" auto="1">プリキャッシュのサムネイル</string>
+    <string name="s_pref_thumbs_cache_summary" auto="1">これは、写真とビデオを含むフォルダを読み込み速度をアップするのに役立ちます。</string>
+    <string name="s_folders" auto="1">フォルダ</string>
+    <string name="s_hidden" auto="1">隠された</string>
+    <string name="s_total" auto="1">合計</string>
+    <string name="s_custom_account" auto="1">カスタムアカウント</string>
+</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
old mode 100644
new mode 100755
index 3b7814c1..7c8641a2
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
     <string name="s_photos">ფოტოები</string>
     <string name="s_videos">ვიდეო</string>
     <string name="s_music">მუსიკა</string>
@@ -26,5 +25,4 @@
     <string name="s_menu_exit">გასვლა</string>
     <string name="s_yes">კი</string>
     <string name="s_no">არა</string>
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
old mode 100644
new mode 100755
index 1c131d7a..f5851f73
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,84 +1,83 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
-    <string name="app_name" auto="1">오픈 탐색기</string>
-    <string name="s_photos" auto="1">사진</string>
-    <string name="s_videos" auto="1">동영상</string>
-    <string name="s_music" auto="1">음악</string>
-    <string name="s_downloads" auto="1">다운로드</string>
+    <string name="app_name">Explorer 열기</string>
+    <string name="s_photos">사진</string>
+    <string name="s_videos">동영상</string>
+    <string name="s_music">음악</string>
+    <string name="s_downloads">다운로드</string>
     <string name="s_external">내장메모리</string>
     <string name="s_internal">내부메모리</string>
     <string name="s_view">보기</string>
-    <string name="s_bookmarks" auto="1">북마크</string>
+    <string name="s_bookmarks">즐겨찾기</string>
     <string name="s_menu_favorites">북마크 전환</string>
     <string name="s_menu_sort">정렬하기</string>
-    <string name="s_menu_sort_name_asc" auto="1">이름으로 정렬 (A - Z)</string>
-    <string name="s_menu_sort_name_desc" auto="1">이름으로 정렬 (Z - A)</string>
-    <string name="s_menu_sort_date_asc">최신으로 정렬</string>
+    <string name="s_menu_sort_name_asc">이름순으로 정렬 (A - Z)</string>
+    <string name="s_menu_sort_name_desc">이름순으로 정렬 (Z - A)</string>
+    <string name="s_menu_sort_date_asc">최신순으로 정렬</string>
     <string name="s_menu_sort_date_desc">오래된 순서로 정렬</string>
-    <string name="s_menu_sort_size_asc">큰순서로 정렬</string>
-    <string name="s_menu_sort_size_desc">작은순서로 정렬</string>
-    <string name="s_menu_sort_type">파일확장자 정렬</string>
-    <string name="s_menu_multi" auto="1">다중 선택</string>
-    <string name="s_menu_grid">그리드 보기</string>
-    <string name="s_menu_list">목록 보기</string>
+    <string name="s_menu_sort_size_asc">큰 순서로 정렬</string>
+    <string name="s_menu_sort_size_desc">작은 순서로 정렬</string>
+    <string name="s_menu_sort_type">파일 확장자로 정렬</string>
+    <string name="s_menu_multi">다중 선택</string>
+    <string name="s_menu_grid">그리드로 보기</string>
+    <string name="s_menu_list">목록으로 보기</string>
     <string name="s_menu_carousel" auto="1">회전 목마</string>
-    <string name="s_menu_hidden">숨김파일보기</string>
-    <string name="s_menu_thumbs" auto="1">이미지 미리보기</string>
-    <string name="s_menu_new_folder" auto="1">새 폴더</string>
-    <string name="s_menu_other" auto="1">기타 설정</string>
-    <string name="s_menu_flush">캐시지우기</string>
+    <string name="s_menu_hidden">숨겨진 파일보기</string>
+    <string name="s_menu_thumbs">썸네일 보기 </string>
+    <string name="s_menu_new_folder">새 폴더</string>
+    <string name="s_menu_other">기타 설정</string>
+    <string name="s_menu_flush">캐시 지우기</string>
     <string name="s_menu_root">루트</string>
-    <string name="s_menu_prefs_folder" auto="1">폴더 환경 설정</string>
-    <string name="s_menu_prefs_global" auto="1">글로벌 환경 설정</string>
-    <string name="s_menu_info" auto="1">정보</string>
+    <string name="s_menu_prefs_folder">폴더 환경 설정</string>
+    <string name="s_menu_prefs_global">공통 환경 설정</string>
+    <string name="s_menu_info">정보</string>
     <string name="s_menu_copy">복사</string>
-    <string name="s_menu_cut" auto="1">절단</string>
-    <string name="s_menu_paste" auto="1">붙여넣기</string>
-    <string name="s_menu_delete" auto="1">삭제</string>
-    <string name="s_menu_share">보내기/공유...</string>
-    <string name="s_menu_zip">파일압축 ...</string>
-    <string name="s_menu_unzip" auto="1">압축 풀기 ...</string>
-    <string name="s_menu_rename" auto="1">이름 바꾸기 ...</string>
-    <string name="s_menu_bookmark" auto="1">즐겨찾기에 추가</string>
-    <string name="s_save" auto="1">저장</string>
-    <string name="s_saveas" auto="1">다른 이름으로 저장 ...</string>
-    <string name="s_cancel" auto="1">취소</string>
-    <string name="s_size" auto="1">크기</string>
-    <string name="s_none" auto="1">없음</string>
-    <string name="s_pref_servers" auto="1">추가 서버</string>
-    <string name="s_pref_server_add" auto="1">+ 새 서버 추가</string>
-    <string name="s_pref_display" auto="1">디스플레이 환경 설정</string>
-    <string name="s_pref_hidden">히든 파일보기</string>
-    <string name="s_pref_hidden_summary">히든 파일 및 폴더를 표시합니다</string>
-    <string name="s_pref_thumbs">썸네일 미리보기</string>
+    <string name="s_menu_cut">잘라내기</string>
+    <string name="s_menu_paste">붙여넣기</string>
+    <string name="s_menu_delete">삭제</string>
+    <string name="s_menu_share">보내기/공유…</string>
+    <string name="s_menu_zip">압축 파일(들)…</string>
+    <string name="s_menu_unzip">압축 풀기…</string>
+    <string name="s_menu_rename">이름 바꾸기…</string>
+    <string name="s_menu_bookmark">즐겨찾기에 추가 </string>
+    <string name="s_save">저장</string>
+    <string name="s_saveas">다른 이름으로 저장…</string>
+    <string name="s_cancel">취소 </string>
+    <string name="s_size">크기</string>
+    <string name="s_none">없음</string>
+    <string name="s_pref_servers">추가 서버</string>
+    <string name="s_pref_server_add">+ 새 서버 추가</string>
+    <string name="s_pref_display">디스플레이 환경 설정</string>
+    <string name="s_pref_hidden">숨겨진 파일보기</string>
+    <string name="s_pref_hidden_summary">숨겨진 파일 및 폴더를 표시합니다</string>
+    <string name="s_pref_thumbs">썸네일 미리보기 보기</string>
     <string name="s_pref_thumbs_summary">이미지/비디오/앱 썸네일 표시</string>
-    <string name="s_pref_view" auto="1">보기 모드</string>
-    <string name="s_pref_view_summary">그리드에서 파일, 목록, 또는 회전 목마를 표시 (단 허니콤)</string>
-    <string name="s_pref_sort" auto="1">정렬</string>
+    <string name="s_pref_view">보기 모드 </string>
+    <string name="s_pref_view_summary">그리드에서 파일, 목록, 또는 회전 목마를 표시 (허니콤 전용)</string>
+    <string name="s_pref_sort">정렬 </string>
     <string name="s_pref_sort_summary">파일과 폴더를 정렬하는 방법을 선택</string>
-    <string name="s_pref_advanced" auto="1">고급</string>
-    <string name="s_pref_server_name" auto="1">서버 이름</string>
-    <string name="s_pref_server_name_summary" auto="1">서버 이름을 입력</string>
-    <string name="s_pref_server_url" auto="1">서버 URL</string>
-    <string name="s_pref_server_url_summary" auto="1">전체 서버 URL을 입력</string>
-    <string name="s_pref_server_host" auto="1">서버 호스트</string>
-    <string name="s_pref_server_user" auto="1">사용자</string>
-    <string name="s_pref_server_user_summary" auto="1">사용자 이름</string>
-    <string name="s_pref_server_password" auto="1">암호</string>
-    <string name="s_pref_server_password_summary" auto="1">로그인 비밀 번호</string>
-    <string name="s_pref_server_path" auto="1">하위 디렉토리</string>
-    <string name="s_pref_server_path_summary" auto="1">기본 로그인 경로를 입력</string>
-    <string name="s_pref_server_extras" auto="1">추가 설정</string>
-    <string name="s_pref_server_update" auto="1">추가 / 서버 업데이트</string>
-    <string name="s_pref_server_type" auto="1">서버 유형</string>
-    <string name="s_files" auto="1">파일</string>
-    <string name="s_create" auto="1">만들기</string>
+    <string name="s_pref_advanced">고급 </string>
+    <string name="s_pref_server_name">서버 이름 </string>
+    <string name="s_pref_server_name_summary">서버 이름을 입력하세요</string>
+    <string name="s_pref_server_url">서버 주소</string>
+    <string name="s_pref_server_url_summary">전체 서버 URL를 입력하세요</string>
+    <string name="s_pref_server_host">서버 주소</string>
+    <string name="s_pref_server_user">사용자 </string>
+    <string name="s_pref_server_user_summary">사용자 이름 </string>
+    <string name="s_pref_server_password">암호 </string>
+    <string name="s_pref_server_password_summary">로그인 비밀 번호 </string>
+    <string name="s_pref_server_path">하위 디렉토리 </string>
+    <string name="s_pref_server_path_summary">기본 로그인 경로를 입력하세요.</string>
+    <string name="s_pref_server_extras">추가 설정 </string>
+    <string name="s_pref_server_update">추가/서버 업데이트 </string>
+    <string name="s_pref_server_type">서버 유형 </string>
+    <string name="s_files">파일 </string>
+    <string name="s_create">만들기 </string>
     <string name="s_title_holding_x_files">XXX 파일을 보류</string>
-    <string name="s_title_newfolder" auto="1">새 폴더를 만듭니다</string>
-    <string name="s_title_send" auto="1">XXX 보내기</string>
+    <string name="s_title_newfolder">새 폴더 만들기</string>
+    <string name="s_title_send">XXX 보내기 </string>
     <string name="s_title_unzip">XXX 압축 풀기 </string>
-    <string name="s_title_zip" auto="1">우편 번호 XXX</string>
+    <string name="s_title_zip">XXX 압축</string>
     <string name="s_title_executing">실행중</string>
     <string name="s_title_deleting">삭제중</string>
     <string name="s_title_searching">검색중</string>
@@ -86,12 +85,12 @@
     <string name="s_title_copying">복사중</string>
     <string name="s_title_zipping">압축중</string>
     <string name="s_title_unzipping">압축 풀기중</string>
-    <string name="s_title_wait" auto="1">잠시 기다려주십시오 ...</string>
-    <string name="s_alert_confirm_delete"> %s 를 삭제하면 복구할 수 없습니다. 계속하겠습니까?</string>
-    <string name="s_alert_rename">파일의 새이름을 입력하십시오</string>
+    <string name="s_title_wait">잠시 기다려주십시오…</string>
+    <string name="s_alert_confirm_delete" formatted="false"> %s 를 삭제하면 복구할 수 없습니다. 계속하겠습니까?</string>
+    <string name="s_alert_rename">파일의 새 이름을 입력하십시오</string>
     <string name="s_alert_newfolder">작성하고자하는 폴더의 이름을 입력하세요.</string>
-    <string name="s_alert_unzip">여기에  %s 를 풀겠습니까 아니면 다른 폴더에 풀겠습니까?</string>
-    <string name="s_button_unzip_here" auto="1">여기에 압축 풀기</string>
+    <string name="s_alert_unzip" formatted="false">여기에  %s 를 풀겠습니까 아니면 다른 폴더에 풀겠습니까?</string>
+    <string name="s_button_unzip_here">여기에 압축 풀기 </string>
     <string name="s_button_unzip_else">다른곳에 압축 풀기 ...</string>
     <string name="s_msg_none">파일(들)은 ..수 없습니다</string>
     <string name="s_msg_some">일부 파일(들)은 ...수 없습니다</string>
@@ -100,148 +99,150 @@
     <string name="s_msg_moved">이동되었습니다</string>
     <string name="s_msg_copied">복사되었습니다</string>
     <string name="s_remove">삭제되었습니다</string>
-    <string name="s_eject" auto="1">꺼내기</string>
-    <string name="s_update" auto="1">업데이트</string>
-    <string name="s_alert_bookmark_rename" auto="1">북마크의 제목을 변경합니다.</string>
-    <string name="s_title_bookmark_prefix" auto="1">즐겨찾기 관리 :</string>
-    <string name="s_alert_remove_safe" auto="1">이제 안전하게 드라이브를 제거할 수 있습니다.</string>
-    <string name="s_alert_remove_error" auto="1">꺼낼 수 없습니다.</string>
-    <string name="s_menu_about">관하여</string>
-    <string name="s_about_version" auto="1">버전</string>
-    <string name="s_about_author" auto="1">저자</string>
-    <string name="s_about_site" auto="1">웹사이트</string>
-    <string name="s_about_email" auto="1">이메일</string>
-    <string name="s_about_recent" auto="1">최근 업데이트</string>
-    <string name="s_chooser_email" auto="1">의견 보내기 ...</string>
+    <string name="s_eject">꺼내기 </string>
+    <string name="s_update">업데이트 </string>
+    <string name="s_alert_bookmark_rename">즐겨찾기의 제목을 변경합니다.</string>
+    <string name="s_title_bookmark_prefix">즐겨찾기 관리:</string>
+    <string name="s_alert_remove_safe">이제 안전하게 드라이브를 제거할 수 있습니다.</string>
+    <string name="s_alert_remove_error">꺼낼 수 없습니다.</string>
+    <string name="s_menu_about">정보</string>
+    <string name="s_about_version">버전</string>
+    <string name="s_about_author">제작자</string>
+    <string name="s_about_site">웹 사이트</string>
+    <string name="s_about_email">이메일</string>
+    <string name="s_about_recent">최근 업데이트</string>
+    <string name="s_chooser_email">의견 보내기…</string>
     <string name="s_status_loading">로딩 중 ...</string>
-    <string name="s_menu_open">...으로 열기</string>
-    <string name="s_menu_edit">...로 수정 </string>
+    <string name="s_menu_open">…으로 열기</string>
+    <string name="s_menu_edit">…로 수정 </string>
     <string name="s_pref_stats_title">OpenExplorer를 개선하는 데 도움이 되주세요</string>
     <string name="s_pref_stats_summary">익명의 사용 통계를 보내주십시오. 이것은 사용자를 식별하는데 사용될 수있는 정보는 포함되지 않습니다.</string>
     <string name="s_error_no_intents">현재 설치된 응용 프로그램으론 이러한 형식의 파일을 읽을 수 없습니다.</string>
     <string name="s_menu_root_disabled">루트 비활성화</string>
-    <string name="s_pref_start" auto="1">시작 폴더</string>
-    <string name="s_pref_start_summary" auto="1">OpenExplorer가 시작되는 폴더를 나타냅니다</string>
-    <string name="s_custom" auto="1">맞춤 ...</string>
-    <string name="s_text_intro_top" auto="1">OpenExplorer에 오신 것을 환영합니다!</string>
-    <string name="s_text_intro_body">OpenExplorer의 목표는 안드로이드 파일 시스템 내에서와 클라우드에서 더 생산적이기 위한 것입니다. 당신이 여러 다른 위치에서 동영상이나 사진들을 관리할때나, FTP를 통해 원격으로 웹서버를 관리하거나 OpenExplorer는 여러분의 필요에 맞출수가 있습니다. 시작하는 경로를 선택해주세요:</string>
-    <string name="s_info_num_folders" auto="1">폴더 수 :</string>
-    <string name="s_info_num_files" auto="1">파일의 개수 :</string>
-    <string name="s_info_last_modified" auto="1">최종 수정일 :</string>
-    <string name="s_info_permissions" auto="1">파일 사용 권한 :</string>
-    <string name="s_info_permission_read" auto="1">읽기 :</string>
-    <string name="s_info_permission_write" auto="1">작성 :</string>
-    <string name="s_info_permission_execute" auto="1">실행 :</string>
-    <string name="s_toggle_keyboard" auto="1">키보드</string>
-    <string name="s_show_password" auto="1">비밀 번호보기</string>
-    <string name="s_error_ftp" auto="1">FTP로 연결하는 중 오류가 발생했습니다</string>
-    <string name="s_prompt_zip" auto="1">새로운 zip 파일의 파일 이름을 입력 :</string>
-    <string name="app_edit" auto="1">OpenExplorer으로 수정</string>
-    <string name="s_menu_more" auto="1">추가 옵션 ...</string>
-    <string name="s_msg_low_memory" auto="1">메모리 부족!</string>
-    <string name="s_clear" auto="1">지우기</string>
-    <string name="s_menu_delete_all" auto="1">모두 삭제</string>
-    <string name="s_menu_move_all" auto="1">여기로 이동</string>
-    <string name="s_menu_copy_all" auto="1">여기에 복사</string>
-    <string name="s_confirm_delete" auto="1">당신은  %s 을 삭제하시겠습니까?</string>
-    <string name="s_error_same_destination" auto="1">대상 디렉터리가 같습니다.</string>
-    <string name="s_sample_notification" auto="1">복사 -&gt; sdcard 옵션 :  n 3 파일</string>
-    <string name="s_pref_fullscreen" auto="1">전체 화면</string>
-    <string name="s_pref_fullscreen_summary_on" auto="1">알림 표시줄 숨기기</string>
-    <string name="s_pref_fullscreen_summary_off" auto="1">알림 표시줄 표시</string>
+    <string name="s_pref_start">시작 폴더</string>
+    <string name="s_pref_start_summary">OpenExplorer가 시작되는 폴더 입니다.</string>
+    <string name="s_custom">사용자 정의 ...</string>
+    <string name="s_text_intro_top">OpenExplorer에 오신 것을 환영합니다!</string>
+    <string name="s_text_intro_body">OpenExplorer의 목표는 안드로이드 파일 시스템과 클라우드에서 당신을 더욱 생산적으로 만드는 것 입니다. 당신이 여러 위치에서 동영상이나 사진을 관리하거나 FTP를 이용해서 당신의 웹 서버를 관리할때 OpenExplorer는 당신의 필요를 맞출 수 있습니다.\n\n당신이 시작할 위치를 선택 해 주세요.</string>
+    <string name="s_info_num_folders">폴더 수:</string>
+    <string name="s_info_num_files">파일 갯수 :</string>
+    <string name="s_info_last_modified">최종 수정일:</string>
+    <string name="s_info_permissions">파일 사용 권한:</string>
+    <string name="s_info_permission_read">읽기:</string>
+    <string name="s_info_permission_write">작성:</string>
+    <string name="s_info_permission_execute">실행:</string>
+    <string name="s_toggle_keyboard">키보드 </string>
+    <string name="s_show_password">비밀번호 보기</string>
+    <string name="s_error_ftp">네트워크를 연결하는 중 오류가 발생했습니다</string>
+    <string name="s_prompt_zip">새로운 zip 파일의 파일 이름:</string>
+    <string name="app_edit">OpenExplorer로 수정</string>
+    <string name="s_menu_more">추가 옵션…</string>
+    <string name="s_msg_low_memory">메모리 부족!</string>
+    <string name="s_clear">지우기 </string>
+    <string name="s_menu_delete_all">모두 삭제</string>
+    <string name="s_menu_move_all">여기로 이동</string>
+    <string name="s_menu_copy_all">여기로 복사</string>
+    <string name="s_confirm_delete" formatted="false">당신은  %s 을(를) 삭제하시겠습니까?</string>
+    <string name="s_error_same_destination">대상 디렉토리가 같습니다. </string>
+    <string name="s_sample_notification">복사 -&gt; sdcard: 3파일</string>
+    <string name="s_pref_fullscreen">전체 화면 </string>
+    <string name="s_pref_fullscreen_summary_on">알림 표시줄 숨기기 </string>
+    <string name="s_pref_fullscreen_summary_off">알림 표시줄 표시 </string>
     <string name="s_pref_pagers" auto="1">호출기보기</string>
-    <string name="s_pref_pagers_summary_on" auto="1"> 디렉토리 탐색 보내주시면 수평</string>
-    <string name="s_pref_pagers_summary_off" auto="1">수평 보내주시면 불가</string>
-    <string name="s_alert_new_media" auto="1">뉴 미디어가 삽입!</string>
+    <string name="s_pref_pagers_summary_on">옆으로 밀듯이 터치 = 폴더 이동</string>
+    <string name="s_pref_pagers_summary_off">옆으로 밀듯이 터치 사용 않함</string>
+    <string name="s_alert_new_media">새로운 장치가 삽입!</string>
     <string name="s_warn_pager_title" auto="1">새로운 기능 :보기 호출기</string>
-    <string name="s_warn_pager" auto="1">문지 르는 디렉토리와 돌아갈 왼쪽에서 오른쪽으로 올라 왼쪽에서 오른쪽으로. 이것은 탐색하는 것이보다 쉽게 ​​할 수 있습니다. (외부 미디어에) 한번 사용해보세요!</string>
-    <string name="s_warn_confirm" auto="1">뭔 말인지 알지?</string>
-    <string name="s_warn_disable" auto="1">사용하지 않음</string>
-    <string name="s_pref_intent_internal" auto="1">내부 관점에서</string>
-    <string name="s_pref_intent_internal_on" auto="1">OpenExplorer의 의도 관리자에게 사용</string>
-    <string name="s_pref_intent_internal_off" auto="1">시스템 의도 관리자를 사용하여</string>
-    <string name="s_pref_text_internal" auto="1">내부 텍스트 편집기를 사용하여</string>
-    <string name="s_text_editor_title" auto="1">텍스트 편집기</string>
-    <string name="s_pref_show_root" auto="1">보기 루트 파일 시스템 (/)</string>
-    <string name="s_pref_show_internal" auto="1">내부 미디어보기</string>
-    <string name="s_pref_show_external" auto="1">외부 미디어보기</string>
-    <string name="s_error_no_media" auto="1">삽입된 어떤 미디어가없는 것 같습니다. 의 USB 공유 또는 다시 삽입 미디어를 사용하지 않도록하십시오.</string>
+    <string name="s_warn_pager">왼쪽에서 오른쪽으로 밀듯이 터치하면 상위 폴더로 갈 수 있고, 오른쪽에서 왼쪽으로 하시면 뒤로 갈 수 있습니다. 이것은 이동을 쉽게 만들어 줄 것 입니다. 사용해 보세요 (외부 장치에서만)!</string>
+    <string name="s_warn_confirm">이해 하시겠습니까?</string>
+    <string name="s_warn_disable">사용않함</string>
+    <string name="s_pref_intent_internal">내부 전환</string>
+    <string name="s_pref_intent_internal_on">OpenExplorer의 전환 관리자를 사용</string>
+    <string name="s_pref_intent_internal_off">시스템 전환 관리자를 사용하여</string>
+    <string name="s_pref_text_internal">내부 텍스트 편집기를 사용</string>
+    <string name="s_text_editor_title">텍스트 편집기 </string>
+    <string name="s_pref_show_root">루트 파일 시스템 보기(/)</string>
+    <string name="s_pref_show_internal">내부 장치보기</string>
+    <string name="s_pref_show_external">외부 장치보기</string>
+    <string name="s_error_no_media">장치가 삽입된 것 같지 않습니다. USB 연결모드를 끄거나 장치를 재 삽입 해 주세요.</string>
     <string name="s_prompt_password" auto="1">비밀 번호를 입력하세요</string>
-    <string name="s_add" auto="1">추가</string>
+    <string name="s_add">추가 </string>
     <string name="s_server_ftp" auto="1">FTP를</string>
-    <string name="s_server_sftp" auto="1">SFTP</string>
-    <string name="s_pref_server_port" auto="1">포트</string>
-    <string name="s_about_buildtime" auto="1">빌드 날짜</string>
-    <string name="s_default" auto="1">기본</string>
-    <string name="s_pref_timeout" auto="1">시간 초과</string>
-    <string name="s_pref_timeout_summary" auto="1">초 단위 시간 초과</string>
-    <string name="s_menu_up" auto="1">올라가다</string>
-    <string name="s_prompt_unzip" auto="1">로 압축 해제하기위한 경로를 입력 :</string>
-    <string name="s_pref_hardware_accel" auto="1">하드웨어 가속을 활성화</string>
-    <string name="s_pref_honeyplus" auto="1">안드로이드 3.0 이상 설정</string>
+    <string name="s_server_sftp">SFTP</string>
+    <string name="s_pref_server_port">포트</string>
+    <string name="s_about_buildtime">빌드 날짜</string>
+    <string name="s_default">기본 </string>
+    <string name="s_pref_timeout">시간 초과 </string>
+    <string name="s_pref_timeout_summary">몇초 내로 시간 초과</string>
+    <string name="s_menu_up">올라가기</string>
+    <string name="s_prompt_unzip">압축을 풀 경로:</string>
+    <string name="s_pref_hardware_accel">하드웨어 가속을 활성화 </string>
+    <string name="s_pref_honeyplus">안드로이드 3.0 이상 가능한 설정</string>
     <string name="s_pref_actionmode" auto="1">액션 모드</string>
-    <string name="s_pref_actionmode_enabled" auto="1">액션 모드를 사용</string>
-    <string name="s_pref_actionmode_disabled" auto="1">표준 컨텍스트 메뉴를 사용하여</string>
-    <string name="s_server_smb" auto="1">SMB / 윈도우</string>
-    <string name="s_bookmark_drives" auto="1">드라이브</string>
-    <string name="s_bookmark_smart" auto="1">스마트 폴더</string>
-    <string name="s_bookmark_favorites" auto="1">즐겨찾기</string>
-    <string name="s_bookmark_servers" auto="1">서버</string>
-    <string name="s_bookmark_cache" auto="1">캐시</string>
-    <string name="s_info_totalspace" auto="1">디스크 전체 공간 :</string>
-    <string name="s_info_freespace" auto="1">디스크 공간 :</string>
-    <string name="s_status_rate" auto="1">평가하기 :</string>
-    <string name="s_about_hardware" auto="1">하드웨어</string>
-    <string name="s_menu_refresh" auto="1">새로고침 폴더</string>
-    <string name="s_pref_reset" auto="1">조회수 재설정</string>
-    <string name="s_toast_complete" auto="1">완벽한 작업!</string>
-    <string name="s_pref_reset_summary" auto="1">기본 상태로 돌아오면, 모든 폴더별로보기 설정을 제거하려면 여기를 클릭하십시오.</string>
-    <string name="s_prompt_path" auto="1">경로를 입력 :</string>
-    <string name="s_prompt_search" auto="1">에 대한 검색 :</string>
-    <string name="s_prompt_search_within" auto="1">내에서 검색 :</string>
-    <string name="s_pref_view_category" auto="1">보기 환경 설정을 즐겨찾기에 추가</string>
-    <string name="s_pref_show_videos" auto="1">동영상보기</string>
-    <string name="s_pref_show_photos" auto="1">사진보기</string>
-    <string name="s_pref_show_music" auto="1">음악보기</string>
-    <string name="s_pref_show_downloads" auto="1">다운로드보기</string>
-    <string name="s_hide" auto="1">숨기기</string>
-    <string name="s_show" auto="1">표시</string>
-    <string name="s_msg_event_cancelled" auto="1">이벤트가 취소되었습니다.</string>
-    <string name="s_alert_newfolder_folder" auto="1">새로운 폴더를 만듭니다 :</string>
-    <string name="s_pref_fancy_category" auto="1">팬시 디스플레이 설정</string>
-    <string name="s_pref_fancy_menus" auto="1">팬시 메뉴</string>
-    <string name="s_pref_fancy_context" auto="1">팬시 컨텍스트 메뉴</string>
-    <string name="s_search_files" auto="1">검색 파일 시스템</string>
-    <string name="s_menu_exit" auto="1">출구</string>
-    <string name="s_warn_wtf_message" auto="1">죄송합니다! 그것은 처리되지 않은 오류가 발생했음을 나타납니다! 이것이 많은 베타 응용 프로그램의 일반적인 문제이기 때문에, 이러한 문제를 해결하는 유일한 방법은 문제를 해결하는 방법을 결정하기 위해서는, 자네와 같은 다양한 장치에서 보고서를받을 것입니다. 우리는 개발자만이 익명의 데이터를 포함하는, 그러한 보고서를 보낼 수 있을까요?</string>
-    <string name="s_warn_wtf_ps" auto="1">유의하십시오 ***,이 응용 프로그램은 베타 버전입니다. 그것이 충돌 간단하기 때문에이 응용 프로그램에게 나쁜 평가를주지 말아주십시오. 정말 당신을 괴롭히는 경우 바로 제거합니다. 감사합니다!</string>
-    <string name="s_yes" auto="1">예</string>
-    <string name="s_no" auto="1">아니</string>
-    <string name="s_wtf_preview" auto="1">미리보기 리포트 데이터</string>
-    <string name="s_wtf_remember" auto="1">다시 묻지 않음</string>
-    <string name="s_pref_basebar" auto="1">작업 표시줄을 분할</string>
-    <string name="s_pref_basebar_on" auto="1">세로 모드에서 화면의 하단에있는 동작 버튼</string>
-    <string name="s_pref_basebar_off" auto="1">화면 상단에 액션 버튼 (가능)</string>
-    <string name="s_pref_autowtf" auto="1">자동 보내 크래시 리포트</string>
-    <string name="s_pref_autowtf_summary" auto="1">처리되지 않은 예외가 발생하면 자동으로 보고서를 보냅니다.</string>
-    <string name="s_split_auto" auto="1">자동</string>
-    <string name="s_split_top" auto="1">상단으로 강제 버튼</string>
-    <string name="s_split_top_single" auto="1">상위로 단일 버튼을 강제</string>
-    <string name="s_split_bottom" auto="1">아래로 강제 버튼</string>
-    <string name="s_split_none" auto="1">시스템 메뉴에서 모든 단추를 놓으십시오</string>
-    <string name="s_about_screensize" auto="1">화면 크기</string>
-    <string name="s_about_density" auto="1">밀도</string>
-    <string name="s_menu_location_int" auto="1">내부 메모리 경로</string>
-    <string name="s_menu_location_ext" auto="1">외부 메모리 경로</string>
-    <string name="s_wtf_context" auto="1">충돌의 상황을 설명해주십시오 :</string>
-    <string name="thanks" auto="1">당신을 감사하십시오!</string>
-    <string name="menu_view_font_small" auto="1">작은 글꼴 크기</string>
-    <string name="menu_view_font_medium" auto="1">폰트 크기 매체</string>
-    <string name="menu_view_font_large" auto="1">폰트 크기 대형</string>
-    <string name="app_description" auto="1">오픈 탐색기 - 모든 장치를위한 오픈 소스 파일 매니저! (정제, 전화기, 구글 텔레비전, 샌드위치!) \n-전체 파일 시스템 관리 \n-USB, SD 및 다른 외부 미디어를 \n-네트워크 Connectable (FTP, SFTP, SMB / 삼바 / 윈도우 / LAN / 무선) \n - 텍스트 편집기는 \n-스마트 폴더는 해당 미디어의 다른 유형 (동영상, 사진, 음악, 다운로드) \n-보기 호출기 디렉토리 탐색 (디렉토리를 이동 슬쩍 오른쪽) \n-슈퍼유저 / 루트 기능 / 목록에 대한 스캔 시스템 폴더를 (어떤 시스템이 아직 작성하지 않음) 앞으로 \n \nFeatures 읽기 옵션 : \n-탭 텍스트 편집기 \n-더많은 네트워킹 기능 (보관용, Box.net, 스카이 드라이브) \n-오프라인 파일 구조 캐시 기억되는 파일 당신이 연결할 필요 \n-디스크 공간 열지도가 가장 큰 파일의 위치를​​ 보여주는하지 않고 다른 장소에 가지고 \n \n * 참고 사항 :이 애플 리케이션은 베타 버전입니다. 많은 버그가 아직 있습니다. 여러분이 이러한 버그를 경험하지 않으려면, 제발이 응용 프로그램을 다운로드하지 않습니다. 당신이 이러한 버그를 쉽게 찾을 수 있도록 알아보려면 이메일을 보내주십시오 또는 GitHub (https://github.com/BrandoCommando/OpenExplorer/)에 협조. 나쁜 평가는 아무 도움도 기억하시기 바랍니다.</string>
-    <string name="alert_translate_google" auto="1">안녕하세요,이 번역은 Google 번역에 의해 제공됩니다. 당신뿐만 %s의로서의 영어 몰랐어요, 그리고 더 나은 번역을 제공하는데 도움을하려는 경우,이 버튼을 클릭하십시오 :</string>
-    <string name="alert_translate_none" auto="1">안녕하세요, 당신이 지원되지 않는 언어를 사용하고있는 것으로 나타납니다. 당신은 영어와 %s을 아십니까? 당신은 당신이 정확한 ​​번역을 제공하는데 도움을 원하시면 여기를 클릭하십시오 :</string>
-    <string name="button_translate" auto="1">번역</string>
+    <string name="s_pref_actionmode_enabled">액션 모드 사용</string>
+    <string name="s_pref_actionmode_disabled">표준 컨텍스트 메뉴를 사용</string>
+    <string name="s_server_smb">SMB/윈도우</string>
+    <string name="s_bookmark_drives">드라이브</string>
+    <string name="s_bookmark_smart">스마트 폴더</string>
+    <string name="s_bookmark_favorites">즐겨찾기</string>
+    <string name="s_bookmark_servers">서버</string>
+    <string name="s_bookmark_cache">캐시 </string>
+    <string name="s_info_totalspace">디스크의 전체 공간 :</string>
+    <string name="s_info_freespace">디스크의 남은 공간 :</string>
+    <string name="s_status_rate">평가하기:</string>
+    <string name="s_about_hardware">하드웨어 </string>
+    <string name="s_menu_refresh">폴더 새로고침</string>
+    <string name="s_pref_reset">조회수 초기화</string>
+    <string name="s_toast_complete">작업 완료!</string>
+    <string name="s_pref_reset_summary">모든 폴더의 특별한 보기를 없에려면 여기를 터치 해 주세요. 기본 상태로 전환됩니다.</string>
+    <string name="s_prompt_path">경로 :</string>
+    <string name="s_prompt_search">다음을 검색:</string>
+    <string name="s_prompt_search_within">다음 내에서 검색 :</string>
+    <string name="s_pref_view_category">보기 환경 설정을 즐겨찾기에 추가 </string>
+    <string name="s_pref_show_videos">동영상 보기</string>
+    <string name="s_pref_show_photos">사진 보기</string>
+    <string name="s_pref_show_music">음악 보기</string>
+    <string name="s_pref_show_downloads">다운로드 보기</string>
+    <string name="s_hide">숨기기 </string>
+    <string name="s_show">표시 </string>
+    <string name="s_msg_event_cancelled">이벤트가 취소되었습니다. </string>
+    <string name="s_alert_newfolder_folder">새로운 폴더를 만듭니다:</string>
+    <string name="s_pref_fancy_category">화려한 디스플레이 설정</string>
+    <string name="s_pref_fancy_menus">화려한 메뉴</string>
+    <string name="s_pref_fancy_context">화려한 컨텍스트 메뉴</string>
+    <string name="s_search_files">파일 시스템 검색</string>
+    <string name="search_summary" formatted="false">\&quot;%S\&quot;를 검색합니다. / \&quot;%s\&quot;를 포함하여 (%d)</string>
+    <string name="search_results" formatted="false">\&quot;%s\&quot;로 %d개를 찾았습니다. / \&quot;%s\&quot;를 포함하여.</string>
+    <string name="s_menu_exit">나가기</string>
+    <string name="s_warn_wtf_message">이런! 처리되지 않은 문제가 발생하였습니다! 이것은 많은 베타 앱들의 일반적인 문제이며, 이러한 문제를 해결하기 위해서는 당신것과 같은 불특정한 장치에서 어떻게 문제를 해결해야 하는지가를 결정하기 위해 리포트를 보내는 것입니다. 만약 우리에게 이러한 익명의 정보만 들어있는 리포트를 개발자에게 보내겠습니까?</string>
+    <string name="s_warn_wtf_ps">***참고하세요, 이 앱은 베타 버전입니다. 부디 그저 앱이 충돌했다고 나쁜 점수를 주지 말아주세요. 만약 정말 당신을 귀찮게 한다면 그냥 삭제해 주세요. 감사합니다!</string>
+    <string name="s_yes">네</string>
+    <string name="s_no">아니요</string>
+    <string name="s_wtf_preview">리포트 데이터 미리보기</string>
+    <string name="s_wtf_remember">다시 묻지 않음</string>
+    <string name="s_pref_basebar">작업 표시줄 분할</string>
+    <string name="s_pref_basebar_on">세로 모드에서 화면의 하단에 있는 동작 버튼</string>
+    <string name="s_pref_basebar_off">화면 상단에 액션 버튼 (가능할때)</string>
+    <string name="s_pref_autowtf">자동으로 충돌 리포트 보내기</string>
+    <string name="s_pref_autowtf_summary">처리되지 않은 예외가 발생하면 자동으로 보고서를 보냅니다.</string>
+    <string name="s_split_auto">자동 </string>
+    <string name="s_split_top">강제로 상단에 버튼을</string>
+    <string name="s_split_top_single">강제로 상단에 하나의 버튼을</string>
+    <string name="s_split_bottom">강제로 하단에 버튼을</string>
+    <string name="s_split_none">시스템 메뉴에서 모든 단추를 배치하세요.</string>
+    <string name="s_about_screensize">화면 크기 </string>
+    <string name="s_about_density">밀도 </string>
+    <string name="s_menu_location_int">내부 메모리 경로</string>
+    <string name="s_menu_location_ext">외부 메모리 경로</string>
+    <string name="s_wtf_context">충돌의 상황을 설명해주세요:</string>
+    <string name="thanks">감사합니다!</string>
+    <string name="menu_view_font_small">글꼴 크기를 작게</string>
+    <string name="menu_view_font_medium">폰트 크기를 중간으로</string>
+    <string name="menu_view_font_large">폰트 크기를 크게</string>
+    <string name="app_description">오픈 탐색기 - 모든 장치를위한 오픈 소스 파일 매니저! (테블릿, 스마트폰, 구글 TV, 센드위치!) \n-파일 시스템 관리 \n-USB, SD 및 다른 외부 미디어를 \n-네트워크 연결가능 (FTP, SFTP, SMB / 삼바 / 윈도우 / LAN / 무선) \n-텍스트 편집기 \n-각각 다른 타입의 미디어를 스켄하는 스마트 폴더(동영상, 사진, 음악, 다운로드) \n-보기 호출기 디렉토리 탐색 (상위 폴더로 이동시 오른쪽으로 밀듯이 터치) \n-슈퍼유저/루트시 시스템 폴더를 표시/읽기 가능\n \n구현 될 기능: \n-탭으로 된 텍스트 편집기 \n-더많은 네트워킹 기능 (Dropbox, Box.net, 스카이 드라이브) \n-오프라인 파일 구조 케시가 연결없이 다른 곳의 파일을 연결없이 기억할 것 입니다.\n-디스크 용량 heatmap이 큰 파일이 어디에 있는지 알려 줄 것입니다.\n \n * 참고 사항 :이 앱은 베타 버전입니다. 아직 많은 버그가 아직 있습니다. 여러분이 이러한 버그를 경험하지 않으려면, 이 앱을 다운로드 하지 말아주세요. 당신이 이러한 버그를 쉽게 찾을 수 있도록 도와주신다면, 이메일을 보내주시거나 GitHub (https://github.com/BrandoCommando/OpenExplorer/)로 협조해 주세요. 나쁜 점수는 아무 도움도 되지 않는다는 것을 기억하시기 바랍니다.</string>
+    <string name="alert_translate_google" formatted="false">안녕하세요, 이 번역은 Google 번역에 의해 제공됩니다. 만약 당신이 %s보다 영어를 잘 하시고, 더 나은 번역을 제공하시고 싶으시다면, 이 버튼을 눌려 주세요.</string>
+    <string name="alert_translate_none" formatted="false">안녕하세요, 당신이 지원되지 않는 언어를 사용하고 있는 것으로 보입니다. 당신은 영어와 %s을 아십니까? 당신은 당신이 정확한 ​​번역을 제공하는데 도움을 주시길 원하시면 여기를 클릭하십시오 :</string>
+    <string name="button_translate">번역</string>
     <string name="httpError">네트워크 오류가 발생했습니다.</string>
     <string name="httpErrorAuth">인증에 실패했습니다.</string>
     <string name="httpErrorProxyAuth">프록시 서버를 통한 인증에 실패했습니다.</string>
@@ -281,21 +282,88 @@
     <string name="storage_usb">SD 카드</string>
     <string name="extract_edit_menu_button">USB 저장소</string>
     <string name="activity_chooser_view_see_all">수정...</string>
-    <string name="s_title_picker" auto="1">디렉토리를 선택하십시오</string>
-    <string name="selected_path" auto="1">선택된 경로 :</string>
-    <string name="filename" auto="1">파일 이름</string>
-    <string name="s_msg_saved" auto="1">저장</string>
-    <string name="s_menu_view_line_numbers" auto="1">줄 번호</string>
-    <string name="warn_text_editor" auto="1">텍스트 편집기에 오신 것을 환영합니다. 편집 모드를 입력하는 텍스트를 누르 긴하시기 바랍니다.</string>
-    <string name="warn_networking" auto="1">네트워킹에 오신 것을 환영합니다. 이 기능은 아직 개발 중 버그를 포함할 수 있습니다. 여러분이 이러한 버그 중 하나를 찾으면 제발 나쁜 시장 평가를 제공하지 않습니다.</string>
-    <string name="s_menu_new_file" auto="1">새 텍스트 파일</string>
-    <string name="s_msg_created" auto="1">만든</string>
-    <string name="s_title_newfile" auto="1">새 파일</string>
-    <string name="s_alert_newfile_folder" auto="1">새로운 파일을 만듭니다 :</string>
-    <string name="s_alert_newfile" auto="1">새 파일의 이름을 입력합니다 :</string>
-    <string name="s_alert_exit" auto="1">당신이 종료 하시겠습니까?</string>
-    <string name="s_alert_clipboard" auto="1">클립 보드에 복사</string>
-    <string name="s_alert_restart" auto="1">다시 시작. 기다려주십시오.</string>
-    <string name="language" auto="1">언어</string>
-
-</resources>
\ No newline at end of file
+    <string name="s_title_picker">폴더를 선택하십시오</string>
+    <string name="selected_path">선택된 경로:</string>
+    <string name="filename">파일 이름</string>
+    <string name="s_msg_saved">저장됨</string>
+    <string name="s_menu_view_line_numbers">줄 번호</string>
+    <string name="warn_text_editor">Text Editor에 오신 것을 환영합니다. 수정을 하시려면 글을 길게 눌러주세요.</string>
+    <string name="warn_networking">네트워킹에 오신 것을 환영합니다. 참고로 이 기능은 아직 개발중이며 버그를 포함하고 있을 수 있습니다. 버그를 찾았다 하더라도 마켓에서 낮은 점수를 주지 말아주세요.</string>
+    <string name="s_menu_new_file">새 텍스트 파일</string>
+    <string name="s_msg_created">만들어짐</string>
+    <string name="s_title_newfile">새 파일</string>
+    <string name="s_alert_newfile_folder">다음 폴더에 새로운 파일을 만듭니다:</string>
+    <string name="s_alert_newfile">새 파일의 이름을 입력하세요 :</string>
+    <string name="s_alert_exit">종료 하시겠습니까?</string>
+    <string name="s_alert_clipboard">클립 보드에 복사됨</string>
+    <string name="s_alert_restart">재시작. 잠시만 기다려 주십시오.</string>
+    <string name="language">언어</string>
+    <string name="s_menu_download">다운 로드</string>
+    <string name="scan">스캔</string>
+    <string name="test">테스트</string>
+    <string name="test_success">연결 성공!</string>
+    <string name="no_items">목록 없음</string>
+    <string name="clipboard">클립보드</string>
+    <string name="theme">테마</string>
+    <string name="theme_dark">Dark UI</string>
+    <string name="theme_light">Light UI</string>
+    <string name="chooser_remember">설정 기억</string>
+    <string name="use_system">시스템 사용 &gt;&gt;</string>
+    <string name="activity_resolver_use_always">항상</string>
+    <string name="activity_resolver_use_once">한번만</string>
+    <string name="s_pref_bookmarks_summary">즐겨찾기 보기</string>
+    <string name="apply_to_all">모든폴더에 적용하시겠습니까?</string>
+    <string name="s_pref_view_folders">폴더 설정</string>
+    <string name="s_pref_view_general">일반 설정</string>
+    <string name="s_pref_text_wrap">글자 선택</string>
+    <string name="s_pref_thumbs_crop">썸네일 자르기/중심에 만들기</string>
+    <string name="s_pref_thumbs_cache_clear">썸네일 캐시 초기화</string>
+    <string name="s_msg_folder_none">폴더를 만들 수 없습니다.</string>
+    <string name="msg_nook_donate2">Nook 사용자 여러분, 안녕하십니까! 당신이 Nook에 대한 오픈 탐색기를 즐기시기 바랍니다. 나는 높은 구석 장치와의 호환성을 보장하기 위해 내 최선을 다 했잖아요 있습니다. 최근 기부금 덕분에, 난 구석 색상을 구입 할 수있었습니다! 기증 한 사람 모두에게 감사합니다! \n \n 다음, 나는 새로운 세대 HD 구석 장치입니다.이 앱이 유용 할 경우 \n \n, 어느를 선택하여 기부하는 것을 고려해보십시오을 구입 할 수 싶습니다 아래 또는 &quot;기부&quot;옵션 메뉴를 활성화하여 버튼을 클릭합니다. 감사합니다, 그리고 행복 여행!</string>
+    <string name="msg_bb_donate">블랙 베리 사용자 여러분, 안녕하십니까! 저희는 당신이 오픈 Explorer를 즐기기 바랍니다. 저희는 높은 BlackBerry 장치와의 호환성을 보장하기 위해 최선을 다하였으나, 실제 블랙 베리 없이 해결하기 어려운 문제 몇가지가 나타납니다. 이러한 이유로, 저희는 호환성을 개선하기 위해 블랙 베리 10 장치를 구입하기 위해 충분한 기부금을 모금하려합니다. 이 앱이 유용 할 경우, 아래의 버튼을 선택하시거나 &quot;기부&quot;옵션 메뉴를 활성화하여, 기부을 고려해 주시길 바랍니다. 감사합니다, 그리고 행복한 탐색 되시길 바랍니다!</string>
+    <string name="msg_donate">안드로이드 사용자 여러분 안녕하세요! 저희는 Open Explorer를 즐겼으면 좋겠네요. 저희는 모든 안드로이드 기기에서 잘 작동되도록 만들었으나, 아직까지도 버그리포트를 받네요. 이런 문제는 폰의 기종문제 때문에 일어납니다. 이 때문에 저희는 호환성을 향상시키기 위해 넥서스를 사기위해 기부를 받고있습니다. 만약 이 앱이 유용하다면 기부를 생각해 주세요. 버튼을 누르거나 메뉴 옵션의 기부 버튼을 누르면 됩니다. 감사하며, 행복한 탐색 되세요!</string>
+    <string name="s_privacy">프라이버시 정책</string>
+    <string name="s_menu_system_mount">/system 폴더에 작성할수있는 권한을 부여합니다. (주의!)</string>
+    <string name="s_menu_system_mount_on">시스템을 편집 가능합니다!</string>
+    <string name="s_menu_system_mount_off">시스템 읽기 전용</string>
+    <string name="s_pref_servers_private">개인 서버 유지</string>
+    <string name="s_pref_servers_private_summary">개인 저장 공간에서 서버 설정을 저장합니다. 이 응용 프로그램을 제거하면 서버 설정이 삭제됩니다. 나중에 다시 설치하는 경우이 확인란의 선택을 취소 한 그런 남겨 방지 할 수 있습니다.</string>
+    <string name="s_theme_lightdark" auto="1">빛과 어둠</string>
+    <string name="s_theme_custom" auto="1">핀 스트라이프</string>
+    <string name="s_menu_rate">평가</string>
+    <string name="s_alert_destination_exists">대상이 이미 있습니다. 어떻게 하시겠습니까?</string>
+    <string name="s_overwrite" auto="1">덮어 쓰기</string>
+    <string name="s_skip" auto="1">건너 뛰기</string>
+    <string name="s_msg_file_exists">일부 대상 파일이 이미 존재 할 수 있습니다. 덮어 쓰기를 하여도 되겠습니까?</string>
+    <string name="s_title_file_exists" auto="1">파일이 이미 존재합니다.</string>
+    <string name="s_msg_pref_archives">돌아다니거나 압축파일을 푸시겠습니까?</string>
+    <string name="s_browse" auto="1">찾아보기</string>
+    <string name="s_extract">해제</string>
+    <string name="s_extracted">해제됨</string>
+    <string name="s_extracting">해제중</string>
+    <string name="s_extract_with">다음으로 추출…</string>
+    <string name="s_title_archive_handler">압축 처리기</string>
+    <string name="s_ask_again" auto="1">때마다 요청</string>
+    <string name="s_archives">압축 파일</string>
+    <string name="s_compress">압축</string>
+    <string name="s_compress_type" auto="1">압축 유형</string>
+    <string name="s_compressed" auto="1">압축</string>
+    <string name="s_delete_after" auto="1">완료 후 소스를 삭제</string>
+    <string name="s_master_pass" auto="1">마스터 비밀번호</string>
+    <string name="s_master_pass_warning">당신은 모든 저장된 비밀번호를 암호화 하기위해 마스터 키를 입력할수 있습니다. 만약 빈칸으로 두신다면, 비밀번호들은 기본 마스터 키로 암호화 될 것 입니다. 참고로 만약 네트워크 암호를 업데이트 하려는 경우, 비밀번호를 초기화 한 후 비밀번호 초기화와 인증을 해야 할 수 있습니다.</string>
+    <string name="s_pass_old" auto="1">이전 암호를 입력하십시오 :</string>
+    <string name="s_pass_new" auto="1">새 비밀번호를 입력하십시오 :</string>
+    <string name="s_logout" auto="1">로그 아웃</string>
+    <string name="s_authenticate" auto="1">인증</string>
+    <string name="s_authenticating">인증중</string>
+    <string name="s_bookmark_history">기록</string>
+    <string name="s_server_account_title" auto="1">계정 :</string>
+    <string name="s_authenticate_success" auto="1">인증 성공</string>
+    <string name="s_authenticate_refresh">인증 재시도</string>
+    <string name="s_pref_thumbs_cache">사전 미리보기 이미지</string>
+    <string name="s_pref_thumbs_cache_summary">이것은 사진과 동영상이 들어 있는 폴더의 로딩 속도를 향상시켜줍니다.</string>
+    <string name="s_folders" auto="1">폴더</string>
+    <string name="s_hidden">숨김</string>
+    <string name="s_total" auto="1">합계</string>
+    <string name="s_custom_account">iamhyon@gmail.com</string>
+</resources>
diff --git a/res/values-ld/strings.xml b/res/values-ld/strings.xml
new file mode 100755
index 00000000..833a1f07
--- /dev/null
+++ b/res/values-ld/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_menu_hidden">show hidden files </string>
+    <string name="s_menu_root">root </string>
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
new file mode 100755
index 00000000..005a284f
--- /dev/null
+++ b/res/values-lt/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="app_name">skype</string>
+    <string name="warn_text_editor">java</string>
+</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
new file mode 100755
index 00000000..6b481a69
--- /dev/null
+++ b/res/values-lv/strings.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_photos">Bildes</string>
+    <string name="s_videos">Video</string>
+    <string name="s_music">Mūzika</string>
+    <string name="s_downloads">Lejupielādes</string>
+    <string name="s_external">Ārējā</string>
+    <string name="s_internal">Iekšējā</string>
+    <string name="s_menu_sort">Kārtot</string>
+    <string name="s_menu_sort_name_asc">Kārtot pēc nosaukuma (A-Z)</string>
+    <string name="s_menu_sort_name_desc">Kārtot pēc nosaukuma (Z-A)</string>
+    <string name="s_menu_hidden">Rādīt paslēptos failus</string>
+    <string name="s_menu_thumbs">Rādīt attēlu priekšskatījumus</string>
+    <string name="s_menu_new_folder">Jauna mape</string>
+    <string name="s_menu_other">Citi iestatījumi</string>
+    <string name="s_menu_root">Sakne</string>
+    <string name="s_menu_prefs_folder">Mapes iestatījumi</string>
+    <string name="s_menu_info">Info</string>
+    <string name="s_menu_copy">Kopēt</string>
+    <string name="s_menu_cut">Izgriezt</string>
+    <string name="s_menu_paste">Ielīmēt</string>
+    <string name="s_menu_delete">Dzēst</string>
+    <string name="s_menu_share">Sūtīt/Koplietot...</string>
+    <string name="s_menu_zip">Saspiest failu(-us)...</string>
+    <string name="s_menu_unzip">Atspiest...</string>
+    <string name="s_menu_rename">Pārsaukt</string>
+    <string name="s_menu_bookmark">Pievienot grāmatzīmi</string>
+    <string name="s_save">Saglabāt</string>
+    <string name="s_saveas">Saglabāt kā...</string>
+    <string name="s_cancel">Atcelt</string>
+    <string name="s_size">Izmērs</string>
+    <string name="s_pref_sort">Kārtošana</string>
+    <string name="s_menu_about">Par</string>
+    <string name="s_about_version">Versija</string>
+    <string name="s_about_author">Autors</string>
+    <string name="s_about_site">Mājas lapa</string>
+    <string name="s_about_email">E-pasts</string>
+    <string name="s_menu_open">Atvērt ar...</string>
+    <string name="s_menu_edit">Labot ar...</string>
+    <string name="s_pref_start">Sākuma mape</string>
+    <string name="s_menu_more">Vairāk opcijas...</string>
+    <string name="s_clear">Notīrīt</string>
+    <string name="s_menu_delete_all">Dzēst visus</string>
+    <string name="s_menu_move_all">Pārvietot šeit</string>
+    <string name="s_menu_copy_all">Kopēt šeit</string>
+    <string name="s_menu_up">Uz augšu</string>
+    <string name="s_bookmark_servers">Serveri</string>
+    <string name="s_menu_refresh">Atjaunot mapi</string>
+    <string name="s_hide">Paslēpt</string>
+    <string name="s_show">Radīt</string>
+    <string name="s_menu_exit">Iziet</string>
+    <string name="s_yes">Jā</string>
+    <string name="s_no">Nē</string>
+    <string name="s_wtf_remember">Vairāk nejautāt</string>
+    <string name="s_about_screensize">Ekrāna izmērs</string>
+    <string name="ext_media_nofs_notification_message">USB glabātuve ir tukša vai tai ir neatbalstīta failu sistēma.</string>
+    <string name="ime_action_send">Sūtīt</string>
+    <string name="no_file_chosen">Nav izvēlēts fails</string>
+    <string name="back_button_label">Atpakaļ</string>
+    <string name="next_button_label">Nākošais</string>
+    <string name="find_on_page">Meklēt lapā</string>
+    <string name="find">Meklēt</string>
+    <string name="activitychooserview_choose_application">Izvēlieties aplikāciju</string>
+    <string name="storage_internal">Iekšējā glabātuve</string>
+    <string name="storage_sd_card">SD karte</string>
+    <string name="storage_usb">USB glabātuve</string>
+    <string name="extract_edit_menu_button">Labot...</string>
+    <string name="s_title_picker">Izvēlēties direktoriju</string>
+    <string name="filename">Faila nosaukums</string>
+    <string name="s_msg_saved">saglabāts</string>
+    <string name="s_menu_view_line_numbers">Līniju numuri</string>
+    <string name="s_menu_new_file">Jauns teksta fails</string>
+    <string name="s_title_newfile">Jauns fails</string>
+    <string name="language">Valoda</string>
+    <string name="s_menu_download">Lejupielādēt</string>
+    <string name="test">Pārbaudīt</string>
+    <string name="test_success">Pieslēgums izdevās!</string>
+    <string name="theme">Tēma</string>
+    <string name="theme_dark">Tumša</string>
+    <string name="theme_light">Gaiša</string>
+    <string name="chooser_remember">Atcerēties manu izvēli</string>
+    <string name="activity_resolver_use_always">Vienmēr</string>
+    <string name="activity_resolver_use_once">Tikai vienreiz</string>
+    <string name="s_msg_folder_none">Nevar izveidot mapi</string>
+    <string name="s_overwrite">Pārrakstīt</string>
+    <string name="s_skip">Izlaist</string>
+    <string name="s_title_file_exists">Fails jau eksitē.</string>
+    <string name="s_ask_again">Jautāt katru reizi</string>
+    <string name="s_archives">Arhīvi</string>
+    <string name="s_pass_old">Ievadiet veco paroli:</string>
+    <string name="s_pass_new">Ievadiet jauno paroli:</string>
+    <string name="s_logout">Iziet</string>
+    <string name="s_authenticate">Autentificēties</string>
+    <string name="s_authenticating">Notiek autentifikācija</string>
+    <string name="s_bookmark_history">Vēsture</string>
+    <string name="s_server_account_title">Konts:</string>
+    <string name="s_authenticate_success">Autentifikācija veiksmīga</string>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
new file mode 100755
index 00000000..682a8285
--- /dev/null
+++ b/res/values-nb/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_photos">Bilder</string>
+    <string name="s_videos">Videoer</string>
+    <string name="s_music">Musikk</string>
+    <string name="s_downloads">Nedlastinger</string>
+    <string name="s_external">Ekstern</string>
+    <string name="s_internal">Intern</string>
+    <string name="s_view">Vis</string>
+    <string name="s_bookmarks">Bokmerker</string>
+    <string name="s_menu_favorites">Slå bokmerker av/på</string>
+    <string name="s_menu_sort">Sorter</string>
+    <string name="s_menu_sort_name_asc">Sorter etter navn (A-Å)</string>
+    <string name="s_menu_sort_name_desc">Sorter etter navn (Å-A)</string>
+    <string name="s_menu_sort_date_asc">Sorter etter dato (nyest først)</string>
+    <string name="s_menu_sort_date_desc">Sorter etter dato (eldst først)</string>
+    <string name="s_menu_sort_size_asc">Sorter etter størrelse (størst først)</string>
+    <string name="s_menu_sort_size_desc">Sorter etter størrelse (minst først)</string>
+    <string name="s_menu_sort_type">Sorter etter filtype</string>
+    <string name="s_menu_multi">Velg flere</string>
+    <string name="s_menu_grid">Rutenett-visning</string>
+    <string name="s_menu_list">Listevisning</string>
+    <string name="s_menu_carousel">Karusell</string>
+    <string name="s_menu_hidden">Vis skjulte filer</string>
+    <string name="s_menu_thumbs">Vis miniatyrbilder</string>
+    <string name="s_menu_new_folder">Ny mappe</string>
+    <string name="s_menu_other">Andre innstillinger</string>
+    <string name="s_menu_flush">Tøm hurtigbuffer</string>
+    <string name="s_menu_root">Root</string>
+    <string name="s_menu_prefs_folder">Mappeinnstillinger</string>
+    <string name="s_menu_prefs_global">Globale innstillinger</string>
+    <string name="s_menu_info">Informasjon</string>
+    <string name="s_menu_copy">Kopier</string>
+    <string name="s_menu_cut">Klipp ut</string>
+    <string name="s_menu_paste">Lim inn</string>
+    <string name="s_menu_delete">Slett</string>
+    <string name="s_menu_share">Send/del...</string>
+    <string name="s_menu_zip">Komprimer fil(er)...</string>
+    <string name="s_menu_unzip">Pakk ut...</string>
+    <string name="s_menu_rename">Gi nytt navn...</string>
+    <string name="s_menu_bookmark">Legg til bokmerke</string>
+    <string name="s_save">Lagre</string>
+    <string name="s_saveas">Lagre som...</string>
+    <string name="s_cancel">Avbryt</string>
+    <string name="s_size">Størrelse</string>
+    <string name="s_none">Ingen</string>
+    <string name="s_pref_server_add">+ Legg til server</string>
+    <string name="s_menu_about">Om</string>
+    <string name="s_menu_open">Åpne med...</string>
+    <string name="s_menu_edit">Rediger med...</string>
+    <string name="s_menu_root_disabled">Root disabled</string>
+    <string name="s_text_intro_body">Målet med OpenExplorer er å gjøre deg mer produktiv innenfor Android-filsystemet og i nettskyen. Enten du trenger å behandle videoer og bilder fra forskjellige steder, eller må ha tilgang til webserveren din via FTP kan OpenExplorer oppfylle dine behov.\n\nVennligst angi din startmappe:</string>
+    <string name="s_menu_more">Flere alternativer...</string>
+    <string name="s_menu_delete_all">Slett alt</string>
+    <string name="s_menu_move_all">Flytt hit</string>
+    <string name="s_menu_copy_all">Kopier hit</string>
+    <string name="s_menu_up">Ett nivå opp</string>
+    <string name="s_menu_refresh">Oppdater mappe</string>
+    <string name="s_pref_fancy_menus">Fine menyer</string>
+    <string name="s_menu_exit">Avslutt</string>
+    <string name="s_menu_location_int">Intern Minnesti </string>
+    <string name="s_menu_location_ext">Ekstern Minnesti</string>
+    <string name="menu_view_font_small">Liten skriftstørrelse</string>
+    <string name="menu_view_font_medium">Middels skriftstørrelse</string>
+    <string name="menu_view_font_large">Stor skriftstørrelse</string>
+    <string name="warn_text_editor">Velkommen til tekstredigering, trykk og hold lenge på teksten for å gå til redigeringsmodus.</string>
+    <string name="warn_networking">Velkommen til nettverksutforskeren. Vennligst husk at denne delen av programmet fortsatt er under utvikling og kan ha småfeil. Vær så snill og ikke gi en dårlig vurdering hvis du finner noen av disse feilene.</string>
+    <string name="s_privacy">Privat Policy</string>
+    <string name="s_menu_system_mount">Gjør /system skrivbart (Farlig!)</string>
+    <string name="s_menu_system_mount_on">Systemet er SKRIVBART!</string>
+    <string name="s_menu_system_mount_off">Sysemet er kun lesbart.</string>
+    <string name="s_pref_servers_private">Behold servere privat</string>
+    <string name="s_pref_servers_private_summary">Lagre server instillinger på privat område. Serverinstillingene vil bli fjernet hvis appen blir avinstallert. Hvis du reinstallerer appen i fremtiden bør du ikke hake av denne for da beholder du instillingene.</string>
+    <string name="s_theme_lightdark">Lys og Mørk</string>
+    <string name="s_overwrite">Overskriv</string>
+    <string name="s_compressed">Komprimert</string>
+    <string name="s_master_pass">Hovedpassord</string>
+    <string name="s_pass_old">Skrv gammelt passord</string>
+    <string name="s_pass_new">Skriv nytt passord</string>
+    <string name="s_logout">Logg ut</string>
+    <string name="s_bookmark_history">Historie</string>
+    <string name="s_server_account_title">Kono</string>
+    <string name="s_folders">Mapper</string>
+    <string name="s_hidden">Skjult</string>
+    <string name="s_total">totalt</string>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
old mode 100644
new mode 100755
index 55e8edf6..782c60d7
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
     <string name="app_name">Open Explorer</string>
     <string name="s_photos">Foto\'s</string>
@@ -13,9 +13,9 @@
     <string name="s_menu_sort">Sorteren</string>
     <string name="s_menu_sort_name_asc">Sorteer op naam (A-Z)</string>
     <string name="s_menu_sort_name_desc">Sorteer op naam (Z-A)</string>
-    <string name="s_menu_sort_date_asc">Sorteer op datum</string>
+    <string name="s_menu_sort_date_asc">Sorteer op nieuwste</string>
     <string name="s_menu_sort_date_desc">Sorteer op oudste</string>
-    <string name="s_menu_sort_size_asc">Sorteer op grootste</string>
+    <string name="s_menu_sort_size_asc">Sorteer op grootte</string>
     <string name="s_menu_sort_size_desc">Sorteer op kleinste</string>
     <string name="s_menu_sort_type">Sorteer op bestandstype</string>
     <string name="s_menu_multi">Meervoudige selectie</string>
@@ -23,15 +23,15 @@
     <string name="s_menu_list">Lijstweergave</string>
     <string name="s_menu_carousel">Carrousel</string>
     <string name="s_menu_hidden">Geef verborgen bestanden weer</string>
-    <string name="s_menu_thumbs">Toon Logo Toetsen</string>
-    <string name="s_menu_new_folder">Nieuwe                  </string>
+    <string name="s_menu_thumbs">Toon  kleine afbeeldingen</string>
+    <string name="s_menu_new_folder">Nieuwe map</string>
     <string name="s_menu_other">Meer instellingen</string>
     <string name="s_menu_flush">Maak buffer leeg</string>
     <string name="s_menu_root">Root</string>
-    <string name="s_menu_prefs_folder">Map voorkeuren</string>
-    <string name="s_menu_prefs_global">Algemene Instellingen</string>
+    <string name="s_menu_prefs_folder">Mapinstellingen</string>
+    <string name="s_menu_prefs_global">Instellingen</string>
     <string name="s_menu_info">Info</string>
-    <string name="s_menu_copy">Kopieëren</string>
+    <string name="s_menu_copy">Kopiëren</string>
     <string name="s_menu_cut">Knippen</string>
     <string name="s_menu_paste">Plakken</string>
     <string name="s_menu_delete">Verwijderen</string>
@@ -50,8 +50,8 @@
     <string name="s_pref_display">Weergave instellingen</string>
     <string name="s_pref_hidden">Verborgen bestanden weergeven</string>
     <string name="s_pref_hidden_summary">Verborgen bestanden en mappen weergeven</string>
-    <string name="s_pref_thumbs">Logo Toetsen weergeven</string>
-    <string name="s_pref_thumbs_summary">Laat Logo Toets voor Afbeelding/Video/App bestanden zien</string>
+    <string name="s_pref_thumbs">Afbeeldingsminiaturen weergeven</string>
+    <string name="s_pref_thumbs_summary">Laat een miniatuur voor Afbeelding/Video/App bestanden zien</string>
     <string name="s_pref_view">Weergavemodus</string>
     <string name="s_pref_view_summary">Bestanden weergeven in een raster, lijst of carrousel (enkel voor Honeycomb)</string>
     <string name="s_pref_sort">Sorteren</string>
@@ -59,37 +59,37 @@
     <string name="s_pref_advanced">Geavanceerd</string>
     <string name="s_pref_server_name">Servernaam</string>
     <string name="s_pref_server_name_summary">Naam van de server</string>
-    <string name="s_pref_server_url">Server URL</string>
-    <string name="s_pref_server_url_summary">Geef volledige server URL op</string>
-    <string name="s_pref_server_host">Server Host</string>
+    <string name="s_pref_server_url">Server-URL</string>
+    <string name="s_pref_server_url_summary">Geef volledige server-URL op</string>
+    <string name="s_pref_server_host">Serverhost</string>
     <string name="s_pref_server_user">Gebruiker</string>
     <string name="s_pref_server_user_summary">Gebruikersnaam</string>
     <string name="s_pref_server_password">Wachtwoord</string>
-    <string name="s_pref_server_password_summary">Login Wachtwoord</string>
+    <string name="s_pref_server_password_summary">Loginwachtwoord</string>
     <string name="s_pref_server_path">Submap</string>
-    <string name="s_pref_server_path_summary">Geef standaard login pad op</string>
+    <string name="s_pref_server_path_summary">Geef standaard loginpad op</string>
     <string name="s_pref_server_extras">Extra Instellingen</string>
     <string name="s_pref_server_update">Server Toevoegen/Bijwerken</string>
     <string name="s_pref_server_type">Server Type</string>
     <string name="s_files">bestanden</string>
     <string name="s_create">Aanmaken</string>
-    <string name="s_title_holding_x_files">Vasthouden van %s bestanden</string>
-    <string name="s_title_newfolder">Maak een nieuwe map aan</string>
-    <string name="s_title_send">Verzend xxx</string>
-    <string name="s_title_unzip">Pak xxx uit</string>
+    <string name="s_title_holding_x_files" formatted="false">Vasthouden van %s bestanden</string>
+    <string name="s_title_newfolder">Maak een nieuwe map</string>
+    <string name="s_title_send">Verstuur xxx</string>
+    <string name="s_title_unzip">Uitpakken xxx</string>
     <string name="s_title_zip">Zip xxx</string>
-    <string name="s_title_executing">Uitvoerend</string>
-    <string name="s_title_deleting">Verwijderend</string>
-    <string name="s_title_searching">Zoekend</string>
-    <string name="s_title_moving">Verplaatsend</string>
+    <string name="s_title_executing">Uitvoeren</string>
+    <string name="s_title_deleting">Verwijderen</string>
+    <string name="s_title_searching">Zoeken</string>
+    <string name="s_title_moving">Verplaatsen</string>
     <string name="s_title_copying">Kopiëren</string>
     <string name="s_title_zipping">Zippen</string>
-    <string name="s_title_unzipping">Uitpakkend</string>
+    <string name="s_title_unzipping">Uitpakken</string>
     <string name="s_title_wait">Even geduld...</string>
-    <string name="s_alert_confirm_delete"> %s verwijderen kan niet ongedaan worden gemaakt. Ben je zeker dat je wil verdergaan?</string>
-    <string name="s_alert_rename">Tik een nieuwe naam voor dit bestand in</string>
-    <string name="s_alert_newfolder">\nTik de naam van de map die je wil aanmaken.</string>
-    <string name="s_alert_unzip">\nWil je %s hier ofwel in een andere map uitpakken?</string>
+    <string name="s_alert_confirm_delete" formatted="false"> %s verwijderen kan niet ongedaan worden gemaakt. Bent u zeker dat u wilt verdergaan?</string>
+    <string name="s_alert_rename">Nieuwe naam voor dit bestand:</string>
+    <string name="s_alert_newfolder">Voer de naam in van de map die je wilt aanmaken.</string>
+    <string name="s_alert_unzip" formatted="false">Wil je %s hier of in een andere map uitpakken?</string>
     <string name="s_button_unzip_here">Hier uitpakken</string>
     <string name="s_button_unzip_else">Ergens anders uitpakken...</string>
     <string name="s_msg_none">Bestand(en) konden niet</string>
@@ -101,11 +101,11 @@
     <string name="s_remove">Verwijderd</string>
     <string name="s_eject">Uitgewerpen</string>
     <string name="s_update">Bijwerken</string>
-    <string name="s_alert_bookmark_rename">verander de omschrijving van uw favoriet</string>
+    <string name="s_alert_bookmark_rename">Verander de omschrijving van uw favoriet</string>
     <string name="s_title_bookmark_prefix">Favorieten beheren</string>
     <string name="s_alert_remove_safe">Het is veilig om de schijf te verwijderen</string>
     <string name="s_alert_remove_error">Uitwerpen is niet mogelijk</string>
-    <string name="s_menu_about">Over</string>
+    <string name="s_menu_about">Info</string>
     <string name="s_about_version">Versie</string>
     <string name="s_about_author">Auteur</string>
     <string name="s_about_site">Website</string>
@@ -117,51 +117,50 @@
     <string name="s_menu_edit">Bewerken met...</string>
     <string name="s_pref_stats_title">Help mee om OpenExplorer te verbeteren</string>
     <string name="s_pref_stats_summary">Stuur anoniem gebruiksinformatie. Er worden geen gegevens verstuurd die inbreuk maken op uw privacy.</string>
-    <string name="s_error_no_intents">Geen enkele geinstalleerde app kan dit type bestand lezen.</string>
+    <string name="s_error_no_intents">Geen van de geïnstalleerde apps kan dit type bestand lezen.</string>
     <string name="s_menu_root_disabled">Root uitgeschakeld</string>
     <string name="s_pref_start">Beginmap</string>
     <string name="s_pref_start_summary">Geeft aan welke map OpenExplorer als eerste opent</string>
     <string name="s_custom">Aangepast...</string>
     <string name="s_text_intro_top">Welkom bij OpenExplorer</string>
-    <string name="s_text_intro_body">\nOpenExplorer heeft als doel je meer productiviteit te geven binnen het Android bestandsysteem en in de bestandwolk ( cloud ). Bij het beheren van video\'s of foto\'s uit verschillende bronnen of het tele-beheren van je webserver  d.m.v.  FTP, kan OpenExplorer hier aan je behoefte voldoen.</string>
+    <string name="s_text_intro_body">OpenExplorer heeft als doel je meer productiviteit te geven binnen het Android bestandsysteem en in de online opslagdienst ( cloud ). Bij het beheren van video\'s of foto\'s uit verschillende bronnen of het tele-beheren van je webserver  d.m.v.  FTP, kan OpenExplorer hier aan je behoefte voldoen.</string>
     <string name="s_info_num_folders">Aantal mappen</string>
     <string name="s_info_num_files">Aantal bestanden</string>
     <string name="s_info_last_modified">Laatst gewijzigd</string>
-    <string name="s_info_permissions">Bestand Rechten:</string>
+    <string name="s_info_permissions">Rechten:</string>
     <string name="s_info_permission_read">Lezen:</string>
     <string name="s_info_permission_write">Schrijven:</string>
     <string name="s_info_permission_execute">Uitvoeren:</string>
     <string name="s_toggle_keyboard">Toetsenbord</string>
     <string name="s_show_password">Wachtwoord weergeven</string>
-    <string name="s_error_ftp">fout met netwerkverbinding</string>
-    <string name="s_prompt_zip">Geef bestandsnaam van nieuw zip bestand</string>
+    <string name="s_error_ftp">Fout bij verbinden met het netwerk</string>
+    <string name="s_prompt_zip">Geef een naam op van het nieuwe zipbestand:</string>
     <string name="app_edit">Bewerken met OpenExplorer</string>
     <string name="s_menu_more">Meer opties...</string>
-    <string name="s_msg_low_memory">Weinig vrij geheugen!</string>
+    <string name="s_msg_low_memory">Weinig geheugen!</string>
     <string name="s_clear">Wissen</string>
     <string name="s_menu_delete_all">Verwijder alles</string>
     <string name="s_menu_move_all">Verplaats naar hier</string>
     <string name="s_menu_copy_all">Kopieer hier</string>
-    <string name="s_confirm_delete">Weet je zeker dat je %s wil verwijderen?</string>
-    <string name="s_error_same_destination">Doelmap is dezelfde</string>
+    <string name="s_confirm_delete" formatted="false">Weet u zeker dat u %s wil verwijderen?</string>
+    <string name="s_error_same_destination">Doelmap is hetzelfde</string>
     <string name="s_sample_notification">3 bestanden naar sd-kaart kopieeren</string>
     <string name="s_pref_fullscreen">Volledig scherm</string>
-    <string name="s_pref_fullscreen_summary_on">Verberg meldingen balk</string>
-    <string name="s_pref_fullscreen_summary_off">Laat meldingen balk zien</string>
+    <string name="s_pref_fullscreen_summary_on">Verberg meldingsbalk</string>
+    <string name="s_pref_fullscreen_summary_off">Laat meldingsbalk zien</string>
     <string name="s_pref_pagers">Laat pagers zien</string>
     <string name="s_pref_pagers_summary_on">Horizontaal vegen = door mappen bladeren</string>
     <string name="s_pref_pagers_summary_off">Horizontaal vegen uitgeschakeld</string>
-    <string name="s_alert_new_media">Nieuw medium ontdekt!</string>
+    <string name="s_alert_new_media">Nieuwe media aangesloten</string>
     <string name="s_warn_pager_title">Nieuwe mogelijkheid: pagers bekijken</string>
-    <string name="s_warn_pager">Veeg van links naar rechts om naar een bovenliggende map te gaan en van rechts naar links om terug te keren. Dit maakt het navigeren makkelijker. Probeer dit uit (op externe media)!</string>
-    <string name="s_warn_confirm">Begrijp je dit?</string>
+    <string name="s_warn_pager">Veeg van links naar rechts om naar een bovenliggende map te gaan en van rechts naar links om terug te gaan. Dit maakt het navigeren makkelijker. Probeer dit (op externe media)</string>
+    <string name="s_warn_confirm">Begrijpt u dit?</string>
     <string name="s_warn_disable">Uitschakelen</string>
-    <string name="s_pref_intent_internal">inhoud</string>
-    <string name="s_pref_intent_internal_on">Intent</string>
-    <string name="s_pref_intent_internal_off">gebruik systeem inhoud organisatie</string>
+    <string name="s_pref_intent_internal_on">Gebruik OpenExplorer-intentmanager</string>
+    <string name="s_pref_intent_internal_off">Gebruik systeeminhoudorganisator</string>
     <string name="s_pref_text_internal">Gebruik interne tekstbewerker</string>
     <string name="s_text_editor_title">Tekstbewerker</string>
-    <string name="s_pref_show_root">Toon het hoofdsbestandsysteem (/)</string>
+    <string name="s_pref_show_root">Toon het hoofdbestandsysteem (/)</string>
     <string name="s_pref_show_internal">Toon de interne media</string>
     <string name="s_pref_show_external">Toon de externe media</string>
     <string name="s_error_no_media">Het lijkt alsof er geen media is geplaatst. Schakel USB opslag uit of plaats media.</string>
@@ -175,27 +174,27 @@
     <string name="s_pref_timeout">Timeout</string>
     <string name="s_pref_timeout_summary">Timeout in seconden</string>
     <string name="s_menu_up">Omhoog</string>
-    <string name="s_prompt_unzip">Benoem de uitpak maplocatie:</string>
+    <string name="s_prompt_unzip">Benoem de uitpakmaplocatie:</string>
     <string name="s_pref_hardware_accel">Hardware Acceleratie inschakelen</string>
-    <string name="s_pref_honeyplus">Android 3.0+ Opties</string>
-    <string name="s_pref_actionmode">Actiemodus</string>
-    <string name="s_pref_actionmode_enabled">Gebruik actiemode</string>
-    <string name="s_pref_actionmode_disabled">Gebruik standaard contextmenus</string>
+    <string name="s_pref_honeyplus">Android-3.0+-Opties</string>
+    <string name="s_pref_actionmode">Actie Mode</string>
+    <string name="s_pref_actionmode_enabled">Gebruik actie mode</string>
+    <string name="s_pref_actionmode_disabled">Gebruik standaard context menus</string>
     <string name="s_server_smb">SMB/Windows</string>
     <string name="s_bookmark_drives">Schijven</string>
     <string name="s_bookmark_smart">Slimme mappen</string>
     <string name="s_bookmark_favorites">Favorieten</string>
     <string name="s_bookmark_servers">Servers</string>
     <string name="s_bookmark_cache">Buffer</string>
-    <string name="s_info_totalspace">Totale grootte Schijfruimte:</string>
-    <string name="s_info_freespace">Beschikbare Schijfruimte:</string>
+    <string name="s_info_totalspace">Totale grootte:</string>
+    <string name="s_info_freespace">Beschikbare ruimte:</string>
     <string name="s_status_rate">Beoordling:</string>
     <string name="s_about_hardware">Hardware</string>
-    <string name="s_menu_refresh">Vernieuwen</string>
-    <string name="s_pref_reset">reset kijkers</string>
+    <string name="s_menu_refresh">Vernieuw map</string>
+    <string name="s_pref_reset">Herstel weergaven</string>
     <string name="s_toast_complete">Bewerking voltooid!</string>
     <string name="s_pref_reset_summary">Klik hier om alle map-specifieke weergave-instellingen te verwijderen en de standaardinstellingen te herstellen.</string>
-    <string name="s_prompt_path">Tik Locatie in:</string>
+    <string name="s_prompt_path">Locatie:</string>
     <string name="s_prompt_search">Zoeken naar:</string>
     <string name="s_prompt_search_within">Zoeken in:</string>
     <string name="s_pref_view_category">Bladwijzer voorkeuren</string>
@@ -208,37 +207,39 @@
     <string name="s_msg_event_cancelled">Gebeurtenis geannuleerd.</string>
     <string name="s_alert_newfolder_folder">Maak een nieuwe map in:</string>
     <string name="s_pref_fancy_category">Weergave instellingen</string>
-    <string name="s_pref_fancy_menus">Uitgebreide menu\'s</string>
-    <string name="s_pref_fancy_context">Grappige Context Menu\'s</string>
-    <string name="s_search_files">Bestanden doorzoeken</string>
-    <string name="search_summary" formatted="false">Zoekend naar "%s" in "%s" (%d)...</string>
-    <string name="search_results" formatted="false">%d resultaten gevonden voor "%s" in "%s"</string>
+    <string name="s_pref_fancy_menus">Uitgebreide menu`s</string>
+    <string name="s_pref_fancy_context">Grappige Contextmenu\'s</string>
+    <string name="s_search_files">Bestanden zoeken</string>
+    <string name="search_summary" formatted="false">Zoekend naar \&quot; %s \&quot; in \&quot; %s \&quot; (%d)...</string>
+    <string name="search_results" formatted="false">%d resultaten gevonden voor \&quot; %s \&quot; in \&quot; %s \&quot;</string>
     <string name="s_menu_exit">Afsluiten</string>
-    <string name="s_warn_wtf_message">Oeps! Er is een onbekende fout opgetreden! Dit een voorkomend probleem bij beta versies van apps. Onze werkwijze om dit op te lossen is door foutrapporten van meerdere apparaten te ontvangen, zodat wij de problemen kunnen onderzoeken en verhelpen. Wil je het foutrapport anoniem opsturen naar de onwikkelaar?</string>
-    <string name="s_warn_wtf_ps">*** Opmerking: deze app is nog in ontwikkeling (beta). Geef deze app geen slechte waardering vanwege crashes. Verwijder de app als hij hinderlijk functioneert. Dank je wel! </string>
+    <string name="s_warn_wtf_message">Oeps! Er is een onbekende fout opgetreden! Dit een voorkomend probleem bij betaversies van apps. Onze werkwijze om dit op te lossen is door foutrapporten van meerdere apparaten te ontvangen, zodat wij de problemen kunnen onderzoeken en verhelpen. Wil je het foutrapport anoniem opsturen naar de ontwikkelaar?</string>
+    <string name="s_warn_wtf_ps">*** Opmerking: deze app is nog in ontwikkeling (beta). Geef deze app geen slechte waardering vanwege crashes. Verwijder de app als hij slecht functioneert. </string>
     <string name="s_yes">Ja</string>
     <string name="s_no">Nee</string>
     <string name="s_wtf_preview">Voorbeeld rapportdata</string>
-    <string name="s_wtf_remember">Niet meer vragen</string>
+    <string name="s_wtf_remember">Niet nog eens vragen</string>
     <string name="s_pref_basebar">Verdeelde taakbalk</string>
-    <string name="s_pref_basebar_on">Knoppen onderzijde scherm in Landschap Modus</string>
+    <string name="s_pref_basebar_on">Knoppen onderzijde scherm in Landschapmodus</string>
     <string name="s_pref_basebar_off">Knoppen bovenzijde scherm (indien mogelijk)</string>
     <string name="s_pref_autowtf">Crashrapporten automatisch verzenden</string>
-    <string name="s_pref_autowtf_summary">Verzend automatisch een rapport bij onvoorziene uitzonderingen.</string>
+    <string name="s_pref_autowtf_summary">Verzend automatisch een rapport bij onverwachte uitzonderingen.</string>
     <string name="s_split_auto">Automatisch</string>
     <string name="s_split_top">Dwing Knoppen naar bovenrand</string>
     <string name="s_split_top_single">Dwing Knop naar bovenrand</string>
     <string name="s_split_bottom">Dwing Knoppen naar Onderrand</string>
-    <string name="s_split_none">Plaats alle knoppen in het Systeem Menu</string>
+    <string name="s_split_none">Plaats alle knoppen in het Systeemmenu</string>
     <string name="s_about_screensize">Schermformaat</string>
-    <string name="s_about_density">Dichtheid</string>
+    <string name="s_about_density">Density</string>
     <string name="s_menu_location_int">Locatie intern geheugen</string>
     <string name="s_menu_location_ext">Locatie extern geheugen</string>
     <string name="s_wtf_context">Verklaar a.u.b. de context van deze crash:</string>
     <string name="thanks">Dankje!</string>
-    <string name="app_description">Niemand </string>
-    <string name="alert_translate_google">Hallo, deze vertaling werd automatisch uitgevoerd door Google Translate. Indien je zowel Engels als %s kent en zou willen helpen met een betere vertaling, klik dan op deze knop:</string>
-    <string name="alert_translate_none">Het lijkt erop dat je een niet ondersteunde taal gebruikt. Ken je zowel Engels als %s en zou je willen helpen met de vertaling, klik dan hier:</string>
+    <string name="menu_view_font_small">Klein lettertype</string>
+    <string name="menu_view_font_medium">Gemiddeld lettertype</string>
+    <string name="menu_view_font_large">Groot lettertype</string>
+    <string name="alert_translate_google" formatted="false">Hallo, deze vertaling werd automatisch uitgevoerd door Google Translate. Indien je zowel Engels als %s kent en zou willen helpen met een betere vertaling, klik dan op deze knop:</string>
+    <string name="alert_translate_none" formatted="false">Het lijkt erop dat je een niet ondersteunde taal gebruikt. Ken je zowel Engels als %s en zou je willen helpen met de vertaling, klik dan hier:</string>
     <string name="button_translate">Vertaal</string>
     <string name="httpError">Er is een netwerkfout opgetreden.</string>
     <string name="httpErrorAuth">Verificatie mislukt.</string>
@@ -255,8 +256,8 @@
     <string name="lockscreen_password_wrong">Sorry, probeer het opnieuw</string>
     <string name="whichApplication">Actie voltooien met</string>
     <string name="noApplications">Geen enkele app kan deze actie uitvoeren.</string>
-    <string name="report">Rapport</string>
-    <string name="sim_restart_button">Opnieuw starten</string>
+    <string name="report">Rapporteren</string>
+    <string name="sim_restart_button">Herstarten</string>
     <string name="extmedia_format_button_format">Formatteren</string>
     <string name="ext_media_nofs_notification_message">USB-opslag leeg of heeft een niet-ondersteund bestandssysteem.</string>
     <string name="activity_list_empty">Geen overeenkomstige activiteiten gevonden</string>
@@ -275,48 +276,90 @@
     <string name="activitychooserview_choose_application">Kies een app</string>
     <string name="shareactionprovider_share_with">Delen met</string>
     <string name="storage_internal">Interne Opslag</string>
-    <string name="storage_sd_card">SD Kaart</string>
-    <string name="storage_usb">USB opslag</string>
+    <string name="storage_sd_card">SD-Kaart</string>
+    <string name="storage_usb">USB-opslag</string>
     <string name="extract_edit_menu_button">Bewerken...</string>
-    <string name="activity_chooser_view_see_all">Alles zien</string>
+    <string name="activity_chooser_view_see_all">Alles weergeven</string>
     <string name="s_title_picker">Kies een map</string>
     <string name="selected_path">Geselecteerd pad:</string>
     <string name="filename">Bestandsnaam</string>
-    <string name="s_msg_saved">opgeslagen</string>
+    <string name="s_msg_saved">Opgeslagen</string>
     <string name="s_menu_view_line_numbers">Regelnummers</string>
-    <string name="warn_text_editor">Welkom in de tekst-editor. Druk lang om de tekst-editmode te activeren.</string>
-    <string name="warn_networking">Welkom bij de netwerk functies. Let wel, deze functie is nog in ontwikkeling en kan fouten bevatten. Geef aub daarom geen slechte waardering indien je een fout vindt.</string>
+    <string name="warn_text_editor">Welkom in de teksteditor. Druk lang om de teksteditmode te activeren.\n\n\nWelkom by Tekstbewerker. Gelieve lang op de tekst te drukken om de bewerkingsmode te starten.\n</string>
+    <string name="warn_networking">Welkom bij de netwerkfuncties. Let wel op dat deze functie nog in ontwikkeling is en fouten kan bevatten. Geef aub daarom geen slechte waardering wanneer je een fout vindt.</string>
     <string name="s_menu_new_file">Nieuw Tekstbestand</string>
     <string name="s_msg_created">Gemaakt</string>
     <string name="s_title_newfile">Nieuw Bestand</string>
     <string name="s_alert_newfile_folder">Maak nieuw bestand in:</string>
     <string name="s_alert_newfile">Tik de naam van het nieuwe bestand in:</string>
-    <string name="s_alert_exit">Weet je zeker dat u wilt afsluiten?</string>
+    <string name="s_alert_exit">Weet u zeker dat u wilt afsluiten?</string>
     <string name="s_alert_clipboard">Gekopieerd naar klembord</string>
     <string name="s_alert_restart">Opnieuw opstarten. Even geduld AUB...</string>
     <string name="language">Taal</string>
     <string name="s_menu_download">Download </string>
     <string name="scan">Scan</string>
     <string name="test">Test </string>
-    <string name="test_success">Verbinding gelukt!</string>
+    <string name="test_success">Verbinding geslaagd!</string>
     <string name="no_items">Lege map.</string>
     <string name="clipboard">Klembord</string>
     <string name="theme">Thema</string>
+    <string name="theme_dark">Donkere UI</string>
+    <string name="theme_light">Lichtere UI</string>
     <string name="chooser_remember">Onthoud mijn keuze</string>
-    <string name="use_system">Gebruik systeem >></string>
+    <string name="use_system">Gebruik systeem &gt;&gt;</string>
     <string name="activity_resolver_use_always">Altijd </string>
-    <string name="activity_resolver_use_once">Een keer</string>
+    <string name="activity_resolver_use_once">Eén keer</string>
     <string name="s_pref_bookmarks_summary">Laat favorieten zien</string>
-    <string name="s_menu_heatmap">Hoofdmap</string>
     <string name="apply_to_all">Wil je dit bij alle folders toepassen?</string>
-    <string name="s_pref_view_folders">Folder instellingen</string>
+    <string name="s_pref_view_folders">Folderinstellingen</string>
     <string name="s_pref_view_general">Algemene Voorkeuren</string>
     <string name="s_pref_text_wrap">Tekst afbreken</string>
     <string name="s_pref_thumbs_crop">Bijsnijden/centreren afbeeldingsminiaturen</string>
-    <string name="s_pref_thumbs_cache_clear">Wis miniatuur weergave buffer</string>
+    <string name="s_pref_thumbs_cache_clear">Wis miniatuur weergavebuffer</string>
     <string name="s_msg_folder_none">Kan deze folder niet aanmaken</string>
-    <string name="msg_bb_donate">Hallo BlackBerry gebruiker! Ik hoop dat je Open Explorer met plezier gebruikt. Ik heb mijn best gedaan om een goede compatibiliteit met BlackBerry-apparaten te verzekeren. Maar, het blijkt dat er enkele verschillen zijn, die moeilijk handelbaar zijn zonder een echt BlackBerry apparaat. Daarom probeer ik genoeg donaties te verzamelen om een BlackBerry 10 te kopen om de compatibiliteit te verbeteren. Als je deze app bruikbaar vindt, overweeg dan eens een donatie, door gebruik te maken van de knop hieronder, of door de menu-optie "doneren" te gebruiken. Bedankt en happy exploring!</string>
+    <string name="msg_bb_donate">Hallo BlackBerry gebruiker! Ik hoop dat je Open Explorer met plezier gebruikt. Ik heb mijn best gedaan om een goede compatibiliteit met BlackBerry-apparaten te verzekeren. Maar, het blijkt dat er enkele verschillen zijn, die moeilijk handelbaar zijn zonder een echt BlackBerry-apparaat. Daarom probeer ik genoeg donaties te verzamelen om een BlackBerry 10 te kopen om de compatibiliteit te verbeteren. Als je deze app bruikbaar vindt, overweeg dan eens een donatie, door gebruik te maken van de knop hieronder, of door de menu-optie \\\&quot;doneren\\\&quot; te gebruiken. Bedankt en happy exploring!</string>
+    <string name="s_privacy">Privacybeleid</string>
+    <string name="s_menu_system_mount">Maken / wijzigingen toestaan (gevaarlijk!)</string>
     <string name="s_menu_system_mount_on">Systeem is SCHRIJFBAAR!</string>
     <string name="s_menu_system_mount_off">Systeem is Alleen Lezen</string>
+    <string name="s_pref_servers_private">Houd servers verborgen</string>
+    <string name="s_pref_servers_private_summary">Sla instellingen lokaal op. Dit zorgt ervoor dat de serverinstellingen verloren gaan als het programma verwijderd wordt. Als je deze app ooit opnieuw installeert, dan voorkom je dit door deze optie uitgevinkt te laten.</string>
     <string name="s_theme_lightdark">Licht en Donker</string>
+    <string name="s_theme_custom">Krijtstrepen</string>
+    <string name="s_menu_rate">Beoordeel</string>
+    <string name="s_alert_destination_exists">Doelbestand bestaat al. Wat wilt U doen?</string>
+    <string name="s_overwrite">Overschrijven</string>
+    <string name="s_skip">Overslaan</string>
+    <string name="s_msg_file_exists">Sommige doelbestanden kunnen reeds bestaan.\nBestand overschrijven?</string>
+    <string name="s_title_file_exists">Bestand bestaat reeds</string>
+    <string name="s_msg_pref_archives">Wilt u bladeren of het archief uitpakken?</string>
+    <string name="s_browse">Zoeken</string>
+    <string name="s_extract">Pak uit</string>
+    <string name="s_extracted">uitgepakt</string>
+    <string name="s_extracting">Bezig met uitpakken</string>
+    <string name="s_extract_with">Uitpakken met...</string>
+    <string name="s_title_archive_handler">Archive beheerder</string>
+    <string name="s_ask_again">Vraag iedere keer</string>
+    <string name="s_archives">Archief bestanden</string>
+    <string name="s_compress">Comprimeer</string>
+    <string name="s_compress_type">Compressiemethode</string>
+    <string name="s_compressed">Gecomprimeerd</string>
+    <string name="s_delete_after">Verwijder  bronbestand na voltooiing</string>
+    <string name="s_master_pass">Hoofdwachtwoord</string>
+    <string name="s_master_pass_warning">Je kunt een masterwachtwoord invoeren. Dit wordt gebruikt als sleutel voor alle andere wachtwoorden. Als je hier niets invult wordt je standaard masterpassword hiervoor gebruikt. Houd er rekening mee dat als je je wachtwoord update terwijl er al opgeslagen netwerkwachtwoorden zijn, dat je waarschijnlijk wachtwoorden zult moeten resetten en opnieuw moet inloggen bij cloudservers.</string>
+    <string name="s_pass_old">Vul oud wachtwoord in:</string>
+    <string name="s_pass_new">Geef nieuw wachtwoord op:</string>
+    <string name="s_logout">Uitloggen</string>
+    <string name="s_authenticate">Geverifieerd</string>
+    <string name="s_authenticating"> Bezig met verifieeren</string>
+    <string name="s_bookmark_history">Geschiedenis </string>
+    <string name="s_server_account_title">Account:</string>
+    <string name="s_authenticate_success">Verificatie geslaagd</string>
+    <string name="s_authenticate_refresh">Ververs verifieering</string>
+    <string name="s_pref_thumbs_cache">Vooraf ingeladen miniaturen</string>
+    <string name="s_pref_thumbs_cache_summary">Dit versnelt het laden van folders met foto\'s en films</string>
+    <string name="s_folders">Mappen</string>
+    <string name="s_hidden">Verborgen</string>
+    <string name="s_total">Totaal</string>
+    <string name="s_custom_account">Aangepast account</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
old mode 100644
new mode 100755
index a592085b..6b20fc7a
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,246 +1,247 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
-    <string name="app_name" auto="1">Otwórz przeglądarkę</string>
-    <string name="s_photos" auto="1">Zdjęcia</string>
-    <string name="s_videos" auto="1">Filmy</string>
-    <string name="s_music" auto="1">Muzyka</string>
+    <string name="app_name">Otwórz przeglądarkęopera</string>
+    <string name="s_photos">Zdjęcia</string>
+    <string name="s_videos">Filmy</string>
+    <string name="s_music">Muzyka</string>
     <string name="s_downloads">Pobrane</string>
     <string name="s_external">Pamięć zewnętrzna </string>
     <string name="s_internal">Pamięć wewnętrzna </string>
     <string name="s_view">Widok</string>
-    <string name="s_bookmarks" auto="1">Zakładki</string>
-    <string name="s_menu_favorites">Zakładki</string>
+    <string name="s_bookmarks">Zakładki</string>
+    <string name="s_menu_favorites">Pokaż Zakładki</string>
     <string name="s_menu_sort">Sortuj</string>
-    <string name="s_menu_sort_name_asc">Sortuj wg nazw (A-Z)</string>
-    <string name="s_menu_sort_name_desc">Sortuj w/g nazwy (Z-A)</string>
+    <string name="s_menu_sort_name_asc">Sortuj wg nazwy (A-Z)</string>
+    <string name="s_menu_sort_name_desc">Sortuj wg nazwy (Z-A)</string>
     <string name="s_menu_sort_date_asc">Sortuj od najnowszych</string>
     <string name="s_menu_sort_date_desc">Sortuj od najstarszych</string>
     <string name="s_menu_sort_size_asc">Sortuj od największych</string>
     <string name="s_menu_sort_size_desc">Sortuj od najmniejszych</string>
-    <string name="s_menu_sort_type">Sortuj wg. typu pliku</string>
+    <string name="s_menu_sort_type">Sortuj wg typu pliku</string>
     <string name="s_menu_multi">Zaznaczenie wielokrotne</string>
     <string name="s_menu_grid">Widok siatki</string>
     <string name="s_menu_list">Widok listy</string>
-    <string name="s_menu_carousel" auto="1">Karuzela</string>
+    <string name="s_menu_carousel">Polski</string>
     <string name="s_menu_hidden">Pokaż ukryte pliki</string>
     <string name="s_menu_thumbs">Pokaż miniatury obrazów</string>
     <string name="s_menu_new_folder">Nowy folder</string>
     <string name="s_menu_other">Inne ustawienia</string>
     <string name="s_menu_flush">Wyczyść Cache</string>
-    <string name="s_menu_root">Root</string>
+    <string name="s_menu_root">Katalog główny</string>
     <string name="s_menu_prefs_folder">Ustawienia folderu</string>
-    <string name="s_menu_prefs_global">Ustawienia ogólne</string>
-    <string name="s_menu_info" auto="1">Info</string>
+    <string name="s_menu_prefs_global">Ustawienia globalne</string>
+    <string name="s_menu_info">Info</string>
     <string name="s_menu_copy">Kopiuj</string>
     <string name="s_menu_cut">Wytnij</string>
     <string name="s_menu_paste">Wklej</string>
     <string name="s_menu_delete">Usuń</string>
-    <string name="s_menu_share">Wyślij/współdziel...</string>
+    <string name="s_menu_share">Wyślij/Udostępnij...</string>
     <string name="s_menu_zip">Utwórz archiwum...</string>
     <string name="s_menu_unzip">Rozpakuj...</string>
     <string name="s_menu_rename">Zmień nazwę...</string>
     <string name="s_menu_bookmark">Dodaj zakładkę</string>
     <string name="s_save">Zapisz</string>
-    <string name="s_saveas" auto="1">Zapisz jako ...</string>
+    <string name="s_saveas">Zapisz jako...</string>
     <string name="s_cancel">Anuluj</string>
-    <string name="s_size" auto="1">Rozmiar</string>
-    <string name="s_none" auto="1">Żaden</string>
-    <string name="s_pref_servers" auto="1">Dodatkowe Serwery</string>
+    <string name="s_size">Rozmiar</string>
+    <string name="s_none">Żaden</string>
+    <string name="s_pref_servers">Dodatkowe Serwery</string>
     <string name="s_pref_server_add">Dodaj Nowy Serwer</string>
-    <string name="s_pref_display" auto="1">Wyświetlanie Preferencje</string>
-    <string name="s_pref_hidden" auto="1">Pokaż ukryte pliki</string>
-    <string name="s_pref_hidden_summary" auto="1">Wyświetlanie ukrytych plików i folderów</string>
-    <string name="s_pref_thumbs" auto="1">Pokaż miniaturek obrazów</string>
-    <string name="s_pref_thumbs_summary" auto="1">Wyświetlić miniaturę obrazu / wideo / App plików</string>
-    <string name="s_pref_view" auto="1">Tryb przeglądania</string>
-    <string name="s_pref_view_summary" auto="1">Wyświetlanie plików w sieci, listy lub Karuzela (Honeycomb tylko)</string>
-    <string name="s_pref_sort" auto="1">Sortowanie</string>
-    <string name="s_pref_sort_summary" auto="1">Wybierz sposób sortowania plików i folderów</string>
-    <string name="s_pref_advanced" auto="1">Zaawansowany</string>
-    <string name="s_pref_server_name" auto="1">Nazwa serwera</string>
-    <string name="s_pref_server_name_summary" auto="1">Wprowadź nazwę serwera</string>
-    <string name="s_pref_server_url" auto="1">Adres serwera</string>
-    <string name="s_pref_server_url_summary" auto="1">Wprowadź pełny adres URL serwera</string>
+    <string name="s_pref_display">Wyświetl właściwości </string>
+    <string name="s_pref_hidden">Pokaż ukryte pliki</string>
+    <string name="s_pref_hidden_summary">Wyświetl ukryte pliki i foldery</string>
+    <string name="s_pref_thumbs">Pokaż miniaturki obrazów</string>
+    <string name="s_pref_thumbs_summary">Wyświetl miniatury Obrazów/Filmów/Aplikacji</string>
+    <string name="s_pref_view">Tryb przeglądania</string>
+    <string name="s_pref_view_summary">Wyświetlanie plików jako siatka, lista lub karuzela (tylko Honeycomb)</string>
+    <string name="s_pref_sort">Sortowanie</string>
+    <string name="s_pref_sort_summary">Wybierz sposób sortowania plików i folderów</string>
+    <string name="s_pref_advanced">Zaawansowane</string>
+    <string name="s_pref_server_name">Nazwa serwera</string>
+    <string name="s_pref_server_name_summary">Wprowadź nazwę serwera</string>
+    <string name="s_pref_server_url">Adres URL serwera</string>
+    <string name="s_pref_server_url_summary">Wprowadź pełny adres URL serwera</string>
     <string name="s_pref_server_host" auto="1">Host Server</string>
-    <string name="s_pref_server_user" auto="1">Użytkownik</string>
-    <string name="s_pref_server_user_summary" auto="1">Login</string>
-    <string name="s_pref_server_password" auto="1">Hasło</string>
-    <string name="s_pref_server_password_summary" auto="1">Login Hasło</string>
-    <string name="s_pref_server_path" auto="1">Podkatalogu</string>
-    <string name="s_pref_server_path_summary" auto="1">Wpisz ścieżkę logowania domyślnego</string>
-    <string name="s_pref_server_extras" auto="1">Dodatkowe Ustawienia</string>
-    <string name="s_pref_server_update" auto="1">Dodaj / aktualizuj Server</string>
-    <string name="s_pref_server_type" auto="1">Typ serwera</string>
-    <string name="s_files" auto="1">Pliki</string>
-    <string name="s_create" auto="1">Tworzyć</string>
-    <string name="s_title_holding_x_files" auto="1">Trzymając %s plików</string>
-    <string name="s_title_newfolder" auto="1">Utwórz nowy folder</string>
-    <string name="s_title_send" auto="1">Wyślij %s</string>
-    <string name="s_title_unzip" auto="1">Rozpakuj %s</string>
-    <string name="s_title_zip" auto="1">Kod pocztowy %s</string>
+    <string name="s_pref_server_user">Użytkownik</string>
+    <string name="s_pref_server_user_summary">Login</string>
+    <string name="s_pref_server_password">Hasło</string>
+    <string name="s_pref_server_password_summary">Login Hasło</string>
+    <string name="s_pref_server_path">Podkatalog</string>
+    <string name="s_pref_server_path_summary">Wpisz domyślną ścieżkę logowania</string>
+    <string name="s_pref_server_extras">Dodatkowe Ustawienia</string>
+    <string name="s_pref_server_update">Dodaj/Aktualizuj Serwer</string>
+    <string name="s_pref_server_type">Typ Serwera</string>
+    <string name="s_files">pliki</string>
+    <string name="s_create">Stwórz </string>
+    <string name="s_title_holding_x_files" formatted="false">Trzymanie %s plików</string>
+    <string name="s_title_newfolder">Utwórz nowy folder</string>
+    <string name="s_title_send" formatted="false">Wyślij %s</string>
+    <string name="s_title_unzip" formatted="false">Rozpakuj %s</string>
+    <string name="s_title_zip" formatted="false">Spakuj %s</string>
     <string name="s_title_executing" auto="1">Wykonywanie</string>
-    <string name="s_title_deleting" auto="1">Usuwanie</string>
-    <string name="s_title_searching" auto="1">Wyszukiwanie</string>
-    <string name="s_title_moving" auto="1">Przeniesienie</string>
-    <string name="s_title_copying" auto="1">Kopiowanie</string>
-    <string name="s_title_zipping" auto="1">Skompresowanie</string>
-    <string name="s_title_unzipping" auto="1">Rozpakowaniu</string>
-    <string name="s_title_wait" auto="1">Proszę czekać ...</string>
-    <string name="s_alert_confirm_delete" auto="1">Usunięcie %s nie można cofnąć. Czy na pewno chcesz kontynuować?</string>
-    <string name="s_alert_rename" auto="1">Wpisz nową nazwę tego pliku</string>
-    <string name="s_alert_newfolder" auto="1">Wpisz nazwę folderu, który chcesz utworzyć.</string>
-    <string name="s_alert_unzip" auto="1">Chcesz rozpakuj %s tutaj lub jakiś inny folder?</string>
-    <string name="s_button_unzip_here" auto="1">Rozpakuj tutaj</string>
-    <string name="s_button_unzip_else" auto="1">Rozpakuj gdzie indziej ...</string>
-    <string name="s_msg_none" auto="1">Plik (i) nie może być</string>
-    <string name="s_msg_some" auto="1">Niektóre pliki (ów) nie może być</string>
+    <string name="s_title_deleting">Usuwanie</string>
+    <string name="s_title_searching">Wyszukiwanie</string>
+    <string name="s_title_moving">Przenoszenie</string>
+    <string name="s_title_copying">Kopiowanie</string>
+    <string name="s_title_zipping">Kompresowanie</string>
+    <string name="s_title_unzipping">Rozpakowywanie</string>
+    <string name="s_title_wait">Proszę czekać...</string>
+    <string name="s_alert_confirm_delete" formatted="false">Usunięcie %s jest nieodwracalne. Czy na pewno chcesz kontynuować?</string>
+    <string name="s_alert_rename">Podaj nową nazwę tego pliku</string>
+    <string name="s_alert_newfolder">Podaj nazwę folderu, który chcesz utworzyć.</string>
+    <string name="s_alert_unzip" formatted="false">Chcesz rozpakować plik %s tutaj czy do innego folderu?</string>
+    <string name="s_button_unzip_here">Rozpakuj tutaj</string>
+    <string name="s_button_unzip_else">Rozpakuj gdzie indziej...</string>
+    <string name="s_msg_none">Pliki nie mogą być</string>
+    <string name="s_msg_some">Niektóre pliki nie mogą być </string>
     <string name="s_msg_all" auto="1">Plik (i) z powodzeniem</string>
-    <string name="s_msg_deleted" auto="1">usunięte</string>
-    <string name="s_msg_moved" auto="1">przeniesiona</string>
-    <string name="s_msg_copied" auto="1">kopiowane</string>
-    <string name="s_remove" auto="1">Usunąć</string>
-    <string name="s_eject" auto="1">Wysunąć</string>
-    <string name="s_update" auto="1">Aktualizacja</string>
-    <string name="s_alert_bookmark_rename" auto="1">Zmienić tytuł zakładki.</string>
-    <string name="s_title_bookmark_prefix" auto="1">Zarządzanie Zakładka:</string>
-    <string name="s_alert_remove_safe" auto="1">Możesz teraz bezpiecznie wyjąć dysku.</string>
+    <string name="s_msg_deleted">usunięto</string>
+    <string name="s_msg_moved">przeniesiono</string>
+    <string name="s_msg_copied">skopiowano</string>
+    <string name="s_remove">Usuń</string>
+    <string name="s_eject">Wysuń</string>
+    <string name="s_update">Aktualizuj</string>
+    <string name="s_alert_bookmark_rename">Zmień tytuł zakładki</string>
+    <string name="s_title_bookmark_prefix">Zarządzaj Zakładkami:</string>
+    <string name="s_alert_remove_safe">Możesz teraz bezpiecznie odłączyć dysk</string>
     <string name="s_alert_remove_error" auto="1">Nie można wysunąć.</string>
     <string name="s_menu_about">O programie</string>
-    <string name="s_about_version" auto="1">Wersja</string>
-    <string name="s_about_author" auto="1">Autor</string>
-    <string name="s_about_site" auto="1">WWW</string>
-    <string name="s_about_email" auto="1">E-mail</string>
-    <string name="s_about_recent" auto="1">Ostatnie aktualizacje</string>
-    <string name="s_chooser_email" auto="1">Wyślij opinię ...</string>
-    <string name="s_status_loading" auto="1">Ładowanie ...</string>
+    <string name="s_about_version">Wersja</string>
+    <string name="s_about_author">Autor</string>
+    <string name="s_about_site">Strona www</string>
+    <string name="s_about_email">E-mail</string>
+    <string name="s_about_recent">Ostatnie aktualizacje</string>
+    <string name="s_chooser_email">Wyślij opinię...</string>
+    <string name="s_status_loading">Ładowanie...</string>
     <string name="s_menu_open">Otwórz przez...</string>
     <string name="s_menu_edit">Edytuj za pomocą...</string>
-    <string name="s_pref_stats_title" auto="1">Przyczynić się do poprawy OpenExplorer</string>
-    <string name="s_pref_stats_summary" auto="1">Wysyłanie anonimowych statystyk użytkowania. Nie zawierają żadnych informacji, które mogłyby zostać wykorzystane do identyfikacji użytkownika.</string>
-    <string name="s_error_no_intents" auto="1">Brak zainstalowanych aplikacji może czytać tego typu pliku.</string>
+    <string name="s_pref_stats_title">Pomóż polepszyć OpenExplorer</string>
+    <string name="s_pref_stats_summary">Wysyłanie anonimowych statystyk użytkowania. Statystyki nie zawierają żadnych informacji, które mogłyby zostać wykorzystane do identyfikacji użytkownika.</string>
+    <string name="s_error_no_intents">Żadna z zainstalowanych aplikacji nie może odczytać tego typu pliku.</string>
     <string name="s_menu_root_disabled">Root zablokowany</string>
-    <string name="s_pref_start" auto="1">Począwszy Folder</string>
-    <string name="s_pref_start_summary" auto="1">Wskazuje, który rozpoczyna się w folderze OpenExplorer</string>
-    <string name="s_custom" auto="1">Zwyczaj ...</string>
-    <string name="s_text_intro_top" auto="1">Witamy OpenExplorer!</string>
-    <string name="s_text_intro_body">Wybierz ścieżkę startową:</string>
-    <string name="s_info_num_folders" auto="1">Liczba folderów:</string>
-    <string name="s_info_num_files" auto="1">Liczba plików:</string>
-    <string name="s_info_last_modified" auto="1">Ostatnia modyfikacja:</string>
-    <string name="s_info_permissions" auto="1">Uprawnienia plików:</string>
-    <string name="s_info_permission_read" auto="1">Odczyt:</string>
-    <string name="s_info_permission_write" auto="1">Zapis:</string>
-    <string name="s_info_permission_execute" auto="1">Execute:</string>
-    <string name="s_toggle_keyboard" auto="1">Klawiatura</string>
-    <string name="s_show_password" auto="1">Pokaż hasła</string>
-    <string name="s_error_ftp" auto="1">Błąd przy połączeniu do FTP</string>
-    <string name="s_prompt_zip" auto="1">Wpisz nazwę nowego pliku Zip:</string>
-    <string name="app_edit" auto="1">Edycja z OpenExplorer</string>
+    <string name="s_pref_start">Folder początkowy</string>
+    <string name="s_pref_start_summary">Wskazuje który folder otwierany jest na starcie</string>
+    <string name="s_custom">Niestandardowy...</string>
+    <string name="s_text_intro_top">Witaj w OpenExplorer!</string>
+    <string name="s_text_intro_body" auto="1">Celem OpenExplorer jest, aby ci bardziej produktywni w systemie plików Android oraz w chmurze. Czy trzeba zarządzać filmów wideo lub zdjęć z wielu miejsc lub zarządzać serwera zdalnie poprzez FTP, OpenExplorer może własnych potrzeb  n  nProszę wybrać ścieżkę wyjścia.:</string>
+    <string name="s_info_num_folders">Liczba folderów:</string>
+    <string name="s_info_num_files">Liczba plików:</string>
+    <string name="s_info_last_modified">Ostatnia modyfikacja:</string>
+    <string name="s_info_permissions">Uprawnienia pliku:</string>
+    <string name="s_info_permission_read">Odczyt:</string>
+    <string name="s_info_permission_write">Zapis:</string>
+    <string name="s_info_permission_execute">Uruchom:</string>
+    <string name="s_toggle_keyboard">Klawiatura</string>
+    <string name="s_show_password">Pokaż hasło</string>
+    <string name="s_error_ftp">Błąd przy połączeniu do sieci</string>
+    <string name="s_prompt_zip">Wpisz nazwę nowego pliku Zip:</string>
+    <string name="app_edit">Edytuj za pomocą OpenExplorer</string>
     <string name="s_menu_more">Więcej opcji...</string>
-    <string name="s_msg_low_memory" auto="1">Niska pamięć!</string>
-    <string name="s_clear" auto="1">Wyczyść</string>
+    <string name="s_msg_low_memory">Mało pamięci!</string>
+    <string name="s_clear">Wyczyść</string>
     <string name="s_menu_delete_all">Usuń wszystko</string>
     <string name="s_menu_move_all">Przenieś tutaj</string>
     <string name="s_menu_copy_all">Skopiuj tutaj</string>
-    <string name="s_confirm_delete" auto="1">Czy na pewno chcesz usunąć %s?</string>
+    <string name="s_confirm_delete" formatted="false">Czy na pewno chcesz usunąć %s?</string>
     <string name="s_error_same_destination" auto="1">Katalog docelowy jest taki sam.</string>
     <string name="s_sample_notification" auto="1">Kopiowanie -&gt; sdcard:  n 3. Pliki</string>
-    <string name="s_pref_fullscreen" auto="1">Pełny ekran</string>
-    <string name="s_pref_fullscreen_summary_on" auto="1">Ukryj pasek powiadomień</string>
-    <string name="s_pref_fullscreen_summary_off" auto="1">Pokaż pasek powiadomień</string>
+    <string name="s_pref_fullscreen">Pełny ekran</string>
+    <string name="s_pref_fullscreen_summary_on">Ukryj pasek powiadomień</string>
+    <string name="s_pref_fullscreen_summary_off">Pokaż pasek powiadomień</string>
     <string name="s_pref_pagers" auto="1">Zobacz pagery</string>
-    <string name="s_pref_pagers_summary_on" auto="1">Pozioma Przesuwanie = katalog Nawigacja</string>
-    <string name="s_pref_pagers_summary_off" auto="1">Poziome niepełnosprawnych przesuwając</string>
-    <string name="s_alert_new_media" auto="1">Nowe Media Wprowadzona!</string>
-    <string name="s_warn_pager_title" auto="1">Nowa funkcja: pagery View</string>
-    <string name="s_warn_pager" auto="1">Przesuwany od lewej do prawej, aby przejść do katalogu i prawej do lewej, aby wrócić.Powinno to ułatwić nawigację. Wypróbuj go (na zewnętrznych nośnikach)!</string>
-    <string name="s_warn_confirm" auto="1">Rozumiesz?</string>
-    <string name="s_warn_disable" auto="1">Wyłącz</string>
-    <string name="s_pref_intent_internal" auto="1">Wewnętrzne Intents</string>
+    <string name="s_pref_pagers_summary_on">Poziome przesuwanie = nawigacja katalogu</string>
+    <string name="s_pref_pagers_summary_off">Poziome przesuwanie zablokowane</string>
+    <string name="s_alert_new_media">Znaleziono nowy nośnik!</string>
+    <string name="s_warn_pager_title">Nowa funkcja: pokaż pagery</string>
+    <string name="s_warn_pager">Wykonaj ruch z lewej do prawej, aby wejść do katalogu, lub z prawej do lewej, aby powrócić. To powinno ułatwić nawigację. Wypróbuj (na zewnętrznych nośnikach)!</string>
+    <string name="s_warn_confirm">Czy rozumiesz?</string>
+    <string name="s_warn_disable">Wyłącz</string>
+    <string name="s_pref_intent_internal">Wewnętrzne zdarzenie</string>
     <string name="s_pref_intent_internal_on" auto="1">Użyj Menedżera Intent OpenExplorer</string>
     <string name="s_pref_intent_internal_off" auto="1">Użyj Menedżera Intent systemu</string>
-    <string name="s_pref_text_internal" auto="1">Używaj wewnętrznego edytora tekstu</string>
-    <string name="s_text_editor_title" auto="1">Edytor tekstu</string>
-    <string name="s_pref_show_root" auto="1">Katalog główny systemu Pokaż plików (/)</string>
-    <string name="s_pref_show_internal" auto="1">Pokaż przewody wewnętrznego</string>
-    <string name="s_pref_show_external" auto="1">Pokaż zewnętrznych nośników</string>
-    <string name="s_error_no_media" auto="1">Wygląda na to, że jest wstawiony żaden nośnik. Proszę wyłączyć udostępnianie USB lub ponownym włożeniu nośnika.</string>
+    <string name="s_pref_text_internal">Użyj wewnętrznego edytora tekstu</string>
+    <string name="s_text_editor_title">Edytor tekstu</string>
+    <string name="s_pref_show_root">Pokaż katalog główny  (/)</string>
+    <string name="s_pref_show_internal">Pokaż media wewnętrzne</string>
+    <string name="s_pref_show_external">Pokaż nośniki zewnętrzne</string>
+    <string name="s_error_no_media">Wygląda na to, że nie podłączono żadnego nośnika. Proszę wyłączyć udostępnianie USB lub ponownie podpiąć nośnik.</string>
     <string name="s_prompt_password">Wpisz hasło</string>
     <string name="s_add">Dodaj</string>
     <string name="s_server_ftp">FTP</string>
-    <string name="s_server_sftp" auto="1">SFTP</string>
-    <string name="s_pref_server_port" auto="1">Port</string>
-    <string name="s_about_buildtime" auto="1">Data produkcji</string>
+    <string name="s_server_sftp">SFTP</string>
+    <string name="s_pref_server_port">Port</string>
+    <string name="s_about_buildtime">Data kompilacji</string>
     <string name="s_default" auto="1">Domyślnie</string>
     <string name="s_pref_timeout" auto="1">Limit czasu</string>
     <string name="s_pref_timeout_summary" auto="1">Limit czasu w sekundach</string>
-    <string name="s_menu_up" auto="1">Idź w górę</string>
-    <string name="s_prompt_unzip" auto="1">Wpisz ścieżkę do rozpakowania w:</string>
-    <string name="s_pref_hardware_accel" auto="1">Włącz akcelerację sprzętową</string>
-    <string name="s_pref_honeyplus" auto="1">Android 3.0 + ustawienia</string>
+    <string name="s_menu_up">Idź w górę</string>
+    <string name="s_prompt_unzip">Wpisz docelową ścieżkę do rozpakowania[:</string>
+    <string name="s_pref_hardware_accel">Włącz przyspieszenie sprzętowe</string>
+    <string name="s_pref_honeyplus">Ustawienia Android 3.0+</string>
     <string name="s_pref_actionmode" auto="1">Tryb działania</string>
     <string name="s_pref_actionmode_enabled" auto="1">Używać trybu działania</string>
-    <string name="s_pref_actionmode_disabled" auto="1">Użyj standardowe menu kontekstowego</string>
-    <string name="s_server_smb" auto="1">SMB / Windows</string>
+    <string name="s_pref_actionmode_disabled">Użyj standardowego menu kontekstowego</string>
+    <string name="s_server_smb">SMB / Windows</string>
     <string name="s_bookmark_drives">Napędy</string>
     <string name="s_bookmark_smart" auto="1">Inteligentne foldery</string>
     <string name="s_bookmark_favorites">Ulubione</string>
     <string name="s_bookmark_servers">Serwery</string>
     <string name="s_bookmark_cache">Pamięć cache</string>
-    <string name="s_info_totalspace">Całkowita przestrzeń dyskowa</string>
-    <string name="s_info_freespace">Wolna przestrzeń dyskowa</string>
-    <string name="s_status_rate">Oceń</string>
+    <string name="s_info_totalspace">Całkowita przestrzeń dyskowa:</string>
+    <string name="s_info_freespace">Wolna przestrzeń dyskowa:</string>
+    <string name="s_status_rate">Oceń:</string>
     <string name="s_about_hardware">Sprzęt</string>
     <string name="s_menu_refresh">Odśwież folder</string>
-    <string name="s_pref_reset" auto="1">Resetowanie wyświetleń</string>
-    <string name="s_toast_complete">Operacja zakończona pomyślnie</string>
-    <string name="s_pref_reset_summary" auto="1">Kliknij tutaj, aby usunąć wszystkie Folder specyficzne ustawienia widoku, powracając do stanu domyślnego.</string>
-    <string name="s_prompt_path">Podaj ścieżkę</string>
-    <string name="s_prompt_search">Szukaj</string>
+    <string name="s_pref_reset">Resetowanie widoków</string>
+    <string name="s_toast_complete">Operacja zakończona!</string>
+    <string name="s_pref_reset_summary">Kliknij tu, aby usunąć wszystkie ustawienia podglądu specyficzne dla foldera, i powrócić do ustawień standardowych.</string>
+    <string name="s_prompt_path">Podaj ścieżkę:</string>
+    <string name="s_prompt_search">Szukaj:</string>
     <string name="s_prompt_search_within" auto="1">Szukaj w:</string>
-    <string name="s_pref_view_category" auto="1">Zakładki Preferencje Zobacz</string>
-    <string name="s_pref_show_videos" auto="1">Pokaż wideo</string>
-    <string name="s_pref_show_photos" auto="1">Pokaż zdjęcia</string>
-    <string name="s_pref_show_music" auto="1">Music Show</string>
-    <string name="s_pref_show_downloads" auto="1">Pokaż Downloads</string>
+    <string name="s_pref_view_category">Zobacz preferencje zakładek</string>
+    <string name="s_pref_show_videos">Pokaż filmy</string>
+    <string name="s_pref_show_photos">Pokaż zdjęcia</string>
+    <string name="s_pref_show_music">Pokaż muzykę</string>
+    <string name="s_pref_show_downloads">Pokaż pobrane pliki</string>
     <string name="s_hide">Ukryj</string>
     <string name="s_show">Pokaż</string>
-    <string name="s_msg_event_cancelled" auto="1">Wydarzenie anulowane.</string>
+    <string name="s_msg_event_cancelled">Zdarzenie anulowano</string>
     <string name="s_alert_newfolder_folder">Stwórz nowy folder w:</string>
-    <string name="s_pref_fancy_category" auto="1">Fancy Ustawienia ekranu</string>
-    <string name="s_pref_fancy_menus" auto="1">Fajne menu</string>
-    <string name="s_pref_fancy_context" auto="1">Fajne menu kontekstowe</string>
-    <string name="s_search_files" auto="1">Szukaj Filesystem</string>
-    <string name="s_menu_exit">wyjdź</string>
+    <string name="s_pref_fancy_category">Fantazyjne ustawienia ekranu</string>
+    <string name="s_pref_fancy_menus">Wyszukane menu</string>
+    <string name="s_pref_fancy_context">Fantazyjne menu kontekstowe</string>
+    <string name="s_search_files">Przeszukaj system plików</string>
+    <string name="search_summary" formatted="false">Wyszukiwanie &quot; %s &quot; w &quot; %s &quot; (%d)</string>
+    <string name="search_results" formatted="false">Znaleziono %d wyników dla &quot; %s &quot; w &quot; %s &quot;</string>
+    <string name="s_menu_exit">Wyjdź</string>
     <string name="s_warn_wtf_message" auto="1">Ups! Wydaje się, że nieobsługiwany błąd! Ponieważ jest to powszechny problem w wielu aplikacji w wersji Beta, jedynym sposobem rozwiązania tych problemów jest przyjmowanie sprawozdań z różnych urządzeń, takich jak twoje, w celu ustalenia sposobu rozwiązania problemu. Możemy wysłać taki raport, zawierający tylko anonimowe dane, do dewelopera?</string>
-    <string name="s_warn_wtf_ps" auto="1">*** Uwaga: Ta aplikacja jest w fazie beta. Proszę nie dać tej aplikacji złą ocenę tylko dlatego, że się zawiesi. Wystarczy odinstalować jeśli naprawdę ci to przeszkadza.Dzięki!</string>
+    <string name="s_warn_wtf_ps">*** Uwaga: Proszę pamiętać, iż aplikacja jest w fazie beta. Proszę nie wystawiać złej opinii tylko dlatego, że się zawiesiła. Jeśli aplikacja ta nie spełnia Twoich oczekiwań poprostu ją odinstaluj. Dziękuje!</string>
     <string name="s_yes">Tak</string>
     <string name="s_no">Nie</string>
-    <string name="s_wtf_preview" auto="1">Dane raportu Podgląd</string>
-    <string name="s_wtf_remember" auto="1">Nie pytaj</string>
-    <string name="s_pref_basebar" auto="1">Podział pasku działań</string>
+    <string name="s_wtf_preview"> Podgląd danych raportu</string>
+    <string name="s_wtf_remember">Nie pytaj ponownie</string>
+    <string name="s_pref_basebar">Podział paska działań</string>
     <string name="s_pref_basebar_on" auto="1">Przyciski akcji na dole ekranu w trybie portretowym</string>
-    <string name="s_pref_basebar_off" auto="1">Przyciski akcji na górze ekranu (jeśli jest dostępny)</string>
-    <string name="s_pref_autowtf" auto="1">Auto-wysłać raporty o awariach</string>
-    <string name="s_pref_autowtf_summary" auto="1">Kiedy nieobsługiwany wyjątek, automatycznie wysłać raport.</string>
-    <string name="s_split_auto" auto="1">Automatyczny</string>
-    <string name="s_split_top" auto="1">Przyciski siły do ​​góry</string>
+    <string name="s_pref_basebar_off">Przyciski akcji na górze ekranu (jeśli dostępne)</string>
+    <string name="s_pref_autowtf">Automatycznie wysyłaj raporty awarii</string>
+    <string name="s_pref_autowtf_summary">Kiedy wystąpi nieobsługiwany wyjątek, automatycznie wyślij raport.</string>
+    <string name="s_split_auto">Automatycznie</string>
+    <string name="s_split_top"> Wymusza przyciski do góry</string>
     <string name="s_split_top_single" auto="1">Wymusza jeden przycisk do góry</string>
-    <string name="s_split_bottom" auto="1">Przyciski siły do ​​dołu</string>
+    <string name="s_split_bottom">Wymusza przyciski do dołu</string>
     <string name="s_split_none" auto="1">Umieść wszystkie przyciski w menu System</string>
-    <string name="s_about_screensize" auto="1">Wielkość ekranu</string>
-    <string name="s_about_density" auto="1">Gęstość</string>
+    <string name="s_about_screensize">Rozmiar ekranu</string>
+    <string name="s_about_density">Gęstość</string>
     <string name="s_menu_location_int">Ścieżka pamięci wewnętrznej</string>
     <string name="s_menu_location_ext">Ścieżka pamięci zewnętrznej</string>
-    <string name="s_wtf_context" auto="1">Proszę opisać kontekst katastrofie:</string>
-    <string name="thanks" auto="1">Dziękujemy!</string>
+    <string name="s_wtf_context">Proszę opisać przyczynę awarii:</string>
+    <string name="thanks">Dziękuję!</string>
     <string name="menu_view_font_small">Mały rozmiar czcionki</string>
-    <string name="menu_view_font_medium" auto="1">Średni rozmiar czcionki</string>
-    <string name="menu_view_font_large" auto="1">Duży rozmiar czcionki</string>
+    <string name="menu_view_font_medium">Średni rozmiar czcionki</string>
+    <string name="menu_view_font_large">Duży rozmiar czcionki</string>
     <string name="app_description" auto="1">Otwórz przeglądarkę - Open manager plik źródłowy dla wszystkich urządzeń! (Tabletki, telefony, telewizory Google, kanapki!)  N-pełna dokumentacja systemu zarządzania  n-USB, SD i innych nośników zewnętrznych  n-Network Podłączane (FTP, SFTP, SMB / Samba / Windows / LAN / WiFi)  n - edytor tekstu  n-Smart Folders, że skanowanie do różnych rodzajów mediów (wideo, zdjęcia, muzykę, pliki do pobrania)  n-View Pager katalogu nawigacji (prawo machnięcia, aby przejść do katalogu)  n-superużytkownika / Root zdolność do listy / czytać foldery systemowe w żaden system napisać jeszcze)  n  nFeatures przyjść:  n-kartach Edytor tekstu  n-Więcej możliwości sieciowe (Dropbox, Box.net, napęd Sky)  n-Offline cache struktura plików, pamięta, które pliki masz w różnych miejscach bez potrzeby podłączania  n-Disk mapa cieplna przestrzeń pokazuje gdzie twoje największe pliki są  n  n * Uwaga: Ta aplikacja jest w fazie beta. Istnieje jeszcze wiele błędów. Jeśli nie chcą poznać te błędy, proszę nie pobrać aplikację. Jeśli chcesz mi pomóc znaleźć te błędy, proszę napisz do mnie lub współpracować ze sobą na Github ust https://github.com/BrandoCommando/OpenExplorer/). Proszę pamiętać, złe wskaźniki pomoc nikogo.</string>
-    <string name="alert_translate_google" auto="1">Witam, to tłumaczenie jest przez Google Translate. Jeśli znasz angielski, a także %s, i chciałbyś pomóc w dostarczaniu lepsze tłumaczenie, proszę kliknąć na ten przycisk:</string>
-    <string name="alert_translate_none" auto="1">Witam, wydaje się, że używasz non-obsługiwanego języka. Znasz angielski i %s? Jeśli chcesz chcesz pomóc w zapewnieniu prawidłowego tłumaczenia, kliknij tutaj:</string>
+    <string name="alert_translate_google" formatted="false" auto="1">Witam, to tłumaczenie jest przez Google Translate. Jeśli znasz angielski, a także %s, i chciałbyś pomóc w dostarczaniu lepsze tłumaczenie, proszę kliknąć na ten przycisk:</string>
+    <string name="alert_translate_none" formatted="false">Witaj, wygląda na to, że używasz nieobsługiwanego języka. Czy znasz angielski i %s ? Jeżeli chcesz pomóc wprowadzając poprawne tłumaczenie, kliknij tutaj:</string>
     <string name="button_translate">Przetłumacz</string>
     <string name="httpError">Wystąpił błąd sieci.</string>
     <string name="httpErrorAuth">Nieudane uwierzytelnianie.</string>
@@ -261,25 +262,104 @@
     <string name="sim_restart_button">Uruchom ponownie</string>
     <string name="extmedia_format_button_format">Formatuj</string>
     <string name="ext_media_nofs_notification_message">Nośnik USB jest pusty lub zawiera nieobsługiwany system plików.</string>
-    <string name="activity_list_empty">Karta SD jest pusta lub zawiera nieobsługiwany system plików.</string>
-    <string name="ime_action_go">Nie znaleziono pasujących działań</string>
-    <string name="ime_action_send">OK</string>
-    <string name="ime_action_done">Wyślij</string>
-    <string name="ime_action_default">Gotowe</string>
-    <string name="upload_file">Wykonaj</string>
-    <string name="no_file_chosen">Wybierz plik</string>
-    <string name="reset">Nie wybrano pliku</string>
-    <string name="back_button_label">Resetuj</string>
-    <string name="next_button_label">Wróć</string>
-    <string name="no_matches">Dalej</string>
-    <string name="find_on_page">Brak wyników</string>
-    <string name="find">Znajdź na stronie</string>
-    <string name="activitychooserview_choose_application">Znajdź</string>
-    <string name="shareactionprovider_share_with">Wybierz aplikację</string>
-    <string name="storage_internal">Udostępnij przez</string>
-    <string name="storage_sd_card">Pamięć wewnętrzna</string>
-    <string name="storage_usb">Karta SD</string>
-    <string name="extract_edit_menu_button">Nośnik USB</string>
-    <string name="activity_chooser_view_see_all">Edytuj...</string>
-
-</resources>
\ No newline at end of file
+    <string name="activity_list_empty">Nie znaleziono pasujących działań</string>
+    <string name="ime_action_go">Idź</string>
+    <string name="ime_action_send">Wyślij</string>
+    <string name="ime_action_done">Gotowe</string>
+    <string name="ime_action_default">Wykonaj</string>
+    <string name="upload_file">Wybierz plik</string>
+    <string name="no_file_chosen">Nie wybrano pliku</string>
+    <string name="reset">Resetuj</string>
+    <string name="back_button_label">Wróć</string>
+    <string name="next_button_label">Dalej</string>
+    <string name="no_matches">Brak wyników</string>
+    <string name="find_on_page">Znajdź na stronie</string>
+    <string name="find">Znajdź</string>
+    <string name="activitychooserview_choose_application">Wybierz aplikację</string>
+    <string name="shareactionprovider_share_with">Udostępnij przez</string>
+    <string name="storage_internal">Pamięć wewnętrzna</string>
+    <string name="storage_sd_card">Karta SD</string>
+    <string name="storage_usb">Nośnik USB</string>
+    <string name="extract_edit_menu_button">Edytuj...</string>
+    <string name="activity_chooser_view_see_all">Zobacz wszystko...</string>
+    <string name="s_title_picker">Proszę wybrać katalog</string>
+    <string name="selected_path">Wybrana ścieżka:</string>
+    <string name="filename">Nazwa pliku</string>
+    <string name="s_msg_saved">zapisany</string>
+    <string name="s_menu_view_line_numbers">Linia Numerów</string>
+    <string name="warn_text_editor">Witaj w Edytorze Tekstu. Dlugie przyciśnięcie na tekście wprowadzi Cię w tryb edycji.</string>
+    <string name="warn_networking">Witaj w Sieci. Proszę pamiętać, iż ta funkcja jest w trakcie budowy i może zawierać błędy. Proszę nie wystawiać programowi złej opinii jeśli napotkasz na błędy.</string>
+    <string name="s_menu_new_file">Nowy plik tekstowy</string>
+    <string name="s_msg_created">stworzony</string>
+    <string name="s_title_newfile">Nowy plik</string>
+    <string name="s_alert_newfile_folder">Utwórz nowy plik w:</string>
+    <string name="s_alert_newfile">Wpisz nazwę nowego pliku:</string>
+    <string name="s_alert_exit">Czy na pewno chcesz wyjść?</string>
+    <string name="s_alert_clipboard">Skopiowano do schowka</string>
+    <string name="s_alert_restart">Ponowne uruchamianie. Proszę czekać.</string>
+    <string name="language">POLSKI</string>
+    <string name="s_menu_download">Pobierz</string>
+    <string name="scan">Skanuj</string>
+    <string name="test">Testuj</string>
+    <string name="test_success">Połączenie udane!</string>
+    <string name="no_items">Brak elementów.</string>
+    <string name="clipboard">Schowek</string>
+    <string name="theme">Motyw</string>
+    <string name="theme_dark">Ciemny motyw</string>
+    <string name="theme_light">Jasny motyw</string>
+    <string name="chooser_remember">Zapamiętaj mój wybór</string>
+    <string name="use_system">Użyj System &gt;&gt;</string>
+    <string name="activity_resolver_use_always">Zawsze</string>
+    <string name="activity_resolver_use_once">Tylko raz</string>
+    <string name="s_pref_bookmarks_summary">Wyświetl zakładki</string>
+    <string name="apply_to_all">Czy chcesz zastosować do wszystkich folderów?</string>
+    <string name="s_pref_view_folders">Ustawienia folderów</string>
+    <string name="s_pref_view_general">Ustawienia ogólne</string>
+    <string name="s_pref_text_wrap">Zawijaj tekst</string>
+    <string name="s_pref_thumbs_crop">Przytnij/Wyśrodkuj miniatury</string>
+    <string name="s_pref_thumbs_cache_clear">Wyczyść pamięć podręczną miniatur</string>
+    <string name="s_msg_folder_none">Nie można utworzyć katalogu</string>
+    <string name="s_privacy">Polityka prywatności</string>
+    <string name="s_menu_system_mount">Umożliw zapisywanie w folderze /system (Niebezpieczne!)</string>
+    <string name="s_menu_system_mount_on">System jest ZAPISYWALNY!</string>
+    <string name="s_menu_system_mount_off">System jest tylko do odczytu</string>
+    <string name="s_pref_servers_private">Zachowaj serwery jako prywatne</string>
+    <string name="s_pref_servers_private_summary">Przechowuj ustawienia serwera w prywatnym i bezpiecznym miejscu. Ta opcja spowoduje usunięcie ustawień serwera podczas dezinstalacji. Jeżeli aplikacja będzie instalowana ponownie, nie zaznaczaj tego pola.</string>
+    <string name="s_theme_lightdark">Jasny i ciemny</string>
+    <string name="s_theme_custom">Paski</string>
+    <string name="s_menu_rate">Oceń</string>
+    <string name="s_alert_destination_exists">Cel już istnieje. Co chcesz ucznić?</string>
+    <string name="s_overwrite">Nadpisz</string>
+    <string name="s_skip">Pomiń</string>
+    <string name="s_msg_file_exists">Niektóre pliki docelowe mogą już istnieć. Czy chcesz je nadpisać?</string>
+    <string name="s_title_file_exists">Plik już istnieje</string>
+    <string name="s_msg_pref_archives">Chcesz przejrzeć czy rozpakować archiwum?</string>
+    <string name="s_browse">Przeglæ</string>
+    <string name="s_extract">Wypakuj</string>
+    <string name="s_extracted">wypakowane</string>
+    <string name="s_extracting">Wypakowywanie</string>
+    <string name="s_extract_with">Wypakuj za pomocą...</string>
+    <string name="s_title_archive_handler">partyzant01</string>
+    <string name="s_ask_again">Pytaj za każdym razem</string>
+    <string name="s_archives">Archiwa</string>
+    <string name="s_compress">Skompresuj</string>
+    <string name="s_compress_type">Rodzaj kompresji</string>
+    <string name="s_compressed">skompresowany</string>
+    <string name="s_delete_after">Usuń źródło po zakończeniu</string>
+    <string name="s_master_pass">Hasło główne</string>
+    <string name="s_pass_old">Podaj stare hasło</string>
+    <string name="s_pass_new">Podaj nowe hasło</string>
+    <string name="s_logout">Wyloguj</string>
+    <string name="s_authenticate">Uwierzytelnij</string>
+    <string name="s_authenticating">Trwa uwierzytelnianie...</string>
+    <string name="s_bookmark_history">Historia</string>
+    <string name="s_server_account_title">Konto:</string>
+    <string name="s_authenticate_success">Uwierzytelnianie powiodło się</string>
+    <string name="s_authenticate_refresh">Odświeżenie uwierzytelniania</string>
+    <string name="s_pref_thumbs_cache">Wstępnie buforowane miniatury</string>
+    <string name="s_pref_thumbs_cache_summary">Ta opcja przyspieszy wczytywanie folderów zawierających zdjęcia i filmy.</string>
+    <string name="s_folders">folder</string>
+    <string name="s_hidden">ukryty</string>
+    <string name="s_total">razem</string>
+    <string name="s_custom_account">konto uzytkownika</string>
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
old mode 100644
new mode 100755
index b10433d8..86d38f1b
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="app_name">Abrir explorador</string>
+    <string name="app_name">Open Explorer</string>
     <string name="s_photos">Fotos</string>
     <string name="s_videos">Vídeos</string>
     <string name="s_music">Música s</string>
@@ -49,7 +49,7 @@
     <string name="s_pref_server_add">Adicionar novo servidor </string>
     <string name="s_pref_display">Preferências de exibição</string>
     <string name="s_pref_hidden">Mostrar ficheiros ocultos</string>
-    <string name="s_pref_hidden_summary">Mostrar pastas e ficheiros ocultos</string>
+    <string name="s_pref_hidden_summary">Mostrar pastas e arquivos ocultos</string>
     <string name="s_pref_thumbs">Mostrar miniaturas das imagens</string>
     <string name="s_pref_thumbs_summary">Mostrar miniatura das imagens/vídeos/aplicações</string>
     <string name="s_pref_view" auto="1">Modo de exibição</string>
@@ -60,15 +60,15 @@
     <string name="s_pref_server_name" auto="1">Nome do servidor</string>
     <string name="s_pref_server_name_summary" auto="1">Digite o nome do servidor</string>
     <string name="s_pref_server_url" auto="1">URL do servidor</string>
-    <string name="s_pref_server_url_summary">Digite o URL do servidor</string>
+    <string name="s_pref_server_url_summary">Digite a URL completa do servidor</string>
     <string name="s_pref_server_host">Servidor</string>
-    <string name="s_pref_server_user">Utilizador</string>
+    <string name="s_pref_server_user">Usuário</string>
     <string name="s_pref_server_user_summary">Nome de utilizador</string>
     <string name="s_pref_server_password">Senha</string>
     <string name="s_pref_server_password_summary">Senha da conta</string>
     <string name="s_pref_server_path">Subdiretório</string>
     <string name="s_pref_server_path_summary">Indique o caminho de login padrão</string>
-    <string name="s_pref_server_extras">Definições extra</string>
+    <string name="s_pref_server_extras">Configurações extra</string>
     <string name="s_pref_server_update">Adicionar/Atualizar servidor</string>
     <string name="s_pref_server_type">Tipo de servidor</string>
     <string name="s_files">ficheiros</string>
@@ -94,12 +94,12 @@
     <string name="s_button_unzip_else">Extrair para...</string>
     <string name="s_msg_none">O ficheiro não foi</string>
     <string name="s_msg_some">Alguns ficheiros não foram</string>
-    <string name="s_msg_all">Ficheiro(s) com sucesso</string>
+    <string name="s_msg_all">arquivo(s) com sucesso</string>
     <string name="s_msg_deleted">eliminado</string>
     <string name="s_msg_moved" auto="1">movido</string>
     <string name="s_msg_copied" auto="1">copiado</string>
     <string name="s_remove">Remover</string>
-    <string name="s_eject" auto="1">Ejetar</string>
+    <string name="s_eject">Ejectar</string>
     <string name="s_update" auto="1">Atualizar</string>
     <string name="s_alert_bookmark_rename">Alterar título do marcador.</string>
     <string name="s_title_bookmark_prefix">Gestor de marcadores:</string>
@@ -108,9 +108,9 @@
     <string name="s_menu_about">Sobre...</string>
     <string name="s_about_version" auto="1">Versão</string>
     <string name="s_about_author" auto="1">Autor</string>
-    <string name="s_about_site">Sítio web</string>
-    <string name="s_about_email">Email</string>
-    <string name="s_about_recent" auto="1">Atualizações recentes</string>
+    <string name="s_about_site">website</string>
+    <string name="s_about_email">smarquespt@gmail.com</string>
+    <string name="s_about_recent">Novidades</string>
     <string name="s_chooser_email">Enviar comentário...</string>
     <string name="s_status_loading">A carregar...</string>
     <string name="s_menu_open">Abrir com...</string>
@@ -125,9 +125,9 @@
     <string name="s_text_intro_top" auto="1">Bem-vindo ao OpenExplorer!</string>
     <string name="s_text_intro_body">O objetivo do OpenExplorer é que o utilizador consiga ser mais produtivo nos ambientes Android e na cloud. Se precisar de gerir vídeos ou fotos de diversas localizações ou em servidores FTP, o OpenExplorer é a aplicação indicada.\n\nPor favor escolha a localização inicial:</string>
     <string name="s_info_num_folders" auto="1">Número de pastas:</string>
-    <string name="s_info_num_files">Número de ficheiros:</string>
+    <string name="s_info_num_files">Número de arquivos:</string>
     <string name="s_info_last_modified" auto="1">Última modificação:</string>
-    <string name="s_info_permissions">Permissões:</string>
+    <string name="s_info_permissions">Permissões de arquivo:</string>
     <string name="s_info_permission_read">Leitura:</string>
     <string name="s_info_permission_write">Escrita:</string>
     <string name="s_info_permission_execute">Execução:</string>
@@ -142,28 +142,28 @@
     <string name="s_menu_delete_all">Eliminar tudo</string>
     <string name="s_menu_move_all">Mover aqui</string>
     <string name="s_menu_copy_all">Copiar aqui</string>
-    <string name="s_confirm_delete">Tem a certeza que pretende eliminar? </string>
+    <string name="s_confirm_delete" formatted="false">Tem certeza que pretende eliminar %s ? </string>
     <string name="s_error_same_destination">O diretório de destino é o mesmo.</string>
     <string name="s_sample_notification">A copiar para cartão SD:</string>
     <string name="s_pref_fullscreen">Ecrã completo</string>
-    <string name="s_pref_fullscreen_summary_on">Ocultar barra de notificações</string>
-    <string name="s_pref_fullscreen_summary_off">Mostrar barra de notificações</string>
+    <string name="s_pref_fullscreen_summary_on">Ocultar a barra de notificações</string>
+    <string name="s_pref_fullscreen_summary_off">Exibir a barra de notificações</string>
     <string name="s_pref_pagers">Ver paginadores</string>
-    <string name="s_pref_pagers_summary_on">Deslize horizontal = Navegar nos diretórios</string>
+    <string name="s_pref_pagers_summary_on">Deslize horizontalmente = Navegar nos diretórios</string>
     <string name="s_pref_pagers_summary_off">Deslize horizontal inativo</string>
     <string name="s_alert_new_media">Novo disco inserido!</string>
     <string name="s_warn_pager_title">Novo recurso: paginador</string>
     <string name="s_warn_pager">Deslize da esquerda para a direita para subir um diretório e da direita para a esquerda para voltar. Isto deve tornar mais fácil de navegar. Experimente (no disco externo)!</string>
     <string name="s_warn_confirm">Percebeu?</string>
     <string name="s_warn_disable" auto="1">Desativar</string>
-    <string name="s_pref_intent_internal">Intenções internas</string>
+    <string name="s_pref_intent_internal">Atividades</string>
     <string name="s_pref_intent_internal_on">Utilizar o gestor de intenções OpenExplorer</string>
     <string name="s_pref_intent_internal_off">Utilizar gestor de intenções do sistema</string>
     <string name="s_pref_text_internal">Utilizar editor de texto do sistema</string>
     <string name="s_text_editor_title">Editor de texto</string>
-    <string name="s_pref_show_root">Mostrar sistema de ficheiros root (/)</string>
-    <string name="s_pref_show_internal">Mostrar disco interno</string>
-    <string name="s_pref_show_external">Mostrar disco externo</string>
+    <string name="s_pref_show_root">Mostrar a raiz do sistema de arquivos (/)</string>
+    <string name="s_pref_show_internal">Exibir disco interno</string>
+    <string name="s_pref_show_external">Exibir disco externo</string>
     <string name="s_error_no_media">Parece que não existe um disco inserido. Desative a partilha USB ou introduza um disco.</string>
     <string name="s_prompt_password" auto="1">Digite a senha</string>
     <string name="s_add" auto="1">Adicionar</string>
@@ -174,46 +174,46 @@
     <string name="s_default">Padrão</string>
     <string name="s_pref_timeout">Expirado </string>
     <string name="s_pref_timeout_summary">Expira (em segundos)</string>
-    <string name="s_menu_up">Subir</string>
+    <string name="s_menu_up">Subiru</string>
     <string name="s_prompt_unzip">Indique o caminho da extração:</string>
-    <string name="s_pref_hardware_accel" auto="1">Ativar aceleração de hardware</string>
+    <string name="s_pref_hardware_accel">Ativar Aceleração de Hardware</string>
     <string name="s_pref_honeyplus">Definições para Android 3.0+</string>
     <string name="s_pref_actionmode">Modo de ação</string>
     <string name="s_pref_actionmode_enabled">Utilizar modo de ação</string>
-    <string name="s_pref_actionmode_disabled">Utilizar menus de contexto</string>
+    <string name="s_pref_actionmode_disabled">Utilizar menus de contexto iniciantes</string>
     <string name="s_server_smb">SMB/Windows</string>
     <string name="s_bookmark_drives">Unidades</string>
     <string name="s_bookmark_smart">Pastas inteligentes</string>
     <string name="s_bookmark_favorites" auto="1">Favoritos</string>
     <string name="s_bookmark_servers" auto="1">Servidores</string>
     <string name="s_bookmark_cache">Cache</string>
-    <string name="s_info_totalspace">Espaço total:</string>
-    <string name="s_info_freespace">Espaço livre:</string>
-    <string name="s_status_rate" auto="1">Taxa:</string>
+    <string name="s_info_totalspace">Espaço total em disco:</string>
+    <string name="s_info_freespace">Espaço livre no disco:</string>
+    <string name="s_status_rate">Avaliação:</string>
     <string name="s_about_hardware">Equipamento</string>
     <string name="s_menu_refresh">Atualizar pasta</string>
     <string name="s_pref_reset">Reiniciar vistas</string>
-    <string name="s_toast_complete">Operação terminada!</string>
+    <string name="s_toast_complete">Operação concluída!</string>
     <string name="s_pref_reset_summary">Clique aqui para restaurar as definições originais das pastas.</string>
     <string name="s_prompt_path">Escreva o caminho:</string>
     <string name="s_prompt_search">Procurar por:</string>
     <string name="s_prompt_search_within">Procurar em:</string>
     <string name="s_pref_view_category">Preferências de visualização</string>
     <string name="s_pref_show_videos">Mostrar vídeos</string>
-    <string name="s_pref_show_photos" auto="1">Mostrar fotos</string>
+    <string name="s_pref_show_photos">Mostrar Fotos</string>
     <string name="s_pref_show_music">Mostrar músicas</string>
     <string name="s_pref_show_downloads">Mostrar transferências</string>
     <string name="s_hide">Ocultar</string>
-    <string name="s_show" auto="1">Mostrar</string>
+    <string name="s_show">Exibir</string>
     <string name="s_msg_event_cancelled" auto="1">Evento cancelado.</string>
     <string name="s_alert_newfolder_folder">Criar nova pasta em:</string>
     <string name="s_pref_fancy_category">Definições dos efeitos</string>
     <string name="s_pref_fancy_menus">Menus elegantes</string>
     <string name="s_pref_fancy_context">Menus de contexto elegantes</string>
     <string name="s_search_files">Procurar no sistema de ficheiros</string>
-    <string name="search_summary" formatted="false">A procurar "%s" em "%s" (%d)...</string>
-    <string name="search_results" formatted="false">Encontrados %d resultados para "%s" em "%s"</string>
-    <string name="s_menu_exit" auto="1">Sair</string>
+    <string name="search_summary" formatted="false">A procurar &quot;%s&quot; em &quot;%s&quot; (%d)...</string>
+    <string name="search_results" formatted="false">Encontrados %d resultados para &quot;%s&quot; em &quot;%s&quot;</string>
+    <string name="s_menu_exit">Sair</string>
     <string name="s_warn_wtf_message">Parece que ocorreu um erro! Como este é um problema recorrente das aplicações Beta, a única forma de resolver os erros é enviando relatórios de erro. Pode enviar um relatório de erro para o programador. Não serão enviadas informações pessoais.</string>
     <string name="s_warn_wtf_ps">*** Tenha em atenção que a aplicação está na fase Beta. Não faça uma má avaliação da aplicação só porque tem erros. Obrigado!</string>
     <string name="s_yes" auto="1">Sim</string>
@@ -221,8 +221,8 @@
     <string name="s_wtf_preview">Pré-visualizar dados do relatório</string>
     <string name="s_wtf_remember" auto="1">Não perguntar novamente</string>
     <string name="s_pref_basebar">Dividir barra de ação</string>
-    <string name="s_pref_basebar_on">Botões de ação na base do ecrã (modo vertical)</string>
-    <string name="s_pref_basebar_off">Botões de ação no topo do ecrã (se disponível)</string>
+    <string name="s_pref_basebar_on">Botões de ação na base da tela (modo vertical)</string>
+    <string name="s_pref_basebar_off">Botões de ação no topo da tela (se disponível)</string>
     <string name="s_pref_autowtf">Envio automático de relatórios</string>
     <string name="s_pref_autowtf_summary">Se ocorrer um erro, enviar relatório automaticamente.</string>
     <string name="s_split_auto" auto="1">Automático</string>
@@ -230,7 +230,7 @@
     <string name="s_split_top_single">Forçar um botão no topo</string>
     <string name="s_split_bottom">Forçar botões na base</string>
     <string name="s_split_none">Colocar todos os botões no menu do sistema</string>
-    <string name="s_about_screensize">Tamanho do ecrã</string>
+    <string name="s_about_screensize">Tamanho da tela</string>
     <string name="s_about_density" auto="1">Densidade</string>
     <string name="s_menu_location_int">Caminho da memória interna</string>
     <string name="s_menu_location_ext">Caminho da memória externa</string>
@@ -255,7 +255,7 @@
     <string name="keyguard_password_enter_pin_code">Digite o PIN</string>
     <string name="keyguard_password_enter_password_code">Digite a senha para desbloquear</string>
     <string name="keyguard_password_enter_pin_password_code">Digite o PIN para desbloquear</string>
-    <string name="lockscreen_password_wrong">Tente novamente</string>
+    <string name="lockscreen_password_wrong">desculpe, tente novamente</string>
     <string name="whichApplication">Executar ação com</string>
     <string name="noApplications">Nenhuma aplicação para efetuar a operação.</string>
     <string name="report">Reportar</string>
@@ -267,8 +267,8 @@
     <string name="ime_action_send">Enviar</string>
     <string name="ime_action_done">Terminado</string>
     <string name="ime_action_default">Executar</string>
-    <string name="upload_file">Escolha o ficheiro</string>
-    <string name="no_file_chosen">Nenhum ficheiro escolhido</string>
+    <string name="upload_file">Escolha o arquivo</string>
+    <string name="no_file_chosen">Nenhum arquivo escolhido</string>
     <string name="reset">Reiniciar</string>
     <string name="back_button_label">Recuar</string>
     <string name="next_button_label">Avançar</string>
@@ -276,7 +276,7 @@
     <string name="find_on_page">Encontrado na página</string>
     <string name="find">Localizar</string>
     <string name="activitychooserview_choose_application">Escolha a aplicação</string>
-    <string name="shareactionprovider_share_with">Partilhar com</string>
+    <string name="shareactionprovider_share_with">Compartilhar com</string>
     <string name="storage_internal">Memória interna</string>
     <string name="storage_sd_card">Cartão SD</string>
     <string name="storage_usb">Disco USB</string>
@@ -284,7 +284,7 @@
     <string name="activity_chooser_view_see_all">Ver tudo...</string>
     <string name="s_title_picker">Escolha um diretório</string>
     <string name="selected_path">Caminho escolhido:</string>
-    <string name="filename">Nome do ficheiro</string>
+    <string name="filename">Nome do arquivo</string>
     <string name="s_msg_saved">gravado</string>
     <string name="s_menu_view_line_numbers">Número de linhas</string>
     <string name="warn_text_editor">Bem-vindo ao editor de texto. Toque longo no texto para entrar no modo de edição.</string>
@@ -297,7 +297,7 @@
     <string name="s_alert_exit">Tem a certeza que pretende sair?</string>
     <string name="s_alert_clipboard">Copiado para a área de transferência</string>
     <string name="s_alert_restart">A reiniciar. Aguarde...</string>
-    <string name="language">Português</string>
+    <string name="language">Idioma</string>
     <string name="s_menu_download">Transferir</string>
     <string name="scan">Analisar</string>
     <string name="test">Teste</string>
@@ -308,7 +308,7 @@
     <string name="theme_dark">Escuro</string>
     <string name="theme_light">Claro</string>
     <string name="chooser_remember">Memorizar opção</string>
-    <string name="use_system">Do sistema >></string>
+    <string name="use_system">Do sistema &gt;&gt;</string>
     <string name="activity_resolver_use_always">Sempre</string>
     <string name="activity_resolver_use_once">Apenas uma vez</string>
     <string name="s_pref_bookmarks_summary">Mostrar marcadores</string>
@@ -316,32 +316,35 @@
     <string name="apply_to_all">Aplicar a todas as pastas?</string>
     <string name="s_pref_view_folders">Preferências de pastas</string>
     <string name="s_pref_view_general">Preferências gerais</string>
-    <string name="s_pref_text_wrap">Quebrar texto</string>
+    <string name="s_pref_text_wrap">Marcar texto</string>
     <string name="s_pref_thumbs_crop">Recortar/Centrar miniaturas</string>
     <string name="s_pref_thumbs_cache_clear">Limpar cache de miniaturas</string>
-    <string name="s_msg_folder_none">A pasta não foi criada</string>
+    <string name="s_msg_folder_none">A pasta não pode ser criada</string>
+    <string name="msg_nook_donate2">Olá utilizador Nook! Esperamos que goste do Open Explorer. Estamos a tentar o nosso melhor para garantir a compatibilidade com todos os dispositivos Nook. Graças aos vossos donativos, consegui comprar um Nook Color\n\nSeguidamente, gostaria de comprar um dispositivo Nook HD\n\nSe você gosta desta aplicação e quiser ajudar no seu desenvolvimento, tenha em consideração a possibilidade de fazer um donativo. Pode fazer o donativo clicando no botão abaixo ou através da opção &quot;Donativos&quot;, existente no menu. O nosso muito obrigado.</string>
+    <string name="msg_bb_donate">Olá usuário BlackBerry! Esperamos que goste do Open Exlorer. Estamos fazendo o máximo possível para garantir a compatibilidade com todos os dispositivos BlackBerry. No entanto, tendo em conta os relatórios de erro criados, podemos afirmar que cada dispositivo tem erros específicos. Por este motivo, estamos tentando obter alguns donativos para comprar um BlackBerry 10 para melhorar a compatibilidade. Se você gosta desta aplicação e quiser ajudar no seu desenvolvimento, tenha em consideração a possibilidade de fazer um donativo. Pode fazer o donativo clicando no botão abaixo ou através da opção &quot;Donativos&quot;, existente no menu. O nosso muito obrigado.</string>
+    <string name="msg_donate">Olá utilizador Android! Esperamos que goste do Open Explorer. Estamos tentado o nosso melhor para garantir a compatibilidade com todos os dispositivos Android. No entanto, tendo em conta os relatórios de erro criados, podemos afirmar que cada um dos dispositivos tem erhros específicos. Por este motivo, estamos tentado obter alguns donativos para comprar alguns dispositivos Nexus para melhorar a compatibilidade. Se você gosta desta aplicação e quiser ajudar no seu desenvolvimento, tenha em consideração a possibilidade de fazer um donativo. Pode fazer o donativo clicando no botão abaixo ou através da opção &quot;Donativos&quot;, existente no menu. O nosso muito obrigado.</string>
     <string name="s_privacy">Política de privacidade</string>
     <string name="s_menu_system_mount">Permitir escrita em /system (perigoso!)</string>
-    <string name="s_menu_system_mount_on">Sistema de escrita!</string>
-    <string name="s_menu_system_mount_off">Sistema de leitura.</string>
+    <string name="s_menu_system_mount_on">O sistema tem permissão de escrita!</string>
+    <string name="s_menu_system_mount_off">O sistema é somente leitura.</string>
     <string name="s_pref_servers_private">Manter servidores privados</string>
     <string name="s_pref_servers_private_summary">Guardar definições do servidor na área privada. Isto fará com que as definições do servidor sejam removidas se desinstalar a aplicação. Se desmarcar esta opção e instalar novamente a aplicação impede a operação.</string>
     <string name="s_theme_lightdark">Claro e escuro</string>
     <string name="s_theme_custom">Riscas</string>
-    <string name="s_menu_rate">Taxa</string>
+    <string name="s_menu_rate">Avaliar</string>
     <string name="s_alert_destination_exists">O destino já existe. O que pretende fazer?</string>
     <string name="s_overwrite">Substituir</string>
     <string name="s_skip">Ignorar</string>
-    <string name="s_msg_file_exists">Alguns ficheiros já existem no destino. Substituir?</string>
-    <string name="s_title_file_exists">O ficheiro já existe.</string>
+    <string name="s_msg_file_exists">Alguns arquivos já existem no destino. Substituir?</string>
+    <string name="s_title_file_exists">O arquivo já existe.</string>
     <string name="s_msg_pref_archives">Pretende explorar ou extrair o arquivo?</string>
     <string name="s_browse">Explorar</string>
     <string name="s_extract">Extrair</string>
     <string name="s_extracted">extraido</string>
-    <string name="s_extracting">A extrair</string>
+    <string name="s_extracting">Extraindo</string>
     <string name="s_extract_with">Extrair com...</string>
     <string name="s_title_archive_handler">Gestor de arquivos</string>
-    <string name="s_ask_again">Perguntar</string>
+    <string name="s_ask_again">Perguntar a cada vez</string>
     <string name="s_archives">Arquivos</string>
     <string name="s_compress">Comprimir</string>
     <string name="s_compress_type" auto="1">Tipo de compressão</string>
@@ -360,8 +363,8 @@
     <string name="s_authenticate_refresh">Atualizar autenticação</string>
     <string name="s_pref_thumbs_cache">Pré-cache de miniaturas</string>
     <string name="s_pref_thumbs_cache_summary">Esta opção ajuda a acelerar o carregamento das pastas com fotos e vídeos.</string>
-    <string name="s_folders" auto="1">pastas</string>
+    <string name="s_folders">pastas</string>
     <string name="s_hidden">oculto</string>
-    <string name="s_total" auto="1">total</string>
+    <string name="s_total">Total</string>
     <string name="s_custom_account">Conta personalizada</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
new file mode 100755
index 00000000..e11fb969
--- /dev/null
+++ b/res/values-ro/strings.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_photos">Foto</string>
+    <string name="s_videos">Video</string>
+    <string name="s_music">Muzică</string>
+    <string name="s_downloads">Descărcări</string>
+    <string name="s_external">Externă</string>
+    <string name="s_internal">Internă</string>
+    <string name="s_view">Vedere</string>
+    <string name="s_bookmarks">Marcaje</string>
+    <string name="s_menu_favorites">Marcaje</string>
+    <string name="s_menu_sort">Sortaţi</string>
+    <string name="s_menu_sort_name_asc">Sortaţi după Nume (A-Z)</string>
+    <string name="s_menu_sort_name_desc">Sortaţi după Nume (Z-A)</string>
+    <string name="s_menu_sort_date_asc">Sortaţi după Mai Nou</string>
+    <string name="s_menu_sort_date_desc">Sortaţi după Mai Vechi</string>
+    <string name="s_menu_sort_size_asc">Sortaţi după Mai Mare</string>
+    <string name="s_menu_sort_size_desc">Sortaţi după Mai Mic</string>
+    <string name="s_menu_sort_type">Sortaţi după Tip Fişier</string>
+    <string name="s_menu_multi">Selectare Multiplă</string>
+    <string name="s_menu_grid">Grilă</string>
+    <string name="s_menu_list">Listă</string>
+    <string name="s_menu_carousel">Carusel</string>
+    <string name="s_menu_hidden">Afişaţi Fişierele Ascunse</string>
+    <string name="s_menu_thumbs">Afişaţi Miniaturile Imaginilor</string>
+    <string name="s_menu_new_folder">Folder Nou</string>
+    <string name="s_menu_other">Alte Setări</string>
+    <string name="s_menu_flush">Curăţare Cache</string>
+    <string name="s_menu_prefs_folder">Preferinţe Folder</string>
+    <string name="s_menu_prefs_global">Preferinţe Globale</string>
+    <string name="s_menu_copy">Copiere</string>
+    <string name="s_menu_cut">Decupare</string>
+    <string name="s_menu_paste">Lipire</string>
+    <string name="s_menu_delete">Ştergere</string>
+    <string name="s_menu_share">Trimitere/Distribuire...</string>
+    <string name="s_menu_zip">Fişier(e) Zip...</string>
+    <string name="s_menu_rename">Redenumire...</string>
+    <string name="s_menu_bookmark">Adăugaţi Marcaj</string>
+    <string name="s_save">Salvare</string>
+    <string name="s_saveas">Salvare ca...</string>
+    <string name="s_cancel">Anulare</string>
+    <string name="s_size">Dimensiune</string>
+    <string name="s_none">Nici una</string>
+    <string name="s_pref_servers">Servere Adiţionale</string>
+    <string name="s_pref_server_add">+ Adăugaţi Server Nou</string>
+    <string name="s_pref_display">Preferinţe Afişare</string>
+    <string name="s_pref_hidden">Afişaţi Fişierele Ascunse</string>
+    <string name="s_pref_hidden_summary">Afişaţi fişierele şi folderele ascunse</string>
+    <string name="s_pref_thumbs">Afişaţi Miniaturile Imaginilor</string>
+    <string name="s_pref_thumbs_summary">Afişaţi miniatură pentru Imagine/Video/Aplicaţii </string>
+    <string name="s_pref_view">Mod Vedere</string>
+    <string name="s_pref_sort">Sortare</string>
+    <string name="s_pref_sort_summary">Alegeţi modul de sortare a fişierelor şi folderelor</string>
+    <string name="s_pref_advanced">Avansat</string>
+    <string name="s_pref_server_name">Nume server</string>
+    <string name="s_pref_server_name_summary">Introduceţi Numele Serverului</string>
+    <string name="s_pref_server_url">URL Server</string>
+    <string name="s_pref_server_url_summary">Introduceţi URL-ul întreg al serverului</string>
+    <string name="s_pref_server_host">Host Server</string>
+    <string name="s_pref_server_user">Utilizator</string>
+    <string name="s_pref_server_user_summary">Nume Utilizator</string>
+    <string name="s_pref_server_password">Parola</string>
+    <string name="s_pref_server_password_summary">Parola de Logare</string>
+    <string name="s_pref_server_path">Subdirector</string>
+    <string name="s_pref_server_path_summary">Introduceţi calea de logare prestabilită</string>
+    <string name="s_pref_server_extras">Setări Suplimentare</string>
+    <string name="s_pref_server_update">Adăugaţi/Actualizaţi Serverul</string>
+    <string name="s_pref_server_type">Tip Server</string>
+    <string name="s_files">fişiere</string>
+    <string name="s_create">Creare</string>
+    <string name="s_title_holding_x_files" formatted="false">Deţinere %s fişiere</string>
+    <string name="s_title_newfolder">Creare folder nou</string>
+    <string name="s_title_executing">Executare</string>
+    <string name="s_title_deleting">Ştergere</string>
+    <string name="s_title_searching">Căutare</string>
+    <string name="s_title_moving">Mutare</string>
+    <string name="s_title_copying">Copiere</string>
+    <string name="s_title_wait">Aşteptaţi...</string>
+    <string name="s_alert_confirm_delete" formatted="false">Ştergerea %s nu poate fi anulată. Sunteţi sigur că vreţi să continuaţi?</string>
+    <string name="s_alert_rename">Introduceţi denumirea nouă pentru acest fişier</string>
+    <string name="s_alert_newfolder">Introduceţi denumirea pentru fişierul ce doriţi să-l creaţi.</string>
+    <string name="s_msg_none">Fişierele nu pot fi</string>
+    <string name="s_msg_some">Unele fişiere nu pot fi</string>
+    <string name="s_msg_all">Fişiere cu succes</string>
+    <string name="s_msg_deleted">şterse</string>
+    <string name="s_msg_moved">mutate</string>
+    <string name="s_msg_copied">copiate</string>
+    <string name="s_remove">Ştergere</string>
+    <string name="s_eject">Scoatere</string>
+    <string name="s_update">Actualizare</string>
+    <string name="s_alert_bookmark_rename">Schimbaţi titlul marcajului Dvs.</string>
+    <string name="s_title_bookmark_prefix">Gestionaţi Marcajul:</string>
+    <string name="s_alert_remove_safe">Puteți scoate în siguranță acum unitatea.</string>
+    <string name="s_alert_remove_error">Imposibil de scos.</string>
+    <string name="s_menu_about">Despre</string>
+    <string name="s_about_version">Versiune</string>
+    <string name="s_about_author">Autor</string>
+    <string name="s_about_site">Site Web</string>
+    <string name="s_about_email">Email</string>
+    <string name="s_about_recent">Actualizări recente</string>
+    <string name="s_chooser_email">Expediere Feedback...</string>
+    <string name="s_status_loading">Încărcare...</string>
+    <string name="s_menu_open">Deschideţi cu...</string>
+    <string name="s_menu_edit">Editaţi cu...</string>
+    <string name="s_pref_stats_title">Ajutaţia la îmbunătăţirea OpenExplorer</string>
+    <string name="s_menu_root_disabled">Root dezactivat</string>
+    <string name="s_pref_start">Folder Pornire</string>
+    <string name="s_custom">Personalizat...</string>
+    <string name="s_text_intro_top">Bine aţi Venit în OpenExplorer!</string>
+    <string name="s_info_num_folders">Numărul folderelor:</string>
+    <string name="s_info_num_files">Numărul fişierelor:</string>
+    <string name="s_info_last_modified">Ultima Modificare:</string>
+    <string name="s_info_permissions">Permisiuni Fişier:</string>
+    <string name="s_info_permission_read">Citire:</string>
+    <string name="s_info_permission_write">Scriere:</string>
+    <string name="s_info_permission_execute">Executare:</string>
+    <string name="s_toggle_keyboard">Tastatură</string>
+    <string name="s_show_password">Afişare Parolă</string>
+    <string name="s_menu_more">Mai multe opţiuni...</string>
+    <string name="s_menu_delete_all">Ştergeţi Tot</string>
+    <string name="s_menu_move_all">Mutare Aici</string>
+    <string name="s_menu_copy_all">Copiere Aici</string>
+    <string name="s_pref_fullscreen">Ecran Complet</string>
+    <string name="s_pref_fullscreen_summary_on">Ascundeți Bara de Notificare</string>
+    <string name="s_pref_fullscreen_summary_off">Afișați Bara de Notificare</string>
+    <string name="s_warn_disable">Dezactivați</string>
+    <string name="s_pref_text_internal">Utilizați Editorul de Text Intern</string>
+    <string name="s_text_editor_title">Editor Text</string>
+    <string name="s_prompt_password">Introduceți parola</string>
+    <string name="s_add">Adăugați</string>
+    <string name="s_default">Prestabilit</string>
+    <string name="s_menu_up">Sus</string>
+    <string name="s_menu_refresh">Reîmprospătare Folder</string>
+    <string name="s_menu_exit">Ieşire</string>
+    <string name="s_yes">Da</string>
+    <string name="s_no">Nu</string>
+    <string name="s_split_auto">Automat</string>
+    <string name="s_menu_location_int">Cale Memorie Internă</string>
+    <string name="s_menu_location_ext">Cale Memorie Externă</string>
+    <string name="menu_view_font_small">Dimensiune Font Mic</string>
+    <string name="menu_view_font_medium">Dimensiune Font Mediu</string>
+    <string name="menu_view_font_large">Dimensiune Font Mare</string>
+    <string name="button_translate">Traduceţi</string>
+    <string name="warn_text_editor">Bine aţi venit în Editorul de Text. Apăsați lung textul pentru a intra în modul Editare.</string>
+    <string name="warn_networking">Bine ați venit la Rețea. Vă rugăm să rețineți faptul că această caracteristică este încă în curs de dezvoltare și poate conține erori. Vă rugăm să nu acorde un punctaj rău în Magazinul Play dacă găsiți oricare dintre aceste erori.</string>
+    <string name="s_alert_restart">Repornire. Așteptați.</string>
+    <string name="language">Limbă</string>
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
old mode 100644
new mode 100755
index e60054f7..233d1a75
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -11,41 +11,41 @@
     <string name="s_bookmarks">Закладки</string>
     <string name="s_menu_favorites">Закладки</string>
     <string name="s_menu_sort">Сортировка</string>
-    <string name="s_menu_sort_name_asc">Сортировать по названию ↓</string>
-    <string name="s_menu_sort_name_desc">Сортировать по названию ↑</string>
-    <string name="s_menu_sort_date_asc">Сортировать по дате ↓</string>
-    <string name="s_menu_sort_date_desc">Сортировать по дате ↑</string>
+    <string name="s_menu_sort_name_asc">Сортировать по имени ↓</string>
+    <string name="s_menu_sort_name_desc">Сортировать по имени ↑</string>
+    <string name="s_menu_sort_date_asc">Сортаровать по дате ↓</string>
+    <string name="s_menu_sort_date_desc">Сортаровать по дате ↑</string>
     <string name="s_menu_sort_size_asc">Сортировать по размеру ↓</string>
     <string name="s_menu_sort_size_desc">Сортировать по размеру ↑</string>
-    <string name="s_menu_sort_type">Сортировать по типу</string>
-    <string name="s_menu_multi">Выбрать несколько файлов</string>
+    <string name="s_menu_sort_type">Сортировать по типам</string>
+    <string name="s_menu_multi">Выбрать несколько</string>
     <string name="s_menu_grid">Сетка</string>
     <string name="s_menu_list">Список</string>
     <string name="s_menu_carousel">Карусель</string>
-    <string name="s_menu_hidden">Показ. скрыт. файлы</string>
-    <string name="s_menu_thumbs">Показывать миниатюры изображений</string>
+    <string name="s_menu_hidden">Скрытые файлы</string>
+    <string name="s_menu_thumbs">Миниатюры изображений</string>
     <string name="s_menu_new_folder">Новая папка</string>
-    <string name="s_menu_other">Прочие настройки</string>
+    <string name="s_menu_other">Настройки</string>
     <string name="s_menu_flush">Сохранить кэш</string>
     <string name="s_menu_root">Root</string>
     <string name="s_menu_prefs_folder">Настройки папки</string>
-    <string name="s_menu_prefs_global">Общие настройки</string>
-    <string name="s_menu_info">Информаци</string>
+    <string name="s_menu_prefs_global">Настройки приложения</string>
+    <string name="s_menu_info">Информация</string>
     <string name="s_menu_copy">Копировать</string>
     <string name="s_menu_cut">Вырезать</string>
     <string name="s_menu_paste">Вставить</string>
     <string name="s_menu_delete">Удалить</string>
-    <string name="s_menu_share">Отправить</string>
+    <string name="s_menu_share">Поделиться...</string>
     <string name="s_menu_zip">Сжать файл(ы)...</string>
     <string name="s_menu_unzip">Распаковать</string>
     <string name="s_menu_rename">Переименовать</string>
     <string name="s_menu_bookmark">Добавить в закладки</string>
     <string name="s_save">Сохранить</string>
-    <string name="s_saveas">Сохранить как...</string>
+    <string name="s_saveas">Сохранить как ...</string>
     <string name="s_cancel">Отмена</string>
     <string name="s_size">Размер</string>
     <string name="s_none">Не сортировать</string>
-    <string name="s_pref_servers">Дополнительные сервера</string>
+    <string name="s_pref_servers">Additional Servers</string>
     <string name="s_pref_server_add">Добавить сервер</string>
     <string name="s_pref_display">Настройки отображения</string>
     <string name="s_pref_hidden">Показывать скрытые файлы</string>
@@ -58,20 +58,20 @@
     <string name="s_pref_sort_summary">Порядок отображения файлов и папок</string>
     <string name="s_pref_advanced">Дополнительно</string>
     <string name="s_pref_server_name">Server name</string>
-    <string name="s_pref_server_name_summary">Введите имя сервера</string>
-    <string name="s_pref_server_url">URL сервера</string>
-    <string name="s_pref_server_url_summary">Ввести полный адрес URL</string>
+    <string name="s_pref_server_name_summary">Enter Server Name</string>
+    <string name="s_pref_server_url">Server URL</string>
+    <string name="s_pref_server_url_summary">Enter full server URL</string>
     <string name="s_pref_server_host">Имя сети</string>
-    <string name="s_pref_server_user">Пользователь</string>
-    <string name="s_pref_server_user_summary">Логин</string>
-    <string name="s_pref_server_password">Пароль</string>
-    <string name="s_pref_server_password_summary">Ввести Пароль</string>
+    <string name="s_pref_server_user">User</string>
+    <string name="s_pref_server_user_summary">Username</string>
+    <string name="s_pref_server_password">Password</string>
+    <string name="s_pref_server_password_summary">Login Password</string>
     <string name="s_pref_server_path">Подпапка</string>
     <string name="s_pref_server_path_summary">русский</string>
     <string name="s_pref_server_extras">Дополнительные настройки</string>
-    <string name="s_pref_server_update">Добавить/Обновить сервер</string>
+    <string name="s_pref_server_update">Add/Update Server</string>
     <string name="s_pref_server_type">Тип сервера</string>
-    <string name="s_files">Файлы</string>
+    <string name="s_files">файлы</string>
     <string name="s_create">Создать</string>
     <string name="s_title_holding_x_files" formatted="false">Holding %s файлы</string>
     <string name="s_title_newfolder">Создать новую папку</string>
@@ -85,7 +85,7 @@
     <string name="s_title_copying">Копирование</string>
     <string name="s_title_zipping">Архивирование</string>
     <string name="s_title_unzipping">Распаковка</string>
-    <string name="s_title_wait">Пожалуйста подождите...</string>
+    <string name="s_title_wait">Пожалуйста ждите...</string>
     <string name="s_alert_confirm_delete" formatted="false">Удаление %s не может быть отменено. Вы уверены что хотите продолжить?</string>
     <string name="s_alert_rename">Введите новое имя файла</string>
     <string name="s_alert_newfolder">Введите имя папки</string>
@@ -99,127 +99,127 @@
     <string name="s_msg_moved">перемещены</string>
     <string name="s_msg_copied">скопированы</string>
     <string name="s_remove">Удалить</string>
-    <string name="s_eject" auto="1">Извлечь</string>
+    <string name="s_eject">Извлечь</string>
     <string name="s_update">Обновить</string>
     <string name="s_alert_bookmark_rename">Изменить название закладки.</string>
     <string name="s_title_bookmark_prefix">Управление закладкам</string>
     <string name="s_alert_remove_safe">Теперь вы можете безопасно извлечь носитель данных</string>
-    <string name="s_alert_remove_error" auto="1">Не удается извлечь.</string>
+    <string name="s_alert_remove_error">Не удается извлечь.</string>
     <string name="s_menu_about">О программе</string>
-    <string name="s_about_version" auto="1">Версия</string>
-    <string name="s_about_author" auto="1">Автор</string>
-    <string name="s_about_site" auto="1">Веб-сайт</string>
-    <string name="s_about_email">chaikina-natasha@mail.du</string>
-    <string name="s_about_recent" auto="1">Последние изменения</string>
-    <string name="s_chooser_email" auto="1">Отправить отзыв ...</string>
+    <string name="s_about_version">Версия</string>
+    <string name="s_about_author">Автор</string>
+    <string name="s_about_site">Веб-сайт</string>
+    <string name="s_about_email" auto="1">Email</string>
+    <string name="s_about_recent">Последние изменения</string>
+    <string name="s_chooser_email">Отправить отзыв...</string>
     <string name="s_status_loading">загрузки</string>
-    <string name="s_menu_open">атро</string>
+    <string name="s_menu_open">Открыть с помощью</string>
     <string name="s_menu_edit">Изменить с помощью...</string>
-    <string name="s_pref_stats_title" auto="1">Помогите улучшить OpenExplorer</string>
-    <string name="s_pref_stats_summary">Отправлять анонимную статистику. Это  информация, не может быть,использована для идентификации пользователя.</string>
+    <string name="s_pref_stats_title">Помогите улучшить OpenExplorer</string>
+    <string name="s_pref_stats_summary" auto="1">Отправлять анонимную статистику использования. Это не относится к какой-либо информации, которая может быть использована для идентификации пользователя.</string>
     <string name="s_error_no_intents">Ни одно из установленных приложений не может открыть этот файл</string>
     <string name="s_menu_root_disabled">Root отключен</string>
     <string name="s_pref_start">Начальная Папка</string>
     <string name="s_pref_start_summary">Показывает, в какой папке открыть OpenExplorer при запуске</string>
     <string name="s_custom">Пользовательский ...</string>
-    <string name="s_text_intro_top" auto="1">Добро пожаловать в OpenExplorer!</string>
-    <string name="s_text_intro_body">Цель OpenExplorer сделать вашу работу более продуктивной в пределах файловой системы Android и в облачных сервисах. Для работы с видео или фотографиями, находящихся в разных местах или управлении ими удаленно через FTP, OpenExplorer -  то, что вам нужно.\n music \nВыберите папку, которая будет открываться при запуске программы: music </string>
+    <string name="s_text_intro_top">Добро пожаловать в OpenExplorer!</string>
+    <string name="s_text_intro_body">Цель OpenExplorer сделать вашу работу более продуктивной в пределах файловой системы Android и в облачных сервисах. Для работы с видео или фотографиями, находящихся в разных местах или управлении ими удаленно через FTP, OpenExplorer -  то, что вам нужно. \nВыберите папку, которая будет открываться при запуске программы:</string>
     <string name="s_info_num_folders">Номер папки:</string>
     <string name="s_info_num_files">Номер файла:</string>
-    <string name="s_info_last_modified" auto="1">Последнее изменение:</string>
-    <string name="s_info_permissions" auto="1">Права доступа к файлам:</string>
+    <string name="s_info_last_modified">Последнее изменение:</string>
+    <string name="s_info_permissions">Права на доступ к файлу:</string>
     <string name="s_info_permission_read">Чтение:</string>
-    <string name="s_info_permission_write" auto="1">Запись:</string>
-    <string name="s_info_permission_execute">Выполнить:</string>
-    <string name="s_toggle_keyboard">Клавиатураa</string>
-    <string name="s_show_password" auto="1">Показать пароль</string>
+    <string name="s_info_permission_write">Запись:</string>
+    <string name="s_info_permission_execute" auto="1">Выполните команду:</string>
+    <string name="s_toggle_keyboard">Клавиатура</string>
+    <string name="s_show_password">Показать пароль</string>
     <string name="s_error_ftp">Ошибка при подключении к Сети</string>
     <string name="s_prompt_zip">Введите имя файла для нового Zip файла:</string>
     <string name="app_edit">Изменить с помощью OpenExplorer</string>
     <string name="s_menu_more"> Дополнительные опции ...</string>
-    <string name="s_msg_low_memory" auto="1">Недостаточно памяти!</string>
-    <string name="s_clear" auto="1">Очистить</string>
+    <string name="s_msg_low_memory">Недостаточно памяти!</string>
+    <string name="s_clear">Очистить</string>
     <string name="s_menu_delete_all">Удалить все</string>
     <string name="s_menu_move_all">Переместить сюда</string>
     <string name="s_menu_copy_all">Копировать сюда</string>
     <string name="s_confirm_delete">Вы уверены, что хотите удалить?</string>
     <string name="s_error_same_destination">Каталог назначения тот же самый.</string>
-    <string name="s_sample_notification">Копирование -> SDCard:   ^ 3 файла</string>
+    <string name="s_sample_notification">Копирование -&gt; SDCard:   ^ 3 файла</string>
     <string name="s_pref_fullscreen">На полный экран</string>
-    <string name="s_pref_fullscreen_summary_on" auto="1">Скрыть панель уведомлений</string>
-    <string name="s_pref_fullscreen_summary_off" auto="1">Показать панель уведомлений</string>
+    <string name="s_pref_fullscreen_summary_on">Скрыть панель уведомлений</string>
+    <string name="s_pref_fullscreen_summary_off">Показать панель уведомлений</string>
     <string name="s_pref_pagers">Просмотр страниц</string>
     <string name="s_pref_pagers_summary_on">Горизонтальная прокрутка = Directory навигации</string>
     <string name="s_pref_pagers_summary_off">Жесты по горизонтали отл</string>
     <string name="s_alert_new_media">Установлен новый носитель</string>
-    <string name="s_warn_pager_title">Новое свойство: вид страниц</string>
+    <string name="s_warn_pager_title" auto="1">Новая функция: View пейджеры</string>
     <string name="s_warn_pager">Провести жест слева направо, чтобы перейти в родительский каталог и справа налево, чтобы вернуться. Эта функция облегчает навигацию.</string>
-    <string name="s_warn_confirm" auto="1">Вы понимаете?</string>
-    <string name="s_warn_disable">да</string>
-    <string name="s_pref_intent_internal">Внутренние намерения</string>
+    <string name="s_warn_confirm">Вы понимаете?</string>
+    <string name="s_warn_disable" auto="1">Отключить</string>
+    <string name="s_pref_intent_internal" auto="1">Внутренние намерениях</string>
     <string name="s_pref_intent_internal_on">Используйте OpenExplorer Intent Manager</string>
     <string name="s_pref_intent_internal_off">Используйте System Intent Manager</string>
     <string name="s_pref_text_internal">Использовать встроенный редактор</string>
-    <string name="s_text_editor_title" auto="1">Текстовый редактор</string>
+    <string name="s_text_editor_title">Текстовый редактор</string>
     <string name="s_pref_show_root" auto="1">Показать корневую файловую систему (/)</string>
     <string name="s_pref_show_internal">Показать внутренние накопители</string>
     <string name="s_pref_show_external">Показать внешние накопители</string>
-    <string name="s_error_no_media">ЖхэПохоже, что нет вставленого носителя информации. Пожалуйста, отключите USB обмен или повторно вставте носитель информации.</string>
-    <string name="s_prompt_password" auto="1">Введите пароль</string>
+    <string name="s_error_no_media">Похоже, что нет вставленого носителя информации. Пожалуйста, отключите USB обмен или повторно вставте носитель информации.</string>
+    <string name="s_prompt_password">Введите пароль</string>
     <string name="s_add">Добавить</string>
-    <string name="s_server_ftp" auto="1">FTP</string>
-    <string name="s_server_sftp" auto="1">SFTP</string>
+    <string name="s_server_ftp">FTP</string>
+    <string name="s_server_sftp">SFTP</string>
     <string name="s_pref_server_port">Порт</string>
-    <string name="s_about_buildtime" auto="1">Дата сборки</string>
+    <string name="s_about_buildtime">Дата сборки</string>
     <string name="s_default">Умолчание</string>
-    <string name="s_pref_timeout" auto="1">Тайм-аут</string>
-    <string name="s_pref_timeout_summary" auto="1">Тайм-аут в секундах</string>
+    <string name="s_pref_timeout">Лимит времени</string>
+    <string name="s_pref_timeout_summary">Лимит времени в секундах</string>
     <string name="s_menu_up">Вверх</string>
     <string name="s_prompt_unzip">Укажите путь для распаковки:</string>
-    <string name="s_pref_hardware_accel" auto="1">Включить аппаратное ускорение</string>
+    <string name="s_pref_hardware_accel">Включить аппаратное ускорение</string>
     <string name="s_pref_honeyplus">Настройки Android 3.0+</string>
     <string name="s_pref_actionmode">Режим действия</string>
     <string name="s_pref_actionmode_enabled">Использовать режим действий</string>
     <string name="s_pref_actionmode_disabled">Использовать стандартные контекстные меню</string>
-    <string name="s_server_smb" auto="1">SMB / Windows</string>
+    <string name="s_server_smb">SMB/Windows</string>
     <string name="s_bookmark_drives">Диски</string>
     <string name="s_bookmark_smart">Умные папки</string>
     <string name="s_bookmark_favorites">Избранное</string>
-    <string name="s_bookmark_servers" auto="1">Серверы</string>
+    <string name="s_bookmark_servers">Серверы</string>
     <string name="s_bookmark_cache">Кэш</string>
     <string name="s_info_totalspace">Общий объем диска:</string>
     <string name="s_info_freespace">Свободное место на диске:</string>
     <string name="s_status_rate" auto="1">Рейтинг:</string>
-    <string name="s_about_hardware" auto="1">Аппаратные средства</string>
-    <string name="s_menu_refresh">файлы</string>
-    <string name="s_pref_reset" auto="1">Сброс Просмотров</string>
-    <string name="s_toast_complete" auto="1">Операция завершена!</string>
+    <string name="s_about_hardware">Аппаратное обеспечение</string>
+    <string name="s_menu_refresh">Обновить содержимое папки</string>
+    <string name="s_pref_reset">Сбросить просмотры</string>
+    <string name="s_toast_complete">Операция завершена!</string>
     <string name="s_pref_reset_summary">Нажмите здесь, чтобы удалить все папко-специфические параметры просмотра возвращая состояние по умолчанию.</string>
-    <string name="s_prompt_path" auto="1">Введите путь:</string>
-    <string name="s_prompt_search" auto="1">Искать:</string>
-    <string name="s_prompt_search_within" auto="1">Искать в:</string>
+    <string name="s_prompt_path">Введите путь:</string>
+    <string name="s_prompt_search">Найти:</string>
+    <string name="s_prompt_search_within">Найти в:</string>
     <string name="s_pref_view_category">Предпочтения внешнего вида закладок</string>
-    <string name="s_pref_show_videos">трон</string>
-    <string name="s_pref_show_photos" auto="1">Показать фотографии</string>
+    <string name="s_pref_show_videos" auto="1">Показать видео</string>
+    <string name="s_pref_show_photos">Показать фотографии</string>
     <string name="s_pref_show_music">Показывать музыку</string>
     <string name="s_pref_show_downloads">Показывать загрузки</string>
     <string name="s_hide">Скрыть</string>
     <string name="s_show">Показать</string>
-    <string name="s_msg_event_cancelled" auto="1">Событие отменено.</string>
+    <string name="s_msg_event_cancelled">Событие отменено.</string>
     <string name="s_alert_newfolder_folder">Создать новую папку в:</string>
     <string name="s_pref_fancy_category">Необычные настройки экрана</string>
     <string name="s_pref_fancy_menus">Необычное меню</string>
     <string name="s_pref_fancy_context">Необычные контекстные меню:</string>
-    <string name="s_search_files" auto="1">Поиск файловой системы</string>
-    <string name="search_summary" formatted="false" auto="1">Поиск " %s " \n в " %s " (%г) ...</string>
-    <string name="search_results" formatted="false" auto="1">Найдено%D результатов для " %s " \n в " %s "</string>
-    <string name="s_menu_exit" auto="1">Выход</string>
-    <string name="s_warn_wtf_message">Ой-ой-ой.Кажется возникла ошибка в программе.Такое часто случается с программами, которые находятся в тестовом состоянии.Единственный способ устранения таких ошибок, это сбор информации с различных устройств, таких как ваше например. Можем ли мы отсылать анонимные отчеты об ошибках в программе разработчикам?</string>
+    <string name="s_search_files">Искать в файловой системе</string>
+    <string name="search_summary" formatted="false">Поиск &quot;%s&quot; в &quot;%s&quot; (%d)</string>
+    <string name="search_results" formatted="false">Найдено %d результатов, содержащих %s</string>
+    <string name="s_menu_exit">Выход</string>
+    <string name="s_warn_wtf_message">Ой-ой-ой. Кажется возникла ошибка в программе. Такое часто случается с программами, которые находятся в тестовом состоянии. Единственный способ устранения таких ошибок, это сбор информации с различных устройств, таких как ваше например. Можем ли мы отсылать анонимные отчеты об ошибках в программе разработчикам?</string>
     <string name="s_warn_wtf_ps">Пожалуйста, обратите внимание на то, что данное приложение находится в состоянии Beta. Просьба не ставить плохую оценку из-за возможных ошибок и вылетов из программы. Просто удалите ее, если она вам не нравится. Большое спасибо!</string>
-    <string name="s_yes" auto="1">Да</string>
-    <string name="s_no" auto="1">Нет</string>
+    <string name="s_yes">Да</string>
+    <string name="s_no">Нет</string>
     <string name="s_wtf_preview"> Данные отчета предварительного просмотра</string>
-    <string name="s_wtf_remember" auto="1">Больше не спрашивать</string>
+    <string name="s_wtf_remember">Больше не спрашивать</string>
     <string name="s_pref_basebar">Слить панель действий</string>
     <string name="s_pref_basebar_on">Действие кнопки в нижней части экрана в портретном режиме</string>
     <string name="s_pref_basebar_off">Действие кнопок в верхней части экрана (при наличии)</string>
@@ -231,17 +231,17 @@
     <string name="s_split_bottom">Переместить кнопки вверх</string>
     <string name="s_split_none">Поместить все кнопки в системное меню</string>
     <string name="s_about_screensize">размер экрана</string>
-    <string name="s_about_density" auto="1">Плотность</string>
+    <string name="s_about_density">Плотность</string>
     <string name="s_menu_location_int">Путь к внутенней памяти</string>
     <string name="s_menu_location_ext">Путь к внешней памяти</string>
     <string name="s_wtf_context">Пожалуйста, опишите, как произошел сбой:</string>
-    <string name="thanks" auto="1">Спасибо!</string>
+    <string name="thanks">Спасибо!</string>
     <string name="menu_view_font_small">Малый размер шрифта</string>
     <string name="menu_view_font_medium">Средний размер шрифта</string>
     <string name="menu_view_font_large">Большой размер шрифта</string>
-    <string name="app_description">OpenExplorer - универсальное приложение для всех устройств (планшеты, телефоны, телевизоры Google)\n- Управление файлами\n- поддержка USB и других внешних носителей\n- Возможность подключения к FTP серверам\n- Текстовый редактор\n- Умные папки, содержат файлы определённых типов: видео, фото, музыка, загрузки\n- Текстовый редактор с вкладками\n\nСкоро будет реализовано:\n- Больше возможностей сети (Dropbox, Box.net, Sky диск, Samba, WiFi)\n- Автономный кэш файловой системы (хранение списка файлов и директорий без необходимости подключения к удаленному серверу)\n- Анализатор используемого места на носителях\n\n    ПРИМЕЧАНИЕ: Это приложение находится в бета-версии. Здесь еще много ошибок. Если Вы не хотите сталкиваться с возможными ошибками, пожалуйста, не загружайте это приложение. Если Вы хотите помочь найти эти ошибки, пожалуйста, напишите мне.\n</string>
+    <string name="app_description">OpenExplorer - универсальное приложение для всех устройств (планшеты, телефоны, телевизоры Google)\n- Управление файлами\n- поддержка USB и других внешних носителей\n- Возможность подключения к FTP серверам\n- Текстовый редактор\n- Умные папки, содержат файлы определённых типов: видео, фото, музыка, загрузки\n- Текстовый редактор с вкладками\n\nСкоро будет реализовано:\n- Больше возможностей сети (Dropbox, Box.net, Sky диск, Samba, WiFi)\n- Автономный кэш файловой системы (хранение списка файлов и директорий без необходимости подключения к удаленному серверу)\n- Анализатор используемого места на носителях\n\n    ПРИМЕЧАНИЕ: Это приложение находится в бета-версии. Есть еще много ошибок. Если Вы не хотите сталкиваться с возможными ошибками, пожалуйста, не загружайте это приложение. Если Вы хотите, чтобы помочь найти эти ошибки, пожалуйста, напишите мне.\n</string>
     <string name="alert_translate_google" formatted="false">Здравствуйте, данный перевод сделан с помощью переводчика Google. Если вы достаточно хорошо владеете английским и %s, а так же хотите помочь перевести, то нажмите сюда:</string>
-    <string name="alert_translate_none">Здравствуйте, вы используете не поддерживаемый язык.если у вас есть знания английского языка,а так же хотите помочь сделать перевод, то нажмите сюда:</string>
+    <string name="alert_translate_none">Здравствуйте, вы используете не поддерживаемый язык. Если у вас есть знания английского языка, а так же хотите помочь сделать перевод, то нажмите сюда:</string>
     <string name="button_translate">Перевести</string>
     <string name="httpError">Произошла сетевая ошибка.</string>
     <string name="httpErrorAuth">Не удалось провести аутентификацию.</string>
@@ -262,109 +262,109 @@
     <string name="sim_restart_button">Перезапуск</string>
     <string name="extmedia_format_button_format">Формат</string>
     <string name="ext_media_nofs_notification_message">На USB-накопителе нет данных или его файловая система не поддерживается.</string>
-    <string name="activity_list_empty">SD-карта пуста или использует неподдерживаемую файловую систему</string>
-    <string name="ime_action_go">Подходящих действий не найдено</string>
-    <string name="ime_action_send">Выбрать</string>
-    <string name="ime_action_done">Отправить</string>
-    <string name="ime_action_default">Готово</string>
-    <string name="upload_file">Выполнить</string>
-    <string name="no_file_chosen">Выбрать файл</string>
-    <string name="reset">Не выбран файл</string>
-    <string name="back_button_label">Сбросить</string>
-    <string name="next_button_label">Назад</string>
-    <string name="no_matches">Далее</string>
-    <string name="find_on_page">Нет совпадений</string>
-    <string name="find">Найти на странице</string>
+    <string name="activity_list_empty">Нет совпадений</string>
+    <string name="ime_action_go">Начать</string>
+    <string name="ime_action_send">Отправить</string>
+    <string name="ime_action_done">Готово</string>
+    <string name="ime_action_default">Выполнить</string>
+    <string name="upload_file">Выберите файл</string>
+    <string name="no_file_chosen">Файл не выбран</string>
+    <string name="reset">Сброс</string>
+    <string name="back_button_label">Назад</string>
+    <string name="next_button_label">Далее</string>
+    <string name="no_matches">Нет совпадений</string>
+    <string name="find_on_page">Найти на странице</string>
+    <string name="find">Найти</string>
     <string name="activitychooserview_choose_application">Найти</string>
-    <string name="shareactionprovider_share_with">Выберите приложение</string>
-    <string name="storage_internal">Открыть доступ:</string>
-    <string name="storage_sd_card">Внутренняя память</string>
-    <string name="storage_usb">SD-карта</string>
-    <string name="extract_edit_menu_button">USB-накопитель</string>
-    <string name="activity_chooser_view_see_all">Изменить...</string>
-    <string name="s_title_picker" auto="1">Пожалуйста, выберите каталог</string>
-    <string name="selected_path" auto="1">Выбранный путь:</string>
+    <string name="shareactionprovider_share_with">Поделиться с</string>
+    <string name="storage_internal">Внутреннее хранилище</string>
+    <string name="storage_sd_card">SD карта</string>
+    <string name="storage_usb">USB накопитель</string>
+    <string name="extract_edit_menu_button">Изменить...</string>
+    <string name="activity_chooser_view_see_all">Посмотреть все...</string>
+    <string name="s_title_picker">Выберите каталог</string>
+    <string name="selected_path">Выбранный путь:</string>
     <string name="filename">Имя файла</string>
     <string name="s_msg_saved">сохранено</string>
-    <string name="s_menu_view_line_numbers" auto="1">номера строк</string>
+    <string name="s_menu_view_line_numbers">Номера строк</string>
     <string name="warn_text_editor">Добро пожаловать в текстовой редактор. Длинное нажатие на текст для редактирования.</string>
     <string name="warn_networking">Добро пожаловать в сеть. Пожалуйста, обратите внимание, что эта функция находится в стадии разработки и может содержать ошибки. Пожалуйста, не ставьте низкую оценку, если вы обнаружите какие-либо ошибки.</string>
-    <string name="s_menu_new_file" auto="1">Новый текстовый файл</string>
-    <string name="s_msg_created" auto="1">созданный</string>
-    <string name="s_title_newfile" auto="1">Новый файл</string>
-    <string name="s_alert_newfile_folder" auto="1">Создать новый файл:</string>
+    <string name="s_menu_new_file">Новый текстовый файл</string>
+    <string name="s_msg_created">созданный</string>
+    <string name="s_title_newfile">Новый файл</string>
+    <string name="s_alert_newfile_folder">Создать новый файл в:</string>
     <string name="s_alert_newfile" auto="1">Введите имя нового файла:</string>
-    <string name="s_alert_exit" auto="1">Вы уверены, что хотите выйти?</string>
-    <string name="s_alert_clipboard" auto="1">Скопировать в буфер обмена</string>
-    <string name="s_alert_restart" auto="1">Перезагрузка. Пожалуйста, подождите.</string>
-    <string name="language">русский</string>
+    <string name="s_alert_exit">Вы уверены, что хотите выйти?</string>
+    <string name="s_alert_clipboard">Скопировано в буфер обмена</string>
+    <string name="s_alert_restart">Перезапуск. Пожалуйста, подождите.</string>
+    <string name="language">Язык</string>
     <string name="s_menu_download">Загрузка</string>
     <string name="scan">Сканирование</string>
     <string name="test">Тест</string>
-    <string name="test_success">Сеть установленна!</string>
+    <string name="test_success">Подключение выполнено!</string>
     <string name="no_items">Нету объекта</string>
     <string name="clipboard">Буфер обмена</string>
     <string name="theme">Тема</string>
-    <string name="theme_dark">Темный интерфейс</string>
-    <string name="theme_light">Светлый интерфейс</string>
+    <string name="theme_dark">Темная</string>
+    <string name="theme_light">Светлая</string>
     <string name="chooser_remember">Запомнить мой выбор</string>
-    <string name="use_system">Использовать Системный>></string>
+    <string name="use_system">Использовать системный &gt;&gt;</string>
     <string name="activity_resolver_use_always">Всегда</string>
     <string name="activity_resolver_use_once">Только один раз</string>
-    <string name="s_pref_bookmarks_summary">Показать заклалки</string>
+    <string name="s_pref_bookmarks_summary">Показать закладки</string>
     <string name="s_menu_heatmap">ясность</string>
-    <string name="apply_to_all">Вы хотите выбрать все паапки?</string>
+    <string name="apply_to_all">Вы хотите выбрать все папки?</string>
     <string name="s_pref_view_folders">Настройки папок</string>
-    <string name="s_pref_view_general">Основные настройки</string>
-    <string name="s_pref_text_wrap">Перенести текст</string>
-    <string name="s_pref_thumbs_crop">Обрезать/Центрировать миниатюру</string>
-    <string name="s_pref_thumbs_cache_clear">Очистить кэш миниатюр</string>
-    <string name="s_msg_folder_none">Папку невозможно создать</string>
-    <string name="msg_nook_donate2" auto="1">Здравствуйте Nook пользователя! Надеюсь, вам понравится Откройте Explorer для Nook. Я старался изо всех сил, чтобы обеспечить высокую совместимость с устройствами Nook. Благодаря последним пожертвования, я был в состоянии купить Нук цвета! Спасибо всем, кто пожертвовал!  П  п Далее, я хотел бы иметь возможность приобрести новое поколение Nook HD устройств.  П  п Если вы найдете это приложение полезным, пожалуйста, рассмотреть вопрос о внесении пожертвований, либо выбрав кнопка ниже, или путем активации "пожертвовать" меню. Спасибо и счастливого изучать!</string>
-    <string name="msg_bb_donate">Здравствуйте BlackBerry пользователь! Надеюсь, вам понравится Открытое Explorer. Я старался изо всех сил, чтобы обеспечить высокую совместимость с устройствами BlackBerry. Однако, похоже, есть некоторые различия, которые трудно справиться без фактического устройства BlackBerry. По этой причине, я пытаюсь собрать достаточно пожертвований, чтобы купить BlackBerry 10 устройств для того, чтобы улучшить совместимость. Если вы найдете это приложение полезным, пожалуйста, рассмотреть вопрос о внесении пожертвований, либо выбрав кнопку ниже, или путем активации "пожертвовать" меню. Спасибо и счастливого пизучать!</string>
-    <string name="msg_donate" auto="1">Hello Android пользователей! Мы надеемся, вам понравится Открытое Explorer. Мы постарались наши трудное для обеспечения высокой совместимости со всеми устройствами Android. Однако, учитывая сообщения об ошибке получили, мы можем только предположить, что существуют различия между различными типами вызывают конкретные вопросы. По этой причине, мы пытаемся собрать достаточно пожертвований для того, чтобы купить Nexus устройств для того, чтобы улучшить совместимость. Если вы найдете это приложение полезным, пожалуйста, рассмотреть вопрос о внесении пожертвований, либо выбрав кнопку ниже, или путем активации "пожертвовать" меню. Спасибо и счастливого изучать!</string>
-    <string name="s_privacy" auto="1">Политика конфиденциальности</string>
+    <string name="s_pref_view_general">Общие настройки</string>
+    <string name="s_pref_text_wrap">Переносить строки</string>
+    <string name="s_pref_thumbs_crop">Обрезать/Центрировать эскиз</string>
+    <string name="s_pref_thumbs_cache_clear">Удалить сохраненные эскизы</string>
+    <string name="s_msg_folder_none">Невозможно создать папку</string>
+    <string name="msg_nook_donate2" auto="1">Здравствуйте Nook пользователя! Надеюсь, вам понравится Откройте Explorer для Nook. Я старался изо всех сил, чтобы обеспечить высокую совместимость с устройствами Nook. Благодаря последним пожертвования, я был в состоянии купить Нук цвета! Спасибо всем, кто пожертвовал!  П  п Далее, я хотел бы иметь возможность приобрести новое поколение Nook HD устройств.  П  п Если вы найдете это приложение полезным, пожалуйста, рассмотреть вопрос о внесении пожертвований, либо выбрав кнопка ниже, или путем активации &quot;пожертвовать&quot; меню. Спасибо и счастливого изучать!</string>
+    <string name="msg_bb_donate">Здравствуйте, пользователь BlackBerry! Надеюсь, что вам понравится Open Explorer. Я старался изо всех сил, чтобы обеспечить высокую совместимость с устройствами BlackBerry. Однако, похоже, что есть некоторые особенности,  с которыми трудно справиться без реального устройства BlackBerry. По этой причине  я пытаюсь собрать достаточно пожертвований, чтобы купить устройство на BlackBerry 10 для того, чтобы улучшить совместимость. Если вы найдете это приложение полезным, пожалуйста, подумайте о внесении пожертвований, либо выбрав кнопку ниже, либо путем выбора пункта &quot;пожертвовать&quot; в меню. Спасибо и счастливого освоения!</string>
+    <string name="msg_donate">Привет, пользователь Android! Мы надеемся, что тебе понравится Open Explorer. Мы постарались изо всех сил, чтобы обеспечить высокую совместимость со всеми устройствами Android. Однако, учитывая полученные сообщения об ошибках, мы предполагаем, что различия между типами устройств вызывают некоторые проблемы. По этой причине, мы пытаемся собрать достаточно пожертвований для покупки Nexus устройств, чтобы улучшить совместимость. Если ты найдешь это приложение полезным, пожалуйста, подумай о внесении пожертвования, нажав кнопку ниже, или выбрав пункт &quot;пожертвовать&quot; в меню. Спасибо и счастливого файлообзора!</string>
+    <string name="s_privacy">Политика конфиденциальности</string>
     <string name="s_menu_system_mount">Сделать /system доступным для записи (Опасно!)</string>
-    <string name="s_menu_system_mount_on">Система доступа в режиме записи!</string>
+    <string name="s_menu_system_mount_on">Система доступна для редактирования!</string>
     <string name="s_menu_system_mount_off">System доступен только для чтения</string>
-    <string name="s_pref_servers_private">частный сервис</string>
+    <string name="s_pref_servers_private">Сохранить приватность серверов</string>
     <string name="s_pref_servers_private_summary">Хранить настройки сервера на карте памяти. В случае потери данных его можно будет восстановить.</string>
-    <string name="s_theme_lightdark">Черно-белая</string>
+    <string name="s_theme_lightdark">Светлая и Темная</string>
     <string name="s_theme_custom">Полоски</string>
-    <string name="s_menu_rate" auto="1">скорость</string>
-    <string name="s_alert_destination_exists" auto="1">Направления уже существует. Что бы вы хотели сделать?</string>
-    <string name="s_overwrite" auto="1">переписывать</string>
-    <string name="s_skip" auto="1">пропускать</string>
-    <string name="s_msg_file_exists" auto="1">Некоторые файлы могут назначения уже существуют. Для перезаписи?</string>
-    <string name="s_title_file_exists" auto="1">Файл уже существует.</string>
-    <string name="s_msg_pref_archives" auto="1">Хотели бы вы, чтобы просмотреть или распаковать архив?</string>
-    <string name="s_browse" auto="1">просматривать</string>
-    <string name="s_extract" auto="1">извлечение</string>
-    <string name="s_extracted" auto="1">извлеченный</string>
+    <string name="s_menu_rate">Оценить</string>
+    <string name="s_alert_destination_exists">Каталог или файл уже существует. Выберите действие:</string>
+    <string name="s_overwrite">перезаписать</string>
+    <string name="s_skip">Пропустить</string>
+    <string name="s_msg_file_exists">Некоторые файлы уже существуют. Перезаписать?</string>
+    <string name="s_title_file_exists">Файл уже существует.</string>
+    <string name="s_msg_pref_archives">Открыть или распаковать архив?</string>
+    <string name="s_browse">Обзор</string>
+    <string name="s_extract">Извлечь</string>
+    <string name="s_extracted">извлеченный</string>
     <string name="s_extracting">Извлекаю</string>
-    <string name="s_extract_with">Извлечение с помощью</string>
-    <string name="s_title_archive_handler" auto="1">Архив Handler</string>
-    <string name="s_ask_again" auto="1">Попросите каждого времени</string>
-    <string name="s_archives" auto="1">архив</string>
-    <string name="s_compress" auto="1">сжимать</string>
-    <string name="s_compress_type" auto="1">Тип сжатия</string>
-    <string name="s_compressed" auto="1">сжатый</string>
-    <string name="s_delete_after" auto="1">Удаление источника после завершения</string>
-    <string name="s_master_pass" auto="1">Мастер-пароль</string>
+    <string name="s_extract_with">Извлечь с помощью</string>
+    <string name="s_title_archive_handler">Обработчик архива</string>
+    <string name="s_ask_again">Спрашивать каждый раз</string>
+    <string name="s_archives">Архивы</string>
+    <string name="s_compress">Сжать</string>
+    <string name="s_compress_type">Тип сжатия</string>
+    <string name="s_compressed">сжатый</string>
+    <string name="s_delete_after">Удалить источник после завершения</string>
+    <string name="s_master_pass">Мастер пароль</string>
     <string name="s_master_pass_warning" auto="1">Вы можете ввести мастер-пароль, используемый в качестве ключа шифрования для любой сохраненные пароли. Если оставить это поле пустым, пароль все равно будет зашифрован, и пароль по умолчанию мастер будет использоваться. Обратите внимание, что если вы обновляете свой ​​пароль сохраненные пароли сети, вам, вероятно, нужно сброса паролей и аутентификации удаленных серверов после сброса пароля.</string>
-    <string name="s_pass_old">dada9090</string>
-    <string name="s_pass_new">dada9090</string>
-    <string name="s_logout">ms.gul.01@mail.ru</string>
+    <string name="s_pass_old">Введите старый пароль</string>
+    <string name="s_pass_new">Введите новый пароль</string>
+    <string name="s_logout">Выйти</string>
     <string name="s_authenticate">Проводить аутентификацию</string>
-    <string name="s_authenticating" auto="1">Аутентификация</string>
-    <string name="s_bookmark_history" auto="1">история</string>
-    <string name="s_server_account_title" auto="1">счет:</string>
+    <string name="s_authenticating">Аутентификация</string>
+    <string name="s_bookmark_history">История</string>
+    <string name="s_server_account_title">Аккаунт</string>
     <string name="s_authenticate_success">Проверка подлинности пройдена</string>
-    <string name="s_authenticate_refresh" auto="1">Обновить аутентификации</string>
-    <string name="s_pref_thumbs_cache" auto="1">Предварительно кэшировать эскизы</string>
+    <string name="s_authenticate_refresh">Обновить аутентификации</string>
+    <string name="s_pref_thumbs_cache">Предварительно кэшировать эскизы</string>
     <string name="s_pref_thumbs_cache_summary">\nЭто поможет ускорить загрузку папки, содержащие фотографии и видео.</string>
-    <string name="s_folders">mail.ru</string>
-    <string name="s_hidden">P</string>
+    <string name="s_folders">каталог</string>
+    <string name="s_hidden">скрытый</string>
     <string name="s_total">полный</string>
-    <string name="s_custom_account" auto="1">Пользовательский аккаунт</string>
+    <string name="s_custom_account">Учетная запись</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
old mode 100644
new mode 100755
index cb7cb2e6..3d4bce13
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
     <string name="app_name">Open Explorer</string>
     <string name="s_photos">Fotky</string>
     <string name="s_videos">Videá</string>
@@ -90,7 +89,7 @@
     <string name="s_alert_confirm_delete">Mazanie nemožno vrátiť. Ste si istí, že chcete pokračovať?</string>
     <string name="s_alert_rename">Prosím zadajte nový názov tohoto súboru</string>
     <string name="s_alert_newfolder" auto="1">Zadajte názov priečinka, ktorú chcete vytvoriť.</string>
-    <string name="s_alert_unzip" auto="1">Chceli by ste rozbalit %s tu alebo inú zložku?</string>
+    <string name="s_alert_unzip" formatted="false" auto="1">Chceli by ste rozbalit %s tu alebo inú zložku?</string>
     <string name="s_button_unzip_here" auto="1">Rozbaľte tu</string>
     <string name="s_button_unzip_else" auto="1">Rozbaľte inde ...</string>
     <string name="s_msg_none" auto="1">Súbor (y) nemôže byť</string>
@@ -113,8 +112,8 @@
     <string name="s_about_recent" auto="1">Nedávne aktualizácia</string>
     <string name="s_chooser_email" auto="1">Poslať komentár ...</string>
     <string name="s_status_loading" auto="1">Loading ...</string>
-    <string name="s_menu_open" auto="1">Otvoriť pomocou ...</string>
-    <string name="s_menu_edit" auto="1">Úpravy sa ...</string>
+    <string name="s_menu_open">Otvoriť s...</string>
+    <string name="s_menu_edit">Upraviť s</string>
     <string name="s_pref_stats_title" auto="1">Zlepšiť OpenExplorer</string>
     <string name="s_pref_stats_summary" auto="1">Poslať anonymný štatistiku. To nezahŕňa žiadne informácie, ktoré by mohli byť použité na identifikáciu používateľa.</string>
     <string name="s_error_no_intents" auto="1">Žiadne nainštalované aplikácie môže čítať tento typ súboru.</string>
@@ -142,7 +141,7 @@
     <string name="s_menu_delete_all" auto="1">Odstrániť všetko</string>
     <string name="s_menu_move_all" auto="1">Presunúť sem</string>
     <string name="s_menu_copy_all" auto="1">Kopírovať sem</string>
-    <string name="s_confirm_delete" auto="1">Ste si istí, že chcete vymazať %s?</string>
+    <string name="s_confirm_delete" formatted="false" auto="1">Ste si istí, že chcete vymazať %s?</string>
     <string name="s_error_same_destination" auto="1">Cieľový adresár je rovnaký.</string>
     <string name="s_sample_notification" auto="1">Kopírovanie -&gt; SDCard:  n 3 súbory</string>
     <string name="s_pref_fullscreen" auto="1">Celá obrazovka</string>
@@ -211,7 +210,9 @@
     <string name="s_pref_fancy_menus" auto="1">Efektné menu</string>
     <string name="s_pref_fancy_context" auto="1">Efektné Kontextové menu</string>
     <string name="s_search_files" auto="1">Hľadať súborového systému</string>
-    <string name="s_menu_exit" auto="1">Výstup</string>
+    <string name="search_summary" formatted="false" auto="1">Vyhľadávanie &quot; %s&quot;  n do &quot; %s&quot; ( %d) ...</string>
+    <string name="search_results" formatted="false" auto="1">Nájdených %d výsledky pre &quot; %s&quot;  n do &quot; %s&quot;</string>
+    <string name="s_menu_exit">Ukončiť</string>
     <string name="s_warn_wtf_message" auto="1">Jejda! Zdá sa, že neošetrené chybe! Pretože sa jedná o obyčajný problém v mnohých beta aplikácie, jediný spôsob, ako tieto problémy vyriešiť, je prijímať správy z rôznych zariadení, ako je tá vaša, za účelom zistenia, ako problém vyriešiť. Môžeme poslať takú správu, ktorá obsahuje len anonymné údaje, pre vývojárov?</string>
     <string name="s_warn_wtf_ps" auto="1">*** Pozor, táto aplikácia je vo verzii beta. Prosím, aby túto aplikáciu zlé hodnotenie len preto, že spadne. Stačí odinštalovať, či to naozaj vadí. Vďaka!</string>
     <string name="s_yes" auto="1">Áno</string>
@@ -238,8 +239,8 @@
     <string name="menu_view_font_medium" auto="1">Veľkosť písma strednej</string>
     <string name="menu_view_font_large" auto="1">Veľkosť písma veľké</string>
     <string name="app_description" auto="1">Otvorené Explorer - Open source správca súborov pre všetky zariadenia! (Tablety, telefóny, televízory Google, sendviče!)  N-Kompletný súborový systém riadenia  n-USB, SD a ďalšie externé média  n-Network Pripojiteľné (FTP, SFTP, SMB / Samba / Windows / LAN / WiFi)  n - textový editor  n-Smart Zložky skenovanie pre rôzne typy médií (videá, fotografie, hudba, na stiahnutie)  n-View Pager adresára navigácie (listovanie právo ísť až adresár)  n-superpoužívateľ / Root schopnosť zoznamu / čítať systémové zložky v žiadny systém napísať ešte)  n  nFeatures prísť:  n-záložkách textový editor  n-viac sieťové funkcie (Dropbox, Box.net, Sky disk)  n-Offline štruktúra súboru cache, si bude pamätať, ktoré súbory Máte na rôznych miestach bez nutnosti pripojenia  n-Miesto na disku tepla mapa ukazuje, kde sa vaše najväčšie súbory sú  n  n * POZNÁMKA: Táto aplikácia je v beta verzii. Existuje ešte veľa chýb. Ak nechcete zažiť tieto chyby, prosím nesťahujte tejto aplikácie. Ak by ste chceli, aby mi pomohol nájsť tieto chyby, prosím, napíšte mi, alebo so mnou spolupracovať na GitHub ods https://github.com/BrandoCommando/OpenExplorer/). Majte na pamäti, zlé hodnotenia pomoci nikto.</string>
-    <string name="alert_translate_google" auto="1">Dobrý deň, je tento preklad za predpokladu, Google Translate. Ak viete, anglicky, rovnako ako %s, a chceli by ste pomôcť pri vytváraní lepší preklad, kliknite na toto tlačítko:</string>
-    <string name="alert_translate_none" auto="1">Dobrý deň, zdá sa, že používate nepodporovaný jazyk. Viete, anglické a %s? Ak by ste chceli pomôcť pri poskytovaní správny preklad, kliknite tu:</string>
+    <string name="alert_translate_google" formatted="false" auto="1">Dobrý deň, je tento preklad za predpokladu, Google Translate. Ak viete, anglicky, rovnako ako %s, a chceli by ste pomôcť pri vytváraní lepší preklad, kliknite na toto tlačítko:</string>
+    <string name="alert_translate_none" formatted="false" auto="1">Dobrý deň, zdá sa, že používate nepodporovaný jazyk. Viete, anglické a %s? Ak by ste chceli pomôcť pri poskytovaní správny preklad, kliknite tu:</string>
     <string name="button_translate" auto="1">Preložiť</string>
     <string name="httpError">Vyskytla sa chyba siete.</string>
     <string name="httpErrorAuth">Overenie nebolo úspešné.</string>
@@ -280,5 +281,46 @@
     <string name="storage_usb">Karta SD</string>
     <string name="extract_edit_menu_button">Ukladací priestor USB</string>
     <string name="activity_chooser_view_see_all">Upraviť...</string>
-
-</resources>
\ No newline at end of file
+    <string name="language">Jazyk</string>
+    <string name="apply_to_all">Želáte si použiť na všetky zložky?</string>
+    <string name="s_pref_text_wrap">Zalomenie textu</string>
+    <string name="s_privacy">Ochrana súkromia</string>
+    <string name="s_menu_system_mount_off">Len na čítanie</string>
+    <string name="s_theme_lightdark">svetle a tmave </string>
+    <string name="s_menu_rate" auto="1">sadzba</string>
+    <string name="s_alert_destination_exists" auto="1">Destinácia už existuje. Čo chcete urobiť?</string>
+    <string name="s_overwrite" auto="1">prepísať</string>
+    <string name="s_skip" auto="1">preskočiť</string>
+    <string name="s_msg_file_exists" auto="1">Niektoré cieľové súbory môžu už existovať. Ok prepísať?</string>
+    <string name="s_title_file_exists" auto="1">Súbor už existuje.</string>
+    <string name="s_msg_pref_archives" auto="1">Chceli by ste prechádzať alebo rozbaliť archív?</string>
+    <string name="s_browse" auto="1">Prehliadať</string>
+    <string name="s_extract" auto="1">výpis</string>
+    <string name="s_extracted" auto="1">extrahované</string>
+    <string name="s_extracting" auto="1">extrahovanie</string>
+    <string name="s_extract_with">extrahovat</string>
+    <string name="s_title_archive_handler" auto="1">Archív Handler</string>
+    <string name="s_ask_again" auto="1">Opýtajte sa zakaždým</string>
+    <string name="s_archives" auto="1">Archív</string>
+    <string name="s_compress" auto="1">komprimovať</string>
+    <string name="s_compress_type" auto="1">typ kompresie</string>
+    <string name="s_compressed" auto="1">stlačený</string>
+    <string name="s_delete_after" auto="1">Odstrániť zdroj po dokončení</string>
+    <string name="s_master_pass" auto="1">Master Password</string>
+    <string name="s_master_pass_warning" auto="1">Môžete zadať hlavné heslo, používané ako šifrovacie kľúče pre všetky uložené heslá. Ak necháte toto pole prázdne, bude hesla stále šifrovaná, a predvolené hlavné heslo bude použité. Vezmite prosím na vedomie, že ak ste aktualizovať svoje heslo uložené siete hesiel, budete pravdepodobne potrebovať reset hesla a overenie cloud servery po resete tohto hesla.</string>
+    <string name="s_pass_old" auto="1">Zadajte staré heslo:</string>
+    <string name="s_pass_new" auto="1">Zadajte nové heslo:</string>
+    <string name="s_logout" auto="1">Odhlásiť</string>
+    <string name="s_authenticate" auto="1">overiť</string>
+    <string name="s_authenticating" auto="1">overovanie</string>
+    <string name="s_bookmark_history" auto="1">História</string>
+    <string name="s_server_account_title" auto="1">účet:</string>
+    <string name="s_authenticate_success" auto="1">autentizácia úspešná</string>
+    <string name="s_authenticate_refresh" auto="1">obnoviť overovanie</string>
+    <string name="s_pref_thumbs_cache" auto="1">Pre-Cache Náhľady</string>
+    <string name="s_pref_thumbs_cache_summary" auto="1">To vám pomôže urýchliť načítanie zložky obsahujúce obrázky a videá.</string>
+    <string name="s_folders" auto="1">zložky</string>
+    <string name="s_hidden" auto="1">skrytý</string>
+    <string name="s_total">celkom</string>
+    <string name="s_custom_account" auto="1">vlastný účet</string>
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
old mode 100644
new mode 100755
index 7a1fecdd..7398888d
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
-    <string name="app_name" auto="1">Öppen Explorer</string>
+    <string name="app_name">Open Explorer</string>
     <string name="s_photos">Foton</string>
     <string name="s_videos">Video</string>
     <string name="s_music">Musik</string>
@@ -10,7 +9,7 @@
     <string name="s_internal">Internt</string>
     <string name="s_view">Översikt</string>
     <string name="s_bookmarks">Bokmärke</string>
-    <string name="s_menu_favorites" auto="1">Toggle bokmärken</string>
+    <string name="s_menu_favorites">Visa/dölj bokmärken</string>
     <string name="s_menu_sort">Sortera</string>
     <string name="s_menu_sort_name_asc">Sortera efter namn (A-Z)</string>
     <string name="s_menu_sort_name_desc">Sortera efter namn (Z-A)</string>
@@ -19,8 +18,8 @@
     <string name="s_menu_sort_size_asc">Sortera efter största</string>
     <string name="s_menu_sort_size_desc">Sortera efter minsta</string>
     <string name="s_menu_sort_type">Sortera efter filtyp</string>
-    <string name="s_menu_multi" auto="1">Multi-Select</string>
-    <string name="s_menu_grid" auto="1">Grid View</string>
+    <string name="s_menu_multi">Multi-val</string>
+    <string name="s_menu_grid">Visning rutnät</string>
     <string name="s_menu_list">listvy</string>
     <string name="s_menu_carousel" auto="1">Karusellen</string>
     <string name="s_menu_hidden">visa dolda filer</string>
@@ -29,16 +28,16 @@
     <string name="s_menu_other" auto="1">Andra inställningar</string>
     <string name="s_menu_flush" auto="1">Flush Cache</string>
     <string name="s_menu_root" auto="1">Rot</string>
-    <string name="s_menu_prefs_folder" auto="1">Folder Preferences</string>
+    <string name="s_menu_prefs_folder">Mapp Inställningar</string>
     <string name="s_menu_prefs_global" auto="1">Globala Inställningar</string>
     <string name="s_menu_info" auto="1">Info</string>
     <string name="s_menu_copy" auto="1">Kopiera</string>
-    <string name="s_menu_cut" auto="1">Skära</string>
+    <string name="s_menu_cut">Klipp ut</string>
     <string name="s_menu_paste" auto="1">Klistra in</string>
-    <string name="s_menu_delete" auto="1">Bort</string>
+    <string name="s_menu_delete">Ta boet</string>
     <string name="s_menu_share" auto="1">Skicka / Dela ...</string>
-    <string name="s_menu_zip" auto="1">Zip-fil (er) ...</string>
-    <string name="s_menu_unzip" auto="1">Packa ...</string>
+    <string name="s_menu_zip">Komprimera fil(er)...</string>
+    <string name="s_menu_unzip">Packa upp</string>
     <string name="s_menu_rename" auto="1">Byt namn ...</string>
     <string name="s_menu_bookmark" auto="1">Lägg till bokmärke</string>
     <string name="s_save" auto="1">Spara</string>
@@ -59,11 +58,11 @@
     <string name="s_pref_sort_summary" auto="1">Välj hur du vill sortera filer och mappar</string>
     <string name="s_pref_advanced" auto="1">Avancerad</string>
     <string name="s_pref_server_name" auto="1">Servernamn</string>
-    <string name="s_pref_server_name_summary" auto="1">Ange Server Name</string>
+    <string name="s_pref_server_name_summary">Ange Servernamn</string>
     <string name="s_pref_server_url" auto="1">Server URL</string>
     <string name="s_pref_server_url_summary" auto="1">Fyll i fullständigt server URL</string>
     <string name="s_pref_server_host" auto="1">Server Host</string>
-    <string name="s_pref_server_user" auto="1">Användaren</string>
+    <string name="s_pref_server_user">Användare</string>
     <string name="s_pref_server_user_summary" auto="1">Användarnamn</string>
     <string name="s_pref_server_password" auto="1">Lösenord</string>
     <string name="s_pref_server_password_summary" auto="1">Användarnamn Lösenord</string>
@@ -72,35 +71,35 @@
     <string name="s_pref_server_extras" auto="1">Extrainställningar</string>
     <string name="s_pref_server_update" auto="1">Lägg till / uppdatera server</string>
     <string name="s_pref_server_type" auto="1">Server av typ</string>
-    <string name="s_files" auto="1">filer</string>
+    <string name="s_files">Filer</string>
     <string name="s_create" auto="1">Skapa</string>
-    <string name="s_title_holding_x_files" auto="1">Håll %s-filer</string>
+    <string name="s_title_holding_x_files" formatted="false" auto="1">Håll %s-filer</string>
     <string name="s_title_newfolder" auto="1">Skapa en ny mapp</string>
-    <string name="s_title_send" auto="1">Skicka %s</string>
-    <string name="s_title_unzip" auto="1">Packa %s</string>
-    <string name="s_title_zip" auto="1">Zip %s</string>
+    <string name="s_title_send" formatted="false" auto="1">Skicka %s</string>
+    <string name="s_title_unzip" formatted="false">Packa upp %s</string>
+    <string name="s_title_zip" formatted="false" auto="1">Zip %s</string>
     <string name="s_title_executing" auto="1">Exekvera</string>
     <string name="s_title_deleting" auto="1">Ta bort</string>
     <string name="s_title_searching" auto="1">Söka</string>
-    <string name="s_title_moving" auto="1">Rörliga</string>
+    <string name="s_title_moving">Flytta</string>
     <string name="s_title_copying" auto="1">Kopiera</string>
     <string name="s_title_zipping" auto="1">Zippa</string>
     <string name="s_title_unzipping" auto="1">Unzipping</string>
     <string name="s_title_wait" auto="1">Var god vänta ...</string>
-    <string name="s_alert_confirm_delete" auto="1">Ta bort %s kan inte ångras. Är du säker på att du vill fortsätta?</string>
+    <string name="s_alert_confirm_delete" formatted="false" auto="1">Ta bort %s kan inte ångras. Är du säker på att du vill fortsätta?</string>
     <string name="s_alert_rename" auto="1">Vänligen skriv in nya namn den här filen</string>
     <string name="s_alert_newfolder" auto="1">Skriv namnet på den mapp du vill skapa.</string>
-    <string name="s_alert_unzip" auto="1">Vill du packa %s här eller någon annan mapp?</string>
-    <string name="s_button_unzip_here" auto="1">Packa här</string>
-    <string name="s_button_unzip_else" auto="1">Packa annanstans ...</string>
+    <string name="s_alert_unzip" formatted="false" auto="1">Vill du packa %s här eller någon annan mapp?</string>
+    <string name="s_button_unzip_here">Packa upp här</string>
+    <string name="s_button_unzip_else">Packa upp någon annanstans ...</string>
     <string name="s_msg_none" auto="1">Fil (er) kunde inte</string>
     <string name="s_msg_some" auto="1">Vissa fil (er) kunde inte</string>
     <string name="s_msg_all" auto="1">Fil (er) med framgång</string>
-    <string name="s_msg_deleted" auto="1">bort</string>
-    <string name="s_msg_moved" auto="1">flyttas</string>
-    <string name="s_msg_copied" auto="1">kopieras</string>
+    <string name="s_msg_deleted">Borttagen</string>
+    <string name="s_msg_moved">Flyttad</string>
+    <string name="s_msg_copied">Kopierad</string>
     <string name="s_remove" auto="1">Avlägsna</string>
-    <string name="s_eject" auto="1">Mata</string>
+    <string name="s_eject">Mata ut</string>
     <string name="s_update" auto="1">Uppdatera</string>
     <string name="s_alert_bookmark_rename" auto="1">Ändra titeln på ditt bokmärke.</string>
     <string name="s_title_bookmark_prefix" auto="1">Hantera Bokmärke:</string>
@@ -116,10 +115,10 @@
     <string name="s_status_loading" auto="1">Laddar ...</string>
     <string name="s_menu_open" auto="1">Öppna med ...</string>
     <string name="s_menu_edit" auto="1">Redigera med ...</string>
-    <string name="s_pref_stats_title" auto="1">Hjälpa till att förbättra OpenExplorer</string>
+    <string name="s_pref_stats_title">Hjälp till att förbättra OpenExplorer</string>
     <string name="s_pref_stats_summary" auto="1">Skicka anonym användarstatistik. Detta inbegriper inte information som kan användas för att identifiera användaren.</string>
     <string name="s_error_no_intents" auto="1">Inga installerade program kan läsa den här typen av fil.</string>
-    <string name="s_menu_root_disabled" auto="1">Rot inaktiverad</string>
+    <string name="s_menu_root_disabled"> Root inaktiverad</string>
     <string name="s_pref_start" auto="1">Start mapp</string>
     <string name="s_pref_start_summary" auto="1">Anger vilken mapp OpenExplorer startar i</string>
     <string name="s_custom" auto="1">Anpassad ...</string>
@@ -138,21 +137,21 @@
     <string name="s_prompt_zip" auto="1">Ange filnamnet på nya zip-fil:</string>
     <string name="app_edit" auto="1">Redigera med OpenExplorer</string>
     <string name="s_menu_more" auto="1">Fler alternativ ...</string>
-    <string name="s_msg_low_memory" auto="1">Låg minne!</string>
+    <string name="s_msg_low_memory">Lågt minne!</string>
     <string name="s_clear" auto="1">Rensa</string>
     <string name="s_menu_delete_all" auto="1">Ta bort alla</string>
     <string name="s_menu_move_all" auto="1">Flytta hit</string>
-    <string name="s_menu_copy_all" auto="1">Kopiera Här</string>
-    <string name="s_confirm_delete" auto="1">Är du säker på att du vill radera %s?</string>
+    <string name="s_menu_copy_all">Kopiera Här</string>
+    <string name="s_confirm_delete" formatted="false" auto="1">Är du säker på att du vill radera %s?</string>
     <string name="s_error_same_destination" auto="1">Målkatalogen är densamma.</string>
     <string name="s_sample_notification" auto="1">Kopiering -&gt; SDCard:  n 3 Filer</string>
-    <string name="s_pref_fullscreen" auto="1">Full Screen</string>
+    <string name="s_pref_fullscreen">Helskärm</string>
     <string name="s_pref_fullscreen_summary_on" auto="1">Göm Anmälan Bar</string>
     <string name="s_pref_fullscreen_summary_off" auto="1">Visa Anmälan Bar</string>
     <string name="s_pref_pagers" auto="1">Visa Personsökare</string>
     <string name="s_pref_pagers_summary_on" auto="1">Horisontell drar = Directory Navigation</string>
     <string name="s_pref_pagers_summary_off" auto="1">Övergripande drar funktionshindrade</string>
-    <string name="s_alert_new_media" auto="1">New Media insatt!</string>
+    <string name="s_alert_new_media">Ny media insatt</string>
     <string name="s_warn_pager_title" auto="1">Ny funktion: Visa Personsökare</string>
     <string name="s_warn_pager" auto="1">Svep vänster till höger för att gå upp en katalog och höger till vänster för att gå tillbaka. Detta bör göra det lättare att navigera. Prova (på externa media)!</string>
     <string name="s_warn_confirm" auto="1">Förstår du?</string>
@@ -167,14 +166,14 @@
     <string name="s_pref_show_external" auto="1">Visa externa media</string>
     <string name="s_error_no_media" auto="1">Det ser ut som det inte finns något insatt media. Inaktivera USB delning eller re-insert media.</string>
     <string name="s_prompt_password" auto="1">Ange lösenord</string>
-    <string name="s_add" auto="1">Tillsätt</string>
+    <string name="s_add">Lägg till</string>
     <string name="s_server_ftp" auto="1">FTP</string>
     <string name="s_server_sftp" auto="1">SFTP</string>
     <string name="s_pref_server_port" auto="1">Port</string>
     <string name="s_about_buildtime" auto="1">Bygg Datum</string>
     <string name="s_default" auto="1">Standard</string>
-    <string name="s_pref_timeout" auto="1">Timeout</string>
-    <string name="s_pref_timeout_summary" auto="1">Timeout i sekunder</string>
+    <string name="s_pref_timeout">Tiden ute</string>
+    <string name="s_pref_timeout_summary">Tid ute i sekunder</string>
     <string name="s_menu_up" auto="1">Gå upp</string>
     <string name="s_prompt_unzip" auto="1">Ange sökväg till unzip i:</string>
     <string name="s_pref_hardware_accel" auto="1">Aktivera Maskinvaruacceleration</string>
@@ -188,8 +187,8 @@
     <string name="s_bookmark_favorites" auto="1">Favoriter</string>
     <string name="s_bookmark_servers" auto="1">Servrar</string>
     <string name="s_bookmark_cache" auto="1">Cache</string>
-    <string name="s_info_totalspace" auto="1">Disk Total Space:</string>
-    <string name="s_info_freespace" auto="1">Disk Free Space:</string>
+    <string name="s_info_totalspace">Totalt utrymme</string>
+    <string name="s_info_freespace">Ledigt utrymme</string>
     <string name="s_status_rate" auto="1">Rate:</string>
     <string name="s_about_hardware" auto="1">Hårdvara</string>
     <string name="s_menu_refresh" auto="1">Uppdatera mapp</string>
@@ -205,18 +204,20 @@
     <string name="s_pref_show_music" auto="1">Visa musik</string>
     <string name="s_pref_show_downloads" auto="1">Visa Downloads</string>
     <string name="s_hide" auto="1">Göm</string>
-    <string name="s_show" auto="1">Visar</string>
-    <string name="s_msg_event_cancelled" auto="1">Händelse annulleras.</string>
+    <string name="s_show">Visa</string>
+    <string name="s_msg_event_cancelled">Händelse annullerad.</string>
     <string name="s_alert_newfolder_folder" auto="1">Skapa ny mapp i:</string>
     <string name="s_pref_fancy_category" auto="1">Fancy Bildskärmsinställningar</string>
-    <string name="s_pref_fancy_menus" auto="1">Fancy Menyer</string>
+    <string name="s_pref_fancy_menus">Snygga Menyer</string>
     <string name="s_pref_fancy_context" auto="1">Fancy Context Menyer</string>
     <string name="s_search_files" auto="1">Sök filsystem</string>
-    <string name="s_menu_exit" auto="1">Utgång</string>
+    <string name="search_summary" formatted="false" auto="1">Söka efter &quot; %s&quot;  n inom &quot; %s&quot; ( %d) ...</string>
+    <string name="search_results" formatted="false" auto="1">Hittade %d resultat för &quot; %s&quot;  n inom &quot; %s&quot;</string>
+    <string name="s_menu_exit">Avsluta</string>
     <string name="s_warn_wtf_message" auto="1">Oops! Det verkar som om en ohanterat fel har inträffat! Eftersom detta är ett vanligt problem i många Beta apps, är det enda sättet att lösa dessa frågor för att ta emot rapporter från olika enheter, t.ex. din, för att avgöra hur du åtgärdar problemet. Kan vi skicka en sådan rapport, som innehåller endast anonyma uppgifter, till utvecklaren?</string>
     <string name="s_warn_wtf_ps" auto="1">*** Observera, detta är app i Beta. Vänligen ger inte denna applikation ett dåligt betyg bara för att det kraschar. Bara avinstallera om det verkligen stör dig. Tack!</string>
     <string name="s_yes" auto="1">Ja</string>
-    <string name="s_no" auto="1">Ingen</string>
+    <string name="s_no">Nej</string>
     <string name="s_wtf_preview" auto="1">Förhandsgranska rapportdata</string>
     <string name="s_wtf_remember" auto="1">Fråga inte igen</string>
     <string name="s_pref_basebar" auto="1">Split Action Bar</string>
@@ -225,22 +226,22 @@
     <string name="s_pref_autowtf" auto="1">Auto-skicka felrapporter</string>
     <string name="s_pref_autowtf_summary" auto="1">När ett ohanterat undantag inträffar, automatiskt skicka rapport.</string>
     <string name="s_split_auto" auto="1">Automatisk</string>
-    <string name="s_split_top" auto="1">Force Knappar till toppen</string>
-    <string name="s_split_top_single" auto="1">Tvinga enda knapp för att Top</string>
-    <string name="s_split_bottom" auto="1">Force Knappar till botten</string>
+    <string name="s_split_top">Tvinga Knappar till toppen</string>
+    <string name="s_split_top_single">Tvinga en knapp till Toppen</string>
+    <string name="s_split_bottom">Tvinga Knappar till botten</string>
     <string name="s_split_none" auto="1">Placera alla knappar i System menyn</string>
     <string name="s_about_screensize" auto="1">Skärmstorlek</string>
     <string name="s_about_density" auto="1">Densitet</string>
-    <string name="s_menu_location_int" auto="1">Internminne Path</string>
-    <string name="s_menu_location_ext" auto="1">Externt minne Path</string>
-    <string name="s_wtf_context" auto="1">Beskriv samband med kraschen:</string>
+    <string name="s_menu_location_int">Sökväg till internminne</string>
+    <string name="s_menu_location_ext">Sökväg till externt minne</string>
+    <string name="s_wtf_context">Beskiv samband med kraschen:</string>
     <string name="thanks" auto="1">Tack!</string>
     <string name="menu_view_font_small" auto="1">Teckenstorlek Liten</string>
     <string name="menu_view_font_medium" auto="1">Teckenstorlek Medium</string>
-    <string name="menu_view_font_large" auto="1">Teckenstorlek Large</string>
+    <string name="menu_view_font_large">Teckenstorlek stor</string>
     <string name="app_description" auto="1">Öppna Utforskaren - Open Source filhanterare för alla enheter! (Tabletter, telefoner, Google TV, smörgåsar!)  N-Komplett filsystem management  n-USB, SD och andra externa media  n-nätverk kan anslutas (FTP, SFTP, SMB / Samba / Windows / LAN / WIFI)  n - Text Editor  n-smarta mappar som skannar för olika typer av media (videor, foton, musik, nedladdningar)  n-View Personsökare katalogen navigering (svep rätt att gå upp en katalog)  n-superuser / Root förmåga att lista / Läs systemmappar (inget system skriva ännu)  n  nFeatures framöver:  n-flikar Text Editor  n-More nätverkskapacitet (Dropbox, Box.net, Sky drive)  n-Offline filstruktur cache, kommer ihåg vilka filer du har på olika platser utan att behöva ansluta  n-Diskutrymme värmen Kartan visar var dina största filer  n  n * OBS: Denna app är i Beta. Det finns fortfarande många buggar. Om du inte vill uppleva dessa fel, hämtar snälla inte denna app. Om du vill hjälpa mig att hitta dessa fel, vänligen maila mig eller samarbeta med mig på GitHub (https://github.com/BrandoCommando/OpenExplorer/). Kom ihåg dåliga betyg att hjälpa någon.</string>
-    <string name="alert_translate_google" auto="1">Hej, är denna översättning tillhandahålls av Google Translate. Om du vet engelska och som %s, och vill hjälpa till att ge en bättre översättning, klicka på knappen:</string>
-    <string name="alert_translate_none" auto="1">Hej, verkar det som du använder en icke-språk som stöds. Vet du engelska och %s? Om du vill du hjälpa till att tillhandahålla en korrekt översättning, klicka här:</string>
+    <string name="alert_translate_google" formatted="false" auto="1">Hej, är denna översättning tillhandahålls av Google Translate. Om du vet engelska och som %s, och vill hjälpa till att ge en bättre översättning, klicka på knappen:</string>
+    <string name="alert_translate_none" formatted="false" auto="1">Hej, verkar det som du använder en icke-språk som stöds. Vet du engelska och %s? Om du vill du hjälpa till att tillhandahålla en korrekt översättning, klicka här:</string>
     <string name="button_translate" auto="1">Översätt</string>
     <string name="httpError">Ett nätverksfel har inträffat.</string>
     <string name="httpErrorAuth">Det gick inte att autentisera.</string>
@@ -265,21 +266,102 @@
     <string name="ime_action_go">Inga matchande aktiviteter hittades</string>
     <string name="ime_action_send">Kör</string>
     <string name="ime_action_done">Skicka</string>
-    <string name="ime_action_default">Färdig</string>
-    <string name="upload_file">Utför</string>
-    <string name="no_file_chosen">Välj fil</string>
-    <string name="reset">Ingen fil har valts</string>
-    <string name="back_button_label">Återställ</string>
-    <string name="next_button_label">Tillbaka</string>
-    <string name="no_matches">Nästa</string>
-    <string name="find_on_page">Inga träffar</string>
-    <string name="find">Sök på sidan</string>
-    <string name="activitychooserview_choose_application">Sök efter</string>
-    <string name="shareactionprovider_share_with">Välj en app</string>
+    <string name="ime_action_default">Utför</string>
+    <string name="upload_file">Välj fil</string>
+    <string name="no_file_chosen">Ingen fil vald</string>
+    <string name="reset">Återställ</string>
+    <string name="back_button_label">Backa</string>
+    <string name="next_button_label">Nästa</string>
+    <string name="no_matches">Inga matchande</string>
+    <string name="find_on_page">Hitta på sidan</string>
+    <string name="find">Sök</string>
+    <string name="activitychooserview_choose_application">Välj  progprogram</string>
+    <string name="shareactionprovider_share_with">Dela med</string>
     <string name="storage_internal">Dela med</string>
     <string name="storage_sd_card">Internt lagringsutrymme</string>
     <string name="storage_usb">SD-kort</string>
-    <string name="extract_edit_menu_button">USB-lagring</string>
+    <string name="extract_edit_menu_button">Redigera</string>
     <string name="activity_chooser_view_see_all">Redigera...</string>
-
-</resources>
\ No newline at end of file
+    <string name="s_title_picker">Vänligen välj katalog</string>
+    <string name="selected_path">Vald sökväg</string>
+    <string name="filename">Filnamn</string>
+    <string name="s_msg_saved">Lagrad</string>
+    <string name="s_menu_view_line_numbers">Antal rader</string>
+    <string name="warn_text_editor">Välkommen till Text Editor.  Långtryck på texten för att komma till redigeringsläge.</string>
+    <string name="warn_networking">Välkommen till Networking. Var vänlig observera att denna funktion fortfarande är under utveckling och kan innehålla buggar. Var snäll och lämna inte ett dåligt omdöme på grund av dem. </string>
+    <string name="s_menu_new_file">Ny textfil</string>
+    <string name="s_msg_created">Skapad</string>
+    <string name="s_title_newfile">Ny fil</string>
+    <string name="s_alert_newfile_folder">Skapa en ny fil i:</string>
+    <string name="s_alert_newfile">Skriv in namnet på den nya filen</string>
+    <string name="s_alert_exit">Är du säker på att du vill avsluta?</string>
+    <string name="s_alert_clipboard">Kopierat till klippbordet</string>
+    <string name="s_alert_restart">Startar om. Väligen vänta.</string>
+    <string name="language">Språk</string>
+    <string name="s_menu_download">Ladda ner</string>
+    <string name="scan">Scanna</string>
+    <string name="test">Testa</string>
+    <string name="test_success">Nätverkskopplingen lyckades!</string>
+    <string name="no_items">Tomt</string>
+    <string name="clipboard">Klippbordet</string>
+    <string name="theme">Tema</string>
+    <string name="theme_dark">Mörkt UI</string>
+    <string name="theme_light">Ljust UI</string>
+    <string name="chooser_remember">Kom ihåg valet</string>
+    <string name="use_system">Använd systemets &gt;&gt;</string>
+    <string name="activity_resolver_use_always">Alltid</string>
+    <string name="activity_resolver_use_once">Bara en gång</string>
+    <string name="s_pref_bookmarks_summary">Visa bokmärken</string>
+    <string name="s_menu_heatmap">Värmekarta</string>
+    <string name="apply_to_all">Vill du att detta ska gälla alla mappar?</string>
+    <string name="s_pref_view_folders">Mappegenskaper</string>
+    <string name="s_pref_view_general">Allmänna egenskaper</string>
+    <string name="s_pref_text_wrap">Bryt text</string>
+    <string name="s_pref_thumbs_crop">Kapa eller centrera tumnaglar</string>
+    <string name="s_pref_thumbs_cache_clear">Töm tumnagelcache</string>
+    <string name="s_msg_folder_none">Mappen kan inte skapas.</string>
+    <string name="s_privacy">Integritetspolicy</string>
+    <string name="s_menu_system_mount">Gör systemet skrivbart</string>
+    <string name="s_menu_system_mount_on">Systemet är skrivbart!</string>
+    <string name="s_menu_system_mount_off">Systemet är läs enbert.</string>
+    <string name="s_pref_servers_private">Håll dessa servrar privata</string>
+    <string name="s_pref_servers_private_summary">Spara serverkonfiguration på ett säkert sätt. Detta kommer att ta bort serverkonfiguration vid avinstallation. Om Ni ominstallerar i framtiden, så hindras detta om rutan är omarkerad.</string>
+    <string name="s_theme_lightdark">Ljus och mörk</string>
+    <string name="s_theme_custom">Linje</string>
+    <string name="s_menu_rate" auto="1">Betygsätt</string>
+    <string name="s_alert_destination_exists" auto="1">Destination finns redan. Vad skulle du vilja göra?</string>
+    <string name="s_overwrite" auto="1">Skriv över</string>
+    <string name="s_skip" auto="1">Hoppa</string>
+    <string name="s_msg_file_exists" auto="1">Vissa destination filer kan redan finns. OK att skriva?</string>
+    <string name="s_title_file_exists" auto="1">Filen finns redan.</string>
+    <string name="s_msg_pref_archives" auto="1">Vill du bläddra eller extrahera arkivet?</string>
+    <string name="s_browse" auto="1">Bläddra</string>
+    <string name="s_extract" auto="1">Utdrag</string>
+    <string name="s_extracted" auto="1">extraherade</string>
+    <string name="s_extracting" auto="1">extrahera</string>
+    <string name="s_extract_with" auto="1">Extrahera med ...</string>
+    <string name="s_title_archive_handler" auto="1">arkiv Handler</string>
+    <string name="s_ask_again" auto="1">Fråga varje gång</string>
+    <string name="s_archives" auto="1">Arkiv</string>
+    <string name="s_compress" auto="1">komprimera</string>
+    <string name="s_compress_type" auto="1">komprimeringstyp</string>
+    <string name="s_compressed" auto="1">komprimerad</string>
+    <string name="s_delete_after" auto="1">Radera källa efter slutförandet</string>
+    <string name="s_master_pass" auto="1">Huvudlösenord</string>
+    <string name="s_master_pass_warning" auto="1">Du kan ange ett huvudlösenord används som krypteringsnyckel för alla lagrade lösenord. Om du lämnar fältet tomt, kommer lösenord fortfarande krypterad och standardlösenordet huvudlösenordet kommer att användas. Observera att om du uppdaterar ditt lösenord med lagrade nätverkslösenord, kommer du antagligen behöva återställa lösenord och autentisera moln servrar efter återställning detta lösenord.</string>
+    <string name="s_pass_old" auto="1">Ange det gamla lösenordet:</string>
+    <string name="s_pass_new" auto="1">Ange nytt lösenord:</string>
+    <string name="s_logout" auto="1">Logga ut</string>
+    <string name="s_authenticate" auto="1">verifiera</string>
+    <string name="s_authenticating" auto="1">autentisering</string>
+    <string name="s_bookmark_history" auto="1">Historik</string>
+    <string name="s_server_account_title" auto="1">konto:</string>
+    <string name="s_authenticate_success" auto="1">autentisering framgångsrik</string>
+    <string name="s_authenticate_refresh" auto="1">Refresh autentisering</string>
+    <string name="s_pref_thumbs_cache" auto="1">Pre-cache miniatyrer</string>
+    <string name="s_pref_thumbs_cache_summary" auto="1">Detta kommer att hjälpa till att snabba upp laddning mappar som innehåller bilder och videoklipp.</string>
+    <string name="s_folders" auto="1">mappar</string>
+    <string name="s_hidden" auto="1">dold</string>
+    <string name="s_total" auto="1">totalt</string>
+    <string name="s_custom_account" auto="1">anpassad konto</string>
+</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
new file mode 100755
index 00000000..46d04f78
--- /dev/null
+++ b/res/values-th/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_downloads">ดาวโหลด</string>
+    <string name="s_view">วิว</string>
+    <string name="s_menu_copy">ก๊อปปี้</string>
+    <string name="s_text_intro_body">The goal of OpenExplorer is to make you more productive within the Android filesystem and in the cloud. Whether you need to manage videos or photos from multiple locations or manage your webserver remotely via FTP, OpenExplorer can suit your needs.</string>
+    <string name="s_menu_exit">ทางออก</string>
+    <string name="warn_text_editor">Welcome to Text Editor. Please long press the text to enter Edit mode.</string>
+    <string name="warn_networking">Welcome to Networking. Please note that this feature is still under development and may contain bugs. Please do not give a bad market rating if you find any of these bugs.</string>
+</resources>
diff --git a/res/values-to/strings.xml b/res/values-to/strings.xml
new file mode 100755
index 00000000..10f688f3
--- /dev/null
+++ b/res/values-to/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="s_pref_server_host">metzatricity</string>
+</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
old mode 100644
new mode 100755
index 3617da30..b6e0c5f1
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
+<resources>
     <string name="app_name">Open Explorer</string>
     <string name="s_photos" auto="1">Fotoğraflar</string>
     <string name="s_videos" auto="1">Videolar</string>
@@ -10,7 +9,7 @@
     <string name="s_internal" auto="1">Iç</string>
     <string name="s_view">Görünüm</string>
     <string name="s_bookmarks" auto="1">Yer imleri</string>
-    <string name="s_menu_favorites" auto="1">Toggle imleri</string>
+    <string name="s_menu_favorites">toggleler</string>
     <string name="s_menu_sort">Sırala</string>
     <string name="s_menu_sort_name_asc">Ada göre sırala (A-Z)</string>
     <string name="s_menu_sort_name_desc">Ada göre sırala (Z-A)</string>
@@ -21,25 +20,25 @@
     <string name="s_menu_sort_type">Dosya türüne göre sırala</string>
     <string name="s_menu_multi">Çoklu seçim</string>
     <string name="s_menu_grid">Grid görünümü</string>
-    <string name="s_menu_list" auto="1">Liste Görünümü</string>
-    <string name="s_menu_carousel" auto="1">Atlıkarınca</string>
-    <string name="s_menu_hidden" auto="1">Gizli Dosyaları Göster</string>
-    <string name="s_menu_thumbs" auto="1">Resim Önizlemesi göster</string>
-    <string name="s_menu_new_folder" auto="1">Yeni Klasör</string>
-    <string name="s_menu_other" auto="1">Diğer Ayarlar</string>
+    <string name="s_menu_list">liste Görünümü</string>
+    <string name="s_menu_carousel">atli karinca</string>
+    <string name="s_menu_hidden">gizli dosyaları gostermece</string>
+    <string name="s_menu_thumbs">resimleri thumbnails (kücülterek) göster</string>
+    <string name="s_menu_new_folder">yeni klasör</string>
+    <string name="s_menu_other">öbür ayarlar</string>
     <string name="s_menu_flush" auto="1">Flush Önbellek</string>
     <string name="s_menu_root">Kök</string>
     <string name="s_menu_prefs_folder">Klasör Seçenekleri</string>
     <string name="s_menu_prefs_global">Genel Ayarlar</string>
-    <string name="s_menu_info" auto="1">Bilgi</string>
-    <string name="s_menu_copy" auto="1">Kopyala</string>
+    <string name="s_menu_info">nedir</string>
+    <string name="s_menu_copy">kopyalla</string>
     <string name="s_menu_cut">Kes</string>
     <string name="s_menu_paste">Yapıştır</string>
     <string name="s_menu_delete">Sil</string>
-    <string name="s_menu_share" auto="1">Paylaş / Gönder ...</string>
+    <string name="s_menu_share">yolla panpa</string>
     <string name="s_menu_zip">Zip dosyası(ları)</string>
     <string name="s_menu_unzip">Unzip...</string>
-    <string name="s_menu_rename" auto="1">Yeniden adlandır ...</string>
+    <string name="s_menu_rename">adlandır</string>
     <string name="s_menu_bookmark">Sık kullanılanlara ekle</string>
     <string name="s_save">Kaydet</string>
     <string name="s_saveas" auto="1">Farklı kaydet ...</string>
@@ -74,7 +73,7 @@
     <string name="s_pref_server_type" auto="1">Sunucu Türü</string>
     <string name="s_files">Dosyalar</string>
     <string name="s_create">Oluştur</string>
-    <string name="s_title_holding_x_files" tools:ignore="StringFormatMatches">% dosyaları seçildi</string>
+    <string name="s_title_holding_x_files" formatted="false">% dosyaları seçildi</string>
     <string name="s_title_newfolder">Yeni klasör oluştur</string>
     <string name="s_title_send">...leri gonder</string>
     <string name="s_title_unzip">...leri sıkıştırmadan çıkart</string>
@@ -87,14 +86,14 @@
     <string name="s_title_zipping">Sıkıştırılıyor</string>
     <string name="s_title_unzipping">Sıkıştırma açılıyor</string>
     <string name="s_title_wait" auto="1">Lütfen bekleyin ...</string>
-    <string name="s_alert_confirm_delete">Silinen % lar geri alınamaz. Devam etmek istediğinize emin misiniz?</string>
+    <string name="s_alert_confirm_delete" formatted="false">Silinen % lar geri alınamaz. Devam etmek istediğinize emin misiniz?</string>
     <string name="s_alert_rename">Bu dosya için yeni bir isim giriniz</string>
     <string name="s_alert_newfolder">Oluşturmak istediğiniz klasör için isim giriniz.</string>
-    <string name="s_alert_unzip">%ları buraya mı açmak istersiniz yoksa başka bir klasöre mi?</string>
+    <string name="s_alert_unzip" formatted="false">%ları buraya mı açmak istersiniz yoksa başka bir klasöre mi?</string>
     <string name="s_button_unzip_here">Buraya çıkart</string>
     <string name="s_button_unzip_else">Başka bir yere çıkart</string>
-    <string name="s_msg_none">Dosya(lar) %ılamadı</string>
-    <string name="s_msg_some">Bazı dosyalar %ılamadı</string>
+    <string name="s_msg_none" formatted="false">Dosya(lar) %ılamadı</string>
+    <string name="s_msg_some" formatted="false">Bazı dosyalar %ılamadı</string>
     <string name="s_msg_all" auto="1">Dosya (lar) başarıyla</string>
     <string name="s_msg_deleted" auto="1">silindi</string>
     <string name="s_msg_moved" auto="1">taşındı</string>
@@ -106,7 +105,7 @@
     <string name="s_title_bookmark_prefix">Sık Kullanılanları Yönet:</string>
     <string name="s_alert_remove_safe" auto="1">Şimdi sürücüyü güvenle kaldırabilirsiniz.</string>
     <string name="s_alert_remove_error">Çıkartılamıyor</string>
-    <string name="s_menu_about" auto="1">Hakkında</string>
+    <string name="s_menu_about">hakkında</string>
     <string name="s_about_version" auto="1">Versiyon</string>
     <string name="s_about_author" auto="1">Yazar</string>
     <string name="s_about_site" auto="1">Web sitesi</string>
@@ -118,7 +117,7 @@
     <string name="s_menu_edit">İle düzenle...</string>
     <string name="s_pref_stats_title" auto="1">OpenExplorer geliştirilmesine yardımcı olun</string>
     <string name="s_pref_stats_summary" auto="1">Anonim kullanım istatistikleri gönder. Bu, kullanıcı tanımlamak için kullanılabilir herhangi bir bilgi içermez.</string>
-    <string name="s_error_no_intents" auto="1">Hayır yüklü uygulamalar bu türde bir dosya okuyabilirsiniz.</string>
+    <string name="s_error_no_intents">Yüklü uygulamaların hiçbiri bu dosya tipini okuyamaz.</string>
     <string name="s_menu_root_disabled">Root devre dışı</string>
     <string name="s_pref_start">Başlangıç Klasörü</string>
     <string name="s_pref_start_summary" auto="1">Klasöründe OpenExplorer başlar hangi gösterir</string>
@@ -137,15 +136,15 @@
     <string name="s_error_ftp">Ağa bağlanırken hata oluştu</string>
     <string name="s_prompt_zip" auto="1">Yeni Zip dosyasının dosya adı girin:</string>
     <string name="app_edit">OpenExplorer ile düzenle</string>
-    <string name="s_menu_more" auto="1">Diğer seçenekler ...</string>
+    <string name="s_menu_more">diger seçnekler</string>
     <string name="s_msg_low_memory">Yetersiz bellek!</string>
     <string name="s_clear" auto="1">Temizle</string>
-    <string name="s_menu_delete_all" auto="1">Tümünü Sil</string>
+    <string name="s_menu_delete_all">hepini sil</string>
     <string name="s_menu_move_all">Buraya Taşı</string>
     <string name="s_menu_copy_all">Buraya kopyala</string>
-    <string name="s_confirm_delete">%s ları silmek istediğinizden emin misiniz?</string>
+    <string name="s_confirm_delete" formatted="false">%ları silmek istediğinizden emin misiniz?</string>
     <string name="s_error_same_destination" auto="1">Hedef dizin aynıdır.</string>
-    <string name="s_sample_notification">Kopyalanıyor -> sdcard: n 3 dosya</string>
+    <string name="s_sample_notification">Kopyalanıyor -&gt; sdcard: 3 dosya</string>
     <string name="s_pref_fullscreen" auto="1">Tam Ekran</string>
     <string name="s_pref_fullscreen_summary_on">Bildirim Çubuğunu Gizle</string>
     <string name="s_pref_fullscreen_summary_off">Bildirim Çubugunu Göster</string>
@@ -175,7 +174,7 @@
     <string name="s_default" auto="1">Standart</string>
     <string name="s_pref_timeout" auto="1">Zaman Aşımı</string>
     <string name="s_pref_timeout_summary" auto="1">Saniye olarak zaman aşımı</string>
-    <string name="s_menu_up" auto="1">Yukarı git</string>
+    <string name="s_menu_up">yukari</string>
     <string name="s_prompt_unzip">Çıkartılacak yolu girin:</string>
     <string name="s_pref_hardware_accel">Donanım hızlandırmayı aç</string>
     <string name="s_pref_honeyplus">Android 3.0+ Ayarları</string>
@@ -212,9 +211,9 @@
     <string name="s_pref_fancy_menus" auto="1">Fantezi Menüler</string>
     <string name="s_pref_fancy_context" auto="1">Fantezi Bağlam Menüler</string>
     <string name="s_search_files">Dosya sistemi ara</string>
-    <string name="search_summary" tools:ignore="StringFormatCount">\" %1$s \" yı (%2$d) içinde ara</string>
-    <string name="search_results" formatted="false">%d içindeki \" %s \" sonuçları</string>
-    <string name="s_menu_exit" auto="1">Çıkış</string>
+    <string name="search_summary" formatted="false">\&quot; % \&quot; yı (%d) içinde ara</string>
+    <string name="search_results" formatted="false">%d içindeki \&quot; % \&quot; sonuçları</string>
+    <string name="s_menu_exit">Çıkış</string>
     <string name="s_warn_wtf_message">Oops! İşlenemeyen bir hata oluştu. Beta sürümlerde sık karşılaşılan bir durum ve çözümü bu gibi durumların anonim raporlarla geliştiriciye bildirilmeidir.  Bu durum geliştiriciye bildirilsin mi?</string>
     <string name="s_warn_wtf_ps">***Bu Beta bir uygulamadır. Lütfen kötü bir değerlendirme puanı vermeyin. Sizi gerçekten rahatsız ederse sadece cihazınızdan kaldırın.</string>
     <string name="s_yes" auto="1">Evet</string>
@@ -242,7 +241,7 @@
     <string name="menu_view_font_large">Büyük Boy Yazılar</string>
     <string name="app_description" auto="1">Açık Explorer - tüm cihazlar için açık kaynak bir dosya yöneticisi! (Tablet, Telefonları, Google TV, sandviçler!)  N-Komple dosya sistem yönetimi  n-USB, SD ve diğer dış ortam  n-Ağ Bağlanabilir (FTP, SFTP, SMB / Samba / Windows / Lan / WIFI)  n - Text Editor  n-Akıllı Klasörler farklı medya türlerini (Video, Fotoğraf, Müzik, indir)  n-View Çağrı dizin navigasyon (bir dizin yukarı çıkmak için tokatlamak sağ)  n-Superuser / Kök yeteneği / liste için tarama Sistem klasörleri (hiçbir sistem henüz yazma) gelmek  n  nFeatures okuyun:  n-Sekmeli Metin Editörü  n-Daha Fazla Ağ yeteneği (Dropbox, Box.net, Sky sürücü)  n-Çevrimdışı dosya yapısı önbellek, hatırlar, hangi dosyaların bağlanmak gerek  n-Disk alanı ısı haritası sizin en büyük dosyaların nerede gösterir olmadan farklı yerlerde var  n  n * LÜTFEN DİKKAT: Bu app Beta bulunmaktadır. BİRÇOK hataları hala var. Eğer bu hataları yaşamak istemiyorsanız, lütfen bu app indirmek yok. Eğer beni bu hataları bulmanıza yardımcı olmak isterseniz, lütfen bana e-posta veya GitHub (https://github.com/BrandoCommando/OpenExplorer/) benimle işbirliği. Kötü derecelendirme kimse yardım unutmayın.</string>
     <string name="alert_translate_google">Merhaba bu çeviri Tuncay Acuner tarafından sağlandı. Eğer ingilizcenize güveniyorsanız ve daha iyi çeviririm diyorsanız buraya tıklayın:</string>
-    <string name="alert_translate_none" auto="1">Merhaba, size desteklenmeyen bir dil kullanarak anlaşılmaktadır. İngilizce ve %s biliyor musunuz? Eğer doğru bir çeviri sağlanmasında yardımcı olmak istiyorsanız, buraya tıklayın:</string>
+    <string name="alert_translate_none" formatted="false" auto="1">Merhaba, size desteklenmeyen bir dil kullanarak anlaşılmaktadır. İngilizce ve %s biliyor musunuz? Eğer doğru bir çeviri sağlanmasında yardımcı olmak istiyorsanız, buraya tıklayın:</string>
     <string name="button_translate">Çevir</string>
     <string name="httpError">Bir ağ hatası oluştu.</string>
     <string name="httpErrorAuth">Kimlik doğrulanamadı.</string>
@@ -298,6 +297,67 @@
     <string name="s_alert_exit">Çıkmak istediğinize emin misiniz?</string>
     <string name="s_alert_clipboard">Kopyalandı</string>
     <string name="s_alert_restart">Yeniden başlatılıyor. Lütfen bekleyiniz.</string>
-    <string name="language">Dil</string>
-
-</resources>
\ No newline at end of file
+    <string name="s_menu_download">indir</string>
+    <string name="scan">Tarama</string>
+    <string name="test">Test</string>
+    <string name="test_success">Bağlantı başarılı!</string>
+    <string name="no_items">Öğe yok.</string>
+    <string name="clipboard">Pano</string>
+    <string name="theme">Tema</string>
+    <string name="theme_dark">Koyu UI</string>
+    <string name="theme_light">Hafif UI</string>
+    <string name="chooser_remember">Seçimimi hatırla</string>
+    <string name="use_system">Sistemi kullan&gt;&gt;</string>
+    <string name="activity_resolver_use_always">Her zaman</string>
+    <string name="activity_resolver_use_once">Sadece bir kere</string>
+    <string name="s_pref_bookmarks_summary">İpuçlarını göster</string>
+    <string name="s_menu_heatmap">Isı haritası</string>
+    <string name="apply_to_all">Tüm klasörlere uylansın mı?</string>
+    <string name="s_pref_view_folders">Klasör seçenekleri</string>
+    <string name="s_pref_view_general">Genel Seçenekler</string>
+    <string name="s_pref_text_wrap">Metni kaydır</string>
+    <string name="s_pref_thumbs_crop">Önizlemeleri Kırp/Ortala</string>
+    <string name="s_pref_thumbs_cache_clear">Önizleme belleğini temizle</string>
+    <string name="s_msg_folder_none">Klasör oluşturulamaz</string>
+    <string name="s_privacy">Kullanıcı Sözleşmesi</string>
+    <string name="s_menu_system_mount_on">Sistem Yazılabilir.</string>
+    <string name="s_menu_system_mount_off">Sistem Salt-Okunur</string>
+    <string name="s_pref_servers_private_summary">Sunucu ayarlarını özel saklama alanında sakla. Bu ayar, eğer uygulama kaldırılırsa ayarların da silinmesine sebep olur. Daha sonra bu uygulamayı tekrar kurarsanız, bu seçeneği seçmemeniz ayarların sonrası için korunmadını sağlayacaktır.</string>
+    <string name="s_theme_lightdark">Koyu ve Açık</string>
+    <string name="s_menu_rate" auto="1">oran</string>
+    <string name="s_alert_destination_exists" auto="1">Hedef zaten var. Ne yapmak istiyorsunuz?</string>
+    <string name="s_overwrite">üzerine yazS</string>
+    <string name="s_skip">Atla</string>
+    <string name="s_msg_file_exists" auto="1">Bazı hedef dosyalar zaten var olabilir. Yazmak için Tamam?</string>
+    <string name="s_title_file_exists" auto="1">Dosya zaten var.</string>
+    <string name="s_msg_pref_archives" auto="1">Eğer arşiv taramak veya çıkarmak ister misiniz?</string>
+    <string name="s_browse" auto="1">Gözat</string>
+    <string name="s_extract" auto="1">çıkarmak</string>
+    <string name="s_extracted" auto="1">Ayıklanan</string>
+    <string name="s_extracting" auto="1">ayıklanıyor</string>
+    <string name="s_extract_with">Bununla aç...</string>
+    <string name="s_title_archive_handler" auto="1">Arşiv Handler</string>
+    <string name="s_ask_again" auto="1">Her zaman sor</string>
+    <string name="s_archives" auto="1">arşiv</string>
+    <string name="s_compress" auto="1">sıkıştırmak</string>
+    <string name="s_compress_type" auto="1">Sıkıştırma Türü</string>
+    <string name="s_compressed" auto="1">sıkıştırılmış</string>
+    <string name="s_delete_after" auto="1">Tamamlanmasından sonra kaynağı sil</string>
+    <string name="s_master_pass" auto="1">master Şifre</string>
+    <string name="s_master_pass_warning" auto="1">Herhangi depolanan parolalar için şifreleme anahtarı olarak kullanılan bir ana parola girebilirsiniz. Bu boş bırakırsanız, şifreler yine şifreli olacak ve varsayılan ana parola kullanılacaktır. Eğer saklanan ağ şifreleri ile şifrenizi güncellemek, muhtemelen şifreleri sıfırlamak ve bu şifre sıfırlama sonra bulut sunucuları kimlik doğrulaması gerektiğini lütfen unutmayın.</string>
+    <string name="s_pass_old" auto="1">Eski şifrenizi girin:</string>
+    <string name="s_pass_new">yeni şifre ne olsun cnm</string>
+    <string name="s_logout">Oturumu kapat</string>
+    <string name="s_authenticate">Doğrulama</string>
+    <string name="s_authenticating" auto="1">Kimlik doğrulanıyor</string>
+    <string name="s_bookmark_history">Geçmiş </string>
+    <string name="s_server_account_title" auto="1">Hesap:</string>
+    <string name="s_authenticate_success" auto="1">Doğrulama başarılı</string>
+    <string name="s_authenticate_refresh">Doğrulamayı yenile</string>
+    <string name="s_pref_thumbs_cache" auto="1">Pre-Cache Thumbnails</string>
+    <string name="s_pref_thumbs_cache_summary" auto="1">Bu Resimler ve Videolar içeren klasörleri yükleme hızlanmasına yardımcı olacaktır.</string>
+    <string name="s_folders">klasorler</string>
+    <string name="s_hidden"> gizli</string>
+    <string name="s_total">topu</string>
+    <string name="s_custom_account">ozel hesap</string>
+</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
old mode 100644
new mode 100755
index 61b88ded..386fe0d2
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-
     <string name="s_menu_sort">Сортувати</string>
     <string name="s_menu_sort_name_asc">Сортувати за іменем А-Я</string>
     <string name="s_menu_sort_name_desc">Сортувати за іменем Я-А</string>
@@ -11,19 +10,19 @@
     <string name="s_menu_sort_type">Сортувати за типом</string>
     <string name="s_menu_multi">Мульти-виділення</string>
     <string name="s_menu_list">Список</string>
-    <string name="s_menu_carousel">карусель</string>
+    <string name="s_menu_carousel">Карусель</string>
     <string name="s_menu_hidden">Показати приховані файли</string>
     <string name="s_menu_thumbs">Ескізи</string>
     <string name="s_menu_new_folder">Нова папка</string>
     <string name="s_menu_other">Інші налаштування</string>
     <string name="s_menu_prefs_folder">Властивості папки</string>
     <string name="s_menu_info">Інфо</string>
-    <string name="s_menu_copy">Копі</string>
+    <string name="s_menu_copy">Копія</string>
     <string name="s_menu_cut">Вирізати</string>
-    <string name="s_menu_paste">Пасте</string>
+    <string name="s_menu_paste">Вставити</string>
     <string name="s_menu_delete">Видалити</string>
     <string name="s_menu_share">Надіслати</string>
-    <string name="s_menu_rename">Переіменувати</string>
+    <string name="s_menu_rename">Перейменувати</string>
     <string name="s_menu_open">Відкрити програмою-»</string>
     <string name="s_menu_edit">Редагувати програмою-»</string>
     <string name="s_clear">Очистити</string>
@@ -34,10 +33,11 @@
     <string name="s_split_none">Розміщення всіх кнопок системного меню</string>
     <string name="s_about_screensize">Розмір дисплею</string>
     <string name="thanks">Дякуємо!</string>
+    <string name="alert_translate_none">Привіт, схоже, що ти використовуєш непідтримувану мову. Якщо ти володієш англійською і рідною мовою і бажаєш допомогти з перекладом, натисни тут:</string>
     <string name="button_translate">Переклад</string>
     <string name="httpError">Мережева помилка</string>
     <string name="httpErrorAuth">Аутентифікація була невдалою.</string>
-    <string name="httpErrorProxyAuth">Аутентифікаціячерез проксі-сервер була невдалою.</string>
+    <string name="httpErrorProxyAuth">Аутентифікація через проксі-сервер була невдалою.</string>
     <string name="httpErrorConnect">З\'єднання з сервером бело невдалим</string>
     <string name="httpErrorIO">Сервер не відповідаю. Спробуйте пізніше.</string>
     <string name="httpErrorTimeout">Приєднання до сервера протерміноване</string>
@@ -48,14 +48,17 @@
     <string name="keyguard_password_enter_password_code">Введіть пароль для розблокування</string>
     <string name="keyguard_password_enter_pin_password_code">Введіть ПІН для розблокування</string>
     <string name="lockscreen_password_wrong">Вибачте. Спробуйте ще</string>
+    <string name="whichApplication">Завершіть дію, використовуючи</string>
     <string name="noApplications">Відсутні програми, здатні виконати дію</string>
-    <string name="report">Звітність</string>
+    <string name="report">Звіт</string>
     <string name="sim_restart_button">Перезапуск</string>
     <string name="extmedia_format_button_format">Формат</string>
     <string name="ext_media_nofs_notification_message">Накопичувач чистий або файлова система не підтримується</string>
-    <string name="ime_action_go">Йти</string>
+    <string name="activity_list_empty">Не знайдено схожого</string>
+    <string name="ime_action_go">Перейти</string>
     <string name="ime_action_send">Надіслати</string>
     <string name="ime_action_done">Готово</string>
+    <string name="ime_action_default">Виконати</string>
     <string name="upload_file">Вибрані файли</string>
     <string name="no_file_chosen">Файли не вибрані</string>
     <string name="reset">Скинути</string>
@@ -71,5 +74,18 @@
     <string name="storage_usb">USB накопичувач</string>
     <string name="extract_edit_menu_button">Редагувати</string>
     <string name="activity_chooser_view_see_all">Відкрити все</string>
-
-</resources>
\ No newline at end of file
+    <string name="s_title_picker">Будь-ласка, виберіть директорію</string>
+    <string name="selected_path">Вибраний шлях</string>
+    <string name="filename">Ім\'я файлу</string>
+    <string name="s_msg_saved">збережено</string>
+    <string name="s_menu_view_line_numbers">Лінійні номери</string>
+    <string name="s_menu_new_file">Новий текстовий файл</string>
+    <string name="s_msg_created">створено</string>
+    <string name="s_title_newfile">Новий файл</string>
+    <string name="s_alert_newfile_folder">Створіть новий файл в:</string>
+    <string name="s_alert_newfile">Назвіть новий файл:</string>
+    <string name="s_alert_exit">Ви впевнені, що хочете вийти?</string>
+    <string name="s_alert_clipboard">Скопійовано в буфер</string>
+    <string name="s_alert_restart">Рестарт. Будь-ласка зачекайте.</string>
+    <string name="language">Мова</string>
+</resources>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
new file mode 100755
index 00000000..84eb18d1
--- /dev/null
+++ b/res/values-zh/strings.xml
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+    <string name="app_name">開源瀏覽器</string>
+    <string name="s_photos">相片</string>
+    <string name="s_videos">影像</string>
+    <string name="s_music">音樂</string>
+    <string name="s_downloads">下載</string>
+    <string name="s_external">外置</string>
+    <string name="s_internal">內置</string>
+    <string name="s_view">檢視</string>
+    <string name="s_bookmarks">書籤</string>
+    <string name="s_menu_favorites">切換書籤</string>
+    <string name="s_menu_sort">排序</string>
+    <string name="s_menu_sort_name_asc">以名稱排序(A-Z)</string>
+    <string name="s_menu_sort_name_desc">以名稱排序(Z-A)</string>
+    <string name="s_menu_sort_date_asc">由新至舊</string>
+    <string name="s_menu_sort_date_desc">由舊至新</string>
+    <string name="s_menu_sort_size_asc">大檔案優先排序</string>
+    <string name="s_menu_sort_size_desc">小檔案優先排序</string>
+    <string name="s_menu_sort_type">檔案類型排序</string>
+    <string name="s_menu_multi">多重選取</string>
+    <string name="s_menu_grid">以大圖示顯示</string>
+    <string name="s_menu_list">以檔名清單顯示</string>
+    <string name="s_menu_carousel">轉盤式</string>
+    <string name="s_menu_hidden">顯示隱藏檔</string>
+    <string name="s_menu_thumbs">顯示縮圖</string>
+    <string name="s_menu_new_folder">新資料夾</string>
+    <string name="s_menu_other">其它設定</string>
+    <string name="s_menu_flush">清空暫存區</string>
+    <string name="s_menu_root">最高權限</string>
+    <string name="s_menu_prefs_folder">檔案夾設定</string>
+    <string name="s_menu_prefs_global">全域設定</string>
+    <string name="s_menu_info">相關資料</string>
+    <string name="s_menu_copy">複製</string>
+    <string name="s_menu_cut">剪下</string>
+    <string name="s_menu_paste">貼上</string>
+    <string name="s_menu_delete">刪除</string>
+    <string name="s_menu_share">傳送/共用...</string>
+    <string name="s_menu_zip">壓縮(多個)檔案...</string>
+    <string name="s_menu_unzip">解壓縮...</string>
+    <string name="s_menu_rename">重新命名</string>
+    <string name="s_menu_bookmark">加入書籤</string>
+    <string name="s_save">儲存</string>
+    <string name="s_saveas">另存新檔...</string>
+    <string name="s_cancel">取消</string>
+    <string name="s_size">大小</string>
+    <string name="s_none">無</string>
+    <string name="s_pref_servers">其它伺服器</string>
+    <string name="s_pref_server_add">+ 新增伺服器</string>
+    <string name="s_pref_display">顯示的設定</string>
+    <string name="s_pref_hidden">顯示隱藏檔</string>
+    <string name="s_pref_hidden_summary">顯示隱藏檔及檔案夾</string>
+    <string name="s_pref_thumbs">顯示縮圖</string>
+    <string name="s_pref_thumbs_summary">顯示圖檔/影像檔/APP 縮圖</string>
+    <string name="s_pref_view">顯示模式</string>
+    <string name="s_pref_view_summary">將檔案以大圖示、清單列表、或轉盤式顯示</string>
+    <string name="s_pref_sort">排序</string>
+    <string name="s_pref_sort_summary">選擇如何排序檔案及檔案夾</string>
+    <string name="s_pref_advanced">進階</string>
+    <string name="s_pref_server_name">伺服器名稱</string>
+    <string name="s_pref_server_name_summary">輸入伺服器名稱</string>
+    <string name="s_pref_server_url">伺服器 URL</string>
+    <string name="s_pref_server_url_summary">輸入伺服器完整 URL</string>
+    <string name="s_pref_server_host">伺服器主機</string>
+    <string name="s_pref_server_user">使用者</string>
+    <string name="s_pref_server_user_summary">使用者名稱</string>
+    <string name="s_pref_server_password">密碼</string>
+    <string name="s_pref_server_password_summary">長密碼</string>
+    <string name="s_pref_server_path">子目錄</string>
+    <string name="s_pref_server_path_summary">輸入登入後預定路徑</string>
+    <string name="s_pref_server_extras">額外設定</string>
+    <string name="s_pref_server_update">新增/更新 伺服器</string>
+    <string name="s_pref_server_type">伺服器類型</string>
+    <string name="s_files">檔案</string>
+    <string name="s_create">建立</string>
+    <string name="s_title_holding_x_files" formatted="false">保持住 %s 檔案</string>
+    <string name="s_title_newfolder">新增檔案夾</string>
+    <string name="s_title_send">傳送 xxx</string>
+    <string name="s_title_unzip">解壓縮 xxx</string>
+    <string name="s_title_zip">壓縮 xxx</string>
+    <string name="s_title_executing">執行中</string>
+    <string name="s_title_deleting">刪除中</string>
+    <string name="s_title_searching">搜尋中</string>
+    <string name="s_title_moving">移動中</string>
+    <string name="s_title_copying">複製中</string>
+    <string name="s_title_zipping">壓縮中</string>
+    <string name="s_title_unzipping">解壓縮中</string>
+    <string name="s_title_wait">請稍等...</string>
+    <string name="s_alert_confirm_delete" formatted="false">刪除%s後將無法復原，確定要繼續嗎？</string>
+    <string name="s_alert_rename">請輸入新檔名</string>
+    <string name="s_alert_unzip" formatted="false">解壓縮%s至此或其它檔案夾？</string>
+    <string name="s_button_unzip_here">解壓縮至此處</string>
+    <string name="s_button_unzip_else">解壓縮至別處</string>
+    <string name="s_msg_none">檔案不可以是</string>
+    <string name="s_msg_some">某些檔案不可以</string>
+    <string name="s_msg_all">成功歸檔</string>
+    <string name="s_msg_deleted">已刪除</string>
+    <string name="s_msg_moved">已移出</string>
+    <string name="s_msg_copied">已複製</string>
+    <string name="s_remove">移動</string>
+    <string name="s_eject">跳出</string>
+    <string name="s_update">更新</string>
+    <string name="s_alert_bookmark_rename">改變書籤名稱</string>
+    <string name="s_title_bookmark_prefix">管理書籤：</string>
+    <string name="s_alert_remove_safe">現在可以安全地移除儲存媒體。</string>
+    <string name="s_alert_remove_error">無法跳出.</string>
+    <string name="s_menu_about">關於</string>
+    <string name="s_about_version">版本</string>
+    <string name="s_about_author">作者</string>
+    <string name="s_about_site">網站</string>
+    <string name="s_about_email">電子郵件</string>
+    <string name="s_about_recent">近期更新</string>
+    <string name="s_chooser_email">提交回覆...</string>
+    <string name="s_status_loading">載入中...</string>
+    <string name="s_menu_open">開啟...</string>
+    <string name="s_menu_edit">編輯...e</string>
+    <string name="s_pref_stats_title">幫忙改善 OpenExplorer</string>
+    <string name="s_pref_stats_summary">提交匿名使用統計資料，這將不會包含任何用來辨識使用者之資料。</string>
+    <string name="s_error_no_intents">沒有已安裝的程式可以讀取這種檔案。</string>
+    <string name="s_menu_root_disabled">最高權限 (Root) 已關閉</string>
+    <string name="s_pref_start">啟始檔案夾</string>
+    <string name="s_pref_start_summary">指示 OpenExplorer 該使用之啟始檔案夾</string>
+    <string name="s_custom">客製...</string>
+    <string name="s_text_intro_top">歡迎使用 OpenExplorer!</string>
+    <string name="s_text_intro_body">OpenExplorer 的目的是要讓您更有效的使用 Android 檔案以及雲端系統，無論您是否需要在多個不同地點管理您的影片及圖片，或是介由 FTP 遠端管理您的網頁伺服器，OpenExplorer 都將能滿足您的需求。\n\n請選擇您的啟使路逕：</string>
+    <string name="s_info_num_folders">檔案夾總數：</string>
+    <string name="s_info_num_files">檔案總數：</string>
+    <string name="s_info_last_modified">最近更新：</string>
+    <string name="s_info_permissions">檔案權限：</string>
+    <string name="s_info_permission_read">讀：</string>
+    <string name="s_info_permission_write">寫：</string>
+    <string name="s_info_permission_execute">執行：</string>
+    <string name="s_toggle_keyboard">鍵盤</string>
+    <string name="s_show_password">顯示密碼</string>
+    <string name="s_error_ftp">連接網路時產生錯誤</string>
+    <string name="s_prompt_zip">輸入新壓縮檔之檔名：</string>
+    <string name="app_edit">使用 OpenExplorer 編輯</string>
+    <string name="s_menu_more">更多選項</string>
+    <string name="s_msg_low_memory">記憶體過低！</string>
+    <string name="s_clear">清除</string>
+    <string name="s_menu_delete_all">全部刪除</string>
+    <string name="s_menu_move_all">移動至此</string>
+    <string name="s_menu_copy_all">複製至此</string>
+    <string name="s_confirm_delete" formatted="false">確定要刪除 %s？</string>
+    <string name="s_error_same_destination">目的檔案夾相同</string>
+    <string name="s_sample_notification">複製 -&gt; sdcard:  3 個檔案</string>
+    <string name="s_pref_fullscreen">全螢幕</string>
+    <string name="s_pref_fullscreen_summary_on">隱藏通知欄</string>
+    <string name="s_pref_fullscreen_summary_off">顯示通知欄</string>
+    <string name="s_pref_pagers">顯示整頁</string>
+    <string name="s_pref_pagers_summary_on">橫向滑動 = 瀏覽檔案夾</string>
+    <string name="s_pref_pagers_summary_off">橫向滑動已關閉</string>
+    <string name="s_alert_new_media">新儲存媒體已插入！</string>
+    <string name="s_warn_pager_title">新功能：</string>
+    <string name="s_warn_pager">由左滑動至右邊，可以進入上一個目錄；由右滑動至左邊，可以回去；這樣可以較方便遊走於各目錄間。試用看看吧！ (於外部儲存媒體上)</string>
+    <string name="s_warn_confirm">你瞭解了嗎？</string>
+    <string name="s_warn_disable">關閉</string>
+    <string name="s_pref_intent_internal">系統內部 Intents</string>
+    <string name="s_pref_intent_internal_on">使用 OpenExplorer Intent 管理</string>
+    <string name="s_pref_intent_internal_off">使用系統內置 Intent 管理</string>
+    <string name="s_pref_text_internal">使用內置文字編輯器</string>
+    <string name="s_text_editor_title">文字編輯器</string>
+    <string name="s_pref_show_root">顯示根目錄檔案</string>
+    <string name="s_pref_show_internal">顯示內置儲存媒體</string>
+    <string name="s_pref_show_external">顯示外部儲存媒體</string>
+    <string name="s_error_no_media">似乎沒有插入儲存媒體。請關閉USB分享或重新插入儲存媒體。</string>
+    <string name="s_prompt_password">輸入密碼</string>
+    <string name="s_add">增加</string>
+    <string name="s_server_ftp">FTP</string>
+    <string name="s_server_sftp">SFTP</string>
+    <string name="s_pref_server_port">Port (端口)</string>
+    <string name="s_about_buildtime">建立日期</string>
+    <string name="s_default">默認</string>
+    <string name="s_pref_timeout">逾時</string>
+    <string name="s_pref_timeout_summary">逾時（秒）</string>
+    <string name="s_menu_up">往上一層</string>
+    <string name="s_prompt_unzip">輸入解壓縮目的路徑：</string>
+    <string name="s_pref_hardware_accel">啟動硬體加速</string>
+    <string name="s_pref_honeyplus">Android 3.0 以上之設定</string>
+    <string name="s_pref_actionmode">操作模式</string>
+    <string name="s_pref_actionmode_enabled">使用操作模式</string>
+    <string name="s_pref_actionmode_disabled">使用標準相關選單</string>
+    <string name="s_server_smb">SMB/Windows</string>
+    <string name="s_bookmark_drives">裝置</string>
+    <string name="s_bookmark_smart">智慧型檔案夾</string>
+    <string name="s_bookmark_favorites">最愛的</string>
+    <string name="s_bookmark_servers">伺服器</string>
+    <string name="s_bookmark_cache">暫存區</string>
+    <string name="s_info_totalspace">總空間</string>
+    <string name="s_info_freespace">未使用空間</string>
+    <string name="s_status_rate">率： (* this may not be a good translation! it should depend on the context.)</string>
+    <string name="s_about_hardware">硬體</string>
+    <string name="s_menu_refresh">刷新檔案夾</string>
+    <string name="s_pref_reset">重設顯示</string>
+    <string name="s_toast_complete">操作完成！</string>
+    <string name="s_pref_reset_summary">按此以移除所有檔案夾顯示設定，回復默認設定。</string>
+    <string name="s_prompt_path">輸入路徑：</string>
+    <string name="s_prompt_search">搜尋：</string>
+    <string name="s_prompt_search_within">於...搜尋：</string>
+    <string name="s_pref_view_category">書籤顯示方式之設定</string>
+    <string name="s_pref_show_videos">顯示影像</string>
+    <string name="s_pref_show_photos">顯示圖片</string>
+    <string name="s_pref_show_music">顯示音樂</string>
+    <string name="s_pref_show_downloads">顯示下載</string>
+    <string name="s_hide">隱藏</string>
+    <string name="s_show">顯示</string>
+    <string name="s_msg_event_cancelled">事件已被取消。</string>
+    <string name="s_alert_newfolder_folder">於...新建檔案夾：</string>
+    <string name="s_pref_fancy_category">新奇顯示設定</string>
+    <string name="s_pref_fancy_menus">新奇選單</string>
+    <string name="s_pref_fancy_context">新奇關聯性選單</string>
+    <string name="s_search_files">於檔案系統中搜尋</string>
+    <string name="search_summary" formatted="false">Searching for \&quot; %s1 \&quot; within \&quot; %s2 \&quot; (%d)... ==&gt; 於 \&quot;%s2\&quot; (%d) 中搜尋 \&quot;%s1\&quot;...</string>
+    <string name="search_results" formatted="false">Found %d results for \&quot; %s1 \&quot; within \&quot; %s2 \&quot; ==&gt; 於 \&quot;%s2\&quot; 中找到 %d 個 \&quot;%s1\&quot;</string>
+    <string name="s_menu_exit">離開</string>
+    <string name="s_warn_wtf_message">糟糕！似乎發生了一個無法處理之錯誤！如同大多數測試版APP一樣無可避免產發生問題，但唯一能幫忙改善問題之方式就是能收到來自各種不同設備之錯誤報告，例如您的設備。所以方便允許我們向您蒐集錯誤報告 (不含您個人資料) 提交至開發者嗎？</string>
+    <string name="s_warn_wtf_ps">*** 請注意：本程式尚在測試階段。懇請不要因為一些程式之錯誤便留下壞評價，您如果覺得本程式實在無趣，煩請移除它，感謝！</string>
+    <string name="s_yes">是</string>
+    <string name="s_no">不是</string>
+    <string name="s_wtf_preview">預覽報告內容</string>
+    <string name="s_wtf_remember">將不再詢問</string>
+    <string name="s_pref_basebar">分割操作欄</string>
+    <string name="s_pref_basebar_on">直立式顯示時，操作按鈕置於螢幕底端</string>
+    <string name="s_pref_basebar_off">操作按鈕置於螢幕頂端 (當有適當時)</string>
+    <string name="s_pref_autowtf">自動提交程式錯誤報告</string>
+    <string name="s_pref_autowtf_summary">當一個沒有預先處理之錯誤發生時，自動提交報告。</string>
+    <string name="s_split_auto">自動</string>
+    <string name="s_split_top">迫使按鈕移至上層</string>
+    <string name="s_split_top_single">迫使單一按鈕移至上層</string>
+    <string name="s_split_bottom">迫使按鈕移至底層</string>
+    <string name="s_split_none">將所有按鈕放置於系統選單內</string>
+    <string name="s_about_screensize">螢幕大小</string>
+    <string name="s_about_density">密度</string>
+    <string name="s_menu_location_int">內部記憶體路徑</string>
+    <string name="s_menu_location_ext">外部記憶體路徑</string>
+    <string name="s_wtf_context">請描述程式錯誤之相關之內容</string>
+    <string name="thanks">感謝您！</string>
+    <string name="menu_view_font_small">小字型</string>
+    <string name="menu_view_font_medium">中字型</string>
+    <string name="menu_view_font_large">大字型</string>
+    <string name="app_description">Open Explorer - 開放源程式碼檔案管理員，適用於各種裝置！ (Tablets, Phones, Google TVs, sandwiches!)\n- 完整檔案系統管理\n- USB、SD 及其它外部儲存媒體\n- 可以經由多種網路方式連接 (FTP, SFTP, SMB/Samba/Windows/Lan/WIFI)\n- 文字編輯器\n- 智慧型檔案夾，可辨識各種不同類型之多媒體 (影像、照片、音樂及下載)\n- 整頁顯示方式瀏覽檔案夾 (向右滑動可移動至上一層檔案目錄)\n- 使用擁有 Superuser/Root 能力之裝置去顯示/讀取系統檔案 (尚未允許寫入系統檔案)\n\n開發中功能：\n- Tab 標籤頁式文字編輯器\n- 更多的連網能力 (Dropbox, Box.net, Sky drive)\n- 離線檔案結構暫存將暫時記住您於不同地方之檔案，而不需要再次連網\n- 檔案空間熱圖能顯示最大的檔案為何\n\n* 請注意：本程式尚在測試階段，可能仍存在些許錯誤。若您不願意經歷這些可能的錯誤，請勿下載使用本程式。如果您願意幫助我找出這些可能的錯誤，請寫 Email 告訴我，或是與我一起努力 (https://github.com/BrandoCommando/OpenExplorer/)。懇請您注意，在此留下壞評價並不將有任何幫助！</string>
+    <string name="alert_translate_google">您好，這是由谷歌翻譯翻譯。如果你不懂英語，以及為％s，並希望協助提供更好的翻譯，請點擊此按鈕：</string>
+    <string name="alert_translate_none" formatted="false">您好，看起來您似乎正在使用尚未支援之語言。您講英文及%s嗎？如果您願意幫助提供正確的翻譯，請按此：</string>
+    <string name="button_translate">翻譯</string>
+    <string name="httpError">發生網路錯誤。</string>
+    <string name="httpErrorAuth">認證不成功。</string>
+    <string name="httpErrorProxyAuth">經由代理伺服器之認證不成功。</string>
+    <string name="httpErrorConnect">無法連接至伺服器。</string>
+    <string name="httpErrorIO">無法與伺服器溝通，請稍後再試。</string>
+    <string name="httpErrorTimeout">與伺服器之網路連線已逾時。</string>
+    <string name="httpErrorFile">此檔案無法存取。</string>
+    <string name="httpErrorFileNotFound">找不到所請求的檔案。</string>
+    <string name="contentServiceSync">同步</string>
+    <string name="keyguard_password_enter_pin_code">輸入 PIN 碼</string>
+    <string name="keyguard_password_enter_password_code">輸入密碼以解鎖</string>
+    <string name="keyguard_password_enter_pin_password_code">輸入 PIN 以解鎖</string>
+    <string name="lockscreen_password_wrong">對不起，請重新再試</string>
+    <string name="whichApplication">使用...完成動作</string>
+    <string name="noApplications">沒有程式可以執行此動作</string>
+    <string name="report">報告</string>
+    <string name="sim_restart_button">重新開始</string>
+    <string name="extmedia_format_button_format">格式化</string>
+    <string name="ext_media_nofs_notification_message">USB 儲存媒體是空白或是不支援之檔案系統</string>
+    <string name="activity_list_empty">找無符合之操作</string>
+    <string name="ime_action_go">進行</string>
+    <string name="ime_action_send">提交</string>
+    <string name="ime_action_done">完成</string>
+    <string name="ime_action_default">執行</string>
+    <string name="upload_file">選擇檔案</string>
+    <string name="no_file_chosen">無檔案被選擇</string>
+    <string name="reset">重置</string>
+    <string name="back_button_label">返回</string>
+    <string name="next_button_label">下一個</string>
+    <string name="no_matches">無符合</string>
+    <string name="find_on_page">搜尋此頁</string>
+    <string name="find">搜尋</string>
+    <string name="activitychooserview_choose_application">選擇應用程式</string>
+    <string name="shareactionprovider_share_with">與...分享</string>
+    <string name="storage_internal">內置記憶體</string>
+    <string name="storage_sd_card">SD卡</string>
+    <string name="storage_usb">USB記憶體不小心卸載，是否能夠在下載？</string>
+    <string name="extract_edit_menu_button">編輯...</string>
+    <string name="activity_chooser_view_see_all">觀看所有...</string>
+    <string name="s_title_picker">請選擇檔案夾</string>
+    <string name="selected_path">所選擇路徑：</string>
+    <string name="filename">檔案名稱</string>
+    <string name="s_msg_saved">儲存完成</string>
+    <string name="s_menu_view_line_numbers">行號</string>
+    <string name="warn_text_editor">歡迎使用文件編輯器，請長按文字以進入編輯模式。</string>
+    <string name="warn_networking">歡迎使用網絡功能。請注意此功能仍在測試階段，因此可能存在各種程式錯誤。請不要在發生問題時，發出劣評。</string>
+    <string name="s_menu_new_file">新增文字檔案</string>
+    <string name="s_msg_created">新增完成</string>
+    <string name="s_title_newfile">新增檔案</string>
+    <string name="s_alert_newfile_folder">新增檔案至</string>
+    <string name="s_alert_newfile">請輸入新檔案名稱</string>
+    <string name="s_alert_exit">你確定要關閉程式嗎？</string>
+    <string name="s_alert_clipboard">複製至剪貼簿</string>
+    <string name="s_alert_restart">重新開始,請稍候片刻</string>
+    <string name="language">語言</string>
+    <string name="s_menu_download">下載</string>
+    <string name="scan">掃描</string>
+    <string name="test">測試</string>
+    <string name="test_success">連接成功！</string>
+    <string name="clipboard">剪貼簿</string>
+    <string name="theme">主題</string>
+    <string name="theme_dark">深色系使用者介面</string>
+    <string name="theme_light">淺色系使用者介面</string>
+    <string name="chooser_remember">記住我的選擇</string>
+    <string name="use_system">使用系統 &gt;&gt;</string>
+    <string name="activity_resolver_use_always">總是</string>
+    <string name="activity_resolver_use_once">僅一次</string>
+    <string name="s_pref_bookmarks_summary">顯示書籤</string>
+    <string name="s_menu_heatmap">熱圖</string>
+    <string name="apply_to_all">將使用於所有檔案夾？</string>
+    <string name="s_pref_view_folders">檔案夾設定</string>
+    <string name="s_pref_view_general">一般設定</string>
+    <string name="s_pref_text_wrap">包覆式文字</string>
+    <string name="s_pref_thumbs_crop">裁切/對齊中央 縮圖</string>
+    <string name="s_pref_thumbs_cache_clear">清除縮圖暫存區</string>
+    <string name="s_msg_folder_none">無法建立檔案夾</string>
+    <string name="msg_nook_donate2">親愛的的用户你好！我希望你享受這套軟體打開資源管理器。我已经盡我最難以確保高的與努克設備的兼容性。由與最近的捐款，我是能够購買Nook Color的！謝謝所有捐贈的人！\n\n接下来，我想能夠買新一代角落HD設備。\n\n如果你有發現有用的應用程序，請考慮捐贈，通過選擇下面的按鈕，或通過認證捐款“捐”菜單選項。謝謝你的安裝，快樂的發覺！</string>
+    <string name="msg_bb_donate">黑莓的用户您好！我希望你可以打开资源管理器。我已经盡我最難保證與BlackBerry設備的高兼容性。然而，似乎有一定的差异，难以处理没有实际的BlackBerry设备。出于这个原因，我想收集到足够的捐款，以购买黑莓10设备，以提高兼容性。如果您发现有用的应用程序，请考虑捐赠，通过选择下面的按钮，或通过激活“捐”菜单选项。谢谢你，快乐的使用！</string>
+    <string name="s_privacy">隱私政策</string>
+    <string name="s_menu_system_mount">使系统可寫</string>
+    <string name="s_menu_system_mount_on">系统可寫</string>
+    <string name="s_menu_system_mount_off">系统只讀</string>
+    <string name="s_alert_destination_exists">目標已經存在。你會想做什麼？</string>
+    <string name="s_overwrite">覆蓋</string>
+    <string name="s_msg_file_exists">有些目標文件可能已經存在。點擊“確定”覆蓋？</string>
+    <string name="s_title_file_exists">文件已存在。有儲存我的檔案 ，無法開瀏覽器</string>
+    <string name="s_msg_pref_archives">你想浏览或提取存档？如果重新提取？</string>
+    <string name="s_browse">瀏覽</string>
+    <string name="s_title_archive_handler">歸檔處理程序</string>
+    <string name="s_ask_again">每次都詢問</string>
+    <string name="s_archives">檔案</string>
+    <string name="s_compress">壓縮</string>
+    <string name="s_compress_type">壓縮類型</string>
+    <string name="s_compressed">壓縮</string>
+    <string name="s_delete_after">完成後刪除源</string>
+    <string name="s_master_pass">主密码</string>
+    <string name="s_master_pass_warning">你可以輸入一個主密碼，使用任何存儲密碼的加密密鑰。如果你離開這個頁面，密碼將被加密，並且将使用默認的主密碼。請注意，如果你更新你的密嘛碼保存的網路密碼，您将可能需要重置密碼後重置密碼和驗證雲服务\n務器。</string>
+    <string name="s_pass_old">输入旧密码：0925889809</string>
+    <string name="s_pass_new">输入新密码：zxcvbn</string>
+    <string name="s_authenticate">認證</string>
+    <string name="s_authenticating">驗證</string>
+    <string name="s_bookmark_history">歷史</string>
+    <string name="s_server_account_title">帐号：</string>
+    <string name="s_authenticate_success">認證成功</string>
+    <string name="s_authenticate_refresh">刷新驗證</string>
+    <string name="s_pref_thumbs_cache">預緩存縮略圖</string>
+    <string name="s_pref_thumbs_cache_summary">這將有助於加快加載包含圖片和影片的文件夾。</string>
+    <string name="s_folders">文件夹  </string>
+    <string name="s_hidden">隱藏</string>
+    <string name="s_total">总计</string>
+    <string name="s_custom_account">自定义帐户</string>
+</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 93c44b4e..6680c955 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -165,5 +165,9 @@
         <item>GZip</item>
         <item>BZip2</item>
     </string-array>
+    <string-array name="file_types">
+        <item>@string/s_menu_new_folder</item>
+        <item>Text File (txt)</item>
+    </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cb7239a3..ab6139f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -92,6 +92,7 @@
     <string name="s_alert_confirm_delete">Deleting %s cannot be undone. Are you sure you want to continue?</string>
     <string name="s_alert_rename">Please type the new name this file</string>
     <string name="s_alert_newfolder">Type the name of the new folder:</string>
+    <string name="s_newfile_prompt">File Type</string>
     <string name="s_alert_unzip">Would you like to unzip %s here or some other folder?</string>
     <string name="s_button_unzip_here">Unzip here</string>
     <string name="s_button_unzip_else">Unzip elsewhere…</string>
@@ -311,7 +312,7 @@
     <string name="s_pref_text_max_size">Maximum Editable Text Filesize</string>
     <string name="warn_text_editor">Welcome to Text Editor. Please long press the text to enter Edit mode.</string>
     <string name="warn_networking">Welcome to Networking. Please note that this feature is still under development and may contain bugs. Please do not give a bad market rating if you find any of these bugs.</string>
-    <string name="s_menu_new_file">New Text File</string>
+    <string name="s_menu_new_file">New File/Folder</string>
     <string name="s_msg_created">created</string>
     <string name="s_title_newfile">New File</string>
     <string name="s_alert_newfile_folder">Create new file in:</string>
@@ -439,5 +440,8 @@
     <string name="s_pref_cloud_key">OAuth client Key override</string>
     <string name="s_pref_cloud_secret">OAuth client Secret override</string>
     
+    <string name="s_title_uploading">Uploading</string>
+    <string name="s_title_downloading">Downloading</string>
+    
 
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 569f31a8..3f2ec564 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -30,7 +30,7 @@
         <!-- Action Mode icons -->
         <item name="actionIconClipboard">@drawable/ic_menu_clipboard</item>
         <item name="actionIconClipboardChecked">@drawable/ic_menu_clipboard_checked</item>
-        <item name="actionIconHomeUp">@drawable/ic_ab_back_holo_dark</item>
+        <item name="actionIconHomeUp">@drawable/ic_drawer</item>
         <item name="actionIconRename">@drawable/ic_rename</item>
         <item name="actionIconPaste">@drawable/ic_action_paste_holo_dark</item>
         <item name="actionIconCopy">@drawable/ic_action_copy_holo_dark</item>
@@ -188,7 +188,7 @@
         <!-- Action Mode icons -->
         <item name="actionIconClipboard">@drawable/ic_menu_clipboard</item>
         <item name="actionIconClipboardChecked">@drawable/ic_menu_clipboard_checked</item>
-        <item name="actionIconHomeUp">@drawable/ic_ab_back_holo_dark</item>
+        <item name="actionIconHomeUp">@drawable/ic_drawer</item>
         <item name="actionIconRename">@drawable/ic_rename</item>
         <item name="actionIconPaste">@drawable/ic_action_paste_holo_dark</item>
         <item name="actionIconCopy">@drawable/ic_action_copy_holo_dark</item>
@@ -203,7 +203,7 @@
         <item name="checkboxButtonOff">@drawable/btn_check_off_holo_light</item>
         <item name="popupBackground">@drawable/contextmenu_square_gray</item>
         <item name="popupArrow">@drawable/contextmenu_arrow_gray</item>
-        <item name="pagerBackground">@drawable/ab_stacked_solid_light_holo</item>
+        <item name="pagerBackground">@color/darkGray</item>
         <item name="listDivider">@drawable/divider_horizontal_bright</item>
         <item name="listBackground">@drawable/list_background_light</item>
         <item name="listColumnBackground">@drawable/list_column_background_light</item>
@@ -319,7 +319,8 @@
     </style>
     
 
-    <style name="AppTheme.Dialog" parent="Theme.Sherlock.Dialog">
+    <style name="AppTheme.Dialog" parent="Theme.Sherlock.DialogWhenLarge">
+    
         <item name="absForceOverflow">true</item>
         <item name="vpiCirclePageIndicatorStyle">@style/Widget.CirclePageIndicator</item>
         <item name="vpiTitlePageIndicatorStyle">@style/Widget.TitlePageIndicator</item>
@@ -399,7 +400,7 @@
         
         <item name="dialog">0</item>
     </style>
-    <style name="AppTheme.Dialog.Light" parent="Theme.Sherlock.Light.Dialog">
+    <style name="AppTheme.Dialog.Light" parent="Theme.Sherlock.Light.DialogWhenLarge">
         <item name="absForceOverflow">true</item>
         <item name="vpiCirclePageIndicatorStyle">@style/Widget.CirclePageIndicator</item>
         <item name="vpiTitlePageIndicatorStyle">@style/Widget.TitlePageIndicator</item>
diff --git a/res/xml/mimetypes.xml b/res/xml/mimetypes.xml
index a39d5a05..532ce296 100644
--- a/res/xml/mimetypes.xml
+++ b/res/xml/mimetypes.xml
@@ -105,9 +105,15 @@
     <type
         extension=".zip"
         mimetype="application/zip" />
+    <type
+        extension=".cbz"
+        mimetype="application/zip" />
     <type
         extension=".rar"
         mimetype="application/rar" />
+    <type
+        extension=".cbr"
+        mimetype="application/rar" />
     <type
         extension=".gz"
         mimetype="application/gzip" /> <!-- NOT IN WEBKIT -->
diff --git a/src/com/box/androidlib/Box.java b/src/com/box/androidlib/Box.java
index badf7a2f..73e2fe00 100755
--- a/src/com/box/androidlib/Box.java
+++ b/src/com/box/androidlib/Box.java
@@ -250,43 +250,6 @@ public final void setApiKey(final String apiKey) {
         mApiKey = apiKey;
     }
 
-    /**
-     * This method is used in the authentication process. The ticket obtained from this method is used to generate an authentication page for the user to login.
-     * Executes API action get_ticket:
-     * {@link <a href="http://developers.box.net/w/page/12923936/ApiFunction_get_ticket">http://developers.box.net/w/page/12923936/ApiFunction_get_ticket</a>}
-     * 
-     * @param listener
-     *            The callback that will run
-     */
-    public final void getTicket(final GetTicketListener listener) {
-
-        new Thread() {
-
-            @Override
-            public void run() {
-                try {
-                    final TicketResponseParser response = BoxSynchronous.getInstance(mApiKey).getTicket();
-                    mHandler.post(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            listener.onComplete(response.getTicket(), response.getStatus());
-                        }
-                    });
-                }
-                catch (final IOException e) {
-                    mHandler.post(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            listener.onIOException(e);
-                        }
-                    });
-                }
-            }
-        }.start();
-    }
-
     /**
      * This method is used in the authorization process. You should call this method after the user has authorized oneself on the Box partner authentication
      * page. Executes API action get_auth_token:
@@ -304,7 +267,7 @@ public final void getAuthToken(final String ticket, final GetAuthTokenListener l
             @Override
             public void run() {
                 try {
-                    final UserResponseParser response = BoxSynchronous.getInstance(mApiKey).getAuthToken(ticket);
+                    final UserResponseParser response = BoxSynchronous.getInstance(mApiKey).getAuthToken();
                     mHandler.post(new Runnable() {
 
                         @Override
diff --git a/src/com/box/androidlib/BoxConfig.java b/src/com/box/androidlib/BoxConfig.java
index de23d880..f7a74261 100644
--- a/src/com/box/androidlib/BoxConfig.java
+++ b/src/com/box/androidlib/BoxConfig.java
@@ -17,6 +17,7 @@
 import java.util.Locale;
 
 import org.apache.http.message.BasicNameValuePair;
+import org.brandroid.openmanager.activities.OpenExplorer;
 
 /**
  * Class for retrieving configuration parameters.
@@ -29,21 +30,21 @@ public final class BoxConfig {
     /** Default API url scheme. */
     private static final String API_URL_SCHEME = "https";
     /** Default API url authority. */
-    private static final String API_URL_AUTHORITY = "www.box.net";
+    private static final String API_URL_AUTHORITY = "www.box.com";
     /** Default API url path. */
-    private static final String API_URL_PATH = "/api/1.0/rest";
+    private static final String API_URL_PATH = "/api/2.0/";
 
     /** Default Upload url scheme. */
     private static final String UPLOAD_URL_SCHEME = "https";
     /** Default Upload url authority. */
-    private static final String UPLOAD_URL_AUTHORITY = "upload.box.net";
+    private static final String UPLOAD_URL_AUTHORITY = "www.box.com";
     /** Default Upload url path. */
-    private static final String UPLOAD_URL_PATH = "/api/1.0/";
+    private static final String UPLOAD_URL_PATH = "/api/2.0/";
 
     /** Default Download url scheme. */
     private static final String DOWNLOAD_URL_SCHEME = "https";
     /** Default Download url authority. */
-    private static final String DOWNLOAD_URL_AUTHORITY = "www.box.net";
+    private static final String DOWNLOAD_URL_AUTHORITY = "www.box.com";
     /** Default Download url path. */
     private static final String DOWNLOAD_URL_PATH = "/api/1.0/download/";
     /** Default User-Agent String. */
@@ -72,7 +73,7 @@ public final class BoxConfig {
     /** User-Agent String to use. */
     private String mUserAgent = USER_AGENT;
     /** Enable Http Logging Flag NEVER ENABLE HTTP LOGGIN FOR PRODUCTION BUILDS. */
-    private boolean mEnableHttpLogging = false;
+    private boolean mEnableHttpLogging = OpenExplorer.IS_DEBUG_BUILD;
 
     /** Time to wait before connection timeout. */
     private static int mConnectionTimout = 0;
diff --git a/src/com/box/androidlib/BoxConstants.java b/src/com/box/androidlib/BoxConstants.java
index 735871e6..d8be7ec0 100755
--- a/src/com/box/androidlib/BoxConstants.java
+++ b/src/com/box/androidlib/BoxConstants.java
@@ -33,6 +33,6 @@ private BoxConstants() {
      * {@link com.box.androidlib.Box#getTicket(com.box.androidlib.ResponseListeners.GetTicketListener)}
      * ) should be appended to the URL.
      */
-    public static final String LOGIN_URL = "https://m.box.net/api/1.0/auth/";
+    public static final String LOGIN_URL = "https://app.box.com/api/1.0/auth/";
 
 }
diff --git a/src/com/box/androidlib/BoxSynchronous.java b/src/com/box/androidlib/BoxSynchronous.java
index 7d627306..90c513cd 100644
--- a/src/com/box/androidlib/BoxSynchronous.java
+++ b/src/com/box/androidlib/BoxSynchronous.java
@@ -34,6 +34,7 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.apache.http.message.BasicNameValuePair;
+import org.brandroid.openmanager.util.PrivatePreferences;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -136,9 +137,11 @@ public final TicketResponseParser getTicket() throws IOException {
      * @throws IOException
      *             Can be thrown if there is no connection, or if some other connection problem exists.
      */
-    public final UserResponseParser getAuthToken(final String ticket) throws IOException {
+    public final UserResponseParser getAuthToken() throws IOException {
         final UserResponseParser parser = new UserResponseParser();
-        saxRequest(parser, BoxUriBuilder.getBuilder(mApiKey).appendQueryParameter("ticket", ticket).appendQueryParameter("action", "get_auth_token").build());
+        saxRequest(parser, BoxUriBuilder.getBuilder(mApiKey).appendPath("oauth2").appendPath("authorize")
+                .appendQueryParameter("response_type", "code")
+                .appendQueryParameter("client_id", PrivatePreferences.getBoxAPIKey()).build());
         return parser;
     }
 
diff --git a/src/com/dropbox/client2/android/AuthActivity.java b/src/com/dropbox/client2/android/AuthActivity.java
index cc3dff3d..512479e9 100644
--- a/src/com/dropbox/client2/android/AuthActivity.java
+++ b/src/com/dropbox/client2/android/AuthActivity.java
@@ -3,6 +3,7 @@
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
 
 import org.brandroid.utils.Logger;
 
@@ -261,13 +262,18 @@ private void startWebAuth() {
         startActivity(intent);
     }
     
-    public static String getConnectUrl(String consumerKey, String consumerSig)
+    public static String getConnectUrl(String consumerKey, String consumerSig, String state)
     {
         String path = "/connect";
+        
+        Locale locale = Locale.getDefault();
 
         String[] params = {
+                "locale", locale.getLanguage()+"_"+locale.getCountry(),
                 "k", consumerKey,
                 "s", consumerSig,
+                "api", null,
+                "state", state
         };
 
         String url = RESTUtility.buildURL("www.dropbox.com",
diff --git a/src/com/github/junrar/extract/ExtractArchive.java b/src/com/github/junrar/extract/ExtractArchive.java
index b5ff3941..24db7b41 100644
--- a/src/com/github/junrar/extract/ExtractArchive.java
+++ b/src/com/github/junrar/extract/ExtractArchive.java
@@ -5,7 +5,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.logging.Log;
+import org.brandroid.utils.Logger;
 
 import com.github.junrar.Archive;
 import com.github.junrar.exception.RarException;
@@ -19,9 +19,9 @@
  */
 public class ExtractArchive {
 
-	private Log logger;
+	private Logger logger;
 
-	public void setLogger(Log logger) {
+	public void setLogger(Logger logger) {
 		this.logger = logger;
 	}
 	
@@ -70,19 +70,19 @@ public void extractArchive(File archive, File destination) {
 	}
 
 	private void logWarn(String warning) {
-		if(logger!=null) logger.warn(warning);
+		if(logger!=null) logger.LogWarning(warning);
 	}
 
 	private void logInfo(String info) {
-		if(logger!=null) logger.info(info);
+		if(logger!=null) logger.LogInfo(info);
 	}
 
 	private void logError(Exception e, String errorMessage) {
-		if(logger!=null) logger.error(errorMessage, e);
+		if(logger!=null) logger.LogError(errorMessage, e);
 	}
 
 	private void logError(Exception e) {
-		if(logger!=null) logger.error(e);
+		if(logger!=null) logger.LogError(e.getMessage(), e);
 	}
 
 	private File createFile(FileHeader fh, File destination) {
diff --git a/src/com/stericson/RootTools/Constants.java b/src/com/stericson/RootTools/Constants.java
new file mode 100644
index 00000000..dd6dae1c
--- /dev/null
+++ b/src/com/stericson/RootTools/Constants.java
@@ -0,0 +1,13 @@
+package com.stericson.RootTools;
+
+public class Constants
+{
+    public static final String TAG = "Root";
+    public static final int FPS = 1;
+    public static final int IAG = 2;
+    public static final int BBA = 3;
+    public static final int BBV = 4;
+    public static final int GI = 5;
+    public static final int GS = 6;
+    public static final int GSYM = 7;
+}
diff --git a/src/com/stericson/RootTools/RootTools.java b/src/com/stericson/RootTools/RootTools.java
index ffb1bc00..3259cb54 100644
--- a/src/com/stericson/RootTools/RootTools.java
+++ b/src/com/stericson/RootTools/RootTools.java
@@ -29,7 +29,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 
-import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.utils.Logger;
 
 import android.app.Activity;
@@ -37,55 +36,80 @@
 import android.content.Intent;
 import android.util.Log;
 
-public class RootTools {
+import com.stericson.RootTools.containers.Mount;
+import com.stericson.RootTools.containers.Permissions;
+import com.stericson.RootTools.containers.Symlink;
+import com.stericson.RootTools.exceptions.RootDeniedException;
+import com.stericson.RootTools.exceptions.RootToolsException;
+import com.stericson.RootTools.execution.Command;
+import com.stericson.RootTools.execution.Executer;
+import com.stericson.RootTools.execution.IResult;
+import com.stericson.RootTools.execution.Shell;
+import com.stericson.RootTools.internal.Remounter;
+import com.stericson.RootTools.internal.RootToolsInternalMethods;
+import com.stericson.RootTools.internal.Runner;
+
+public final class RootTools {
 
     /**
-     * This class is the gateway to every functionality within the RootTools
-     * library.The developer should only have access to this class and this
-     * class only.This means that this class should be the only one to be
-     * public.The rest of the classes within this library must not have the
-     * public modifier. All methods and Variables that the developer may need to
-     * have access to should be here. If a method, or a specific functionality,
-     * requires a fair amount of code, or work to be done, then that
-     * functionality should probably be moved to its own class and the call to
-     * it done here.For examples of this being done, look at the remount
-     * functionality.
+     * This class is the gateway to every functionality within the RootTools library.The developer
+     * should only have access to this class and this class only.This means that this class should
+     * be the only one to be public.The rest of the classes within this library must not have the
+     * public modifier.
+     * 
+     * All methods and Variables that the developer may need to have access to should be here.
+     * 
+     * If a method, or a specific functionality, requires a fair amount of code, or work to be done,
+     * then that functionality should probably be moved to its own class and the call to it done
+     * here.For examples of this being done, look at the remount functionality.
      */
 
+	private static RootToolsInternalMethods rim = null;
+	
+	public static void setRim(RootToolsInternalMethods rim) {
+		RootTools.rim = rim;
+	}
+	
+	private static final RootToolsInternalMethods getInternals() {
+		if (rim == null) {
+			RootToolsInternalMethods.getInstance();
+			return rim;
+		} else {
+			return rim;
+		}
+	}
+	
     // --------------------
     // # Public Variables #
     // --------------------
 
-    public static boolean debugMode = OpenExplorer.IS_DEBUG_BUILD && false;
+    public static boolean debugMode = true;
     public static List<String> lastFoundBinaryPaths = new ArrayList<String>();
     public static int lastExitCode;
     public static String utilPath;
-    public static Boolean access = null;
+    private static boolean accessRequested = false;
 
     /**
-     * You can use this to force sendshell to use a shell other than the
-     * deafult.
+     * You can use this to force sendshell to use a shell other than the deafult.
      */
     public static String customShell = "";
 
     /**
-     * Change this to a lower/higher setting to speed up/slow down shell
-     * commands if things are taking too long or you are having constant crashes
-     * or timeout exceptions.
+     * Change this to a lower/higher setting to speed up/slow down shell commands if things are
+     * taking too long or you are having constant crashes or timeout exceptions.
      */
     public static int shellDelay = 0;
 
     /**
-     * Many Functions here use root by default, but there may be times that you
-     * do not want them to use root. This can be useful when running a lot of
-     * commands at once. By default, if all of these functions are requesting
-     * root access then superuser will notify the user everytime that root is
-     * requested...this can lead to a flood of toast messages from superuser
-     * notifying the user that root access is being requested. Setting this to
-     * false will cause sendShell to not use root by default. So any commands
-     * sent to the shell will not have root access unless specifically directed
-     * to obtain root access by you. Some commands will not work properly
-     * without root access, so use this with care.
+     * Many Functions here use root by default, but there may be times that you do not want them to
+     * use root. This can be useful when running a lot of commands at once. By default, if all of
+     * these functions are requesting root access then superuser will notify the user everytime that
+     * root is requested...this can lead to a flood of toast messages from superuser notifying the
+     * user that root access is being requested.
+     * 
+     * Setting this to false will cause sendShell to not use root by default. So any commands sent
+     * to the shell will not have root access unless specifically directed to obtain root access by
+     * you. Some commands will not work properly without root access, so use this with care.
      */
     public static boolean useRoot = true;
 
@@ -96,371 +120,526 @@ public class RootTools {
     // ------------------
     // # Public Methods #
     // ------------------
+    
+    public static boolean isAccessRequested() { return accessRequested; }
 
     /**
-     * This will check a given binary, determine if it exists and determine that
-     * it has either the permissions 755, 775, or 777.
+     * This will check a given binary, determine if it exists and determine that it has either the
+     * permissions 755, 775, or 777.
+     * 
      * 
-     * @param String Name of the utility to check.
-     * @return boolean to indicate whether the binary is installed and has
-     *         appropriate permissions.
+     * @param util
+     *            Name of the utility to check.
+     * 
+     * @return boolean to indicate whether the binary is installed and has appropriate permissions.
      */
     public static boolean checkUtil(String util) {
-
-        return InternalMethods.checkUtil(util);
+    	
+		return getInternals().checkUtil(util);
     }
 
     /**
      * This will close all open shells.
      * 
-     * @throws IOException
+     * @throws IOException 
+     *  
      */
-    public static void closeAllShells() throws IOException {
-        Shell.closeAll();
-        access = null;
+    public static void closeAllShells() throws IOException
+    {
+    	Shell.closeAll();
     }
 
     /**
      * This will close the custom shell that you opened.
      * 
-     * @throws IOException
+     * @throws IOException 
+     *  
      */
-    public static void closeCustomShell() throws IOException {
-        Shell.closeCustomShell();
+    public static void closeCustomShell() throws IOException
+    {
+		Shell.closeCustomShell();
     }
-
+    
     /**
-     * This will close either the root shell or the standard shell depending on
-     * what you specify.
+     * This will close either the root shell or the standard shell depending on what you specify.
      * 
-     * @param root a <code>boolean</code> to specify whether to close the root
-     *            shell or the standard shell.
-     * @throws IOException
+     * @param root
+     * 			a <code>boolean</code> to specify whether to close the root shell or the standard shell.
+     * 
+     * @throws IOException 
+     *  
      */
-    public static void closeShell(boolean root) throws IOException {
-        if (root)
-            Shell.closeRootShell();
-        else
-            Shell.closeShell();
+    public static void closeShell(boolean root) throws IOException
+    {
+    	if (root)
+    		Shell.closeRootShell();
+    	else
+    		Shell.closeShell();
     }
-
+    
     /**
-     * Copys a file to a destination. Because cp is not available on all android
-     * devices, we have a fallback on the cat command
+     * Copys a file to a destination. Because cp is not available on all android devices, we have a
+     * fallback on the cat command
      * 
-     * @param source example: /data/data/org.adaway/files/hosts
-     * @param destination example: /system/etc/hosts
-     * @param remountAsRw remounts the destination as read/write before writing
-     *            to it
-     * @param preserveFileAttributes tries to copy file attributes from source
-     *            to destination, if only cat is available only permissions are
-     *            preserved
+     * @param source
+     *            example: /data/data/org.adaway/files/hosts
+     * @param destination
+     *            example: /system/etc/hosts
+     * @param remountAsRw
+     *            remounts the destination as read/write before writing to it
+     * @param preserveFileAttributes
+     *            tries to copy file attributes from source to destination, if only cat is available
+     *            only permissions are preserved
      * @return true if it was successfully copied
      */
-    public static boolean copyFile(String source, String destination, boolean remountAsRw,
-            boolean preserveFileAttributes) {
-        return InternalMethods.copyFile(source, destination, remountAsRw, preserveFileAttributes);
+    public static boolean copyFile(String source, String destination, boolean remountAsRw, 
+    		boolean preserveFileAttributes) {
+        return getInternals().copyFile(source, destination, remountAsRw, preserveFileAttributes);
     }
 
     /**
-     * Use this to check whether or not a file exists on the filesystem.
-     * 
-     * @param file String that represent the file, including the full path to
-     *            the file and its name.
-     * @return a boolean that will indicate whether or not the file exists.
+     * Deletes a file or directory
+     *
+     * @param target
+     *          example: /data/data/org.adaway/files/hosts
+     * @param remountAsRw
+     *          remounts the destination as read/write before writing to it
+     * @return true if it was successfully deleted
      */
-    public static boolean exists(final String file) {
-        return InternalMethods.exists(file);
+    public boolean deleteFileOrDirectory(String target, boolean remountAsRw) {
+        return getInternals().deleteFileOrDirectory(target, remountAsRw);
     }
 
+	/**
+	 * Use this to check whether or not a file exists on the filesystem.
+	 * 
+	 * @param file
+	 *            String that represent the file, including the full path to the
+	 *            file and its name.
+	 * 
+	 * @return a boolean that will indicate whether or not the file exists.
+	 * 
+	 */
+	public static boolean exists(final String file)
+	{
+		return getInternals().exists(file);
+	}
+	
     /**
-     * This will try and fix a given binary. (This is for Busybox applets or
-     * Toolbox applets) By "fix", I mean it will try and symlink the binary from
-     * either toolbox or Busybox and fix the permissions if the permissions are
-     * not correct.
+     * This will try and fix a given binary. (This is for Busybox applets or Toolbox applets) By
+     * "fix", I mean it will try and symlink the binary from either toolbox or Busybox and fix the
+     * permissions if the permissions are not correct.
      * 
-     * @param String Name of the utility to fix.
-     * @param String path to the toolbox that provides ln, rm, and chmod. This
-     *            can be a blank string, a path to a binary that will provide
-     *            these, or you can use RootTools.getWorkingToolbox()
+     * @param util
+     *            Name of the utility to fix.
+     * @param utilPath
+     *            path to the toolbox that provides ln, rm, and chmod. This can be a blank string, a
+     *            path to a binary that will provide these, or you can use
+     *            RootTools.getWorkingToolbox()
      */
     public static void fixUtil(String util, String utilPath) {
-        InternalMethods.fixUtil(util, utilPath);
+    	getInternals().fixUtil(util, utilPath);
     }
-
+    
     /**
-     * This will check an array of binaries, determine if they exist and
-     * determine that it has either the permissions 755, 775, or 777. If an
-     * applet is not setup correctly it will try and fix it. (This is for
-     * Busybox applets or Toolbox applets)
+     * This will check an array of binaries, determine if they exist and determine that it has
+     * either the permissions 755, 775, or 777. If an applet is not setup correctly it will try and
+     * fix it. (This is for Busybox applets or Toolbox applets)
+     * 
+     * @param utils
+     *            Name of the utility to check.
      * 
-     * @param String Name of the utility to check.
-     * @throws Exception if the operation cannot be completed.
-     * @return boolean to indicate whether the operation completed. Note that
-     *         this is not indicative of whether the problem was fixed, just
-     *         that the method did not encounter any exceptions.
+     * @throws Exception
+     *             if the operation cannot be completed.
+     * 
+     * @return boolean to indicate whether the operation completed. Note that this is not indicative
+     *         of whether the problem was fixed, just that the method did not encounter any
+     *         exceptions.
      */
     public static boolean fixUtils(String[] utils) throws Exception {
-        return InternalMethods.fixUtils(utils);
+    	return getInternals().fixUtils(utils);
     }
-
+        
     /**
-     * @param binaryName String that represent the binary to find.
-     * @return <code>true</code> if the specified binary was found. Also, the
-     *         path the binary was found at can be retrieved via the variable
-     *         lastFoundBinaryPath, if the binary was found in more than one
-     *         location this will contain all of these locations.
+     * 
+     * @param binaryName
+     *            String that represent the binary to find.
+     * 
+     * @return <code>true</code> if the specified binary was found. Also, the path the binary was
+     *         found at can be retrieved via the variable lastFoundBinaryPath, if the binary was
+     *         found in more than one location this will contain all of these locations.
+     * 
      */
     public static boolean findBinary(String binaryName) {
-        return InternalMethods.findBinary(binaryName);
+    	return getInternals().findBinary(binaryName);
+    }
+    
+    /**
+     * @param path
+     *				String that represents the path to the Busybox binary you want to retrieve the version of.
+     *            
+     * @return BusyBox version is found, "" if not found.
+     */
+    public static String getBusyBoxVersion(String path) {
+        return getInternals().getBusyBoxVersion(path);
     }
 
     /**
      * @return BusyBox version is found, "" if not found.
      */
     public static String getBusyBoxVersion() {
-        return InternalMethods.getBusyBoxVersion();
+        return RootTools.getBusyBoxVersion("");
     }
 
     /**
-     * This will return an List of Strings. Each string represents an applet
-     * available from BusyBox.
+     * This will return an List of Strings. Each string represents an applet available from BusyBox.
      * <p/>
      * 
-     * @return <code>List<String></code> a List of strings representing the
-     *         applets available from Busybox.
-     * @throws Exception if we cannot return the applets available.
+     * @return <code>List<String></code> a List of strings representing the applets available from
+     *         Busybox.
+     *         
+     * @return <code>null</code> If we cannot return the list of applets.
+     * 
      */
     public static List<String> getBusyBoxApplets() throws Exception {
-        return InternalMethods.getBusyBoxApplets();
+        return RootTools.getBusyBoxApplets("");
     }
-
+    
     /**
-     * This will open or return, if one is already open, a custom shell, you are
-     * responsible for managing the shell, reading the output and for closing
-     * the shell when you are done using it.
+     * This will return an List of Strings. Each string represents an applet available from BusyBox.
+     * <p/>
+     * 
+     * @param path
+     *				Path to the busybox binary that you want the list of applets from.
+     *
+     * @return <code>List<String></code> a List of strings representing the applets available from
+     *         Busybox.
+     *         
+     * @return <code>null</code> If we cannot return the list of applets.
      * 
-     * @param shellPath a <code>String</code> to Indicate the path to the shell
-     *            that you want to open.
-     * @throws IOException
      */
-    public static Shell getCustomShell(String shellPath) throws IOException {
-        return Shell.startCustomShell(shellPath);
+    public static List<String> getBusyBoxApplets(String path) throws Exception {
+        return getInternals().getBusyBoxApplets(path);
     }
 
     /**
-     * @param file String that represent the file, including the full path to
-     *            the file and its name.
-     * @return An instance of the class permissions from which you can get the
-     *         permissions of the file or if the file could not be found or
-     *         permissions couldn't be determined then permissions will be null.
+     * This will open or return, if one is already open, a custom shell, you are responsible for managing the shell, reading the output
+     * and for closing the shell when you are done using it.
+     * 
+     * @param	shellPath
+     * 				a <code>String</code> to Indicate the path to the shell that you want to open.
+     * 
+     * @param	timeout
+     * 				an <code>int</code> to Indicate the length of time before giving up on opening a shell.
+     * 
+     * @throws	IOException 
+     * @throws TimeoutException 
+     * @throws RootDeniedException 
+     *  
+     */
+    public static Shell getCustomShell(String shellPath, int timeout) throws IOException, TimeoutException, RootDeniedException
+    {
+    	return Shell.startCustomShell(shellPath, timeout);
+    }
+    
+    /**
+     * This will open or return, if one is already open, a custom shell, you are responsible for managing the shell, reading the output
+     * and for closing the shell when you are done using it.
+     * 
+     * @param	shellPath
+     * 				a <code>String</code> to Indicate the path to the shell that you want to open.
+     * 
+     * @throws	IOException 
+     * @throws TimeoutException 
+     * @throws RootDeniedException 
+     *  
+     */
+    public static Shell getCustomShell(String shellPath) throws IOException, TimeoutException, RootDeniedException
+    {
+    	return RootTools.getCustomShell(shellPath, 10000);
+    }
+    
+    /**
+     * 
+     * @param file
+     *            String that represent the file, including the full path to the file and its name.
+     * 
+     * @return An instance of the class permissions from which you can get the permissions of the
+     *         file or if the file could not be found or permissions couldn't be determined then
+     *         permissions will be null.
+     * 
      */
     public static Permissions getFilePermissionsSymlinks(String file) {
-        return InternalMethods.getFilePermissionsSymlinks(file);
+		return getInternals().getFilePermissionsSymlinks(file);
     }
-
+    
     /**
-     * This method will return the inode number of a file. This method is
-     * dependent on having a version of ls that supports the -i parameter.
+     * This method will return the inode number of a file. This method is dependent on having a version of
+     * ls that supports the -i parameter. 
      * 
-     * @param String path to the file that you wish to return the inode number
-     * @return String The inode number for this file or "" if the inode number
-     *         could not be found.
+     *  @param file path to the file that you wish to return the inode number
+     *  
+     *  @return String The inode number for this file or "" if the inode number could not be found.
      */
-    public static String getInode(String file) {
-        return InternalMethods.getInode(file);
+    public static String getInode(String file)
+    {
+    	return getInternals().getInode(file);
     }
 
     /**
-     * This will return an ArrayList of the class Mount. The class mount
-     * contains the following property's: device mountPoint type flags
+     * This will return an ArrayList of the class Mount. The class mount contains the following
+     * property's: device mountPoint type flags
      * <p/>
-     * These will provide you with any information you need to work with the
-     * mount points.
+     * These will provide you with any information you need to work with the mount points.
      * 
      * @return <code>ArrayList<Mount></code> an ArrayList of the class Mount.
-     * @throws Exception if we cannot return the mount points.
+     * @throws Exception
+     *             if we cannot return the mount points.
      */
     public static ArrayList<Mount> getMounts() throws Exception {
-        return InternalMethods.getMounts();
+        return getInternals().getMounts();
     }
-
+    
     /**
      * This will tell you how the specified mount is mounted. rw, ro, etc...
      * <p/>
+     * @param path The mount you want to check
      * 
-     * @param The mount you want to check
      * @return <code>String</code> What the mount is mounted as.
-     * @throws Exception if we cannot determine how the mount is mounted.
+     * @throws Exception
+     *             if we cannot determine how the mount is mounted.
      */
     public static String getMountedAs(String path) throws Exception {
-        return InternalMethods.getMountedAs(path);
+        return getInternals().getMountedAs(path);
     }
-
+    
     /**
      * This will return the environment variable $PATH
      * 
-     * @return <code>Set<String></code> A Set of Strings representing the
-     *         environment variable $PATH
-     * @throws Exception if we cannot return the $PATH variable
+     * @return <code>Set<String></code> A Set of Strings representing the environment variable $PATH
+     * @throws Exception
+     *             if we cannot return the $PATH variable
      */
     public static Set<String> getPath() throws Exception {
-        return InternalMethods.getPath();
+        return getInternals().getPath();
     }
 
     /**
-     * This will open or return, if one is already open, a shell, you are
-     * responsible for managing the shell, reading the output and for closing
-     * the shell when you are done using it.
-     * 
-     * @param root a <code>boolean</code> to Indicate whether or not you want to
-     *            open a root shell or a standard shell
-     * @throws IOException
+     * This will open or return, if one is already open, a shell, you are responsible for managing the shell, reading the output
+     * and for closing the shell when you are done using it.
+     *
+     * @param	root
+     * 				a <code>boolean</code> to Indicate whether or not you want to open a root shell or a standard shell
+     *
+     * @param	timeout
+     * 				an <code>int</code> to Indicate the length of time to wait before giving up on opening a shell.
+     *
+     * @param   retry
+     *              a <code>int</code> to indicate how many times the ROOT shell should try to open with root priviliges...
+     *
+     * @throws	IOException
+     * @throws TimeoutException
+     * @throws RootDeniedException
+     *
      */
-    public static Shell getShell(boolean root) throws IOException {
-        if (root)
-            return Shell.startRootShell();
-        else
-            return Shell.startShell();
+    public static Shell getShell(boolean root, int timeout, int retry) throws IOException, TimeoutException, RootDeniedException
+    {
+    	if (root)
+    		return Shell.startRootShell(timeout);
+    	else
+    		return Shell.startShell(timeout);
     }
 
+    /**
+     * This will open or return, if one is already open, a shell, you are responsible for managing the shell, reading the output
+     * and for closing the shell when you are done using it.
+     * 
+     * @param	root
+     * 				a <code>boolean</code> to Indicate whether or not you want to open a root shell or a standard shell
+     * 
+     * @param	timeout
+     * 				an <code>int</code> to Indicate the length of time to wait before giving up on opening a shell.
+     * 
+     * @throws	IOException 
+     * @throws TimeoutException 
+     * @throws RootDeniedException 
+     *  
+     */
+    public static Shell getShell(boolean root, int timeout) throws IOException, TimeoutException, RootDeniedException
+    {
+    	return getShell(root, timeout, 3);
+    }
+    
+    /**
+     * This will open or return, if one is already open, a shell, you are responsible for managing the shell, reading the output
+     * and for closing the shell when you are done using it.
+     * 
+     * @param	root
+     * 				a <code>boolean</code> to Indicate whether or not you want to open a root shell or a standard shell
+     * 
+     * @throws	IOException 
+     * @throws TimeoutException 
+     * @throws RootDeniedException 
+     *  
+     */
+    public static Shell getShell(boolean root) throws IOException, TimeoutException, RootDeniedException
+    {
+    	return RootTools.getShell(root, 10000);
+    }
+    
     /**
      * Get the space for a desired partition.
      * 
-     * @param path The partition to find the space for.
-     * @return the amount if space found within the desired partition. If the
-     *         space was not found then the value is -1
+     * @param path
+     *            The partition to find the space for.
+     * @return the amount if space found within the desired partition. If the space was not found
+     *         then the value is -1
      * @throws TimeoutException
      */
     public static long getSpace(String path) {
-        return InternalMethods.getSpace(path);
+        return getInternals().getSpace(path);
     }
 
     /**
-     * This will return a String that represent the symlink for a specified
-     * file.
+     * This will return a String that represent the symlink for a specified file.
      * <p/>
      * 
-     * @param The path to the file to get the Symlink for. (must have absolute
-     *            path)
-     * @return <code>String</code> a String that represent the symlink for a
-     *         specified file or an empty string if no symlink exists.
+     * @param file
+     *            path to the file to get the Symlink for. (must have absolute path)
+     * 
+     * @return <code>String</code> a String that represent the symlink for a specified file or an
+     *         empty string if no symlink exists.
      */
     public static String getSymlink(String file) {
-        return InternalMethods.getSymlink(file);
+    	return getInternals().getSymlink(file);
     }
-
+    
     /**
-     * This will return an ArrayList of the class Symlink. The class Symlink
-     * contains the following property's: path SymplinkPath
+     * This will return an ArrayList of the class Symlink. The class Symlink contains the following
+     * property's: path SymplinkPath
      * <p/>
      * These will provide you with any Symlinks in the given path.
      * 
-     * @param The path to search for Symlinks.
+     * @param path
+     *            path to search for Symlinks.
+     * 
      * @return <code>ArrayList<Symlink></code> an ArrayList of the class Symlink.
-     * @throws Exception if we cannot return the Symlinks.
+     * @throws Exception
+     *             if we cannot return the Symlinks.
      */
     public static ArrayList<Symlink> getSymlinks(String path) throws Exception {
-        return InternalMethods.getSymlinks(path);
+    	return getInternals().getSymlinks(path);
     }
-
+    
     /**
-     * This will return to you a string to be used in your shell commands which
-     * will represent the valid working toolbox with correct permissions. For
-     * instance, if Busybox is available it will return "busybox", if busybox is
-     * not available but toolbox is then it will return "toolbox"
+     * This will return to you a string to be used in your shell commands which will represent the
+     * valid working toolbox with correct permissions. For instance, if Busybox is available it will
+     * return "busybox", if busybox is not available but toolbox is then it will return "toolbox"
      * 
-     * @return String that indicates the available toolbox to use for accessing
-     *         applets.
+     * @return String that indicates the available toolbox to use for accessing applets.
      */
     public static String getWorkingToolbox() {
-        return InternalMethods.getWorkingToolbox();
+        return getInternals().getWorkingToolbox();
     }
-
+    
     /**
      * Checks if there is enough Space on SDCard
      * 
-     * @param updateSize size to Check (long)
-     * @return <code>true</code> if the Update will fit on SDCard,
-     *         <code>false</code> if not enough space on SDCard. Will also
-     *         return <code>false</code>, if the SDCard is not mounted as
+     * @param updateSize
+     *            size to Check (long)
+     * @return <code>true</code> if the Update will fit on SDCard, <code>false</code> if not enough
+     *         space on SDCard. Will also return <code>false</code>, if the SDCard is not mounted as
      *         read/write
      */
     public static boolean hasEnoughSpaceOnSdCard(long updateSize) {
-        return InternalMethods.hasEnoughSpaceOnSdCard(updateSize);
+        return getInternals().hasEnoughSpaceOnSdCard(updateSize);
     }
 
     /**
      * Checks whether the toolbox or busybox binary contains a specific util
      * 
      * @param util
-     * @param box Should contain "toolbox" or "busybox"
+     * @param box
+     *            Should contain "toolbox" or "busybox"
      * @return true if it contains this util
      */
     public static boolean hasUtil(final String util, final String box) {
-        // TODO Convert this to use the new shell.
-        return InternalMethods.hasUtil(util, box);
+    	//TODO Convert this to use the new shell.
+    	return getInternals().hasUtil(util, box);
     }
 
     /**
-     * This method can be used to unpack a binary from the raw resources folder
-     * and store it in /data/data/app.package/files/ This is typically useful if
-     * you provide your own C- or C++-based binary. This binary can then be
-     * executed using sendShell() and its full path.
+     * This method can be used to unpack a binary from the raw resources folder and store it in
+     * /data/data/app.package/files/ This is typically useful if you provide your own C- or
+     * C++-based binary. This binary can then be executed using sendShell() and its full path.
      * 
-     * @param context the current activity's <code>Context</code>
-     * @param sourceId resource id; typically <code>R.raw.id</code>
-     * @param destName destination file name; appended to
-     *            /data/data/app.package/files/
-     * @param mode chmod value for this file
-     * @return a <code>boolean</code> which indicates whether or not we were
-     *         able to create the new file.
+     * @param context
+     *            the current activity's <code>Context</code>
+     * @param sourceId
+     *            resource id; typically <code>R.raw.id</code>
+     * @param destName
+     *            destination file name; appended to /data/data/app.package/files/
+     * @param mode
+     *            chmod value for this file
+     * @return a <code>boolean</code> which indicates whether or not we were able to create the new
+     *         file.
      */
     public static boolean installBinary(Context context, int sourceId, String destName, String mode) {
-        return InternalMethods.installBinary(context, sourceId, destName, mode);
+        return getInternals().installBinary(context, sourceId, destName, mode);
     }
 
     /**
-     * This method can be used to unpack a binary from the raw resources folder
-     * and store it in /data/data/app.package/files/ This is typically useful if
-     * you provide your own C- or C++-based binary. This binary can then be
-     * executed using sendShell() and its full path.
+     * This method can be used to unpack a binary from the raw resources folder and store it in
+     * /data/data/app.package/files/ This is typically useful if you provide your own C- or
+     * C++-based binary. This binary can then be executed using sendShell() and its full path.
      * 
-     * @param context the current activity's <code>Context</code>
-     * @param sourceId resource id; typically <code>R.raw.id</code>
-     * @param binaryName destination file name; appended to
-     *            /data/data/app.package/files/
-     * @return a <code>boolean</code> which indicates whether or not we were
-     *         able to create the new file.
+     * @param context
+     *            the current activity's <code>Context</code>
+     * @param sourceId
+     *            resource id; typically <code>R.raw.id</code>
+     * @param binaryName
+     *            destination file name; appended to /data/data/app.package/files/
+     * @return a <code>boolean</code> which indicates whether or not we were able to create the new
+     *         file.
      */
     public static boolean installBinary(Context context, int sourceId, String binaryName) {
         return installBinary(context, sourceId, binaryName, "700");
     }
+    
+    /**
+     * This will let you know if an applet is available from BusyBox
+     * <p/>
+     * 
+     * @param applet The applet to check for.
+     * @param path
+     *				Path to the busybox binary that you want to check. (do not include binary name)
+     * 
+     * @return <code>true</code> if applet is available, false otherwise.
+     */
+    public static boolean isAppletAvailable(String applet, String path) {
+        return getInternals().isAppletAvailable(applet, path);
+    }
 
     /**
      * This will let you know if an applet is available from BusyBox
      * <p/>
      * 
-     * @param <code>String</code> The applet to check for.
+     * @param applet The applet to check for.
+     * 
      * @return <code>true</code> if applet is available, false otherwise.
      */
-    public static boolean isAppletAvailable(String Applet) {
-        return InternalMethods.isAppletAvailable(Applet);
+    public static boolean isAppletAvailable(String applet) {
+        return RootTools.isAppletAvailable(applet, "");
     }
 
     /**
      * @return <code>true</code> if your app has been given root access.
-     * @throws TimeoutException if this operation times out. (cannot determine
-     *             if access is given)
+     * @throws TimeoutException
+     *             if this operation times out. (cannot determine if access is given)
      */
     public static boolean isAccessGiven() {
-        if (access == null)
-            access = InternalMethods.isAccessGiven();
-        return access;
-    }
-
-    public static boolean isAccessRequested() {
-        return access == null;
+        accessRequested = true;
+    	return getInternals().isAccessGiven();
     }
 
     /**
@@ -469,111 +648,119 @@ public static boolean isAccessRequested() {
     public static boolean isBusyboxAvailable() {
         return findBinary("busybox");
     }
-
+    
     public static boolean isNativeToolsReady(int nativeToolsId, Context context) {
-        return InternalMethods.isNativeToolsReady(nativeToolsId, context);
+    	return getInternals().isNativeToolsReady(nativeToolsId, context);
     }
-
+    
     /**
      * This method can be used to to check if a process is running
      * 
-     * @param processName name of process to check
+     * @param processName
+     *            name of process to check
      * @return <code>true</code> if process was found
-     * @throws TimeoutException (Could not determine if the process is running)
+     * @throws TimeoutException
+     *             (Could not determine if the process is running)
      */
     public static boolean isProcessRunning(final String processName) {
-        // TODO convert to new shell
-        return InternalMethods.isProcessRunning(processName);
+    	//TODO convert to new shell
+        return getInternals().isProcessRunning(processName);
     }
-
+    
     /**
      * @return <code>true</code> if su was found.
      */
     public static boolean isRootAvailable() {
         return findBinary("su");
     }
-
+    
     /**
      * This method can be used to kill a running process
      * 
-     * @param processName name of process to kill
+     * @param processName
+     *            name of process to kill
      * @return <code>true</code> if process was found and killed successfully
      */
     public static boolean killProcess(final String processName) {
-        // TODO convert to new shell
-        return InternalMethods.killProcess(processName);
+    	//TODO convert to new shell
+		return getInternals().killProcess(processName);
     }
-
+    
     /**
      * This will launch the Android market looking for BusyBox
      * 
-     * @param activity pass in your Activity
+     * @param activity
+     *            pass in your Activity
      */
     public static void offerBusyBox(Activity activity) {
-        InternalMethods.offerBusyBox(activity);
+        getInternals().offerBusyBox(activity);
     }
 
     /**
-     * This will launch the Android market looking for BusyBox, but will return
-     * the intent fired and starts the activity with startActivityForResult
+     * This will launch the Android market looking for BusyBox, but will return the intent fired and
+     * starts the activity with startActivityForResult
      * 
-     * @param activity pass in your Activity
-     * @param requestCode pass in the request code
+     * @param activity
+     *            pass in your Activity
+     * @param requestCode
+     *            pass in the request code
      * @return intent fired
      */
     public static Intent offerBusyBox(Activity activity, int requestCode) {
-        return InternalMethods.offerBusyBox(activity, requestCode);
+        return getInternals().offerBusyBox(activity, requestCode);
     }
 
     /**
      * This will launch the Android market looking for SuperUser
      * 
-     * @param activity pass in your Activity
+     * @param activity
+     *            pass in your Activity
      */
     public static void offerSuperUser(Activity activity) {
-        InternalMethods.offerSuperUser(activity);
+        getInternals().offerSuperUser(activity);
     }
 
     /**
-     * This will launch the Android market looking for SuperUser, but will
-     * return the intent fired and starts the activity with
-     * startActivityForResult
+     * This will launch the Android market looking for SuperUser, but will return the intent fired
+     * and starts the activity with startActivityForResult
      * 
-     * @param activity pass in your Activity
-     * @param requestCode pass in the request code
+     * @param activity
+     *            pass in your Activity
+     * @param requestCode
+     *            pass in the request code
      * @return intent fired
      */
     public static Intent offerSuperUser(Activity activity, int requestCode) {
-        return InternalMethods.offerSuperUser(activity, requestCode);
+        return getInternals().offerSuperUser(activity, requestCode);
     }
-
+    
     /**
-     * This will take a path, which can contain the file name as well, and
-     * attempt to remount the underlying partition.
+     * This will take a path, which can contain the file name as well, and attempt to remount the
+     * underlying partition.
      * <p/>
      * For example, passing in the following string:
-     * "/system/bin/some/directory/that/really/would/never/exist" will result in
-     * /system ultimately being remounted. However, keep in mind that the longer
-     * the path you supply, the more work this has to do, and the slower it will
-     * run.
+     * "/system/bin/some/directory/that/really/would/never/exist" will result in /system ultimately
+     * being remounted. However, keep in mind that the longer the path you supply, the more work
+     * this has to do, and the slower it will run.
      * 
-     * @param file file path
-     * @param mountType mount type: pass in RO (Read only) or RW (Read Write)
-     * @return a <code>boolean</code> which indicates whether or not the
-     *         partition has been remounted as specified.
+     * @param file
+     *            file path
+     * @param mountType
+     *            mount type: pass in RO (Read only) or RW (Read Write)
+     * @return a <code>boolean</code> which indicates whether or not the partition has been
+     *         remounted as specified.
      */
     public static boolean remount(String file, String mountType) {
-        // Recieved a request, get an instance of Remounter
+    	// Recieved a request, get an instance of Remounter
         Remounter remounter = new Remounter();
         // send the request.
         return (remounter.remount(file, mountType));
     }
 
     /**
-     * This restarts only Android OS without rebooting the whole device. This
-     * does NOT work on all devices. This is done by killing the main init
-     * process named zygote. Zygote is restarted automatically by Android after
-     * killing it.
+     * This restarts only Android OS without rebooting the whole device. This does NOT work on all
+     * devices. This is done by killing the main init process named zygote. Zygote is restarted
+     * automatically by Android after killing it.
      * 
      * @throws TimeoutException
      */
@@ -583,51 +770,60 @@ public static void restartAndroid() {
     }
 
     /**
-     * Executes binary in a separated process. Before using this method, the
-     * binary has to be installed in /data/data/app.package/files/ using the
-     * installBinary method.
+     * Executes binary in a separated process. Before using this method, the binary has to be
+     * installed in /data/data/app.package/files/ using the installBinary method.
      * 
-     * @param context the current activity's <code>Context</code>
-     * @param binaryName name of installed binary
-     * @param parameter parameter to append to binary like "-vxf"
+     * @param context
+     *            the current activity's <code>Context</code>
+     * @param binaryName
+     *            name of installed binary
+     * @param parameter
+     *            parameter to append to binary like "-vxf"
      */
     public static void runBinary(Context context, String binaryName, String parameter) {
-        Runner runner = new Runner(context, binaryName, parameter);
+		Runner runner = new Runner(context, binaryName, parameter);
         runner.start();
     }
 
     /**
-     * Executes a given command with root access or without depending on the
-     * value of the boolean passed. This will also start a root shell or a
-     * standard shell without you having to open it specifically. You will still
-     * need to close the shell after you are done using the shell.
+     * Executes a given command with root access or without depending on the value of the boolean passed.
+     * This will also start a root shell or a standard shell without you having to open it specifically.
      * 
-     * @param shell The shell to execute the command on, this can be a root
-     *            shell or a standard shell.
-     * @param command The command to execute in the shell
+     * You will still need to close the shell after you are done using the shell.
+     * 
+     * @param shell
+     *        	The shell to execute the command on, this can be a root shell or a standard shell.
+     *            
+     * @param command
+     *            The command to execute in the shell
+     *            
      * @throws IOException
      */
-    public static void runShellCommand(Shell shell, Command command) throws IOException {
-        shell.add(command);
-    }
-
+	public static void runShellCommand(Shell shell, Command command) throws IOException {
+		shell.add(command);
+	}
+	
     /**
      * Sends several shell command as su (attempts to)
      * 
-     * @param commands array of commands to send to the shell
-     * @param sleepTime time to sleep between each command, delay.
-     * @param result injected result object that implements the Result class
-     * @param timeout How long to wait before throwing TimeoutException,
-     *            sometimes when running root commands on certain devices or
-     *            roms ANR's may occur because a process never returns or
-     *            readline never returns. This allows you to protect your
-     *            application from throwing an ANR. if you pass -1, then the
-     *            default timeout is 5 minutes.
-     * @return a <code>LinkedList</code> containing each line that was returned
-     *         by the shell after executing or while trying to execute the given
-     *         commands. You must iterate over this list, it does not allow
-     *         random access, so no specifying an index of an item you want, not
-     *         like you're going to know that anyways.
+     * @param commands
+     *            array of commands to send to the shell
+     * @param sleepTime
+     *            time to sleep between each command, delay.
+     * @param result
+     *            injected result object that implements the Result class
+     * @param timeout
+     *            How long to wait before throwing TimeoutException, sometimes when running root
+     *            commands on certain devices or roms ANR's may occur because a process never
+     *            returns or readline never returns. This allows you to protect your application
+     *            from throwing an ANR.
+     * 
+     *            if you pass -1, then the default timeout is 5 minutes.
+     * 
+     * @return a <code>LinkedList</code> containing each line that was returned by the shell after
+     *         executing or while trying to execute the given commands. You must iterate over this
+     *         list, it does not allow random access, so no specifying an index of an item you want,
+     *         not like you're going to know that anyways.
      * @throws InterruptedException
      * @throws IOException
      * @throws TimeoutException
@@ -638,24 +834,31 @@ public static List<String> sendShell(String[] commands, int sleepTime, Result re
     }
 
     /**
-     * Sends several shell command as su (attempts to) if useRoot is true; as
-     * the current user (app_xxx) otherwise.
-     * 
-     * @param commands array of commands to send to the shell
-     * @param sleepTime time to sleep between each command, delay.
-     * @param result injected result object that implements the Result class
-     * @param useRoot whether to use root or not when issuing these commands.
-     * @param timeout How long to wait before throwing TimeoutException,
-     *            sometimes when running root commands on certain devices or
-     *            roms ANR's may occur because a process never returns or
-     *            readline never returns. This allows you to protect your
-     *            application from throwing an ANR. if you pass -1, then the
-     *            default timeout is 5 minutes.
-     * @return a <code>LinkedList</code> containing each line that was returned
-     *         by the shell after executing or while trying to execute the given
-     *         commands. You must iterate over this list, it does not allow
-     *         random access, so no specifying an index of an item you want, not
-     *         like you're going to know that anyways.
+     * Sends several shell command as su (attempts to) if useRoot is true; as the current user
+     * (app_xxx) otherwise.
+     * 
+     * @deprecated
+     * 
+     * @param commands
+     *            array of commands to send to the shell
+     * @param sleepTime
+     *            time to sleep between each command, delay.
+     * @param result
+     *            injected result object that implements the Result class
+     * @param useRoot
+     *            whether to use root or not when issuing these commands.
+     * @param timeout
+     *            How long to wait before throwing TimeoutException, sometimes when running root
+     *            commands on certain devices or roms ANR's may occur because a process never
+     *            returns or readline never returns. This allows you to protect your application
+     *            from throwing an ANR.
+     * 
+     *            if you pass -1, then the default timeout is 5 minutes.
+     * 
+     * @return a <code>LinkedList</code> containing each line that was returned by the shell after
+     *         executing or while trying to execute the given commands. You must iterate over this
+     *         list, it does not allow random access, so no specifying an index of an item you want,
+     *         not like you're going to know that anyways.
      * @throws InterruptedException
      * @throws IOException
      * @throws TimeoutException
@@ -668,19 +871,25 @@ public static List<String> sendShell(String[] commands, int sleepTime, Result re
     /**
      * Sends several shell command as su, unless useRoot is set to false
      * 
-     * @param commands array of commands to send to the shell
-     * @param sleepTime time to sleep between each command, delay.
-     * @param timeout How long to wait before throwing TimeoutException,
-     *            sometimes when running root commands on certain devices or
-     *            roms ANR's may occur because a process never returns or
-     *            readline never returns. This allows you to protect your
-     *            application from throwing an ANR. if you pass -1, then the
-     *            default timeout is 5 minutes.
-     * @return a LinkedList containing each line that was returned by the shell
-     *         after executing or while trying to execute the given commands.
-     *         You must iterate over this list, it does not allow random access,
-     *         so no specifying an index of an item you want, not like you're
-     *         going to know that anyways.
+     * @deprecated
+     * 
+     * @param commands
+     *            array of commands to send to the shell
+     * @param sleepTime
+     *            time to sleep between each command, delay.
+     * @param timeout
+     *            How long to wait before throwing TimeoutException, sometimes when running root
+     *            commands on certain devices or roms ANR's may occur because a process never
+     *            returns or readline never returns. This allows you to protect your application
+     *            from throwing an ANR.
+     * 
+     *            if you pass -1, then the default timeout is 5 minutes.
+     * 
+     * @return a LinkedList containing each line that was returned by the shell after executing or
+     *         while trying to execute the given commands. You must iterate over this list, it does
+     *         not allow random access, so no specifying an index of an item you want, not like
+     *         you're going to know that anyways.
+     * 
      * @throws InterruptedException
      * @throws IOException
      * @throws TimeoutException
@@ -693,19 +902,25 @@ public static List<String> sendShell(String[] commands, int sleepTime, int timeo
     /**
      * Sends one shell command as su, unless useRoot is set to false
      * 
-     * @param command command to send to the shell
-     * @param result injected result object that implements the Result class
-     * @param timeout How long to wait before throwing TimeoutException,
-     *            sometimes when running root commands on certain devices or
-     *            roms ANR's may occur because a process never returns or
-     *            readline never returns. This allows you to protect your
-     *            application from throwing an ANR. if you pass -1, then the
-     *            default timeout is 5 minutes.
-     * @return a <code>LinkedList</code> containing each line that was returned
-     *         by the shell after executing or while trying to execute the given
-     *         commands. You must iterate over this list, it does not allow
-     *         random access, so no specifying an index of an item you want, not
-     *         like you're going to know that anyways.
+     * @deprecated
+     * 
+     * @param command
+     *            command to send to the shell
+     * @param result
+     *            injected result object that implements the Result class
+     * @param timeout
+     *            How long to wait before throwing TimeoutException, sometimes when running root
+     *            commands on certain devices or roms ANR's may occur because a process never
+     *            returns or readline never returns. This allows you to protect your application
+     *            from throwing an ANR.
+     * 
+     *            if you pass -1, then the default timeout is 5 minutes.
+     * 
+     * @return a <code>LinkedList</code> containing each line that was returned by the shell after
+     *         executing or while trying to execute the given commands. You must iterate over this
+     *         list, it does not allow random access, so no specifying an index of an item you want,
+     *         not like you're going to know that anyways.
+     * 
      * @throws InterruptedException
      * @throws IOException
      * @throws RootToolsException
@@ -713,26 +928,28 @@ public static List<String> sendShell(String[] commands, int sleepTime, int timeo
      */
     public static List<String> sendShell(String command, Result result, int timeout)
             throws IOException, RootToolsException, TimeoutException {
-        return sendShell(new String[] {
-            command
-        }, 0, result, timeout);
+        return sendShell(new String[] { command }, 0, result, timeout);
     }
 
     /**
      * Sends one shell command as su, unless useRoot is set to false
      * 
-     * @param command command to send to the shell
-     * @param timeout How long to wait before throwing TimeoutException,
-     *            sometimes when running root commands on certain devices or
-     *            roms ANR's may occur because a process never returns or
-     *            readline never returns. This allows you to protect your
-     *            application from throwing an ANR. if you pass -1, then the
-     *            default timeout is 5 minutes.
-     * @return a LinkedList containing each line that was returned by the shell
-     *         after executing or while trying to execute the given commands.
-     *         You must iterate over this list, it does not allow random access,
-     *         so no specifying an index of an item you want, not like you're
-     *         going to know that anyways.
+     * @deprecated
+     * 
+     * @param command
+     *            command to send to the shell
+     * @param timeout
+     *            How long to wait before throwing TimeoutException, sometimes when running root
+     *            commands on certain devices or roms ANR's may occur because a process never
+     *            returns or readline never returns. This allows you to protect your application
+     *            from throwing an ANR.
+     * 
+     *            if you pass -1, then the default timeout is 5 minutes.
+     * 
+     * @return a LinkedList containing each line that was returned by the shell after executing or
+     *         while trying to execute the given commands. You must iterate over this list, it does
+     *         not allow random access, so no specifying an index of an item you want, not like
+     *         you're going to know that anyways.
      * @throws InterruptedException
      * @throws IOException
      * @throws TimeoutException
@@ -782,67 +999,111 @@ public int getError() {
             return error;
         }
     }
+    
 
     /**
-     * This method allows you to output debug messages only when debugging is
-     * on. This will allow you to add a debug option to your app, which by
-     * default can be left off for performance. However, when you need debugging
-     * information, a simple switch can enable it and provide you with detailed
-     * logging.
+     * This method allows you to output debug messages only when debugging is on. This will allow
+     * you to add a debug option to your app, which by default can be left off for performance.
+     * However, when you need debugging information, a simple switch can enable it and provide you
+     * with detailed logging.
      * <p/>
-     * This method handles whether or not to log the information you pass it
-     * depending whether or not RootTools.debugMode is on. So you can use this
-     * and not have to worry about handling it yourself.
-     * 
-     * @param TAG Optional parameter to define the tag that the Log will use.
-     * @param msg The message to output.
-     * @param type The type of log, 1 for verbose, 2 for error, 3 for debug
-     * @param exception The exception that was thrown (Needed for errors)
+     * This method handles whether or not to log the information you pass it depending whether or
+     * not RootTools.debugMode is on. So you can use this and not have to worry about handling it
+     * yourself.
+     *
+     * @param msg
+     *            The message to output.
      */
     public static void log(String msg) {
-        if(debugMode)
-            Logger.LogDebug("Root Tools: " + msg);
-        // log(null, msg, 3, null);
+        log(null, msg, 3, null);
     }
 
+    /**
+     * This method allows you to output debug messages only when debugging is on. This will allow
+     * you to add a debug option to your app, which by default can be left off for performance.
+     * However, when you need debugging information, a simple switch can enable it and provide you
+     * with detailed logging.
+     * <p/>
+     * This method handles whether or not to log the information you pass it depending whether or
+     * not RootTools.debugMode is on. So you can use this and not have to worry about handling it
+     * yourself.
+     *
+     * @param TAG
+     *            Optional parameter to define the tag that the Log will use.
+     * @param msg
+     *            The message to output.
+     *
+     */
     public static void log(String TAG, String msg) {
-        if(debugMode)
-            Logger.LogDebug("RootTools: " + TAG + ": " + msg);
-        // log(TAG, msg, 3, null);
+        log(TAG, msg, 3, null);
     }
 
+    /**
+     * This method allows you to output debug messages only when debugging is on. This will allow
+     * you to add a debug option to your app, which by default can be left off for performance.
+     * However, when you need debugging information, a simple switch can enable it and provide you
+     * with detailed logging.
+     * <p/>
+     * This method handles whether or not to log the information you pass it depending whether or
+     * not RootTools.debugMode is on. So you can use this and not have to worry about handling it
+     * yourself.
+     *
+     * @param msg
+     *            The message to output.
+     *
+     * @param type
+     * 			  The type of log, 1 for verbose, 2 for error, 3 for debug
+     *
+     * @param e
+     * 			  The exception that was thrown (Needed for errors)
+     */
     public static void log(String msg, int type, Exception e) {
-        if(!debugMode && type != 2) return;
-        if (type == 1)
-            Logger.LogVerbose("Root Tools: " + msg, e);
-        else if (type == 2)
-            Logger.LogError("Root Tools: " + msg, e);
-        else
-            Logger.LogDebug("Root Tools: " + msg, e);
-        // log(null, msg, type, e);
+        log(null, msg, type, e);
     }
 
+    /**
+     * This method allows you to output debug messages only when debugging is on. This will allow
+     * you to add a debug option to your app, which by default can be left off for performance.
+     * However, when you need debugging information, a simple switch can enable it and provide you
+     * with detailed logging.
+     * <p/>
+     * This method handles whether or not to log the information you pass it depending whether or
+     * not RootTools.debugMode is on. So you can use this and not have to worry about handling it
+     * yourself.
+     *
+     * @param TAG
+     *            Optional parameter to define the tag that the Log will use.
+     * @param msg
+     *            The message to output.
+     *
+     * @param type
+     * 			  The type of log, 1 for verbose, 2 for error, 3 for debug
+     *
+     * @param e
+     * 			  The exception that was thrown (Needed for errors)
+     */
     public static void log(String TAG, String msg, int type, Exception e) {
         if (msg != null && !msg.equals("")) {
             if (debugMode) {
                 if (TAG == null) {
-                    TAG = InternalVariables.TAG;
-                }
-
-                switch (type) {
-                    case 1:
-                        Logger.LogVerbose("Root Tools: (" + TAG + ") " + msg, e);
-                        // Log.v(TAG, msg);
-                        break;
-                    case 2:
-                        Logger.LogError("Root Tools: (" + TAG + ") " + msg, e);
-                        // Log.e(TAG, msg, e);
-                        break;
-                    case 3:
-                        Logger.LogDebug("Root Tools: (" + TAG + ") " + msg, e);
-                        // Log.d(TAG, msg);
-                        break;
+                	TAG = Constants.TAG;
                 }
+                
+            	switch (type)
+            	{
+            	case 1:
+                    Logger.LogVerbose(TAG + ": " + msg);
+                    break;
+            	case 2:
+                    Logger.LogError(TAG + ": " + msg, e);
+                    break;
+            	case 3:
+                    Logger.LogDebug(TAG + ": " + msg);
+                    break;
+            	default:
+            		Logger.LogDebug(TAG + ": " + msg);
+            		break;
+            	}
             }
         }
     }
diff --git a/src/com/stericson/RootTools/Shell.java b/src/com/stericson/RootTools/Shell.java
deleted file mode 100644
index 437798fc..00000000
--- a/src/com/stericson/RootTools/Shell.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/* 
- * This file is part of the RootTools Project: http://code.google.com/p/roottools/
- *  
- * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
- *  
- * This code is dual-licensed under the terms of the Apache License Version 2.0 and
- * the terms of the General Public License (GPL) Version 2.
- * You may use this code according to either of these licenses as is most appropriate
- * for your project on a case-by-case basis.
- * 
- * The terms of each license can be found in the root directory of this project's repository as well as at:
- * 
- * * http://www.apache.org/licenses/LICENSE-2.0
- * * http://www.gnu.org/licenses/gpl-2.0.txt
- *  
- * Unless required by applicable law or agreed to in writing, software
- * distributed under these Licenses is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See each License for the specific language governing permissions and
- * limitations under that License.
- */
-
-/*
- *Special thanks to Jeremy Lakeman for the following code and for teaching me something new.
- *
- *Stephen
- */
-
-package com.stericson.RootTools;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import android.os.SystemClock;
-
-public class Shell {
-	private final Process proc;
-	private final DataInputStream in;
-	private final DataOutputStream out;
-	private final List<Command> commands = new ArrayList<Command>();
-	private boolean close = false;
-	
-	private static final String token = "F*D^W@#FGF";
-	private static Shell rootShell = null;
-	private static Shell shell = null;
-	private static Shell customShell = null;
-
-	public static Shell getOpenShell()
-	{
-		if (customShell != null)
-			return customShell;
-		else if (rootShell != null)
-			return rootShell;
-		else
-			return shell;
-	}
-	
-	public static Shell startRootShell() throws IOException {
-		if (rootShell == null) {
-			RootTools.log("Starting Root Shell!");
-			String cmd = "su";
-			// keep prompting the user until they accept, we hit 10 retries, or
-			// the attempt fails quickly
-			int retries = 0;
-			while (rootShell == null) {
-				long start = SystemClock.elapsedRealtime();
-				try {
-					rootShell = new Shell(cmd);
-				} catch (IOException e) {
-					long delay = SystemClock.elapsedRealtime() - start;
-					if (delay < 500 || retries++ >= 2)
-					{
-						RootTools.log("IOException, could not start shell");
-						throw e;
-					}
-				}
-			}
-		}
-		else
-		{
-			RootTools.log("Using Existing Root Shell!");
-		}
-		
-		return rootShell;
-	}
-
-	public static Shell startCustomShell(String shellPath) throws IOException {
-		if (customShell == null) {
-			RootTools.log("Starting Custom Shell!");
-			customShell = new Shell(shellPath);
-		}
-		else
-			RootTools.log("Using Existing Custom Shell!");
-
-		return customShell;
-	}
-	
-	public static Shell startShell() throws IOException {
-		if (shell == null) {
-			RootTools.log("Starting Shell!");
-			shell = new Shell("/system/bin/sh");
-		}
-		else
-			RootTools.log("Using Existing Shell!");
-		return shell;
-	}
-
-	public static void runRootCommand(Command command) throws IOException {
-		startRootShell().add(command);
-	}
-
-	public static void runCommand(Command command) throws IOException {
-		startShell().add(command);
-	}
-
-	public static void closeCustomShell() throws IOException {
-		if (customShell == null)
-			return;
-		customShell.close();
-	}
-
-	public static void closeRootShell() throws IOException {
-		if (rootShell == null)
-			return;
-		rootShell.close();
-	}
-	
-	public static void closeShell() throws IOException {
-		if (shell == null)
-			return;
-		shell.close();
-	}
-
-	public static void closeAll() throws IOException
-	{
-		closeShell();
-		closeRootShell();
-		closeCustomShell();
-	}
-	
-	public static boolean isShellOpen()
-	{
-		if (shell == null)
-			return false;
-		else
-			return true;
-	}
-
-	public static boolean isCustomShellOpen()
-	{
-		if (customShell == null)
-			return false;
-		else
-			return true;
-	}
-
-	public static boolean isRootShellOpen()
-	{
-		if (rootShell == null)
-			return false;
-		else
-			return true;
-	}
-	
-	public static boolean isAnyShellOpen()
-	{
-		if (shell != null)
-			return true;
-		else if (rootShell != null)
-			return true;
-		else if (customShell != null)
-			return true;
-		else
-			return false;
-	}
-	
-	private Shell(String cmd) throws IOException {
-
-		RootTools.log("Starting shell: " + cmd);
-
-		proc = new ProcessBuilder(cmd).redirectErrorStream(true).start();
-		in = new DataInputStream(proc.getInputStream());
-		out = new DataOutputStream(proc.getOutputStream());
-
-		out.write("echo Started\n".getBytes());
-		out.flush();
-
-		while (true) {
-			String line = in.readLine();
-			if (line == null)
-				throw new EOFException();
-			if ("".equals(line))
-				continue;
-			if ("Started".equals(line))
-				break;
-
-			proc.destroy();
-			throw new IOException("Unable to start shell, unexpected output \""
-					+ line + "\"");
-		}
-
-		new Thread(input, "Shell Input").start();
-		new Thread(output, "Shell Output").start();
-	}
-
-	private Runnable input = new Runnable() {
-		public void run() {
-			try {
-				writeCommands();
-			} catch (IOException e) {
-				RootTools.log(e.getMessage(), 2, e);
-			}
-		}
-	};
-
-	private void writeCommands() throws IOException {
-		try {
-			int write = 0;
-			while (true) {
-				DataOutputStream out;
-				synchronized (commands) {
-					while (!close && write >= commands.size()) {
-						commands.wait();
-					}
-					out = this.out;
-				}
-				if (write < commands.size()) {
-					Command next = commands.get(write);
-					next.writeCommand(out);
-					String line = "\necho " + token + " " + write + " $?\n";
-					out.write(line.getBytes());
-					out.flush();
-					write++;
-				} else if (close) {
-					out.write("\nexit 0\n".getBytes());
-					out.flush();
-					out.close();
-					RootTools.log("Closing shell");
-					return;
-				}
-			}
-		} catch (InterruptedException e) {
-			RootTools.log(e.getMessage(), 2, e);
-		}
-	}
-
-	private Runnable output = new Runnable() {
-		public void run() {
-			try {
-				readOutput();
-			} catch (IOException e) {
-				RootTools.log(e.getMessage(), 2, e);
-			} catch (InterruptedException e) {
-				RootTools.log(e.getMessage(), 2, e);
-			}
-		}
-	};
-
-	private void readOutput() throws IOException, InterruptedException {
-		Command command = null;
-		int read = 0;
-		while (true) {
-			String line = in.readLine();
-
-			// terminate on EOF
-			if (line == null)
-				break;
-			
-			// Log.v("Shell", "Out; \"" + line + "\"");
-			if (command == null) {
-				if (read >= commands.size())
-				{
-					if (close)
-						break;
-					continue;
-				}
-				command = commands.get(read);
-			}
-
-			int pos = line.indexOf(token);
-			if (pos > 0)
-				command.output(command.id, line.substring(0, pos));
-			if (pos >= 0) {
-				line = line.substring(pos);
-				String fields[] = line.split(" ");
-				int id = Integer.parseInt(fields[1]);
-				if (id == read) {
-					command.setExitCode(Integer.parseInt(fields[2]));
-					read++;
-					command = null;
-					continue;
-				}
-			}
-			command.output(command.id, line);
-		}
-		RootTools.log("Read all output");
-		proc.waitFor();
-		proc.destroy();
-		RootTools.log("Shell destroyed");
-		
-		while (read < commands.size()) {
-			if (command == null)
-				command = commands.get(read);
-			command.terminated("Unexpected Termination.");
-			command = null;
-			read++;
-		}
-	}
-
-	public Command add(Command command) throws IOException {
-		if (close)
-			throw new IllegalStateException(
-					"Unable to add commands to a closed shell");
-		synchronized (commands) {
-			commands.add(command);
-			commands.notifyAll();
-		}
-		
-		return command;
-	}
-
-	public void close() throws IOException {
-		if (this == rootShell)
-			rootShell = null;
-		if (this == shell)
-			shell = null;
-		if (this == customShell)
-			customShell = null;
-		synchronized (commands) {
-			this.close = true;
-			commands.notifyAll();
-		}		
-	}
-
-	public int countCommands() {
-		return commands.size();
-	}
-	
-	public void waitFor() throws IOException, InterruptedException {
-		close();
-		if (commands.size() > 0)
-		{
-			Command command = commands.get(commands.size() - 1);
-			command.exitCode();
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/com/stericson/RootTools/containers/.svn/all-wcprops b/src/com/stericson/RootTools/containers/.svn/all-wcprops
new file mode 100644
index 00000000..ad34c77e
--- /dev/null
+++ b/src/com/stericson/RootTools/containers/.svn/all-wcprops
@@ -0,0 +1,23 @@
+K 25
+svn:wc:ra_dav:version-url
+V 99
+/svn/!svn/ver/232/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/containers
+END
+Mount.java
+K 25
+svn:wc:ra_dav:version-url
+V 110
+/svn/!svn/ver/232/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/containers/Mount.java
+END
+Symlink.java
+K 25
+svn:wc:ra_dav:version-url
+V 112
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/containers/Symlink.java
+END
+Permissions.java
+K 25
+svn:wc:ra_dav:version-url
+V 116
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/containers/Permissions.java
+END
diff --git a/src/com/stericson/RootTools/containers/.svn/entries b/src/com/stericson/RootTools/containers/.svn/entries
new file mode 100644
index 00000000..b719c990
--- /dev/null
+++ b/src/com/stericson/RootTools/containers/.svn/entries
@@ -0,0 +1,130 @@
+10
+
+dir
+249
+http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/containers
+http://roottools.googlecode.com/svn
+
+
+
+2013-02-14T03:55:31.156897Z
+232
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+326c17ea-325e-592a-0117-b1346ba49fde
+
+Mount.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+dd7d6231470ff5e53ec144588e267641
+2013-02-14T03:55:31.156897Z
+232
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2006
+
+Symlink.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+a69328e41c26c1bb6714a79802b3109e
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1447
+
+Permissions.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+cc18d537d419ca864bfda3ccfb063cab
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2593
+
diff --git a/src/com/stericson/RootTools/containers/.svn/text-base/Mount.java.svn-base b/src/com/stericson/RootTools/containers/.svn/text-base/Mount.java.svn-base
new file mode 100644
index 00000000..585087bf
--- /dev/null
+++ b/src/com/stericson/RootTools/containers/.svn/text-base/Mount.java.svn-base
@@ -0,0 +1,64 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.containers;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class Mount {
+    final File mDevice;
+    final File mMountPoint;
+    final String mType;
+    final Set<String> mFlags;
+
+    public Mount(File device, File path, String type, String flagsStr) {
+        mDevice = device;
+        mMountPoint = path;
+        mType = type;
+        mFlags = new LinkedHashSet<String>(Arrays.asList(flagsStr.split(",")));
+    }
+
+    public File getDevice() {
+        return mDevice;
+    }
+
+    public File getMountPoint() {
+        return mMountPoint;
+    }
+
+    public String getType() {
+        return mType;
+    }
+
+    public Set<String> getFlags() {
+        return mFlags;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s on %s type %s %s", mDevice, mMountPoint, mType, mFlags);
+    }
+}
diff --git a/src/com/stericson/RootTools/containers/.svn/text-base/Permissions.java.svn-base b/src/com/stericson/RootTools/containers/.svn/text-base/Permissions.java.svn-base
new file mode 100644
index 00000000..d9f14c00
--- /dev/null
+++ b/src/com/stericson/RootTools/containers/.svn/text-base/Permissions.java.svn-base
@@ -0,0 +1,124 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.containers;
+
+public class Permissions {
+	String type;
+	String user;
+	String group;
+	String other;
+	String symlink;
+	int permissions;
+
+	public String getSymlink()
+	{
+		return this.symlink;
+	}
+	
+	public String getType()
+	{
+		return type;
+	}
+	
+	public int getPermissions()
+	{
+		return this.permissions;
+	}
+	
+    public String getUserPermissions()
+    {
+    	return this.user;
+    }
+    
+    public String getGroupPermissions()
+    {
+    	return this.group;
+    }
+    
+    public String getOtherPermissions()
+    {
+    	return this.other;
+    }
+    
+    public void setSymlink(String symlink)
+    {
+    	this.symlink = symlink;
+    }
+    
+    public void setType(String type)
+    {
+    	this.type = type;
+    }
+    
+    public void setPermissions(int permissions)
+    {
+    	this.permissions = permissions;
+    }
+    
+    public void setUserPermissions(String user)
+    {
+    	this.user = user;
+    }
+    
+    public void setGroupPermissions(String group)
+    {
+    	this.group = group;
+    }
+    
+    public void setOtherPermissions(String other)
+    {
+    	this.other = other;
+    }
+
+	public String getUser()
+	{
+		return user;
+	}
+
+	public void setUser(String user)
+	{
+		this.user = user;
+	}
+
+	public String getGroup()
+	{
+		return group;
+	}
+
+	public void setGroup(String group)
+	{
+		this.group = group;
+	}
+
+	public String getOther()
+	{
+		return other;
+	}
+
+	public void setOther(String other)
+	{
+		this.other = other;
+	}
+    
+    
+}
diff --git a/src/com/stericson/RootTools/containers/.svn/text-base/Symlink.java.svn-base b/src/com/stericson/RootTools/containers/.svn/text-base/Symlink.java.svn-base
new file mode 100644
index 00000000..0162756b
--- /dev/null
+++ b/src/com/stericson/RootTools/containers/.svn/text-base/Symlink.java.svn-base
@@ -0,0 +1,43 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.containers;
+
+import java.io.File;
+
+public class Symlink {
+    protected final File file;
+    protected final File symlinkPath;
+
+    public Symlink(File file, File path) {
+        this.file = file;
+        symlinkPath = path;
+    }
+
+    public File getFile() {
+        return this.file;
+    }
+
+    public File getSymlinkPath() {
+        return symlinkPath;
+    }
+}
diff --git a/src/com/stericson/RootTools/Mount.java b/src/com/stericson/RootTools/containers/Mount.java
similarity index 82%
rename from src/com/stericson/RootTools/Mount.java
rename to src/com/stericson/RootTools/containers/Mount.java
index 62c5c5f3..585087bf 100644
--- a/src/com/stericson/RootTools/Mount.java
+++ b/src/com/stericson/RootTools/containers/Mount.java
@@ -20,24 +20,25 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.containers;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 public class Mount {
-    protected final File mDevice;
-    protected final File mMountPoint;
-    protected final String mType;
-    protected final Set<String> mFlags;
+    final File mDevice;
+    final File mMountPoint;
+    final String mType;
+    final Set<String> mFlags;
 
-    Mount(File device, File path, String type, String flagsStr) {
+    public Mount(File device, File path, String type, String flagsStr) {
         mDevice = device;
         mMountPoint = path;
         mType = type;
-        mFlags = new HashSet<String>(Arrays.asList(flagsStr.split(",")));
+        mFlags = new LinkedHashSet<String>(Arrays.asList(flagsStr.split(",")));
     }
 
     public File getDevice() {
diff --git a/src/com/stericson/RootTools/Permissions.java b/src/com/stericson/RootTools/containers/Permissions.java
similarity index 84%
rename from src/com/stericson/RootTools/Permissions.java
rename to src/com/stericson/RootTools/containers/Permissions.java
index 3cbdb541..d9f14c00 100644
--- a/src/com/stericson/RootTools/Permissions.java
+++ b/src/com/stericson/RootTools/containers/Permissions.java
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.containers;
 
 public class Permissions {
 	String type;
@@ -89,4 +89,36 @@ public void setOtherPermissions(String other)
     {
     	this.other = other;
     }
+
+	public String getUser()
+	{
+		return user;
+	}
+
+	public void setUser(String user)
+	{
+		this.user = user;
+	}
+
+	public String getGroup()
+	{
+		return group;
+	}
+
+	public void setGroup(String group)
+	{
+		this.group = group;
+	}
+
+	public String getOther()
+	{
+		return other;
+	}
+
+	public void setOther(String other)
+	{
+		this.other = other;
+	}
+    
+    
 }
diff --git a/src/com/stericson/RootTools/Symlink.java b/src/com/stericson/RootTools/containers/Symlink.java
similarity index 93%
rename from src/com/stericson/RootTools/Symlink.java
rename to src/com/stericson/RootTools/containers/Symlink.java
index ad57656e..0162756b 100644
--- a/src/com/stericson/RootTools/Symlink.java
+++ b/src/com/stericson/RootTools/containers/Symlink.java
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.containers;
 
 import java.io.File;
 
@@ -28,7 +28,7 @@ public class Symlink {
     protected final File file;
     protected final File symlinkPath;
 
-    Symlink(File file, File path) {
+    public Symlink(File file, File path) {
         this.file = file;
         symlinkPath = path;
     }
diff --git a/src/com/stericson/RootTools/exceptions/.svn/all-wcprops b/src/com/stericson/RootTools/exceptions/.svn/all-wcprops
new file mode 100644
index 00000000..c27c7236
--- /dev/null
+++ b/src/com/stericson/RootTools/exceptions/.svn/all-wcprops
@@ -0,0 +1,17 @@
+K 25
+svn:wc:ra_dav:version-url
+V 99
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/exceptions
+END
+RootToolsException.java
+K 25
+svn:wc:ra_dav:version-url
+V 123
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/exceptions/RootToolsException.java
+END
+RootDeniedException.java
+K 25
+svn:wc:ra_dav:version-url
+V 124
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/exceptions/RootDeniedException.java
+END
diff --git a/src/com/stericson/RootTools/exceptions/.svn/entries b/src/com/stericson/RootTools/exceptions/.svn/entries
new file mode 100644
index 00000000..63fa024e
--- /dev/null
+++ b/src/com/stericson/RootTools/exceptions/.svn/entries
@@ -0,0 +1,96 @@
+10
+
+dir
+249
+http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/exceptions
+http://roottools.googlecode.com/svn
+
+
+
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+326c17ea-325e-592a-0117-b1346ba49fde
+
+RootToolsException.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+ed9da4638143f8dbdced0a69fbb0a178
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1383
+
+RootDeniedException.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+329b8057a8dc12770b4c5f90836f4911
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1382
+
diff --git a/src/com/stericson/RootTools/exceptions/.svn/text-base/RootDeniedException.java.svn-base b/src/com/stericson/RootTools/exceptions/.svn/text-base/RootDeniedException.java.svn-base
new file mode 100644
index 00000000..d150e596
--- /dev/null
+++ b/src/com/stericson/RootTools/exceptions/.svn/text-base/RootDeniedException.java.svn-base
@@ -0,0 +1,36 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.exceptions;
+
+/**
+ * Developers may throw this exception from within their code
+ * when using IResult as a means to change the program flow.
+ */
+public class RootDeniedException extends Exception {
+
+	private static final long serialVersionUID = -8713947214162841310L;
+
+	public RootDeniedException(String error) {
+        super(error);
+    }
+}
diff --git a/src/com/stericson/RootTools/exceptions/.svn/text-base/RootToolsException.java.svn-base b/src/com/stericson/RootTools/exceptions/.svn/text-base/RootToolsException.java.svn-base
new file mode 100644
index 00000000..d9c06573
--- /dev/null
+++ b/src/com/stericson/RootTools/exceptions/.svn/text-base/RootToolsException.java.svn-base
@@ -0,0 +1,36 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.exceptions;
+
+/**
+ * Developers may throw this exception from within their code
+ * when using IResult as a means to change the program flow.
+ */
+public class RootToolsException extends Exception {
+
+    private static final long serialVersionUID = -4431771251773644144L;
+
+    public RootToolsException(Throwable th) {
+        super(th);
+    }
+}
diff --git a/src/com/stericson/RootTools/exceptions/RootDeniedException.java b/src/com/stericson/RootTools/exceptions/RootDeniedException.java
new file mode 100644
index 00000000..d150e596
--- /dev/null
+++ b/src/com/stericson/RootTools/exceptions/RootDeniedException.java
@@ -0,0 +1,36 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.exceptions;
+
+/**
+ * Developers may throw this exception from within their code
+ * when using IResult as a means to change the program flow.
+ */
+public class RootDeniedException extends Exception {
+
+	private static final long serialVersionUID = -8713947214162841310L;
+
+	public RootDeniedException(String error) {
+        super(error);
+    }
+}
diff --git a/src/com/stericson/RootTools/RootToolsException.java b/src/com/stericson/RootTools/exceptions/RootToolsException.java
similarity index 96%
rename from src/com/stericson/RootTools/RootToolsException.java
rename to src/com/stericson/RootTools/exceptions/RootToolsException.java
index be8d5838..d9c06573 100644
--- a/src/com/stericson/RootTools/RootToolsException.java
+++ b/src/com/stericson/RootTools/exceptions/RootToolsException.java
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.exceptions;
 
 /**
  * Developers may throw this exception from within their code
diff --git a/src/com/stericson/RootTools/execution/.svn/all-wcprops b/src/com/stericson/RootTools/execution/.svn/all-wcprops
new file mode 100644
index 00000000..d5b3a2ea
--- /dev/null
+++ b/src/com/stericson/RootTools/execution/.svn/all-wcprops
@@ -0,0 +1,35 @@
+K 25
+svn:wc:ra_dav:version-url
+V 98
+/svn/!svn/ver/233/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/execution
+END
+CommandCapture.java
+K 25
+svn:wc:ra_dav:version-url
+V 118
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/execution/CommandCapture.java
+END
+Executer.java
+K 25
+svn:wc:ra_dav:version-url
+V 112
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/execution/Executer.java
+END
+IResult.java
+K 25
+svn:wc:ra_dav:version-url
+V 111
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/execution/IResult.java
+END
+Shell.java
+K 25
+svn:wc:ra_dav:version-url
+V 109
+/svn/!svn/ver/233/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/execution/Shell.java
+END
+Command.java
+K 25
+svn:wc:ra_dav:version-url
+V 111
+/svn/!svn/ver/232/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/execution/Command.java
+END
diff --git a/src/com/stericson/RootTools/execution/.svn/entries b/src/com/stericson/RootTools/execution/.svn/entries
new file mode 100644
index 00000000..d3babda2
--- /dev/null
+++ b/src/com/stericson/RootTools/execution/.svn/entries
@@ -0,0 +1,198 @@
+10
+
+dir
+249
+http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/execution
+http://roottools.googlecode.com/svn
+
+
+
+2013-02-14T21:30:45.116390Z
+233
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+326c17ea-325e-592a-0117-b1346ba49fde
+
+CommandCapture.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+66476aa0e8a8e22b23cb994056708763
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1596
+
+Executer.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+6ee3e08accce93d7892f4fe75dd9b3a3
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7959
+
+IResult.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+cb08d8633b472987ea5942e72149beee
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1809
+
+Shell.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+e737943fdd5f33aadd0d82da513c1b2e
+2013-02-14T21:30:45.116390Z
+233
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11261
+
+Command.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+dc1fbc8c767e641d93234bddf52db4b1
+2013-02-14T03:55:31.156897Z
+232
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3462
+
diff --git a/src/com/stericson/RootTools/execution/.svn/text-base/Command.java.svn-base b/src/com/stericson/RootTools/execution/.svn/text-base/Command.java.svn-base
new file mode 100644
index 00000000..d734179c
--- /dev/null
+++ b/src/com/stericson/RootTools/execution/.svn/text-base/Command.java.svn-base
@@ -0,0 +1,136 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+/*
+ *Special thanks to Jeremy Lakeman for the following code and for teaching me something new.
+ *
+ *Stephen
+ */
+
+package com.stericson.RootTools.execution;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+
+import com.stericson.RootTools.RootTools;
+
+public abstract class Command {
+	final String[] command;
+	boolean finished = false;
+	int exitCode;
+	int id = 0;
+	int timeout = 5000;
+
+	public Command(int id, String... command) {
+		this.command = command;
+		this.id = id;
+	}
+	
+	public Command(int id, int timeout, String... command) {
+		this.command = command;
+		this.id = id;
+		this.timeout = timeout;
+	}
+	    
+	public String getCommand() {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < command.length; i++) {
+			sb.append(command[i]);
+			sb.append('\n');
+		}
+		RootTools.log("Sending command(s): " + sb.toString());
+		return sb.toString();
+	}
+
+	public void writeCommand(OutputStreamWriter out) throws IOException {
+		out.write(getCommand());
+	}
+
+	public abstract void output(int id, String line);
+	
+	public void commandFinished(int id)
+	{
+		RootTools.log("Command " + id + "finished.");
+	}
+
+	public void setExitCode(int code) {
+		synchronized (this) {
+			exitCode = code;
+			finished = true;
+			commandFinished(id);
+			this.notifyAll();
+		}
+	}
+
+	public void terminate(String reason) {
+		try
+		{
+			Shell.closeAll();
+			RootTools.log("Terminating all shells.");
+			terminated(reason);
+		}
+		catch (IOException e) {}
+	}
+
+	public void terminated(String reason) {
+		setExitCode(-1);
+		RootTools.log("Command " + id + " did not finish.");
+	}
+	
+	// waits for this command to finish
+	public void waitForFinish(int timeout) throws InterruptedException {
+		synchronized (this) {
+			while (!finished) {
+				this.wait(timeout);
+				
+				if (!finished)
+				{
+					finished = true;
+					RootTools.log("Timeout Exception has occurred.");
+					terminate("Timeout Exception");
+				}
+			}
+		}
+	}
+	
+	// waits for this command to finish and returns the exit code
+	public int exitCode(int timeout) throws InterruptedException {
+		synchronized (this) {
+			waitForFinish(timeout);
+		}
+		return exitCode;
+	}
+	
+	// waits for this command to finish
+	public void waitForFinish() throws InterruptedException {
+		synchronized (this) {
+			waitForFinish(timeout);
+		}
+	}
+	
+	// waits for this command to finish and returns the exit code
+	public int exitCode() throws InterruptedException {
+		synchronized (this) {
+			return exitCode(timeout);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/com/stericson/RootTools/execution/.svn/text-base/CommandCapture.java.svn-base b/src/com/stericson/RootTools/execution/.svn/text-base/CommandCapture.java.svn-base
new file mode 100644
index 00000000..65cf7ff3
--- /dev/null
+++ b/src/com/stericson/RootTools/execution/.svn/text-base/CommandCapture.java.svn-base
@@ -0,0 +1,50 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+/*
+ *Special thanks to Jeremy Lakeman for the following code and for teaching me something new.
+ *
+ *Stephen
+ */
+
+package com.stericson.RootTools.execution;
+
+import com.stericson.RootTools.RootTools;
+
+public class CommandCapture extends Command {
+	private StringBuilder sb = new StringBuilder();
+
+	public CommandCapture(int id, String... command) {
+		super(id, command);
+	}
+
+	@Override
+	public void output(int id, String line) {
+		sb.append(line).append('\n');
+		RootTools.log("Command", "ID: " + id + ", " + line);
+	}
+	
+	@Override
+	public String toString() {
+		return sb.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/com/stericson/RootTools/execution/.svn/text-base/Executer.java.svn-base b/src/com/stericson/RootTools/execution/.svn/text-base/Executer.java.svn-base
new file mode 100644
index 00000000..e9af009a
--- /dev/null
+++ b/src/com/stericson/RootTools/execution/.svn/text-base/Executer.java.svn-base
@@ -0,0 +1,290 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.execution;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.RootTools.Result;
+import com.stericson.RootTools.exceptions.RootToolsException;
+
+public class Executer {
+
+	protected Process process = null;
+	protected Result result = null;
+	
+	// ------------
+	// # Executer #
+	// ------------
+	
+	/**
+	 * Sends several shell command as su (attempts to)
+	 * 
+	 * @deprecated
+	 * 
+	 * @param commands
+	 *            array of commands to send to the shell
+	 * 
+	 * @param sleepTime
+	 *            time to sleep between each command, delay.
+	 * 
+	 * @param result
+	 *            injected result object that implements the Result class
+	 * 
+	 * @return a <code>LinkedList</code> containing each line that was returned
+	 *         by the shell after executing or while trying to execute the given
+	 *         commands. You must iterate over this list, it does not allow
+	 *         random access, so no specifying an index of an item you want, not
+	 *         like you're going to know that anyways.
+	 * 
+	 * @throws InterruptedException
+	 * 
+	 * @throws IOException
+	 * @throws TimeoutException
+	 * 
+	 */
+	public synchronized List<String> sendShell(String[] commands, int sleepTime,
+			Result result, boolean useRoot, int timeout) throws IOException,
+			RootToolsException, TimeoutException {
+
+		RootTools.log("Sending " + commands.length + " shell command" + (commands.length > 1 ? "s" : ""));
+
+        Worker worker = new Worker(this, commands, sleepTime, result, useRoot);
+        worker.start();
+        
+        try
+        {
+        	if (timeout == -1)
+        	{
+        		timeout = 300000;
+        	}
+        	
+        	worker.join(timeout);
+        	
+        	//small pause, let things catch up
+			Thread.sleep(RootTools.shellDelay);
+
+            if (worker.exit != -911)
+              return worker.finalResponse;
+            else
+              throw new TimeoutException();
+        } 
+        catch(InterruptedException ex) 
+        {
+            worker.interrupt();
+            Thread.currentThread().interrupt();
+            throw new TimeoutException();
+        } 
+
+	}
+
+    private static class Worker extends Thread 
+    {
+    	private String[] commands;
+    	private int sleepTime;
+    	private boolean useRoot;
+    	public int exit = -911;
+    	public List<String> finalResponse;
+    	private Executer executer;
+    	
+	  
+		private Worker(Executer executer, String[] commands, int sleepTime, Result result, boolean useRoot) 
+		{
+			this.commands = commands;
+			this.sleepTime = sleepTime;
+			this.executer = executer;
+			this.executer.result = result;
+			this.useRoot = useRoot;
+		}
+		public void run() 
+		{
+			DataOutputStream os = null;
+			InputStreamReader osRes = null;
+			InputStreamReader osErr = null;
+			
+		    try 
+		    {
+		    	if (executer.process == null)
+		    	{
+			    	Runtime.getRuntime().gc();
+			    	
+			    	if (RootTools.customShell.equals(""))
+			    	{
+			    		executer.process = Runtime.getRuntime().exec(useRoot ? "su" : "sh");
+				    	RootTools.log(useRoot ? "Using Root" : "Using sh");
+			    	}
+			    	else
+			    	{
+			    		executer.process = Runtime.getRuntime().exec(RootTools.customShell);
+				    	RootTools.log("Using custom shell: " + RootTools.customShell);
+			    	}
+			    	
+					if (null != executer.result) {
+						executer.result.setProcess(executer.process);
+					}
+		    	}
+		    	
+		    	os = new DataOutputStream(executer.process.getOutputStream());
+		    	osRes = new InputStreamReader(executer.process.getInputStream());
+		    	osErr = new InputStreamReader(executer.process.getErrorStream());
+				BufferedReader reader = new BufferedReader(osRes);
+				BufferedReader reader_error = new BufferedReader(osErr);
+				
+				List<String> response = null;
+
+				if (null == executer.result) {
+					response = new LinkedList<String>();
+				}
+
+				try {
+					
+					// Doing Stuff ;)
+					for (String single : commands) {
+						RootTools.log("Shell command: " + single);
+						os.writeBytes(single + "\n");
+						os.flush();
+						Thread.sleep(sleepTime);
+					}
+					
+					os.writeBytes("exit \n");
+	    			os.flush();	
+					
+					String line = reader.readLine();
+					String line_error = reader_error.readLine();
+
+					while (line != null) {
+						if (null == executer.result) {
+							response.add(line);
+						} else {
+							executer.result.process(line);
+						}
+		                
+						RootTools.log("input stream: " + line);
+						
+						line = reader.readLine();
+					}
+
+					RootTools.log("Done reading input stream");
+					
+					while (line_error != null) {
+						if (null == executer.result) {
+							response.add(line_error);
+						} else {
+							executer.result.processError(line_error);
+						}
+
+						RootTools.log("error stream: " + line_error);
+						line_error = reader_error.readLine();
+					}
+					
+					RootTools.log("Done reading error stream");
+
+				} 
+				catch (Exception ex) 
+				{
+		            if (RootTools.debugMode) {
+		                RootTools.log("Error: " + ex.getMessage());
+		            }
+		            
+					if (null != executer.result) 
+					{
+						executer.result.onFailure(ex);
+					}
+				} finally {
+					RootTools.log("In finally block");
+
+					if (executer.process != null) {
+						RootTools.log("Getting Exit");
+						finalResponse = response;
+						exit = -1;
+						exit = executer.process.waitFor();
+						RootTools.log("Exit done...");
+						RootTools.lastExitCode = exit;
+						
+						if (null != executer.result) {
+							executer.result.onComplete(exit);
+						} else {
+							response.add(Integer.toString(exit));
+						}
+					}
+				}
+		    }
+		    catch (InterruptedException ignore) 
+		    {
+		    	return;
+		    }
+		    catch (Exception e) {
+	            if (RootTools.debugMode) {
+	                e.printStackTrace();
+	                RootTools.log("Error: " + e.getMessage());
+	            }
+	        } finally {
+	        	
+				try {
+					
+		            if (os != null) {
+		            	os.writeBytes("exit \n");
+		    			os.flush();
+		    			os.close();
+		                os = null;
+		            }
+		            if (osRes != null) {
+		                osRes.close();
+		                osRes = null;
+		            }
+		            if (osErr != null) {
+		                osErr.close();
+		                osErr = null;
+		            }
+				} catch (Exception ignore) {}
+
+			
+        		executer.closeShell();
+				
+	        }
+		}
+    }
+    
+	private void closeShell()
+	{
+		if (this.process != null)
+    	{
+    		try {
+    			//if this fails, ignore it and dont crash.
+    			this.process.destroy();
+    		} catch (Exception ignore) {}
+    		this.process = null;
+    	}
+
+        if (this.result != null)
+        {
+        	this.result = null;
+        }        
+	}
+}
diff --git a/src/com/stericson/RootTools/execution/.svn/text-base/IResult.java.svn-base b/src/com/stericson/RootTools/execution/.svn/text-base/IResult.java.svn-base
new file mode 100644
index 00000000..83196974
--- /dev/null
+++ b/src/com/stericson/RootTools/execution/.svn/text-base/IResult.java.svn-base
@@ -0,0 +1,46 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.execution;
+
+import java.io.Serializable;
+
+/**
+ * Implement this interface and inject the resulting object
+ * when invoking <code>sendShell</code>.
+ * <code>RootTools</code> comes with a reference implementation:
+ * <code>RootTools.Result</code>
+ */
+public interface IResult {
+    public abstract void process(String line) throws Exception;
+    public abstract void processError(String line) throws Exception;
+    public abstract void onFailure(Exception ex);
+    public abstract void onComplete(int diag);
+
+    public IResult      setProcess(Process process);
+    public Process      getProcess();
+    public IResult      setData(Serializable data);
+    public Serializable getData();
+    public IResult      setError(int error);
+    public int          getError();
+
+}
diff --git a/src/com/stericson/RootTools/execution/.svn/text-base/Shell.java.svn-base b/src/com/stericson/RootTools/execution/.svn/text-base/Shell.java.svn-base
new file mode 100644
index 00000000..575553fd
--- /dev/null
+++ b/src/com/stericson/RootTools/execution/.svn/text-base/Shell.java.svn-base
@@ -0,0 +1,454 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+/*
+ *Special thanks to Jeremy Lakeman for the following code and for teaching me something new.
+ *
+ *Stephen
+ */
+
+package com.stericson.RootTools.execution;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.exceptions.RootDeniedException;
+
+public class Shell {
+	
+	private final Process proc;
+	private final BufferedReader in;
+	private final OutputStreamWriter out;
+	private final List<Command> commands = new ArrayList<Command>();
+	private boolean close = false;
+
+	private static String error = "";
+	private static final String token = "F*D^W@#FGF";
+	private static Shell rootShell = null;
+	private static Shell shell = null;
+	private static Shell customShell = null;
+
+    private static int shellTimeout = 10000;
+
+	private Shell(String cmd) throws IOException, TimeoutException, RootDeniedException {
+
+		RootTools.log("Starting shell: " + cmd);
+
+		proc = new ProcessBuilder(cmd).redirectErrorStream(true).start();
+		in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+		out = new OutputStreamWriter(proc.getOutputStream(), "UTF-8");
+
+        Worker worker = new Worker(proc, in, out);
+        worker.start();
+        
+        try
+        {
+        	worker.join(shellTimeout);
+        	
+        	if (worker.exit == -911) {
+            	proc.destroy();
+				
+            	throw new TimeoutException(error);
+            }
+        	if (worker.exit == -42) {
+            	proc.destroy();
+				
+            	throw new RootDeniedException("Root Access Denied"); 
+            }
+            else
+            {
+        		new Thread(input, "Shell Input").start();
+        		new Thread(output, "Shell Output").start();
+            }
+        } 
+        catch(InterruptedException ex) 
+        {
+            worker.interrupt();
+            Thread.currentThread().interrupt();
+            throw new TimeoutException();
+        } 		
+	}
+
+
+    public Command add(Command command) throws IOException {
+   		if (close)
+   			throw new IllegalStateException(
+   					"Unable to add commands to a closed shell");
+   		synchronized (commands) {
+   			commands.add(command);
+   			commands.notifyAll();
+   		}
+
+   		return command;
+   	}
+
+   	public void close() throws IOException {
+   		if (this == rootShell)
+   			rootShell = null;
+   		if (this == shell)
+   			shell = null;
+   		if (this == customShell)
+   			customShell = null;
+   		synchronized (commands) {
+   			this.close = true;
+   			commands.notifyAll();
+   		}
+   	}
+
+   	public int countCommands() {
+   		return commands.size();
+   	}
+
+	public static void closeCustomShell() throws IOException {
+		if (customShell == null)
+			return;
+		customShell.close();
+	}
+
+	public static void closeRootShell() throws IOException {
+		if (rootShell == null)
+			return;
+		rootShell.close();
+	}
+	
+	public static void closeShell() throws IOException {
+		if (shell == null)
+			return;
+		shell.close();
+	}
+
+	public static void closeAll() throws IOException
+	{
+		closeShell();
+		closeRootShell();
+		closeCustomShell();
+	}
+
+    public static Shell getOpenShell()
+   	{
+   		if (customShell != null)
+   			return customShell;
+   		else if (rootShell != null)
+   			return rootShell;
+   		else
+   			return shell;
+   	}
+
+	public static boolean isShellOpen()
+	{
+		if (shell == null)
+			return false;
+		else
+			return true;
+	}
+
+	public static boolean isCustomShellOpen()
+	{
+		if (customShell == null)
+			return false;
+		else
+			return true;
+	}
+
+	public static boolean isRootShellOpen()
+	{
+		if (rootShell == null)
+			return false;
+		else
+			return true;
+	}
+	
+	public static boolean isAnyShellOpen()
+	{
+		if (shell != null)
+			return true;
+		else if (rootShell != null)
+			return true;
+		else if (customShell != null)
+			return true;
+		else
+			return false;
+	}
+
+	private Runnable input = new Runnable() {
+		public void run() {
+			try {
+				writeCommands();
+			} catch (IOException e) {
+				RootTools.log(e.getMessage(), 2, e);
+			}
+		}
+	};
+
+	private Runnable output = new Runnable() {
+		public void run() {
+			try {
+				readOutput();
+			} catch (IOException e) {
+				RootTools.log(e.getMessage(), 2, e);
+			} catch (InterruptedException e) {
+				RootTools.log(e.getMessage(), 2, e);
+			}
+		}
+	};
+
+	private void readOutput() throws IOException, InterruptedException {
+		Command command = null;
+		int read = 0;
+		while (true) {
+			String line = in.readLine();
+
+			// terminate on EOF
+			if (line == null)
+				break;
+			
+			// Log.v("Shell", "Out; \"" + line + "\"");
+			if (command == null) {
+				if (read >= commands.size())
+				{
+					if (close)
+						break;
+					continue;
+				}
+				command = commands.get(read);
+			}
+
+			int pos = line.indexOf(token);
+			if (pos > 0)
+				command.output(command.id, line.substring(0, pos));
+			if (pos >= 0) {
+				line = line.substring(pos);
+				String fields[] = line.split(" ");
+				if (fields.length >= 2 && fields[1] != null)
+				{
+                    int id=0;
+                    try {
+					    id = Integer.parseInt(fields[1]);
+                    }
+                    catch (NumberFormatException e) {
+                    }
+                    int exitCode = -1;
+                    try {
+                        exitCode = Integer.parseInt(fields[2]);
+                    }
+                    catch (NumberFormatException e) {
+                    }
+					if (id == read) {
+						command.setExitCode(exitCode);
+						read++;
+						command = null;
+						continue;
+					}
+				}
+			}
+			command.output(command.id, line);
+		}
+		RootTools.log("Read all output");
+		proc.waitFor();
+		proc.destroy();
+		RootTools.log("Shell destroyed");
+		
+		while (read < commands.size()) {
+			if (command == null)
+				command = commands.get(read);
+			command.terminated("Unexpected Termination.");
+			command = null;
+			read++;
+		}
+	}
+
+    public static void runRootCommand(Command command) throws IOException, TimeoutException, RootDeniedException {
+       		startRootShell().add(command);
+       	}
+
+    public static void runCommand(Command command) throws IOException, TimeoutException {
+       		startShell().add(command);
+       	}
+
+    public static Shell startRootShell() throws IOException, TimeoutException, RootDeniedException {
+       		return Shell.startRootShell(20000, 3);
+    }
+
+    public static Shell startRootShell(int timeout) throws IOException, TimeoutException, RootDeniedException {
+   		return Shell.startRootShell(timeout, 3);
+   	}
+
+   	public static Shell startRootShell(int timeout, int retry) throws IOException, TimeoutException, RootDeniedException {
+
+        Shell.shellTimeout = timeout;
+
+   		if (rootShell == null) {
+   			RootTools.log("Starting Root Shell!");
+   			String cmd = "su";
+   			// keep prompting the user until they accept for x amount of times...
+   			int retries = 0;
+   			while (rootShell == null) {
+   				try {
+   					rootShell = new Shell(cmd);
+   				} catch (IOException e) {
+   					if (retries++ >= retry)
+   					{
+   						RootTools.log("IOException, could not start shell");
+   						throw e;
+   					}
+   				}
+   			}
+   		}
+   		else
+   		{
+   			RootTools.log("Using Existing Root Shell!");
+   		}
+
+   		return rootShell;
+   	}
+
+   	public static Shell startCustomShell(String shellPath) throws IOException, TimeoutException, RootDeniedException {
+   		return Shell.startCustomShell(shellPath, 20000);
+   	}
+
+   	public static Shell startCustomShell(String shellPath, int timeout) throws IOException, TimeoutException, RootDeniedException {
+   		Shell.shellTimeout = timeout;
+
+   		if (customShell == null) {
+   			RootTools.log("Starting Custom Shell!");
+   			customShell = new Shell(shellPath);
+   		}
+   		else
+   			RootTools.log("Using Existing Custom Shell!");
+
+   		return customShell;
+   	}
+
+   	public static Shell startShell() throws IOException, TimeoutException {
+   		return Shell.startShell(20000);
+   	}
+
+   	public static Shell startShell(int timeout) throws IOException, TimeoutException {
+   		Shell.shellTimeout = timeout;
+
+   		try {
+   			if (shell == null) {
+   				RootTools.log("Starting Shell!");
+   				shell = new Shell("/system/bin/sh");
+   			}
+   			else
+   				RootTools.log("Using Existing Shell!");
+   			return shell;
+   		} catch (RootDeniedException e) {
+   			//Root Denied should never be thrown.
+   			throw new IOException();
+   		}
+   	}
+
+	public void waitFor() throws IOException, InterruptedException {
+		close();
+		if (commands.size() > 0)
+		{
+			Command command = commands.get(commands.size() - 1);
+			command.exitCode();
+		}
+	}
+	
+    protected static class Worker extends Thread 
+    {
+    	public int exit = -911;
+    	
+    	public Process proc;
+    	public BufferedReader in;
+    	public OutputStreamWriter out;
+	  
+		private Worker(Process proc, BufferedReader in, OutputStreamWriter out)  {
+			this.proc = proc;
+			this.in = in;
+			this.out = out;
+		}
+				
+		public void run() 
+		{
+
+			try
+			{
+				out.write("echo Started\n");
+				out.flush();
+	
+				while (true) {
+					String line = in.readLine();
+					if (line == null) {
+						throw new EOFException();
+					}
+					if ("".equals(line))
+						continue;
+					if ("Started".equals(line))
+					{
+						this.exit = 1;
+						break;
+					}
+					Shell.error = "unkown error occured.";
+				}
+			}
+			catch (IOException e)
+			{
+				exit = -42;
+				if (e.getMessage() != null)
+					Shell.error = e.getMessage();
+				else
+					Shell.error = "RootAccess denied?.";
+			}
+			
+		}
+    }
+
+    private void writeCommands() throws IOException {
+   		try {
+   			int write = 0;
+   			while (true) {
+   				OutputStreamWriter out;
+   				synchronized (commands) {
+   					while (!close && write >= commands.size()) {
+   						commands.wait();
+   					}
+   					out = this.out;
+   				}
+   				if (write < commands.size()) {
+   					Command next = commands.get(write);
+   					next.writeCommand(out);
+   					String line = "\necho " + token + " " + write + " $?\n";
+   					out.write(line);
+   					out.flush();
+   					write++;
+   				} else if (close) {
+   					out.write("\nexit 0\n");
+   					out.flush();
+   					out.close();
+   					RootTools.log("Closing shell");
+   					return;
+   				}
+   			}
+   		} catch (InterruptedException e) {
+   			RootTools.log(e.getMessage(), 2, e);
+   		}
+   	}
+
+}
\ No newline at end of file
diff --git a/src/com/stericson/RootTools/Command.java b/src/com/stericson/RootTools/execution/Command.java
similarity index 89%
rename from src/com/stericson/RootTools/Command.java
rename to src/com/stericson/RootTools/execution/Command.java
index 267646c6..bdea2b65 100644
--- a/src/com/stericson/RootTools/Command.java
+++ b/src/com/stericson/RootTools/execution/Command.java
@@ -26,18 +26,21 @@
  *Stephen
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.execution;
 
 import java.io.IOException;
-import java.io.OutputStream;
-import java.util.concurrent.TimeoutException;
+import java.io.OutputStreamWriter;
+
+import org.brandroid.utils.Logger;
+
+import com.stericson.RootTools.RootTools;
 
 public abstract class Command {
-	final String command[];
+	final String[] command;
 	boolean finished = false;
 	int exitCode;
 	int id = 0;
-	int timeout = InternalVariables.timeout;
+	int timeout = 5000;
 
 	public Command(int id, String... command) {
 		this.command = command;
@@ -56,12 +59,12 @@ public String getCommand() {
 			sb.append(command[i]);
 			sb.append('\n');
 		}
-		RootTools.log("Sending command(s): " + sb.toString());
+		Logger.LogDebug("Root: Sending command(s): " + sb.toString());
 		return sb.toString();
 	}
 
-	public void writeCommand(OutputStream out) throws IOException {
-		out.write(getCommand().getBytes());
+	public void writeCommand(OutputStreamWriter out) throws IOException {
+		out.write(getCommand());
 	}
 
 	public abstract void output(int id, String line);
diff --git a/src/com/stericson/RootTools/CommandCapture.java b/src/com/stericson/RootTools/execution/CommandCapture.java
similarity index 94%
rename from src/com/stericson/RootTools/CommandCapture.java
rename to src/com/stericson/RootTools/execution/CommandCapture.java
index 7e8fbc30..65cf7ff3 100644
--- a/src/com/stericson/RootTools/CommandCapture.java
+++ b/src/com/stericson/RootTools/execution/CommandCapture.java
@@ -26,7 +26,9 @@
  *Stephen
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.execution;
+
+import com.stericson.RootTools.RootTools;
 
 public class CommandCapture extends Command {
 	private StringBuilder sb = new StringBuilder();
diff --git a/src/com/stericson/RootTools/Executer.java b/src/com/stericson/RootTools/execution/Executer.java
similarity index 95%
rename from src/com/stericson/RootTools/Executer.java
rename to src/com/stericson/RootTools/execution/Executer.java
index 712d6122..e9af009a 100644
--- a/src/com/stericson/RootTools/Executer.java
+++ b/src/com/stericson/RootTools/execution/Executer.java
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.execution;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -30,9 +30,11 @@
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 
+import com.stericson.RootTools.RootTools;
 import com.stericson.RootTools.RootTools.Result;
+import com.stericson.RootTools.exceptions.RootToolsException;
 
-class Executer {
+public class Executer {
 
 	protected Process process = null;
 	protected Result result = null;
@@ -44,6 +46,8 @@ class Executer {
 	/**
 	 * Sends several shell command as su (attempts to)
 	 * 
+	 * @deprecated
+	 * 
 	 * @param commands
 	 *            array of commands to send to the shell
 	 * 
@@ -62,9 +66,10 @@ class Executer {
 	 * @throws InterruptedException
 	 * 
 	 * @throws IOException
-	 * @throws TimeoutException 
+	 * @throws TimeoutException
+	 * 
 	 */
-	synchronized List<String> sendShell(String[] commands, int sleepTime,
+	public synchronized List<String> sendShell(String[] commands, int sleepTime,
 			Result result, boolean useRoot, int timeout) throws IOException,
 			RootToolsException, TimeoutException {
 
@@ -99,7 +104,7 @@ synchronized List<String> sendShell(String[] commands, int sleepTime,
 
 	}
 
-    protected static class Worker extends Thread 
+    private static class Worker extends Thread 
     {
     	private String[] commands;
     	private int sleepTime;
@@ -266,7 +271,7 @@ public void run()
 		}
     }
     
-	public void closeShell()
+	private void closeShell()
 	{
 		if (this.process != null)
     	{
diff --git a/src/com/stericson/RootTools/IResult.java b/src/com/stericson/RootTools/execution/IResult.java
similarity index 97%
rename from src/com/stericson/RootTools/IResult.java
rename to src/com/stericson/RootTools/execution/IResult.java
index 7cc49bde..83196974 100644
--- a/src/com/stericson/RootTools/IResult.java
+++ b/src/com/stericson/RootTools/execution/IResult.java
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.execution;
 
 import java.io.Serializable;
 
diff --git a/src/com/stericson/RootTools/execution/Shell.java b/src/com/stericson/RootTools/execution/Shell.java
new file mode 100644
index 00000000..575553fd
--- /dev/null
+++ b/src/com/stericson/RootTools/execution/Shell.java
@@ -0,0 +1,454 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+/*
+ *Special thanks to Jeremy Lakeman for the following code and for teaching me something new.
+ *
+ *Stephen
+ */
+
+package com.stericson.RootTools.execution;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.exceptions.RootDeniedException;
+
+public class Shell {
+	
+	private final Process proc;
+	private final BufferedReader in;
+	private final OutputStreamWriter out;
+	private final List<Command> commands = new ArrayList<Command>();
+	private boolean close = false;
+
+	private static String error = "";
+	private static final String token = "F*D^W@#FGF";
+	private static Shell rootShell = null;
+	private static Shell shell = null;
+	private static Shell customShell = null;
+
+    private static int shellTimeout = 10000;
+
+	private Shell(String cmd) throws IOException, TimeoutException, RootDeniedException {
+
+		RootTools.log("Starting shell: " + cmd);
+
+		proc = new ProcessBuilder(cmd).redirectErrorStream(true).start();
+		in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+		out = new OutputStreamWriter(proc.getOutputStream(), "UTF-8");
+
+        Worker worker = new Worker(proc, in, out);
+        worker.start();
+        
+        try
+        {
+        	worker.join(shellTimeout);
+        	
+        	if (worker.exit == -911) {
+            	proc.destroy();
+				
+            	throw new TimeoutException(error);
+            }
+        	if (worker.exit == -42) {
+            	proc.destroy();
+				
+            	throw new RootDeniedException("Root Access Denied"); 
+            }
+            else
+            {
+        		new Thread(input, "Shell Input").start();
+        		new Thread(output, "Shell Output").start();
+            }
+        } 
+        catch(InterruptedException ex) 
+        {
+            worker.interrupt();
+            Thread.currentThread().interrupt();
+            throw new TimeoutException();
+        } 		
+	}
+
+
+    public Command add(Command command) throws IOException {
+   		if (close)
+   			throw new IllegalStateException(
+   					"Unable to add commands to a closed shell");
+   		synchronized (commands) {
+   			commands.add(command);
+   			commands.notifyAll();
+   		}
+
+   		return command;
+   	}
+
+   	public void close() throws IOException {
+   		if (this == rootShell)
+   			rootShell = null;
+   		if (this == shell)
+   			shell = null;
+   		if (this == customShell)
+   			customShell = null;
+   		synchronized (commands) {
+   			this.close = true;
+   			commands.notifyAll();
+   		}
+   	}
+
+   	public int countCommands() {
+   		return commands.size();
+   	}
+
+	public static void closeCustomShell() throws IOException {
+		if (customShell == null)
+			return;
+		customShell.close();
+	}
+
+	public static void closeRootShell() throws IOException {
+		if (rootShell == null)
+			return;
+		rootShell.close();
+	}
+	
+	public static void closeShell() throws IOException {
+		if (shell == null)
+			return;
+		shell.close();
+	}
+
+	public static void closeAll() throws IOException
+	{
+		closeShell();
+		closeRootShell();
+		closeCustomShell();
+	}
+
+    public static Shell getOpenShell()
+   	{
+   		if (customShell != null)
+   			return customShell;
+   		else if (rootShell != null)
+   			return rootShell;
+   		else
+   			return shell;
+   	}
+
+	public static boolean isShellOpen()
+	{
+		if (shell == null)
+			return false;
+		else
+			return true;
+	}
+
+	public static boolean isCustomShellOpen()
+	{
+		if (customShell == null)
+			return false;
+		else
+			return true;
+	}
+
+	public static boolean isRootShellOpen()
+	{
+		if (rootShell == null)
+			return false;
+		else
+			return true;
+	}
+	
+	public static boolean isAnyShellOpen()
+	{
+		if (shell != null)
+			return true;
+		else if (rootShell != null)
+			return true;
+		else if (customShell != null)
+			return true;
+		else
+			return false;
+	}
+
+	private Runnable input = new Runnable() {
+		public void run() {
+			try {
+				writeCommands();
+			} catch (IOException e) {
+				RootTools.log(e.getMessage(), 2, e);
+			}
+		}
+	};
+
+	private Runnable output = new Runnable() {
+		public void run() {
+			try {
+				readOutput();
+			} catch (IOException e) {
+				RootTools.log(e.getMessage(), 2, e);
+			} catch (InterruptedException e) {
+				RootTools.log(e.getMessage(), 2, e);
+			}
+		}
+	};
+
+	private void readOutput() throws IOException, InterruptedException {
+		Command command = null;
+		int read = 0;
+		while (true) {
+			String line = in.readLine();
+
+			// terminate on EOF
+			if (line == null)
+				break;
+			
+			// Log.v("Shell", "Out; \"" + line + "\"");
+			if (command == null) {
+				if (read >= commands.size())
+				{
+					if (close)
+						break;
+					continue;
+				}
+				command = commands.get(read);
+			}
+
+			int pos = line.indexOf(token);
+			if (pos > 0)
+				command.output(command.id, line.substring(0, pos));
+			if (pos >= 0) {
+				line = line.substring(pos);
+				String fields[] = line.split(" ");
+				if (fields.length >= 2 && fields[1] != null)
+				{
+                    int id=0;
+                    try {
+					    id = Integer.parseInt(fields[1]);
+                    }
+                    catch (NumberFormatException e) {
+                    }
+                    int exitCode = -1;
+                    try {
+                        exitCode = Integer.parseInt(fields[2]);
+                    }
+                    catch (NumberFormatException e) {
+                    }
+					if (id == read) {
+						command.setExitCode(exitCode);
+						read++;
+						command = null;
+						continue;
+					}
+				}
+			}
+			command.output(command.id, line);
+		}
+		RootTools.log("Read all output");
+		proc.waitFor();
+		proc.destroy();
+		RootTools.log("Shell destroyed");
+		
+		while (read < commands.size()) {
+			if (command == null)
+				command = commands.get(read);
+			command.terminated("Unexpected Termination.");
+			command = null;
+			read++;
+		}
+	}
+
+    public static void runRootCommand(Command command) throws IOException, TimeoutException, RootDeniedException {
+       		startRootShell().add(command);
+       	}
+
+    public static void runCommand(Command command) throws IOException, TimeoutException {
+       		startShell().add(command);
+       	}
+
+    public static Shell startRootShell() throws IOException, TimeoutException, RootDeniedException {
+       		return Shell.startRootShell(20000, 3);
+    }
+
+    public static Shell startRootShell(int timeout) throws IOException, TimeoutException, RootDeniedException {
+   		return Shell.startRootShell(timeout, 3);
+   	}
+
+   	public static Shell startRootShell(int timeout, int retry) throws IOException, TimeoutException, RootDeniedException {
+
+        Shell.shellTimeout = timeout;
+
+   		if (rootShell == null) {
+   			RootTools.log("Starting Root Shell!");
+   			String cmd = "su";
+   			// keep prompting the user until they accept for x amount of times...
+   			int retries = 0;
+   			while (rootShell == null) {
+   				try {
+   					rootShell = new Shell(cmd);
+   				} catch (IOException e) {
+   					if (retries++ >= retry)
+   					{
+   						RootTools.log("IOException, could not start shell");
+   						throw e;
+   					}
+   				}
+   			}
+   		}
+   		else
+   		{
+   			RootTools.log("Using Existing Root Shell!");
+   		}
+
+   		return rootShell;
+   	}
+
+   	public static Shell startCustomShell(String shellPath) throws IOException, TimeoutException, RootDeniedException {
+   		return Shell.startCustomShell(shellPath, 20000);
+   	}
+
+   	public static Shell startCustomShell(String shellPath, int timeout) throws IOException, TimeoutException, RootDeniedException {
+   		Shell.shellTimeout = timeout;
+
+   		if (customShell == null) {
+   			RootTools.log("Starting Custom Shell!");
+   			customShell = new Shell(shellPath);
+   		}
+   		else
+   			RootTools.log("Using Existing Custom Shell!");
+
+   		return customShell;
+   	}
+
+   	public static Shell startShell() throws IOException, TimeoutException {
+   		return Shell.startShell(20000);
+   	}
+
+   	public static Shell startShell(int timeout) throws IOException, TimeoutException {
+   		Shell.shellTimeout = timeout;
+
+   		try {
+   			if (shell == null) {
+   				RootTools.log("Starting Shell!");
+   				shell = new Shell("/system/bin/sh");
+   			}
+   			else
+   				RootTools.log("Using Existing Shell!");
+   			return shell;
+   		} catch (RootDeniedException e) {
+   			//Root Denied should never be thrown.
+   			throw new IOException();
+   		}
+   	}
+
+	public void waitFor() throws IOException, InterruptedException {
+		close();
+		if (commands.size() > 0)
+		{
+			Command command = commands.get(commands.size() - 1);
+			command.exitCode();
+		}
+	}
+	
+    protected static class Worker extends Thread 
+    {
+    	public int exit = -911;
+    	
+    	public Process proc;
+    	public BufferedReader in;
+    	public OutputStreamWriter out;
+	  
+		private Worker(Process proc, BufferedReader in, OutputStreamWriter out)  {
+			this.proc = proc;
+			this.in = in;
+			this.out = out;
+		}
+				
+		public void run() 
+		{
+
+			try
+			{
+				out.write("echo Started\n");
+				out.flush();
+	
+				while (true) {
+					String line = in.readLine();
+					if (line == null) {
+						throw new EOFException();
+					}
+					if ("".equals(line))
+						continue;
+					if ("Started".equals(line))
+					{
+						this.exit = 1;
+						break;
+					}
+					Shell.error = "unkown error occured.";
+				}
+			}
+			catch (IOException e)
+			{
+				exit = -42;
+				if (e.getMessage() != null)
+					Shell.error = e.getMessage();
+				else
+					Shell.error = "RootAccess denied?.";
+			}
+			
+		}
+    }
+
+    private void writeCommands() throws IOException {
+   		try {
+   			int write = 0;
+   			while (true) {
+   				OutputStreamWriter out;
+   				synchronized (commands) {
+   					while (!close && write >= commands.size()) {
+   						commands.wait();
+   					}
+   					out = this.out;
+   				}
+   				if (write < commands.size()) {
+   					Command next = commands.get(write);
+   					next.writeCommand(out);
+   					String line = "\necho " + token + " " + write + " $?\n";
+   					out.write(line);
+   					out.flush();
+   					write++;
+   				} else if (close) {
+   					out.write("\nexit 0\n");
+   					out.flush();
+   					out.close();
+   					RootTools.log("Closing shell");
+   					return;
+   				}
+   			}
+   		} catch (InterruptedException e) {
+   			RootTools.log(e.getMessage(), 2, e);
+   		}
+   	}
+
+}
\ No newline at end of file
diff --git a/src/com/stericson/RootTools/internal/.svn/all-wcprops b/src/com/stericson/RootTools/internal/.svn/all-wcprops
new file mode 100644
index 00000000..a782c41d
--- /dev/null
+++ b/src/com/stericson/RootTools/internal/.svn/all-wcprops
@@ -0,0 +1,35 @@
+K 25
+svn:wc:ra_dav:version-url
+V 97
+/svn/!svn/ver/231/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/internal
+END
+Remounter.java
+K 25
+svn:wc:ra_dav:version-url
+V 112
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/internal/Remounter.java
+END
+RootToolsInternalMethods.java
+K 25
+svn:wc:ra_dav:version-url
+V 127
+/svn/!svn/ver/231/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java
+END
+InternalVariables.java
+K 25
+svn:wc:ra_dav:version-url
+V 120
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/internal/InternalVariables.java
+END
+Runner.java
+K 25
+svn:wc:ra_dav:version-url
+V 109
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/internal/Runner.java
+END
+Installer.java
+K 25
+svn:wc:ra_dav:version-url
+V 112
+/svn/!svn/ver/228/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/internal/Installer.java
+END
diff --git a/src/com/stericson/RootTools/internal/.svn/entries b/src/com/stericson/RootTools/internal/.svn/entries
new file mode 100644
index 00000000..2352c920
--- /dev/null
+++ b/src/com/stericson/RootTools/internal/.svn/entries
@@ -0,0 +1,198 @@
+10
+
+dir
+249
+http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/internal
+http://roottools.googlecode.com/svn
+
+
+
+2013-01-29T22:05:41.000183Z
+231
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+326c17ea-325e-592a-0117-b1346ba49fde
+
+Remounter.java
+file
+
+
+
+
+2013-05-10T21:35:38.000000Z
+aa3559967af11ba967830c94d7babafa
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5798
+
+RootToolsInternalMethods.java
+file
+
+
+
+
+2013-05-10T21:35:38.000000Z
+c6a7da8de3242c0e8f780bd1fbaf51e4
+2013-01-29T22:05:41.000183Z
+231
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+47964
+
+InternalVariables.java
+file
+
+
+
+
+2013-05-10T21:35:38.000000Z
+ba85bb5e9c8eb7137574c9712dad288c
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2267
+
+Runner.java
+file
+
+
+
+
+2013-05-10T21:35:38.000000Z
+d3b89caa4502dbe7902645a0351cf2c5
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2331
+
+Installer.java
+file
+
+
+
+
+2013-05-10T21:35:38.000000Z
+b2fef1e27c2da2bcbb10c52a6a4fea5f
+2012-10-04T15:16:32.967479Z
+228
+Stericson.g1@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5917
+
diff --git a/src/com/stericson/RootTools/internal/.svn/text-base/Installer.java.svn-base b/src/com/stericson/RootTools/internal/.svn/text-base/Installer.java.svn-base
new file mode 100644
index 00000000..31d0d425
--- /dev/null
+++ b/src/com/stericson/RootTools/internal/.svn/text-base/Installer.java.svn-base
@@ -0,0 +1,167 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.internal;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
+
+import android.content.Context;
+import android.util.Log;
+
+class Installer {
+
+    //-------------
+    //# Installer #
+    //-------------
+
+    private static final String LOG_TAG = "RootTools::Installer";
+
+    private static final String BOGUS_FILE_NAME = "bogus";
+
+    private Context context;
+    private String  filesPath;
+
+    public Installer(Context context)
+            throws IOException {
+
+        this.context   = context;
+        this.filesPath = context.getFilesDir().getCanonicalPath();
+    }
+
+    /**
+     * This method can be used to unpack a binary from the raw resources folder and store it in
+     * /data/data/app.package/files/
+     * This is typically useful if you provide your own C- or C++-based binary.
+     * This binary can then be executed using sendShell() and its full path.
+     *
+     * @param sourceId  resource id; typically <code>R.raw.id</code>
+     *
+     * @param destName  destination file name; appended to /data/data/app.package/files/
+     *
+     * @param mode      chmod value for this file
+     *
+     * @return          a <code>boolean</code> which indicates whether or not we were
+     *                  able to create the new file.
+     */
+    protected boolean installBinary(int sourceId, String destName, String mode) {
+        File mf = new File(filesPath + File.separator + destName);
+        if(!mf.exists()) {
+            // First, does our files/ directory even exist?
+            // We cannot wait for android to lazily create it as we will soon
+            // need it.
+            try {
+                FileInputStream fis = context.openFileInput(BOGUS_FILE_NAME);
+                fis.close();
+            } catch (FileNotFoundException e) {
+                FileOutputStream fos = null;
+                try {
+                    fos = context.openFileOutput("bogus", Context.MODE_PRIVATE);
+                    fos.write("justcreatedfilesdirectory".getBytes());
+                } catch (Exception ex) {
+                	if (RootTools.debugMode) {
+                		Log.e(LOG_TAG, ex.toString());
+                	}
+                    return false;
+                }
+                finally {
+                    if(null != fos) {
+                        try {
+                            fos.close();
+                            context.deleteFile(BOGUS_FILE_NAME);
+                        } catch (IOException e1) {}
+                    }
+                }
+            }
+            catch(IOException ex) {
+            	if (RootTools.debugMode) {
+            		Log.e(LOG_TAG, ex.toString());
+            	}
+                return false;
+            }
+
+            // Only now can we start creating our actual file
+            InputStream iss = context.getResources().openRawResource(sourceId);
+            FileOutputStream oss = null;
+            try {
+                oss = new FileOutputStream(mf);
+                byte [] buffer = new byte[4096];
+                int len;
+                try {
+                    while(-1 != (len = iss.read(buffer))) {
+                        oss.write(buffer, 0, len);
+                    }
+                } catch (IOException ex) {
+                	if (RootTools.debugMode) {
+                		Log.e(LOG_TAG, ex.toString());
+                	}
+                    return false;
+                }
+            } catch (FileNotFoundException ex) {
+            	if (RootTools.debugMode) {
+            		Log.e(LOG_TAG, ex.toString());
+            	}
+                return false;
+            }
+            finally {
+                if(oss != null) {
+                    try {
+                        oss.close();
+                    } catch (IOException e) {}
+                }
+            }
+            try {
+                iss.close();
+            } catch (IOException ex) {
+            	if (RootTools.debugMode) {
+            		Log.e(LOG_TAG, ex.toString());
+            	}
+                return false;
+            }
+
+            try {
+            	CommandCapture command = new CommandCapture(0, "chmod " + mode + " " + filesPath + File.separator + destName);
+            	Shell.startRootShell().add(command);
+            	command.waitForFinish();
+			} catch (Exception e) {}
+        }
+        return true;
+    }
+
+    protected boolean isBinaryInstalled(String destName) {
+        boolean installed = false;
+        File mf = new File(filesPath + File.separator + destName);
+        if(mf.exists()) {
+            installed = true;
+            // TODO: pass mode as argument and check it matches
+        }
+        return installed;
+    }
+}
diff --git a/src/com/stericson/RootTools/internal/.svn/text-base/InternalVariables.java.svn-base b/src/com/stericson/RootTools/internal/.svn/text-base/InternalVariables.java.svn-base
new file mode 100644
index 00000000..7654d87f
--- /dev/null
+++ b/src/com/stericson/RootTools/internal/.svn/text-base/InternalVariables.java.svn-base
@@ -0,0 +1,63 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import com.stericson.RootTools.containers.Mount;
+import com.stericson.RootTools.containers.Permissions;
+import com.stericson.RootTools.containers.Symlink;
+
+public class InternalVariables {
+
+    // ----------------------
+    // # Internal Variables #
+    // ----------------------
+
+    
+    protected static boolean accessGiven = false;
+    protected static boolean nativeToolsReady = false;
+    protected static boolean found = false;
+    protected static String[] space;
+    protected static String getSpaceFor;
+    protected static String busyboxVersion;
+    protected static Set<String> path;
+    protected static ArrayList<Mount> mounts;
+    protected static ArrayList<Symlink> symlinks;
+    protected static List<String> results;
+    protected static String inode = "";
+    protected static Permissions permissions;
+
+
+
+    // regex to get pid out of ps line, example:
+    // root 2611 0.0 0.0 19408 2104 pts/2 S 13:41 0:00 bash
+    protected static final String PS_REGEX = "^\\S+\\s+([0-9]+).*$";
+    protected static Pattern psPattern;
+    static {
+        psPattern = Pattern.compile(PS_REGEX);
+    }
+}
diff --git a/src/com/stericson/RootTools/internal/.svn/text-base/Remounter.java.svn-base b/src/com/stericson/RootTools/internal/.svn/text-base/Remounter.java.svn-base
new file mode 100644
index 00000000..78b722c4
--- /dev/null
+++ b/src/com/stericson/RootTools/internal/.svn/text-base/Remounter.java.svn-base
@@ -0,0 +1,145 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.internal;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import android.util.Log;
+
+import com.stericson.RootTools.Constants;
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.containers.Mount;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
+
+public class Remounter {
+
+    //-------------
+    //# Remounter #
+    //-------------
+
+    /**
+     * This will take a path, which can contain the file name as well,
+     * and attempt to remount the underlying partition.
+     * <p/>
+     * For example, passing in the following string:
+     * "/system/bin/some/directory/that/really/would/never/exist"
+     * will result in /system ultimately being remounted.
+     * However, keep in mind that the longer the path you supply, the more work this has to do,
+     * and the slower it will run.
+     *
+     * @param file      file path
+     * @param mountType mount type: pass in RO (Read only) or RW (Read Write)
+     * @return a <code>boolean</code> which indicates whether or not the partition
+     *         has been remounted as specified.
+     */
+
+    public boolean remount(String file, String mountType) {
+    	    	
+        //if the path has a trailing slash get rid of it.
+        if (file.endsWith("/") && !file.equals("/")) {
+            file = file.substring(0, file.lastIndexOf("/"));
+        }
+        //Make sure that what we are trying to remount is in the mount list.
+        boolean foundMount = false;
+        while (!foundMount) {
+            try {
+                for (Mount mount : RootTools.getMounts()) {
+                    RootTools.log(mount.getMountPoint().toString());
+
+                    if (file.equals(mount.getMountPoint().toString())) {
+                        foundMount = true;
+                        break;
+                    }
+                }
+            } catch (Exception e) {
+                if (RootTools.debugMode) {
+                    e.printStackTrace();
+                }
+                return false;
+            }
+            if (!foundMount) {
+                try {
+                    file = (new File(file).getParent()).toString();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return false;
+                }
+            }
+        }
+        Mount mountPoint = findMountPointRecursive(file);
+
+        RootTools.log(Constants.TAG, "Remounting " + mountPoint.getMountPoint().getAbsolutePath() + " as " + mountType.toLowerCase());
+        final boolean isMountMode = mountPoint.getFlags().contains(mountType.toLowerCase());
+
+        if (!isMountMode) {
+            //grab an instance of the internal class
+            try {
+            	CommandCapture command = new CommandCapture(0,
+				        		"busybox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),		
+				        		"toolbox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),		
+				        		"mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),				        		
+				        		"/system/bin/toolbox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath()		
+            	); 
+            	
+            	Shell.startRootShell().add(command);
+            	command.waitForFinish();
+            	
+			} catch (Exception e) {}
+			
+            mountPoint = findMountPointRecursive(file);
+        }
+
+        Log.i(Constants.TAG, mountPoint.getFlags() + " AND " + mountType.toLowerCase());
+        if (mountPoint.getFlags().contains(mountType.toLowerCase())) {
+            RootTools.log(mountPoint.getFlags().toString());
+            return true;
+        } else {
+            RootTools.log(mountPoint.getFlags().toString());
+            return false;
+        }
+    }
+
+    private Mount findMountPointRecursive(String file) {
+        try {
+            ArrayList<Mount> mounts = RootTools.getMounts();
+            for (File path = new File(file); path != null; ) {
+                for (Mount mount : mounts) {
+                    if (mount.getMountPoint().equals(path)) {
+                        return mount;
+                    }
+                }
+            }
+            return null;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (Exception e) {
+            if (RootTools.debugMode) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/stericson/RootTools/InternalMethods.java b/src/com/stericson/RootTools/internal/.svn/text-base/RootToolsInternalMethods.java.svn-base
similarity index 84%
rename from src/com/stericson/RootTools/InternalMethods.java
rename to src/com/stericson/RootTools/internal/.svn/text-base/RootToolsInternalMethods.java.svn-base
index f07ff7e3..12570a5c 100644
--- a/src/com/stericson/RootTools/InternalMethods.java
+++ b/src/com/stericson/RootTools/internal/.svn/text-base/RootToolsInternalMethods.java.svn-base
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.internal;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -32,7 +32,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 import java.util.regex.Matcher;
@@ -44,17 +43,33 @@
 import android.os.Environment;
 import android.os.StatFs;
 
+import com.stericson.RootTools.Constants;
+import com.stericson.RootTools.RootTools;
 import com.stericson.RootTools.RootTools.Result;
-
-//no modifier, this is package-private which means that no one but the library can access it.
-class InternalMethods
+import com.stericson.RootTools.containers.Mount;
+import com.stericson.RootTools.containers.Permissions;
+import com.stericson.RootTools.containers.Symlink;
+import com.stericson.RootTools.execution.Command;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
+
+public final class RootToolsInternalMethods
 {
 
 	// --------------------
 	// # Internal methods #
 	// --------------------
-
-	protected boolean returnPath() throws TimeoutException
+	boolean instantiated = false;
+	
+	protected RootToolsInternalMethods() {}
+	
+	public static void getInstance() {
+		//this will allow RootTools to be the only one to get an instance of this class.
+		RootTools.setRim(new RootToolsInternalMethods());
+	}
+	
+	
+	public boolean returnPath() throws TimeoutException
 	{
 
 		CommandCapture command = null;
@@ -112,7 +127,7 @@ protected boolean returnPath() throws TimeoutException
 		}
 	}
 
-	protected ArrayList<Symlink> getSymLinks() throws FileNotFoundException,
+	public ArrayList<Symlink> getSymLinks() throws FileNotFoundException,
 			IOException
 	{
 		LineNumberReader lnr = null;
@@ -140,7 +155,7 @@ protected ArrayList<Symlink> getSymLinks() throws FileNotFoundException,
 		}
 	}
 
-	protected Permissions getPermissions(String line)
+	public Permissions getPermissions(String line)
 	{
 
 		String[] lineArray = line.split(" ");
@@ -187,7 +202,7 @@ protected Permissions getPermissions(String line)
 		return null;
 	}
 
-	protected int parsePermissions(String permission)
+	public int parsePermissions(String permission)
 	{
 		int tmp;
 		if(permission.charAt(0) == 'r')
@@ -217,7 +232,7 @@ protected int parsePermissions(String permission)
 		return tmp;
 	}
 	
-	protected int parseSpecialPermissions(String permission)
+	public int parseSpecialPermissions(String permission)
 	{
 		int tmp = 0;
 		if(permission.charAt(2) == 's')
@@ -249,7 +264,7 @@ protected int parseSpecialPermissions(String permission)
      *            only permissions are preserved
      * @return true if it was successfully copied
      */
-    public static boolean copyFile(String source, String destination, boolean remountAsRw,
+    public boolean copyFile(String source, String destination, boolean remountAsRw,
             boolean preserveFileAttributes) {
         boolean result = true;
 
@@ -290,7 +305,7 @@ public static boolean copyFile(String source, String destination, boolean remoun
                         if (preserveFileAttributes) {
                             // get permissions of source before overwriting
                             Permissions permissions = getFilePermissionsSymlinks(source);
-                            filePermission = permissions.permissions;
+                            filePermission = permissions.getPermissions();
                         }
 
                         CommandCapture command;
@@ -326,13 +341,13 @@ public static boolean copyFile(String source, String destination, boolean remoun
 	 * it has either the permissions 755, 775, or 777.
 	 * 
 	 * 
-	 * @param String
+	 * @param util
 	 *            Name of the utility to check.
 	 * 
 	 * @return boolean to indicate whether the binary is installed and has
 	 *         appropriate permissions.
 	 */
-	static boolean checkUtil(String util)
+	public boolean checkUtil(String util)
 	{
 		if(RootTools.findBinary(util))
 		{
@@ -368,6 +383,58 @@ static boolean checkUtil(String util)
 
 	}
 
+    /**
+     * Deletes a file or directory
+     *
+     * @param target
+     *          example: /data/data/org.adaway/files/hosts
+     * @param remountAsRw
+     *          remounts the destination as read/write before writing to it
+     * @return true if it was successfully deleted
+     */
+    public boolean deleteFileOrDirectory(String target, boolean remountAsRw) {
+        boolean result = true;
+
+        try {
+            // mount destination as rw before writing to it
+            if (remountAsRw) {
+                RootTools.remount(target, "RW");
+            }
+
+            if (hasUtil("rm", "toolbox")) {
+                RootTools.log("rm command is available!");
+
+                CommandCapture command = new CommandCapture(0, "rm -r " + target);
+                Shell.startRootShell().add(command).waitForFinish();
+                if (command.exitCode() != 0) {
+                    RootTools.log("target not exist or unable to delete file");
+                    result = false;
+                }
+            } else {
+                if (checkUtil("busybox") && hasUtil("rm", "busybox")) {
+                    RootTools.log("busybox cp command is available!");
+
+                    CommandCapture command = new CommandCapture(0, "busybox rm -rf " + target);
+                    Shell.startRootShell().add(command).waitForFinish();
+                    if (command.exitCode() != 0) {
+                        RootTools.log("target not exist or unable to delete file");
+                        result = false;
+                    }
+                }
+            }
+
+            // mount destination back to ro
+            if (remountAsRw) {
+                RootTools.remount(target, "RO");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            result = false;
+        }
+
+        return result;
+   	}
+
 	/**
 	 * Use this to check whether or not a file exists on the filesystem.
 	 * 
@@ -378,7 +445,7 @@ static boolean checkUtil(String util)
 	 * @return a boolean that will indicate whether or not the file exists.
 	 * 
 	 */
-	public static boolean exists(final String file)
+	public boolean exists(final String file)
 	{
 		final List<String> result = new ArrayList<String>();
 		
@@ -449,14 +516,14 @@ public void output(int arg0, String arg1)
      * "fix", I mean it will try and symlink the binary from either toolbox or Busybox and fix the
      * permissions if the permissions are not correct.
      * 
-     * @param String
+     * @param util
      *            Name of the utility to fix.
-     * @param String
+     * @param utilPath
      *            path to the toolbox that provides ln, rm, and chmod. This can be a blank string, a
      *            path to a binary that will provide these, or you can use
      *            RootTools.getWorkingToolbox()
      */
-    public static void fixUtil(String util, String utilPath) {
+    public void fixUtil(String util, String utilPath) {
         try {
             RootTools.remount("/system", "rw");
 
@@ -482,7 +549,7 @@ public static void fixUtil(String util, String utilPath) {
      * either the permissions 755, 775, or 777. If an applet is not setup correctly it will try and
      * fix it. (This is for Busybox applets or Toolbox applets)
      * 
-     * @param String
+     * @param utils
      *            Name of the utility to check.
      * 
      * @throws Exception
@@ -492,7 +559,7 @@ public static void fixUtil(String util, String utilPath) {
      *         of whether the problem was fixed, just that the method did not encounter any
      *         exceptions.
      */
-    static boolean fixUtils(String[] utils) throws Exception {
+    public boolean fixUtils(String[] utils) throws Exception {
 
         for (String util : utils) {
             if (!checkUtil(util)) {
@@ -525,7 +592,7 @@ static boolean fixUtils(String[] utils) throws Exception {
      *         found in more than one location this will contain all of these locations.
      * 
      */
-    static boolean findBinary(String binaryName) {
+    public boolean findBinary(String binaryName) {
         boolean found = false;
         RootTools.lastFoundBinaryPaths.clear();
 
@@ -588,25 +655,33 @@ static boolean findBinary(String binaryName) {
      * This will return an List of Strings. Each string represents an applet available from BusyBox.
      * <p/>
      * 
+     * @param path
+     *				Path to the busybox binary that you want the list of applets from.
+     *
      * @return <code>List<String></code> a List of strings representing the applets available from
      *         Busybox.
-     * @throws Exception
-     *             if we cannot return the applets available.
+     *         
+     * @return <code>null</code> If we cannot return the list of applets.
      */
-    static List<String> getBusyBoxApplets() throws Exception {
+    public List<String> getBusyBoxApplets(String path) throws Exception {
     	
+    	if (path != null && !path.endsWith("/") && !path.equals("")) {
+    		path += "/";
+        } else if (path == null) {
+            //Don't know what the user wants to do...what am I pshycic?
+            throw new Exception("Path is null, please specifiy a path");
+        }
+
     	final List<String> results = new ArrayList<String>();
     	
-    	Command command = new Command(InternalVariables.BBA, "busybox --list")
-    	{
+    	Command command = new Command(Constants.BBA, path + "busybox --list") {
 
 			@Override
-			public void output(int id, String line)
-			{
-				if (id == InternalVariables.BBA)
-				{
-					if (!line.trim().equals(""))
+			public void output(int id, String line) {
+				if (id == Constants.BBA) {
+					if (!line.trim().equals("") && !line.trim().contains("not found")) {
 						results.add(line);
+                    }
 				}				
 			}    		
     	};
@@ -614,29 +689,30 @@ public void output(int id, String line)
     	Shell.startRootShell().add(command);
     	command.waitForFinish();
     	
-        if (InternalVariables.results != null) {
-            return InternalVariables.results;
-        } else {
-            throw new Exception();
-        }
+        return results;
     }
     
     /**
      * @return BusyBox version is found, "" if not found.
      */
-    static String getBusyBoxVersion() {
+    public String getBusyBoxVersion(String path) {
+
+    	if (!path.equals("") && !path.endsWith("/"))
+    	{
+    		path += "/";
+    	}
+    	
         RootTools.log("Getting BusyBox Version");
-        InternalVariables.busyboxVersion = null;
+        InternalVariables.busyboxVersion = "";
         try {
-        	Command command = new Command(InternalVariables.BBV, "busybox")
+        	Command command = new Command(Constants.BBV, path + "busybox")
         	{
-
 				@Override
 				public void output(int id, String line)
 				{
-					if (id == InternalVariables.BBV)
+					if (id == Constants.BBV)
 					{
-		                if (line.startsWith("BusyBox")) {
+		                if (line.startsWith("BusyBox") && InternalVariables.busyboxVersion.equals("")) {
 		                    String[] temp = line.split(" ");
 		                    InternalVariables.busyboxVersion = temp[1];
 		                }
@@ -651,13 +727,14 @@ public void output(int id, String line)
             RootTools.log("BusyBox was not found, more information MAY be available with Debugging on.");
             return "";
         }
+        
         return InternalVariables.busyboxVersion;
     }
     
 	/**
 	 * @return long Size, converted to kilobytes (from xxx or xxxm or xxxk etc.)
 	 */
-	protected long getConvertedSpace(String spaceStr)
+	public long getConvertedSpace(String spaceStr)
 	{
 		try
 		{
@@ -693,21 +770,21 @@ else if(c == 'g' || c == 'G')
      * This method will return the inode number of a file. This method is dependent on having a version of
      * ls that supports the -i parameter. 
      * 
-     *  @param String path to the file that you wish to return the inode number
+     *  @param file path to the file that you wish to return the inode number
      *  
      *  @return String The inode number for this file or "" if the inode number could not be found.
      */
-    static String getInode(String file)
+    public String getInode(String file)
     {
     	try
     	{
-    		Command command = new Command(InternalVariables.GI, "/data/local/ls -i " + file)
+    		Command command = new Command(Constants.GI, "/data/local/ls -i " + file)
     		{
 
 				@Override
 				public void output(int id, String line)
 				{
-					if (id == InternalVariables.GI)
+					if (id == Constants.GI)
 					{
 			    		if (!line.trim().equals("") && Character.isDigit((char) line.trim().substring(0, 1).toCharArray()[0]))
 			    		{
@@ -732,17 +809,17 @@ public void output(int id, String line)
      * @throws TimeoutException
      *             if this operation times out. (cannot determine if access is given)
      */
-    static boolean isAccessGiven() {
+    public boolean isAccessGiven() {
         try {
             RootTools.log("Checking for Root access");
             InternalVariables.accessGiven = false;
             
-        	Command command = new Command(InternalVariables.IAG, "id")
+        	Command command = new Command(Constants.IAG, "id")
         	{
 				@Override
 				public void output(int id, String line)
 				{
-					if (id == InternalVariables.IAG)
+					if (id == Constants.IAG)
 					{
 						Set<String> ID = new HashSet<String>(Arrays.asList(line.split(" ")));
 		                for (String userid : ID) {
@@ -772,8 +849,6 @@ public void output(int id, String line)
             }
 
         } catch (Exception e) {
-            if(e.getMessage().toLowerCase(Locale.US).contains("denied"))
-                return false;
             e.printStackTrace();
             return false;
         } finally {
@@ -781,7 +856,7 @@ public void output(int id, String line)
         }
     }
 
-    static boolean isNativeToolsReady(int nativeToolsId, Context context) {
+    public boolean isNativeToolsReady(int nativeToolsId, Context context) {
         RootTools.log("Preparing Native Tools");
         InternalVariables.nativeToolsReady = false;
 
@@ -815,7 +890,7 @@ static boolean isNativeToolsReady(int nativeToolsId, Context context) {
 	 *         permissions couldn't be determined then permissions will be null.
 	 * 
 	 */
-	static Permissions getFilePermissionsSymlinks(String file)
+	public Permissions getFilePermissionsSymlinks(String file)
 	{
 		RootTools.log("Checking permissions for " + file);
 		if(RootTools.exists(file))
@@ -825,7 +900,7 @@ static Permissions getFilePermissionsSymlinks(String file)
 			{
 
 				Command command = new Command(
-						InternalVariables.FPS, "ls -l " + file,
+						Constants.FPS, "ls -l " + file,
 						"busybox ls -l " + file,
 						"/system/bin/failsafe/toolbox ls -l " + file,
 						"toolbox ls -l " + file)
@@ -833,7 +908,7 @@ static Permissions getFilePermissionsSymlinks(String file)
 					@Override
 					public void output(int id, String line)
 					{
-						if(id == InternalVariables.FPS)
+						if(id == Constants.FPS)
 						{
 							String symlink_final = "";
 
@@ -860,7 +935,7 @@ public void output(int id, String line)
 
 							try
 							{
-								InternalVariables.permissions = new InternalMethods().getPermissions(line);
+								InternalVariables.permissions = getPermissions(line);
 								if(InternalVariables.permissions != null)
 								{
 									InternalVariables.permissions.setSymlink(symlink_final);
@@ -900,7 +975,7 @@ public void output(int id, String line)
      * @throws Exception
      *             if we cannot return the mount points.
      */
-	protected static ArrayList<Mount> getMounts() throws Exception
+	public ArrayList<Mount> getMounts() throws Exception
 	{
 		LineNumberReader lnr = null;
 		lnr = new LineNumberReader(new FileReader("/proc/mounts"));
@@ -930,13 +1005,13 @@ protected static ArrayList<Mount> getMounts() throws Exception
     /**
      * This will tell you how the specified mount is mounted. rw, ro, etc...
      * <p/>
-     * @param The mount you want to check
+     * @param path mount you want to check
      * 
      * @return <code>String</code> What the mount is mounted as.
      * @throws Exception
      *             if we cannot determine how the mount is mounted.
      */
-    static String getMountedAs(String path) throws Exception {
+    public String getMountedAs(String path) throws Exception {
         InternalVariables.mounts = getMounts();
         if (InternalVariables.mounts != null) {
         	for (Mount mount : InternalVariables.mounts)
@@ -963,11 +1038,11 @@ static String getMountedAs(String path) throws Exception {
      * @throws Exception
      *             if we cannot return the $PATH variable
      */
-    static Set<String> getPath() throws Exception {
+    public Set<String> getPath() throws Exception {
         if (InternalVariables.path != null) {
             return InternalVariables.path;
         } else {
-            if (new InternalMethods().returnPath()) {
+            if (returnPath()) {
                 return InternalVariables.path;
             } else {
                 throw new Exception();
@@ -984,20 +1059,20 @@ static Set<String> getPath() throws Exception {
      *         then the value is -1
      * @throws TimeoutException
      */
-    static long getSpace(String path) {
+    public long getSpace(String path) {
         InternalVariables.getSpaceFor = path;
         boolean found = false;
         RootTools.log("Looking for Space");
         try {
-            Command command = new Command(InternalVariables.GS, "df " + path)
+            final Command command = new Command(Constants.GS, "df " + path)
             {
 
 				@Override
 				public void output(int id, String line)
 				{
-					if (id == InternalVariables.GS)
+					if (id == Constants.GS)
 					{
-						if (line.contains(command[0].substring(2, command[0].length()).trim())) {
+						if (line.contains(InternalVariables.getSpaceFor.trim())) {
 		                    InternalVariables.space = line.split(" ");
 		                }
 					}					
@@ -1016,7 +1091,7 @@ public void output(int id, String line)
                 RootTools.log(spaceSearch);
 
                 if (found) {
-                    return new InternalMethods().getConvertedSpace(spaceSearch);
+                    return getConvertedSpace(spaceSearch);
                 } else if (spaceSearch.equals("used,")) {
                     found = true;
                 }
@@ -1037,7 +1112,7 @@ public void output(int id, String line)
                 if (spaceSearch.length() > 0) {
                     RootTools.log(spaceSearch + ("Valid"));
                     if (count == targetCount) {
-                        return new InternalMethods().getConvertedSpace(spaceSearch);
+                        return getConvertedSpace(spaceSearch);
                     }
                     count++;
                 }
@@ -1051,25 +1126,25 @@ public void output(int id, String line)
      * This will return a String that represent the symlink for a specified file.
      * <p/>
      * 
-     * @param The
+     * @param file
      *            file to get the Symlink for. (must have absolute path)
      * 
      * @return <code>String</code> a String that represent the symlink for a specified file or an
      *         empty string if no symlink exists.
      */
-    static String getSymlink(String file) {
+    public String getSymlink(String file) {
         RootTools.log("Looking for Symlink for " + file);
 
         try {
         	final List<String> results = new ArrayList<String>();
 
-        	Command command = new Command(InternalVariables.GSYM, "ls -l " + file)
+        	Command command = new Command(Constants.GSYM, "ls -l " + file)
         	{
 
 				@Override
 				public void output(int id, String line)
 				{
-					if (id == InternalVariables.GSYM)
+					if (id == Constants.GSYM)
 					{
 						if (!line.trim().equals(""))
 						{
@@ -1124,14 +1199,14 @@ public void output(int id, String line)
      * <p/>
      * These will provide you with any Symlinks in the given path.
      * 
-     * @param The
+     * @param path
      *            path to search for Symlinks.
      * 
      * @return <code>ArrayList<Symlink></code> an ArrayList of the class Symlink.
      * @throws Exception
      *             if we cannot return the Symlinks.
      */
-    static ArrayList<Symlink> getSymlinks(String path) throws Exception {
+    public ArrayList<Symlink> getSymlinks(String path) throws Exception {
 
         // this command needs find
         if (!checkUtil("find")) {
@@ -1142,7 +1217,7 @@ static ArrayList<Symlink> getSymlinks(String path) throws Exception {
         Shell.startRootShell().add(command);
         command.waitForFinish();
         
-        InternalVariables.symlinks = new InternalMethods().getSymLinks();
+        InternalVariables.symlinks = getSymLinks();
         if (InternalVariables.symlinks != null) {
             return InternalVariables.symlinks;
         } else {
@@ -1157,7 +1232,7 @@ static ArrayList<Symlink> getSymlinks(String path) throws Exception {
      * 
      * @return String that indicates the available toolbox to use for accessing applets.
      */
-    static String getWorkingToolbox() {
+    public String getWorkingToolbox() {
         if (RootTools.checkUtil("busybox")) {
             return "busybox";
         } else if (RootTools.checkUtil("toolbox")) {
@@ -1176,7 +1251,7 @@ static String getWorkingToolbox() {
      *         space on SDCard. Will also return <code>false</code>, if the SDCard is not mounted as
      *         read/write
      */
-    public static boolean hasEnoughSpaceOnSdCard(long updateSize) {
+    public boolean hasEnoughSpaceOnSdCard(long updateSize) {
         RootTools.log("Checking SDcard size and that it is mounted as RW");
         String status = Environment.getExternalStorageState();
         if (!status.equals(Environment.MEDIA_MOUNTED)) {
@@ -1197,64 +1272,41 @@ public static boolean hasEnoughSpaceOnSdCard(long updateSize) {
      *            Should contain "toolbox" or "busybox"
      * @return true if it contains this util
      */
-    public static boolean hasUtil(final String util, final String box) {
-
+    public boolean hasUtil(final String util, final String box) {
+    	
+    	InternalVariables.found = false;
+    	
         // only for busybox and toolbox
-        if (!(box.equals("toolbox") || box.equals("busybox"))) {
+        if (!(box.endsWith("toolbox") || box.endsWith("busybox"))) {
             return false;
         }
-
+        
         try {
-            Result result = new Result() {
-                @Override
-                public void process(String line) throws Exception {
-                    // TODO: blocking shell commands like "toolbox watchprops" makes this stuck
-                    // possible fix could be terminating the running process after one line output
-                    if (box.equals("toolbox")) {
+        	
+        	Command command = new Command(0, box.endsWith("toolbox") ? box + " " + util : box + " --list" ) {
+
+				@Override
+				public void output(int id, String line)
+				{
+					if (box.endsWith("toolbox")) {
                         if (line.contains("no such tool")) {
-                            setError(1);
+                        	InternalVariables.found = true;
                         }
-                    } else if (box.equals("busybox")) {
+                    } else if (box.endsWith("busybox")) {
                         // go through all lines of busybox --list
                         if (line.contains(util)) {
                             RootTools.log("Found util!");
-                            setData(1);
+                            InternalVariables.found = true;
                         }
-                    }
-                }
-
-                @Override
-                public void onFailure(Exception ex) {
-                    setError(2);
-                }
-
-                @Override
-                public void onComplete(int diag) {
-                }
-
-                @Override
-                public void processError(String arg0) throws Exception {
-                    getProcess().destroy();
-                }
-
-            };
-            if (box.equals("toolbox")) {
-                RootTools.sendShell(new String[] { "toolbox " + util }, 0, result, false,
-                        InternalVariables.timeout);
-            } else if (box.equals("busybox")) {
-                RootTools.sendShell(new String[] { "busybox --list" }, 0, result, false,
-                        InternalVariables.timeout);
-            }
-
-            if (result.getError() == 0) {
-                // if data has been set process is running
-                if (result.getData() != null) {
-                    RootTools.log("Box contains " + util + " util!");
-                    return true;
-                } else {
-                    RootTools.log("Box does not contain " + util + " util!");
-                    return false;
-                }
+                    }					
+				}
+        		
+        	};
+        	RootTools.getShell(true).add(command).waitForFinish(5000);
+        	
+            if (InternalVariables.found) {
+                RootTools.log("Box contains " + util + " util!");
+                return true;
             } else {
                 RootTools.log("Box does not contain " + util + " util!");
                 return false;
@@ -1281,7 +1333,7 @@ public void processError(String arg0) throws Exception {
      * @return a <code>boolean</code> which indicates whether or not we were able to create the new
      *         file.
      */
-    static boolean installBinary(Context context, int sourceId, String destName, String mode) {
+    public boolean installBinary(Context context, int sourceId, String destName, String mode) {
         Installer installer;
 
         try {
@@ -1300,14 +1352,14 @@ static boolean installBinary(Context context, int sourceId, String destName, Str
      * This will let you know if an applet is available from BusyBox
      * <p/>
      * 
-     * @param <code>String</code> The applet to check for.
+     * @param applet The applet to check for.
      * 
      * @return <code>true</code> if applet is available, false otherwise.
      */
-    public static boolean isAppletAvailable(String Applet) {
+    public boolean isAppletAvailable(String applet, String binaryPath) {
         try {
-            for (String applet : getBusyBoxApplets()) {
-                if (applet.equals(Applet)) {
+            for (String aplet : getBusyBoxApplets(binaryPath)) {
+                if (aplet.equals(applet)) {
                     return true;
                 }
             }
@@ -1327,7 +1379,7 @@ public static boolean isAppletAvailable(String Applet) {
      * @throws TimeoutException
      *             (Could not determine if the process is running)
      */
-    static boolean isProcessRunning(final String processName) {
+    public boolean isProcessRunning(final String processName) {
         RootTools.log("Checks if process is running: " + processName);
 
         boolean processRunning = false;
@@ -1376,7 +1428,7 @@ public void processError(String arg0) throws Exception {
 	 *            name of process to kill
 	 * @return <code>true</code> if process was found and killed successfully
 	 */
-	static boolean killProcess(final String processName)
+	public boolean killProcess(final String processName)
 	{
 		RootTools.log("Killing process " + processName);
 
@@ -1476,7 +1528,7 @@ public void processError(String arg0) throws Exception
      * @param activity
      *            pass in your Activity
      */
-    static void offerBusyBox(Activity activity) {
+    public void offerBusyBox(Activity activity) {
         RootTools.log("Launching Market for BusyBox");
         Intent i = new Intent(Intent.ACTION_VIEW,
                 Uri.parse("market://details?id=stericson.busybox"));
@@ -1493,7 +1545,7 @@ static void offerBusyBox(Activity activity) {
      *            pass in the request code
      * @return intent fired
      */
-    static Intent offerBusyBox(Activity activity, int requestCode) {
+    public Intent offerBusyBox(Activity activity, int requestCode) {
         RootTools.log("Launching Market for BusyBox");
         Intent i = new Intent(Intent.ACTION_VIEW,
                 Uri.parse("market://details?id=stericson.busybox"));
@@ -1507,7 +1559,7 @@ static Intent offerBusyBox(Activity activity, int requestCode) {
      * @param activity
      *            pass in your Activity
      */
-    static void offerSuperUser(Activity activity) {
+    public void offerSuperUser(Activity activity) {
         RootTools.log("Launching Market for SuperUser");
         Intent i = new Intent(Intent.ACTION_VIEW,
                 Uri.parse("market://details?id=com.noshufou.android.su"));
@@ -1524,7 +1576,7 @@ static void offerSuperUser(Activity activity) {
      *            pass in the request code
      * @return intent fired
      */
-    static Intent offerSuperUser(Activity activity, int requestCode) {
+    public Intent offerSuperUser(Activity activity, int requestCode) {
         RootTools.log("Launching Market for SuperUser");
         Intent i = new Intent(Intent.ACTION_VIEW,
                 Uri.parse("market://details?id=com.noshufou.android.su"));
diff --git a/src/com/stericson/RootTools/internal/.svn/text-base/Runner.java.svn-base b/src/com/stericson/RootTools/internal/.svn/text-base/Runner.java.svn-base
new file mode 100644
index 00000000..253d1ea9
--- /dev/null
+++ b/src/com/stericson/RootTools/internal/.svn/text-base/Runner.java.svn-base
@@ -0,0 +1,67 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.internal;
+
+import java.io.IOException;
+
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
+
+import android.content.Context;
+import android.util.Log;
+
+public class Runner extends Thread {
+
+    private static final String LOG_TAG = "RootTools::Runner";
+
+    Context context;
+    String binaryName;
+    String parameter;
+
+    public Runner(Context context, String binaryName, String parameter) {
+        this.context = context;
+        this.binaryName = binaryName;
+        this.parameter = parameter;
+    }
+
+    public void run() {
+        String privateFilesPath = null;
+        try {
+            privateFilesPath = context.getFilesDir().getCanonicalPath();
+        } catch (IOException e) {
+            if (RootTools.debugMode) {
+                Log.e(LOG_TAG, "Problem occured while trying to locate private files directory!");
+            }
+            e.printStackTrace();
+        }
+        if (privateFilesPath != null) {
+            try {
+            	CommandCapture command = new CommandCapture(0, privateFilesPath + "/" + binaryName + " " + parameter);
+            	Shell.startRootShell().add(command);
+            	command.waitForFinish();
+			} catch (Exception e) {}
+        }
+    }
+
+}
diff --git a/src/com/stericson/RootTools/Installer.java b/src/com/stericson/RootTools/internal/Installer.java
similarity index 96%
rename from src/com/stericson/RootTools/Installer.java
rename to src/com/stericson/RootTools/internal/Installer.java
index 857cbedb..31d0d425 100644
--- a/src/com/stericson/RootTools/Installer.java
+++ b/src/com/stericson/RootTools/internal/Installer.java
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,6 +29,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
+
 import android.content.Context;
 import android.util.Log;
 
diff --git a/src/com/stericson/RootTools/InternalVariables.java b/src/com/stericson/RootTools/internal/InternalVariables.java
similarity index 74%
rename from src/com/stericson/RootTools/InternalVariables.java
rename to src/com/stericson/RootTools/internal/InternalVariables.java
index eb876557..7654d87f 100644
--- a/src/com/stericson/RootTools/InternalVariables.java
+++ b/src/com/stericson/RootTools/internal/InternalVariables.java
@@ -20,38 +20,30 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-//no modifier, this is package-private which means that no one but the library can access it.
-//If we need public variables just create the class for it.
-class InternalVariables {
+import com.stericson.RootTools.containers.Mount;
+import com.stericson.RootTools.containers.Permissions;
+import com.stericson.RootTools.containers.Symlink;
+
+public class InternalVariables {
 
     // ----------------------
     // # Internal Variables #
     // ----------------------
 
-	//Constants
-    // Version numbers should be maintained here.
-    protected static String TAG = "RootTools v2.";
-    protected static int timeout = 5000;
-    protected static int FPS = 1;
-    protected static int IAG = 2;
-    protected static int BBA = 3;
-    protected static int BBV = 4;
-    protected static int GI = 5;
-    protected static int GS = 6;
-    protected static int GSYM = 7;
     
     protected static boolean accessGiven = false;
     protected static boolean nativeToolsReady = false;
+    protected static boolean found = false;
     protected static String[] space;
     protected static String getSpaceFor;
-    protected static String busyboxVersion = "";
+    protected static String busyboxVersion;
     protected static Set<String> path;
     protected static ArrayList<Mount> mounts;
     protected static ArrayList<Symlink> symlinks;
diff --git a/src/com/stericson/RootTools/Remounter.java b/src/com/stericson/RootTools/internal/Remounter.java
similarity index 87%
rename from src/com/stericson/RootTools/Remounter.java
rename to src/com/stericson/RootTools/internal/Remounter.java
index 63fb7a06..78b722c4 100644
--- a/src/com/stericson/RootTools/Remounter.java
+++ b/src/com/stericson/RootTools/internal/Remounter.java
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,8 +28,13 @@
 
 import android.util.Log;
 
-//no modifier, this means it is package-private. Only our internal classes can use this.
-class Remounter {
+import com.stericson.RootTools.Constants;
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.containers.Mount;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
+
+public class Remounter {
 
     //-------------
     //# Remounter #
@@ -51,7 +56,7 @@ class Remounter {
      *         has been remounted as specified.
      */
 
-    protected boolean remount(String file, String mountType) {
+    public boolean remount(String file, String mountType) {
     	    	
         //if the path has a trailing slash get rid of it.
         if (file.endsWith("/") && !file.equals("/")) {
@@ -86,14 +91,14 @@ protected boolean remount(String file, String mountType) {
         }
         Mount mountPoint = findMountPointRecursive(file);
 
-        RootTools.log(InternalVariables.TAG, "Remounting " + mountPoint.getMountPoint().getAbsolutePath() + " as " + mountType.toLowerCase());
+        RootTools.log(Constants.TAG, "Remounting " + mountPoint.getMountPoint().getAbsolutePath() + " as " + mountType.toLowerCase());
         final boolean isMountMode = mountPoint.getFlags().contains(mountType.toLowerCase());
 
         if (!isMountMode) {
             //grab an instance of the internal class
             try {
             	CommandCapture command = new CommandCapture(0,
-				        		"busybox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " -t yaffs2 " + mountPoint.getMountPoint().getAbsolutePath(),		
+				        		"busybox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),		
 				        		"toolbox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),		
 				        		"mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),				        		
 				        		"/system/bin/toolbox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath()		
@@ -107,7 +112,7 @@ protected boolean remount(String file, String mountType) {
             mountPoint = findMountPointRecursive(file);
         }
 
-        Log.i(InternalVariables.TAG, mountPoint.getFlags() + " AND " + mountType.toLowerCase());
+        Log.i(Constants.TAG, mountPoint.getFlags() + " AND " + mountType.toLowerCase());
         if (mountPoint.getFlags().contains(mountType.toLowerCase())) {
             RootTools.log(mountPoint.getFlags().toString());
             return true;
diff --git a/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java b/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java
new file mode 100644
index 00000000..37944aed
--- /dev/null
+++ b/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java
@@ -0,0 +1,1587 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.internal;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeoutException;
+import java.util.regex.Matcher;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.StatFs;
+
+import com.stericson.RootTools.Constants;
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.RootTools.Result;
+import com.stericson.RootTools.containers.Mount;
+import com.stericson.RootTools.containers.Permissions;
+import com.stericson.RootTools.containers.Symlink;
+import com.stericson.RootTools.execution.Command;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
+
+public final class RootToolsInternalMethods
+{
+
+	// --------------------
+	// # Internal methods #
+	// --------------------
+	boolean instantiated = false;
+	
+	protected RootToolsInternalMethods() {}
+	
+	public static void getInstance() {
+		//this will allow RootTools to be the only one to get an instance of this class.
+		RootTools.setRim(new RootToolsInternalMethods());
+	}
+	
+	
+	public boolean returnPath() throws TimeoutException
+	{
+
+		CommandCapture command = null;
+
+		try
+		{
+			if(!RootTools.exists("/data/local/tmp"))
+			{
+				command = new CommandCapture(0, "mkdir /data/local/tmp");
+				Shell.startRootShell().add(command).waitForFinish();
+			}
+
+			InternalVariables.path = new HashSet<String>();
+			// Try to read from the file.
+			LineNumberReader lnr = null;
+
+			String mountedas = RootTools.getMountedAs("/");
+			RootTools.remount("/", "rw");
+
+			command = new CommandCapture(0, "chmod 0777 /init.rc");
+			Shell.startRootShell().add(command);
+			command = new CommandCapture(0,
+					"dd if=/init.rc of=/data/local/tmp/init.rc");
+			Shell.startRootShell().add(command);
+			command = new CommandCapture(0,
+					"chmod 0777 /data/local/tmp/init.rc");
+			Shell.startRootShell().add(command).waitForFinish();
+
+			RootTools.remount("/", mountedas);
+
+			lnr = new LineNumberReader(
+					new FileReader("/data/local/tmp/init.rc"));
+			String line;
+			while ((line = lnr.readLine()) != null)
+			{
+				RootTools.log(line);
+				if(line.contains("export PATH"))
+				{
+					int tmp = line.indexOf("/");
+					InternalVariables.path = new HashSet<String>(
+							Arrays.asList(line.substring(tmp).split(":")));
+					return true;
+				}
+			}
+			return false;
+		}
+		catch (Exception e)
+		{
+			if(RootTools.debugMode)
+			{
+				RootTools.log("Error: " + e.getMessage());
+				e.printStackTrace();
+			}
+			return false;
+		}
+	}
+
+	public ArrayList<Symlink> getSymLinks() throws FileNotFoundException,
+			IOException
+	{
+		LineNumberReader lnr = null;
+		try
+		{
+			lnr = new LineNumberReader(new FileReader(
+					"/data/local/symlinks.txt"));
+			String line;
+			ArrayList<Symlink> symlink = new ArrayList<Symlink>();
+			while ((line = lnr.readLine()) != null)
+			{
+
+				RootTools.log(line);
+
+				String[] fields = line.split(" ");
+				symlink.add(new Symlink(new File(fields[fields.length - 3]), // file
+						new File(fields[fields.length - 1]) // SymlinkPath
+				));
+			}
+			return symlink;
+		}
+		finally
+		{
+			// no need to do anything here.
+		}
+	}
+
+	public Permissions getPermissions(String line)
+	{
+
+		String[] lineArray = line.split(" ");
+		String rawPermissions = lineArray[0];
+
+		if(rawPermissions.length() == 10
+				&& (rawPermissions.charAt(0) == '-'
+						|| rawPermissions.charAt(0) == 'd' || rawPermissions
+						.charAt(0) == 'l')
+				&& (rawPermissions.charAt(1) == '-' || rawPermissions.charAt(1) == 'r')
+				&& (rawPermissions.charAt(2) == '-' || rawPermissions.charAt(2) == 'w'))
+		{
+			//RootTools.log(rawPermissions);
+
+			Permissions permissions = new Permissions();
+
+			permissions.setType(rawPermissions.substring(0, 1));
+
+			//RootTools.log(permissions.getType());
+
+			permissions.setUserPermissions(rawPermissions.substring(1, 4));
+
+			//RootTools.log(permissions.getUserPermissions());
+
+			permissions.setGroupPermissions(rawPermissions.substring(4, 7));
+
+			//RootTools.log(permissions.getGroupPermissions());
+
+			permissions.setOtherPermissions(rawPermissions.substring(7, 10));
+
+			//RootTools.log(permissions.getOtherPermissions());
+
+			StringBuilder finalPermissions = new StringBuilder();
+			finalPermissions.append(parseSpecialPermissions(rawPermissions));
+			finalPermissions.append(parsePermissions(permissions.getUserPermissions()));
+			finalPermissions.append(parsePermissions(permissions.getGroupPermissions()));
+			finalPermissions.append(parsePermissions(permissions.getOtherPermissions()));
+
+			permissions.setPermissions(Integer.parseInt(finalPermissions.toString()));
+
+			return permissions;
+		}
+
+		return null;
+	}
+
+	public int parsePermissions(String permission)
+	{
+		int tmp;
+		if(permission.charAt(0) == 'r')
+			tmp = 4;
+		else
+			tmp = 0;
+
+		//RootTools.log("permission " + tmp);
+		//RootTools.log("character " + permission.charAt(0));
+
+		if(permission.charAt(1) == 'w')
+			tmp += 2;
+		else
+			tmp += 0;
+
+		//RootTools.log("permission " + tmp);
+		//RootTools.log("character " + permission.charAt(1));
+
+		if(permission.charAt(2) == 'x')
+			tmp += 1;
+		else
+			tmp += 0;
+
+		//RootTools.log("permission " + tmp);
+		//RootTools.log("character " + permission.charAt(2));
+
+		return tmp;
+	}
+	
+	public int parseSpecialPermissions(String permission)
+	{
+		int tmp = 0;
+		if(permission.charAt(2) == 's')
+			tmp += 4;
+
+		if(permission.charAt(5) == 's')
+			tmp += 2;
+
+		if(permission.charAt(8) == 't')
+			tmp += 1;
+
+		//RootTools.log("special permissions " + tmp);
+
+		return tmp;
+	}
+	
+    /**
+     * Copys a file to a destination. Because cp is not available on all android devices, we have a
+     * fallback on the cat command
+     * 
+     * @param source
+     *            example: /data/data/org.adaway/files/hosts
+     * @param destination
+     *            example: /system/etc/hosts
+     * @param remountAsRw
+     *            remounts the destination as read/write before writing to it
+     * @param preserveFileAttributes
+     *            tries to copy file attributes from source to destination, if only cat is available
+     *            only permissions are preserved
+     * @return true if it was successfully copied
+     */
+    public boolean copyFile(String source, String destination, boolean remountAsRw,
+            boolean preserveFileAttributes) {
+        boolean result = true;
+
+        try {
+            // mount destination as rw before writing to it
+            if (remountAsRw) {
+                RootTools.remount(destination, "RW");
+            }
+
+            // if cp is available and has appropriate permissions
+            if (checkUtil("cp")) {
+                RootTools.log("cp command is available!");
+
+                if (preserveFileAttributes) {
+                	CommandCapture command = new CommandCapture(0, "cp -fp " + source + " " + destination);
+                	Shell.startRootShell().add(command).waitForFinish();
+                } else {
+                	CommandCapture command = new CommandCapture(0, "cp -f " + source + " " + destination);
+                	Shell.startRootShell().add(command).waitForFinish();
+                }
+            } else {
+                if (checkUtil("busybox") && hasUtil("cp", "busybox")) {
+                    RootTools.log("busybox cp command is available!");
+
+                    if (preserveFileAttributes) {
+                    	CommandCapture command = new CommandCapture(0, "busybox cp -fp " + source + " " + destination);
+                    	Shell.startRootShell().add(command).waitForFinish();
+                    } else {
+                    	CommandCapture command = new CommandCapture(0, "busybox cp -f " + source + " " + destination);
+                    	Shell.startRootShell().add(command).waitForFinish();
+                    }
+                } else { // if cp is not available use cat
+                    // if cat is available and has appropriate permissions
+                    if (checkUtil("cat")) {
+                        RootTools.log("cp is not available, use cat!");
+
+                        int filePermission = -1;
+                        if (preserveFileAttributes) {
+                            // get permissions of source before overwriting
+                            Permissions permissions = getFilePermissionsSymlinks(source);
+                            filePermission = permissions.getPermissions();
+                        }
+
+                        CommandCapture command;
+                        // copy with cat
+                    	command = new CommandCapture(0, "cat " + source + " > " + destination);
+                    	Shell.startRootShell().add(command).waitForFinish();
+                        
+                        if (preserveFileAttributes) {
+                            // set premissions of source to destination
+                        	command = new CommandCapture(0, "chmod " + filePermission + " " + destination);
+                        	Shell.startRootShell().add(command).waitForFinish();
+                        }
+                    } else {
+                        result = false;
+                    }
+                }
+            }
+
+            // mount destination back to ro
+            if (remountAsRw) {
+                RootTools.remount(destination, "RO");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            result = false;
+        }
+
+        return result;
+    }
+
+	/**
+	 * This will check a given binary, determine if it exists and determine that
+	 * it has either the permissions 755, 775, or 777.
+	 * 
+	 * 
+	 * @param util
+	 *            Name of the utility to check.
+	 * 
+	 * @return boolean to indicate whether the binary is installed and has
+	 *         appropriate permissions.
+	 */
+	public boolean checkUtil(String util)
+	{
+		if(RootTools.findBinary(util))
+		{
+
+			List<String> binaryPaths = new ArrayList<String>();
+			binaryPaths.addAll(RootTools.lastFoundBinaryPaths);
+
+			for(String path : binaryPaths)
+			{
+				Permissions permissions = RootTools
+						.getFilePermissionsSymlinks(path + "/" + util);
+
+				if(permissions != null)
+				{
+					String permission;
+					
+					if (Integer.toString(permissions.getPermissions()).length() > 3)
+						permission = Integer.toString(permissions.getPermissions()).substring(1);
+					else
+						permission = Integer.toString(permissions.getPermissions());
+					
+					if(permission.equals("755") || permission.equals("777")
+							|| permission.equals("775"))
+					{
+						RootTools.utilPath = path + "/" + util;
+						return true;
+					}
+				}
+			}
+		}
+
+		return false;
+
+	}
+
+    /**
+     * Deletes a file or directory
+     *
+     * @param target
+     *          example: /data/data/org.adaway/files/hosts
+     * @param remountAsRw
+     *          remounts the destination as read/write before writing to it
+     * @return true if it was successfully deleted
+     */
+    public boolean deleteFileOrDirectory(String target, boolean remountAsRw) {
+        boolean result = true;
+
+        try {
+            // mount destination as rw before writing to it
+            if (remountAsRw) {
+                RootTools.remount(target, "RW");
+            }
+
+            if (hasUtil("rm", "toolbox")) {
+                RootTools.log("rm command is available!");
+
+                CommandCapture command = new CommandCapture(0, "rm -r " + target);
+                Shell.startRootShell().add(command).waitForFinish();
+                if (command.exitCode() != 0) {
+                    RootTools.log("target not exist or unable to delete file");
+                    result = false;
+                }
+            } else {
+                if (checkUtil("busybox") && hasUtil("rm", "busybox")) {
+                    RootTools.log("busybox cp command is available!");
+
+                    CommandCapture command = new CommandCapture(0, "busybox rm -rf " + target);
+                    Shell.startRootShell().add(command).waitForFinish();
+                    if (command.exitCode() != 0) {
+                        RootTools.log("target not exist or unable to delete file");
+                        result = false;
+                    }
+                }
+            }
+
+            // mount destination back to ro
+            if (remountAsRw) {
+                RootTools.remount(target, "RO");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            result = false;
+        }
+
+        return result;
+   	}
+
+	/**
+	 * Use this to check whether or not a file exists on the filesystem.
+	 * 
+	 * @param file
+	 *            String that represent the file, including the full path to the
+	 *            file and its name.
+	 * 
+	 * @return a boolean that will indicate whether or not the file exists.
+	 * 
+	 */
+	public boolean exists(final String file)
+	{
+		final List<String> result = new ArrayList<String>();
+		
+		Command command = new Command(0, "ls " + file)
+		{
+			@Override
+			public void output(int arg0, String arg1)
+			{
+				RootTools.log(arg1);
+				result.add(arg1);
+			}			
+		};
+		
+		try
+		{
+			//Try not to open a new shell if one is open.
+			if (!Shell.isAnyShellOpen())
+				Shell.startShell().add(command).waitForFinish();
+			else
+				Shell.getOpenShell().add(command).waitForFinish();
+		}
+		catch (Exception e)
+		{
+			return false;
+		}
+		
+		for (String line : result)
+		{
+			if (line.trim().equals(file))
+			{
+				return true;
+			}
+		}
+		
+		try
+		{
+			RootTools.closeShell(false);
+		} catch (Exception e) {}
+		
+		result.clear();
+		try
+		{
+			Shell.startRootShell().add(command).waitForFinish();
+		}
+		catch (Exception e)
+		{
+			return false;
+		}
+		
+		//Avoid concurrent modification...
+		List<String> final_result = new ArrayList<String>();
+		final_result.addAll(result);
+		
+		for (String line : final_result)
+		{
+			if (line.trim().equals(file))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+
+	}
+	
+    /**
+     * This will try and fix a given binary. (This is for Busybox applets or Toolbox applets) By
+     * "fix", I mean it will try and symlink the binary from either toolbox or Busybox and fix the
+     * permissions if the permissions are not correct.
+     * 
+     * @param util
+     *            Name of the utility to fix.
+     * @param utilPath
+     *            path to the toolbox that provides ln, rm, and chmod. This can be a blank string, a
+     *            path to a binary that will provide these, or you can use
+     *            RootTools.getWorkingToolbox()
+     */
+    public void fixUtil(String util, String utilPath) {
+        try {
+            RootTools.remount("/system", "rw");
+
+            if (RootTools.findBinary(util)) {
+            	List<String> paths = new ArrayList<String>();
+            	paths.addAll(RootTools.lastFoundBinaryPaths);
+                for (String path : paths)
+                {
+                	CommandCapture command = new CommandCapture(0, utilPath + " rm " + path + "/" + util);
+                	Shell.startRootShell().add(command).waitForFinish();
+                }
+
+                CommandCapture command = new CommandCapture(0, utilPath + " ln -s " + utilPath + " /system/bin/" + util, utilPath + " chmod 0755 /system/bin/" + util);
+            	Shell.startRootShell().add(command).waitForFinish();
+            }
+
+            RootTools.remount("/system", "ro");
+        } catch (Exception e) {}
+    }
+    
+    /**
+     * This will check an array of binaries, determine if they exist and determine that it has
+     * either the permissions 755, 775, or 777. If an applet is not setup correctly it will try and
+     * fix it. (This is for Busybox applets or Toolbox applets)
+     * 
+     * @param utils
+     *            Name of the utility to check.
+     * 
+     * @throws Exception
+     *             if the operation cannot be completed.
+     * 
+     * @return boolean to indicate whether the operation completed. Note that this is not indicative
+     *         of whether the problem was fixed, just that the method did not encounter any
+     *         exceptions.
+     */
+    public boolean fixUtils(String[] utils) throws Exception {
+
+        for (String util : utils) {
+            if (!checkUtil(util)) {
+                if (checkUtil("busybox")) {
+                    if (hasUtil(util, "busybox")) {
+                        fixUtil(util, RootTools.utilPath);
+                    }
+                } else {
+                    if (checkUtil("toolbox")) {
+                        if (hasUtil(util, "toolbox")) {
+                            fixUtil(util, RootTools.utilPath);
+                        }
+                    } else {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+    
+    /**
+     * 
+     * @param binaryName
+     *            String that represent the binary to find.
+     * 
+     * @return <code>true</code> if the specified binary was found. Also, the path the binary was
+     *         found at can be retrieved via the variable lastFoundBinaryPath, if the binary was
+     *         found in more than one location this will contain all of these locations.
+     * 
+     */
+    public boolean findBinary(String binaryName) {
+        boolean found = false;
+        RootTools.lastFoundBinaryPaths.clear();
+
+    	List<String> list = new ArrayList<String>();
+
+        RootTools.log("Checking for " + binaryName);
+        
+        try {
+        	Set<String> paths = RootTools.getPath();
+        	if (paths.size() > 0)
+        	{
+	            for (String path : paths) {
+	                if (RootTools.exists(path + "/" + binaryName)) {
+	                	RootTools.log(binaryName + " was found here: " + path);
+	                    list.add(path);
+	                    found = true;
+	                } else {
+	                	RootTools.log(binaryName + " was NOT found here: " + path);
+	                }
+	            }
+        	}
+        } catch (TimeoutException ex) {
+            RootTools.log("TimeoutException!!!");
+        } catch (Exception e) {
+            RootTools.log(binaryName + " was not found, more information MAY be available with Debugging on.");
+        }
+
+        if (!found) {
+            RootTools.log("Trying second method");
+            RootTools.log("Checking for " + binaryName);
+            String[] places = { "/sbin/", "/system/bin/", "/system/xbin/", "/data/local/xbin/",
+                    "/data/local/bin/", "/system/sd/xbin/", "/system/bin/failsafe/", "/data/local/" };
+            for (String where : places) {
+                if (RootTools.exists(where + binaryName)) {
+                	RootTools.log(binaryName + " was found here: " + where);
+                    list.add(where);
+                    found = true;
+                } else {
+                	RootTools.log(binaryName + " was NOT found here: " + where);
+                }
+            }
+        }
+
+        if (RootTools.debugMode)
+        {        	
+        	for (String path : list)
+        	{
+            	RootTools.log("Paths: " + path);	
+        	}        	
+        }
+        
+        Collections.reverse(list);
+        
+        RootTools.lastFoundBinaryPaths.addAll(list);
+        
+        return found;
+    }
+        
+    /**
+     * This will return an List of Strings. Each string represents an applet available from BusyBox.
+     * <p/>
+     * 
+     * @param path
+     *				Path to the busybox binary that you want the list of applets from.
+     *
+     * @return <code>List<String></code> a List of strings representing the applets available from
+     *         Busybox.
+     *         
+     * @return <code>null</code> If we cannot return the list of applets.
+     */
+    public List<String> getBusyBoxApplets(String path) throws Exception {
+    	
+    	if (path != null && !path.endsWith("/") && !path.equals("")) {
+    		path += "/";
+        } else if (path == null) {
+            //Don't know what the user wants to do...what am I pshycic?
+            throw new Exception("Path is null, please specifiy a path");
+        }
+
+    	final List<String> results = new ArrayList<String>();
+    	
+    	Command command = new Command(Constants.BBA, path + "busybox --list") {
+
+			@Override
+			public void output(int id, String line) {
+				if (id == Constants.BBA) {
+					if (!line.trim().equals("") && !line.trim().contains("not found")) {
+						results.add(line);
+                    }
+				}				
+			}    		
+    	};
+    	
+    	Shell.startRootShell().add(command);
+    	command.waitForFinish();
+    	
+        return results;
+    }
+    
+    /**
+     * @return BusyBox version is found, "" if not found.
+     */
+    public String getBusyBoxVersion(String path) {
+
+    	if (!path.equals("") && !path.endsWith("/"))
+    	{
+    		path += "/";
+    	}
+    	
+        RootTools.log("Getting BusyBox Version");
+        InternalVariables.busyboxVersion = "";
+        try {
+        	Command command = new Command(Constants.BBV, path + "busybox")
+        	{
+				@Override
+				public void output(int id, String line)
+				{
+					if (id == Constants.BBV)
+					{
+		                if (line.startsWith("BusyBox") && InternalVariables.busyboxVersion.equals("")) {
+		                    String[] temp = line.split(" ");
+		                    InternalVariables.busyboxVersion = temp[1];
+		                }
+					}					
+				}
+        	};
+        	
+        	Shell.startRootShell().add(command);
+        	command.waitForFinish();
+        	
+        } catch (Exception e) {
+            RootTools.log("BusyBox was not found, more information MAY be available with Debugging on.");
+            return "";
+        }
+        
+        return InternalVariables.busyboxVersion;
+    }
+    
+	/**
+	 * @return long Size, converted to kilobytes (from xxx or xxxm or xxxk etc.)
+	 */
+	public long getConvertedSpace(String spaceStr)
+	{
+		try
+		{
+			double multiplier = 1.0;
+			char c;
+			StringBuffer sb = new StringBuffer();
+			for(int i = 0; i < spaceStr.length(); i++)
+			{
+				c = spaceStr.charAt(i);
+				if(!Character.isDigit(c) && c != '.')
+				{
+					if(c == 'm' || c == 'M')
+					{
+						multiplier = 1024.0;
+					}
+					else if(c == 'g' || c == 'G')
+					{
+						multiplier = 1024.0 * 1024.0;
+					}
+					break;
+				}
+				sb.append(spaceStr.charAt(i));
+			}
+			return (long) Math.ceil(Double.valueOf(sb.toString()) * multiplier);
+		}
+		catch (Exception e)
+		{
+			return -1;
+		}
+	}
+
+    /**
+     * This method will return the inode number of a file. This method is dependent on having a version of
+     * ls that supports the -i parameter. 
+     * 
+     *  @param file path to the file that you wish to return the inode number
+     *  
+     *  @return String The inode number for this file or "" if the inode number could not be found.
+     */
+    public String getInode(String file)
+    {
+    	try
+    	{
+    		Command command = new Command(Constants.GI, "/data/local/ls -i " + file)
+    		{
+
+				@Override
+				public void output(int id, String line)
+				{
+					if (id == Constants.GI)
+					{
+			    		if (!line.trim().equals("") && Character.isDigit((char) line.trim().substring(0, 1).toCharArray()[0]))
+			    		{
+			    			InternalVariables.inode = line.trim().split(" ")[0].toString();
+			    		}
+					}					
+				}
+    		};
+    		Shell.startRootShell().add(command);
+    		command.waitForFinish();
+    		
+	    	return InternalVariables.inode;
+    	}
+    	catch (Exception ignore)
+    	{
+    		return "";
+    	}
+    }
+
+    /**
+     * @return <code>true</code> if your app has been given root access.
+     * @throws TimeoutException
+     *             if this operation times out. (cannot determine if access is given)
+     */
+    public boolean isAccessGiven() {
+        try {
+            RootTools.log("Checking for Root access");
+            InternalVariables.accessGiven = false;
+            
+        	Command command = new Command(Constants.IAG, "id")
+        	{
+				@Override
+				public void output(int id, String line)
+				{
+					if (id == Constants.IAG)
+					{
+						Set<String> ID = new HashSet<String>(Arrays.asList(line.split(" ")));
+		                for (String userid : ID) {
+		                    RootTools.log(userid);
+
+		                    if (userid.toLowerCase().contains("uid=0")) {
+		                        InternalVariables.accessGiven = true;
+		                        RootTools.log("Access Given");
+		                        break;
+		                    }
+		                }
+		                if (!InternalVariables.accessGiven) {
+		                    RootTools.log("Access Denied?");
+		                }		                    
+					}					
+				}
+        	};
+        	
+        	Shell.startRootShell().add(command);
+        	command.waitForFinish();
+        	
+        	
+            if (InternalVariables.accessGiven) {
+                return true;
+            } else {
+                return false;
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            RootTools.shellDelay = 0;
+        }
+    }
+
+    public boolean isNativeToolsReady(int nativeToolsId, Context context) {
+        RootTools.log("Preparing Native Tools");
+        InternalVariables.nativeToolsReady = false;
+
+        Installer installer;
+        try {
+            installer = new Installer(context);
+        } catch (IOException ex) {
+            if (RootTools.debugMode) {
+                ex.printStackTrace();
+            }
+            return false;
+        }
+
+        if (installer.isBinaryInstalled("nativetools")) {
+            InternalVariables.nativeToolsReady = true;
+        } else {
+            InternalVariables.nativeToolsReady = installer.installBinary(nativeToolsId,
+                    "nativetools", "700");
+        }
+        return InternalVariables.nativeToolsReady;
+    }
+	
+	/**
+	 * 
+	 * @param file
+	 *            String that represent the file, including the full path to the
+	 *            file and its name.
+	 * 
+	 * @return An instance of the class permissions from which you can get the
+	 *         permissions of the file or if the file could not be found or
+	 *         permissions couldn't be determined then permissions will be null.
+	 * 
+	 */
+	public Permissions getFilePermissionsSymlinks(String file)
+	{
+		RootTools.log("Checking permissions for " + file);
+		if(RootTools.exists(file))
+		{
+			RootTools.log(file + " was found.");
+			try
+			{
+
+				Command command = new Command(
+						Constants.FPS, "ls -l " + file,
+						"busybox ls -l " + file,
+						"/system/bin/failsafe/toolbox ls -l " + file,
+						"toolbox ls -l " + file)
+				{
+					@Override
+					public void output(int id, String line)
+					{
+						if(id == Constants.FPS)
+						{
+							String symlink_final = "";
+
+							String[] lineArray = line.split(" ");
+							if(lineArray[0].length() != 10)
+							{
+								return;
+							}
+
+							RootTools.log("Line " + line);
+
+							try
+							{
+								String[] symlink = line.split(" ");
+								if(symlink[symlink.length - 2].equals("->"))
+								{
+									RootTools.log("Symlink found.");
+									symlink_final = symlink[symlink.length - 1];
+								}
+							}
+							catch (Exception e)
+							{
+							}
+
+							try
+							{
+								InternalVariables.permissions = getPermissions(line);
+								if(InternalVariables.permissions != null)
+								{
+									InternalVariables.permissions.setSymlink(symlink_final);
+								}
+							}
+							catch (Exception e)
+							{
+								RootTools.log(e.getMessage());
+							}
+						}						
+					}
+					
+				};
+				Shell.startRootShell().add(command);
+				command.waitForFinish();
+
+				return InternalVariables.permissions;
+
+			}
+			catch (Exception e)
+			{
+				RootTools.log(e.getMessage());
+				return null;
+			}
+		}
+
+		return null;
+	}
+	
+    /**
+     * This will return an ArrayList of the class Mount. The class mount contains the following
+     * property's: device mountPoint type flags
+     * <p/>
+     * These will provide you with any information you need to work with the mount points.
+     * 
+     * @return <code>ArrayList<Mount></code> an ArrayList of the class Mount.
+     * @throws Exception
+     *             if we cannot return the mount points.
+     */
+	public ArrayList<Mount> getMounts() throws Exception
+	{
+		LineNumberReader lnr = null;
+		lnr = new LineNumberReader(new FileReader("/proc/mounts"));
+		String line;
+		ArrayList<Mount> mounts = new ArrayList<Mount>();
+		while ((line = lnr.readLine()) != null)
+		{
+	
+			//RootTools.log(line);
+	
+			String[] fields = line.split(" ");
+			mounts.add(new Mount(new File(fields[0]), // device
+					new File(fields[1]), // mountPoint
+					fields[2], // fstype
+					fields[3] // flags
+			));
+		}
+		InternalVariables.mounts = mounts;
+		lnr.close();
+		
+        if (InternalVariables.mounts != null) {
+        	return InternalVariables.mounts;
+        } else {
+            throw new Exception();
+        }
+	}
+    
+    /**
+     * This will tell you how the specified mount is mounted. rw, ro, etc...
+     * <p/>
+     * @param path mount you want to check
+     * 
+     * @return <code>String</code> What the mount is mounted as.
+     * @throws Exception
+     *             if we cannot determine how the mount is mounted.
+     */
+    public String getMountedAs(String path) throws Exception {
+        InternalVariables.mounts = getMounts();
+        if (InternalVariables.mounts != null) {
+        	for (Mount mount : InternalVariables.mounts)
+        	{
+        	    if (path.equalsIgnoreCase(mount.getMountPoint().getAbsolutePath()))
+        		{
+        			RootTools.log((String) mount.getFlags().toArray()[0] + " :: " + mount.toString());
+        			return (String) mount.getFlags().toArray()[0];
+        		}
+        	}
+        	
+        	throw new Exception();
+        } 
+        else 
+        {
+            throw new Exception();
+        }
+    }
+    
+    /**
+     * This will return the environment variable $PATH
+     * 
+     * @return <code>Set<String></code> A Set of Strings representing the environment variable $PATH
+     * @throws Exception
+     *             if we cannot return the $PATH variable
+     */
+    public Set<String> getPath() throws Exception {
+        if (InternalVariables.path != null) {
+            return InternalVariables.path;
+        } else {
+            if (returnPath()) {
+                return InternalVariables.path;
+            } else {
+                throw new Exception();
+            }
+        }
+    }
+    
+    /**
+     * Get the space for a desired partition.
+     * 
+     * @param path
+     *            The partition to find the space for.
+     * @return the amount if space found within the desired partition. If the space was not found
+     *         then the value is -1
+     * @throws TimeoutException
+     */
+    public long getSpace(String path) {
+        InternalVariables.getSpaceFor = path;
+        boolean found = false;
+        RootTools.log("Looking for Space");
+        try {
+            final Command command = new Command(Constants.GS, "df " + path)
+            {
+
+				@Override
+				public void output(int id, String line)
+				{
+					if (id == Constants.GS)
+					{
+						if (line.contains(InternalVariables.getSpaceFor.trim())) {
+		                    InternalVariables.space = line.split(" ");
+		                }
+					}					
+				}
+            };
+            
+            Shell.startRootShell().add(command);
+            command.waitForFinish();
+        } catch (Exception e) {}
+
+        if (InternalVariables.space != null) {
+            RootTools.log("First Method");
+
+            for (String spaceSearch : InternalVariables.space) {
+
+                RootTools.log(spaceSearch);
+
+                if (found) {
+                    return getConvertedSpace(spaceSearch);
+                } else if (spaceSearch.equals("used,")) {
+                    found = true;
+                }
+            }
+
+            // Try this way
+            int count = 0, targetCount = 3;
+
+            RootTools.log("Second Method");
+
+            if (InternalVariables.space[0].length() <= 5 ) {
+                targetCount = 2;
+            }
+
+            for (String spaceSearch : InternalVariables.space) {
+
+                RootTools.log(spaceSearch);
+                if (spaceSearch.length() > 0) {
+                    RootTools.log(spaceSearch + ("Valid"));
+                    if (count == targetCount) {
+                        return getConvertedSpace(spaceSearch);
+                    }
+                    count++;
+                }
+            }
+        }
+        RootTools.log("Returning -1, space could not be determined.");
+        return -1;
+    }
+    
+    /**
+     * This will return a String that represent the symlink for a specified file.
+     * <p/>
+     * 
+     * @param file
+     *            file to get the Symlink for. (must have absolute path)
+     * 
+     * @return <code>String</code> a String that represent the symlink for a specified file or an
+     *         empty string if no symlink exists.
+     */
+    public String getSymlink(String file) {
+        RootTools.log("Looking for Symlink for " + file);
+
+        try {
+        	final List<String> results = new ArrayList<String>();
+
+        	Command command = new Command(Constants.GSYM, "ls -l " + file)
+        	{
+
+				@Override
+				public void output(int id, String line)
+				{
+					if (id == Constants.GSYM)
+					{
+						if (!line.trim().equals(""))
+						{
+							results.add(line);
+						}
+					}					
+				}
+        	};
+        	
+        	Shell.startRootShell().add(command);
+        	command.waitForFinish();
+        	            
+            String[] symlink = results.get(0).split(" ");
+            if (symlink[symlink.length - 2].equals("->")) {
+                RootTools.log("Symlink found.");
+                
+                String final_symlink = "";
+                if (!symlink[symlink.length - 1].equals("") && !symlink[symlink.length - 1].contains("/"))
+                {
+                	//We assume that we need to get the path for this symlink as it is probably not absolute.
+                	findBinary(symlink[symlink.length - 1]);
+                	if (RootTools.lastFoundBinaryPaths.size() > 0)
+                	{
+                		//We return the first found location.
+                		final_symlink = RootTools.lastFoundBinaryPaths.get(0) + "/" + symlink[symlink.length - 1];
+                	}
+                	else
+                	{
+                    	//we couldnt find a path, return the symlink by itself.
+                    	final_symlink = symlink[symlink.length - 1];
+                	}
+                }
+                else
+                {
+                	final_symlink = symlink[symlink.length - 1];
+                }
+
+                return final_symlink;
+            }
+        } catch (Exception e) {
+        	if (RootTools.debugMode)
+        		e.printStackTrace();
+        }
+
+        RootTools.log("Symlink not found");
+        return "";
+    }
+    
+    /**
+     * This will return an ArrayList of the class Symlink. The class Symlink contains the following
+     * property's: path SymplinkPath
+     * <p/>
+     * These will provide you with any Symlinks in the given path.
+     * 
+     * @param path
+     *            path to search for Symlinks.
+     * 
+     * @return <code>ArrayList<Symlink></code> an ArrayList of the class Symlink.
+     * @throws Exception
+     *             if we cannot return the Symlinks.
+     */
+    public ArrayList<Symlink> getSymlinks(String path) throws Exception {
+
+        // this command needs find
+        if (!checkUtil("find")) {
+            throw new Exception();
+        }
+
+        CommandCapture command = new CommandCapture(0, "find " + path + " -type l -exec ls -l {} \\; > /data/local/symlinks.txt;");
+        Shell.startRootShell().add(command);
+        command.waitForFinish();
+        
+        InternalVariables.symlinks = getSymLinks();
+        if (InternalVariables.symlinks != null) {
+            return InternalVariables.symlinks;
+        } else {
+            throw new Exception();
+        }
+    }
+    
+    /**
+     * This will return to you a string to be used in your shell commands which will represent the
+     * valid working toolbox with correct permissions. For instance, if Busybox is available it will
+     * return "busybox", if busybox is not available but toolbox is then it will return "toolbox"
+     * 
+     * @return String that indicates the available toolbox to use for accessing applets.
+     */
+    public String getWorkingToolbox() {
+        if (RootTools.checkUtil("busybox")) {
+            return "busybox";
+        } else if (RootTools.checkUtil("toolbox")) {
+            return "toolbox";
+        } else {
+            return "";
+        }
+    }
+    
+    /**
+     * Checks if there is enough Space on SDCard
+     * 
+     * @param updateSize
+     *            size to Check (long)
+     * @return <code>true</code> if the Update will fit on SDCard, <code>false</code> if not enough
+     *         space on SDCard. Will also return <code>false</code>, if the SDCard is not mounted as
+     *         read/write
+     */
+    public boolean hasEnoughSpaceOnSdCard(long updateSize) {
+        RootTools.log("Checking SDcard size and that it is mounted as RW");
+        String status = Environment.getExternalStorageState();
+        if (!status.equals(Environment.MEDIA_MOUNTED)) {
+            return false;
+        }
+        File path = Environment.getExternalStorageDirectory();
+        StatFs stat = new StatFs(path.getPath());
+        long blockSize = stat.getBlockSize();
+        long availableBlocks = stat.getAvailableBlocks();
+        return (updateSize < availableBlocks * blockSize);
+    }
+    
+    /**
+     * Checks whether the toolbox or busybox binary contains a specific util
+     * 
+     * @param util
+     * @param box
+     *            Should contain "toolbox" or "busybox"
+     * @return true if it contains this util
+     */
+    public boolean hasUtil(final String util, final String box) {
+    	
+    	InternalVariables.found = false;
+    	
+        // only for busybox and toolbox
+        if (!(box.endsWith("toolbox") || box.endsWith("busybox"))) {
+            return false;
+        }
+        
+        try {
+        	
+        	Command command = new Command(0, box.endsWith("toolbox") ? box + " " + util : box + " --list" ) {
+
+				@Override
+				public void output(int id, String line)
+				{
+					if (box.endsWith("toolbox")) {
+                        if (line.contains("no such tool")) {
+                        	InternalVariables.found = true;
+                        }
+                    } else if (box.endsWith("busybox")) {
+                        // go through all lines of busybox --list
+                        if (line.contains(util)) {
+                            RootTools.log("Found util!");
+                            InternalVariables.found = true;
+                        }
+                    }					
+				}
+        		
+        	};
+        	RootTools.getShell(true).add(command).waitForFinish(5000);
+        	
+            if (InternalVariables.found) {
+                RootTools.log("Box contains " + util + " util!");
+                return true;
+            } else {
+                RootTools.log("Box does not contain " + util + " util!");
+                return false;
+            }
+        } catch (Exception e) {
+            RootTools.log(e.getMessage());
+            return false;
+        }
+    }
+    
+    /**
+     * This method can be used to unpack a binary from the raw resources folder and store it in
+     * /data/data/app.package/files/ This is typically useful if you provide your own C- or
+     * C++-based binary. This binary can then be executed using sendShell() and its full path.
+     * 
+     * @param context
+     *            the current activity's <code>Context</code>
+     * @param sourceId
+     *            resource id; typically <code>R.raw.id</code>
+     * @param destName
+     *            destination file name; appended to /data/data/app.package/files/
+     * @param mode
+     *            chmod value for this file
+     * @return a <code>boolean</code> which indicates whether or not we were able to create the new
+     *         file.
+     */
+    public boolean installBinary(Context context, int sourceId, String destName, String mode) {
+        Installer installer;
+
+        try {
+            installer = new Installer(context);
+        } catch (IOException ex) {
+            if (RootTools.debugMode) {
+                ex.printStackTrace();
+            }
+            return false;
+        }
+
+        return (installer.installBinary(sourceId, destName, mode));
+    }
+    
+    /**
+     * This will let you know if an applet is available from BusyBox
+     * <p/>
+     * 
+     * @param applet The applet to check for.
+     * 
+     * @return <code>true</code> if applet is available, false otherwise.
+     */
+    public boolean isAppletAvailable(String applet, String binaryPath) {
+        try {
+            for (String aplet : getBusyBoxApplets(binaryPath)) {
+                if (aplet.equals(applet)) {
+                    return true;
+                }
+            }
+            return false;
+        } catch (Exception e) {
+            RootTools.log(e.toString());
+            return false;
+        }
+    }
+    
+    /**
+     * This method can be used to to check if a process is running
+     * 
+     * @param processName
+     *            name of process to check
+     * @return <code>true</code> if process was found
+     * @throws TimeoutException
+     *             (Could not determine if the process is running)
+     */
+    public boolean isProcessRunning(final String processName) {
+        RootTools.log("Checks if process is running: " + processName);
+
+        boolean processRunning = false;
+        try {
+            Result result = new Result() {
+                @Override
+                public void process(String line) throws Exception {
+                    if (line.contains(processName)) {
+                        setData(1);
+                    }
+                }
+
+                @Override
+                public void onFailure(Exception ex) {
+                    setError(1);
+                }
+
+                @Override
+                public void onComplete(int diag) {
+                }
+
+                @Override
+                public void processError(String arg0) throws Exception {
+                }
+
+            };
+            RootTools.sendShell(new String[] { "ps" }, 1, result, -1);
+
+            if (result.getError() == 0) {
+                // if data has been set process is running
+                if (result.getData() != null) {
+                    processRunning = true;
+                }
+            }
+        } catch (Exception e) {
+            RootTools.log(e.getMessage());
+        }
+
+        return processRunning;
+    }
+
+	/**
+	 * This method can be used to kill a running process
+	 * 
+	 * @param processName
+	 *            name of process to kill
+	 * @return <code>true</code> if process was found and killed successfully
+	 */
+	public boolean killProcess(final String processName)
+	{
+		RootTools.log("Killing process " + processName);
+
+		boolean processKilled = false;
+		try
+		{
+			Result result = new Result()
+			{
+				@Override
+				public void process(String line) throws Exception
+				{
+					if(line.contains(processName))
+					{
+						Matcher psMatcher = InternalVariables.psPattern.matcher(line);
+
+						try
+						{
+							if(psMatcher.find())
+							{
+								String pid = psMatcher.group(1);
+								// concatenate to existing pids, to use later in
+								// kill
+								if(getData() != null)
+								{
+									setData(getData() + " " + pid);
+								}
+								else
+								{
+									setData(pid);
+								}
+								RootTools.log("Found pid: " + pid);
+							}
+							else
+							{
+								RootTools.log("Matching in ps command failed!");
+							}
+						}
+						catch (Exception e)
+						{
+							RootTools.log("Error with regex!");
+							e.printStackTrace();
+						}
+					}
+				}
+
+				@Override
+				public void onFailure(Exception ex)
+				{
+					setError(1);
+				}
+
+				@Override
+				public void onComplete(int diag)
+				{
+				}
+
+				@Override
+				public void processError(String arg0) throws Exception
+				{
+				}
+
+			};
+			RootTools.sendShell(new String[] { "ps" }, 1, result, -1);
+
+			if(result.getError() == 0)
+			{
+				// get all pids in one string, created in process method
+				String pids = (String) result.getData();
+
+				// kill processes
+				if(pids != null)
+				{
+					try
+					{
+						// example: kill -9 1234 1222 5343
+						RootTools.sendShell(new String[] { "kill -9 " + pids }, 1, -1);
+						processKilled = true;
+					}
+					catch (Exception e)
+					{
+						RootTools.log(e.getMessage());
+					}
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			RootTools.log(e.getMessage());
+		}
+
+		return processKilled;
+	}
+
+    /**
+     * This will launch the Android market looking for BusyBox
+     * 
+     * @param activity
+     *            pass in your Activity
+     */
+    public void offerBusyBox(Activity activity) {
+        RootTools.log("Launching Market for BusyBox");
+        Intent i = new Intent(Intent.ACTION_VIEW,
+                Uri.parse("market://details?id=stericson.busybox"));
+        activity.startActivity(i);
+    }
+
+    /**
+     * This will launch the Android market looking for BusyBox, but will return the intent fired and
+     * starts the activity with startActivityForResult
+     * 
+     * @param activity
+     *            pass in your Activity
+     * @param requestCode
+     *            pass in the request code
+     * @return intent fired
+     */
+    public Intent offerBusyBox(Activity activity, int requestCode) {
+        RootTools.log("Launching Market for BusyBox");
+        Intent i = new Intent(Intent.ACTION_VIEW,
+                Uri.parse("market://details?id=stericson.busybox"));
+        activity.startActivityForResult(i, requestCode);
+        return i;
+    }
+
+    /**
+     * This will launch the Android market looking for SuperUser
+     * 
+     * @param activity
+     *            pass in your Activity
+     */
+    public void offerSuperUser(Activity activity) {
+        RootTools.log("Launching Market for SuperUser");
+        Intent i = new Intent(Intent.ACTION_VIEW,
+                Uri.parse("market://details?id=com.noshufou.android.su"));
+        activity.startActivity(i);
+    }
+
+    /**
+     * This will launch the Android market looking for SuperUser, but will return the intent fired
+     * and starts the activity with startActivityForResult
+     * 
+     * @param activity
+     *            pass in your Activity
+     * @param requestCode
+     *            pass in the request code
+     * @return intent fired
+     */
+    public Intent offerSuperUser(Activity activity, int requestCode) {
+        RootTools.log("Launching Market for SuperUser");
+        Intent i = new Intent(Intent.ACTION_VIEW,
+                Uri.parse("market://details?id=com.noshufou.android.su"));
+        activity.startActivityForResult(i, requestCode);
+        return i;
+    }
+}
diff --git a/src/com/stericson/RootTools/Runner.java b/src/com/stericson/RootTools/internal/Runner.java
similarity index 90%
rename from src/com/stericson/RootTools/Runner.java
rename to src/com/stericson/RootTools/internal/Runner.java
index 5f5de371..253d1ea9 100644
--- a/src/com/stericson/RootTools/Runner.java
+++ b/src/com/stericson/RootTools/internal/Runner.java
@@ -20,14 +20,18 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.internal;
 
 import java.io.IOException;
 
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
+
 import android.content.Context;
 import android.util.Log;
 
-class Runner extends Thread {
+public class Runner extends Thread {
 
     private static final String LOG_TAG = "RootTools::Runner";
 
diff --git a/src/com/stericson/RootTools/test/.svn/all-wcprops b/src/com/stericson/RootTools/test/.svn/all-wcprops
new file mode 100644
index 00000000..ba70effe
--- /dev/null
+++ b/src/com/stericson/RootTools/test/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 93
+/svn/!svn/ver/230/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/test
+END
+SanityCheckRootTools.java
+K 25
+svn:wc:ra_dav:version-url
+V 119
+/svn/!svn/ver/230/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/test/SanityCheckRootTools.java
+END
diff --git a/src/com/stericson/RootTools/test/.svn/entries b/src/com/stericson/RootTools/test/.svn/entries
new file mode 100644
index 00000000..e8de5de7
--- /dev/null
+++ b/src/com/stericson/RootTools/test/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+249
+http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools/test
+http://roottools.googlecode.com/svn
+
+
+
+2013-01-29T03:44:12.016408Z
+230
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+326c17ea-325e-592a-0117-b1346ba49fde
+
+SanityCheckRootTools.java
+file
+
+
+
+
+2013-05-10T21:35:37.000000Z
+b60134aa19e5d1a192f87c0c875f408b
+2013-01-29T03:44:12.016408Z
+230
+stericson.g1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+15839
+
diff --git a/src/com/stericson/RootTools/test/.svn/text-base/SanityCheckRootTools.java.svn-base b/src/com/stericson/RootTools/test/.svn/text-base/SanityCheckRootTools.java.svn-base
new file mode 100644
index 00000000..4c6c0cff
--- /dev/null
+++ b/src/com/stericson/RootTools/test/.svn/text-base/SanityCheckRootTools.java.svn-base
@@ -0,0 +1,401 @@
+/* 
+ * This file is part of the RootTools Project: http://code.google.com/p/roottools/
+ *  
+ * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
+ *  
+ * This code is dual-licensed under the terms of the Apache License Version 2.0 and
+ * the terms of the General Public License (GPL) Version 2.
+ * You may use this code according to either of these licenses as is most appropriate
+ * for your project on a case-by-case basis.
+ * 
+ * The terms of each license can be found in the root directory of this project's repository as well as at:
+ * 
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * http://www.gnu.org/licenses/gpl-2.0.txt
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under these Licenses is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See each License for the specific language governing permissions and
+ * limitations under that License.
+ */
+
+package com.stericson.RootTools.test;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.containers.Permissions;
+import com.stericson.RootTools.exceptions.RootDeniedException;
+import com.stericson.RootTools.exceptions.RootToolsException;
+import com.stericson.RootTools.execution.Shell;
+
+public class SanityCheckRootTools extends Activity {
+    private ScrollView mScrollView;
+    private TextView mTextView;
+    private ProgressDialog mPDialog;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+    	RootTools.debugMode = true;
+
+        mTextView = new TextView(this);
+        mTextView.setText("");
+        mScrollView = new ScrollView(this);
+        mScrollView.addView(mTextView);
+        setContentView(mScrollView);
+
+        // Great the user with our version number
+        String version = "?";
+        try {
+            PackageInfo packageInfo =
+                    this.getPackageManager().getPackageInfo(this.getPackageName(), 0);
+            version = packageInfo.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+
+        print("SanityCheckRootTools v " + version + "\n\n");
+        
+        try
+		{
+			Shell.startRootShell();
+		}
+		catch (IOException e2)
+		{
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
+		catch (TimeoutException e)
+		{
+            print("[ TIMEOUT EXCEPTION! ]\n");
+			e.printStackTrace();
+		}
+		catch (RootDeniedException e)
+		{
+			print("[ ROOT DENIED EXCEPTION! ]\n");
+			e.printStackTrace();
+		}
+		
+        try {
+			if (false == RootTools.isAccessGiven()) {
+			    print("ERROR: No root access to this device.\n");
+			    return;
+			}
+		} catch (Exception e) {
+		    print("ERROR: could not determine root access to this device.\n");
+		    return;
+		}
+
+        // Display infinite progress bar
+        mPDialog = new ProgressDialog(this);
+        mPDialog.setCancelable(false);
+        mPDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+
+        new SanityCheckThread(this, new TestHandler()).start();
+    }
+
+    protected void print(CharSequence text) {
+        mTextView.append(text);
+        mScrollView.post(new Runnable() {
+            public void run() {
+                mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
+            }
+        });
+    }
+
+    // Run our long-running tests in their separate thread so as to
+    // not interfere with proper rendering.
+    private class SanityCheckThread extends Thread {
+        private Handler mHandler;
+
+        public SanityCheckThread(Context context, Handler handler) {
+            mHandler = handler;
+        }
+
+        public void run() {
+            visualUpdate(TestHandler.ACTION_SHOW, null);
+
+            // First test: Install a binary file for future use
+            // if it wasn't already installed.
+            /*
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Installing binary if needed");
+            if(false == RootTools.installBinary(mContext, R.raw.nes, "nes_binary")) {
+                visualUpdate(TestHandler.ACTION_HIDE, "ERROR: Failed to install binary. Please see log file.");
+                return;
+            }
+            */
+			
+            boolean result;
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing Find Binary");
+            result = RootTools.isRootAvailable();
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking Root ]\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, result + " k\n\n");
+            
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing file exists");
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking Exists() ]\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, RootTools.exists("/system/sbin/[") + " k\n\n");
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing Is Access Given");
+            result = RootTools.isAccessGiven();
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking for Access to Root ]\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, result + " k\n\n");
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing Remount");
+            result = RootTools.remount("/system", "rw");
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Remounting System as RW ]\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, result + " k\n\n");
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing CheckUtil");
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking busybox is setup ]\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, RootTools.checkUtil("busybox") + " k\n\n");
+            
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing getBusyBoxVersion");
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking busybox version ]\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, RootTools.getBusyBoxVersion("/system/bin/") + " k\n\n");
+
+            try
+			{
+                visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing fixUtils");
+                visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking Utils ]\n");
+                visualUpdate(TestHandler.ACTION_DISPLAY, RootTools.fixUtils(new String[] {"ls", "rm", "ln", "dd", "chmod", "mount"}) + " k\n\n");
+			}
+			catch (Exception e2)
+			{
+				// TODO Auto-generated catch block
+				e2.printStackTrace();
+			}
+			
+            try
+			{
+                visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing getSymlink");
+                visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking [[ for symlink ]\n");
+                visualUpdate(TestHandler.ACTION_DISPLAY, RootTools.getSymlink("/system/bin/[[") + " k\n\n");
+			}
+			catch (Exception e2)
+			{
+				// TODO Auto-generated catch block
+				e2.printStackTrace();
+			}
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing getInode");
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking Inodes ]\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, RootTools.getInode("/system/bin/busybox") + " k\n\n");
+            
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing GetBusyBoxapplets");
+            try
+			{
+
+	            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Getting all available Busybox applets ]\n");
+	            for (String applet : RootTools.getBusyBoxApplets("/data/data/stericson.busybox.donate/files/bb"))
+	            {
+	                visualUpdate(TestHandler.ACTION_DISPLAY,  applet + " k\n\n");            	
+	            }
+
+			}
+			catch (Exception e1)
+			{
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+			
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing getFilePermissionsSymlinks");
+            Permissions permissions = RootTools.getFilePermissionsSymlinks("/system/bin/busybox");
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking busybox permissions and symlink ]\n");
+            
+            if (permissions != null)
+            {
+	            visualUpdate(TestHandler.ACTION_DISPLAY, "Symlink: " + permissions.getSymlink() + " k\n\n");
+	            visualUpdate(TestHandler.ACTION_DISPLAY, "Group Permissions: " + permissions.getGroupPermissions() + " k\n\n");
+	            visualUpdate(TestHandler.ACTION_DISPLAY, "Owner Permissions: " + permissions.getOtherPermissions() + " k\n\n");
+	            visualUpdate(TestHandler.ACTION_DISPLAY, "Permissions: " + permissions.getPermissions() + " k\n\n");
+	            visualUpdate(TestHandler.ACTION_DISPLAY, "Type: " + permissions.getType() + " k\n\n");
+	            visualUpdate(TestHandler.ACTION_DISPLAY, "User Permissions: " + permissions.getUserPermissions() + " k\n\n");
+            }
+            else
+            {
+	            visualUpdate(TestHandler.ACTION_DISPLAY, "Permissions == null k\n\n");
+            }
+            
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing df");
+            long spaceValue = RootTools.getSpace("/data");
+            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking /data partition size]\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, spaceValue + "k\n\n");
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing sendShell() w/ return array");
+            try {
+                List<String> response = RootTools.sendShell("ls /", -1);
+                visualUpdate(TestHandler.ACTION_DISPLAY, "[ Listing of / (passing a List)]\n");
+                for (String line : response) {
+                    visualUpdate(TestHandler.ACTION_DISPLAY, line + "\n");
+                }
+            } catch (IOException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "ERROR: " + e);
+                return;
+            } catch (RootToolsException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "DEV-DEFINED ERROR: " + e);
+                return;
+            } catch (TimeoutException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "Timeout.. " + e);
+                return;
+			}
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing sendShell() w/ callbacks");
+            try {
+                visualUpdate(TestHandler.ACTION_DISPLAY, "\n[ Listing of / (callback)]\n");
+                RootTools.Result result2 = new RootTools.Result() {
+                    @Override
+                    public void process(String line) throws Exception {
+                        visualUpdate(TestHandler.ACTION_DISPLAY, line + "\n");
+                    }
+
+                    @Override
+                    public void onFailure(Exception ex) {
+                        visualUpdate(TestHandler.ACTION_HIDE, "ERROR: " + ex);
+                        setError(1);
+                    }
+
+                    @Override
+                    public void onComplete(int diag) {
+                        visualUpdate(TestHandler.ACTION_DISPLAY, "------\nDone.\n");
+                    }
+
+					@Override
+					public void processError(String line) throws Exception {
+                        visualUpdate(TestHandler.ACTION_DISPLAY, line + "\n");						
+					}
+                };
+                RootTools.sendShell("ls /", result2, -1);
+                if (0 != result2.getError())
+                    return;
+            } catch (IOException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "ERROR: " + e);
+                return;
+            } catch (RootToolsException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "DEV-DEFINED ERROR: " + e);
+                return;
+            } catch (TimeoutException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "Timeout.. " + e);
+                return;
+			}
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing sendShell() for multiple commands");
+            try {
+                visualUpdate(TestHandler.ACTION_DISPLAY, "\n[ ps + ls + date / (callback)]\n");
+                RootTools.Result result2 = new RootTools.Result() {
+                    @Override
+                    public void process(String line) throws Exception {
+                        visualUpdate(TestHandler.ACTION_DISPLAY, line + "\n");
+                    }
+
+                    @Override
+                    public void onFailure(Exception ex) {
+                        visualUpdate(TestHandler.ACTION_HIDE, "ERROR: " + ex);
+                        setError(1);
+                    }
+
+                    @Override
+                    public void onComplete(int diag) {
+                        visualUpdate(TestHandler.ACTION_DISPLAY, "------\nDone.\n");
+                    }
+
+					@Override
+					public void processError(String line) throws Exception {
+                        visualUpdate(TestHandler.ACTION_DISPLAY, line + "\n");						
+					}
+
+                };
+                RootTools.sendShell(
+                        new String[]{
+                                "echo \"* PS:\"",
+                                "ps",
+                                "echo \"* LS:\"",
+                                "ls",
+                                "echo \"* DATE:\"",
+                                "date"},
+                        0,
+                        result2,
+                        -1
+                );
+                if (0 != result2.getError())
+                    return;
+            } catch (IOException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "ERROR: " + e);
+            } catch (RootToolsException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "DEV-DEFINED ERROR: " + e);
+            } catch (TimeoutException e) {
+                visualUpdate(TestHandler.ACTION_HIDE, "Timeout.. " + e);
+                return;
+			}
+
+            visualUpdate(TestHandler.ACTION_PDISPLAY, "All tests complete.");
+            visualUpdate(TestHandler.ACTION_HIDE, null);
+            
+            try
+			{
+				RootTools.closeAllShells();
+			}
+			catch (IOException e)
+			{
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+        }
+
+        private void visualUpdate(int action, String text) {
+            Message msg = mHandler.obtainMessage();
+            Bundle bundle = new Bundle();
+            bundle.putInt(TestHandler.ACTION, action);
+            bundle.putString(TestHandler.TEXT, text);
+            msg.setData(bundle);
+            mHandler.sendMessage(msg);
+        }
+    }
+
+    private class TestHandler extends Handler {
+        static final public String ACTION = "action";
+        static final public int ACTION_SHOW = 0x01;
+        static final public int ACTION_HIDE = 0x02;
+        static final public int ACTION_DISPLAY = 0x03;
+        static final public int ACTION_PDISPLAY = 0x04;
+        static final public String TEXT = "text";
+
+        public void handleMessage(Message msg) {
+            int action = msg.getData().getInt(ACTION);
+            String text = msg.getData().getString(TEXT);
+
+            switch (action) {
+                case ACTION_SHOW:
+                    mPDialog.show();
+                    mPDialog.setMessage("Running Root Library Tests...");
+                    break;
+                case ACTION_HIDE:
+                    if (null != text)
+                        print(text);
+                    mPDialog.hide();
+                    break;
+                case ACTION_DISPLAY:
+                    print(text);
+                    break;
+                case ACTION_PDISPLAY:
+                    mPDialog.setMessage(text);
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/com/stericson/RootTools/SanityCheckRootTools.java b/src/com/stericson/RootTools/test/SanityCheckRootTools.java
similarity index 94%
rename from src/com/stericson/RootTools/SanityCheckRootTools.java
rename to src/com/stericson/RootTools/test/SanityCheckRootTools.java
index 792bf5c3..4c6c0cff 100644
--- a/src/com/stericson/RootTools/SanityCheckRootTools.java
+++ b/src/com/stericson/RootTools/test/SanityCheckRootTools.java
@@ -20,7 +20,7 @@
  * limitations under that License.
  */
 
-package com.stericson.RootTools;
+package com.stericson.RootTools.test;
 
 import java.io.IOException;
 import java.util.List;
@@ -37,6 +37,12 @@
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.containers.Permissions;
+import com.stericson.RootTools.exceptions.RootDeniedException;
+import com.stericson.RootTools.exceptions.RootToolsException;
+import com.stericson.RootTools.execution.Shell;
+
 public class SanityCheckRootTools extends Activity {
     private ScrollView mScrollView;
     private TextView mTextView;
@@ -64,6 +70,27 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         print("SanityCheckRootTools v " + version + "\n\n");
+        
+        try
+		{
+			Shell.startRootShell();
+		}
+		catch (IOException e2)
+		{
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
+		catch (TimeoutException e)
+		{
+            print("[ TIMEOUT EXCEPTION! ]\n");
+			e.printStackTrace();
+		}
+		catch (RootDeniedException e)
+		{
+			print("[ ROOT DENIED EXCEPTION! ]\n");
+			e.printStackTrace();
+		}
+		
         try {
 			if (false == RootTools.isAccessGiven()) {
 			    print("ERROR: No root access to this device.\n");
@@ -112,16 +139,6 @@ public void run() {
                 return;
             }
             */
-
-            try
-			{
-				Shell.startRootShell();
-			}
-			catch (IOException e2)
-			{
-				// TODO Auto-generated catch block
-				e2.printStackTrace();
-			}
 			
             boolean result;
 
@@ -150,7 +167,7 @@ public void run() {
             
             visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing getBusyBoxVersion");
             visualUpdate(TestHandler.ACTION_DISPLAY, "[ Checking busybox version ]\n");
-            visualUpdate(TestHandler.ACTION_DISPLAY, RootTools.getBusyBoxVersion() + " k\n\n");
+            visualUpdate(TestHandler.ACTION_DISPLAY, RootTools.getBusyBoxVersion("/system/bin/") + " k\n\n");
 
             try
 			{
@@ -185,7 +202,7 @@ public void run() {
 			{
 
 	            visualUpdate(TestHandler.ACTION_DISPLAY, "[ Getting all available Busybox applets ]\n");
-	            for (String applet : RootTools.getBusyBoxApplets())
+	            for (String applet : RootTools.getBusyBoxApplets("/data/data/stericson.busybox.donate/files/bb"))
 	            {
 	                visualUpdate(TestHandler.ACTION_DISPLAY,  applet + " k\n\n");            	
 	            }
@@ -222,7 +239,7 @@ public void run() {
 
             visualUpdate(TestHandler.ACTION_PDISPLAY, "Testing sendShell() w/ return array");
             try {
-                List<String> response = RootTools.sendShell("ls /", InternalVariables.timeout);
+                List<String> response = RootTools.sendShell("ls /", -1);
                 visualUpdate(TestHandler.ACTION_DISPLAY, "[ Listing of / (passing a List)]\n");
                 for (String line : response) {
                     visualUpdate(TestHandler.ACTION_DISPLAY, line + "\n");
@@ -263,7 +280,7 @@ public void processError(String line) throws Exception {
                         visualUpdate(TestHandler.ACTION_DISPLAY, line + "\n");						
 					}
                 };
-                RootTools.sendShell("ls /", result2, InternalVariables.timeout);
+                RootTools.sendShell("ls /", result2, -1);
                 if (0 != result2.getError())
                     return;
             } catch (IOException e) {
@@ -313,7 +330,7 @@ public void processError(String line) throws Exception {
                                 "date"},
                         0,
                         result2,
-                        InternalVariables.timeout
+                        -1
                 );
                 if (0 != result2.getError())
                     return;
diff --git a/src/jcifs/smb/Dfs.java b/src/jcifs/smb/Dfs.java
index 14cd7152..b47aff16 100644
--- a/src/jcifs/smb/Dfs.java
+++ b/src/jcifs/smb/Dfs.java
@@ -50,7 +50,7 @@ static class CacheEntry {
     protected CacheEntry referrals = null;
 
     public HashMap getTrustedDomains(NtlmPasswordAuthentication auth) throws SmbAuthException {
-        if (DISABLED || auth.domain == "?")
+        if (DISABLED || "".equals(auth.domain))
             return null;
 
         if (_domains != null && System.currentTimeMillis() > _domains.expiration) {
diff --git a/src/org/brandroid/openmanager/activities/FolderPickerActivity.java b/src/org/brandroid/openmanager/activities/FolderPickerActivity.java
index 56664af1..ce218f3e 100644
--- a/src/org/brandroid/openmanager/activities/FolderPickerActivity.java
+++ b/src/org/brandroid/openmanager/activities/FolderPickerActivity.java
@@ -2,16 +2,29 @@
 package org.brandroid.openmanager.activities;
 
 import org.brandroid.openmanager.R;
+import org.brandroid.openmanager.adapters.OpenClipboard;
 import org.brandroid.openmanager.data.OpenFile;
 import org.brandroid.openmanager.data.OpenPath;
 import org.brandroid.openmanager.fragments.PickerFragment;
 import org.brandroid.openmanager.fragments.PickerFragment.OnOpenPathPickedListener;
+import org.brandroid.openmanager.interfaces.OpenApp;
 import org.brandroid.openmanager.util.FileManager;
+import org.brandroid.openmanager.util.ShellSession;
+import org.brandroid.utils.DiskLruCache;
+import org.brandroid.utils.LruCache;
+import org.brandroid.utils.Preferences;
 import org.brandroid.utils.ViewUtils;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.ActionMode;
+import com.android.gallery3d.data.DataManager;
+import com.android.gallery3d.data.DownloadCache;
+import com.android.gallery3d.data.ImageCacheService;
+import com.android.gallery3d.util.ThreadPool;
 
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.v4.app.FragmentActivity;
@@ -20,15 +33,17 @@
 import android.text.TextWatcher;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
 public class FolderPickerActivity extends SherlockFragmentActivity implements OnItemClickListener,
-        OnClickListener, TextWatcher {
+        OnClickListener, TextWatcher, OpenApp {
     private OpenPath mPath;
-    private boolean pickDirOnly = false;
+    private boolean mFoldersOnly = false;
     private String mDefaultName;
     private TextView mSelection, mTitle;
     private EditText mPickName;
@@ -39,6 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setTheme(R.style.AppTheme_Dark);
+        
+        setTitle(R.string.s_title_picker);
 
         setContentView(R.layout.picker_widget);
         mSelection = (TextView)findViewById(R.id.pick_path);
@@ -55,7 +72,7 @@ else if (intent.getData() != null)
 
         mFragmentManager = getSupportFragmentManager();
         setPath(mPath, true);
-        ViewUtils.setViewsOnClick(this, this, android.R.id.button1, android.R.id.button2);
+        ViewUtils.setViewsOnClick(this, this, android.R.id.button1, android.R.id.button2, R.id.check_folders);
         if (mPickName != null)
             mPickName.addTextChangedListener(this);
     }
@@ -64,18 +81,26 @@ private void checkBundle(Bundle data, Intent intent) {
         if (data.containsKey("start")) {
             mPath = (OpenPath)data.getParcelable("start");
             intent.putExtra("picker", data.getParcelable("start"));
-        } else
+        } else if(data.containsKey("path")) {
+        	mPath = FileManager.getOpenCache(data.getString("path"));
+        	intent.putExtra("picker", (Parcelable)mPath);
+        }
+        else if ("file".equals(intent.getData().getScheme()))
+        {
+        	mPath = FileManager.getOpenCache(intent.getData().toString());
+        	intent.putExtra("picker", (Parcelable)mPath);
+        }
+        else
             mPath = OpenFile.getExternalMemoryDrive(true);
         if (data.containsKey("name")) {
             mDefaultName = data.getString("name");
             intent.putExtra("name", mDefaultName);
         }
         if (data.containsKey("files"))
-            pickDirOnly = data.getBoolean("files", pickDirOnly);
-
-        ViewUtils.setViewsVisible(this, !pickDirOnly, R.id.pick_path_row, R.id.pick_path);
-        if (!pickDirOnly && (mDefaultName == null || mDefaultName == ""))
-            ViewUtils.setViewsEnabled(this, false, android.R.id.button1);
+            mFoldersOnly = data.getBoolean("files", mFoldersOnly);
+        
+        //ViewUtils.setViewsChecked(this, mFoldersOnly, R.id.check_folders);
+        //ViewUtils.setViewsVisible(this, !mFoldersOnly, R.id.pick_path_row, R.id.pick_path);
     }
 
     private void setPath(OpenPath path, boolean addToStack) {
@@ -139,7 +164,7 @@ private void returnPath() {
         if (intent == null)
             intent = new Intent();
         OpenPath ret = mPath;
-        if (!pickDirOnly)
+        if (!mFoldersOnly)
             ret = ret.getChild(mPickName.getText().toString());
         intent.setData(ret.getUri());
         intent.putExtra("path", (Parcelable)ret);
@@ -157,6 +182,11 @@ public void onClick(View v) {
                 setResult(RESULT_CANCELED);
                 finish();
                 break;
+            case R.id.check_folders:
+            	mFoldersOnly = ((CheckBox)findViewById(R.id.check_folders)).isChecked();
+                ViewUtils.setViewsVisible(this, !mFoldersOnly, R.id.pick_path_row, R.id.pick_path);
+            	setPath(mPath, false);
+            	break;
         }
     }
 
@@ -177,4 +207,90 @@ public void afterTextChanged(Editable s) {
         ViewUtils
                 .setViewsEnabled(this, s != null && !s.toString().equals(""), android.R.id.button1);
     }
+    
+    public OpenApplication getOpenApplication() { return (OpenApplication)getApplication(); }
+
+	@Override
+	public DataManager getDataManager() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getDataManager();
+	}
+
+	@Override
+	public ImageCacheService getImageCacheService() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getImageCacheService();
+	}
+
+	@Override
+	public DownloadCache getDownloadCache() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getDownloadCache();
+	}
+
+	@Override
+	public ThreadPool getThreadPool() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getThreadPool();
+	}
+
+	@Override
+	public LruCache<String, Bitmap> getMemoryCache() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getMemoryCache();
+	}
+
+	@Override
+	public DiskLruCache getDiskCache() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getDiskCache();
+	}
+
+	@Override
+	public ActionMode getActionMode() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getActionMode();
+	}
+
+	@Override
+	public void setActionMode(ActionMode mode) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public OpenClipboard getClipboard() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getClipboard();
+	}
+
+	@Override
+	public ShellSession getShellSession() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getShellSession();
+	}
+
+	@Override
+	public Context getContext() {
+		// TODO Auto-generated method stub
+		return this;
+	}
+
+	@Override
+	public Preferences getPreferences() {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getPreferences();
+	}
+
+	@Override
+	public void refreshBookmarks() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public int getThemedResourceId(int styleableId, int defaultResourceId) {
+		// TODO Auto-generated method stub
+		return getOpenApplication().getThemedResourceId(styleableId, defaultResourceId);
+	}
 }
diff --git a/src/org/brandroid/openmanager/activities/OpenExplorer.java b/src/org/brandroid/openmanager/activities/OpenExplorer.java
index f1a5a77c..d8e00d4d 100644
--- a/src/org/brandroid/openmanager/activities/OpenExplorer.java
+++ b/src/org/brandroid/openmanager/activities/OpenExplorer.java
@@ -22,7 +22,6 @@
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.NetworkInfo.State;
-import android.nfc.FormatException;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
 import android.nfc.NfcAdapter;
@@ -50,7 +49,6 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import android.database.ContentObserver;
@@ -106,11 +104,9 @@
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
-import android.widget.GridLayout;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.PopupWindow.OnDismissListener;
@@ -129,13 +125,9 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.RejectedExecutionException;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-
-import org.apache.commons.vfs2.auth.StaticUserAuthenticator;
+import java.util.concurrent.TimeoutException;
 import org.brandroid.openmanager.R;
 import org.brandroid.openmanager.adapters.ArrayPagerAdapter;
 import org.brandroid.openmanager.adapters.OpenBookmarks;
@@ -148,7 +140,6 @@
 import org.brandroid.openmanager.adapters.IconContextMenu;
 import org.brandroid.openmanager.adapters.IconContextMenuAdapter;
 import org.brandroid.openmanager.data.OpenCursor;
-import org.brandroid.openmanager.data.OpenDrive;
 import org.brandroid.openmanager.data.OpenFile;
 import org.brandroid.openmanager.data.OpenMediaStore;
 import org.brandroid.openmanager.data.OpenNetworkPath;
@@ -157,10 +148,9 @@
 import org.brandroid.openmanager.data.OpenPathArray;
 import org.brandroid.openmanager.data.OpenPathMerged;
 import org.brandroid.openmanager.data.OpenSFTP;
-import org.brandroid.openmanager.data.OpenServer;
 import org.brandroid.openmanager.data.OpenServers;
 import org.brandroid.openmanager.data.OpenSmartFolder;
-import org.brandroid.openmanager.data.OpenVFS;
+import org.brandroid.openmanager.data.OpenURL;
 import org.brandroid.openmanager.data.OpenSmartFolder.SmartSearch;
 import org.brandroid.openmanager.fragments.DialogHandler;
 import org.brandroid.openmanager.fragments.ContentFragment;
@@ -174,9 +164,9 @@
 import org.brandroid.openmanager.fragments.SearchResultsFragment;
 import org.brandroid.openmanager.fragments.TextEditorFragment;
 import org.brandroid.openmanager.interfaces.OpenApp;
-import org.brandroid.openmanager.interfaces.OpenApp.OnBookMarkChangeListener;
 import org.brandroid.openmanager.util.BetterPopupWindow;
 import org.brandroid.openmanager.util.EventHandler;
+import org.brandroid.openmanager.util.EventHandler.BackgroundWork;
 import org.brandroid.openmanager.util.EventHandler.EventType;
 import org.brandroid.openmanager.util.EventHandler.OnWorkerUpdateListener;
 import org.brandroid.openmanager.util.IntentManager;
@@ -184,11 +174,11 @@
 import org.brandroid.openmanager.util.MimeTypeParser;
 import org.brandroid.openmanager.util.FileManager;
 import org.brandroid.openmanager.util.PrivatePreferences;
+import org.brandroid.openmanager.util.RootManager;
 import org.brandroid.openmanager.util.ShellSession;
 import org.brandroid.openmanager.util.SimpleHostKeyRepo;
 import org.brandroid.openmanager.util.SimpleUserInfo;
 import org.brandroid.openmanager.util.SimpleUserInfo.UserInfoInteractionCallback;
-import org.brandroid.openmanager.util.SortType;
 import org.brandroid.openmanager.util.ThumbnailCreator;
 import org.brandroid.openmanager.util.ThumbnailCreator.OnUpdateImageListener;
 import org.brandroid.openmanager.views.OpenPathList;
@@ -205,7 +195,6 @@
 import org.brandroid.utils.ViewUtils;
 
 import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.internal.view.menu.ActionMenuPresenter;
 import com.actionbarsherlock.internal.view.menu.MenuBuilder;
 import com.actionbarsherlock.view.*;
 import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
@@ -217,6 +206,10 @@
 import com.android.gallery3d.util.ThreadPool;
 import com.jcraft.jsch.JSchException;
 import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.exceptions.RootDeniedException;
+import com.stericson.RootTools.execution.Command;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
 import com.viewpagerindicator.TabPageIndicator;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -246,6 +239,8 @@ public class OpenExplorer extends OpenFragmentActivity implements OnBackStackCha
     public static final int VIEW_LIST = 0;
     public static final int VIEW_GRID = 1;
     public static final int VIEW_CAROUSEL = 2;
+    
+    public static final String INTENT_BROADCAST_ACTION = "INTENT_BROADCAST";
 
     public static final boolean BEFORE_HONEYCOMB = Build.VERSION.SDK_INT < 11;
     public static final boolean SDK_JELLYBEAN = Build.VERSION.SDK_INT > 15;
@@ -532,6 +527,8 @@ public void onCreate(Bundle savedInstanceState) {
                         PackageManager.GET_META_DATA).applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) == ApplicationInfo.FLAG_DEBUGGABLE;
             if (isBlackBerry())
                 IS_DEBUG_BUILD = false;
+            if(RootTools.debugMode)
+                RootTools.debugMode = IS_DEBUG_BUILD;
         } catch (NameNotFoundException e1) {
         }
 
@@ -598,10 +595,6 @@ public void onCreate(Bundle savedInstanceState) {
             EventHandler.execute(new PeekAtGrandKidsTask(), path);
 
         initPager();
-        if (handleIntent(getIntent())) {
-            path = mLastPath = null;
-            bAddToStack = false;
-        }
 
         if (mViewPager != null && mViewPagerAdapter != null && path != null) {
             // mViewPagerAdapter.add(mContentFragment);
@@ -735,7 +728,6 @@ private void checkGTV() {
     private void checkRoot() {
         try {
             if (Preferences.Pref_Root) {
-                showToast("Root preference selected, requesting now.");
                 // && (RootManager.Default == null ||
                 // !RootManager.Default.isRoot()))
                 requestRoot();
@@ -748,18 +740,189 @@ private void checkRoot() {
     }
 
     private void requestRoot() {
+        if(!Preferences.Pref_Root) return;
+        showToast("Root preference selected, requesting now.");
         new Thread(new Runnable() {
             public void run() {
+                Preferences.Pref_Root = false;
                 if (RootTools.isAccessGiven())
                     try {
                         RootTools.getShell(true);
+                        Preferences.Pref_Root = true;
+                        checkBusybox();
                     } catch (IOException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
+                    } catch (TimeoutException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    } catch (RootDeniedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
                     }
             }
         }).start();
     }
+    
+    private boolean checkBusybox()
+    {
+    	if(RootTools.checkUtil("busybox")) return true;
+    	post(new Runnable() {
+			public void run() {
+		    	DialogHandler.showConfirmationDialog(OpenExplorer.this,
+		    			"It appears that Busybox is not installed on your system. Would you like to install it?",
+		    			"Busybox Check", getPreferences(), "pref_busybox", false,
+		    			new OnClickListener() {
+							public void onClick(DialogInterface dialog, int which) {
+							    if(which != DialogInterface.BUTTON_POSITIVE)
+							        return;
+							    if(dialog != null)
+							        dialog.dismiss();
+								new Thread(new Runnable() {
+									public void run() {
+										installBusybox();
+									}
+								}).start();
+							}
+						});
+			}
+		});
+    	return false;
+    }
+    
+    private void installBusybox()
+    {
+    	try {
+    		String cpuinfo = new OpenFile("/proc/cpuinfo").readAscii();
+    		for(String arc : new String[] {"v7l", "v6l", "v5l", "v4tl", "v4l", "i686", "i586", "i486", "mips", "x86_64", "powerpc"})
+    			if(cpuinfo.indexOf(arc) > -1)
+    				if(installBusybox((arc.startsWith("v") ? "arm" : "") + arc))
+    					return;
+    		RootTools.getShell(false, 500).add(new Command(0, 500, "uname -m") {
+				public void output(int id, String arch) {
+					if(arch == null || arch.equals("")) return;
+					if(arch.indexOf(" ") > -1) return;
+					installBusybox(arch);
+				}
+			});
+    	} catch(IOException e) {
+    		e.printStackTrace();
+    	} catch (TimeoutException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (RootDeniedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    }
+    
+    private boolean installBusybox(String arch)
+    {
+    	final String mBusyboxUrl = "http://busybox.net/downloads/binaries/latest/";
+    	final String mBusyboxFile = "busybox-" + arch;
+    	final String url = mBusyboxUrl + "busybox-" + arch;
+    	if(IS_DEBUG_BUILD)
+    	    Logger.LogVerbose("Checking for busybox for " + arch + ": " + url);
+		OpenFile dl = new OpenFile("/mnt/sdcard");
+		if(!dl.exists() || !dl.canWrite())
+		    dl = OpenFile.getExternalMemoryDrive(true);
+		if(dl != null && dl.getChild("Download") != null && dl.getChild("Download").canWrite())
+			dl = dl.getChild("Download");
+//		dl = dl.getChild(".busybox");
+//		if(dl.exists())
+//		    dl.delete();
+//		try {
+//			dl.create(); // Make sure we can write to it
+//			if(!dl.exists()) throw new IOException("WTF");
+//			dl.delete();
+//		} catch (IOException e) {
+//			Logger.LogError("Unable to create temporary busybox", e);
+//			return false;
+//		}
+		final OpenFile dlp = dl;
+		final OpenURL u = new OpenURL(url);
+        if(!u.exists())
+        {
+        	showToast("Unable to download busybox for [" + arch + "]");
+        	return false;
+        } else
+        	post(new Runnable() {
+				public void run() {
+					EventHandler eh = new EventHandler(getFileManager());
+					BackgroundWork bw = eh.getWorker(EventType.COPY, OpenExplorer.this, dlp);
+					eh.setUpdateListener(new OnWorkerUpdateListener() {
+						
+						@Override
+						public void onWorkerThreadFailure(EventType type, OpenPath... files) {
+							Logger.LogError("Busybox installation failed!");
+						}
+						
+						@Override
+						public void onWorkerThreadComplete(EventType type, String... results) {
+							for(String s : results)
+								Logger.LogDebug("BusyBox.onWorkerThreadComplete(" + s + ")");
+							if(installBusybox(dlp.getChild(mBusyboxFile)))
+								showToast("Busybox installed successfully!");
+							else
+							    showToast("Unable to install Busybox");
+						}
+						
+						@Override
+						public void onWorkerProgressUpdate(int pos, int total) {
+							// TODO Auto-generated method stub
+							
+						}
+					});
+					bw.execute(u);
+				}
+        	});
+        return true;
+    }
+    
+    private boolean installBusybox(OpenFile tmp)
+    {
+    	boolean success = false;
+    	if(!RootManager.isSystemMounted())
+    	    RootTools.remount("/system", "rw");
+    	try {
+            Command cmd = new CommandCapture(0,
+                    "cp " + tmp.getAbsolutePath() + " /system/xbin/busybox",
+                    "chmod 755 /system/xbin/busybox"
+                    );
+    	    Shell.runRootCommand(cmd);
+    	    cmd.waitForFinish();
+    	    final List<String> missings = new ArrayList<String>();
+    	    cmd = new Command(1, "busybox --list") {
+                public void output(int id, String util) {
+                    if(new File("/system/xbin/" + util).exists() ||
+                       new File("/system/bin/" + util).exists())
+                        Logger.LogWarning(util + " already exists!");
+                    else
+                    {
+                        missings.add("ln -s /system/xbin/busybox /system/xbin/" + util);
+                        Logger.LogVerbose("Need to link to busybox: " + util);
+                    }
+                }
+            };
+            Shell.runCommand(cmd);
+            cmd.waitForFinish();
+            if(missings.size() > 0)
+            {
+                for(int i = 0; i < missings.size(); i++)
+                {
+                    cmd = new CommandCapture(2 + i, missings.get(i));
+                    Shell.runRootCommand(cmd);
+                    cmd.waitForFinish();
+                }
+            }
+    	    tmp.delete();
+            success = RootTools.checkUtil("busybox");
+        } catch (Exception e) {
+            Logger.LogError("Couldn't finish Busybox install", e);
+        }
+    	RootTools.remount("/system", "ro");
+    	return success;
+    }
 
     private void exitRoot() {
         new Thread(new Runnable() {
@@ -1165,6 +1328,8 @@ public boolean handleIntent(Intent intent) {
             } else if (reqId == REQ_EVENT_VIEW)
             {
                 refreshOperations();
+                mOpsFragment = null;
+                initOpsPopup();
                 BetterPopupWindow pw = mOpsFragment.getPopup();
                 if(pw != null)
                     pw.showLikePopDownMenu();
@@ -1498,11 +1663,14 @@ public void updatePagerTitle(int page) {
                     left += "/";
             }
         }
-        SpannableString srLeft = new SpannableString(left);
-        if(left.length() > 0)
-            srLeft.setSpan(new ForegroundColorSpan(Color.GRAY), 0, left.length(),
-                Spanned.SPAN_COMPOSING);
-        ssb.append(srLeft);
+        if(!left.equals(""))
+        {
+            SpannableString srLeft = new SpannableString(left);
+            if(left.length() > 0)
+                srLeft.setSpan(new ForegroundColorSpan(Color.GRAY), 0, left.length(),
+                    Spanned.SPAN_COMPOSING);
+            ssb.append(srLeft);
+        }
         // ssb.setSpan(new ForegroundColorSpan(Color.GRAY), 0, left.length(),
         // Spanned.SPAN_COMPOSING);
         OpenFragment curr = mViewPagerAdapter.getItem(page);
@@ -1522,10 +1690,13 @@ public void updatePagerTitle(int page) {
                     right += "/";
             }
         }
-        SpannableString srRight = new SpannableString(right);
-        srRight.setSpan(new ForegroundColorSpan(Color.GRAY), 0, right.length(),
-                Spanned.SPAN_COMPOSING);
-        ssb.append(srRight);
+        if(!right.equals(""))
+        {
+            SpannableString srRight = new SpannableString(right);
+            srRight.setSpan(new ForegroundColorSpan(Color.GRAY), 0, right.length(),
+                    Spanned.SPAN_COMPOSING);
+            ssb.append(srRight);
+        }
         updateTitle(ssb);
     }
 
@@ -1697,22 +1868,26 @@ private void submitStats() // submit anonymous error log
     {
         if (!Logger.isLoggingEnabled())
             return; // Disable by default
-        if (OpenExplorer.IS_DEBUG_BUILD)
-            return;
-        if (new Date().getTime() - lastSubmit < 60000)
+            // if (OpenExplorer.IS_DEBUG_BUILD)
+            // return;
+        if (new Date().getTime() - lastSubmit < 6000)
+        {
+            Logger.LogVerbose("Skipping stats. Not enough time has passed ("
+                    + (new Date().getTime() - lastSubmit) + ")");
             return;
+        }
         lastSubmit = new Date().getTime();
         if (!isNetworkConnected())
             return;
 
         String logs = Logger.getDbLogs(false);
-        if (logs == null || logs == "")
+        if (logs == null || "".equals(logs))
             logs = "[]";
         // if(logs != null && logs != "") {
         Logger.LogDebug("Found " + logs.length() + " bytes of logs.");
         EventHandler.execute(new SubmitStatsTask(this), logs);
         // } else Logger.LogWarning("Logs not found.");
-            }
+    }
 
     public void handleRefreshMedia(final String path, boolean keepChecking, final int retries) {
         if (!keepChecking || retries <= 0) {
@@ -1967,7 +2142,7 @@ public void run() {
                                 }
                             }
                             mVideosMerged.refreshKids();
-                        } catch (IOException e) {
+                        } catch (Exception e) {
                             Logger.LogError("Couldn't refresh merged Videos");
                         }
                     }
@@ -2323,9 +2498,12 @@ public void updateTitle(CharSequence cs) {
         {
             SpannableStringBuilder sb = new SpannableStringBuilder(getResources().getString(
                     R.string.app_title));
-            sb.append(cs.equals("") ? "" : " - ");
-            sb.append(cs);
-            setTitle(cs);
+            if(!cs.equals(""))
+            {
+                sb.append(cs.equals("") ? "" : " - ");
+                sb.append(cs);
+            }
+            setTitle(sb);
         }
     }
 
@@ -2353,7 +2531,7 @@ private void restoreOpenedEditors() {
         if (editing == null)
             return;
         for (String s : editing.split(",")) {
-            if (s == null || s == "")
+            if (s == null || "".equals(s))
                 continue;
             OpenPath path = FileManager.getOpenCache(s, this);
             if (path == null)
@@ -2618,9 +2796,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
         // if(id != R.id.title_icon_holder && id != android.R.id.home);
         // toggleBookmarks(false);
         OpenFragment f = getSelectedFragment();
+        
+        Logger.LogInfo("OpenExplorer.onOptionsItemSelected(" + item.getTitle() + ")");
 
-        if (IS_DEBUG_BUILD)
-            Logger.LogDebug("OpenExplorer.onClick(0x" + Integer.toHexString(id) + "," + item + ")");
         switch (id) {
             case R.id.menu_donate:
                 launchUri(this, Uri.parse("http://brandroid.org/donate.php?ref=app_menu"));
@@ -2740,9 +2918,6 @@ public void onClick(DialogInterface dialog, int which) {
 
         // return super.onOptionsItemSelected(item);
 
-        if (IS_DEBUG_BUILD)
-            Logger.LogDebug("OpenExplorer.onOptionsItemSelected(" + item + ")");
-
         if (item.getSubMenu() != null) {
             onPrepareOptionsMenu(item.getSubMenu());
             View anchor = findViewById(item.getItemId());
@@ -2772,16 +2947,12 @@ public void onClick(DialogInterface dialog, int which) {
         if (f != null && f.onOptionsItemSelected(item))
             return true;
 
-        if (IS_DEBUG_BUILD)
-            Logger.LogDebug("OpenExplorer.onOptionsItemSelected(0x"
-                    + Integer.toHexString(item.getItemId()) + ")");
-
         return onClick(item.getItemId(), item, null);
     }
 
     private void showExitDialog() {
         DialogHandler.showConfirmationDialog(this, getString(R.string.s_alert_exit),
-                getString(R.string.s_menu_exit), getPreferences(), "exit",
+                getString(R.string.s_menu_exit), getPreferences(), "exit", true,
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -3022,8 +3193,7 @@ public void showPreferences(OpenPath path) {
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (IS_DEBUG_BUILD)
-            Logger.LogInfo("OpenExplorer.onKeyUp(" + keyCode + "," + event + ")");
+        Logger.LogInfo("OpenExplorer.onKeyUp(" + keyCode + "," + event + ")");
         if (event.getAction() != KeyEvent.ACTION_UP)
             return super.onKeyUp(keyCode, event);
         if (MenuUtils.getMenuShortcut(event) != null) {
@@ -3549,15 +3719,25 @@ public boolean onLongClick(View v) {
         }
         return false;
     }
+    
+    public void addBookmark(OpenPath file)
+    {
+        addBookmark(this, file, mBookmarkListener);
+    }
 
-    public void addBookmark(OpenPath file) {
+    public static void addBookmark(OpenApp app, OpenPath file, OpenApp.OnBookMarkChangeListener mBookmarkListener) {
         Logger.LogDebug("Adding Bookmark: " + file.getPath());
-        String sBookmarks = getPreferences().getSetting("bookmarks", "bookmarks", "");
+        Preferences prefs = app.getPreferences();
+        String sBookmarks = prefs.getSetting("bookmarks", "bookmarks", "");
         sBookmarks += (sBookmarks != "" ? ";" : "") + file.getPath();
         Logger.LogVerbose("Bookmarks: " + sBookmarks);
-        getPreferences().setSetting("bookmarks", "bookmarks", sBookmarks);
+        prefs.setSetting("bookmarks", "bookmarks", sBookmarks);
+        Intent intent = new Intent(OpenExplorer.INTENT_BROADCAST_ACTION);
+        intent.putExtra("action", "bookmark");
+        intent.putExtra("path", (Parcelable)file);
+        app.getContext().sendBroadcast(intent);
         if (mBookmarkListener != null)
-            mBookmarkListener.onBookMarkAdd(this, file);
+            mBookmarkListener.onBookMarkAdd(app, file);
     }
 
     public void removeBookmark(OpenPath file) {
@@ -3840,7 +4020,11 @@ else if (l.getId() == 2)
         else if (l.getId() == 3)
             mParent = mApkParent;
 
-        mParent.setCursor(c);
+		try {
+	        mParent.setCursor(c);
+	    } catch(android.database.CursorIndexOutOfBoundsException cex) {
+	    	Logger.LogError("Unable to set parent cursor.", cex);
+	    }
 
         if (l.getId() == 0)
             try {
@@ -4029,8 +4213,7 @@ public boolean onIconContextItemSelected(PopupMenu menu, MenuItem item,
     public boolean onKey(View v, int keyCode, KeyEvent event) {
         if (v == null)
             return false;
-        if (IS_DEBUG_BUILD)
-            Logger.LogDebug("OpenExplorer.onKey(" + v + "," + keyCode + "," + event + ")");
+        Logger.LogInfo("OpenExplorer.onKey(" + keyCode + "," + event + ") on " + v);
         if (event.getAction() != KeyEvent.ACTION_UP)
             return false;
         if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) {
diff --git a/src/org/brandroid/openmanager/activities/OpenFragmentActivity.java b/src/org/brandroid/openmanager/activities/OpenFragmentActivity.java
index 00b32510..f24b732f 100644
--- a/src/org/brandroid/openmanager/activities/OpenFragmentActivity.java
+++ b/src/org/brandroid/openmanager/activities/OpenFragmentActivity.java
@@ -427,7 +427,7 @@ public void onSendCommand(SmbFile file, Object... commands) {
                         if (DEBUG && blk instanceof SmbComReadAndX)
                             continue;
                         String tmp = blk.toShortString();
-                        if (tmp == null || tmp == "")
+                        if (tmp == null || "".equals(tmp))
                             continue;
                         if (tmp.indexOf("[") > -1)
                             s += " -> " + tmp.substring(0, tmp.indexOf("["));
diff --git a/src/org/brandroid/openmanager/activities/ServerSetupActivity.java b/src/org/brandroid/openmanager/activities/ServerSetupActivity.java
index 58305b9e..6af777f7 100644
--- a/src/org/brandroid/openmanager/activities/ServerSetupActivity.java
+++ b/src/org/brandroid/openmanager/activities/ServerSetupActivity.java
@@ -92,6 +92,7 @@
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
+import android.view.ViewGroup.LayoutParams;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -102,6 +103,7 @@
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -141,11 +143,10 @@ public class ServerSetupActivity extends Activity implements OnCheckedChangeList
     private View mBaseView;
     private Spinner mTypeSpinner;
     private Bundle mArgs;
+    private String mAuthState = null;
     private int mServerType = -1;
     private boolean mAuthTokenFound = false;
-    private WebView mLoginWebView;
     private static boolean DEBUG = OpenExplorer.IS_DEBUG_BUILD && true;
-    private final boolean mUseDialog = Build.VERSION.SDK_INT > 10;
 
     public static class ServerTypeAdapter extends BaseAdapter
     {
@@ -336,6 +337,7 @@ public CharSequence colorify(int resId, int color) {
     }
 
     public static CharSequence colorify(String txt, int color) {
+        if(txt.equals("")) return txt;
         if (color != 0) {
             color = Color.rgb(Color.red(color), Color.green(color), Color.blue(color));
             SpannableString line = new SpannableString(txt);
@@ -350,14 +352,21 @@ public int getThemeId() {
         String themeName = new Preferences(this)
                 .getString("global", "pref_themes", "dark");
         if (themeName.equals("dark"))
-            return mUseDialog ? R.style.AppTheme_Dialog : R.style.AppTheme_Dark;
+            return R.style.AppTheme_Dialog;
         else if (themeName.equals("light"))
-            return mUseDialog ? R.style.AppTheme_Dialog_Light : R.style.AppTheme_Light;
+            return R.style.AppTheme_Dialog_Light;
         else if (themeName.equals("lightdark"))
-            return mUseDialog ? R.style.AppTheme_Dialog_Light : R.style.AppTheme_LightAndDark;
+            return R.style.AppTheme_Dialog_Light;
         else if (themeName.equals("custom"))
-            return mUseDialog ? R.style.AppTheme_Dialog : R.style.AppTheme_Custom;
-        return mUseDialog ? R.style.AppTheme_Dialog : R.style.AppTheme_Dark;
+            return R.style.AppTheme_Dialog;
+        return R.style.AppTheme_Dialog;
+    }
+    
+    private String getAuthState()
+    {
+        if(mAuthState == null)
+            mAuthState = OpenDropBox.createStateNonce();
+        return mAuthState;
     }
 
     @Override
@@ -420,20 +429,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mBaseView = getLayoutInflater().inflate(R.layout.server, null);
         
-        if(Build.VERSION.SDK_INT > 10)
-        {
-	        requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
-	        setContentView(mBaseView);
-	        getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title_bar_dialog);
-	        ViewUtils.setViewsVisible(mBaseView, false, R.id.title_bar, R.id.title_divider);
-        } else
-        	setContentView(mBaseView);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(mBaseView);
         
         getWindow().setSoftInputMode(
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
 
-        mLoginWebView = (WebView)mBaseView.findViewById(R.id.server_webview);
-
         setIcon(getServerTypeDrawable(mServerType));
         setTitle(server.getName());
         
@@ -516,6 +517,20 @@ protected void onResume() {
             onClick(R.id.server_authenticate);
         invalidateOptionsMenu();
     }
+    
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        if(getAuthState() != null)
+            outState.putString("state", getAuthState());
+        super.onSaveInstanceState(outState);
+    }
+    
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        if(savedInstanceState != null && savedInstanceState.containsKey("state"))
+            mAuthState = savedInstanceState.getString("state");
+    }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -561,13 +576,15 @@ private void handleIntent(Intent data) {
             enableAuthenticateButton(false);
             ViewUtils.setViewsVisible(mBaseView, false, R.id.server_webview);
             ViewUtils.setViewsVisible(mBaseView, true, R.id.server_logout);
+            onClick(android.R.string.ok);
         } else {
             if (OpenDropBox.handleIntent(data, server))
             {
-                ViewUtils.setText(mBaseView, server.getPassword(), R.id.text_password);
+                ViewUtils.setText(mBaseView, server.getPassword(), R.id.text_password); 
                 ViewUtils.setViewsVisible(mBaseView, false, R.id.server_webview,
                         R.id.server_authenticate);
                 ViewUtils.setViewsVisible(mBaseView, true, R.id.server_logout);
+                onClick(android.R.string.ok);
             }
         }
         invalidateOptionsMenu();
@@ -686,14 +703,21 @@ public void setTitle(CharSequence title) {
     @SuppressLint("NewApi")
     @Override
     public void invalidateOptionsMenu() {
-        if(findViewById(R.id.title_buttons) != null)
+        if(findViewById(R.id.title_buttons) != null && findViewById(R.id.title_buttons).isShown())
         {
             MenuBuilder2 mb = new MenuBuilder2(this);
             onCreateOptionsMenu(mb);
             onPrepareOptionsMenu(mb);
-        } else if(Build.VERSION.SDK_INT > 10)
+        }
+        if(Build.VERSION.SDK_INT > 10)
             super.invalidateOptionsMenu();
     }
+    
+    @Override
+    public void onAttachedToWindow() {
+    	super.onAttachedToWindow();
+    	invalidateOptionsMenu();
+    }
 
     // @Override
     // protected void onSaveInstanceState(Bundle outState) {
@@ -720,6 +744,11 @@ public void invalidateOptionsMenu() {
     public void onClick(View v) {
         onClick(v.getId());
     }
+    
+    @Override
+    public void onBackPressed() {
+    	onClick(android.R.string.ok);
+    }
 
     public boolean onClick(int id)
     {
@@ -801,6 +830,7 @@ public void onComplete(final String ticket, final String status) {
                             }
                             else {
                                 // onGetTicketFail();
+                                Logger.LogError("Unable to get Box Ticket");
                                 enableAuthenticateButton(true);
                             }
                         }
@@ -808,15 +838,20 @@ public void onComplete(final String ticket, final String status) {
                         @Override
                         public void onIOException(final IOException e) {
                             // onGetTicketFail();
+                            Logger.LogError("Unable to get Box Ticket", e);
                             enableAuthenticateButton(true);
                         }
                     });
                 } else if (t2.startsWith("db")) {
+                    final WebView mLoginWebView = (WebView)findViewById(R.id.server_webview);
+                    mLoginWebView.setVisibility(View.VISIBLE);
+                    findViewById(R.id.server_text_scroller).setVisibility(View.GONE);
                     //if (!checkDropBoxAppKeySetup())
                     {
                         enableAuthenticateButton(false);
                         mLoginWebView.getSettings().setJavaScriptEnabled(true);
-                        if(!OpenDropBox.startAuthentication(this, mLoginWebView))
+                        // App Auth not working, so disable for now
+                        //if(!OpenDropBox.startAuthentication(this, mLoginWebView, getAuthState()))
                         {
                             mLoginWebView.setWebViewClient(new WebViewClient(){
                                 @SuppressLint("NewApi")
@@ -828,6 +863,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                                         String token = uri.getQueryParameter("oauth_token");
                                         String secret = uri.getQueryParameter("oauth_token_secret");
                                         String uid = uri.getQueryParameter("uid");
+                                        mAuthState = uri.getQueryParameter("state");
                                         server.setPassword(token + "," + secret);
                                         mLoginWebView.setVisibility(View.GONE);
                                         enableAuthenticateButton(false);
@@ -841,7 +877,8 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                                 }
                             });
                             mLoginWebView.loadUrl(AuthActivity.getConnectUrl(getCloudSetting("dropbox_key"),
-                                    OpenDropBox.getConsumerSig(getCloudSetting("dropbox_secret"))));
+                                    OpenDropBox.getConsumerSig(getCloudSetting("dropbox_secret")),
+                                    getAuthState()));
                             mLoginWebView.setVisibility(View.VISIBLE);
                         }
                         
@@ -984,8 +1021,7 @@ private void enableAuthenticateButton(boolean enable)
         } else {
             ViewUtils.setText(mBaseView, getString(R.string.s_authenticating),
                     R.id.server_authenticate);
-            ViewUtils.setText(mBaseView, getString(R.string.s_authenticate_refresh),
-                    R.id.server_authenticate);
+            ViewUtils.setViewsEnabled(mBaseView, false, R.id.server_authenticate);
         }
     }
 
@@ -1016,7 +1052,10 @@ private boolean checkDropBoxAppKeySetup() {
     private void loadBoxLoginWebview(final String ticket) {
         // Load the login webpage. Note how the ticket must be appended to the
         // login url.
-        String loginUrl = "https://m.box.net/api/1.0/auth/" + ticket;
+        String loginUrl = "https://api.box.com/1.0/auth/" + ticket;
+        WebView mLoginWebView = (WebView)findViewById(R.id.server_webview);
+        mLoginWebView.setVisibility(View.VISIBLE);
+        ViewUtils.setViewsVisible(mBaseView, false, R.id.server_text_scroller, R.id.server_authenticate, R.id.server_logout);
         mLoginWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
         mLoginWebView.getSettings().setJavaScriptEnabled(true);
         mLoginWebView.setWebViewClient(new WebViewClient() {
@@ -1062,7 +1101,11 @@ private String getCloudSetting(String key)
     private void loadDBLoginWebview() {
         String url = AuthActivity.getConnectUrl(
                 getCloudSetting("dropbox_key"),
-                getCloudSetting("dropbox_secret"));
+                getCloudSetting("dropbox_secret"),
+                getAuthState());
+        WebView mLoginWebView = (WebView)findViewById(R.id.server_webview);
+        mLoginWebView.setVisibility(View.VISIBLE);
+        ViewUtils.setViewsVisible(mBaseView, false, R.id.server_text_scroller, R.id.server_authenticate, R.id.server_logout);
         mLoginWebView.setWebViewClient(new WebViewClient(){
             @Override
             public void onPageFinished(WebView view, String url) {
@@ -1139,34 +1182,42 @@ private void onBoxAuthTokenRetreived(final User authToken) {
         server.setSetting("dao", DAO.toJSON(authToken));
         setIntent(intent);
         onActivityResult(OpenExplorer.REQ_AUTHENTICATE_BOX, RESULT_OK, intent);
+        onClick(android.R.string.ok);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         //getSupportMenuInflater().inflate(R.menu.dialog_buttons, menu);
         getMenuInflater().inflate(R.menu.dialog_buttons, menu);
-        View mTitleButtons = findViewById(R.id.title_buttons);
-        if(mTitleButtons != null)
-        {
-            ((ViewGroup)mTitleButtons).removeAllViews();
-            final LayoutInflater inflater = LayoutInflater.from(this);
-            for(int i = 0; i < menu.size(); i++)
-            {
-                final MenuItem item = menu.getItem(i);
-                ImageView btn = (ImageView)inflater.inflate(R.layout.toolbar_button, null);
-                btn.setId(item.getItemId());
-                btn.setOnClickListener(this);
-                btn.setImageDrawable(item.getIcon());
-                btn.setOnLongClickListener(new View.OnLongClickListener() {
-                    public boolean onLongClick(View v) {
-                        Toast.makeText(ServerSetupActivity.this, item.getTitle(), Toast.LENGTH_SHORT).show();
-        return true;
-    }
-                });
-                ((ViewGroup)mTitleButtons).addView(btn);
-            }
-        }
-        return true;
+		ViewGroup mTitleButtons = (ViewGroup)findViewById(R.id.title_buttons);
+		if (mTitleButtons != null) {
+			mTitleButtons.removeAllViews();
+			final LayoutInflater inflater = LayoutInflater.from(this);
+			for (int i = 0; i < menu.size(); i++) {
+				final MenuItem item = menu.getItem(i);
+				ImageView btn = (ImageView) inflater.inflate(
+						R.layout.toolbar_button, null);
+				mTitleButtons.addView(btn);
+				LayoutParams lp = btn.getLayoutParams();
+				if(lp != null)
+				{
+					lp.height = LayoutParams.MATCH_PARENT;
+					btn.setLayoutParams(lp);
+				}
+				btn.setId(item.getItemId());
+				btn.setOnClickListener(this);
+				btn.setImageDrawable(item.getIcon());
+				btn.setOnLongClickListener(new View.OnLongClickListener() {
+					public boolean onLongClick(View v) {
+						Toast.makeText(ServerSetupActivity.this,
+								item.getTitle(), Toast.LENGTH_SHORT).show();
+						return true;
+					}
+				});
+				
+			}
+		}
+		return true;
     }
 
     @Override
@@ -1185,6 +1236,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
                 btn.setId(item.getItemId());
                 btn.setOnClickListener(this);
                 btn.setImageDrawable(item.getIcon());
+                
             }
             ViewUtils.setViewsEnabled(btn, item.isEnabled());
             ViewUtils.setViewsVisible(btn, item.isVisible());
@@ -1631,6 +1683,7 @@ public void onDriveAuthTokenReceived(String account, String token) {
         ViewUtils.setViewsVisible(mBaseView, true, R.id.server_logout);
         ViewUtils.setViewsVisible(mBaseView, false, R.id.server_authenticate);
         invalidateOptionsMenu();
+        onClick(android.R.string.ok); 
     }
 
     public static boolean interceptOldToken(final Exception e, final String authToken, final String refreshToken,
@@ -1785,8 +1838,10 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
     private void showDriveWebview()
     {
+        final WebView mLoginWebView = (WebView)findViewById(R.id.server_webview);
+        mLoginWebView.setVisibility(View.VISIBLE);
+        ViewUtils.setViewsVisible(mBaseView, false, R.id.server_text_scroller);
         enableAuthenticateButton(false);
-        mLoginWebView.setVisibility(View.GONE);
         mLoginWebView.getSettings().setJavaScriptEnabled(true);
         mLoginWebView.setWebChromeClient(new WebChromeClient(){
             @SuppressLint("NewApi")
@@ -1834,7 +1889,6 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         });
         mLoginWebView.loadUrl(
                 OpenDrive.getTokenAuthURL());
-        mLoginWebView.setVisibility(View.VISIBLE);
     }
 
     private static boolean received401 = false;
diff --git a/src/org/brandroid/openmanager/activities/SettingsActivity.java b/src/org/brandroid/openmanager/activities/SettingsActivity.java
index f8c110b9..6f71d105 100644
--- a/src/org/brandroid/openmanager/activities/SettingsActivity.java
+++ b/src/org/brandroid/openmanager/activities/SettingsActivity.java
@@ -18,11 +18,15 @@
 
 package org.brandroid.openmanager.activities;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeoutException;
 
 import org.brandroid.openmanager.R;
 import org.brandroid.openmanager.adapters.OpenClipboard;
@@ -32,6 +36,7 @@
 import org.brandroid.openmanager.data.OpenServer;
 import org.brandroid.openmanager.data.OpenServers;
 import org.brandroid.openmanager.fragments.DialogHandler;
+import org.brandroid.openmanager.fragments.PreferenceFragmentV11;
 import org.brandroid.openmanager.interfaces.OpenApp;
 import org.brandroid.openmanager.util.InputDialog;
 import org.brandroid.openmanager.util.PrivatePreferences;
@@ -55,6 +60,7 @@
 import com.android.gallery3d.util.ThreadPool;
 import com.box.androidlib.BoxAuthentication;
 import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.exceptions.RootDeniedException;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -83,6 +89,7 @@
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.text.Spannable;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.Toast;
@@ -162,6 +169,8 @@ protected void onResume() {
         if (data == null || (data.size() == 1 && data.containsKey("path"))) {
 
         }
+        if(data.toString().indexOf("key=advanced") > -1)
+            updateSystemMount(getPreferenceScreen());
         if (DEBUG)
             Logger.LogDebug("SettingsActivity.onResume(" + data + ")");
         super.onResume();
@@ -172,6 +181,10 @@ protected void onRestoreInstanceState(Bundle state) {
             Logger.LogDebug("SettingsActivity.onRestoreInstanceState(" + state + ")");
         super.onRestoreInstanceState(state);
     }
+    
+    protected boolean isValidFragment(String fragmentName) {
+    	  return PreferenceFragmentV11.class.getName().equals(fragmentName);
+    }
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -217,10 +230,6 @@ public void onCreate(Bundle savedInstanceState) {
         PreferenceManager.setDefaultValues(this, pathSafe, PreferenceActivity.MODE_PRIVATE,
                 R.xml.preferences, false);
 
-        CheckBoxPreference pSystem = (CheckBoxPreference)findPreference("pref_system_mount");
-        if (pSystem != null)
-            pSystem.setChecked(RootManager.isSystemMounted());
-
         // getPreferences(MODE_PRIVATE);
         prefs = new Preferences(getApplicationContext());
 
@@ -240,6 +249,17 @@ public void onCreate(Bundle savedInstanceState) {
             } else { // global preferences
                 addPreferencesFromResource(R.xml.preferences);
 
+                CheckBoxPreference pSystem = (CheckBoxPreference)findPreference("pref_system_mount");
+                if (pSystem != null)
+                {
+                    pSystem.setChecked(false);
+                    try {
+                        String sysrw = RootTools.getMountedAs("/system");
+                        pSystem.setChecked(sysrw.equals("rw"));
+                    } catch(Exception e) {
+                    }
+                }
+                
                 final PreferenceActivity pa = this;
 
                 Preference pLanguage = pm.findPreference("pref_language");
@@ -364,6 +384,21 @@ public void onStopTrackingTouch(SeekBar seekBar) {
          * //showDialog(DIALOG_CANNOT_CONNECT_ID); }
          */
     }
+    
+    private void updateSystemMount(Preference parent)
+    {
+        Logger.LogVerbose("Looking for mount pref...");
+        if(parent == null) return;
+        if(!(parent instanceof PreferenceScreen)) return;
+        PreferenceScreen ps = (PreferenceScreen)parent;
+        Preference pref = ps.findPreference("pref_system_mount");
+        if(pref == null) {
+            updateSystemMount(ps.findPreference("advanced"));
+            return;
+        }
+        Logger.LogVerbose("Found system mount preference.");
+        ((CheckBoxPreference)pref).setChecked(RootManager.isSystemMounted());
+    }
 
     protected void onDestroy() {
         super.onDestroy();
@@ -424,6 +459,8 @@ public void setOnChange(Preference p, Boolean forceSummaries) {
                 setOnChange(ps.getPreference(i), forceSummaries);
             return;
         }
+        
+        updateSystemMount(p);
 
         p.setOnPreferenceChangeListener(this);
 
@@ -577,10 +614,33 @@ public void run() {
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         return onPreferenceTreeClick(preferenceScreen, preference, this);
     }
+    
+    private void requestRoot() {
+        if(!Preferences.Pref_Root) return;
+        new Thread(new Runnable() {
+            public void run() {
+                Preferences.Pref_Root = false;
+                if (RootTools.isAccessGiven())
+                    try {
+                        RootTools.getShell(true);
+                        Preferences.Pref_Root = true;
+                    } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    } catch (TimeoutException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    } catch (RootDeniedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+            }
+        }).start();
+    }
 
     public static boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference, Activity activity) {
-        final String key = preference.getKey();
+            Preference preference, final Activity activity) {
+        final String key = preference.getKey();    
         if (key.equals("pref_global")) {
             Intent intentGlobal = new Intent(activity, SettingsActivity.class);
             activity.startActivity(intentGlobal);
@@ -598,18 +658,68 @@ public static boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
         } else if (key.equals("pref_thumbs_cache_clear")) {
             Toast.makeText(activity, "Cache cleared!", Toast.LENGTH_SHORT).show();
             return true;
+        } else if (key.equals("pref_root")) {
+            final CheckBoxPreference pRoot = (CheckBoxPreference)preference;
+            Preferences.Pref_Root = pRoot.isChecked();
+            if(Preferences.Pref_Root)
+                new Thread(new Runnable() {
+                    public void run() {
+                        Preferences.Pref_Root = false;
+                        if (RootTools.isAccessGiven())
+                            try {
+                                RootTools.getShell(true);
+                                Preferences.Pref_Root = true;
+                            } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                            } catch (TimeoutException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                            } catch (RootDeniedException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                            }
+                    }
+                }).start();
         } else if (key.equals("pref_system_mount")) {
             final CheckBoxPreference pSystem = (CheckBoxPreference)preference;
+            if(!Preferences.Pref_Root)
+            {
+                pSystem.setChecked(false);
+                return true;
+            }
+            pSystem.setEnabled(false);
+            final Handler handler = new Handler();
             final boolean checked = pSystem.isChecked();
+            RootManager.Default.setHandler();
             new Thread(new Runnable() {
                 public void run() {
                     String mode;
                     try {
-                        mode = !checked ? "ro" : "rw";
+                        mode = checked ? "rw" : "ro";
                         RootTools.remount("/system", mode);
-                        if (DEBUG)
-                            Logger.LogDebug("New /system: " + RootTools.getMountedAs("/system"));
-                        // pSystem.setChecked(RootTools.getMountedAs("/system").equalsIgnoreCase("rw"));
+                        final boolean success = RootManager.isSystemMounted() == checked;
+                        if(!success) // fall back to my version
+                        {
+                            final boolean startMounted = RootManager.isSystemMounted();
+                            RootManager.mountSystem(checked);
+                            final boolean isMounted = RootManager.isSystemMounted();
+                            handler.post(new Runnable() {
+                                public void run() {
+                                    if(pSystem != null)
+                                    {
+                                        pSystem.setEnabled(true);
+                                        pSystem.setChecked(isMounted);
+                                    }
+                                    if(isMounted != startMounted)
+                                        Toast.makeText(activity, "Unable to remount system.", Toast.LENGTH_SHORT).show();
+                                }
+                            });
+                        } else
+                            handler.post(new Runnable() {
+                                public void run() {
+                                    pSystem.setEnabled(true);
+                                }});
                     } catch (Exception e) {
                         Logger.LogError("Unable to remount system", e);
                     }
diff --git a/src/org/brandroid/openmanager/activities/UsbActivity.java b/src/org/brandroid/openmanager/activities/UsbActivity.java
index f2b70095..b8641bae 100644
--- a/src/org/brandroid/openmanager/activities/UsbActivity.java
+++ b/src/org/brandroid/openmanager/activities/UsbActivity.java
@@ -37,7 +37,9 @@ protected void onCreate(Bundle savedInstanceState) {
         Intent intent = new Intent(this, OpenExplorer.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
         intent.setAction(Intent.ACTION_VIEW);
-        intent.setData(OpenFile.getUsbDrive().getUri());
+        if(OpenFile.getUsbDrive() == null) { finish(); return; }
+        else
+            intent.setData(OpenFile.getUsbDrive().getUri());
         try {
             startActivity(intent);
         } catch (ActivityNotFoundException e) {
diff --git a/src/org/brandroid/openmanager/adapters/ContentAdapter.java b/src/org/brandroid/openmanager/adapters/ContentAdapter.java
index be735fb9..238d661a 100644
--- a/src/org/brandroid/openmanager/adapters/ContentAdapter.java
+++ b/src/org/brandroid/openmanager/adapters/ContentAdapter.java
@@ -26,6 +26,7 @@
 import org.brandroid.openmanager.data.OpenPath.OpenPathUpdateHandler;
 import org.brandroid.openmanager.data.OpenPath.SpaceHandler;
 import org.brandroid.openmanager.interfaces.OpenApp;
+import org.brandroid.openmanager.util.FileManager;
 import org.brandroid.openmanager.util.SortType;
 import org.brandroid.openmanager.util.SortType.Type;
 import org.brandroid.openmanager.util.ThumbnailCreator;
@@ -46,9 +47,11 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.os.Build;
 import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.style.StyleSpan;
 import android.util.SparseArray;
 import android.view.Gravity;
@@ -68,9 +71,9 @@ public class ContentAdapter extends BaseAdapter {
     private final int GB = MG * KB;
 
     private final OpenPath mParent;
-    private SortedSet<OpenPath> mData2 = new TreeSet<OpenPath>();
-    private OpenPath[] mFinalItems;
-    private boolean isFinal = false;
+    private ArrayList<OpenPath> mData2 = new ArrayList<OpenPath>();
+    //private OpenPath[] mFinalItems;
+    //private boolean isFinal = false;
     // private final List<OpenPath> mData2 = new ArrayList<OpenPath>();
     public int mViewMode = OpenExplorer.VIEW_LIST;
     public boolean mShowThumbnails = true;
@@ -184,18 +187,20 @@ private void updateData(final OpenPath[] items, final boolean doSort) {
             super.notifyDataSetChanged();
             return;
         }
+        
+    	FileManager.setOpenCache(mParent);
 
         // new Thread(new Runnable(){public void run() {
         boolean showHidden = getShowHiddenFiles();
         boolean foldersFirst = getSorting().foldersFirst();
-        Logger.LogVerbose("updateData on " + items.length + " items (for " + mParent + ") : "
+        Logger.LogVerbose("updateData(" + doSort + ") on " + items.length + " items (for " + mParent + ") : "
                 + (showHidden ? "show" : "hide") + " + " + (foldersFirst ? "folders" : "files")
                 + " + " + (doSort ? mSorting.toString() : "no sort"));
-
-        OpenPath.Sorting = mSorting;
+        
+        //OpenPath.Sorting = mSorting;
         mData2.clear();
-        isFinal = false;
-        mFinalItems = null;
+        //isFinal = false;
+        //mFinalItems = null;
 
         if (items != null)
             for (OpenPath f : items) {
@@ -213,46 +218,75 @@ private void updateData(final OpenPath[] items, final boolean doSort) {
                     continue;
                 mData2.add(f);
             }
+        
+        if(doSort)
+        	sort();
 
-        finalize();
-    }
-
-    private void prefinalize() {
-        if (isFinal)
-            return;
-        mFinalItems = mData2.toArray(new OpenPath[mData2.size()]);
-        mData2.clear();
-        isFinal = true;
-    }
-
-    public void finalize() {
-        prefinalize();
+        //finalize();
         super.notifyDataSetChanged();
     }
 
-    private void unfinalize() {
-        if (!isFinal)
-            return;
-        isFinal = false;
-        mData2.clear();
-        mData2.addAll(Arrays.asList(mFinalItems));
-    }
-
-    public boolean isFinalized() {
-        return isFinal;
-    }
+    private void prefinalize() {
+//        if (isFinal)
+//            return;
+//        mFinalItems = mData2.toArray(new OpenPath[mData2.size()]);
+//        mData2.clear();
+//        isFinal = true;
+    }
+
+//    public void finalize() {
+//        prefinalize();
+//        if(!Thread.currentThread().equals(OpenExplorer.UiThread))
+//            OpenExplorer.getHandler().post(new Runnable() {
+//                public void run() {
+//                    ContentAdapter.super.notifyDataSetChanged();
+//                }
+//            });
+//        else
+//            super.notifyDataSetChanged();
+//    }
+//
+//    private void unfinalize() {
+//        if (!isFinal)
+//            return;
+//        isFinal = false;
+//        mData2.clear();
+//        mData2.addAll(Arrays.asList(mFinalItems));
+//    }
+//
+//    public boolean isFinalized() {
+//        return isFinal;
+//    }
 
     @Override
     public void notifyDataSetChanged() {
-        finalize();
+    	//finalize();
         // super.notifyDataSetChanged();
         /*
          * Please note, this is on purpose. We want to hook into
          * notifyDataSetChanged to ensure filters & sorting are enabled.
          */
-        super.notifyDataSetChanged();
+    	if(!Thread.currentThread().equals(OpenExplorer.UiThread))
+    	{
+    		sort();
+            OpenExplorer.getHandler().post(new Runnable() {
+				public void run() {
+					notifyDataSetChanged();
+				}});
+    	} else
+        	super.notifyDataSetChanged();
     }
 
+    public void sort() {
+        sort(mSorting);
+    }
+
+    public void sort(SortType sort) {
+        OpenPath.Sorting = sort;
+        if (mData2 != null && mData2.size() > 1)
+            Collections.sort(mData2);
+    }
+    
     private OpenPath[] getList() {
         try {
             if (mParent == null
@@ -345,14 +379,19 @@ public View getView(int position, View view, ViewGroup parent) {
         // view.measure(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
         // mHolder.setInfo(getFileDetails(file, false));
 
+        if (mNameView != null)
+            mNameView.setText(mName);
+        
+        //if(Build.VERSION.SDK_INT < 99) return view;
+        
         if (mInfo != null) {
             SpannableStringBuilder sInfo = new SpannableStringBuilder(String.format(
                     file.getDetails(getShowHiddenFiles()), getResources()
                             .getString(R.string.s_files)));
-            if (OpenPath.Sorting.getType() == Type.SIZE
-                    || OpenPath.Sorting.getType() == Type.SIZE_DESC)
+            if ((OpenPath.Sorting.getType() == Type.SIZE
+                    || OpenPath.Sorting.getType() == Type.SIZE_DESC) && sInfo.length() > 0)
                 sInfo.setSpan(new StyleSpan(Typeface.BOLD), 0, sInfo.length(),
-                        Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+                        Spanned.SPAN_COMPOSING);
             if (mShowDetails && mParent.showChildPath()) {
                 sInfo.append(" :: " + file.getPath().replace(file.getName(), ""));
                 showLongDate = false;
@@ -368,9 +407,6 @@ public View getView(int position, View view, ViewGroup parent) {
             mInfo.setText(sInfo);
         }
 
-        if (mNameView != null)
-            mNameView.setText(mName);
-
         /*
          * if(file.isHidden()) ViewUtils.setAlpha(0.5f, mNameView, mPathView,
          * mInfo); else ViewUtils.setAlpha(1.0f, mNameView, mPathView, mInfo);
@@ -488,15 +524,15 @@ public void onClick(View v) {
 
     @Override
     public int getCount() {
-        if (!isFinal)
-            prefinalize();
-        return mFinalItems.length + (mPlusParent ? 1 : 0);
+//        if (!isFinal)
+//            prefinalize();
+        return mData2.size() + (mPlusParent ? 1 : 0);
     }
 
     @Override
     public OpenPath getItem(int position) {
-        if (!isFinal)
-            prefinalize();
+//        if (!isFinal)
+//            prefinalize();
         if (mPlusParent)
         {
             if (position == 0)
@@ -504,34 +540,45 @@ public OpenPath getItem(int position) {
             else
                 position--;
         }
-        if (position < 0 || position >= mFinalItems.length)
+        if (position < 0 || position >= mData2.size())
             return null;
-        return mFinalItems[position];
+        return mData2.get(position);
     }
 
     @Override
     public long getItemId(int position) {
-        if (!isFinal)
-            prefinalize();
+//        if (!isFinal)
+//            prefinalize();
         return position;
     }
 
     public void clearData() {
         mData2.clear();
-        isFinal = false;
-        mFinalItems = null;
-    }
-
-    public void addAll(Collection<? extends OpenPath> collection) {
-        if (isFinal)
-            unfinalize();
-        mData2.addAll(collection);
-        notifyDataSetChanged();
+//        isFinal = false;
+//        mFinalItems = null;
+    }
+
+    public void addAll(final Collection<? extends OpenPath> collection) {
+//        if (isFinal)
+//            unfinalize();
+    	if(Thread.currentThread().equals(OpenExplorer.UiThread))
+    		new Thread(new Runnable() {
+				@Override
+				public void run() {
+					addAll(collection);
+				}
+			}).start();
+    	else {
+    		for(OpenPath p : collection)
+    			if(!mData2.contains(p))
+    				mData2.add(p);
+    		notifyDataSetChanged();
+    	}
     }
 
     public void selectAll()
     {
-        mSelectedSet.addAll(isFinal ? Arrays.asList(mFinalItems) : mData2);
+        mSelectedSet.addAll(mData2);
         notifyDataSetChanged();
     }
 
@@ -640,8 +687,8 @@ else if (p.isDirectory())
         } catch (Exception e) {
         }
         try {
-            if (mFinalItems != null)
-                for (OpenPath p : mFinalItems)
+            if (mData2 != null)
+                for (OpenPath p : mData2)
                 {
                     stats[0]++;
                     if (!mShowHiddenFiles && p.isHidden())
diff --git a/src/org/brandroid/openmanager/adapters/HeatmapAdapter.java b/src/org/brandroid/openmanager/adapters/HeatmapAdapter.java
index b41e0e42..6f640868 100644
--- a/src/org/brandroid/openmanager/adapters/HeatmapAdapter.java
+++ b/src/org/brandroid/openmanager/adapters/HeatmapAdapter.java
@@ -5,12 +5,15 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import org.brandroid.openmanager.R;
+import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.openmanager.data.OpenPath;
 import org.brandroid.openmanager.interfaces.OpenApp;
 import org.brandroid.openmanager.util.ThumbnailCreator;
@@ -28,7 +31,7 @@
 import android.widget.TextView;
 
 public class HeatmapAdapter extends BaseAdapter {
-    private long mTotalBytes = 0l;
+    private long mTotalBytes = 0l, mLargest = 0l, mLastNotify = 0l;
     private final OpenPath mParent;
     private final OpenApp mApp;
     private final List<OpenPath> mPaths;
@@ -48,24 +51,21 @@ public void setHeatmapCallback(HeatmapCallback callback) {
     public HeatmapAdapter(OpenApp app, OpenPath parent) {
         mApp = app;
         mParent = parent;
-        OpenPath[] items = new OpenPath[0];
+        mPaths = new ArrayList<OpenPath>();
         try {
-            items = mParent.list();
-            if(items == null)
-                items = mParent.listFiles();
+            for(OpenPath p : mParent.listFiles())
+            	mPaths.add(p);
         } catch (IOException e) {
             Logger.LogError("Couldn't list for Heatmap.", e);
         }
-        mPaths = new ArrayList<OpenPath>();
-        for (OpenPath kid : items) {
-            mSizes.put(kid, kid.length());
-            mPaths.add(kid);
+        Collections.sort(mPaths);
+        for (OpenPath kid : mPaths) {
             if (kid.isDirectory()) {
                 ScanSizeTask task = new ScanSizeTask(null, null);
                 mTasks.put(kid, task);
-                task.execute(kid);
-            }
-        }
+            } else 
+            	mSizes.put(kid, kid.length());
+       }
     }
 
     @Override
@@ -82,53 +82,79 @@ public int compare(OpenPath lhs, OpenPath rhs) {
         });
         super.notifyDataSetChanged();
     }
+    
+    private void setBar(ProgressBar mBar, long size)
+    {
+        if (size > mLargest)
+        {
+            mLargest = size;
+            long time = new Date().getTime();
+            if(time - mLastNotify > 500)
+            {
+                mLastNotify = time;
+                notifyDataSetChanged();
+                return;
+            }
+        }
+        if (mLargest > 0)
+        {
+            mBar.setIndeterminate(false);
+            mBar.setMax((int)(mLargest / 1000));
+            mBar.setProgress((int)(size / 1000));
+            //Logger.LogDebug("Bar Progress: " + mBar.getProgress() + " / " + mBar.getMax());
+        }
+    }
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        View view = convertView;
+        View view = null;
         if (view == null)
-            view = LayoutInflater.from(parent.getContext()).inflate(R.layout.heatmap_row, parent,
-                    false);
+            view = LayoutInflater.from(parent.getContext())
+            			.inflate(R.layout.heatmap_row, parent, false);
 
         ImageView mIcon = (ImageView)view.findViewById(R.id.content_icon);
-        TextView mText = (TextView)view.findViewById(R.id.content_text);
+        final TextView mText = (TextView)view.findViewById(R.id.content_text);
         TextView mSize = (TextView)view.findViewById(R.id.content_count);
         ProgressBar mBar = (ProgressBar)view.findViewById(android.R.id.progress);
 
-        OpenPath path = getItem(position);
+        final OpenPath path = getItem(position);
         mIcon.setImageBitmap(ThumbnailCreator
                 .generateThumb(mApp, path, 32, 32, parent.getContext()).get());
         mText.setText(path.getName());
         mSize.setText(R.string.s_status_loading);
 
-        mBar.setMax((int)mTotalBytes / 1000);
-
-        if (!path.isDirectory()) {
+        if (mSizes.containsKey(path)) {
+            long size = mSizes.get(path);
+            mSize.setText("Size: " + OpenPath.formatSize(size));
+            setBar(mBar, size);
+        } else if (!path.isDirectory()) {
             long size = path.length();
             mSizes.put(path, size);
             mSize.setText("Size: " + OpenPath.formatSize(size));
-            mBar.setProgress((int)size / 1000);
+            setBar(mBar, size);
         } else if (!mTasks.containsKey(path)) {
             mBar.setProgress(0);
-            mBar.setIndeterminate(true);
             ScanSizeTask task = new ScanSizeTask(mSize, mBar);
             mTasks.put(path, task);
             task.execute(path);
         } else {
             ScanSizeTask task = mTasks.get(path);
+            if(!task.hasViews())
+            	task.setViews(mBar, mSize);
+            if (task.getStatus() == Status.PENDING)
+            	task.execute(path);
             if (task.getStatus() == Status.FINISHED) {
                 long bytes = 0;
                 try {
                     bytes = task.get();
+                    mSizes.put(path, bytes);
                 } catch (InterruptedException e) {
                 } catch (ExecutionException e) {
                 }
-                if (bytes > 0) {
-                    mBar.setProgress((int)(bytes / 1000));
+                setBar(mBar, bytes);
+                if(mSize != null)
                     mSize.setText("Size: " + OpenPath.formatSize(bytes));
-                }
-            } else
-                task.setViews(mBar, mSize);
+            }
         }
 
         return view;
@@ -147,11 +173,13 @@ public ScanSizeTask(TextView sizeText, ProgressBar bar) {
             mSizeText = sizeText;
             mBar = bar;
         }
+        
+        public boolean hasViews() { return mBar != null && mSizeText != null; }
 
         @Override
         protected Long doInBackground(OpenPath... params) {
             OpenPath path = params[0];
-            Long size = ScanDir(params[0]);
+            Long size = ScanDir(params[0], 0);
             mSizes.put(path, size);
             return size;
         }
@@ -169,39 +197,51 @@ protected void onPreExecute() {
         @Override
         protected void onProgressUpdate(Long... values) {
             super.onProgressUpdate(values);
-            mSizeText.setText(values[0].toString());
+            String descr = values[0].toString();
+            if(mSizeText != null && mSizeText.getText().equals(descr))
+            	mSizeText.setText(descr);
+            if(mBar != null && values.length > 0) {
+                int val = (int)((long)values[0]);
+                if(mBar.getProgress() != val)
+                    mBar.setProgress(val);
+            }
         }
 
         @Override
         protected void onPostExecute(Long result) {
             super.onPostExecute(result);
+            mLargest = Math.max(mLargest, result);
             if (mCallback != null)
                 mCallback.OnHeatmapTasksComplete(mTotalBytes, false);
             if (mSizeText != null)
                 mSizeText.setText("Size: " + OpenPath.formatSize(result));
             if (mBar != null) {
-                mBar.setMax((int)mTotalBytes / 1000);
-                mBar.setProgress((int)((long)result / 1000));
-                mBar.setIndeterminate(false);
+                mBar.setMax((int)mLargest);
+                mBar.setProgress((int)((long)result));
             }
             notifyDataSetChanged();
             if (--mTaskCount <= 0) {
                 if (mCallback != null)
                     mCallback.OnHeatmapTasksComplete(mTotalBytes, true);
+                
             }
         }
 
-        private Long ScanDir(OpenPath path) {
+        private Long ScanDir(OpenPath path, int depth) {
             Long mTotal = 0l;
             if (path.isDirectory()) {
                 OpenPath[] kids = null;
                 try {
-                    kids = path.list();
+                    kids = path.listFiles();
                 } catch (IOException e) {
                 }
                 if (kids != null)
                     for (OpenPath kid : kids)
-                        mTotal += ScanDir(kid);
+                    {
+                        mTotal += ScanDir(kid, depth + 1);
+                        if(depth <= 1)
+                        	publishProgress(mTotal);
+                    }
             } else {
                 long bytes = path.length();
                 mTotalBytes += bytes;
@@ -226,4 +266,13 @@ public long getItemId(int position) {
         return position;
     }
 
+	public void cancelTasks() {
+		Enumeration<ScanSizeTask> tasks = mTasks.elements();
+		while(tasks.hasMoreElements())
+		{
+			ScanSizeTask task = tasks.nextElement();
+			task.cancel(true);
+		}
+	}
+
 }
diff --git a/src/org/brandroid/openmanager/adapters/OpenBookmarks.java b/src/org/brandroid/openmanager/adapters/OpenBookmarks.java
index 66180c5e..02780d93 100644
--- a/src/org/brandroid/openmanager/adapters/OpenBookmarks.java
+++ b/src/org/brandroid/openmanager/adapters/OpenBookmarks.java
@@ -37,8 +37,9 @@
 import org.brandroid.utils.Preferences;
 import org.brandroid.utils.ViewUtils;
 
-import com.stericson.RootTools.Mount;
 import com.stericson.RootTools.RootTools;
+import com.stericson.RootTools.containers.Mount;
+
 import android.animation.Animator;
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -125,6 +126,7 @@ public OpenBookmarks(OpenApp app, View view) {
     }
 
     public void scanRoot() {
+        if(!Preferences.Pref_Root) return;
         // Logger.LogDebug("Trying to get roots");
         if (mBlkids == null && mProcMounts == null) {
             mProcMounts = new ArrayList<String>();
@@ -134,7 +136,7 @@ public void scanRoot() {
                 @Override
                 public void run() {
                     try {
-                        if (Preferences.Pref_Root && RootTools.isAccessRequested()
+                        if (RootTools.isAccessRequested()
                                 && RootTools.isAccessGiven()) {
                             mBlkids = RootTools.sendShell("blkid", 1000);
                             mProcMounts = RootTools.sendShell("cat /proc/mounts", 1000);
@@ -149,8 +151,8 @@ public void run() {
                     }
                 }
             }).start();
-        } else
-            Logger.LogWarning("No root, can't get roots");
+        } //else
+          //  Logger.LogWarning("No root, can't get roots");
     }
 
     public enum BookmarkType {
@@ -553,7 +555,7 @@ else if (path.getPath().startsWith("/") && mBlkids != null && mProcMounts != nul
             Logger.LogDebug("Looking for " + path + " in procmounts");
             for (String m : mProcMounts) {
                 String[] parts = m.split("  *");
-                if (path.getPath().startsWith(parts[1].toString())) {
+                if (parts.length > 1 && path.getPath().startsWith(parts[1].toString())) {
                     String dev = parts[0];
                     for (String blk : mBlkids)
                         if (blk.indexOf(dev) > -1 && blk.toLowerCase().indexOf("label=") > -1) {
diff --git a/src/org/brandroid/openmanager/data/OpenDrive.java b/src/org/brandroid/openmanager/data/OpenDrive.java
index 30dec82a..108594e9 100644
--- a/src/org/brandroid/openmanager/data/OpenDrive.java
+++ b/src/org/brandroid/openmanager/data/OpenDrive.java
@@ -912,6 +912,8 @@ public void run() {
         return true;
     }
     
+    private boolean hasSpaceRequested = false;
+    
     @Override
     public void getSpace(final SpaceListener callback) {
         final OpenServer server = getServer();
@@ -921,6 +923,8 @@ public void getSpace(final SpaceListener callback) {
                     server.get("agg", 0), 0);
             return;
         }
+        if(hasSpaceRequested) return;
+        hasSpaceRequested = true;
         thread(new Runnable() {
             public void run() {
                 try {
diff --git a/src/org/brandroid/openmanager/data/OpenDropBox.java b/src/org/brandroid/openmanager/data/OpenDropBox.java
index ab7e2b42..e6f2991b 100644
--- a/src/org/brandroid/openmanager/data/OpenDropBox.java
+++ b/src/org/brandroid/openmanager/data/OpenDropBox.java
@@ -7,6 +7,7 @@
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -80,6 +81,7 @@ public class OpenDropBox extends OpenNetworkPath implements OpenNetworkPath.Clou
     private List<OpenPath> mChildren = null;
     private String mName = null;
     private Account mAccount;
+    private String mAuthState;
 
     private final static boolean DEBUG = OpenExplorer.IS_DEBUG_BUILD && true;
     
@@ -344,14 +346,13 @@ public static AndroidAuthSession buildSession(OpenServer server) {
      *             AuthActivity in your manifest, meaning that the Dropbox app
      *             will not be able to redirect back to your app after auth.
      */
-    public static boolean startAuthentication(final Activity c, final WebView web) {
+    public static boolean startAuthentication(final Activity c, final WebView web, String state) {
         AppKeyPair appKeyPair = getAppKeyPair();
 
-        Intent intent = getOfficialIntent(c, appKeyPair.key, appKeyPair.secret);
+        Intent intent = getOfficialIntent(c, appKeyPair.key, appKeyPair.secret, state);
         if (!OpenServers.getDefaultServers().hasServerType("db")
                 && hasDropboxApp(c, intent)) {
-            c.startActivity(intent); // ,
-                                     // OpenExplorer.REQ_AUTHENTICATE_DROPBOX);
+            c.startActivityForResult(intent, OpenExplorer.REQ_AUTHENTICATE_DROPBOX);
             return true;
         } else {
             //startWebAuth(c, appKeyPair);
@@ -419,15 +420,17 @@ public static boolean handleIntent(Intent intent, OpenServer out)
         return false;
     }
 
-    public static Intent getOfficialIntent(Context c, String key, String secret)
+    public static Intent getOfficialIntent(Activity a, String key, String secret, String state)
     {
         Intent officialIntent = new Intent();
         officialIntent.setClassName("com.dropbox.android",
                 "com.dropbox.android.activity.auth.DropboxAuth");
-        officialIntent.setAction(ACTION_AUTHENTICATE_V1);
+        officialIntent.setAction(ACTION_AUTHENTICATE_V2);
         officialIntent.putExtra(EXTRA_CONSUMER_KEY, key);
         officialIntent.putExtra(EXTRA_CONSUMER_SIG, getConsumerSig(secret));
-        officialIntent.putExtra(EXTRA_CALLING_PACKAGE, c.getPackageName());
+        officialIntent.putExtra(EXTRA_CALLING_PACKAGE, a.getPackageName());
+        officialIntent.putExtra(EXTRA_CALLING_CLASS, a.getClass().getName());
+        officialIntent.putExtra(EXTRA_AUTH_STATE, state);
         return officialIntent;
     }
 
@@ -514,6 +517,17 @@ public static String getConsumerSig(String consumerSecret) {
                     "526b9c45f2967c3d28dee1aff5a5b29b9c2c8639"
     };
 
+    public static String createStateNonce() {
+        final int NONCE_BYTES = 16; // 128 bits of randomness.
+        byte randomBytes[] = new byte[NONCE_BYTES];
+        new SecureRandom().nextBytes(randomBytes);
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < NONCE_BYTES; ++i) {
+            sb.append(String.format("%02x", (randomBytes[i]&0xff)));
+        }
+        return sb.toString();
+    }
+
     @Override
     public String getName() {
         if (mEntry != null)
@@ -815,9 +829,20 @@ public long getFreeSpace() {
      */
     public static final String EXTRA_CALLING_PACKAGE = "CALLING_PACKAGE";
 
+    /**
+     * Used for internal authentication. You won't ever have to use this.
+     */
+    public static final String EXTRA_CALLING_CLASS = "CALLING_CLASS";
+
+    /**
+     * Used for internal authentication. You won't ever have to use this.
+     */
+    public static final String EXTRA_AUTH_STATE = "AUTH_STATE";
+
     public static final String ACTION_AUTHENTICATE_V1 = "com.dropbox.android.AUTHENTICATE_V1";
+    public static final String ACTION_AUTHENTICATE_V2 = "com.dropbox.android.AUTHENTICATE_V2";
 
-    public static final int AUTH_VERSION = 1;
+    public static final int AUTH_VERSION = 2;
 
     // For communication between AndroidAuthSesssion and this activity.
     static final String EXTRA_INTERNAL_CONSUMER_KEY = "EXTRA_INTERNAL_CONSUMER_KEY";
diff --git a/src/org/brandroid/openmanager/data/OpenFTP.java b/src/org/brandroid/openmanager/data/OpenFTP.java
index 80af1c09..60b9bf57 100644
--- a/src/org/brandroid/openmanager/data/OpenFTP.java
+++ b/src/org/brandroid/openmanager/data/OpenFTP.java
@@ -165,7 +165,7 @@ public String getPath(boolean bIncludeUser) {
                 && ((mAttributes != null && (mAttributes & FLAG_DIRECTORY) == FLAG_DIRECTORY) || (mChildren != null && mChildren
                         .size() > 0)))
             ret += "/";
-        if (ret == "")
+        if (ret.equals(""))
             ret = "/";
         if (!bIncludeUser)
             ret = ret.replace(getUri().getUserInfo() + "@", "");
diff --git a/src/org/brandroid/openmanager/data/OpenFile.java b/src/org/brandroid/openmanager/data/OpenFile.java
index 3ad50df3..4bd6c75d 100644
--- a/src/org/brandroid/openmanager/data/OpenFile.java
+++ b/src/org/brandroid/openmanager/data/OpenFile.java
@@ -11,19 +11,19 @@
 import java.io.OutputStream;
 import java.lang.ref.WeakReference;
 import java.nio.channels.FileChannel;
+import java.util.ArrayList;
 import java.util.Date;
 
 import org.brandroid.openmanager.activities.OpenApplication;
 import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.openmanager.adapters.OpenPathDbAdapter;
+import org.brandroid.openmanager.data.OpenNetworkPath.Cancellable;
 import org.brandroid.openmanager.data.OpenPath.*;
 import org.brandroid.openmanager.util.DFInfo;
 import org.brandroid.openmanager.util.SortType;
 import org.brandroid.utils.Logger;
 import org.brandroid.utils.Preferences;
 
-import com.stericson.RootTools.RootTools;
-
 import android.annotation.SuppressLint;
 import android.database.Cursor;
 import android.net.Uri;
@@ -32,7 +32,7 @@
 import android.os.StatFs;
 
 @SuppressLint("NewApi")
-public class OpenFile extends OpenPath implements OpenPathCopyable, OpenPathByteIO, OpenStream, SpaceHandler, OpenPath.OpenPathSizable {
+public class OpenFile extends OpenPath implements OpenPathCopyable, OpenPathByteIO, OpenStream, SpaceHandler, OpenPath.OpenPathSizable, OpenPath.OpenPathUpdateHandler {
     private static final long serialVersionUID = 6436156952322586833L;
     private File mFile;
     private WeakReference<OpenFile[]> mChildren = null;
@@ -95,15 +95,15 @@ public String getPath() {
     public long length() {
         return mFile.length();
     }
-
+    
     @Override
     public int getListLength() {
         if (mChildCount != null)
             return mChildCount;
         if (mChildren != null)
             return mChildCount = mChildren.get().length;
-        else
-            return list().length;
+        else 
+        	return list().length;
     }
 
     public long getFreeSpace() {
@@ -375,25 +375,31 @@ private OpenFile[] getOpenPaths(String[] files, String base) {
     }
 
     public OpenFile[] listFiles(boolean grandPeek) {
-        OpenFile[] mChildren = getOpenPaths(mFile.listFiles());
+    	if(mChildren != null && mChildren.get() != null && mChildren.get().length > 0)
+    		return mChildren.get();
+    	File[] realFiles = null;
+    	try {
+    		realFiles = mFile.listFiles();
+    	} catch(Throwable e) { }
+    	OpenFile[] mChildren2 = getOpenPaths(realFiles);
         if (!grandPeek) {
             // Logger.LogDebug(mFile.getPath() + " has " + mChildren.length +
             // " children");
         } // else mChildren = listFilesNative(mFile);
 
-        if ((mChildren == null || mChildren.length == 0) && !isDirectory()
+        if ((mChildren2 == null || mChildren2.length == 0) && !isDirectory()
                 && mFile.getParentFile() != null)
-            mChildren = getParent().listFiles(grandPeek);
+            mChildren2 = getParent().listFiles(grandPeek);
 
-        if (mChildren == null)
+        if (mChildren2 == null)
             return new OpenFile[0];
 
-        if (grandPeek && !bGrandPeeked && mChildren != null && mChildren.length > 0) {
-            for (int i = 0; i < mChildren.length; i++) {
+        if (grandPeek && !bGrandPeeked && mChildren2 != null && mChildren2.length > 0) {
+            for (int i = 0; i < mChildren2.length; i++) {
                 try {
-                    if (!mChildren[i].isDirectory())
+                    if (!mChildren2[i].isDirectory())
                         continue;
-                    mChildren[i].list();
+                    mChildren2[i].list();
                 } catch (ArrayIndexOutOfBoundsException e) {
                     Logger.LogWarning("Grandchild lost!", e);
                 }
@@ -401,10 +407,10 @@ public OpenFile[] listFiles(boolean grandPeek) {
             bGrandPeeked = true;
         }
         
-        mChildCount = mChildren.length;
-        this.mChildren = new WeakReference<OpenFile[]>(mChildren);
+        mChildCount = mChildren2.length;
+        this.mChildren = new WeakReference<OpenFile[]>(mChildren2);
 
-        return mChildren;
+        return mChildren2;
     }
 
     @Override
@@ -454,7 +460,7 @@ public OpenFile[] list() {
 
     @Override
     public Boolean requiresThread() {
-        return false;
+        return true;
     }
 
     @Override
@@ -671,6 +677,50 @@ public void rename(String name) {
     public boolean copyFrom(OpenStream file) {
         if (file instanceof OpenFile)
             return copyFrom((OpenFile)file);
+        try {
+			return copyFrom(file.getInputStream());
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return false;
+    }
+    
+    private boolean copyFrom(InputStream in)
+    {
+    	Logger.LogVerbose("copyFrom InputStream on " + getPath());
+        int blen = 4096;
+        byte[] buffer = new byte[blen];
+        int read = 0;
+        int wrote = 0;
+        OutputStream os = null;
+        try {
+            if (!exists())
+                create();
+            os = getOutputStream();
+	        while((read = in.read(buffer, 0, blen)) > -1)
+	        {
+	        	if(read > 0)
+	        	{
+	        		os.write(buffer);
+	        		wrote += buffer.length;
+	        	}
+	        }
+            os.flush();
+            os.close();
+            Logger.LogVerbose("Wrote " + wrote + " bytes to " + getPath());
+            return true;
+        } catch (IOException e) {
+            Logger.LogError("Couldn't write to OpenFile (" + getPath() + ")", e);
+            if(OpenApplication.hasRootAccess())
+                new OpenFileRoot(this).writeBytes(buffer);
+        } finally {
+            if (os != null)
+                try {
+                    os.close();
+                } catch (IOException e) {
+                }
+        }
         return false;
     }
 
@@ -774,4 +824,28 @@ public void run() {
     public long getThirdSpace() {
         return 0;
     }
+
+	@Override
+	public Cancellable list(final OpenContentUpdateListener callback) {
+		return cancelify(thread(new Runnable() {
+			
+			@Override
+			public void run() {
+                try {
+                	ArrayList<OpenFile> files = new ArrayList<OpenFile>();
+                	for(OpenFile file : listFiles())
+                		if(ShowHiddenFiles || !file.isHidden())
+                    		files.add(file);
+                	OpenFile[] files2 = new OpenFile[files.size()];
+                	for(int i=0; i < files2.length; i++)
+                		files2[i] = files.get(i);
+                	callback.addContentPath(files2);
+                    callback.doneUpdating();
+                } catch(Exception e) {
+                	callback.onException(e);
+                	callback.doneUpdating();
+                }
+            }
+		}));
+	}
 }
diff --git a/src/org/brandroid/openmanager/data/OpenFileRoot.java b/src/org/brandroid/openmanager/data/OpenFileRoot.java
index 6f4268f4..11a3ffa9 100644
--- a/src/org/brandroid/openmanager/data/OpenFileRoot.java
+++ b/src/org/brandroid/openmanager/data/OpenFileRoot.java
@@ -10,16 +10,22 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeoutException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.openmanager.data.OpenNetworkPath.Cancellable;
 import org.brandroid.openmanager.data.OpenPath.*;
 import org.brandroid.openmanager.util.FileManager;
 import org.brandroid.utils.Logger;
-import com.stericson.RootTools.Command;
+import org.brandroid.utils.Utils;
+
 import com.stericson.RootTools.RootTools;
-import com.stericson.RootTools.Shell;
+import com.stericson.RootTools.exceptions.RootToolsException;
+import com.stericson.RootTools.execution.Command;
+import com.stericson.RootTools.execution.Shell;
+
 import android.annotation.SuppressLint;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -70,7 +76,7 @@ public OpenFileRoot(String parent, String listing) {
                         m.start() - 1).trim());
                 success = true;
             } catch (Exception e) {
-                Logger.LogError("Couldn't parse date.", e);
+                Logger.LogWarning("Couldn't parse date.", e);
             }
             mPerms = listing.split(" ")[0];
         }
@@ -363,22 +369,32 @@ public Long lastModified() {
 
     @Override
     public Boolean canWrite() {
-        if (mPerms != null)
+        if (getPath().startsWith("/system"))
+            try {
+                return RootTools.getMountedAs("/system").equals("rw");
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        if (mPerms != null && mPerms.length() > 0)
             return mPerms.indexOf("w") > -1;
+        if (Thread.currentThread().equals(OpenExplorer.UiThread))
+            return false;
+        if (RootTools.isAccessRequested() && RootTools.isAccessGiven())
+            return true;
         return getFile().canWrite();
     }
 
     @SuppressLint("NewApi")
     @Override
     public Boolean canExecute() {
-        if (mPerms != null)
+        if (mPerms != null && mPerms.length() > 0)
             return mPerms.indexOf("x") > -1;
         return Build.VERSION.SDK_INT > 8 ? getFile().canExecute() : true;
     }
 
     @Override
     public Boolean delete() {
-        execute("rm -rf " + getPath(), false);
+        if(execute("rm " + (isDirectory() ? "-r " : "") + getPath(), false) == null) return false;
         return true;
     }
 
@@ -444,24 +460,22 @@ else if (lastModified() <= tmp.lastModified())
     }
 
     private String execute(final String cmd, boolean useBusyBox) {
-        final boolean[] waiting = new boolean[] {
-                true
-        };
-        final String[] ret = new String[] {
-                ""
-        };
-        final String bb = useBusyBox && RootTools.isBusyboxAvailable() ? "busybox " : "";
         try {
-            new Command(0, 500, bb + cmd) {
-                @Override
-                public void output(int id, String line) {
-                    ret[0] = ret[0] + (ret[0] == "" ? "" : "\n") + line;
-                }
-            }.waitForFinish(500);
-        } catch (Exception e) {
-            Logger.LogError("Could not execute: " + cmd, e);
+            Logger.LogVerbose("$ " + cmd);
+            final List<String> result = RootTools.sendShell(cmd, 500);
+            Logger.LogVerbose("--> " + Utils.joinArray(result.toArray(new String[result.size()]), "\n--> "));
+            return result.get(0);
+        } catch (IOException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        } catch (RootToolsException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        } catch (TimeoutException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
         }
-        return ret[0];
+        return null;
     }
 
     public static boolean copy(final OpenPath src, final OpenPath dest) {
@@ -487,7 +501,11 @@ public byte[] readBytes() {
                 tempDownload(null);
             tmp = getTempFile();
             if (tmp != null)
-                return tmp.readAscii().getBytes();
+            {
+                String s = tmp.readAscii();
+                if(s != null)
+                    return s.getBytes();
+            }
         } catch (Exception e) {
             Logger.LogError("Unable to read root file: " + getPath(), e);
         }
@@ -497,7 +515,12 @@ public byte[] readBytes() {
 
     @Override
     public void writeBytes(byte[] bytes) {
-        String ret = execute("cat > " + getPath() + "\n" + new String(bytes), false);
-        Logger.LogDebug("writeBytes response: " + ret);
+        OpenFile tmp = getTempFile();
+        try {
+            tmp.writeBytes(bytes);
+            tempUpload(null);
+        } catch(Exception e) {
+            Logger.LogError("Unable to write root file: " + getPath(), e);
+        }
     }
 }
diff --git a/src/org/brandroid/openmanager/data/OpenPath.java b/src/org/brandroid/openmanager/data/OpenPath.java
index 38135939..3d5d8680 100644
--- a/src/org/brandroid/openmanager/data/OpenPath.java
+++ b/src/org/brandroid/openmanager/data/OpenPath.java
@@ -1180,7 +1180,7 @@ public String getDetails(boolean countHiddenChildren) {
         String deets = "";
 
         try {
-            if (isDirectory())
+            if (!requiresThread() && isDirectory())
                 deets += getListLength() + " %s";
             else if (isFile())
                 deets += formatSize(length());
diff --git a/src/org/brandroid/openmanager/data/OpenSMB.java b/src/org/brandroid/openmanager/data/OpenSMB.java
index ff0e70bd..1952dc85 100644
--- a/src/org/brandroid/openmanager/data/OpenSMB.java
+++ b/src/org/brandroid/openmanager/data/OpenSMB.java
@@ -41,7 +41,7 @@ public class OpenSMB extends OpenNetworkPath implements OpenNetworkPath.PipeNeed
     public OpenSMB(String urlString) throws MalformedURLException {
         URL url = new URL(null, urlString, Handler.SMB_HANDLER);
         NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(url.getUserInfo());
-        if (auth.getPassword() == null || auth.getPassword() == "") {
+        if (auth.getPassword() == null || "".equals(auth.getPassword())) {
             OpenServers servers = OpenServers.getDefaultServers();
             OpenServer s = servers.findByUser("smb", url.getHost(), auth.getUsername());
             if (s != null) {
@@ -77,8 +77,8 @@ public OpenSMB(OpenSMB parent, SmbFile kid) {
     public OpenSMB(String urlString, long size, long modified) throws MalformedURLException {
         URL url = new URL(null, urlString, Handler.SMB_HANDLER);
         NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(url.getUserInfo());
-        if (auth.getUsername() == null || auth.getUsername() == "" || auth.getPassword() == null
-                || auth.getPassword() == "") {
+        if (auth.getUsername() == null || "".equals(auth.getUsername()) || auth.getPassword() == null
+                || "".equals(auth.getPassword())) {
             OpenServers servers = OpenServers.getDefaultServers();
             OpenServer s = servers.findByUser("smb", url.getHost(), auth.getUsername());
             if (s == null)
@@ -93,6 +93,11 @@ public OpenSMB(String urlString, long size, long modified) throws MalformedURLEx
         mSize = size;
         mModified = modified;
     }
+    
+    public String getHost()
+    {
+    	return mFile.getURL().getHost();
+    }
 
     @Override
     public void disconnect() {
@@ -159,7 +164,7 @@ public String getAbsolutePath() {
         String ret = "smb://";
         if(getServer() != null)
             ret = getServer().getAbsolutePath();
-        if(!ret.endsWith("/"))
+        if(!ret.endsWith("/") && !mFile.getURL().getPath().startsWith("/"))
             ret += "/";
         ret += mFile.getURL().getPath();
         return ret;
diff --git a/src/org/brandroid/openmanager/data/OpenSearch.java b/src/org/brandroid/openmanager/data/OpenSearch.java
index 49446dc7..a14845ba 100644
--- a/src/org/brandroid/openmanager/data/OpenSearch.java
+++ b/src/org/brandroid/openmanager/data/OpenSearch.java
@@ -117,6 +117,7 @@ private void SearchDB(OpenPath dir) {
         try {
             if (DEBUG)
                 Logger.LogVerbose("Searching DB...");
+            if(getDb() == null) return;
             Cursor c = getDb().fetchSearch(getQuery(), dir != null ? dir.getPath() : null);
             c.moveToFirst();
             while (!c.isAfterLast()) {
diff --git a/src/org/brandroid/openmanager/data/OpenServer.java b/src/org/brandroid/openmanager/data/OpenServer.java
index 93b58d6b..e9bd22af 100644
--- a/src/org/brandroid/openmanager/data/OpenServer.java
+++ b/src/org/brandroid/openmanager/data/OpenServer.java
@@ -384,7 +384,7 @@ public String getString(String key) {
     public int getPort() {
         try {
             String p = get("port", "-1");
-            if (p == null || p.equals("null"))
+            if (p == null || "null".equals(p) || "".equals(p))
                 return -1;
             return Integer.parseInt(p);
         } catch (NumberFormatException e) {
@@ -432,7 +432,7 @@ public String getAbsolutePath() {
         String p = getPath();
         if(p != null)
         {
-            if(!ret.endsWith("/") || !p.startsWith("/"))
+            if(!ret.endsWith("/") && !p.startsWith("/"))
                 ret += "/";
             ret += p;
             ret = ret.replace("//", "/");
diff --git a/src/org/brandroid/openmanager/data/OpenServers.java b/src/org/brandroid/openmanager/data/OpenServers.java
index 77c0bb16..252bab83 100644
--- a/src/org/brandroid/openmanager/data/OpenServers.java
+++ b/src/org/brandroid/openmanager/data/OpenServers.java
@@ -83,7 +83,7 @@ public OpenServer findByUser(String type, String host, String user) {
             OpenServer server = mData.get(i);
             if ((host == null || server.getHost().equalsIgnoreCase(host))
                     && server.getType().equalsIgnoreCase(type)
-                    && (user == null || user == ""
+                    && (user == null || "".equals(user)
                     || server.getUser().equalsIgnoreCase(user)))
                 return server;
         }
@@ -108,8 +108,12 @@ public List<OpenServer> findByType(String type) {
     public OpenServer findByHost(String type, String host) {
         for (int i = 0; i < mData.size(); i++) {
             OpenServer server = mData.get(i);
-            if (server.getType().equalsIgnoreCase(type) && server.getHost().equalsIgnoreCase(host))
-                return server;
+            if (server.getType().equalsIgnoreCase(type))
+            {
+            	if(server.getHost().equalsIgnoreCase(host))
+            		return server;
+            	else Logger.LogWarning("Server type (" + server.getType() + ") but not host (" + server.getHost() + " != " + host + ")");
+            }
         }
         return null;
     }
diff --git a/src/org/brandroid/openmanager/data/OpenURL.java b/src/org/brandroid/openmanager/data/OpenURL.java
new file mode 100644
index 00000000..e19c1aba
--- /dev/null
+++ b/src/org/brandroid/openmanager/data/OpenURL.java
@@ -0,0 +1,185 @@
+package org.brandroid.openmanager.data;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import android.net.Uri;
+
+public class OpenURL extends OpenNetworkPath implements OpenPath.OpenStream, OpenNetworkPath.PipeNeeded {
+	
+	private String mURL;
+	private int responseCode = 0;
+	private int responseLength = 0;
+	private HttpURLConnection conn = null;
+	private boolean mConnected = false;
+	
+	public OpenURL(String url)
+	{
+		mURL = url;
+	}
+	
+	public int getResponseCode() throws IOException
+	{
+		connect();
+        responseCode = conn.getResponseCode();
+        responseLength = conn.getContentLength();
+        return responseCode;
+	}
+
+
+	@Override
+	public boolean syncUpload(OpenFile f, NetworkListener l) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	
+	@Override
+	public InputStream getInputStream() throws IOException {
+		connect();
+		return conn.getInputStream();
+	}
+	
+	@Override
+	public void connect() throws IOException {
+		//disconnect();
+		if(!isConnected())
+		{
+			conn = (HttpURLConnection) new URL(mURL).openConnection();
+			conn.setDoInput(true);
+			conn.connect();
+		}
+		mConnected = true;
+	}
+	
+	@Override
+	public void disconnect() {
+		if(conn != null && mConnected)
+			conn.disconnect();
+		mConnected = false;
+	}
+	
+	@Override
+	public boolean isConnected() throws IOException {
+		return conn != null && mConnected;
+	}
+
+	@Override
+	public boolean syncDownload(OpenFile f, NetworkListener l) {
+        try {
+        	if(!f.copyFrom(this))
+        	{
+        		f.delete();
+        		l.OnNetworkFailure(this, f, null);
+        		return false;
+        	}
+            l.OnNetworkCopyFinished(this, f);
+            return true;
+        } catch (Exception e) {
+            l.OnNetworkFailure(this, f, e);
+        }
+        return false;
+	}
+
+	@Override
+	public OpenNetworkPath[] getChildren() {
+		return null;
+	}
+
+	@Override
+	public String getPath() {
+		return mURL;
+	}
+	
+	@Override
+	public String getName() {
+		return getUri().getLastPathSegment();
+	}
+
+	@Override
+	public String getAbsolutePath() {
+		return mURL;
+	}
+
+	@Override
+	public long length() {
+		return responseLength;
+	}
+
+	@Override
+	public OpenPath getParent() {
+		return new OpenURL(mURL.replace(getUri().getLastPathSegment(), ""));
+	}
+
+	@Override
+	public OpenPath getChild(String name) {
+		return null;
+	}
+
+	@Override
+	public OpenPath[] list() throws IOException {
+		return null;
+	}
+
+	@Override
+	public OpenPath[] listFiles() throws IOException {
+		return null;
+	}
+
+	@Override
+	public Boolean isDirectory() {
+		return mURL.endsWith("/");
+	}
+
+	@Override
+	public Boolean isFile() {
+		return !mURL.endsWith("/");
+	}
+
+	@Override
+	public Boolean isHidden() {
+		return false;
+	}
+
+	@Override
+	public Uri getUri() {
+		return Uri.parse(mURL);
+	}
+
+	@Override
+	public Long lastModified() {
+		return null;
+	}
+
+	@Override
+	public Boolean canRead() {
+		return exists();
+	}
+
+	@Override
+	public Boolean canExecute() {
+		return false;
+	}
+
+	@Override
+	public Boolean exists() {
+		try {
+			return getResponseCode() < 400;
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return false;
+	}
+
+	@Override
+	public Boolean delete() {
+		return false;
+	}
+
+	@Override
+	public Boolean mkdir() {
+		return false;
+	}
+
+}
diff --git a/src/org/brandroid/openmanager/data/OpenZip.java b/src/org/brandroid/openmanager/data/OpenZip.java
index 69814a47..281849aa 100644
--- a/src/org/brandroid/openmanager/data/OpenZip.java
+++ b/src/org/brandroid/openmanager/data/OpenZip.java
@@ -21,7 +21,7 @@
 
 import android.net.Uri;
 
-public class OpenZip extends OpenPath implements OpenStream {
+public class OpenZip extends OpenPath implements OpenStream, OpenPath.ListHandler {
     private final OpenFile mFile;
     private ZipFile mZip = null;
     private OpenPath[] mChildren = null;
@@ -40,6 +40,26 @@ public OpenZip(OpenFile zipFile) {
             Logger.LogError("Couldn't open zip file (" + zipFile + ")");
         }
     }
+    
+    @Override
+    public Thread list(final ListListener listener) {
+    	return thread(new Runnable() {
+			public void run() {
+				try {
+					OpenPath[] kids = listFiles();
+					postListReceived(kids, listener);
+		        	//FileManager.setOpenCache(getPath(), OpenZip.this);
+				} catch (Exception e) {
+					postException(e, listener);
+				}
+			}
+		});
+    }
+    
+    @Override
+    public void clearChildren() {
+    	mEntries = new ArrayList<OpenZip.OpenZipEntry>();
+    }
 
     @Override
     public boolean canHandleInternally() {
@@ -147,7 +167,7 @@ public List<OpenZipEntry> getAllEntries() throws IOException {
         return mEntries;
     }
 
-    private OpenPath findVirtualPath(String name) {
+    public OpenPath findVirtualPath(String name) {
         if (mVirtualPaths.containsKey(name))
             return mVirtualPaths.get(name);
         OpenZipVirtualPath path = null;
@@ -300,14 +320,59 @@ public InputStream getInputStream() throws IOException {
     public OutputStream getOutputStream() throws IOException {
         return new ZipOutputStream(mFile.getOutputStream());
     }
+    
+    public OpenPath getZipChild(String path)
+    {
+    	if(path.endsWith("/"))
+    		return new OpenZipVirtualPath(path);
+    	else {
+    		OpenZipVirtualPath p = null;
+    		if(path.indexOf("/") > -1)
+    			p = new OpenZipVirtualPath(path.substring(0, path.lastIndexOf("/") + 1));
+    		return new OpenZipEntry(p, mZip.getEntry(path));
+    	}
+    }
 
-    public class OpenZipVirtualPath extends OpenPath {
+    public class OpenZipVirtualPath extends OpenPath implements ListHandler {
         private final String path;
         private final OpenPath mParent;
+        private boolean mFinal = false;
 
         public OpenZipVirtualPath(OpenPath parent, String path) {
             mParent = parent;
             this.path = path;
+            mFinal = true;
+        }
+        
+        public OpenZipVirtualPath(String fullpath)
+        {
+        	if(fullpath.endsWith("/"))
+        		fullpath = fullpath.substring(0, fullpath.length() - 1);
+        	path = fullpath;
+        	if(path.indexOf("/") > -1)
+        		mParent = new OpenZipVirtualPath(path.substring(0, path.lastIndexOf("/")));
+        	else mParent = OpenZip.this;
+        	mFinal = false;
+        }
+        
+        @Override
+        public Thread list(final ListListener listener) {
+        	if(DEBUG)
+        		Logger.LogVerbose("OpenZipVirtualPath.list(" + mParent + "," + path + ")");
+        	return thread(new Runnable() {
+				public void run() {
+					try {
+						OpenPath[] kids = listFiles();
+						postListReceived(kids, listener);
+					} catch(Exception e) {
+						postException(e, listener);
+					}
+				}
+			});
+        }
+        
+        @Override
+        public void clearChildren() {
         }
 
         @Override
@@ -358,12 +423,14 @@ public OpenPath getChild(String name) {
 
         @Override
         public OpenPath[] list() throws IOException {
-            return OpenZip.this.listFiles(path);
+        	return OpenZip.this.listFiles(path);
         }
 
         @Override
         public OpenPath[] listFiles() throws IOException {
-            return list();
+        	OpenPath[] ret = list();
+        	//FileManager.setOpenCache(getPath(), this);
+        	return ret;
         }
 
         @Override
@@ -413,7 +480,7 @@ public Boolean exists() {
 
         @Override
         public Boolean requiresThread() {
-            return false;
+            return true;
         }
 
         @Override
@@ -428,7 +495,7 @@ public Boolean mkdir() {
 
     }
 
-    public class OpenZipEntry extends OpenPath {
+    public class OpenZipEntry extends OpenPath implements OpenStream {
         private final OpenPath mParent;
         private final ZipEntry ze;
         private OpenPath[] mChildren = null;
@@ -443,6 +510,16 @@ public OpenZipEntry(OpenPath parent, ZipEntry entry) {
                 }
             }
         }
+        
+        @Override
+        public InputStream getInputStream() throws IOException {
+        	return mZip.getInputStream(ze);
+        }
+        
+        @Override
+        public OutputStream getOutputStream() throws IOException {
+        	return null;
+        }
 
         @Override
         public String getName() {
diff --git a/src/org/brandroid/openmanager/fragments/ContentFragment.java b/src/org/brandroid/openmanager/fragments/ContentFragment.java
index 4f01f0d8..b14f788c 100644
--- a/src/org/brandroid/openmanager/fragments/ContentFragment.java
+++ b/src/org/brandroid/openmanager/fragments/ContentFragment.java
@@ -178,7 +178,7 @@ public class ContentFragment extends OpenFragment implements OnItemLongClickList
     private Bundle mBundle;
     private NetworkIOTask mTask;
 
-    private boolean mIsViewCreated;
+    protected boolean mIsViewCreated;
 
     protected Integer mViewMode = null;
     protected ContentAdapter mContentAdapter;
@@ -477,9 +477,13 @@ public synchronized void refreshData(Bundle savedInstanceState, boolean allowSki
             return;
         }
 
-        if (path instanceof OpenFile && !path.canRead())
-            if (OpenApplication.hasRootAccess(true))
+        try {
+            if (path instanceof OpenFile && !path.canRead()
+                    && OpenApplication.hasRootAccess(true))
                 path = new OpenFileRoot(path);
+        } catch (Exception e) {
+            Logger.LogWarning("Unable to convert File to Root. " + getPath(), e);
+        }
 
         // if (DEBUG)
         // Logger.LogDebug("refreshData running...");
@@ -593,10 +597,9 @@ public void runUpdateTask(boolean reconnect) {
             final OpenContentUpdateListener updateCallback = new OpenContentUpdateListener() {
                 @Override
                 public void addContentPath(final OpenPath... files) {
-                    OpenExplorer.getHandler().post(new Runnable() {
-                        public void run() {
-                            mContentAdapter.addAll(Arrays.asList(files));
-                        }});
+                    if(OpenExplorer.IS_DEBUG_BUILD)
+                    	Logger.LogVerbose("ContentFragment.OpenContentUpdateListener.addContentPath");
+                    mContentAdapter.addAll(Arrays.asList(files));
                     if(OpenPath.AllowDBCache)
                     {
                         new Thread(new Runnable() {
@@ -616,6 +619,8 @@ public void run() {
 
                 @Override
                 public void doneUpdating() {
+                    if(OpenExplorer.IS_DEBUG_BUILD)
+                    	Logger.LogVerbose("ContentFragment.OpenContentUpdateListener.doneUpdating");
                     getHandler().post(new Runnable() {
                         public void run() {
                             setProgressVisibility(false);
@@ -824,11 +829,13 @@ private void extractSet(final OpenPath archive, final OpenPath dest, final Strin
 
     private void browseArchive(OpenPath archive)
     {
-        if (archive.getExtension().equalsIgnoreCase("zip"))
+        String mime = archive.getMimeType();
+        String ext = archive.getExtension();
+        if (mime.equals("application/zip"))
             getExplorer().changePath(new OpenZip((OpenFile)archive));
-        else if (archive.getMimeType().endsWith("rar"))
+        else if (mime.endsWith("rar"))
             getExplorer().changePath(new OpenRAR((OpenFile)archive));
-        else if (archive.getMimeType().contains("7z") || archive.getMimeType().contains("lzma"))
+        else if (mime.contains("7z") || mime.contains("lzma"))
             getExplorer().changePath(new OpenLZMA((OpenFile)archive));
         else
             getExplorer().changePath(new OpenTar((OpenFile)archive));
@@ -851,7 +858,7 @@ private void extractArchive(OpenPath archive)
     public void onItemClick(final AdapterView<?> list, final View view, final int position,
             final long id) {
         OpenPath file = (OpenPath)list.getItemAtPosition(position);
-        Logger.LogInfo("ContentFragment.onItemClick (" + file.getPath() + ")");
+        Logger.LogInfo("ContentFragment.onItemClick");
 
         if (getActionMode() == null)
         {
@@ -1182,10 +1189,7 @@ && mMenuContextItemIndex < getContentAdapter().getCount())
                 DialogHandler.showFileHeatmap(getExplorer(), getPath());
                 return true;
             case R.id.menu_new_file:
-                EventHandler.createNewFile(getPath(), getActivity(), this);
-                return true;
-            case R.id.menu_new_folder:
-                EventHandler.createNewFolder(getPath(), getActivity(), this);
+                DialogHandler.showNewFileDialog(getPath(), getActivity(), this, 1);
                 return true;
             case R.id.menu_sort_name_asc:
                 onSortingChanged(SortType.Type.ALPHA);
@@ -1681,7 +1685,7 @@ public void onPrepareOptionsMenu(Menu menu) {
             return;
         super.onPrepareOptionsMenu(menu);
 		
-		MenuUtils.setMenuEnabled(menu, getPath().canWrite(), R.id.menu_new_file, R.id.menu_new_folder);
+		MenuUtils.setMenuEnabled(menu, getPath().canWrite(), R.id.menu_new_file);
 		MenuUtils.setMenuVisible(menu, mPath instanceof OpenNetworkPath, R.id.menu_context_download);
 		MenuUtils.setMenuVisible(menu, !(mPath instanceof OpenNetworkPath), R.id.menu_context_edit, R.id.menu_context_view);
 		
@@ -1704,8 +1708,7 @@ public void onPrepareOptionsMenu(Menu menu) {
         if (mPath != null)
             MenuUtils.setMenuEnabled(menu,
                     !mPath.requiresThread() && mPath.canWrite() && !mPath.isArchive(),
-                    R.id.menu_multi_all_copy, R.id.menu_multi_all_move, R.id.menu_new_file,
-                    R.id.menu_new_folder);
+                    R.id.menu_multi_all_copy, R.id.menu_multi_all_move, R.id.menu_new_file);
 
         SortType.Type st = getSorting().getType();
         int sti = Utils.getArrayIndex(sortTypes, st);
@@ -2192,6 +2195,8 @@ public void updateData(final OpenPath[] result) {
             Logger.LogWarning("ContentFragment.updateData warning: mContentAdapter is null");
             return;
         }
+        if(OpenExplorer.IS_DEBUG_BUILD)
+        	Logger.LogVerbose("ContentFragment.updateData");
         if (Thread.currentThread().equals(OpenExplorer.UiThread)) {
             mContentAdapter.updateData(result);
             notifyDataSetChanged();
@@ -2398,9 +2403,9 @@ public boolean onMenuItemClick(MenuItem item) {
             OpenPath last = mContentAdapter.getSelectedSet().get(getSelectedCount() - 1);
 
             MenuUtils.setMenuEnabled(menu, writable, R.id.menu_context_delete,
-                    R.id.menu_context_cut);
+                    R.id.menu_context_cut, R.id.menu_context_rename);
             MenuUtils.setMenuEnabled(menu, readable, R.id.menu_context_copy, R.id.menu_context_cut,
-                    R.id.menu_context_download, R.id.menu_context_rename, R.id.menu_context_zip);
+                    R.id.menu_context_download, R.id.menu_context_zip, R.id.menu_context_share);
             
             if(last instanceof CloudOpsHandler)
                 MenuUtils.setMenuShowAsAction(menu, MenuItem.SHOW_AS_ACTION_ALWAYS, R.id.menu_context_download);
@@ -2511,6 +2516,7 @@ public void onDestroyActionMode(ActionMode mode) {
     @Override
     public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
         if(position == 0 && Preferences.Pref_ShowUp) return false;
+        Logger.LogInfo(getClassName() + ".onItemLongClick");
         OpenPath path = getContentAdapter().getItem(position);
         toggleSelection(view, path);
         return true;
@@ -2524,6 +2530,8 @@ private void toggleSelection(View view, OpenPath path) {
     public void notifyDataSetChanged() {
         if (getExplorer() == null)
             return;
+        if(OpenExplorer.IS_DEBUG_BUILD)
+        	Logger.LogVerbose("ContentFragment.notifyDataSetChanged");
         if (!Thread.currentThread().equals(OpenExplorer.UiThread)) {
             OpenExplorer.getHandler().post(new Runnable() {
                 public void run() {
@@ -2536,7 +2544,7 @@ public void run() {
             mContentAdapter = getContentAdapter();
         }
 
-        mContentAdapter.finalize();
+        //mContentAdapter.finalize();
 
         if (mGrid != null
                 && (mGrid.getAdapter() == null || !mGrid.getAdapter().equals(mContentAdapter)))
diff --git a/src/org/brandroid/openmanager/fragments/DialogHandler.java b/src/org/brandroid/openmanager/fragments/DialogHandler.java
index 691d4538..0513413c 100644
--- a/src/org/brandroid/openmanager/fragments/DialogHandler.java
+++ b/src/org/brandroid/openmanager/fragments/DialogHandler.java
@@ -43,6 +43,8 @@
 import android.graphics.Bitmap.Config;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.text.ClipboardManager;
 import android.text.util.Linkify;
 import android.util.DisplayMetrics;
 import android.view.Display;
@@ -69,6 +71,7 @@
 import android.widget.ListView;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
+import android.widget.SpinnerAdapter;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
@@ -82,6 +85,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Properties;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.regex.Pattern;
@@ -96,10 +100,13 @@
 import jcifs.smb.SmbFile;
 
 import org.brandroid.openmanager.R;
+import org.brandroid.openmanager.R.drawable;
+import org.brandroid.openmanager.R.string;
 import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.openmanager.activities.ServerSetupActivity;
 import org.brandroid.openmanager.adapters.HeatmapAdapter;
 import org.brandroid.openmanager.adapters.IconContextMenu;
+import org.brandroid.openmanager.adapters.IconContextMenu.IconContextItemSelectedListener;
 import org.brandroid.openmanager.data.OpenMediaStore;
 import org.brandroid.openmanager.data.OpenPath;
 import org.brandroid.openmanager.data.OpenFile;
@@ -108,15 +115,24 @@
 import org.brandroid.openmanager.data.OpenPath.OpenPathSizable;
 import org.brandroid.openmanager.data.OpenPath.SpaceHandler;
 import org.brandroid.openmanager.interfaces.OpenApp;
+import org.brandroid.openmanager.util.EventHandler;
+import org.brandroid.openmanager.util.EventHandler.OnWorkerUpdateListener;
+import org.brandroid.openmanager.util.FileManager;
 import org.brandroid.openmanager.util.HelpStringHelper;
+import org.brandroid.openmanager.util.InputDialog;
 import org.brandroid.openmanager.util.IntentManager;
+import org.brandroid.openmanager.util.MimeTypes;
 import org.brandroid.openmanager.util.OpenChromeClient;
 import org.brandroid.openmanager.util.ThumbnailCreator;
 import org.brandroid.utils.Logger;
+import org.brandroid.utils.MenuBuilder2;
 import org.brandroid.utils.MenuUtils;
 import org.brandroid.utils.Preferences;
+import org.brandroid.utils.SubmitStatsTask;
 import org.brandroid.utils.Utils;
 import org.brandroid.utils.ViewUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 import com.actionbarsherlock.view.MenuItem;
 
@@ -160,6 +176,8 @@ public void onClick(View v) {
             public void OnHeatmapTasksComplete(long mTotalBytes, boolean allDone) {
                 mTotalSize.setText(app.getContext().getResources().getString(R.string.s_size)
                         + ": " + OpenPath.formatSize(mTotalBytes) + (allDone ? "" : "..."));
+                if(allDone)
+                    adapter.notifyDataSetChanged();
             }
         });
 
@@ -176,15 +194,42 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                OpenPath path = adapter.getItem(position);
-                IconContextMenu icm = new IconContextMenu(app.getContext(), R.menu.context_file,
-                        view);
+                final OpenPath path = adapter.getItem(position);
+                IconContextMenu icm = new IconContextMenu(app.getContext(), R.menu.context_heatmap, view);
+                icm.setOnIconContextItemSelectedListener(new IconContextItemSelectedListener() {
+					public void onIconContextItemSelected(IconContextMenu menu, MenuItem item,
+							Object info, View view) {
+						switch(item.getItemId())
+						{
+						    case R.id.menu_context_bookmark:
+						        OpenExplorer.addBookmark(app, path, null);
+						        break;
+						    case R.id.menu_context_copy:
+						        app.getClipboard().add(path);
+						        break;
+                            case R.id.menu_context_rename:
+                                OpenExplorer.getEventHandler().renameFile(path, path.isDirectory(), app.getContext());
+                                break;
+                            case R.id.menu_context_share:
+                                Intent shareIntent = new Intent(Intent.ACTION_VIEW);
+                                shareIntent.setType(path.getMimeType());
+                                shareIntent.putExtra(Intent.EXTRA_STREAM, path.getUri());
+                                app.getContext().startActivity(shareIntent);
+                                break;
+    						case R.id.menu_context_delete:
+    							OpenExplorer.getEventHandler().deleteFile(path, app, true);
+    							break;
+						}
+					}
+				});
                 icm.show();
                 return true;
             }
         });
 
         lv.setAdapter(adapter);
+        
+        v.setTag(adapter);
 
         return v;
     }
@@ -216,6 +261,15 @@ public static void populateFileInfoViews(OpenApp app, View v, OpenPath file) thr
         
         ((TextView)v.findViewById(R.id.info_time_stamp)).setText(date.toString());
         ((TextView)v.findViewById(R.id.info_path_label)).setText(file.getPath());
+        v.findViewById(R.id.info_path_label).setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				ClipboardManager clip = (ClipboardManager)v.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+				clip.setText(((TextView)v).getText());
+				Toast.makeText(v.getContext(), R.string.s_alert_clipboard, Toast.LENGTH_SHORT).show();
+			}
+		});
         ((TextView)v.findViewById(R.id.info_read_perm)).setText(file.canRead() + "");
         ((TextView)v.findViewById(R.id.info_write_perm)).setText(file.canWrite() + "");
         ((TextView)v.findViewById(R.id.info_execute_perm)).setText(file.canExecute() + "");
@@ -388,15 +442,24 @@ public static void showFileInfo(final OpenApp app, final OpenPath path) {
     public static void showFileHeatmap(final OpenApp app, final OpenPath path) {
         final Context mContext = app.getContext();
         try {
-            new AlertDialog.Builder(mContext)
-                    .setView(
-                            createFileHeatmapDialog(app, (LayoutInflater)mContext
-                                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE), path))
+        	final View mHeatmap = createFileHeatmapDialog(app, (LayoutInflater)mContext
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE), path);
+            AlertDialog dlg = new AlertDialog.Builder(mContext)
+                    .setView(mHeatmap)
                     .setTitle(path.getName())
                     .setIcon(
                             new BitmapDrawable(mContext.getResources(), path.getThumbnail(app,
                                     ContentFragment.mListImageSize, ContentFragment.mListImageSize)
-                                    .get())).create().show();
+                                    .get()))
+                    .create();
+            dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
+				public void onDismiss(DialogInterface dialog) {
+					Object o = mHeatmap.getTag();
+					if(o != null && o instanceof HeatmapAdapter)
+						((HeatmapAdapter)o).cancelTasks();
+				}
+			});
+            dlg.show();
         } catch (Exception e) {
             Logger.LogError("Couldn't show File Info.", e);
         }
@@ -463,11 +526,13 @@ public boolean cancel() {
      * @param preferences Preferences object from which to pull pref_key. This
      *            will be placed in the "warn" SharedPreference.
      * @param pref_key Preference Key holding whether or not to show warning.
+     * @param hideNo Boolean to either hide No or Yes when "Always Remember"
+     *            is checked.
      * @param onYes Callback for when Yes is chosen. This will be called
      *            automatically if "Do not ask again" is selected.
      */
     public static void showConfirmationDialog(Context context, String text, String title,
-            final Preferences preferences, final String pref_key,
+            final Preferences preferences, final String pref_key, final boolean hideNo,
             final DialogInterface.OnClickListener onYes) {
 
         if (!preferences.getBoolean("warn", pref_key, false)) {
@@ -483,12 +548,23 @@ public static void showConfirmationDialog(Context context, String text, String t
                 public void onClick(View v) {
                     if (v.getId() == R.id.confirm_remember) {
                         CheckBox me = (CheckBox)v;
+                        Logger.LogInfo("Confirm." + pref_key + ": " + (me.isChecked() ? "Remember" : "Forget"));
                         preferences.setSetting("warn", pref_key, me.isChecked());
-                        ViewUtils.setViewsEnabled(layout, !me.isChecked(), R.id.confirm_no);
+                        ViewUtils.setViewsEnabled(layout, !me.isChecked(),
+                                hideNo ? R.id.confirm_no : R.id.confirm_yes);
                     } else if (v.getId() == R.id.confirm_no) {
-                        preferences.setSetting("warn", pref_key, false);
+                        Logger.LogInfo("Confirm." + pref_key + ": NO");
+                        preferences.setSetting(null, "confirm_" + pref_key, true);
+                        if(hideNo)
+                            preferences.setSetting("warn", pref_key, false);
                         dialog.dismiss();
+                        if(!hideNo)
+                            onYes.onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
                     } else if (v.getId() == R.id.confirm_yes) {
+                        Logger.LogInfo("Confirm." + pref_key + ": YES");
+                        preferences.setSetting(null, "confirm_" + pref_key, true);
+                        if(!hideNo)
+                            preferences.setSetting("warn", pref_key, false);
                         onYes.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
                     }
                 }
@@ -497,7 +573,7 @@ public void onClick(View v) {
             if (context != null)
                 dialog.show();
         } else
-            onYes.onClick(null, DialogInterface.BUTTON_POSITIVE);
+            onYes.onClick(null, hideNo ? DialogInterface.BUTTON_POSITIVE : DialogInterface.BUTTON_NEGATIVE);
     }
 
     public static void showExtractDialog(final OpenExplorer app, String title, final OpenPath file,
@@ -931,6 +1007,23 @@ public void onReceivedError(WebView view, int errorCode, String description,
                 mRecent.setVisibility(View.GONE);
                 mRecentLabel.setVisibility(View.GONE);
             }
+            
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                if(url.toLowerCase().endsWith("apk"))
+                {
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setData(Uri.parse(url));
+                    if(IntentManager.getResolvesAvailable(intent, mApp).size() > 0)
+                    {
+                        mApp.getContext().startActivity(intent);
+                        return true;
+                    }
+                }
+                view.loadUrl(url);
+                return true;
+            }
+            
         });
         mRecent.setBackgroundColor(Color.TRANSPARENT);
         mRecent.loadUrl("http://brandroid.org/open/?show=recent");
@@ -1095,30 +1188,14 @@ public static String getDeviceInfo() {
         String ret = "";
         String sep = "\n";
         ret += sep + "Build Info:" + sep;
-        ret += "SDK: " + Build.VERSION.SDK_INT + sep;
-        if (OpenExplorer.SCREEN_WIDTH > -1)
-            ret += "Screen: " + OpenExplorer.SCREEN_WIDTH + "x" + OpenExplorer.SCREEN_HEIGHT + sep;
-        if (OpenExplorer.SCREEN_DPI > -1)
-            ret += "DPI: " + OpenExplorer.SCREEN_DPI + sep;
-        ret += "Lang: " + Utils.getLangCode() + sep;
+        JSONObject json = SubmitStatsTask.getDeviceInfo();
+        JSONArray keys = json.names();
+        for(int i = 0; i < keys.length(); i++)
+        {
+            String key = keys.optString(i);
+            ret += key + ": " + json.optString(key) + sep;
+        }
         ret += "Runs: " + Preferences.Run_Count + sep;
-        ret += "Fingerprint: " + Build.FINGERPRINT + sep;
-        ret += "Manufacturer: " + Build.MANUFACTURER + sep;
-        ret += "Model: " + Build.MODEL + sep;
-        ret += "Product: " + Build.PRODUCT + sep;
-        ret += "Brand: " + Build.BRAND + sep;
-        ret += "Board: " + Build.BOARD + sep;
-        ret += "Bootloader: " + Build.BOOTLOADER + sep;
-        ret += "Hardware: " + Build.HARDWARE + sep;
-        ret += "Display: " + Build.DISPLAY + sep;
-        ret += "Language: " + Locale.getDefault().getDisplayLanguage() + sep;
-        ret += "Country: " + Locale.getDefault().getDisplayCountry() + sep;
-        ret += "Tags: " + Build.TAGS + sep;
-        ret += "Type: " + Build.TYPE + sep;
-        ret += "User: " + Build.USER + sep;
-        if (Build.UNKNOWN != null)
-            ret += "Unknown: " + Build.UNKNOWN + sep;
-        ret += "ID: " + Build.ID;
         return ret;
     }
 
@@ -1133,4 +1210,105 @@ public void onClick(DialogInterface dialog, int which) {
         });
         return true;
     }
+    
+    private static Drawable getFileTypeDrawable(int type, Context context)
+    {
+    	int res = R.drawable.sm_folder;
+    	switch(type)
+    	{
+    	case 1: res = R.drawable.sm_paper; break;
+    	}
+    	return context.getResources().getDrawable(res);
+    }
+    
+    public static void showNewFileTypeDialog(final Context context, DialogInterface.OnClickListener onclick)
+    {
+    	ArrayList<CharSequence> mTypes = new ArrayList<CharSequence>();
+		for(String t : context.getResources().getStringArray(R.array.file_types))
+			mTypes.add(t);
+		ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(context,
+				android.R.layout.simple_list_item_1, mTypes) {
+			@Override
+			public View getView(int position, View convertView,
+					ViewGroup parent) {
+				View ret = super.getView(position, convertView, parent);
+				Drawable d = getFileTypeDrawable(position, context);
+				Drawable plus = context.getResources().getDrawable(R.drawable.ic_menu_add_layer);
+				LayerDrawable ld = new LayerDrawable(new Drawable[]{d, plus});
+				if(ret instanceof TextView)
+				{
+					((TextView)ret).setCompoundDrawablePadding(8);
+					((TextView)ret).setCompoundDrawablesWithIntrinsicBounds(ld, null, null, null);
+				}
+				return ret;
+			}
+		};
+		new AlertDialog.Builder(context)
+			.setTitle(R.string.s_add)
+			.setAdapter(adapter, onclick)
+			.setNegativeButton(R.string.s_cancel, onclick)
+			.create()
+			.show();
+    }
+
+	public static void showNewFileDialog(final OpenPath folder, final Context context,
+	        final OnWorkerUpdateListener threadListener, int initialType) {
+		showNewFileTypeDialog(context, new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface dialog, int which) {
+				if(which >= 0)
+					showNewFileOfTypeDialog(folder, context, threadListener, which);
+			}
+		});
+	}
+		
+	public static void showNewFileOfTypeDialog(final OpenPath folder, final Context context,
+	        final OnWorkerUpdateListener threadListener, final int type) {
+    	final InputDialog dlg = new InputDialog(context)
+				.setTitle(type == 0 ? R.string.s_title_newfolder : R.string.s_title_newfile)
+	            .setIcon(getFileTypeDrawable(type, context))
+	            .setNegativeButton(R.string.s_cancel,
+	            		new DialogInterface.OnClickListener() {
+		                public void onClick(DialogInterface dialog, int which) {
+		                    dialog.dismiss();
+		                }
+		            });
+	    dlg.setPositiveButton(R.string.s_create, new DialogInterface.OnClickListener() {
+	        public void onClick(DialogInterface dialog, int which) {
+	        	String name = dlg.getInputText();
+	            if (name.length() == 0) { dialog.dismiss(); return; }
+	            switch(type)
+	            {
+	            case 0: // new folder
+	            	if (!folder.getChild(name).exists()) {
+	                    if (!EventHandler.createNewFolder(folder, name, context)) {
+	                        // new folder wasn't created, and since we've
+	                        // already ruled out an existing folder, the folder
+	                        // can't be created for another reason
+	                        OpenPath path = folder.getChild(name);
+	                        Logger.LogError("Unable to create folder (" + path + ")");
+	                        if (threadListener != null)
+	                            threadListener.onWorkerThreadFailure(EventHandler.MKDIR_TYPE);
+	                        Toast.makeText(context, R.string.s_msg_folder_none, Toast.LENGTH_LONG)
+	                                .show();
+	                    } else {
+	                        if (threadListener != null)
+	                            threadListener.onWorkerThreadComplete(EventHandler.MKDIR_TYPE);
+	                    }
+	                } else {
+	                    // folder exists, so let the user know
+	                    Toast.makeText(context,
+	                            EventHandler.getResourceString(context, R.string.s_msg_folder_exists),
+	                            Toast.LENGTH_SHORT).show();
+	                }
+	            	break;
+	            case 1: // text file:
+	            	EventHandler.createNewFile(folder, name, threadListener);
+	            	break;
+	            }
+	            
+	        }
+	    });
+	    dlg.create().show();
+	}
+
 }
diff --git a/src/org/brandroid/openmanager/fragments/OpenFragment.java b/src/org/brandroid/openmanager/fragments/OpenFragment.java
index 260dd191..4bd79aa3 100644
--- a/src/org/brandroid/openmanager/fragments/OpenFragment.java
+++ b/src/org/brandroid/openmanager/fragments/OpenFragment.java
@@ -6,6 +6,7 @@
 import java.util.List;
 
 import org.brandroid.openmanager.R;
+import org.brandroid.openmanager.activities.OpenApplication;
 import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.openmanager.activities.OpenFragmentActivity;
 import org.brandroid.openmanager.adapters.IconContextMenu;
@@ -42,6 +43,7 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.Application;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -79,7 +81,7 @@ public abstract class OpenFragment extends SherlockFragment implements View.OnCl
     // public static boolean CONTENT_FRAGMENT_FREE = true;
     // public boolean isFragmentValid = true;
     private boolean mHasOptions = false;
-    protected boolean DEBUG = OpenExplorer.IS_DEBUG_BUILD && true;
+    protected boolean DEBUG = OpenExplorer.IS_DEBUG_BUILD && false;
     private OnFragmentDPADListener mDPAD = null;
     private boolean mDestroyed = false;
 
@@ -188,8 +190,8 @@ public void run() {
     }
 
     public String getString(int resId, String mDefault) {
-        if (getExplorer() != null)
-            return getExplorer().getString(resId);
+        if (getApplication() != null)
+            return getApplication().getString(resId);
         else
             return mDefault;
     }
@@ -444,11 +446,7 @@ public void setHasOptionsMenu(boolean hasMenu) {
         // super.setHasOptionsMenu(hasMenu);
         mHasOptions = hasMenu;
     }
-
-    public boolean hasOptionsMenu() {
-        return mHasOptions;
-    }
-
+    
     public boolean onBackPressed() {
         if (getExplorer() != null) {
             try {
@@ -646,9 +644,21 @@ public OpenExplorer getExplorer() {
     public Context getApplicationContext() {
         if (getSherlockActivity() != null)
             return getSherlockActivity().getApplicationContext();
+        else if(getActivity() != null)
+        	return getActivity().getApplicationContext();
         else
             return null;
     }
+    
+    public Application getApplication() {
+    	if(getActivity() != null)
+    		return getActivity().getApplication();
+    	else return null;
+    }
+    
+    public OpenApplication getOpenApplication() {
+    	return (OpenApplication)getApplication();
+    }
 
     public static EventHandler getEventHandler() {
         return OpenExplorer.getEventHandler();
@@ -660,23 +670,29 @@ public static FileManager getFileManager() {
 
     @Override
     public ActionMode getActionMode() {
-        if (getExplorer() != null)
-            return getExplorer().getActionMode();
+    	if (getExplorer() != null)
+    		return getExplorer().getActionMode();
+        if (getOpenApplication() != null)
+            return getOpenApplication().getActionMode();
         else
             return null;
     }
 
     @Override
     public void setActionMode(ActionMode mode) {
-        if (getExplorer() != null)
-            getExplorer().setActionMode(mode);
+    	if (getExplorer() != null)
+    		getExplorer().setActionMode(mode);
+    	else if (getOpenApplication() != null)
+        	getOpenApplication().setActionMode(mode);
     }
 
     @Override
     public OpenClipboard getClipboard() {
-        if (getExplorer() != null)
-            return getExplorer().getClipboard();
-        else
+    	if (getExplorer() != null)
+    		return getExplorer().getClipboard();
+    	else if (getOpenApplication() != null)
+            return getOpenApplication().getClipboard();
+        else 
             return null;
     }
 
@@ -768,57 +784,57 @@ public Context getContext() {
 
     @Override
     public DataManager getDataManager() {
-        return getExplorer().getDataManager();
+        return getOpenApplication().getDataManager();
     }
 
     @Override
     public DiskLruCache getDiskCache() {
-        return getExplorer().getDiskCache();
+        return getOpenApplication().getDiskCache();
     }
 
     @Override
     public DownloadCache getDownloadCache() {
-        return getExplorer().getDownloadCache();
+        return getOpenApplication().getDownloadCache();
     }
 
     @Override
     public ImageCacheService getImageCacheService() {
-        return getExplorer().getImageCacheService();
+        return getOpenApplication().getImageCacheService();
     }
 
     @Override
     public ContentResolver getContentResolver() {
-        return getExplorer().getContentResolver();
+        return getOpenApplication().getContentResolver();
     }
 
     @Override
     public Looper getMainLooper() {
-        return getExplorer().getMainLooper();
+        return getOpenApplication().getMainLooper();
     }
 
     @Override
     public LruCache<String, Bitmap> getMemoryCache() {
-        return getExplorer().getMemoryCache();
+        return getOpenApplication().getMemoryCache();
     }
 
     @Override
     public Preferences getPreferences() {
-        return getExplorer().getPreferences();
+        return getOpenApplication().getPreferences();
     }
 
     @Override
     public void refreshBookmarks() {
-        getExplorer().refreshBookmarks();
+        getOpenApplication().refreshBookmarks();
     }
 
     @Override
     public ThreadPool getThreadPool() {
-        return getExplorer().getThreadPool();
+        return getOpenApplication().getThreadPool();
     }
 
     @Override
     public ShellSession getShellSession() {
-        return getExplorer().getShellSession();
+        return getOpenApplication().getShellSession();
     }
 
     @Override
diff --git a/src/org/brandroid/openmanager/fragments/OperationsFragment.java b/src/org/brandroid/openmanager/fragments/OperationsFragment.java
index 909e744f..f541dbad 100644
--- a/src/org/brandroid/openmanager/fragments/OperationsFragment.java
+++ b/src/org/brandroid/openmanager/fragments/OperationsFragment.java
@@ -105,11 +105,6 @@ public void onWorkerThreadFailure(EventType type, OpenPath... files) {
 
     }
 
-    @Override
-    public boolean hasOptionsMenu() {
-        return true;
-    }
-
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
diff --git a/src/org/brandroid/openmanager/fragments/PickerFragment.java b/src/org/brandroid/openmanager/fragments/PickerFragment.java
index 27dbf5fc..22796cdd 100644
--- a/src/org/brandroid/openmanager/fragments/PickerFragment.java
+++ b/src/org/brandroid/openmanager/fragments/PickerFragment.java
@@ -4,40 +4,38 @@
 import org.brandroid.openmanager.R;
 import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.openmanager.adapters.ContentAdapter;
-import org.brandroid.openmanager.adapters.OpenPathPagerAdapter;
-import org.brandroid.openmanager.data.OpenFile;
+import org.brandroid.openmanager.adapters.ContentAdapter.SelectionCallback;
+import org.brandroid.openmanager.adapters.OpenPathAdapter;
 import org.brandroid.openmanager.data.OpenPath;
 import org.brandroid.openmanager.views.OpenViewPager;
 import org.brandroid.utils.Logger;
 import org.brandroid.utils.ViewUtils;
 
-import com.viewpagerindicator.PageIndicator;
-import com.viewpagerindicator.TabPageIndicator;
-
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView;
+import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.GridView;
 import android.widget.TextView;
 
 public class PickerFragment extends OpenFragment implements OnItemClickListener,
-        OpenPathFragmentInterface {
+        OpenPathFragmentInterface, SelectionCallback {
     private OnOpenPathPickedListener mPickListener;
     private View view;
-    private OpenViewPager mPager;
-    private PickerPagerAdapter mPagerAdapter;
+//    private OpenViewPager mPager;
+//    private PickerPagerAdapter mPagerAdapter;
+    private GridView mGrid;
+    private ContentAdapter mAdapter;
     private TextView mSelection;
     private EditText mPickName;
     private OpenPath mPath;
@@ -80,42 +78,43 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         view = inflater.inflate(R.layout.picker_pager, container, false);
         ViewUtils.setViewsVisible(view, false, android.R.id.button1, android.R.id.button2,
                 android.R.id.title, R.id.pick_filename);
-        mPager = (OpenViewPager)view.findViewById(R.id.picker_pager);
-        mPager.setOnPageChangeListener(new OnPageChangeListener() {
-
-            @Override
-            public void onPageSelected(int position) {
-                OpenPath path = ((PickerPagerAdapter)mPagerAdapter).getItemPath(position);
-                if (mPickListener != null)
-                    mPickListener.onOpenPathShown(path);
-            }
-
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                // TODO Auto-generated method stub
-
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-                // TODO Auto-generated method stub
-
-            }
-        });
+//        mPager = (OpenViewPager)view.findViewById(R.id.picker_pager);
+//        mPager.setOnPageChangeListener(new OnPageChangeListener() {
+//
+//            @Override
+//            public void onPageSelected(int position) {
+//                OpenPath path = ((PickerPagerAdapter)mPagerAdapter).getItemPath(position);
+//                if (mPickListener != null)
+//                    mPickListener.onOpenPathShown(path);
+//            }
+//
+//            @Override
+//            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+//                // TODO Auto-generated method stub
+//
+//            }
+//
+//            @Override
+//            public void onPageScrollStateChanged(int state) {
+//                // TODO Auto-generated method stub
+//
+//            }
+//        });
         mSelection = (TextView)view.findViewById(R.id.pick_path);
 
-        // mGrid = (GridView)view.findViewById(android.R.id.list);
-        // mGrid.setNumColumns(mContext.getResources().getInteger(R.integer.max_grid_columns));
-        // mSelection = (TextView)view.findViewById(R.id.pick_path);
-        // mPickName = (EditText)view.findViewById(R.id.pick_filename);
-        return view;
+		Context mContext = getContext();
+		mGrid = (GridView) view.findViewById(android.R.id.list);
+		mGrid.setNumColumns(mContext.getResources().getInteger(R.integer.max_grid_columns));
+		mSelection = (TextView) view.findViewById(R.id.pick_path);
+		mPickName = (EditText) view.findViewById(R.id.pick_filename);
+		return view;
     }
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mPagerAdapter = new PickerPagerAdapter(getFragmentManager()).setContext(getContext());
-        // mGrid.setOnItemClickListener(this);
+        //mPagerAdapter = new PickerPagerAdapter(getFragmentManager()).setContext(getContext());
+        mGrid.setOnItemClickListener(this);
         if (savedInstanceState != null && savedInstanceState.containsKey("start"))
             mPath = (OpenPath)savedInstanceState.getParcelable("start");
         setPath(mPath);
@@ -133,26 +132,26 @@ else if (savedInstanceState != null && savedInstanceState.containsKey("name"))
 
     public void setPath(final OpenPath path) {
         mPath = path;
-        ((PickerPagerAdapter)mPagerAdapter).setOnItemClickListener(this).setPath(path);
-        mPager.postDelayed(new Runnable() {
-            public void run() {
-                mPager.setCurrentItem(path.getDepth() - 1);
-            }
-        }, 200);
-        /*
-         * mAdapter = new ContentAdapter(mContext, OpenExplorer.VIEW_LIST,
-         * mPath); mAdapter.setShowPlusParent(path.getParent() != null);
-         * mAdapter.setShowFiles(false); mAdapter.setShowDetails(false);
-         * mAdapter.updateData(); mGrid.setAdapter(mAdapter);
-         */
-        if (mSelection != null && mShowSelection)
+        //((PickerPagerAdapter)mPagerAdapter).setOnItemClickListener(this).setPath(path);
+//        mPager.postDelayed(new Runnable() {
+//            public void run() {
+//                mPager.setCurrentItem(path.getDepth() - 1);
+//            }
+//        }, 200);
+		mAdapter = new ContentAdapter(this, this, OpenExplorer.VIEW_LIST, mPath);
+		mAdapter.setShowPlusParent(path.getParent() != null);
+		mAdapter.setShowFiles(true);
+		mAdapter.setShowDetails(true);
+		mAdapter.updateData();
+		mGrid.setAdapter(mAdapter);
+		if (mSelection != null && mShowSelection)
             mSelection.setText(mPath.getPath());
-        if (mPager != null && mPagerAdapter != null && mPager.getAdapter() == null)
-            try {
-                mPager.setAdapter(mPagerAdapter);
-            } catch (IllegalStateException e) {
-                Logger.LogError("Illegal State in PickerFragment?", e);
-            }
+//        if (mPager != null && mPagerAdapter != null && mPager.getAdapter() == null)
+//            try {
+//                mPager.setAdapter(mPagerAdapter);
+//            } catch (IllegalStateException e) {
+//                Logger.LogError("Illegal State in PickerFragment?", e);
+//            }
     }
 
     public interface OnOpenPathPickedListener {
@@ -242,4 +241,11 @@ public int getCount() {
 
     }
 
+	@Override
+	public void onAdapterSelectedChanged(OpenPath path, boolean newSelected,
+			int mSelectedCount) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/src/org/brandroid/openmanager/fragments/SearchResultsFragment.java b/src/org/brandroid/openmanager/fragments/SearchResultsFragment.java
index 75980406..58e9e4b6 100644
--- a/src/org/brandroid/openmanager/fragments/SearchResultsFragment.java
+++ b/src/org/brandroid/openmanager/fragments/SearchResultsFragment.java
@@ -14,7 +14,11 @@
 import org.brandroid.openmanager.data.OpenSearch;
 import org.brandroid.openmanager.data.OpenSearch.SearchProgressUpdateListener;
 import org.brandroid.openmanager.util.FileManager;
+import org.brandroid.openmanager.util.SortType;
 import org.brandroid.utils.Logger;
+import org.brandroid.utils.ViewUtils;
+
+import com.actionbarsherlock.view.ActionMode;
 
 import android.annotation.SuppressLint;
 import android.graphics.drawable.Drawable;
@@ -35,8 +39,7 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 
-public class SearchResultsFragment extends ContentFragment implements OnItemLongClickListener,
-        SearchProgressUpdateListener {
+public class SearchResultsFragment extends ContentFragment implements SearchProgressUpdateListener {
     private TextView mTextSummary;
     private ProgressBar mProgressBar;
     private Button mCancel;
@@ -119,6 +122,7 @@ public void onDestroy() {
 
     @SuppressLint("NewApi")
     private void executeMyTask() {
+    	if(myTask.getStatus() == Status.FINISHED) return;
         if (Build.VERSION.SDK_INT > 10)
             myTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         else
@@ -195,8 +199,7 @@ else if (b.containsKey("path"))
             if (myTask != null)
                 executeMyTask();
         }
-        mContentAdapter = new ContentAdapter(getExplorer(), this, OpenExplorer.VIEW_LIST,
-                getSearch());
+        mContentAdapter = getContentAdapter();
     }
 
     @Override
@@ -214,13 +217,21 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mTextSummary = (TextView)ret.findViewById(R.id.search_summary);
         mProgressBar = (ProgressBar)ret.findViewById(android.R.id.progress);
         mCancel = (Button)ret.findViewById(R.id.search_cancel);
-        // mGrid.setOnItemClickListener(this);
-        mGrid.setOnItemLongClickListener(this);
-        if (!OpenExplorer.USE_PRETTY_CONTEXT_MENUS) // || !USE_ACTIONMODE)
-            registerForContextMenu(mGrid);
+        mIsViewCreated = true;
         updateGridView();
         return ret;
     }
+    
+    @Override
+    protected ContentAdapter getContentAdapter() {
+        if (mContentAdapter == null) {
+            mContentAdapter = new ContentAdapter(getExplorer(), this, OpenExplorer.VIEW_LIST,
+                    getSearch());
+            mContentAdapter.setShowHiddenFiles(getViewSetting(getPath(), "show",
+                    getViewSetting(null, "pref_show", false)));
+        }
+    	return mContentAdapter;
+    }
 
     @Override
     public void setProgressVisibility(boolean visible) {
@@ -291,9 +302,7 @@ public void run() {
 
     @Override
     public void onFinish() {
-        if (getView() == null)
-            return;
-        getView().post(new Runnable() {
+        OpenExplorer.post(new Runnable() {
             public void run() {
                 setProgressVisibility(false);
                 mContentAdapter.notifyDataSetChanged();
@@ -308,6 +317,7 @@ public void run() {
                     else
                         te.setText(R.string.no_items);
                 }
+                ViewUtils.setViewsVisible(getView(), false, R.id.content_status_bar);
             }
         });
     }
diff --git a/src/org/brandroid/openmanager/fragments/TextEditorFragment.java b/src/org/brandroid/openmanager/fragments/TextEditorFragment.java
index 2e480791..1d1b152d 100644
--- a/src/org/brandroid/openmanager/fragments/TextEditorFragment.java
+++ b/src/org/brandroid/openmanager/fragments/TextEditorFragment.java
@@ -753,8 +753,16 @@ protected String doInBackground(OpenPath... params) {
                 Logger.LogDebug("File is " + mPath.length() + " bytes.");
                 StringBuilder sb = new StringBuilder();
                 if (mPath instanceof OpenPath.OpenPathByteIO)
-                    sb.append(new String(((OpenPath.OpenPathByteIO)mPath).readBytes()));
-                else {
+                {
+                    try {
+                        byte[] bytes = ((OpenPath.OpenPathByteIO)mPath).readBytes();
+                        if(bytes != null)
+                            sb.append(new String(bytes));
+                    } catch(Exception e) {
+                        Logger.LogError("Unable to read bytes from " + mPath, e);
+                        doClose();
+                    }
+                } else {
                     InputStream is = null;
                     try {
                         if (mPath instanceof OpenStream)
diff --git a/src/org/brandroid/openmanager/util/EventHandler.java b/src/org/brandroid/openmanager/util/EventHandler.java
index e560ddea..6469d210 100644
--- a/src/org/brandroid/openmanager/util/EventHandler.java
+++ b/src/org/brandroid/openmanager/util/EventHandler.java
@@ -166,8 +166,11 @@ public static boolean hasRunningTasks() {
 
     public static void cancelRunningTasks() {
         for (BackgroundWork bw : mTasks)
+        {
+        	Logger.LogVerbose("Cancelling " + bw.getTitle());
             if (bw.getStatus() == Status.RUNNING)
                 bw.cancel(true);
+        }
         if (mNotifier != null)
             mNotifier.cancelAll();
     }
@@ -227,7 +230,7 @@ public EventHandler(FileManager filemanager) {
     public static String getResourceString(Context mContext, int... resIds) {
         String ret = "";
         for (int resId : resIds)
-            ret += (ret == "" ? "" : " ") + mContext.getText(resId);
+            ret += ("".equals(ret) ? "" : " ") + mContext.getText(resId);
         return ret;
     }
 
@@ -317,91 +320,6 @@ public void onClick(DialogInterface dialog, int which) {
         }).create().show();
     }
 
-    /**
-     * @param directory directory path to create the new folder in.
-     */
-    public static void createNewFolder(final OpenPath folder, final Context context,
-            final OnWorkerUpdateListener threadListener) {
-        final InputDialog dlg = new InputDialog(context).setTitle(R.string.s_title_newfolder)
-                .setIcon(R.drawable.ic_menu_folder_add_dark).setMessage(R.string.s_alert_newfolder)
-                .setMessageTop(R.string.s_alert_newfolder_folder)
-                .setDefaultTop(folder.getPath(), false).setCancelable(true)
-                .setNegativeButton(R.string.s_cancel, DialogHandler.OnClickDismiss);
-        dlg.setPositiveButton(R.string.s_create, new OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                String name = dlg.getInputText();
-                if (name.length() > 0) {
-                    if (!folder.getChild(name).exists()) {
-                        if (!createNewFolder(folder, name, context)) {
-                            // new folder wasn't created, and since we've
-                            // already ruled out an existing folder, the folder
-                            // can't be created for another reason
-                            OpenPath path = folder.getChild(name);
-                            Logger.LogError("Unable to create folder (" + path + ")");
-                            if (threadListener != null)
-                                threadListener.onWorkerThreadFailure(MKDIR_TYPE);
-                            Toast.makeText(context, R.string.s_msg_folder_none, Toast.LENGTH_LONG)
-                                    .show();
-                        } else {
-                            if (threadListener != null)
-                                threadListener.onWorkerThreadComplete(MKDIR_TYPE);
-                        }
-                    } else {
-                        // folder exists, so let the user know
-                        Toast.makeText(context,
-                                getResourceString(context, R.string.s_msg_folder_exists),
-                                Toast.LENGTH_SHORT).show();
-                    }
-                } else {
-                    dialog.dismiss();
-                }
-            }
-        });
-        dlg.create().show();
-    }
-
-    protected static boolean createNewFolder(OpenPath folder, String folderName, Context context) {
-        return folder.getChild(folderName).mkdir();
-    }
-
-    public static void createNewFile(final OpenPath folder, final Context context,
-            final OnWorkerUpdateListener threadListener) {
-        final InputDialog dlg = new InputDialog(context).setTitle(R.string.s_title_newfile)
-                .setIcon(R.drawable.ic_menu_new_file).setMessage(R.string.s_alert_newfile)
-                .setMessageTop(R.string.s_alert_newfile_folder).setDefaultTop(folder.getPath())
-                .setCancelable(true).setNegativeButton(R.string.s_cancel, new OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                    }
-                });
-        dlg.setPositiveButton(R.string.s_create, new OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                String name = dlg.getInputText();
-                if (name.length() > 0) {
-                    createNewFile(folder, name, threadListener);
-                } else {
-                    dialog.dismiss();
-                }
-            }
-        });
-        dlg.create().show();
-    }
-
-    public static void createNewFile(final OpenPath folder, final String filename,
-            final OnWorkerUpdateListener threadListener) {
-        new Thread(new Runnable() {
-            public void run() {
-                if (folder.getChild(filename).touch())
-                    threadListener.onWorkerThreadComplete(TOUCH_TYPE);
-                else
-                    threadListener.onWorkerThreadFailure(TOUCH_TYPE);
-            }
-        }).start();
-        // BackgroundWork bw = new BackgroundWork(TOUCH_TYPE, context, folder,
-        // filename);
-        // bw.execute();
-    }
-
     public void sendFile(final Collection<OpenPath> path, final Context mContext) {
         String name;
         CharSequence[] list = {
@@ -459,6 +377,11 @@ public void copyFile(OpenPath source, OpenPath destPath, Context mContext) {
         files.add(source);
         copyFile(files, destPath, mContext);
     }
+    
+    public BackgroundWork getWorker(EventType type, Context context, OpenPath intoPath, String... params)
+    {
+    	return new BackgroundWork(type, context, intoPath, params);
+    }
 
     public void copyFile(final Collection<OpenPath> files, final OpenPath newPath,
             final Context mContext) {
@@ -630,7 +553,26 @@ public void extractSet(final OpenPath file, final OpenPath dest, final Context m
      * toDir).execute(zipFile); }
      */
 
-    public class BackgroundWork extends AsyncTask<OpenPath, Integer, Integer> implements
+    public static void createNewFile(final OpenPath folder, final String filename,
+	        final OnWorkerUpdateListener threadListener) {
+	    new Thread(new Runnable() {
+	        public void run() {
+	            if (folder.getChild(filename).touch())
+	                threadListener.onWorkerThreadComplete(TOUCH_TYPE);
+	            else
+	                threadListener.onWorkerThreadFailure(TOUCH_TYPE);
+	        }
+	    }).start();
+	    // BackgroundWork bw = new BackgroundWork(TOUCH_TYPE, context, folder,
+	    // filename);
+	    // bw.execute();
+	}
+
+	public static boolean createNewFolder(OpenPath folder, String folderName, Context context) {
+	    return folder.getChild(folderName).mkdir();
+	}
+
+	public class BackgroundWork extends AsyncTask<OpenPath, Integer, Integer> implements
             OnProgressUpdateCallback {
         private final EventType mType;
         private final Context mContext;
@@ -660,6 +602,8 @@ public class BackgroundWork extends AsyncTask<OpenPath, Integer, Integer> implem
         public void setWorkerUpdateListener(OnWorkerUpdateListener listener) {
             mListener = listener;
         }
+        
+        public OnWorkerUpdateListener getWorkerUpdateListener() { return mListener; }
 
         public void OnWorkerThreadComplete(EventType type, String... results) {
             if (mListener != null)
@@ -702,6 +646,10 @@ public String getOperation() {
                 case SEARCH:
                     return getResourceString(mContext, R.string.s_title_searching).toString();
                 case COPY:
+                	if(mIntoPath != null && mIntoPath instanceof OpenNetworkPath)
+                		return getResourceString(mContext, R.string.s_title_uploading).toString();
+                	else if (mCurrentPath != null && mCurrentPath instanceof OpenNetworkPath)
+                		return getResourceString(mContext,  R.string.s_title_downloading).toString();
                     return getResourceString(mContext, R.string.s_title_copying).toString();
                 case CUT:
                     return getResourceString(mContext, R.string.s_title_moving).toString();
@@ -720,7 +668,7 @@ public String getOperation() {
         public String getTitle() {
             String title = getOperation();
             if (mCurrentPath != null) {
-                title += " " + '\u2192' + " " + mCurrentPath.getName();
+                title += " " + mCurrentPath.getName();
             }
             return title;
         }
@@ -836,6 +784,7 @@ protected void onPreExecute() {
                     showDialog = showNotification = false;
                     break;
             }
+            Logger.LogVerbose("Showing notification for " + getTitle());
             if (showDialog)
                 try {
                     mPDialog = ProgressDialog.show(mContext, getTitle(),
@@ -904,12 +853,13 @@ public Notification prepareNotification(int notifIcon, boolean isCancellable,
                 mBuilder.setAutoCancel(true);
                 NotificationCompat.BigTextStyle style = new NotificationCompat.BigTextStyle();
                 style.bigText(getDetailedText());
-                style.setBigContentTitle(getOperation() + " " + mCurrentPath.getName());
+                style.setBigContentTitle(getTitle());
                 mBuilder.setStyle(style);
-                mBuilder.addAction(R.drawable.ic_menu_close_clear_cancel,
+                if(isCancellable)
+                	mBuilder.addAction(R.drawable.ic_menu_close_clear_cancel,
                                 mContext.getResources().getText(R.string.s_cancel),
-                                makePendingIntent(OpenExplorer.REQ_EVENT_CANCEL))
-                        .addAction(R.drawable.ic_menu_info_details,
+                                makePendingIntent(OpenExplorer.REQ_EVENT_CANCEL));
+                mBuilder.addAction(R.drawable.ic_menu_info_details,
                                 mContext.getText(R.string.s_menu_info),
                                 makePendingIntent(OpenExplorer.REQ_EVENT_VIEW));
                 if (Build.VERSION.SDK_INT < 11) {
@@ -936,7 +886,7 @@ public Notification prepareNotification(int notifIcon, boolean isCancellable,
         }
 
         private PendingIntent makePendingIntent(int reqIntent) {
-            Intent intent = new Intent();
+            Intent intent = new Intent(mContext, OpenExplorer.class);
             intent.putExtra("TaskId", taskId);
             intent.putExtra("RequestId", reqIntent);
             return PendingIntent.getActivity(mContext, reqIntent, intent, 0);
@@ -1252,27 +1202,28 @@ private Boolean copyFileToDirectory(final OpenFile source, OpenFile into, final
             if (source.getPath().equals(into.getPath()))
                 return false;
             final OpenFile dest = (OpenFile)into;
-            final boolean[] running = new boolean[] {
-                    true
-            };
             final long size = source.length();
-            if (size > 50000)
-                new Thread(new Runnable() {
+            Thread t = new Thread(new Runnable() {
                     @Override
                     public void run() {
-                        while ((int)dest.length() < total || running[0]) {
+                        while ((int)dest.length() < total && !Thread.currentThread().isInterrupted()) {
                             long pos = dest.length();
                             publish((int)pos, (int)size, total);
                             try {
                                 Thread.sleep(500);
+                                if(Thread.currentThread().isInterrupted())
+                                	break;
                             } catch (InterruptedException e) {
-                                running[0] = false;
+                                break;
                             }
                         }
                     }
-                }).start();
+                });
+            t.start();
+            publish(0, (int)size, total);
             boolean ret = dest.copyFrom(source);
-            running[0] = false;
+            if(t != null && !t.isInterrupted())
+            	t.interrupt();
             return ret;
         }
 
@@ -1396,11 +1347,8 @@ private Boolean copyToDirectory(OpenPath old, OpenPath intoDir, int total)
                 }
             }
             OpenPath newDir = intoDir;
-            if (intoDir instanceof OpenSmartFolder) {
+            if (intoDir instanceof OpenSmartFolder)
                 newDir = ((OpenSmartFolder)intoDir).getFirstDir();
-                if (old instanceof OpenFile && newDir instanceof OpenFile)
-                    return copyFileToDirectory((OpenFile)old, (OpenFile)newDir, total);
-            }
             Logger.LogDebug("EventHandler.copyToDirectory : Trying to copy [" + old.getPath()
                     + "] to [" + intoDir.getPath() + "]...");
             if (old.getPath().equals(intoDir.getPath())) {
@@ -1417,6 +1365,9 @@ private Boolean copyToDirectory(OpenPath old, OpenPath intoDir, int total)
 
             if (old.isDirectory() && newDir.isDirectory() && newDir.canWrite()) {
                 OpenPath[] files = old.list();
+                
+                if(files == null)
+                	files = old.listFiles();
 
                 for (OpenPath file : files)
                     if (file != null)
@@ -1456,7 +1407,7 @@ private Boolean copyToDirectory(OpenPath old, OpenPath intoDir, int total)
                 boolean success = false;
                 if (old instanceof OpenStream && newFile instanceof OpenStream)
                 {
-
+                	Logger.LogDebug("Copying Stream -> Stream");
                     int size = (int)old.length();
                     int pos = 0;
 
@@ -1468,12 +1419,12 @@ private Boolean copyToDirectory(OpenPath old, OpenPath intoDir, int total)
                         o_stream = new BufferedOutputStream(((OpenStream)newFile).getOutputStream());
 
                         while ((read = i_stream.read(data, 0,
-                                Math.min(size - pos, FileManager.BUFFER))) != -1) {
+                                size > 0 ? Math.min(size - pos, FileManager.BUFFER) : FileManager.BUFFER)) != -1) {
                             o_stream.write(data, 0, read);
                             pos += read;
-                            if (pos >= size)
+                            if (size > 0 && pos >= size)
                                 break;
-                            publishMyProgress(pos, size);
+                            publishMyProgress(pos, Math.max(pos, size));
                         }
 
                         o_stream.flush();
@@ -1505,6 +1456,7 @@ private Boolean copyToDirectory(OpenPath old, OpenPath intoDir, int total)
             }
 
             Logger.LogWarning("Couldn't copy file for unknown reason.");
+            OnWorkerThreadFailure(mType, old);
             return false;
         }
 
@@ -1738,9 +1690,8 @@ protected void onProgressUpdate(Integer... values) {
             // publish(current, size, total);
             OnWorkerProgressUpdate(current, total);
 
-            // Logger.LogInfo("onProgressUpdate(" + current + ", " + size + ", "
-            // + total + ")-("
-            // + progA + "," + progB + ")-> " + mRemain + "::" + mLastRate);
+            Logger.LogInfo("onProgressUpdate(" + current + ", " + size + ", " + total +
+            		")-(" + progA + "," + progB + ")-> " + mRemain + "::" + mLastRate);
 
             // mNote.setLatestEventInfo(mContext, , contentText, contentIntent)
 
diff --git a/src/org/brandroid/openmanager/util/FileManager.java b/src/org/brandroid/openmanager/util/FileManager.java
index 1b5cfac5..f2e91b18 100644
--- a/src/org/brandroid/openmanager/util/FileManager.java
+++ b/src/org/brandroid/openmanager/util/FileManager.java
@@ -34,7 +34,6 @@
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.commons.logging.impl.WeakHashtable;
 import org.apache.commons.net.ftp.FTPFile;
 import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.openmanager.activities.ServerSetupActivity;
@@ -58,6 +57,7 @@
 import org.brandroid.openmanager.data.OpenZip;
 import org.brandroid.openmanager.data.OpenPath.OpenStream;
 import org.brandroid.openmanager.data.OpenSearch.SearchProgressUpdateListener;
+import org.brandroid.openmanager.data.OpenZip.OpenZipVirtualPath;
 import org.brandroid.utils.Logger;
 import org.brandroid.utils.Preferences;
 
@@ -223,6 +223,8 @@ else if (target.exists() && target.isDirectory() && target.canRead()) {
             OpenPath[] file_list = null;
             try {
                 file_list = target.list();
+                if(file_list == null)
+                	file_list = target.listFiles();
             } catch (IOException e) {
                 Logger.LogError("Error listing children to delete.", e);
             }
@@ -288,8 +290,11 @@ public static OpenPath getOpenCache(String path, Context c) {
             return null;
         OpenPath ret = null;
         if (path.startsWith("/"))
+        {
             ret = new OpenFile(path);
-        else if (path.startsWith("ftp:/"))
+            if (path.equals("/data") || path.startsWith("/data/"))
+                ret = new OpenFileRoot(ret);
+        } else if (path.startsWith("ftp:/"))
             ret = new OpenFTP(path, null, new FTPManager());
         else if (path.startsWith("sftp:/"))
             ret = new OpenSFTP(path);
@@ -394,7 +399,9 @@ public static OpenPath getOpenCache(String path, Boolean bGetNetworkedFiles, Sor
                         server = servers.findByUser("smb", uri.getHost(), user);
                     if (server == null)
                         server = servers.findByHost("smb", uri.getHost());
-                    if (user == "")
+                    if (server == null)
+                    	server = servers.findByType("smb").size() > 0 ? servers.findByType("smb").get(0) : null;
+                    if(server != null && user.equals(""))
                         user = server.getUser();
                     if (server != null && server.getPassword() != null
                             && server.getPassword() != "")
@@ -519,6 +526,25 @@ else if (path.equals("Downloads"))
                 return ret;
             if (ret instanceof OpenFile && ret.isArchive() && Preferences.Pref_Zip_Internal)
                 ret = new OpenZip((OpenFile)ret);
+            else if (ret instanceof OpenFile && path.toLowerCase().indexOf(".zip/") > -1)
+            {
+            	String pp = path.substring(0, path.toLowerCase().indexOf(".zip/") + 4);
+            	String cp = path.substring(pp.length() + 1);
+            	OpenZip pz = new OpenZip(new OpenFile(pp));
+            	pz.listFiles();
+            	ret = null;
+            	if(cp.endsWith("/"))
+            		ret = pz.findVirtualPath(cp);
+            	else if(cp.indexOf("/") > -1) {
+            		OpenZip.OpenZipVirtualPath vp = (OpenZipVirtualPath) pz.findVirtualPath(cp.substring(0, cp.lastIndexOf("/")));
+            		if(vp != null)
+            			ret = vp.getChild(cp.substring(cp.lastIndexOf("/") + 1));
+            	} else ret = pz.getChild(cp);
+            	if(ret == null)
+            		ret = new OpenFile(path);
+            	else
+            		setOpenCache(path, ret);
+            }
             // if (ret instanceof OpenFile
             // && (ret.getMimeType().contains("tar")
             // || ret.getExtension().equalsIgnoreCase("tar")
@@ -537,6 +563,11 @@ else if (path.equals("Downloads"))
         // else setOpenCache(path, ret);
         return ret;
     }
+    
+    public static OpenPath setOpenCache(OpenPath file) {
+    	mOpenCache.put(file.getPath(), file);
+    	return file;
+    }
 
     public static OpenPath setOpenCache(String path, OpenPath file) {
         // Logger.LogDebug("FileManager.setOpenCache(" + path + ")");
diff --git a/src/org/brandroid/openmanager/util/PrivatePreferences.java b/src/org/brandroid/openmanager/util/PrivatePreferences.java
index cde8141c..d2233884 100644
--- a/src/org/brandroid/openmanager/util/PrivatePreferences.java
+++ b/src/org/brandroid/openmanager/util/PrivatePreferences.java
@@ -27,12 +27,14 @@ public static final void putKey(String name, String value) {
     }
 
     static {
-        // All Private Keys should be entered here, if enabled by default:
-        privateKeys.put("box_key", "");
-        privateKeys.put("box_secret", "");
-        privateKeys.put("dropbox_key", "");
-        privateKeys.put("dropbox_secret", "");
-        privateKeys.put("drive_key", "");
-        privateKeys.put("drive_secret", "");
+        // All Private Keys should go here like this:
+        privateKeys.put("box_key", "zqjxn1m3i4eg4iud158e0nz7u9oi2cpu");
+        privateKeys.put("box_secret", "BcTh1GpJpma1cJc58sqcfZSjDZeuiYZ2");
+        privateKeys.put("dropbox_key", "vajaedmhzkkp3sw");
+        privateKeys.put("dropbox_secret", "plkrfrygu17glgn");
+        privateKeys.put("drive_key", "645291897772.apps.googleusercontent.com");
+        privateKeys.put("drive_secret", "xo9-oPP7P7Rj5er3J1qmzhoG");
+//        privateKeys.put("skydrive_key", "00000000400F4500");
+//        privateKeys.put("skydrive_secret", "0uUmcI0Bjdxux9KdSWVxmgRCZcpzacyz");
     }
 }
diff --git a/src/org/brandroid/openmanager/util/RootManager.java b/src/org/brandroid/openmanager/util/RootManager.java
index 2905b5b5..714dde45 100644
--- a/src/org/brandroid/openmanager/util/RootManager.java
+++ b/src/org/brandroid/openmanager/util/RootManager.java
@@ -22,16 +22,21 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.Thread.State;
+import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.concurrent.TimeoutException;
 
 import org.brandroid.openmanager.data.OpenFile;
 import org.brandroid.utils.ByteQueue;
 import org.brandroid.utils.Logger;
+import org.brandroid.utils.Preferences;
 
 import com.stericson.RootTools.RootTools;
-import com.stericson.RootTools.RootToolsException;
+import com.stericson.RootTools.containers.Mount;
+import com.stericson.RootTools.exceptions.RootDeniedException;
+import com.stericson.RootTools.execution.Command;
+import com.stericson.RootTools.execution.CommandCapture;
+import com.stericson.RootTools.execution.Shell;
 
 import android.os.Handler;
 import android.os.Message;
@@ -54,7 +59,6 @@ public interface UpdateCallback {
     }
 
     private static boolean rootRequested = false;
-    private static boolean rootEnabled = false;
     private static final boolean singleProcess = true;
     private static String busybox = null;
     private Process myProcess = null;
@@ -77,18 +81,22 @@ public interface UpdateCallback {
     }
 
     private boolean mIsRunning = false;
-    private Handler mMsgHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            if (!mIsRunning) {
-                Logger.LogWarning("Handler exited");
-                return;
-            }
-            if (msg.what == NEW_INPUT) {
-                readFromProcess();
+    private Handler mMsgHandler;
+    
+    public void setHandler() {
+        mMsgHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                if (!mIsRunning) {
+                    Logger.LogWarning("Handler exited");
+                    return;
+                }
+                if (msg.what == NEW_INPUT) {
+                    readFromProcess();
+                }
             }
-        }
-    };
+        };
+    }
 
     @Override
     protected void finalize() throws Throwable {
@@ -153,6 +161,10 @@ public void run() {
             }
         };
     }
+    
+    public interface MountCallback {
+        void onMountOutput(boolean isMounted);
+    }
 
     /**
      * Mount /system as Read-Write or Read-Only. Not thoroughly tested. Use at
@@ -162,46 +174,65 @@ public void run() {
      *         returned.
      */
     public static boolean mountSystem(boolean rw) {
-        if (!rootEnabled)
+        if (!isRoot())
+        {
+            Logger.LogWarning("Unable to mount. No root!");
             return false;
-        String sysDev = "/dev/block/mmcblk1p23";
-        OpenFile f = new OpenFile("/proc/mounts");
-        if(f == null) return false;
-        String data = f.readAscii();
-        if(data == null) return false;
-        for (String s : data.split("\n")) {
-            if (s.indexOf("/system") > -1) {
-                sysDev = s.substring(0, s.indexOf(" "));
-                break;
-            }
         }
 
         try {
-            if (RootTools.sendShell(
-                    "mount -o " + (rw ? "rw" : "ro") + ",remount -t yaffs2 " + sysDev + " /system",
-                    1000).size() > 0)
-                return false;
+            /*
+            mount -o remount,rw `cat /proc/mounts | grep /system | sed -e 's: .*::'` /system && cat /proc/mounts | grep /system
+            mount -o remount,ro `cat /proc/mounts | grep /system | sed -e 's: .*::'` /system && cat /proc/mounts | grep /system
+            */
+            String mnt = "mount -o remount,r" + (rw?"w":"o") + " `cat /proc/mounts | grep /system | sed -e 's: .*::'` /system && cat /proc/mounts | grep /system";
+            Command cmd = new CommandCapture(0, mnt);
+            Logger.LogVerbose("RootManager.mountSystem(" + rw + "): " + mnt);
+            Shell.runRootCommand(cmd);
+            cmd.waitForFinish();
+            return true;
         } catch (Exception e) {
             Logger.LogError("Unable to mount system", e);
             return false;
         }
-        return true;
     }
 
     public static boolean isSystemMounted() {
+        if(!Preferences.Pref_Root) return false;
+        try {
+            for(String s : RootTools.sendShell("cat /proc/mounts | grep /system", 1000))
+                if(s.contains("rw"))
+                    return true;
+            return false;
+        } catch (Exception e) {
+            Logger.LogError("Unable to tell if /system is mounted.", e);
+            return false;
+        }
+    }
+    private static boolean isSystemMountedOld() {
         OpenFile f = new OpenFile("/proc/mounts");
-        if(f == null) return false;
+        if(f == null || !f.exists()) {
+            Logger.LogWarning("/proc/mounts missing!");
+            return false;
+        }
         String data = f.readAscii();
-        if(data == null) return false;
+        if(data == null) {
+            Logger.LogWarning("/proc/mounts empty!");
+            return false;
+        }
         for (String s : data.split("\n")) {
             if (s.indexOf("/system") > -1)
+            {
+                Logger.LogVerbose("RootManager.isSystemMounted: System Line: " + s);
                 return s.indexOf("rw,") > -1;
+            }
         }
+        Logger.LogWarning("/proc/mounts does not contain /system!");
         return false;
     }
 
     public String getDriveLabel(String path, String sDefault) {
-        if (!rootEnabled)
+        if (!Preferences.Pref_Root)
             return sDefault;
         HashSet<String> blkid = execute("blkid `cat /proc/mounts | grep \""
                 + sDefault.replace("\"", "\\\"") + "\"`");
@@ -247,7 +278,7 @@ private void readFromProcess() {
     }
 
     public Process getSuProcess() throws IOException {
-        if (rootRequested && !rootEnabled)
+        if (rootRequested && !Preferences.Pref_Root)
             return null;
         if (myProcess == null || !singleProcess) {
             myProcess = new ProcessBuilder().command("su", "-c sh").redirectErrorStream(true)
@@ -303,17 +334,17 @@ else if (!busybox.startsWith("/"))
         return busybox;
     }
 
-    public boolean isRoot() {
-        return rootEnabled;
+    public static boolean isRoot() {
+        return Preferences.Pref_Root;
     }
 
-    public boolean isRootRequested() {
+    public static boolean isRootRequested() {
         return rootRequested;
     }
 
     @SuppressWarnings("unused")
     public void exitRoot() {
-        rootEnabled = false;
+        Preferences.Pref_Root = false;
         rootRequested = false;
         if (myProcess != null) // exit su
         {
@@ -437,7 +468,7 @@ public HashSet<String> execute(String cmd) {
     @SuppressWarnings("deprecation")
     public boolean requestRoot() {
         if (rootRequested)
-            return rootEnabled;
+            return Preferences.Pref_Root;
         try {
             Process suProcess = myProcess != null ? myProcess : Runtime.getRuntime().exec("su");
 
@@ -456,19 +487,19 @@ public boolean requestRoot() {
                 String currUid = is.readLine();
                 boolean exitSu = false;
                 if (null == currUid) {
-                    rootEnabled = false;
+                    Preferences.Pref_Root = false;
                     Logger.LogDebug("Can't get root access or denied by user");
                 } else if (true == currUid.contains("uid=0")) {
-                    rootEnabled = true;
+                    Preferences.Pref_Root = true;
                     exitSu = true;
                     Logger.LogDebug("Root access granted");
                 } else {
-                    rootEnabled = false;
+                    Preferences.Pref_Root = false;
                     exitSu = true;
                     Logger.LogDebug("Root access rejected: " + currUid);
                 }
 
-                if (!rootEnabled) {
+                if (!Preferences.Pref_Root) {
                     // mPollingThread.stop();
                 }
                 if (exitSu) {
@@ -482,13 +513,13 @@ public boolean requestRoot() {
             // stream (os) after su failed, meaning that the device is not
             // rooted
 
-            rootEnabled = false;
+            Preferences.Pref_Root = false;
             Logger.LogError("Root access rejected [" + e.getClass().getName() + "]", e);
         }
 
         rootRequested = true;
 
-        return rootEnabled;
+        return Preferences.Pref_Root;
     }
 
     public static boolean tryExecute(String... commands) {
diff --git a/src/org/brandroid/openmanager/util/ThumbnailCreator.java b/src/org/brandroid/openmanager/util/ThumbnailCreator.java
index c8f876a8..5c05c2dc 100644
--- a/src/org/brandroid/openmanager/util/ThumbnailCreator.java
+++ b/src/org/brandroid/openmanager/util/ThumbnailCreator.java
@@ -364,7 +364,7 @@ public static int getDefaultResourceId(OpenPath file, int mWidth, int mHeight) {
         final boolean useLarge = mWidth > 36;
         boolean hasKids = false;
         try {
-            if (file.isDirectory())
+            if (!file.requiresThread() && file.isDirectory() && file.canRead())
                 hasKids = file.getChildCount(false) > 0;
             else if (file instanceof OpenCursor)
                 hasKids = true;
@@ -710,9 +710,9 @@ public static SoftReference<Bitmap> generateThumb(final OpenApp app, final OpenP
 
                 BitmapFactory.Options options = new BitmapFactory.Options();
                 options.inJustDecodeBounds = true;
-                // BitmapFactory.decodeFile(file.getPath(), options);
-                options.inSampleSize = Math.min(options.outWidth / mWidth, options.outHeight
-                        / mHeight);
+                BitmapFactory.decodeFile(file.getPath(), options);
+                options.inSampleSize = Math.min(options.outWidth / mWidth,
+                        options.outHeight / mHeight);
                 options.inJustDecodeBounds = false;
                 options.inPurgeable = true;
                 bmp = BitmapFactory.decodeFile(file.getPath(), options);
diff --git a/src/org/brandroid/utils/Logger.java b/src/org/brandroid/utils/Logger.java
index e95deed0..31f2ff10 100644
--- a/src/org/brandroid/utils/Logger.java
+++ b/src/org/brandroid/utils/Logger.java
@@ -1,13 +1,7 @@
 
 package org.brandroid.utils;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
@@ -19,7 +13,6 @@
 import org.brandroid.openmanager.activities.OpenExplorer;
 import org.brandroid.openmanager.data.OpenFile;
 import org.brandroid.openmanager.fragments.DialogHandler;
-import org.brandroid.openmanager.util.FileManager;
 import org.json.JSONArray;
 
 import android.annotation.SuppressLint;
@@ -39,100 +32,7 @@ public class Logger {
                                                    // preferences
     public final static Integer MIN_DB_LEVEL = Log.INFO;
     public final static String LOG_KEY = "OpenExplorer";
-    public static final org.apache.commons.logging.Log VFSLogger = new org.apache.commons.logging.Log() {
-        
-        @Override
-        public void warn(Object arg0, Throwable arg1) {
-            Logger.LogWarning(arg0.toString(), arg1);
-        }
-        
-        @Override
-        public void warn(Object arg0) {
-            Logger.LogWarning(arg0.toString());
-        }
-        
-        @Override
-        public void trace(Object arg0, Throwable arg1) {
-            Logger.LogVerbose(arg0.toString(), arg1);
-        }
-        
-        @Override
-        public void trace(Object arg0) {
-            Logger.LogVerbose(arg0.toString());
-        }
-        
-        @Override
-        public boolean isWarnEnabled() {
-            return true;
-        }
-        
-        @Override
-        public boolean isTraceEnabled() {
-            // TODO Auto-generated method stub
-            return false;
-        }
-        
-        @Override
-        public boolean isInfoEnabled() {
-            return true;
-        }
-        
-        @Override
-        public boolean isFatalEnabled() {
-            return true;
-        }
-        
-        @Override
-        public boolean isErrorEnabled() {
-            return true;
-        }
-        
-        @Override
-        public boolean isDebugEnabled() {
-            return OpenExplorer.IS_DEBUG_BUILD;
-        }
-        
-        @Override
-        public void info(Object arg0, Throwable arg1) {
-            Logger.LogInfo(arg0.toString(), arg1);
-        }
-        
-        @Override
-        public void info(Object arg0) {
-            Logger.LogInfo(arg0.toString());
-        }
-        
-        @Override
-        public void fatal(Object arg0, Throwable arg1) {
-            Logger.LogError(arg0.toString(), arg1);
-        }
-        
-        @Override
-        public void fatal(Object arg0) {
-            Logger.LogError(arg0.toString());
-        }
-        
-        @Override
-        public void error(Object arg0, Throwable arg1) {
-            Logger.LogError(arg0.toString(), arg1);
-        }
-        
-        @Override
-        public void error(Object arg0) {
-            Logger.LogError(arg0.toString());
-        }
-        
-        @Override
-        public void debug(Object arg0, Throwable arg1) {
-            Logger.LogDebug(arg0.toString(), arg1);
-        }
-        
-        @Override
-        public void debug(Object arg0) {
-            Logger.LogDebug(arg0.toString());
-        }
-    };
-    
+
     private static Handler mDefaultHandler;
     private final static List<String> mLogsHandled = new ArrayList<String>();
     public static void setDefaultHandler(Handler handler) { mDefaultHandler = handler; }
@@ -169,7 +69,7 @@ protected void finalize() throws Throwable {
     }
 
     public static Boolean isLoggingEnabled() {
-        return bLoggingEnabled && DO_LOG;
+        return false; //bLoggingEnabled && DO_LOG;
     }
 
     public static void setLoggingEnabled(Boolean enable) {
@@ -285,9 +185,11 @@ public static int countLevel(int level) {
         return dbLog.countLevel(level);
     }
 
-    public static void clearDb() {
+    public static boolean clearDb() {
         if (dbLog != null)
             dbLog.clear();
+	else return false;
+	return true;
     }
 
     public static int LogError(String msg) {
diff --git a/src/org/brandroid/utils/MenuUtils.java b/src/org/brandroid/utils/MenuUtils.java
index 6ca0b23d..704cbd05 100644
--- a/src/org/brandroid/utils/MenuUtils.java
+++ b/src/org/brandroid/utils/MenuUtils.java
@@ -171,6 +171,8 @@ public static void setMenuEnabled(Menu menu, boolean enabled, int... ids) {
             item.setEnabled(enabled);
             if (enabled)
                 item.setVisible(true);
+            else
+                item.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         }
     }
 
diff --git a/src/org/brandroid/utils/SubmitStatsTask.java b/src/org/brandroid/utils/SubmitStatsTask.java
index 333b7d58..0d2e5724 100644
--- a/src/org/brandroid/utils/SubmitStatsTask.java
+++ b/src/org/brandroid/utils/SubmitStatsTask.java
@@ -8,6 +8,7 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Properties;
 import java.util.zip.GZIPOutputStream;
 
 import org.json.JSONException;
@@ -51,7 +52,7 @@ protected Void doInBackground(String... params) {
                 sb.append(",\"DeviceInfo\":" + device.toString());
             String pref_json = "";
             Boolean stats_changed = false;
-            for (String pref : "global,views,bookmarks".split(",")) {
+            for (String pref : "global,views,bookmarks,warn".split(",")) {
                 SharedPreferences sp = Preferences.getPreferences(pref);
                 if (sp == null || sp.getAll() == null)
                     continue;
@@ -91,6 +92,7 @@ protected Void doInBackground(String... params) {
             out.write(sb.toString().getBytes());
             out.flush();
             out.close();
+	    if(Logger.clearDb()) return null;
             uc.connect();
             if (uc.getResponseCode() == HttpURLConnection.HTTP_OK) {
                 BufferedReader br = new BufferedReader(new InputStreamReader(uc.getInputStream()));
@@ -130,12 +132,13 @@ protected Void doInBackground(String... params) {
         return null;
     }
 
-    private static JSONObject getDeviceInfo() {
+    public static JSONObject getDeviceInfo() {
         JSONObject ret = new JSONObject();
         try {
             ret.put("SDK", Build.VERSION.SDK_INT);
             ret.put("Language", Locale.getDefault().getDisplayLanguage());
             ret.put("Country", Locale.getDefault().getDisplayCountry());
+            ret.put("Lang", Utils.getLangCode());
             ret.put("Brand", Build.BRAND);
             ret.put("Manufacturer", Build.MANUFACTURER);
             ret.put("Model", Build.MODEL);
@@ -149,6 +152,9 @@ private static JSONObject getDeviceInfo() {
             ret.put("Display", Build.DISPLAY);
             ret.put("Fingerprint", Build.FINGERPRINT);
             ret.put("ID", Build.ID);
+            ret.put("Release", Build.VERSION.RELEASE);
+            ret.put("arch", System.getProperty("os.arch"));
+            ret.put("kernel", System.getProperty("os.version"));
         } catch (JSONException e) {
 
         }
diff --git a/src/org/brandroid/utils/ViewUtils.java b/src/org/brandroid/utils/ViewUtils.java
index 9dac5d54..4e4a4b5f 100644
--- a/src/org/brandroid/utils/ViewUtils.java
+++ b/src/org/brandroid/utils/ViewUtils.java
@@ -323,6 +323,37 @@ else if (v instanceof TextView)
         }
     }
 
+    public static void setViewsChecked(final Activity parent, final boolean checked, final int... ids) {
+        boolean ui = Thread.currentThread().equals(OpenExplorer.UiThread);
+        if (!ui)
+            OpenExplorer.post(new Runnable() {
+                public void run() {
+                    setViewsChecked(parent, checked, ids);
+                }
+            });
+        for (int id : ids) {
+            final View v = parent.findViewById(id);
+            if (v != null) {
+                if (v instanceof CheckedTextView)
+                    ((CheckedTextView)v).setChecked(checked);
+                else if (v instanceof CheckBox)
+                    ((CheckBox)v).setChecked(checked);
+                else if (v instanceof ImageView)
+                    ((ImageView)v)
+                            .setImageResource(checked ? android.R.drawable.checkbox_on_background
+                                    : android.R.drawable.checkbox_off_background);
+                else if (v instanceof TextView)
+                    ((TextView)v).setCompoundDrawables(
+                            parent
+                                    .getResources()
+                                    .getDrawable(
+                                            checked ? android.R.drawable.checkbox_on_background
+                                                    : android.R.drawable.checkbox_off_background),
+                            null, null, null);
+            }
+        }
+    }
+
     public static void setViewsVisibleNow(final View parent, final boolean visible,
             final int... ids) {
         if (parent == null)