From: Jorge Ruesga <jorge@ruesga.com>
Date: Mon, 7 Jan 2013 11:27:19 +0000 (-0800)
Subject: Merge "CMFM: Fix sync object" into cm-10.1
X-Git-Tag: android-x86-6.0-r1~520
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e8dd09a631ba98c05a19b42b2ba7188b0373b85;hp=0f6534b6982aea47402c4e58770394492ff41ccd;p=android-x86%2Fpackages-apps-CMFileManager.git

Merge "CMFM: Fix sync object" into cm-10.1
---

diff --git a/res/layout/fso_properties_dialog.xml b/res/layout/fso_properties_dialog.xml
index 7c4886b..45c3845 100644
--- a/res/layout/fso_properties_dialog.xml
+++ b/res/layout/fso_properties_dialog.xml
@@ -264,22 +264,72 @@
           android:textAppearance="@style/secondary_text_appearance" />
       </TableRow>
 
-      <!-- Date -->
+      <!-- Last Accessed Time -->
       <TableRow
         android:layout_marginLeft="@dimen/extra_large_margin"
         android:layout_marginRight="@dimen/extra_large_margin" >
 
         <TextView
-          android:id="@+id/fso_properties_date_label"
+          android:id="@+id/fso_properties_last_accessed_label"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
           android:gravity="left|center_vertical"
-          android:text="@string/fso_properties_dialog_date"
+          android:text="@string/fso_properties_dialog_last_accessed_date"
           android:textAppearance="@style/primary_text_appearance" />
 
         <TextView
-          android:id="@+id/fso_properties_date"
+          android:id="@+id/fso_properties_last_accessed"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
+          android:gravity="left|center_vertical"
+          android:singleLine="false"
+          android:textAppearance="@style/secondary_text_appearance" />
+      </TableRow>
+
+      <!-- Last Modified Time -->
+      <TableRow
+        android:layout_marginLeft="@dimen/extra_large_margin"
+        android:layout_marginRight="@dimen/extra_large_margin" >
+
+        <TextView
+          android:id="@+id/fso_properties_last_modified_label"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/default_margin"
+          android:gravity="left|center_vertical"
+          android:text="@string/fso_properties_dialog_last_modified_date"
+          android:textAppearance="@style/primary_text_appearance" />
+
+        <TextView
+          android:id="@+id/fso_properties_last_modified"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/default_margin"
+          android:paddingRight="@dimen/double_margin"
+          android:gravity="left|center_vertical"
+          android:singleLine="false"
+          android:textAppearance="@style/secondary_text_appearance" />
+      </TableRow>
+
+      <!-- Last Changed Time -->
+      <TableRow
+        android:layout_marginLeft="@dimen/extra_large_margin"
+        android:layout_marginRight="@dimen/extra_large_margin" >
+
+        <TextView
+          android:id="@+id/fso_properties_last_changed_label"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/default_margin"
+          android:gravity="left|center_vertical"
+          android:text="@string/fso_properties_dialog_last_changed_date"
+          android:textAppearance="@style/primary_text_appearance" />
+
+        <TextView
+          android:id="@+id/fso_properties_last_changed"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_margin="@dimen/default_margin"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8e2fdee..5d045d5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -255,8 +255,6 @@
   <string name="fso_properties_dialog_size">Velikost:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Obsah:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Poslední přístup:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Vlastník:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 912d613..50dff86 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -240,8 +240,6 @@
   <string name="fso_properties_dialog_size">Størrelse:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Indeholder:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Sidst tilgået:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Ejer:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 64e4754..771c466 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -244,8 +244,6 @@
   <string name="fso_properties_dialog_size">Größe:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Beinhaltet:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Letzter Zugriff:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Besitzer:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0749843..054735e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -252,8 +252,6 @@
   <string name="fso_properties_dialog_size">Μέγεθος:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Περιέχει:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Τελ. προσπέλαση:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Ιδιοκτήτης:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 757534b..e8ff2af 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -114,7 +114,6 @@
   <string name="fso_properties_dialog_link">Enlace:</string>
   <string name="fso_properties_dialog_size">Tamaño:</string>
   <string name="fso_properties_dialog_contains">Contenido:</string>
