Merge lp:~renatofilho/ubuntu-filemanager-app/import-contact into lp:ubuntu-filemanager-app

[Renato Araujo Oliveira Filho]

Implemented support for importing any kind of file.

[lp:~renatofilho/ubuntu-filemanager-app/import-contact]

556. By Renato Araujo Oliveira Filho on 2016-07-14

Accept any kind of file as destination.

557. By Renato Araujo Oliveira Filho on 2016-07-15

Increase index to make sure a new file name is created.

[Ken VanDine (ken-vandine)]

Looks good. I don't know much about the filemanager code base, but at least the content-hub portions look fine.

review: Approve

[lp:~renatofilho/ubuntu-filemanager-app/import-contact]

558. By Renato Araujo Oliveira Filho on 2016-07-15

Use plural form on import finish dialog.

559. By Renato Araujo Oliveira Filho on 2016-07-15

Refresh view on page activated.

560. By Renato Araujo Oliveira Filho on 2016-07-15

Fixed typo.

561. By Renato Araujo Oliveira Filho on 2016-07-15

Avoid create directories with space in the end.

[Carlos Jose Mazieri (carlos-mazieri)]

The code looks OK to me. Thanks.

review: Approve

[lp:~renatofilho/ubuntu-filemanager-app/import-contact]

562. By Renato Araujo Oliveira Filho on 2016-07-18

Does not use predictive text on input dialog to keep the "Ok" button enabled while entering the text.

563. By Renato Araujo Oliveira Filho on 2016-07-18

Disable "Create folder" button if current path is not writable.

564. By Renato Araujo Oliveira Filho on 2016-07-18

Add comments

565. By Renato Araujo Oliveira Filho on 2016-07-18

Change the active folder to the folder selected during the import process.

566. By Renato Araujo Oliveira Filho on 2016-07-18

Changed "imported" dialog visual.

567. By Renato Araujo Oliveira Filho on 2016-07-18

Make sure that full access change get propagated to all pages.

568. By Renato Araujo Oliveira Filho on 2016-07-18

Update pot file.

569. By Renato Araujo Oliveira Filho on 2016-07-18

Does not show "create folder" button if directory is not writable.

570. By Renato Araujo Oliveira Filho on 2016-07-18

Go inside of the recent created folder.

571. By Renato Araujo Oliveira Filho on 2016-07-18

Does not upercase inital letter on input dialog.

572. By Renato Araujo Oliveira Filho on 2016-07-18

Avoid stole keyboard focus by NetAuthenticationHandler dialog.

573. By Renato Araujo Oliveira Filho on 2016-07-19

Make current Path darker than the visited one.

[Bill Filler (bfiller)]

works as expected

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-10 22:37:45 +0000
+++ CMakeLists.txt	2016-07-19 17:00:39 +0000
@@ -18,7 +18,7 @@
 set(ICON_FILE filemanager64.png)
 set(AUTOPILOT_DIR ${APP_NAME})
 set(EXEC "${APP_NAME}")
-set(CONTENT_HUB_EXPORTER hub-exporter.json)
+set(CONTENT_HUB_JSON content-hub.json)
 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
 
 # global FILE definitions for stat system call, it works for any sub module
@@ -71,7 +71,7 @@
 
     add_custom_target(com_ubuntu_calendar_CLICKFiles ALL SOURCES ${CLICK_FILES})
 
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json filemanager.apparmor ${CONTENT_HUB_EXPORTER} DESTINATION ${CMAKE_INSTALL_PREFIX})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json filemanager.apparmor ${CONTENT_HUB_JSON} DESTINATION ${CMAKE_INSTALL_PREFIX})
 
         set(UPSTREAM_LIBS_DIR ${CMAKE_BINARY_DIR}/upstream-libs)
 

