ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #08591
[Merge] lp:~nskaggs/ubuntu-filemanager-app/fix-ap-tests into lp:ubuntu-filemanager-app
Nicholas Skaggs has proposed merging lp:~nskaggs/ubuntu-filemanager-app/fix-ap-tests into lp:ubuntu-filemanager-app.
Commit message:
Fix AP tests and remove the ones that can't be maintained
Requested reviews:
Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
Ubuntu File Manager Developers (ubuntu-filemanager-dev)
For more details, see:
https://code.launchpad.net/~nskaggs/ubuntu-filemanager-app/fix-ap-tests/+merge/288189
This fixes several tests already; WIP
--
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~nskaggs/ubuntu-filemanager-app/fix-ap-tests into lp:ubuntu-filemanager-app.
=== modified file 'README-Mergeproposal'
--- README-Mergeproposal 2015-12-19 07:34:45 +0000
+++ README-Mergeproposal 2016-03-04 23:02:36 +0000
@@ -26,3 +26,7 @@
The above checklist is more of a guideline to help file manager app trunk stay buildable,
stable and up to date.
+
+Jenkins
+=======
+In addition to manual reviews, merge proposals are subject to being run in jenkins to ensure the application builds and any unit tests are successful. For more information on jenkins and how it works, see the [Core Apps Jenkins Wiki](https://wiki.ubuntu.com/Touch/CoreApps/Jenkins)
=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot 2016-01-29 07:30:30 +0000
+++ po/com.ubuntu.filemanager.pot 2016-03-04 23:02:36 +0000
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-12 21:23+0100\n"
+"POT-Creation-Date: 2016-03-04 16:59-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -18,136 +18,260 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../src/app/qml/components/FolderIconView.qml:57
-#: ../src/app/qml/components/FolderListView.qml:35
-#, qt-format
-msgid "%1 (%2 file)"
-msgid_plural "%1 (%2 files)"
-msgstr[0] ""
-msgstr[1] ""
-
+#: ../amd64/qml/components/FolderIconView.qml:58
+#: ../amd64/qml/components/FolderListView.qml:36
+#: ../i386/qml/components/FolderIconView.qml:58
+#: ../i386/qml/components/FolderListView.qml:36
+#: ../multi/qml/components/FolderIconView.qml:58
+#: ../multi/qml/components/FolderListView.qml:36
+#, qt-format
+msgid "%1 (1 file)"
+msgstr ""
+
+#: ../amd64/qml/components/FolderIconView.qml:59
+#: ../amd64/qml/components/FolderListView.qml:37
+#: ../i386/qml/components/FolderIconView.qml:59
+#: ../i386/qml/components/FolderListView.qml:37
+#: ../multi/qml/components/FolderIconView.qml:59
+#: ../multi/qml/components/FolderListView.qml:37
+#, qt-format
+msgid "%1 (%2 files)"
+msgstr ""
+
+#: ../amd64/qml/components/PathHistoryRow.qml:84
+#: ../amd64/qml/ui/FolderListPage.qml:620
+#: ../i386/qml/components/PathHistoryRow.qml:84
+#: ../i386/qml/ui/FolderListPage.qml:620
+#: ../multi/qml/components/PathHistoryRow.qml:84
+#: ../multi/qml/ui/FolderListPage.qml:620
#: ../src/app/qml/components/PathHistoryRow.qml:84
-#: ../src/app/qml/ui/FolderListPage.qml:830
+#: ../src/app/qml/ui/FolderListPage.qml:845
msgid "Device"
msgstr ""
-#: ../src/app/qml/components/PlacesSidebar.qml:53
+#: ../amd64/qml/components/PlacesSidebar.qml:54
+#: ../amd64/qml/ui/PlacesPage.qml:28 ../amd64/qml/ui/PlacesPopover.qml:103
+#: ../i386/qml/components/PlacesSidebar.qml:54 ../i386/qml/ui/PlacesPage.qml:28
+#: ../i386/qml/ui/PlacesPopover.qml:103
+#: ../multi/qml/components/PlacesSidebar.qml:54
+#: ../multi/qml/ui/PlacesPage.qml:28 ../multi/qml/ui/PlacesPopover.qml:103
+#: ../src/app/qml/components/PlacesSidebar.qml:54
#: ../src/app/qml/ui/FolderListPage.qml:31 ../src/app/qml/ui/PlacesPage.qml:27
#: ../src/app/qml/ui/PlacesPopover.qml:102
msgid "Places"
msgstr ""
+#: ../amd64/qml/content-hub/FileOpener.qml:27
+#: ../i386/qml/content-hub/FileOpener.qml:27
+#: ../multi/qml/content-hub/FileOpener.qml:27
#: ../src/app/qml/content-hub/FileOpener.qml:27
msgid "Open with"
msgstr ""
-#: ../src/app/qml/filemanager.qml:81 ../src/app/qml/ui/FolderListPage.qml:107
+#: ../amd64/qml/filemanager.qml:81 ../amd64/qml/ui/FolderListPage.qml:102
+#: ../amd64/qml/ui/SettingsSheet.qml:31 ../i386/qml/filemanager.qml:81
+#: ../i386/qml/ui/FolderListPage.qml:102 ../i386/qml/ui/SettingsSheet.qml:31
+#: ../multi/qml/filemanager.qml:81 ../multi/qml/ui/FolderListPage.qml:102
+#: ../multi/qml/ui/SettingsSheet.qml:31 ../src/app/qml/filemanager.qml:80
+#: ../src/app/qml/ui/FolderListPage.qml:107
#: ../src/app/qml/ui/SettingsSheet.qml:31
msgid "Settings"
msgstr ""
-#: ../src/app/qml/filemanager.qml:82
+#: ../amd64/qml/filemanager.qml:82 ../i386/qml/filemanager.qml:82
+#: ../multi/qml/filemanager.qml:82 ../src/app/qml/filemanager.qml:81
msgid "Change app settings"
msgstr ""
-#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:365
+#: ../amd64/qml/filemanager.qml:259 ../amd64/qml/ui/FolderListPage.qml:352
+#: ../amd64/qml/ui/ViewPopover.qml:70 ../i386/qml/filemanager.qml:259
+#: ../i386/qml/ui/FolderListPage.qml:352 ../i386/qml/ui/ViewPopover.qml:70
+#: ../multi/qml/filemanager.qml:259 ../multi/qml/ui/FolderListPage.qml:352
+#: ../multi/qml/ui/ViewPopover.qml:70 ../src/app/qml/filemanager.qml:258
+#: ../src/app/qml/ui/FolderListPage.qml:379
#: ../src/app/qml/ui/ViewPopover.qml:70
msgid "Icons"
msgstr ""
-#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:381
+#: ../amd64/qml/filemanager.qml:259 ../amd64/qml/ui/FolderListPage.qml:368
+#: ../amd64/qml/ui/ViewPopover.qml:71 ../i386/qml/filemanager.qml:259
+#: ../i386/qml/ui/FolderListPage.qml:368 ../i386/qml/ui/ViewPopover.qml:71
+#: ../multi/qml/filemanager.qml:259 ../multi/qml/ui/FolderListPage.qml:368
+#: ../multi/qml/ui/ViewPopover.qml:71 ../src/app/qml/filemanager.qml:258
+#: ../src/app/qml/ui/FolderListPage.qml:395
#: ../src/app/qml/ui/ViewPopover.qml:71
msgid "List"
msgstr ""
+#: ../amd64/qml/ui/AuthenticationDialog.qml:25
+#: ../i386/qml/ui/AuthenticationDialog.qml:25
+#: ../multi/qml/ui/AuthenticationDialog.qml:25
#: ../src/app/qml/ui/AuthenticationDialog.qml:25
+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:26
msgid "Authentication required"
msgstr ""
+#: ../amd64/qml/ui/AuthenticationDialog.qml:27
+#: ../i386/qml/ui/AuthenticationDialog.qml:27
+#: ../multi/qml/ui/AuthenticationDialog.qml:27
#: ../src/app/qml/ui/AuthenticationDialog.qml:27
msgid "Password is required to access all files"
msgstr ""
+#: ../amd64/qml/ui/AuthenticationDialog.qml:39
+#: ../i386/qml/ui/AuthenticationDialog.qml:39
+#: ../multi/qml/ui/AuthenticationDialog.qml:39
#: ../src/app/qml/ui/AuthenticationDialog.qml:39
msgid "password"
msgstr ""
-#: ../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/NotifyDialog.qml:25
+#: ../amd64/qml/ui/AuthenticationDialog.qml:49
+#: ../amd64/qml/ui/ConfirmDialog.qml:31
+#: ../amd64/qml/ui/ConfirmDialogWithInput.qml:47
+#: ../amd64/qml/ui/NotifyDialog.qml:25
+#: ../i386/qml/ui/AuthenticationDialog.qml:49
+#: ../i386/qml/ui/ConfirmDialog.qml:31
+#: ../i386/qml/ui/ConfirmDialogWithInput.qml:47
+#: ../i386/qml/ui/NotifyDialog.qml:25
+#: ../multi/qml/ui/AuthenticationDialog.qml:49
+#: ../multi/qml/ui/ConfirmDialog.qml:31
+#: ../multi/qml/ui/ConfirmDialogWithInput.qml:47
+#: ../multi/qml/ui/NotifyDialog.qml:25
+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:98
msgid "Ok"
msgstr ""
+#: ../amd64/qml/ui/AuthenticationDialog.qml:60
+#: ../amd64/qml/ui/ConfirmDialog.qml:41
+#: ../amd64/qml/ui/ConfirmDialogWithInput.qml:57
+#: ../amd64/qml/ui/FileActionDialog.qml:45
+#: ../amd64/qml/ui/FileOperationProgressDialog.qml:44
+#: ../amd64/qml/ui/FolderListPage.qml:330 ../amd64/qml/ui/GoToDialog.qml:66
+#: ../i386/qml/ui/AuthenticationDialog.qml:60
+#: ../i386/qml/ui/ConfirmDialog.qml:41
+#: ../i386/qml/ui/ConfirmDialogWithInput.qml:57
+#: ../i386/qml/ui/FileActionDialog.qml:45
+#: ../i386/qml/ui/FileOperationProgressDialog.qml:44
+#: ../i386/qml/ui/FolderListPage.qml:330 ../i386/qml/ui/GoToDialog.qml:66
+#: ../multi/qml/ui/AuthenticationDialog.qml:60
+#: ../multi/qml/ui/ConfirmDialog.qml:41
+#: ../multi/qml/ui/ConfirmDialogWithInput.qml:57
+#: ../multi/qml/ui/FileActionDialog.qml:45
+#: ../multi/qml/ui/FileOperationProgressDialog.qml:44
+#: ../multi/qml/ui/FolderListPage.qml:330 ../multi/qml/ui/GoToDialog.qml:66
#: ../src/app/qml/ui/AuthenticationDialog.qml:60
#: ../src/app/qml/ui/ConfirmDialog.qml:41
#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:57
#: ../src/app/qml/ui/FileActionDialog.qml:45
#: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
-#: ../src/app/qml/ui/FolderListPage.qml:343
-#: ../src/app/qml/ui/FolderListPage.qml:673
-#: ../src/app/qml/ui/FolderListPage.qml:740
-#: ../src/app/qml/ui/GoToDialog.qml:67
+#: ../src/app/qml/ui/FolderListPage.qml:357
+#: ../src/app/qml/ui/FolderListPage.qml:670
+#: ../src/app/qml/ui/FolderListPage.qml:737 ../src/app/qml/ui/GoToDialog.qml:67
+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:108
msgid "Cancel"
msgstr ""
+#: ../amd64/qml/ui/FileActionDialog.qml:30
+#: ../i386/qml/ui/FileActionDialog.qml:30
+#: ../multi/qml/ui/FileActionDialog.qml:30
#: ../src/app/qml/ui/FileActionDialog.qml:30
msgid "Choose action"
msgstr ""
+#: ../amd64/qml/ui/FileActionDialog.qml:31
+#: ../i386/qml/ui/FileActionDialog.qml:31
+#: ../multi/qml/ui/FileActionDialog.qml:31
#: ../src/app/qml/ui/FileActionDialog.qml:31
#, qt-format
msgid "For file: %1"
msgstr ""
+#: ../amd64/qml/ui/FileActionDialog.qml:35
+#: ../i386/qml/ui/FileActionDialog.qml:35
+#: ../multi/qml/ui/FileActionDialog.qml:35
#: ../src/app/qml/ui/FileActionDialog.qml:35
msgid "Open"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:37
+#: ../i386/qml/ui/FileDetailsPopover.qml:37
+#: ../multi/qml/ui/FileDetailsPopover.qml:37
#: ../src/app/qml/ui/FileDetailsPopover.qml:37
msgid "Readable"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:40
+#: ../i386/qml/ui/FileDetailsPopover.qml:40
+#: ../multi/qml/ui/FileDetailsPopover.qml:40
#: ../src/app/qml/ui/FileDetailsPopover.qml:40
msgid "Writable"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:43
+#: ../i386/qml/ui/FileDetailsPopover.qml:43
+#: ../multi/qml/ui/FileDetailsPopover.qml:43
#: ../src/app/qml/ui/FileDetailsPopover.qml:43
msgid "Executable"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:91
+#: ../i386/qml/ui/FileDetailsPopover.qml:91
+#: ../multi/qml/ui/FileDetailsPopover.qml:91
#: ../src/app/qml/ui/FileDetailsPopover.qml:91
msgid "Path:"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:102
+#: ../i386/qml/ui/FileDetailsPopover.qml:102
+#: ../multi/qml/ui/FileDetailsPopover.qml:102
#: ../src/app/qml/ui/FileDetailsPopover.qml:102
msgid "Contents:"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:103
+#: ../i386/qml/ui/FileDetailsPopover.qml:103
+#: ../multi/qml/ui/FileDetailsPopover.qml:103
#: ../src/app/qml/ui/FileDetailsPopover.qml:103
msgid "Size:"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:112
+#: ../i386/qml/ui/FileDetailsPopover.qml:112
+#: ../multi/qml/ui/FileDetailsPopover.qml:112
#: ../src/app/qml/ui/FileDetailsPopover.qml:112
msgid "Accessed:"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:121
+#: ../i386/qml/ui/FileDetailsPopover.qml:121
+#: ../multi/qml/ui/FileDetailsPopover.qml:121
#: ../src/app/qml/ui/FileDetailsPopover.qml:121
msgid "Modified:"
msgstr ""
+#: ../amd64/qml/ui/FileDetailsPopover.qml:130
+#: ../i386/qml/ui/FileDetailsPopover.qml:130
+#: ../multi/qml/ui/FileDetailsPopover.qml:130
#: ../src/app/qml/ui/FileDetailsPopover.qml:130
msgid "Permissions:"
msgstr ""
+#: ../amd64/qml/ui/FileOperationProgressDialog.qml:27
+#: ../i386/qml/ui/FileOperationProgressDialog.qml:27
+#: ../multi/qml/ui/FileOperationProgressDialog.qml:27
#: ../src/app/qml/ui/FileOperationProgressDialog.qml:27
msgid "Operation in progress"
msgstr ""
+#: ../amd64/qml/ui/FileOperationProgressDialog.qml:29
+#: ../i386/qml/ui/FileOperationProgressDialog.qml:29
+#: ../multi/qml/ui/FileOperationProgressDialog.qml:29
#: ../src/app/qml/ui/FileOperationProgressDialog.qml:29
msgid "File operation"
msgstr ""
+#: ../amd64/qml/ui/FolderListPage.qml:52 ../i386/qml/ui/FolderListPage.qml:52
+#: ../multi/qml/ui/FolderListPage.qml:52
#: ../src/app/qml/ui/FolderListPage.qml:57
#, qt-format
msgid "Paste %1 File"
@@ -155,359 +279,508 @@
msgstr[0] ""
msgstr[1] ""
+#: ../amd64/qml/ui/FolderListPage.qml:56 ../i386/qml/ui/FolderListPage.qml:56
+#: ../multi/qml/ui/FolderListPage.qml:56
#: ../src/app/qml/ui/FolderListPage.qml:61
msgid "Paste files"
msgstr ""
+#: ../amd64/qml/ui/FolderListPage.qml:64 ../i386/qml/ui/FolderListPage.qml:64
+#: ../multi/qml/ui/FolderListPage.qml:64
#: ../src/app/qml/ui/FolderListPage.qml:69
msgid "Clear clipboard"
msgstr ""
+#: ../amd64/qml/ui/FolderListPage.qml:74 ../amd64/qml/ui/FolderListPage.qml:92
+#: ../amd64/qml/ui/FolderListPage.qml:511 ../i386/qml/ui/FolderListPage.qml:74
+#: ../i386/qml/ui/FolderListPage.qml:92 ../i386/qml/ui/FolderListPage.qml:511
+#: ../multi/qml/ui/FolderListPage.qml:74 ../multi/qml/ui/FolderListPage.qml:92
+#: ../multi/qml/ui/FolderListPage.qml:511
#: ../src/app/qml/ui/FolderListPage.qml:79
#: ../src/app/qml/ui/FolderListPage.qml:97
-#: ../src/app/qml/ui/FolderListPage.qml:610
+#: ../src/app/qml/ui/FolderListPage.qml:607
msgid "Properties"
msgstr ""
+#: ../amd64/qml/ui/FolderListPage.qml:83 ../i386/qml/ui/FolderListPage.qml:83
+#: ../multi/qml/ui/FolderListPage.qml:83
#: ../src/app/qml/ui/FolderListPage.qml:88
msgid "New Folder"
msgstr ""
+#: ../amd64/qml/ui/FolderListPage.qml:109 ../i386/qml/ui/FolderListPage.qml:109
+#: ../multi/qml/ui/FolderListPage.qml:109
#: ../src/app/qml/ui/FolderListPage.qml:115
msgid "Go To"
msgstr ""
+#: ../amd64/qml/ui/FolderListPage.qml:116 ../i386/qml/ui/FolderListPage.qml:116
+#: ../multi/qml/ui/FolderListPage.qml:116
#: ../src/app/qml/ui/FolderListPage.qml:122
msgid "Unlock full access"
msgstr ""
+#: ../amd64/qml/ui/FolderListPage.qml:130 ../i386/qml/ui/FolderListPage.qml:130
+#: ../multi/qml/ui/FolderListPage.qml:130
#: ../src/app/qml/ui/FolderListPage.qml:136
msgid "Authentication failed"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:206
+#: ../amd64/qml/ui/FolderListPage.qml:202 ../i386/qml/ui/FolderListPage.qml:202
+#: ../multi/qml/ui/FolderListPage.qml:202
+#: ../src/app/qml/ui/FolderListPage.qml:210
#, qt-format
msgid "%1 file"
msgid_plural "%1 files"
msgstr[0] ""
msgstr[1] ""
-#: ../src/app/qml/ui/FolderListPage.qml:240
+#: ../amd64/qml/ui/FolderListPage.qml:227 ../i386/qml/ui/FolderListPage.qml:227
+#: ../multi/qml/ui/FolderListPage.qml:227
+#: ../src/app/qml/ui/FolderListPage.qml:254
msgid "Open in a new tab"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:248
+#: ../amd64/qml/ui/FolderListPage.qml:235 ../i386/qml/ui/FolderListPage.qml:235
+#: ../multi/qml/ui/FolderListPage.qml:235
+#: ../src/app/qml/ui/FolderListPage.qml:262
msgid "Close this tab"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:261
+#: ../amd64/qml/ui/FolderListPage.qml:248 ../i386/qml/ui/FolderListPage.qml:248
+#: ../multi/qml/ui/FolderListPage.qml:248
+#: ../src/app/qml/ui/FolderListPage.qml:275
msgid "Create folder"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:262
+#: ../amd64/qml/ui/FolderListPage.qml:249 ../i386/qml/ui/FolderListPage.qml:249
+#: ../multi/qml/ui/FolderListPage.qml:249
+#: ../src/app/qml/ui/FolderListPage.qml:276
msgid "Enter name for new folder"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:278
+#: ../amd64/qml/ui/FolderListPage.qml:265 ../i386/qml/ui/FolderListPage.qml:265
+#: ../multi/qml/ui/FolderListPage.qml:265
+#: ../src/app/qml/ui/FolderListPage.qml:292
msgid "Create file"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:279
+#: ../amd64/qml/ui/FolderListPage.qml:266 ../i386/qml/ui/FolderListPage.qml:266
+#: ../multi/qml/ui/FolderListPage.qml:266
+#: ../src/app/qml/ui/FolderListPage.qml:293
msgid "Enter name for new file"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:328
+#: ../amd64/qml/ui/FolderListPage.qml:315 ../i386/qml/ui/FolderListPage.qml:315
+#: ../multi/qml/ui/FolderListPage.qml:315
+#: ../src/app/qml/ui/FolderListPage.qml:342
msgid "Select"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:425
+#: ../amd64/qml/ui/FolderListPage.qml:383 ../i386/qml/ui/FolderListPage.qml:383
+#: ../multi/qml/ui/FolderListPage.qml:383
+#: ../src/app/qml/ui/FolderListPage.qml:439
msgid "No files"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:445
-#: ../src/app/qml/ui/FolderListPage.qml:571
+#: ../amd64/qml/ui/FolderListPage.qml:403
+#: ../amd64/qml/ui/FolderListPage.qml:485 ../i386/qml/ui/FolderListPage.qml:403
+#: ../i386/qml/ui/FolderListPage.qml:485 ../multi/qml/ui/FolderListPage.qml:403
+#: ../multi/qml/ui/FolderListPage.qml:485
+#: ../src/app/qml/ui/FolderListPage.qml:459
+#: ../src/app/qml/ui/FolderListPage.qml:568
msgid "Delete"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:446
+#: ../amd64/qml/ui/FolderListPage.qml:404 ../i386/qml/ui/FolderListPage.qml:404
+#: ../multi/qml/ui/FolderListPage.qml:404
+#: ../src/app/qml/ui/FolderListPage.qml:460
#, qt-format
msgid "Are you sure you want to permanently delete '%1'?"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:451
+#: ../amd64/qml/ui/FolderListPage.qml:409 ../i386/qml/ui/FolderListPage.qml:409
+#: ../multi/qml/ui/FolderListPage.qml:409
+#: ../src/app/qml/ui/FolderListPage.qml:465
msgid "Deleting files"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:469
-#: ../src/app/qml/ui/FolderListPage.qml:584
+#: ../amd64/qml/ui/FolderListPage.qml:427
+#: ../amd64/qml/ui/FolderListPage.qml:498 ../i386/qml/ui/FolderListPage.qml:427
+#: ../i386/qml/ui/FolderListPage.qml:498 ../multi/qml/ui/FolderListPage.qml:427
+#: ../multi/qml/ui/FolderListPage.qml:498
+#: ../src/app/qml/ui/FolderListPage.qml:483
+#: ../src/app/qml/ui/FolderListPage.qml:581
msgid "Rename"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:470
+#: ../amd64/qml/ui/FolderListPage.qml:428 ../i386/qml/ui/FolderListPage.qml:428
+#: ../multi/qml/ui/FolderListPage.qml:428
+#: ../src/app/qml/ui/FolderListPage.qml:484
msgid "Enter a new name"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:479
+#: ../amd64/qml/ui/FolderListPage.qml:437 ../i386/qml/ui/FolderListPage.qml:437
+#: ../multi/qml/ui/FolderListPage.qml:437
+#: ../src/app/qml/ui/FolderListPage.qml:493
msgid "Could not rename"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:480
+#: ../amd64/qml/ui/FolderListPage.qml:438 ../i386/qml/ui/FolderListPage.qml:438
+#: ../multi/qml/ui/FolderListPage.qml:438
+#: ../src/app/qml/ui/FolderListPage.qml:494
msgid "Insufficient permissions or name already exists?"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:498
-msgid "Extract Archive"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:499
-#, qt-format
-msgid "Are you sure you want to extract '%1' here?"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:548
+#: ../amd64/qml/ui/FolderListPage.qml:462 ../i386/qml/ui/FolderListPage.qml:462
+#: ../multi/qml/ui/FolderListPage.qml:462
+#: ../src/app/qml/ui/FolderListPage.qml:545
msgid "Cut"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:559
+#: ../amd64/qml/ui/FolderListPage.qml:473 ../i386/qml/ui/FolderListPage.qml:473
+#: ../multi/qml/ui/FolderListPage.qml:473
+#: ../src/app/qml/ui/FolderListPage.qml:556
msgid "Copy"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:599
-#: ../src/app/qml/ui/FolderListPage.qml:720
-msgid "Extract archive"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:630
+#: ../amd64/qml/ui/FolderListPage.qml:531 ../i386/qml/ui/FolderListPage.qml:531
+#: ../multi/qml/ui/FolderListPage.qml:531
+#: ../src/app/qml/ui/FolderListPage.qml:627
msgid "File operation error"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:661
-#, qt-format
-msgid "Extracting archive '%1'"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:682
-msgid "OK"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:697
-msgid "Extracting failed"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:698
-#, qt-format
-msgid "Extracting the archive '%1' failed."
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:712
-msgid "Archive file"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:713
-msgid "Do you want to extract the archive here?"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:730
-msgid "Open with another app"
-msgstr ""
-
-#: ../src/app/qml/ui/FolderListPage.qml:798
+#: ../amd64/qml/ui/FolderListPage.qml:591 ../i386/qml/ui/FolderListPage.qml:591
+#: ../multi/qml/ui/FolderListPage.qml:591
+#: ../src/app/qml/ui/FolderListPage.qml:811
msgid "~/Desktop"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:808
+#: ../amd64/qml/ui/FolderListPage.qml:601 ../i386/qml/ui/FolderListPage.qml:601
+#: ../multi/qml/ui/FolderListPage.qml:601
+#: ../src/app/qml/ui/FolderListPage.qml:821
msgid "~/Public"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:810
+#: ../amd64/qml/ui/FolderListPage.qml:603 ../i386/qml/ui/FolderListPage.qml:603
+#: ../multi/qml/ui/FolderListPage.qml:603
+#: ../src/app/qml/ui/FolderListPage.qml:823
msgid "~/Programs"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:812
+#: ../amd64/qml/ui/FolderListPage.qml:605 ../i386/qml/ui/FolderListPage.qml:605
+#: ../multi/qml/ui/FolderListPage.qml:605
+#: ../src/app/qml/ui/FolderListPage.qml:825
msgid "~/Templates"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:828
+#: ../amd64/qml/ui/FolderListPage.qml:618 ../i386/qml/ui/FolderListPage.qml:618
+#: ../multi/qml/ui/FolderListPage.qml:618
+#: ../src/app/qml/ui/FolderListPage.qml:843
msgid "Home"
msgstr ""
-#: ../src/app/qml/ui/FolderListPage.qml:898
+#: ../amd64/qml/ui/FolderListPage.qml:688 ../i386/qml/ui/FolderListPage.qml:688
+#: ../multi/qml/ui/FolderListPage.qml:688
+#: ../src/app/qml/ui/FolderListPage.qml:948
msgid "Folder not accessible"
msgstr ""
#. TRANSLATORS: this refers to a folder name
-#: ../src/app/qml/ui/FolderListPage.qml:900
+#: ../amd64/qml/ui/FolderListPage.qml:690 ../i386/qml/ui/FolderListPage.qml:690
+#: ../multi/qml/ui/FolderListPage.qml:690
+#: ../src/app/qml/ui/FolderListPage.qml:950
#, qt-format
msgid "Can not access %1"
msgstr ""
-#: ../src/app/qml/ui/GoToDialog.qml:26
+#: ../amd64/qml/ui/GoToDialog.qml:25 ../i386/qml/ui/GoToDialog.qml:25
+#: ../multi/qml/ui/GoToDialog.qml:25 ../src/app/qml/ui/GoToDialog.qml:26
msgid "Go To Location"
msgstr ""
-#: ../src/app/qml/ui/GoToDialog.qml:28
+#: ../amd64/qml/ui/GoToDialog.qml:27 ../i386/qml/ui/GoToDialog.qml:27
+#: ../multi/qml/ui/GoToDialog.qml:27 ../src/app/qml/ui/GoToDialog.qml:28
msgid "Enter a location to go to:"
msgstr ""
-#: ../src/app/qml/ui/GoToDialog.qml:45 ../src/app/qml/ui/PlacesPage.qml:63
-#: ../src/app/qml/ui/PlacesPopover.qml:66
+#: ../amd64/qml/ui/GoToDialog.qml:44 ../amd64/qml/ui/PlacesPage.qml:62
+#: ../amd64/qml/ui/PlacesPopover.qml:67 ../i386/qml/ui/GoToDialog.qml:44
+#: ../i386/qml/ui/PlacesPage.qml:62 ../i386/qml/ui/PlacesPopover.qml:67
+#: ../multi/qml/ui/GoToDialog.qml:44 ../multi/qml/ui/PlacesPage.qml:62
+#: ../multi/qml/ui/PlacesPopover.qml:67 ../src/app/qml/ui/GoToDialog.qml:45
+#: ../src/app/qml/ui/PlacesPage.qml:63 ../src/app/qml/ui/PlacesPopover.qml:66
msgid "Location..."
msgstr ""
-#: ../src/app/qml/ui/GoToDialog.qml:54 ../src/app/qml/ui/PlacesPage.qml:78
-#: ../src/app/qml/ui/PlacesPopover.qml:81
+#: ../amd64/qml/ui/GoToDialog.qml:53 ../amd64/qml/ui/PlacesPage.qml:77
+#: ../amd64/qml/ui/PlacesPopover.qml:82 ../i386/qml/ui/GoToDialog.qml:53
+#: ../i386/qml/ui/PlacesPage.qml:77 ../i386/qml/ui/PlacesPopover.qml:82
+#: ../multi/qml/ui/GoToDialog.qml:53 ../multi/qml/ui/PlacesPage.qml:77
+#: ../multi/qml/ui/PlacesPopover.qml:82 ../src/app/qml/ui/GoToDialog.qml:54
+#: ../src/app/qml/ui/PlacesPage.qml:78 ../src/app/qml/ui/PlacesPopover.qml:81
msgid "Go"
msgstr ""
-#: ../src/app/qml/ui/SettingsSheet.qml:34
+#: ../amd64/qml/ui/SettingsSheet.qml:34 ../i386/qml/ui/SettingsSheet.qml:34
+#: ../multi/qml/ui/SettingsSheet.qml:34 ../src/app/qml/ui/SettingsSheet.qml:34
msgid "Close"
msgstr ""
-#: ../src/app/qml/ui/SettingsSheet.qml:43
+#: ../amd64/qml/ui/SettingsSheet.qml:43 ../i386/qml/ui/SettingsSheet.qml:43
+#: ../multi/qml/ui/SettingsSheet.qml:43 ../src/app/qml/ui/SettingsSheet.qml:43
msgid "Show Advanced Features"
msgstr ""
-#: ../src/app/qml/ui/ViewPopover.qml:39
+#: ../amd64/qml/ui/ViewPopover.qml:39 ../i386/qml/ui/ViewPopover.qml:39
+#: ../multi/qml/ui/ViewPopover.qml:39 ../src/app/qml/ui/ViewPopover.qml:39
msgid "Show Hidden Files"
msgstr ""
-#: ../src/app/qml/ui/ViewPopover.qml:59
+#: ../amd64/qml/ui/ViewPopover.qml:59 ../i386/qml/ui/ViewPopover.qml:59
+#: ../multi/qml/ui/ViewPopover.qml:59 ../src/app/qml/ui/ViewPopover.qml:59
msgid "View As"
msgstr ""
-#: ../src/app/qml/ui/ViewPopover.qml:81
+#: ../amd64/qml/ui/ViewPopover.qml:81 ../i386/qml/ui/ViewPopover.qml:81
+#: ../multi/qml/ui/ViewPopover.qml:81 ../src/app/qml/ui/ViewPopover.qml:81
msgid "Sort By"
msgstr ""
-#: ../src/app/qml/ui/ViewPopover.qml:92
+#: ../amd64/qml/ui/ViewPopover.qml:92 ../i386/qml/ui/ViewPopover.qml:92
+#: ../multi/qml/ui/ViewPopover.qml:92 ../src/app/qml/ui/ViewPopover.qml:92
msgid "Name"
msgstr ""
-#: ../src/app/qml/ui/ViewPopover.qml:93
+#: ../amd64/qml/ui/ViewPopover.qml:93 ../i386/qml/ui/ViewPopover.qml:93
+#: ../multi/qml/ui/ViewPopover.qml:93 ../src/app/qml/ui/ViewPopover.qml:93
msgid "Date"
msgstr ""
-#: ../src/app/qml/ui/ViewPopover.qml:103
+#: ../amd64/qml/ui/ViewPopover.qml:103 ../i386/qml/ui/ViewPopover.qml:103
+#: ../multi/qml/ui/ViewPopover.qml:103 ../src/app/qml/ui/ViewPopover.qml:103
msgid "Sort Order"
msgstr ""
+#: ../amd64/qml/ui/ViewPopover.qml:114 ../amd64/qml/ui/ViewPopover.qml:119
+#: ../i386/qml/ui/ViewPopover.qml:114 ../i386/qml/ui/ViewPopover.qml:119
+#: ../multi/qml/ui/ViewPopover.qml:114 ../multi/qml/ui/ViewPopover.qml:119
#: ../src/app/qml/ui/ViewPopover.qml:114 ../src/app/qml/ui/ViewPopover.qml:119
msgid "Ascending"
msgstr ""
-#: ../src/app/qml/ui/ViewPopover.qml:115
+#: ../amd64/qml/ui/ViewPopover.qml:115 ../i386/qml/ui/ViewPopover.qml:115
+#: ../multi/qml/ui/ViewPopover.qml:115 ../src/app/qml/ui/ViewPopover.qml:115
msgid "Descending"
msgstr ""
-#: ../src/app/qml/ui/ViewPopover.qml:127
+#: ../amd64/qml/ui/ViewPopover.qml:127 ../i386/qml/ui/ViewPopover.qml:127
+#: ../multi/qml/ui/ViewPopover.qml:127 ../src/app/qml/ui/ViewPopover.qml:127
msgid "Filter"
msgstr ""
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:418
+#: ../src/app/qml/components/FolderIconView.qml:57
+#: ../src/app/qml/components/FolderListView.qml:35
+#, qt-format
+msgid "%1 (%2 file)"
+msgid_plural "%1 (%2 files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../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:679
+#: ../src/app/qml/ui/NotifyDialog.qml:25
+msgid "OK"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:512
+msgid "Extract Archive"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:513
+#, qt-format
+msgid "Are you sure you want to extract '%1' here?"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:596
+#: ../src/app/qml/ui/FolderListPage.qml:717
+msgid "Extract archive"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:658
+#, qt-format
+msgid "Extracting archive '%1'"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:694
+msgid "Extracting failed"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:695
+#, qt-format
+msgid "Extracting the archive '%1' failed."
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:709
+msgid "Archive file"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:710
+msgid "Do you want to extract the archive here?"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:727
+msgid "Open with another app"
+msgstr ""
+
+#: ../src/app/qml/ui/FolderListPage.qml:847
+msgid "Network"
+msgstr ""
+
+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:55
+msgid "User"
+msgstr ""
+
+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:66
+msgid "Password"
+msgstr ""
+
+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:79
+msgid "Save password"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:376
+msgid "Unknown"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:491
msgid "path or url may not exist or cannot be read"
msgstr ""
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:585
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:682
msgid "Rename error"
msgstr ""
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:610
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:703
msgid "Error creating new folder"
msgstr ""
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:1252
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:1351
msgid "items"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:263
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:327
msgid "File or Directory does not exist"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:264
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:328
msgid " does not exist"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:590
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:334
+msgid "Cannot access File or Directory"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:335
+msgid " it needs Authentication"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:366
+msgid "Cannot copy/move items"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:367
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1626
+msgid "no write permission on folder "
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:692
msgid "Could not remove the item "
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:631
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:733
msgid "Could not find a suitable name to backup"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:685
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:791
msgid "Could not create the directory"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:694
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:800
msgid "Could not create link to"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:706
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:812
msgid "Could not set permissions to dir"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:720
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:826
msgid "Could not open file"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:739
-msgid "There is no space on disk to copy"
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:845
+msgid "There is no space to copy"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:749
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:855
msgid "Could not create file"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:813
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:920
msgid "Could not remove the directory/file "
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:829
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:936
msgid "Could not move the directory/file "
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:863
-msgid "Cannot copy items"
-msgstr ""
-
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:864
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:883
-msgid "no write permission on folder "
-msgstr ""
-
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:882
-msgid "Cannot move items"
-msgstr ""
-
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:888
-msgid "origin and destination folders are the same"
-msgstr ""
-
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1104
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1196
msgid "Write error in "
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1120
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1212
msgid "Read error in "
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1354
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1450
msgid " Copy"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1410
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1510
msgid "Set permissions error in "
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1494
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1579
msgid "Could not create trash info file"
msgstr ""
-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1507
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1592
msgid "Could not remove the trash info file"
msgstr ""
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1617
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1625
+msgid "Cannot move items"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1619
+msgid "origin and destination folders are the same"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1663
+msgid "There is no space to download"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.cpp:72
+msgid "net tool not found, check samba installation"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.cpp:80
+msgid "cannot write in "
+msgstr ""
+
#: com.ubuntu.filemanager.desktop.in.in.h:1
msgid "File Manager"
msgstr ""
=== modified file 'tests/autopilot/filemanager/__init__.py'
--- tests/autopilot/filemanager/__init__.py 2016-01-14 16:44:26 +0000
+++ tests/autopilot/filemanager/__init__.py 2016-03-04 23:02:36 +0000
@@ -606,7 +606,7 @@
"""FileDetailsPopover Autopilot emulator."""
def get_path(self):
- return self.select_single('Label', objectName='pathLabel').text
+ return self.select_single('UCLabel', objectName='pathLabel').text
class PathBar(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py 2015-03-10 21:41:40 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py 2016-03-04 23:02:36 +0000
@@ -312,13 +312,10 @@
def test_copy_directory(self):
# Set up a directory to copy and a directory to copy it into.
- destination_dir_path = os.path.join(self.fakehome,
- 'destination')
- destination_dir_name = os.path.basename(destination_dir_path)
- os.mkdir(destination_dir_path)
- dir_to_copy_path = os.path.join(self.fakehome, 'to_copy')
- dir_to_copy_name = os.path.basename(dir_to_copy_path)
- os.mkdir(dir_to_copy_path)
+ destination_dir_path = self.make_directory_in_home()
+ destination_dir_name = os.path.basename(dir_path)
+ dir_to_copy_path = self.make_directory_in_home()
+ dir_to_copy_name = os.path.basename(dir_path)
folder_list_page = self.app.main_view.get_folder_list_page()
self._assert_number_of_files(2)
@@ -349,13 +346,10 @@
def test_cut_directory(self):
# Set up a directory to cut and a directory to move it into.
- destination_dir_path = os.path.join(self.fakehome,
- 'destination')
- destination_dir_name = os.path.basename(destination_dir_path)
- os.mkdir(destination_dir_path)
- dir_to_cut_path = os.path.join(self.fakehome, 'to_cut')
- dir_to_cut_name = os.path.basename(dir_to_cut_path)
- os.mkdir(dir_to_cut_path)
+ destination_dir_path = self.make_directory_in_home()
+ destination_dir_name = os.path.basename(dir_path)
+ dir_to_copy_path = self.make_directory_in_home()
+ dir_to_copy_name = os.path.basename(dir_path)
folder_list_page = self.app.main_view.get_folder_list_page()
self._assert_number_of_files(2)