-  <string name="fso_properties_dialog_date">Último acceso:</string>
   <string name="fso_properties_dialog_owner">Propietario:</string>
   <string name="fso_properties_dialog_group">Grupo:</string>
   <string name="fso_properties_dialog_others">Otros:</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a613de7..6168b20 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -235,8 +235,6 @@
   <string name="fso_properties_dialog_size">Taille\u00A0:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Contenu\u00A0:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Dernier accès\u00A0:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Propriétaire\u00A0:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ff1c00e..b45cbb2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -237,8 +237,6 @@
     <string name="fso_properties_dialog_size">Méret:</string>
     <!-- Fso Properties Dialog * Contains Label -->
     <string name="fso_properties_dialog_contains">Tartalmaz:</string>
-    <!-- Fso Properties Dialog * Date Label -->
-    <string name="fso_properties_dialog_date">Utolsó hozzáférés:</string>
     <!-- Fso Properties Dialog * Owner Label -->
     <string name="fso_properties_dialog_owner">Tulajdonos:</string>
     <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b77007d..09aa6d2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -121,7 +121,6 @@
   <string name="fso_properties_dialog_link">Link:</string>
   <string name="fso_properties_dialog_size">Dimensioni:</string>
   <string name="fso_properties_dialog_contains">Contiene:</string>
-  <string name="fso_properties_dialog_date">Ultimo accesso:</string>
   <string name="fso_properties_dialog_owner">Proprietario:</string>
   <string name="fso_properties_dialog_group">Gruppo:</string>
   <string name="fso_properties_dialog_others">Altri:</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9fd13bf..b08fbac 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -255,8 +255,6 @@
   <string name="fso_properties_dialog_size">サイズ:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">内包数:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">最終アクセス:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">オーナー:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7458fd9..6309451 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -80,14 +80,14 @@
   <string name="msgs_unknown">Er is een fout opgetreden. De bewerking is niet succesvol voltooid.</string>
   <!-- When an operation requires elevated privileged (normally caused for the use of a
        non-privileged console) -->
-  <string name="msgs_insufficient_permissions">Deze bewerking heeft verhoogde machtigingen nodig. Probeer naar root-toegangsmodus om te schakelen.</string>
+  <string name="msgs_insufficient_permissions">Deze bewerking heeft verhoogde machtigingen nodig. Probeer naar root-toegangsmodus te schakelen.</string>
   <!-- The file or directory was not found -->
   <string name="msgs_file_not_found">Het bestand of de map is niet gevonden.</string>
   <!-- The command reference couldn't be created (not found or invalid definition)
        (normally caused by a development error) -->
   <string name="msgs_command_not_found">Het bewerkingscommando is niet gevonden of is ongeldig.</string>
   <!-- I/O exception -->
-  <string name="msgs_io_failed">Lees/schrijffout.</string>
+  <string name="msgs_io_failed">Lees-/schrijffout.</string>
   <!-- Operation timeout detected -->
   <string name="msgs_operation_timeout">Bewerkingstime-out.</string>
   <!-- The operation returns an invalid exit code -->
@@ -97,7 +97,7 @@
   <!-- An operation can't be cancelled -->
   <string name="msgs_operation_can_not_be_cancelled">De bewerking kan niet worden geannuleerd.</string>
   <!-- The operation requieres mount the file system prior to execute the command -->
-  <string name="msgs_read_only_filesystem">Het bestandssysteem is gekoppeld als alleen-schrijven. Probeer het bestandssysteem als beschrijfbaar te koppelen voorafgaand aan het uitvoeren van de bewerking.</string>
+  <string name="msgs_read_only_filesystem">Het bestandssysteem is gekoppeld als alleen-lezen. Probeer het bestandssysteem als beschrijfbaar te koppelen alvorens de bewerking uit te voeren.</string>
   <!-- Illegal argument (normally caused by a development error when calling internal api) -->
   <string name="msgs_illegal_argument">Ongeldig argument. Activering mislukt.</string>
   <!-- The operation will cause inconsistencies -->
@@ -109,7 +109,7 @@
   <string name="msgs_push_again_to_exit">Tik nogmaals om af te sluiten.</string>
 
   <!-- There is no registered application that can handle the mime-type -->
-  <string name="msgs_not_registered_app">Er is geen app geïnstalleerd om het geselecteerde type bestand te hanteren.</string>
+  <string name="msgs_not_registered_app">Er is geen app geïnstalleerd om het geselecteerde bestandstype te openen.</string>
 
   <!-- Overwrite files? -->
   <string name="msgs_overwrite_files">Een aantal bestanden bestaat al in de doelmap.\n\nOverschrijven?</string>