=== renamed file 'hub-exporter.json' => 'content-hub.json'
--- hub-exporter.json	2014-10-30 21:20:11 +0000
+++ content-hub.json	2016-07-19 17:00:39 +0000
@@ -1,4 +1,18 @@
 {
+    "destination": [
+        "pictures",
+        "documents",
+        "videos",
+        "contacts",
+        "music"
+    ],
+    "share": [
+        "pictures",
+        "documents",
+        "videos",
+        "contacts",
+        "music"
+    ],
     "source": [
         "pictures",
         "documents",

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-04-07 17:27:53 +0000
+++ manifest.json.in	2016-07-19 17:00:39 +0000
@@ -7,7 +7,7 @@
         "filemanager": {
             "apparmor": "filemanager.apparmor",
             "desktop": "com.ubuntu.filemanager.desktop",
-            "content-hub": "hub-exporter.json"
+            "content-hub": "content-hub.json"
         }
     },
     "icon": "filemanager64.png",

=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot	2016-06-09 11:17:57 +0000
+++ po/com.ubuntu.filemanager.pot	2016-07-19 17:00:39 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the  package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-09 12:17+0100\n"
+"POT-Creation-Date: 2016-07-18 19:55-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,402 +18,927 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../armhf-build/po/com.ubuntu.filemanager.desktop.in.in.h:1
+#: ../qbuild/po/com.ubuntu.filemanager.desktop.in.in.h:1
+#: ../sbuild/po/com.ubuntu.filemanager.desktop.in.in.h:1
+#: ../ssbuild/po/com.ubuntu.filemanager.desktop.in.in.h:1
+#: com.ubuntu.filemanager.desktop.in.in.h:1
+msgid "File Manager"
+msgstr ""
+
+#: ../sbuild/package/qml/components/FolderIconView.qml:57
+#: ../sbuild/package/qml/components/FolderListView.qml:36
+#: ../sbuild/src/app/qml/components/FolderIconView.qml:57
+#: ../sbuild/src/app/qml/components/FolderListView.qml:36
 #: ../src/app/qml/components/FolderIconView.qml:57
 #: ../src/app/qml/components/FolderListView.qml:36
+#: ../ssbuild/package/qml/components/FolderIconView.qml:57
+#: ../ssbuild/package/qml/components/FolderListView.qml:36
+#: ../ssbuild/src/app/qml/components/FolderIconView.qml:57
+#: ../ssbuild/src/app/qml/components/FolderListView.qml:36
 #, qt-format
 msgid "%1 (%2 file)"
 msgid_plural "%1 (%2 files)"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../sbuild/package/qml/components/PathHistoryRow.qml:89
+#: ../sbuild/package/qml/ui/FolderListPage.qml:872
+#: ../sbuild/src/app/qml/components/PathHistoryRow.qml:89
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:875
 #: ../src/app/qml/components/PathHistoryRow.qml:89
-#: ../src/app/qml/ui/FolderListPage.qml:852
+#: ../src/app/qml/ui/FolderListPage.qml:875
+#: ../ssbuild/package/qml/components/PathHistoryRow.qml:89
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:858
+#: ../ssbuild/src/app/qml/components/PathHistoryRow.qml:89
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:858
 msgid "Device"
 msgstr ""
 
+#: ../sbuild/package/qml/components/PlacesSidebar.qml:54
+#: ../sbuild/package/qml/ui/FolderListPage.qml:31
+#: ../sbuild/package/qml/ui/PlacesPage.qml:31
+#: ../sbuild/package/qml/ui/PlacesPopover.qml:102
+#: ../sbuild/src/app/qml/components/PlacesSidebar.qml:54
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:31
+#: ../sbuild/src/app/qml/ui/PlacesPage.qml:31
+#: ../sbuild/src/app/qml/ui/PlacesPopover.qml:102
 #: ../src/app/qml/components/PlacesSidebar.qml:54
-#: ../src/app/qml/ui/FolderListPage.qml:30 ../src/app/qml/ui/PlacesPage.qml:31
+#: ../src/app/qml/ui/FolderListPage.qml:31 ../src/app/qml/ui/PlacesPage.qml:31
 #: ../src/app/qml/ui/PlacesPopover.qml:102
+#: ../ssbuild/package/qml/components/PlacesSidebar.qml:54
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:30
+#: ../ssbuild/package/qml/ui/PlacesPage.qml:31
+#: ../ssbuild/package/qml/ui/PlacesPopover.qml:102
+#: ../ssbuild/src/app/qml/components/PlacesSidebar.qml:54
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:30
+#: ../ssbuild/src/app/qml/ui/PlacesPage.qml:31
+#: ../ssbuild/src/app/qml/ui/PlacesPopover.qml:102
 msgid "Places"
 msgstr ""
 
+#: ../sbuild/package/qml/content-hub/FileOpener.qml:27
+#: ../sbuild/src/app/qml/content-hub/FileOpener.qml:27
 #: ../src/app/qml/content-hub/FileOpener.qml:27
+#: ../ssbuild/package/qml/content-hub/FileOpener.qml:27
+#: ../ssbuild/src/app/qml/content-hub/FileOpener.qml:27
 msgid "Open with"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:80 ../src/app/qml/ui/FolderListPage.qml:112
+#: ../sbuild/package/qml/filemanager.qml:83
+#: ../sbuild/package/qml/ui/FolderListPage.qml:114
+#: ../sbuild/package/qml/ui/SettingsSheet.qml:33
+#: ../sbuild/src/app/qml/filemanager.qml:83
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:114
+#: ../sbuild/src/app/qml/ui/SettingsSheet.qml:33
+#: ../src/app/qml/filemanager.qml:83 ../src/app/qml/ui/FolderListPage.qml:114
 #: ../src/app/qml/ui/SettingsSheet.qml:33
+#: ../ssbuild/package/qml/filemanager.qml:81
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:112
+#: ../ssbuild/package/qml/ui/SettingsSheet.qml:33
+#: ../ssbuild/src/app/qml/filemanager.qml:81
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:112
+#: ../ssbuild/src/app/qml/ui/SettingsSheet.qml:33
 msgid "Settings"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:81
+#: ../sbuild/package/qml/filemanager.qml:84
+#: ../sbuild/src/app/qml/filemanager.qml:84 ../src/app/qml/filemanager.qml:84
+#: ../ssbuild/package/qml/filemanager.qml:82
+#: ../ssbuild/src/app/qml/filemanager.qml:82
 msgid "Change app settings"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:386
+#: ../sbuild/package/qml/filemanager.qml:295
+#: ../sbuild/package/qml/ui/FolderListPage.qml:406
+#: ../sbuild/package/qml/ui/ViewPopover.qml:70
+#: ../sbuild/src/app/qml/filemanager.qml:287
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:409
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:70
+#: ../src/app/qml/filemanager.qml:287 ../src/app/qml/ui/FolderListPage.qml:409
 #: ../src/app/qml/ui/ViewPopover.qml:70
+#: ../ssbuild/package/qml/filemanager.qml:291
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:392
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:70
+#: ../ssbuild/src/app/qml/filemanager.qml:291
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:392
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:70
 msgid "Icons"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:402
+#: ../sbuild/package/qml/filemanager.qml:295
+#: ../sbuild/package/qml/ui/FolderListPage.qml:422
+#: ../sbuild/package/qml/ui/ViewPopover.qml:71
+#: ../sbuild/src/app/qml/filemanager.qml:287
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:425
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:71
+#: ../src/app/qml/filemanager.qml:287 ../src/app/qml/ui/FolderListPage.qml:425
 #: ../src/app/qml/ui/ViewPopover.qml:71
+#: ../ssbuild/package/qml/filemanager.qml:291
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:408
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:71
+#: ../ssbuild/src/app/qml/filemanager.qml:291
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:408
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:71
 msgid "List"
 msgstr ""
 
+#: ../sbuild/package/qml/filemanager.qml:324
+#: ../sbuild/src/app/qml/filemanager.qml:316
+#: ../src/app/qml/filemanager.qml:316
+#, qt-format
+msgid "File %1"
+msgstr ""
+
+#: ../sbuild/package/qml/filemanager.qml:324
+#: ../sbuild/src/app/qml/filemanager.qml:316
+#: ../src/app/qml/filemanager.qml:316
+#, qt-format
+msgid "%1 Files"
+msgstr ""
+
+#: ../sbuild/package/qml/filemanager.qml:325
+#: ../sbuild/src/app/qml/filemanager.qml:317
+#: ../src/app/qml/filemanager.qml:317
+#, qt-format
+msgid "Saved to: %1"
+msgstr ""
+
+#: ../sbuild/package/qml/ui/AuthenticationDialog.qml:25
+#: ../sbuild/package/qml/ui/NetAuthenticationDialog.qml:26
+#: ../sbuild/src/app/qml/ui/AuthenticationDialog.qml:25
+#: ../sbuild/src/app/qml/ui/NetAuthenticationDialog.qml:26
 #: ../src/app/qml/ui/AuthenticationDialog.qml:25
 #: ../src/app/qml/ui/NetAuthenticationDialog.qml:26
+#: ../ssbuild/package/qml/ui/AuthenticationDialog.qml:25
+#: ../ssbuild/package/qml/ui/NetAuthenticationDialog.qml:26
+#: ../ssbuild/src/app/qml/ui/AuthenticationDialog.qml:25
+#: ../ssbuild/src/app/qml/ui/NetAuthenticationDialog.qml:26
 msgid "Authentication required"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/AuthenticationDialog.qml:27
+#: ../sbuild/src/app/qml/ui/AuthenticationDialog.qml:27
 #: ../src/app/qml/ui/AuthenticationDialog.qml:27
+#: ../ssbuild/package/qml/ui/AuthenticationDialog.qml:27
+#: ../ssbuild/src/app/qml/ui/AuthenticationDialog.qml:27
 msgid "Password is required to access all files"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/AuthenticationDialog.qml:39
+#: ../sbuild/src/app/qml/ui/AuthenticationDialog.qml:39
 #: ../src/app/qml/ui/AuthenticationDialog.qml:39
+#: ../ssbuild/package/qml/ui/AuthenticationDialog.qml:39
+#: ../ssbuild/src/app/qml/ui/AuthenticationDialog.qml:39
 msgid "password"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/AuthenticationDialog.qml:49
+#: ../sbuild/package/qml/ui/ConfirmDialog.qml:31
+#: ../sbuild/package/qml/ui/ConfirmDialogWithInput.qml:49
+#: ../sbuild/package/qml/ui/FolderListPage.qml:706
+#: ../sbuild/package/qml/ui/NotifyDialog.qml:25
+#: ../sbuild/src/app/qml/ui/AuthenticationDialog.qml:49
+#: ../sbuild/src/app/qml/ui/ConfirmDialog.qml:31
+#: ../sbuild/src/app/qml/ui/ConfirmDialogWithInput.qml:49
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:709
+#: ../sbuild/src/app/qml/ui/NotifyDialog.qml:25
 #: ../src/app/qml/ui/AuthenticationDialog.qml:49
 #: ../src/app/qml/ui/ConfirmDialog.qml:31
-#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:47
-#: ../src/app/qml/ui/FolderListPage.qml:686
+#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:49
+#: ../src/app/qml/ui/FolderListPage.qml:709
 #: ../src/app/qml/ui/NotifyDialog.qml:25
+#: ../ssbuild/package/qml/ui/AuthenticationDialog.qml:49
+#: ../ssbuild/package/qml/ui/ConfirmDialog.qml:31
+#: ../ssbuild/package/qml/ui/ConfirmDialogWithInput.qml:47
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:692
+#: ../ssbuild/package/qml/ui/NotifyDialog.qml:25
+#: ../ssbuild/src/app/qml/ui/AuthenticationDialog.qml:49
+#: ../ssbuild/src/app/qml/ui/ConfirmDialog.qml:31
+#: ../ssbuild/src/app/qml/ui/ConfirmDialogWithInput.qml:47
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:692
+#: ../ssbuild/src/app/qml/ui/NotifyDialog.qml:25
 msgid "OK"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/AuthenticationDialog.qml:61
+#: ../sbuild/package/qml/ui/ConfirmDialog.qml:41
+#: ../sbuild/package/qml/ui/ConfirmDialogWithInput.qml:59
+#: ../sbuild/package/qml/ui/FileActionDialog.qml:45
+#: ../sbuild/package/qml/ui/FileOperationProgressDialog.qml:44
+#: ../sbuild/package/qml/ui/FolderListPage.qml:384
+#: ../sbuild/package/qml/ui/FolderListPage.qml:697
+#: ../sbuild/package/qml/ui/FolderListPage.qml:764
+#: ../sbuild/package/qml/ui/GoToDialog.qml:67
+#: ../sbuild/package/qml/ui/NetAuthenticationDialog.qml:108
+#: ../sbuild/src/app/qml/ui/AuthenticationDialog.qml:61
+#: ../sbuild/src/app/qml/ui/ConfirmDialog.qml:41
+#: ../sbuild/src/app/qml/ui/ConfirmDialogWithInput.qml:59
+#: ../sbuild/src/app/qml/ui/FileActionDialog.qml:45
+#: ../sbuild/src/app/qml/ui/FileOperationProgressDialog.qml:44
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:387
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:700
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:767
+#: ../sbuild/src/app/qml/ui/GoToDialog.qml:67
+#: ../sbuild/src/app/qml/ui/NetAuthenticationDialog.qml:108
 #: ../src/app/qml/ui/AuthenticationDialog.qml:61
 #: ../src/app/qml/ui/ConfirmDialog.qml:41
-#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:57
+#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:59
 #: ../src/app/qml/ui/FileActionDialog.qml:45
 #: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
-#: ../src/app/qml/ui/FolderListPage.qml:364
-#: ../src/app/qml/ui/FolderListPage.qml:677
-#: ../src/app/qml/ui/FolderListPage.qml:744 ../src/app/qml/ui/GoToDialog.qml:67
+#: ../src/app/qml/ui/FolderListPage.qml:387
+#: ../src/app/qml/ui/FolderListPage.qml:700
+#: ../src/app/qml/ui/FolderListPage.qml:767
+#: ../src/app/qml/ui/GoToDialog.qml:67
 #: ../src/app/qml/ui/NetAuthenticationDialog.qml:108
+#: ../ssbuild/package/qml/ui/AuthenticationDialog.qml:61
+#: ../ssbuild/package/qml/ui/ConfirmDialog.qml:41
+#: ../ssbuild/package/qml/ui/ConfirmDialogWithInput.qml:57
+#: ../ssbuild/package/qml/ui/FileActionDialog.qml:45
+#: ../ssbuild/package/qml/ui/FileOperationProgressDialog.qml:44
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:370
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:683
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:750
+#: ../ssbuild/package/qml/ui/GoToDialog.qml:67
+#: ../ssbuild/package/qml/ui/NetAuthenticationDialog.qml:108
+#: ../ssbuild/src/app/qml/ui/AuthenticationDialog.qml:61
+#: ../ssbuild/src/app/qml/ui/ConfirmDialog.qml:41
+#: ../ssbuild/src/app/qml/ui/ConfirmDialogWithInput.qml:57
+#: ../ssbuild/src/app/qml/ui/FileActionDialog.qml:45
+#: ../ssbuild/src/app/qml/ui/FileOperationProgressDialog.qml:44
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:370
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:683
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:750
+#: ../ssbuild/src/app/qml/ui/GoToDialog.qml:67
+#: ../ssbuild/src/app/qml/ui/NetAuthenticationDialog.qml:108
 msgid "Cancel"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileActionDialog.qml:30
+#: ../sbuild/src/app/qml/ui/FileActionDialog.qml:30
 #: ../src/app/qml/ui/FileActionDialog.qml:30
+#: ../ssbuild/package/qml/ui/FileActionDialog.qml:30
+#: ../ssbuild/src/app/qml/ui/FileActionDialog.qml:30
 msgid "Choose action"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileActionDialog.qml:31
+#: ../sbuild/src/app/qml/ui/FileActionDialog.qml:31
 #: ../src/app/qml/ui/FileActionDialog.qml:31
+#: ../ssbuild/package/qml/ui/FileActionDialog.qml:31
+#: ../ssbuild/src/app/qml/ui/FileActionDialog.qml:31
 #, qt-format
 msgid "For file: %1"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileActionDialog.qml:35
+#: ../sbuild/src/app/qml/ui/FileActionDialog.qml:35
 #: ../src/app/qml/ui/FileActionDialog.qml:35
+#: ../ssbuild/package/qml/ui/FileActionDialog.qml:35
+#: ../ssbuild/src/app/qml/ui/FileActionDialog.qml:35
 msgid "Open"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:37
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:37
 #: ../src/app/qml/ui/FileDetailsPopover.qml:37
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:37
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:37
 msgid "Readable"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:40
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:40
 #: ../src/app/qml/ui/FileDetailsPopover.qml:40
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:40
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:40
 msgid "Writable"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:43
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:43
 #: ../src/app/qml/ui/FileDetailsPopover.qml:43
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:43
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:43
 msgid "Executable"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:91
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:91
 #: ../src/app/qml/ui/FileDetailsPopover.qml:91
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:91
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:91
 msgid "Path:"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:102
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:102
 #: ../src/app/qml/ui/FileDetailsPopover.qml:102
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:102
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:102
 msgid "Contents:"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:103
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:103
 #: ../src/app/qml/ui/FileDetailsPopover.qml:103
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:103
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:103
 msgid "Size:"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:112
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:112
 #: ../src/app/qml/ui/FileDetailsPopover.qml:112
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:112
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:112
 msgid "Accessed:"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:121
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:121
 #: ../src/app/qml/ui/FileDetailsPopover.qml:121
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:121
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:121
 msgid "Modified:"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileDetailsPopover.qml:130
+#: ../sbuild/src/app/qml/ui/FileDetailsPopover.qml:130
 #: ../src/app/qml/ui/FileDetailsPopover.qml:130
+#: ../ssbuild/package/qml/ui/FileDetailsPopover.qml:130
+#: ../ssbuild/src/app/qml/ui/FileDetailsPopover.qml:130
 msgid "Permissions:"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileOperationProgressDialog.qml:27
+#: ../sbuild/src/app/qml/ui/FileOperationProgressDialog.qml:27
 #: ../src/app/qml/ui/FileOperationProgressDialog.qml:27
+#: ../ssbuild/package/qml/ui/FileOperationProgressDialog.qml:27
+#: ../ssbuild/src/app/qml/ui/FileOperationProgressDialog.qml:27
 msgid "Operation in progress"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/FileOperationProgressDialog.qml:29
+#: ../sbuild/src/app/qml/ui/FileOperationProgressDialog.qml:29
 #: ../src/app/qml/ui/FileOperationProgressDialog.qml:29
+#: ../ssbuild/package/qml/ui/FileOperationProgressDialog.qml:29
+#: ../ssbuild/src/app/qml/ui/FileOperationProgressDialog.qml:29
 msgid "File operation"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:62
+#: ../sbuild/package/qml/ui/FolderListPage.qml:63
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:63
+#: ../src/app/qml/ui/FolderListPage.qml:63
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:62
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:62
 #, qt-format
 msgid "Paste %1 File"
 msgid_plural "Paste %1 Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:66
+#: ../sbuild/package/qml/ui/FolderListPage.qml:67
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:67
+#: ../src/app/qml/ui/FolderListPage.qml:67
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:66
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:66
 msgid "Paste files"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:74
+#: ../sbuild/package/qml/ui/FolderListPage.qml:75
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:75
+#: ../src/app/qml/ui/FolderListPage.qml:75
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:74
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:74
 msgid "Clear clipboard"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:84
-#: ../src/app/qml/ui/FolderListPage.qml:102
-#: ../src/app/qml/ui/FolderListPage.qml:614
+#: ../sbuild/package/qml/ui/FolderListPage.qml:85
+#: ../sbuild/package/qml/ui/FolderListPage.qml:104
+#: ../sbuild/package/qml/ui/FolderListPage.qml:634
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:85
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:104
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:637
+#: ../src/app/qml/ui/FolderListPage.qml:85
+#: ../src/app/qml/ui/FolderListPage.qml:104
+#: ../src/app/qml/ui/FolderListPage.qml:637
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:84
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:102
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:620
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:84
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:102
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:620
 msgid "Properties"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:93
+#: ../sbuild/package/qml/ui/FolderListPage.qml:94
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:94
+#: ../src/app/qml/ui/FolderListPage.qml:94
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:93
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:93
 msgid "New Folder"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:120
+#: ../sbuild/package/qml/ui/FolderListPage.qml:122
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:122
+#: ../src/app/qml/ui/FolderListPage.qml:122
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:120
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:120
 msgid "Go To"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:127
+#: ../sbuild/package/qml/ui/FolderListPage.qml:129
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:129
+#: ../src/app/qml/ui/FolderListPage.qml:129
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:127
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:127
 msgid "Unlock full access"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:141
+#: ../sbuild/package/qml/ui/FolderListPage.qml:143
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:143
+#: ../src/app/qml/ui/FolderListPage.qml:143
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:141
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:141
 msgid "Authentication failed"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:217
+#: ../sbuild/package/qml/ui/FolderListPage.qml:223
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:223
+#: ../src/app/qml/ui/FolderListPage.qml:223
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:219
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:219
 #, qt-format
 msgid "%1 file"
 msgid_plural "%1 files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:261
+#: ../sbuild/package/qml/ui/FolderListPage.qml:277
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:277
+#: ../src/app/qml/ui/FolderListPage.qml:277
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:263
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:263
 msgid "Open in a new tab"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:269
+#: ../sbuild/package/qml/ui/FolderListPage.qml:285
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:285
+#: ../src/app/qml/ui/FolderListPage.qml:285
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:271
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:271
 msgid "Close this tab"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:282
+#: ../sbuild/package/qml/ui/FolderListPage.qml:298
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:298
+#: ../src/app/qml/ui/FolderListPage.qml:298
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:284
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:284
 msgid "Create folder"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:283
+#: ../sbuild/package/qml/ui/FolderListPage.qml:299
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:299
+#: ../src/app/qml/ui/FolderListPage.qml:299
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:285
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:285
 msgid "Enter name for new folder"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:299
+#: ../sbuild/package/qml/ui/FolderListPage.qml:315
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:318
+#: ../src/app/qml/ui/FolderListPage.qml:318
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:301
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:301
 msgid "Create file"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:300
+#: ../sbuild/package/qml/ui/FolderListPage.qml:316
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:319
+#: ../src/app/qml/ui/FolderListPage.qml:319
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:302
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:302
 msgid "Enter name for new file"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:349
+#: ../sbuild/package/qml/ui/FolderListPage.qml:365
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:368
+#: ../src/app/qml/ui/FolderListPage.qml:368
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:351
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:351
 msgid "Select"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:446
+#: ../sbuild/package/qml/ui/FolderListPage.qml:466
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:469
+#: ../src/app/qml/ui/FolderListPage.qml:469
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:452
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:452
 msgid "No files"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:466
-#: ../src/app/qml/ui/FolderListPage.qml:575
+#: ../sbuild/package/qml/ui/FolderListPage.qml:486
+#: ../sbuild/package/qml/ui/FolderListPage.qml:595
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:489
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:598
+#: ../src/app/qml/ui/FolderListPage.qml:489
+#: ../src/app/qml/ui/FolderListPage.qml:598
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:472
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:581
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:472
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:581
 msgid "Delete"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:467
+#: ../sbuild/package/qml/ui/FolderListPage.qml:487
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:490
+#: ../src/app/qml/ui/FolderListPage.qml:490
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:473
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:473
 #, qt-format
 msgid "Are you sure you want to permanently delete '%1'?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:472
+#: ../sbuild/package/qml/ui/FolderListPage.qml:492
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:495
+#: ../src/app/qml/ui/FolderListPage.qml:495
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:478
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:478
 msgid "Deleting files"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:490
-#: ../src/app/qml/ui/FolderListPage.qml:588
+#: ../sbuild/package/qml/ui/FolderListPage.qml:510
+#: ../sbuild/package/qml/ui/FolderListPage.qml:608
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:513
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:611
+#: ../src/app/qml/ui/FolderListPage.qml:513
+#: ../src/app/qml/ui/FolderListPage.qml:611
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:496
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:594
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:496
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:594
 msgid "Rename"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:491
+#: ../sbuild/package/qml/ui/FolderListPage.qml:511
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:514
+#: ../src/app/qml/ui/FolderListPage.qml:514
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:497
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:497
 msgid "Enter a new name"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:500
+#: ../sbuild/package/qml/ui/FolderListPage.qml:520
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:523
+#: ../src/app/qml/ui/FolderListPage.qml:523
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:506
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:506
 msgid "Could not rename"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:501
+#: ../sbuild/package/qml/ui/FolderListPage.qml:521
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:524
+#: ../src/app/qml/ui/FolderListPage.qml:524
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:507
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:507
 msgid "Insufficient permissions or name already exists?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:519
+#: ../sbuild/package/qml/ui/FolderListPage.qml:539
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:542
+#: ../src/app/qml/ui/FolderListPage.qml:542
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:525
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:525
 msgid "Extract Archive"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:520
+#: ../sbuild/package/qml/ui/FolderListPage.qml:540
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:543
+#: ../src/app/qml/ui/FolderListPage.qml:543
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:526
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:526
 #, qt-format
 msgid "Are you sure you want to extract '%1' here?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:552
+#: ../sbuild/package/qml/ui/FolderListPage.qml:572
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:575
+#: ../src/app/qml/ui/FolderListPage.qml:575
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:558
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:558
 msgid "Cut"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:563
+#: ../sbuild/package/qml/ui/FolderListPage.qml:583
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:586
+#: ../src/app/qml/ui/FolderListPage.qml:586
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:569
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:569
 msgid "Copy"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:603
-#: ../src/app/qml/ui/FolderListPage.qml:724
+#: ../sbuild/package/qml/ui/FolderListPage.qml:623
+#: ../sbuild/package/qml/ui/FolderListPage.qml:744
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:626
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:747
+#: ../src/app/qml/ui/FolderListPage.qml:626
+#: ../src/app/qml/ui/FolderListPage.qml:747
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:609
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:730
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:609
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:730
 msgid "Extract archive"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:634
+#: ../sbuild/package/qml/ui/FolderListPage.qml:654
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:657
+#: ../src/app/qml/ui/FolderListPage.qml:657
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:640
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:640
 msgid "File operation error"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:665
+#: ../sbuild/package/qml/ui/FolderListPage.qml:685
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:688
+#: ../src/app/qml/ui/FolderListPage.qml:688
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:671
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:671
 #, qt-format
 msgid "Extracting archive '%1'"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:701
+#: ../sbuild/package/qml/ui/FolderListPage.qml:721
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:724
+#: ../src/app/qml/ui/FolderListPage.qml:724
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:707
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:707
 msgid "Extracting failed"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:702
+#: ../sbuild/package/qml/ui/FolderListPage.qml:722
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:725
+#: ../src/app/qml/ui/FolderListPage.qml:725
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:708
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:708
 #, qt-format
 msgid "Extracting the archive '%1' failed."
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:716
+#: ../sbuild/package/qml/ui/FolderListPage.qml:736
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:739
+#: ../src/app/qml/ui/FolderListPage.qml:739
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:722
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:722
 msgid "Archive file"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:717
+#: ../sbuild/package/qml/ui/FolderListPage.qml:737
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:740
+#: ../src/app/qml/ui/FolderListPage.qml:740
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:723
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:723
 msgid "Do you want to extract the archive here?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:734
+#: ../sbuild/package/qml/ui/FolderListPage.qml:754
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:757
+#: ../src/app/qml/ui/FolderListPage.qml:757
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:740
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:740
 msgid "Open with another app"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:818
+#: ../sbuild/package/qml/ui/FolderListPage.qml:838
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:841
+#: ../src/app/qml/ui/FolderListPage.qml:841
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:824
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:824
 msgid "~/Desktop"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:828
+#: ../sbuild/package/qml/ui/FolderListPage.qml:848
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:851
+#: ../src/app/qml/ui/FolderListPage.qml:851
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:834
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:834
 msgid "~/Public"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:830
+#: ../sbuild/package/qml/ui/FolderListPage.qml:850
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:853
+#: ../src/app/qml/ui/FolderListPage.qml:853
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:836
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:836
 msgid "~/Programs"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:832
+#: ../sbuild/package/qml/ui/FolderListPage.qml:852
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:855
+#: ../src/app/qml/ui/FolderListPage.qml:855
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:838
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:838
 msgid "~/Templates"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:850
+#: ../sbuild/package/qml/ui/FolderListPage.qml:870
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:873
+#: ../src/app/qml/ui/FolderListPage.qml:873
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:856
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:856
 msgid "Home"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:854
+#: ../sbuild/package/qml/ui/FolderListPage.qml:874
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:877
+#: ../src/app/qml/ui/FolderListPage.qml:877
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:860
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:860
 msgid "Network"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:955
+#: ../sbuild/package/qml/ui/FolderListPage.qml:976
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:979
+#: ../src/app/qml/ui/FolderListPage.qml:979
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:962
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:962
 msgid "Folder not accessible"
 msgstr ""
 
 #. TRANSLATORS: this refers to a folder name
-#: ../src/app/qml/ui/FolderListPage.qml:957
+#: ../sbuild/package/qml/ui/FolderListPage.qml:978
+#: ../sbuild/src/app/qml/ui/FolderListPage.qml:981
+#: ../src/app/qml/ui/FolderListPage.qml:981
+#: ../ssbuild/package/qml/ui/FolderListPage.qml:964
+#: ../ssbuild/src/app/qml/ui/FolderListPage.qml:964
 #, qt-format
 msgid "Can not access %1"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/GoToDialog.qml:26
+#: ../sbuild/src/app/qml/ui/GoToDialog.qml:26
 #: ../src/app/qml/ui/GoToDialog.qml:26
+#: ../ssbuild/package/qml/ui/GoToDialog.qml:26
+#: ../ssbuild/src/app/qml/ui/GoToDialog.qml:26
 msgid "Go To Location"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/GoToDialog.qml:28
+#: ../sbuild/src/app/qml/ui/GoToDialog.qml:28
 #: ../src/app/qml/ui/GoToDialog.qml:28
+#: ../ssbuild/package/qml/ui/GoToDialog.qml:28
+#: ../ssbuild/src/app/qml/ui/GoToDialog.qml:28
 msgid "Enter a location to go to:"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/GoToDialog.qml:45
+#: ../sbuild/package/qml/ui/PlacesPage.qml:65
+#: ../sbuild/package/qml/ui/PlacesPopover.qml:66
+#: ../sbuild/src/app/qml/ui/GoToDialog.qml:45
+#: ../sbuild/src/app/qml/ui/PlacesPage.qml:65
+#: ../sbuild/src/app/qml/ui/PlacesPopover.qml:66
 #: ../src/app/qml/ui/GoToDialog.qml:45 ../src/app/qml/ui/PlacesPage.qml:65
 #: ../src/app/qml/ui/PlacesPopover.qml:66
+#: ../ssbuild/package/qml/ui/GoToDialog.qml:45
+#: ../ssbuild/package/qml/ui/PlacesPage.qml:65
+#: ../ssbuild/package/qml/ui/PlacesPopover.qml:66
+#: ../ssbuild/src/app/qml/ui/GoToDialog.qml:45
+#: ../ssbuild/src/app/qml/ui/PlacesPage.qml:65
+#: ../ssbuild/src/app/qml/ui/PlacesPopover.qml:66
 msgid "Location..."
 msgstr ""
 
+#: ../sbuild/package/qml/ui/GoToDialog.qml:54
+#: ../sbuild/package/qml/ui/PlacesPage.qml:80
+#: ../sbuild/package/qml/ui/PlacesPopover.qml:81
+#: ../sbuild/src/app/qml/ui/GoToDialog.qml:54
+#: ../sbuild/src/app/qml/ui/PlacesPage.qml:80
+#: ../sbuild/src/app/qml/ui/PlacesPopover.qml:81
 #: ../src/app/qml/ui/GoToDialog.qml:54 ../src/app/qml/ui/PlacesPage.qml:80
 #: ../src/app/qml/ui/PlacesPopover.qml:81
+#: ../ssbuild/package/qml/ui/GoToDialog.qml:54
+#: ../ssbuild/package/qml/ui/PlacesPage.qml:80
+#: ../ssbuild/package/qml/ui/PlacesPopover.qml:81
+#: ../ssbuild/src/app/qml/ui/GoToDialog.qml:54
+#: ../ssbuild/src/app/qml/ui/PlacesPage.qml:80
+#: ../ssbuild/src/app/qml/ui/PlacesPopover.qml:81
 msgid "Go"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/NetAuthenticationDialog.qml:55
+#: ../sbuild/src/app/qml/ui/NetAuthenticationDialog.qml:55
 #: ../src/app/qml/ui/NetAuthenticationDialog.qml:55
+#: ../ssbuild/package/qml/ui/NetAuthenticationDialog.qml:55
+#: ../ssbuild/src/app/qml/ui/NetAuthenticationDialog.qml:55
 msgid "User"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/NetAuthenticationDialog.qml:66
+#: ../sbuild/src/app/qml/ui/NetAuthenticationDialog.qml:66
 #: ../src/app/qml/ui/NetAuthenticationDialog.qml:66
+#: ../ssbuild/package/qml/ui/NetAuthenticationDialog.qml:66
+#: ../ssbuild/src/app/qml/ui/NetAuthenticationDialog.qml:66
 msgid "Password"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/NetAuthenticationDialog.qml:79
+#: ../sbuild/src/app/qml/ui/NetAuthenticationDialog.qml:79
 #: ../src/app/qml/ui/NetAuthenticationDialog.qml:79
+#: ../ssbuild/package/qml/ui/NetAuthenticationDialog.qml:79
+#: ../ssbuild/src/app/qml/ui/NetAuthenticationDialog.qml:79
 msgid "Save password"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/NetAuthenticationDialog.qml:98
+#: ../sbuild/src/app/qml/ui/NetAuthenticationDialog.qml:98
 #: ../src/app/qml/ui/NetAuthenticationDialog.qml:98
+#: ../ssbuild/package/qml/ui/NetAuthenticationDialog.qml:98
+#: ../ssbuild/src/app/qml/ui/NetAuthenticationDialog.qml:98
 msgid "Ok"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/SettingsSheet.qml:45
+#: ../sbuild/src/app/qml/ui/SettingsSheet.qml:45
 #: ../src/app/qml/ui/SettingsSheet.qml:45
+#: ../ssbuild/package/qml/ui/SettingsSheet.qml:45
+#: ../ssbuild/src/app/qml/ui/SettingsSheet.qml:45
 msgid "Show Advanced Features"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:39
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:39
 #: ../src/app/qml/ui/ViewPopover.qml:39
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:39
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:39
 msgid "Show Hidden Files"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:59
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:59
 #: ../src/app/qml/ui/ViewPopover.qml:59
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:59
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:59
 msgid "View As"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:81
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:81
 #: ../src/app/qml/ui/ViewPopover.qml:81
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:81
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:81
 msgid "Sort By"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:92
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:92
 #: ../src/app/qml/ui/ViewPopover.qml:92
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:92
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:92
 msgid "Name"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:93
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:93
 #: ../src/app/qml/ui/ViewPopover.qml:93
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:93
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:93
 msgid "Date"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:103
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:103
 #: ../src/app/qml/ui/ViewPopover.qml:103
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:103
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:103
 msgid "Sort Order"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:114
+#: ../sbuild/package/qml/ui/ViewPopover.qml:119
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:114
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:119
 #: ../src/app/qml/ui/ViewPopover.qml:114 ../src/app/qml/ui/ViewPopover.qml:119
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:114
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:119
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:114
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:119
 msgid "Ascending"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:115
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:115
 #: ../src/app/qml/ui/ViewPopover.qml:115
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:115
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:115
 msgid "Descending"
 msgstr ""
 
+#: ../sbuild/package/qml/ui/ViewPopover.qml:127
+#: ../sbuild/src/app/qml/ui/ViewPopover.qml:127
 #: ../src/app/qml/ui/ViewPopover.qml:127
+#: ../ssbuild/package/qml/ui/ViewPopover.qml:127
+#: ../ssbuild/src/app/qml/ui/ViewPopover.qml:127
 msgid "Filter"
 msgstr ""
 
@@ -547,6 +1072,12 @@
 msgid "cannot write in "
 msgstr ""
 
-#: com.ubuntu.filemanager.desktop.in.in.h:1
-msgid "File Manager"
+#: ../ssbuild/package/qml/filemanager.qml:316
+#: ../ssbuild/src/app/qml/filemanager.qml:316
+msgid "Files imported"
+msgstr ""
+
+#: ../ssbuild/package/qml/filemanager.qml:317
+#: ../ssbuild/src/app/qml/filemanager.qml:317
+msgid "Files imported into: "
 msgstr ""

=== modified file 'src/app/qml/components/NetAuthenticationHandler.qml'
--- src/app/qml/components/NetAuthenticationHandler.qml	2016-01-18 10:32:34 +0000
+++ src/app/qml/components/NetAuthenticationHandler.qml	2016-07-19 17:00:39 +0000
@@ -7,9 +7,14 @@
    objectName: "netAuthenticatinHandler"
 
    property bool savePassword: true
+   property var dialogObject: null
+
    function showDialog(urlPath,user) {
-       console.log("needsAuthenticationHandler::showDialog()")
-       netAuthenticationDialog.showDialog(urlPath,user)
+       if (dialogObject)
+           return
+
+       dialogObject = PopupUtils.open(netAuthenticationDialogComponent)
+       dialogObject.showDialog(urlPath,user)
    }
 
    Timer {
@@ -26,15 +31,22 @@
        }
    }
 