@@ -217,17 +217,17 @@
   <!-- Fso Properties * Not allowed message -->
   <string name="fso_properties_permissions_not_allowed_msg">Machtigingsbewerking is niet toegestaan in veilige modus. Tik om naar root-toegangsmodus te schakelen.</string>
   <!-- Fso Properties * Failed to change owner to fso -->
-  <string name="fso_properties_failed_to_change_owner_msg">De wijziging van eigenaar is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een eigenaarswijziging niet toe.</string>
+  <string name="fso_properties_failed_to_change_owner_msg">Het wijzigen van eigenaar is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een eigenaarswijziging niet toe.</string>
   <!-- Fso Properties * Failed to change group to fso -->
-  <string name="fso_properties_failed_to_change_group_msg">De wijziging van groep is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een groepswijziging niet toe.</string>
+  <string name="fso_properties_failed_to_change_group_msg">Het wijzigen van groep is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een groepswijziging niet toe.</string>
   <!-- Fso Properties * Failed to change group to fso -->
-  <string name="fso_properties_failed_to_change_permission_msg">De wijziging van machtigingen is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een wijziging van rechten niet toe.</string>
+  <string name="fso_properties_failed_to_change_permission_msg">Het wijzigen van machtigingen is mislukt.\n\nOm veiligheidsredenen staan sommige bestandssystemen, zoals op SD-kaarten, een wijziging van rechten niet toe.</string>
   <!-- Fso Properties Dialog * Title -->
   <string name="fso_properties_dialog_title">Eigenschappen</string>
   <!-- Fso Properties Dialog * Tab * Info -->
   <string name="fso_properties_dialog_tab_info">Info</string>
   <!-- Fso Properties Dialog * Tab * Permissions -->
-  <string name="fso_properties_dialog_tab_permissions">Rechten</string>
+  <string name="fso_properties_dialog_tab_permissions">Machtigingen</string>
   <!-- Fso Properties Dialog * Name Label -->
   <string name="fso_properties_dialog_name">Naam:</string>
   <!-- Fso Properties Dialog * Parent Folder Label -->
@@ -242,8 +242,6 @@
   <string name="fso_properties_dialog_size">Grootte:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Inhoud:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Recente toegang:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Eigenaar:</string>
   <!-- Fso Properties Dialog * Group Label -->
@@ -293,9 +291,9 @@
   <!-- Search * Confirm search -->
   <string name="search_few_characters_title">Zoeken bevestigen</string>
   <!-- Search * Some terms of the search are too small. The operation could be very costly -->
-  <string name="search_few_characters_msg">Sommige zoektermen hebben een klein aantal karakters. De bewerking zou te veel tijd of systeembronnen in beslag kunnen nemen.\n\nWil je doorgaan?</string>
+  <string name="search_few_characters_msg">Sommige zoektermen hebben een klein aantal karakters. De bewerking zou te veel tijd of systeembronnen in beslag kunnen nemen.\n\nWeet u zeker dat u door wilt gaan?</string>
   <!-- Search * Searching dialog title -->
-  <string name="searching">Een ogenblik a.u.b.\u2026</string>
+  <string name="searching">Een ogenblik a.u.b.</string>
   <!-- Search * Searching label -->
   <string name="searching_action_label">Bezig met zoeken</string>
 
@@ -313,7 +311,7 @@
   <!-- Editor * Editor is dirty, ask the user * Dialog title -->
   <string name="editor_dirty_ask_title">Afsluiten bevestigen</string>
   <!-- Editor * Editor is dirty, ask the user * Dialog message -->
-  <string name="editor_dirty_ask_msg">Er zijn onopgeslagen wijzigingen.\n\nAfsluiten zonder opslaan?</string>
+  <string name="editor_dirty_ask_msg">Het bestand is gewijzigd.\n\nAfsluiten zonder opslaan?</string>
   <!-- Editor * Save operation success -->
   <string name="editor_successfully_saved">Het bestand is succesvol opgeslagen.</string>
   <!-- Editor * Read-only file mode -->
@@ -384,9 +382,9 @@
   <!-- Waiting dialog * Initializing the dialog -->
   <string name="waiting_dialog_analizing_msg"><![CDATA[<b>Analyseren\u2026</b>]]></string>
   <!-- Extracting * Success message -->
-  <string name="msgs_extracting_success">Het uitpakken is succesvol afgerond. De gegevens zijn uitgepakt naar <xliff:g id="destination">%1$s</xliff:g>.</string>
+  <string name="msgs_extracting_success">Het uitpakken is succesvol voltooid. De gegevens zijn uitgepakt naar <xliff:g id="destination">%1$s</xliff:g>.</string>
   <!-- Compressing * Success message -->
-  <string name="msgs_compressing_success">Het comprimeren is succesvol afgerond. De gegevens zijn gecomprimeerd naar <xliff:g id="destination">%1$s</xliff:g>.</string>
+  <string name="msgs_compressing_success">Het comprimeren is succesvol voltooid. De gegevens zijn gecomprimeerd naar <xliff:g id="destination">%1$s</xliff:g>.</string>
 
   <!-- Actions Dialog * Title -->
   <string name="actions_dialog_title">Acties</string>
@@ -415,7 +413,7 @@
   <!-- Actions Dialog * Menu * Compress selection -->
   <string name="actions_menu_compress_selection">Selectie comprimeren</string>
   <!-- Actions Dialog * Menu * Create link -->
-  <string name="actions_menu_create_link">Verwijzing maken</string>
+  <string name="actions_menu_create_link">Symlink maken</string>
   <!-- Actions Dialog * Menu * Open -->
   <string name="actions_menu_open">Openen</string>
   <!-- Actions Dialog * Menu * Open with -->
@@ -444,7 +442,7 @@
   <string name="actions_menu_open_parent_folder">Bovenliggende map openen</string>
 
   <!-- Actions * Ask user prior to do an undone operation. Dialog message -->
-  <string name="actions_ask_undone_operation_msg">Deze actie kan niet ongedaan gemaakt worden. Weet u zeker dat u door wilt gaan?</string>
+  <string name="actions_ask_undone_operation_msg">Deze actie kan niet ongedaan worden gemaakt. Weet u zeker dat u door wilt gaan?</string>
 
   <!-- Enter Name Dialog * Label -->
   <string name="input_name_dialog_label">Naam:</string>
@@ -455,7 +453,7 @@
   <!-- Enter Name Dialog * Message * Invalid name -->
   <string name="input_name_dialog_message_invalid_name">Ongeldige naam. De namen \'.\' en \'..\' zijn niet toegestaan.</string>
   <!-- Enter Name Dialog * Message * Name exists -->
-  <string name="input_name_dialog_message_name_exists">De naam bestaat al.</string>
+  <string name="input_name_dialog_message_name_exists">Deze naam bestaat al.</string>
 
   <!-- Associations Dialog * Title -->
   <string name="associations_dialog_title">Gekoppelde apps</string>
@@ -543,7 +541,7 @@
   <!-- Preferences * General * Behaviour category -->
   <string name="pref_general_behaviour_category">Algemeen</string>
   <!-- Preferences * General * Case sensitive sort title -->
-  <string name="pref_case_sensitive_sort">Hoofdletter en kleine letter gebruiken bij sorteren</string>
+  <string name="pref_case_sensitive_sort">Hoofdlettergevoelig sorteren</string>
   <!-- Preferences * General *Disk usage warning level title -->
   <string name="pref_disk_usage_warning_level">Schijfgebruikswaarschuwing</string>
   <!-- Preferences * General * Disk usage warning level summary -->
@@ -553,7 +551,7 @@
   <!-- Preferences * General * Compute folder statistics title -->
   <string name="pref_compute_folder_statistics">Mapstatistieken berekenen</string>
   <!-- Preferences * General * Compute folder statistics summary on -->
-  <string name="pref_compute_folder_statistics_on">Let op! Het berekenen van mapstatistieken kost tijd en systeembronnen</string>
+  <string name="pref_compute_folder_statistics_on">Let op: het berekenen van mapstatistieken kost tijd en systeembronnen</string>
   <!-- Preferences * General * Use flinger detection -->
   <string name="pref_use_flinger">Veegbewegingen gebruiken</string>
   <!-- Preferences * General * Use flinger detection summary -->