-   NetAuthenticationDialog {
-       id: netAuthenticationDialog
-       onSavePasswordChanged: {
-           savePassword = check
-           console.log("NetAuthenticationHandler savePassword="+savePassword)
-       }
-       onOk: {
-           if (!authTimer.running) {
-               authTimer.start()
+   Component {
+        id: netAuthenticationDialogComponent
+
+        NetAuthenticationDialog {
+           id: netAuthenticationDialog
+           onSavePasswordChanged: {
+               savePassword = check
+               console.log("NetAuthenticationHandler savePassword="+savePassword)
+           }
+           onOk: {
+               if (!authTimer.running) {
+                   authTimer.start()
+               }
+           }
+           Component.onDestruction: {
+               netAuthenticatinHandler.dialogObject = null
            }
        }
    }

=== modified file 'src/app/qml/components/PathHistoryRow.qml'
--- src/app/qml/components/PathHistoryRow.qml	2016-06-05 06:58:11 +0000
+++ src/app/qml/components/PathHistoryRow.qml	2016-07-19 17:00:39 +0000
@@ -147,7 +147,8 @@
                     text: pathText(folder,index)
                     fontSize: flickable.textSize
                     anchors.verticalCenter: parent.verticalCenter
-                    color: repeater.model === index + 1 ? UbuntuColors.inkstone : UbuntuColors.inkstone
+                    color: UbuntuColors.inkstone
+                    opacity: repeater.model === index + 1 ? 1.0 : 0.3
                     clip: true
 
                     /* Maximum Width = Flickable Width */
@@ -162,6 +163,7 @@
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.right: label.left
                     color: UbuntuColors.inkstone
+                    opacity: label.opacity
                     // clip: true
                 }
             }
@@ -193,6 +195,7 @@
                     fontSize: flickable.textSize
                     anchors.verticalCenter: parent.verticalCenter
                     color: UbuntuColors.inkstone
+                    opacity: 0.3
                     clip: true
 
                     /* Maximum Width = Flickable Width */
@@ -207,6 +210,7 @@
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.right: memoryLabel.left
                     color: UbuntuColors.inkstone
+                    opacity: 0.3
                     // clip: true
                 }
             }

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2016-03-16 16:15:41 +0000
+++ src/app/qml/filemanager.qml	2016-07-19 17:00:39 +0000
@@ -42,6 +42,8 @@
     property bool loaded: false
 
     property bool allowSidebarExpanded: width > units.gu(50)