@@ -567,23 +565,23 @@
   <!-- Preferences * General * Safe mode summary -->
   <string name="pref_access_mode_safe_summary">Veilige modus\n\nDe app werkt zonder machtigingen en alleen opslagvolumes (SD-kaart en USB) zijn toegankelijk</string>
   <!-- Preferences * General * Prompt user mode -->
-  <string name="pref_access_mode_prompt">Naar toegangsmodus vragen</string>
+  <string name="pref_access_mode_prompt">Vragen naar toegangsmodus</string>
   <!-- Preferences * General * Prompt user mode summary -->
-  <string name="pref_access_mode_prompt_summary">Naar toegangsmodus vragen\n\nDe app heeft volledige toegang tot het bestandssysteem, maar zal vragen om toestemming voorafgaand aan acties waarvoor machtigingen nodig zijn</string>
+  <string name="pref_access_mode_prompt_summary">Vragen naar toegangsmodus\n\nDe app heeft volledige toegang tot het bestandssysteem, maar zal toestemming vragen voor bewerking waarvoor machtigingen nodig zijn</string>
   <!-- Preferences * General * Root access mode -->
   <string name="pref_access_mode_root">Root-toegangsmodus</string>
   <!-- Preferences * General * Root access mode summary -->
-  <string name="pref_access_mode_root_summary">Root-toegangsmodus\n\nLet op! Deze modus staat bewerkingen toe die het apparaat kunnen beschadingen. Het is je eigen verantwoordelijk om te zorgen dat een bewerking veilig is</string>
+  <string name="pref_access_mode_root_summary">Root-toegangsmodus\n\nLet op! Deze modus staat bewerkingen toe die het apparaat kunnen beschadingen. Het is uw eigen verantwoordelijk om te zorgen dat een bewerking veilig is</string>
   <!-- Preferences * Search * Results category -->
   <string name="pref_search_results_category">Resultaten</string>
   <!-- Preferences * Search * Show relevance widget -->
-  <string name="pref_show_relevance_widget">Relevantie widget tonen</string>
+  <string name="pref_show_relevance_widget">Relevantiepictogram tonen</string>
   <!-- Preferences * Search * Highlight search terms -->
   <string name="pref_highlight_terms">Zoektermen markeren</string>
   <!-- Preferences * Search * Sort results mode -->
-  <string name="pref_sort_search_results_mode">Resultatenmodus sorteren</string>
+  <string name="pref_sort_search_results_mode">Resultaten sorteren</string>
   <!-- Preferences * Search * Sort results mode. None -->
-  <string name="pref_sort_search_results_mode_none">Geen sortering</string>
+  <string name="pref_sort_search_results_mode_none">Niet sorteren</string>
   <!-- Preferences * Search * Sort results mode. None -->
   <string name="pref_sort_search_results_mode_name">Op naam</string>
   <!-- Preferences * Search * Sort results mode. Relevance -->
@@ -593,9 +591,9 @@
   <!-- Preferences * Search * Save search terms -->
   <string name="pref_save_search_terms">Zoektermen opslaan</string>
   <!-- Preferences * Search * Save search terms summary on -->
-  <string name="pref_save_search_terms_on">Zoektermen zullen worden opgeslagen en gebruikt als suggesties voor toekomstige zoekopdrachten</string>
+  <string name="pref_save_search_terms_on">Zoektermen worden opgeslagen en gebruikt als suggesties voor toekomstige zoekopdrachten</string>
   <!-- Preferences * Search * Save search terms summary off -->
-  <string name="pref_save_search_terms_off">Zoektermen zullen niet worden opgeslagen</string>
+  <string name="pref_save_search_terms_off">Zoektermen worden niet opgeslagen</string>
   <!-- Preferences * Search * Remove saved search terms -->
   <string name="pref_remove_saved_search_terms">Opgeslagen zoektermen verwijderen</string>
   <!-- Preferences * Search * Remove saved search terms summary -->
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 4efa616..c32e2e5 100755
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -116,7 +116,6 @@
     <string name="fso_properties_dialog_link">Vínculo:</string>
     <string name="fso_properties_dialog_size">Tamanho:</string>
     <string name="fso_properties_dialog_contains">Contém:</string>
-    <string name="fso_properties_dialog_date">Último acesso:</string>
     <string name="fso_properties_dialog_owner">Proprietário:</string>
     <string name="fso_properties_dialog_group">Grupo:</string>
     <string name="fso_properties_dialog_others">Outros:</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0d1cb33..27f9613 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -256,8 +256,6 @@
   <string name="fso_properties_dialog_size">Tamanho:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Contém:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Último acesso:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Dono:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f2d174f..9a52a18 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -110,7 +110,6 @@
   <string name="fso_properties_dialog_link">Link:</string>
   <string name="fso_properties_dialog_size">Dimensiune:</string>
   <string name="fso_properties_dialog_contains">Conţin:</string>
-  <string name="fso_properties_dialog_date">Ultima accesare:</string>
   <string name="fso_properties_dialog_owner">Proprietar:</string>
   <string name="fso_properties_dialog_group">Grup:</string>
   <string name="fso_properties_dialog_others">Altele:</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ece85a7..28f7d33 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -139,7 +139,6 @@
   <string name="fso_properties_dialog_link">Ссылка:</string>
   <string name="fso_properties_dialog_size">Размер:</string>
   <string name="fso_properties_dialog_contains">Содержит:</string>
-  <string name="fso_properties_dialog_date">Посл. доступ:</string>
   <string name="fso_properties_dialog_owner">Владелец:</string>
   <string name="fso_properties_dialog_group">Группа:</string>
   <string name="fso_properties_dialog_others">Другое:</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 23e322a..c7478a1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -252,8 +252,6 @@
   <string name="fso_properties_dialog_size">大小:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">包含:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">最后一次访问:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">拥有者:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4b1a243..070e3dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -276,8 +276,12 @@
   <string name="fso_properties_dialog_size">Size:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Contains:</string>
-  <!-- Fso Properties Dialog * Date Label -->
-  <string name="fso_properties_dialog_date">Last access:</string>
+  <!-- Fso Properties Dialog * Last Accessed Time Label -->
+  <string name="fso_properties_dialog_last_accessed_date">Accessed:</string>
+  <!-- Fso Properties Dialog * Last Modified Time Label -->
+  <string name="fso_properties_dialog_last_modified_date">Modified:</string>
+  <!-- Fso Properties Dialog * Last Changed Time -->
+  <string name="fso_properties_dialog_last_changed_date">Changed:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Owner:</string>
   <!-- Fso Properties Dialog * Group Label -->
diff --git a/res/xml/command_list.xml b/res/xml/command_list.xml
index c473c28..5d27be5 100644
--- a/res/xml/command_list.xml
+++ b/res/xml/command_list.xml
@@ -48,7 +48,7 @@
   <command commandId="id" commandPath="/system/bin/id" commandArgs="-Gn" />
 
   <!-- FileSystem -->
-  <command commandId="mount" commandPath="/system/bin/mount" commandArgs="-o %1$s,remount -t auto %2$s %3$s" />
+  <command commandId="mount" commandPath="/system/bin/mount" commandArgs="-o %1$s,remount -t %2$s %3$s" />
   <command commandId="mountpointinfo" commandPath="/system/bin/mount" commandArgs="" />
 
   <!-- List/Find/Info -->
diff --git a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
index 87c38c8..95fa193 100644
--- a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
@@ -253,7 +253,12 @@ public class FsoPropertiesDialog
         this.mTvSize = (TextView)contentView.findViewById(R.id.fso_properties_size);
         View vContatinsRow = contentView.findViewById(R.id.fso_properties_contains_row);
         this.mTvContains = (TextView)contentView.findViewById(R.id.fso_properties_contains);
-        TextView tvDate = (TextView)contentView.findViewById(R.id.fso_properties_date);
+        TextView tvLastAccessedTime =
+                (TextView)contentView.findViewById(R.id.fso_properties_last_accessed);
+        TextView tvLastModifiedTime =
+                (TextView)contentView.findViewById(R.id.fso_properties_last_modified);
+        TextView tvLastChangedTime =
+                (TextView)contentView.findViewById(R.id.fso_properties_last_changed);
         this.mSpnOwner = (Spinner)contentView.findViewById(R.id.fso_properties_owner);
         this.mSpnGroup = (Spinner)contentView.findViewById(R.id.fso_properties_group);
         this.mInfoMsgView = (TextView)contentView.findViewById(R.id.fso_info_msg);
@@ -291,7 +296,21 @@ public class FsoPropertiesDialog
         this.mTvSize.setText(size);
         this.mTvContains.setText("-");  //$NON-NLS-1$
         DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-        tvDate.setText(df.format(this.mFso.getLastModifiedTime()));