+    property bool fullAccessGranted: noAuthentication || !pamAuthentication.requireAuthentication()
+
 
     onAllowSidebarExpandedChanged: {
         if (!allowSidebarExpanded)
@@ -58,6 +60,7 @@
         id: fileSelector
         property var activeTransfer: null
         property var fileSelectorComponent: null
+        property bool importMode: false
     }
 
     Component {
@@ -101,8 +104,10 @@
         tabs.selectedTabIndex = 0
     }
 
-    function openFileSelector() {
-        pageStack.push(fileSelectorComponent, { fileSelectorMode: true} )
+    function openFileSelector(selectFolderMode) {
+        fileSelector.fileSelectorComponent = pageStack.push(Qt.resolvedUrl("./ui/FolderListPage.qml"), { fileSelectorMode: !selectFolderMode,
+                                                                                                         folderSelectorMode: selectFolderMode,
+                                                                                                         folder: userplaces.locationHome})
     }
 
     function cancelFileSelector() {
@@ -114,38 +119,62 @@
 
     function acceptFileSelector(fileUrls) {
         console.log("accept file selector " + fileUrls)
-        var results = fileUrls.map(function(fileUrl) {
+        if (fileSelector.importMode) {
+            importFiles(fileSelector.activeTransfer, fileUrls[0])
+        }
+        else
+        {
+            exportFiles(fileSelector.activeTransfer, fileUrls)
+        }
+    }
+
+    function openLocalFile(filePath) {
+        pageStack.push(Qt.resolvedUrl("content-hub/FileOpener.qml"), { fileUrl: "file://" + filePath} )
+    }
+
+    function startImport(activeTransfer) {
+        if (activeTransfer.state === ContentTransfer.Charged) {
+            fileSelector.activeTransfer = activeTransfer
+            fileSelector.importMode = true
+            openFileSelector(true)
+        }
+    }
+
+    function importFiles(activeTransfer, destDir) {
+        var fileNames = []
+        for(var i=0; i < activeTransfer.items.length; i++) {
+            var item = activeTransfer.items[i]
+            var uniqueName = fileSelector.fileSelectorComponent.newFileUniqueName(destDir,
+                                                                                  fileSelector.fileSelectorComponent.basename(String(item.url)))
+            console.log("Move file to:" + destDir + " with name: " + uniqueName)
+            activeTransfer.items[i].move(destDir, uniqueName)
+            fileNames.push(uniqueName)
+        }
+        finishImport(destDir, fileNames)
+    }
+
+    function exportFiles(activeTransfer, filesUrls) {
+        var results = filesUrls.map(function(fileUrl) {
             return fileSelectorResultComponent.createObject(mainView, {"url": fileUrl})
         })
 
-        if (fileSelector.activeTransfer !== null) {
-            fileSelector.activeTransfer.items = results
-            fileSelector.activeTransfer.state = ContentTransfer.Charged
+        if (activeTransfer !== null) {
+            activeTransfer.items = results
+            activeTransfer.state = ContentTransfer.Charged
             console.log("set activeTransfer")
         } else {
             console.log("activeTransfer null, not setting, testing code")
         }
     }
 
-    function openLocalFile(filePath) {
-        pageStack.push(Qt.resolvedUrl("content-hub/FileOpener.qml"), { fileUrl: "file://" + filePath} )
-    }
-
     Connections {
         target: ContentHub
         onExportRequested: {
             fileSelector.activeTransfer = transfer
-            openFileSelector()
-        }
-    }
-
-    Component {
-        id: fileSelectorComponent
-
-        FolderListPage {
-            // TODO: remember last selection
-            folder: userplaces.locationHome
-        }
+            openFileSelector(false)
+        }
+        onImportRequested: startImport(transfer)
+        onShareRequested: startImport(transfer)
     }
 
     PageStack {
@@ -275,6 +304,20 @@
                         })
     }
 
+    function finishImport(folder, urls) {
+        var count = urls.length
+
+        pageStack.pop()
+        fileSelector.fileSelectorComponent = null
+        pageStack.currentPage.currentPage.folder = folder
+        pageStack.currentPage.currentPage.refresh()
+        PopupUtils.open(Qt.resolvedUrl("./ui/NotifyDialog.qml"), mainView,
+                        {
+                            title: (count === 1 ? i18n.tr("File %1").arg(urls[0]) : i18n.tr("%1 Files").arg(count)),
+                            text: i18n.tr("Saved to: %1").arg(folder)
+                        })
+    }
+
     Keys.onPressed: {
         print("Key pressed!")
         event.accepted = tabs.currentPage.keyPressed(event.key, event.modifiers)

=== modified file 'src/app/qml/ui/ConfirmDialogWithInput.qml'
--- src/app/qml/ui/ConfirmDialogWithInput.qml	2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/ConfirmDialogWithInput.qml	2016-07-19 17:00:39 +0000
@@ -37,6 +37,8 @@
         id: input
         objectName: "inputField"
         focus: true
+        // Avoid need to press enter to make "Ok" button enabled.
+        inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase
         validator: RegExpValidator {
             regExp: /.+/
         }

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2016-06-05 06:58:11 +0000
+++ src/app/qml/ui/FolderListPage.qml	2016-07-19 17:00:39 +0000
@@ -27,6 +27,7 @@
 
 PageWithBottomEdge {
     id: folderListPage
+
     bottomEdgeTitle: i18n.tr("Places")
     bottomEdgeEnabled: !sidebar.expanded
     bottomEdgePageSource: Qt.resolvedUrl("PlacesPage.qml")
@@ -91,6 +92,7 @@
                     objectName: "createFolder"
                     iconName: "add"
                     text: i18n.tr("New Folder")
+                    visible: folderListPage.__pathIsWritable
                     onTriggered: {
                         print(text)
                         PopupUtils.open(createFolderDialog, folderListPage)
@@ -134,7 +136,7 @@
                         authDialog.passwordEntered.connect(function(password) {
                             if (pamAuthentication.validatePasswordToken(password)) {
                                 console.log("Authenticated for full access")
-                                pageModel.onlyAllowedPaths = false
+                                mainView.fullAccessGranted = true
                             } else {
                                 PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), folderListPage,
                                                 {
@@ -157,9 +159,13 @@
     property bool sortAscending: true
     property string folder
     property bool loading: pageModel.awaitingResults
+    property bool __pathIsWritable: false
+
 
     // Set to true if called as file selector for ContentHub
     property bool fileSelectorMode: false
+    property bool folderSelectorMode: false
+    readonly property bool selectionMode: fileSelectorMode || folderSelectorMode
 
     property FolderListSelection selectionManager: pageModel.selectionObject()
 
@@ -209,7 +215,7 @@
         id: pageModel
         path: folderListPage.folder
         enableExternalFSWatcher: true
-        onlyAllowedPaths: !noAuthentication && pamAuthentication.requireAuthentication()
+        onlyAllowedPaths: !mainView.fullAccessGranted
 
         // Properties to emulate a model entry for use by FileDetailsPopover
         property bool isDir: true
@@ -218,6 +224,14 @@
         property bool isReadable: true
         property bool isExecutable: true
 
+        function checkIfIsWritable() {
+            if (pageModel.path) {
+                folderListPage.__pathIsWritable = pageModel.curPathIsWritable() &&
+                        (!pageModel.onlyAllowedPaths || pageModel.isAllowedPath(path))
+            }
+        }
+
+
         Component.onCompleted: {
             // Add default allowed paths
             addAllowedDirectory(userplaces.locationDocuments)
@@ -236,6 +250,8 @@
             console.log("onDownloadTemporaryComplete received filename="+filename + "name="+nameOnly)
             openFromDisk(filename, nameOnly)
         }
+        onOnlyAllowedPathsChanged: checkIfIsWritable()
+        onPathChanged: checkIfIsWritable()
     }
 
     FolderListModel {
@@ -285,7 +301,10 @@
             onAccepted: {
                 console.log("Create folder accepted", inputText)
                 if (inputText !== '') {
-                    pageModel.mkdir(inputText)
+                    var folderName = inputText.trim()
+                    if (pageModel.mkdir(folderName)) {
+                        folder = pageModel.path + "/" + folderName
+                    }
                 } else {
                     console.log("Empty directory name, ignored")
                 }
@@ -343,26 +362,30 @@
         width: parent.width - sidebar.width
 
         spacing: units.gu(2)
-        visible: fileSelectorMode || pageModel.onlyAllowedPaths
+        visible: selectionMode || pageModel.onlyAllowedPaths
 
         Button {
             text: i18n.tr("Select")
-            enabled: selectionManager.counter > 0
-            visible: fileSelectorMode
+            enabled: (selectionManager.counter > 0) || (folderSelectorMode && folderListPage.__pathIsWritable)
+            visible: selectionMode
             onClicked: {
-                var selectedAbsPaths = selectionManager.selectedAbsFilePaths();
-                // For now support only selection in filesystem
-                var selectedAbsUrls = selectedAbsPaths.map(function(item) {
-                    return "file://" + item;
-                });
+                var selectedAbsUrls = []
+                if (folderSelectorMode) {
+                    selectedAbsUrls = [ folder ]
+                } else {
+                    var selectedAbsPaths = selectionManager.selectedAbsFilePaths();
+                    // For now support only selection in filesystem
+                    selectedAbsUrls = selectedAbsPaths.map(function(item) {
+                        return "file://" + item;
+                    });
+                }
                 console.log("FileSelector OK clicked, selected items: " + selectedAbsUrls)
-
                 acceptFileSelector(selectedAbsUrls)
             }
         }
         Button {
             text: i18n.tr("Cancel")
-            visible: fileSelectorMode
+            visible: selectionMode
             onClicked: {
                 console.log("FileSelector cancelled")
                 cancelFileSelector()
@@ -493,8 +516,8 @@
             onAccepted: {
                 console.log("Rename accepted", inputText)
                 if (inputText !== '') {
-                    console.log("Rename commensed, modelRow/inputText", modelRow, inputText)
-                    if (pageModel.rename(modelRow, inputText) === false) {
+                    console.log("Rename commensed, modelRow/inputText", modelRow, inputText.trim())
+                    if (pageModel.rename(modelRow, inputText.trim()) === false) {
                         PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
                                         {
                                             title: i18n.tr("Could not rename"),
@@ -948,6 +971,7 @@
                 console.log("Changing to dir", model.filePath)
                 //prefer pageModel.cdIntoIndex() because it is not necessary to parse the path
                 //goTo(model.filePath)
+                folder = model.filePath
                 pageModel.cdIntoIndex(model.index)
             } else {
                 PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
@@ -962,7 +986,7 @@
             console.log("Non dir clicked")
             if (fileSelectorMode) {
                 selectionManager.select(model.index,false,true)
-            } else {
+            } else if (!folderSelectorMode){
                 openFile(model)
             }
         }
@@ -1022,6 +1046,20 @@
         }
     }
 
+    function newFileUniqueName(filePath, fileName) {
+        var fileBaseName = fileName.substring(0, fileName.lastIndexOf("."))
+        var fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1)
+        var fullName = filePath + "/" + fileName
+        var index = 1
+
+        while (pageModel.existsFile(fullName)) {
+            fullName = filePath + "/" + fileBaseName + "-" + index + "." + fileExtension;
+            index++
+        }
+
+        return fullName.substring(fullName.lastIndexOf("/") + 1);
+    }
+
     Component.onCompleted: {
         forceActiveFocus()
     }

=== modified file 'src/plugin/folderlistmodel/dirmodel.h'
--- src/plugin/folderlistmodel/dirmodel.h	2015-12-08 16:55:41 +0000
+++ src/plugin/folderlistmodel/dirmodel.h	2016-07-19 17:00:39 +0000
@@ -453,6 +453,7 @@
     inline void removeAllowedDirectory(const QString &allowedDirAbsolutePath) {
         m_allowedDirs.remove(allowedDirAbsolutePath);
     }
+    bool isAllowedPath(const QString &absolutePath) const;
 
 signals:
     /*!
@@ -563,7 +564,6 @@
 
     bool allowAccess(const DirItemInfo &fi) const;
     bool allowCurrentPathAccess() const;
-    bool isAllowedPath(const QString &absolutePath) const;
 };
 
 

=== modified file 'ubuntu-filemanager-app.json'
--- ubuntu-filemanager-app.json	2014-08-01 02:41:53 +0000
+++ ubuntu-filemanager-app.json	2016-07-19 17:00:39 +0000
@@ -4,5 +4,5 @@
         "content_exchange_source",
         "content_exchange"
     ],
-    "policy_version": 1
-}
\ No newline at end of file
+    "policy_version": 1.3
+}