+        try {
+            tvLastAccessedTime.setText(df.format(this.mFso.getLastAccessedTime()));
+        } catch (Exception e) {
+            tvLastAccessedTime.setText("-");  //$NON-NLS-1$
+        }
+        try {
+            tvLastModifiedTime.setText(df.format(this.mFso.getLastModifiedTime()));
+        } catch (Exception e) {
+            tvLastModifiedTime.setText("-");  //$NON-NLS-1$
+        }
+        try {
+            tvLastChangedTime.setText(df.format(this.mFso.getLastChangedTime()));
+        } catch (Exception e) {
+            tvLastChangedTime.setText("-");  //$NON-NLS-1$
+        }
 
         //- Permissions
         String loadingMsg = this.mContext.getString(R.string.loading_message);
@@ -1156,9 +1175,17 @@ public class FsoPropertiesDialog
         theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$
         v = this.mContentView.findViewById(R.id.fso_properties_contains);
         theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$
-        v = this.mContentView.findViewById(R.id.fso_properties_date_label);
+        v = this.mContentView.findViewById(R.id.fso_properties_last_accessed_label);
+        theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$
+        v = this.mContentView.findViewById(R.id.fso_properties_last_accessed);
+        theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$
+        v = this.mContentView.findViewById(R.id.fso_properties_last_modified_label);
+        theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$
+        v = this.mContentView.findViewById(R.id.fso_properties_last_modified);
+        theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$
+        v = this.mContentView.findViewById(R.id.fso_properties_last_changed_label);
         theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$
-        v = this.mContentView.findViewById(R.id.fso_properties_date);
+        v = this.mContentView.findViewById(R.id.fso_properties_last_changed);
         theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$
 
         v = this.mContentView.findViewById(R.id.fso_properties_owner_label);
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java b/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java
index b674d98..6ab3017 100644
--- a/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java
@@ -149,6 +149,9 @@ public class DirectoryInlineAutocompleteTextView
 
         //Get the new parent
         String newParent = FileHelper.getParentDir(new File(value));
+        if (newParent == null) {
+            newParent = FileHelper.ROOT_DIRECTORY;
+        }
         if (!newParent.endsWith(File.separator)) {
             newParent += File.separator;
         }
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
index f6e7139..afcf457 100644
--- a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
@@ -63,6 +63,7 @@ import com.cyanogenmod.filemanager.ui.widgets.FlingerListView.OnItemFlingerRespo
 import com.cyanogenmod.filemanager.util.CommandHelper;
 import com.cyanogenmod.filemanager.util.DialogHelper;
 import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.ExceptionUtil.OnRelaunchCommandResult;
 import com.cyanogenmod.filemanager.util.FileHelper;
 import com.cyanogenmod.filemanager.util.StorageHelper;
 
@@ -828,7 +829,7 @@ public class NavigationView extends RelativeLayout implements
                                     }
                                 }
 
-                                //Capture exception
+                                //Capture exception (attach task, and use listener to do the anim)
                                 ExceptionUtil.attachAsyncTask(
                                     ex,
                                     new AsyncTask<Object, Integer, Boolean>() {
@@ -845,16 +846,31 @@ public class NavigationView extends RelativeLayout implements
                                                                 files, addToHistory,
                                                                 isNewHistory, hasChanged,
                                                                 searchInfo, fNewDir, scrollTo);
-
-                                                        // Do animation
-                                                        fadeEfect(false);
                                                     }
                                                 });
                                             return Boolean.TRUE;
                                         }
-
                                     });
-                                ExceptionUtil.translateException(getContext(), ex);
+                                final OnRelaunchCommandResult exListener =
+                                        new OnRelaunchCommandResult() {
+                                    @Override
+                                    public void onSuccess() {
+                                        // Do animation
+                                        fadeEfect(false);
+                                    }
+                                    @Override
+                                    public void onFailed(Throwable cause) {
+                                        // Do animation
+                                        fadeEfect(false);
+                                    }
+                                    @Override
+                                    public void onCancelled() {
+                                        // Do animation
+                                        fadeEfect(false);
+                                    }
+                                };
+                                ExceptionUtil.translateException(
+                                        getContext(), ex, false, true, exListener);
                             }
                             return null;
                         }