Ubuntu File Manager App

Merge lp:~popey/ubuntu-filemanager-app/update-colours into lp:ubuntu-filemanager-app

  1. update-colours
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Rejected
Rejected by: Alan Pope 🍺🐧🐱 🦄
Proposed branch: lp:~popey/ubuntu-filemanager-app/update-colours
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13
Diff against target: 612 lines (+108/-148)
7 files modified
com.ubuntu.filemanager.desktop.in.in (+2/-0)
po/com.ubuntu.filemanager.pot (+93/-136)
src/app/qml/components/PathHistoryRow.qml (+5/-5)
src/app/qml/components/PlacesSidebar.qml (+1/-0)
src/app/qml/filemanager.qml (+3/-3)
src/app/qml/upstream/FakeHeader.qml (+2/-2)
src/app/qml/upstream/PageWithBottomEdge.qml (+2/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-filemanager-app/update-colours
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Needs Fixing
Ubuntu File Manager Developers Pending
Review via email: mp+283206@code.launchpad.net

Commit message

Change colour theme to match other core apps

Description of the change

Change colour theme to match other core apps

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:522
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/146/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/423/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/146/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:522
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/149/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/426/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/149/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Looks fine to me, except that the commit includes changes to .pot file. If I remember correctly these should not be committed.

Then there is of course the issue of autopilot failing...

lp:~popey/ubuntu-filemanager-app/update-colours updated
523. By Alan Pope 🍺🐧🐱 🦄

remove erroneous pot file change

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:523
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/199/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/485/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/199/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

523. By Alan Pope 🍺🐧🐱 🦄

remove erroneous pot file change

522. By Alan Pope 🍺🐧🐱 🦄

Change colour theme to match other core apps

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'com.ubuntu.filemanager.desktop.in.in'
--- com.ubuntu.filemanager.desktop.in.in 2014-08-13 08:36:53 +0000
+++ com.ubuntu.filemanager.desktop.in.in 2016-01-28 20:47:21 +0000
@@ -7,3 +7,5 @@
7_Name=File Manager7_Name=File Manager
8X-Ubuntu-Touch=true8X-Ubuntu-Touch=true
9X-Ubuntu-Default-Department-ID=accessories9X-Ubuntu-Default-Department-ID=accessories
10X-Ubuntu-Splash-Show-Header=true
11X-Ubuntu-Splash-Color=#F5F5F5
1012
=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot 2016-01-28 20:47:21 +0000
+++ po/com.ubuntu.filemanager.pot 2015-06-03 11:54:36 +0000
@@ -1,6 +1,6 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Canonical Ltd.2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the package.3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
6#, fuzzy6#, fuzzy
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-01-18 11:27+0100\n"11"POT-Creation-Date: 2015-03-12 21:23+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,7 @@
27msgstr[1] ""27msgstr[1] ""
2828
29#: ../src/app/qml/components/PathHistoryRow.qml:8429#: ../src/app/qml/components/PathHistoryRow.qml:84
30#: ../src/app/qml/ui/FolderListPage.qml:84530#: ../src/app/qml/ui/FolderListPage.qml:830
31msgid "Device"31msgid "Device"
32msgstr ""32msgstr ""
3333
@@ -50,18 +50,17 @@
50msgid "Change app settings"50msgid "Change app settings"
51msgstr ""51msgstr ""
5252
53#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:37953#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:365
54#: ../src/app/qml/ui/ViewPopover.qml:7054#: ../src/app/qml/ui/ViewPopover.qml:70
55msgid "Icons"55msgid "Icons"
56msgstr ""56msgstr ""
5757
58#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:39558#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:381
59#: ../src/app/qml/ui/ViewPopover.qml:7159#: ../src/app/qml/ui/ViewPopover.qml:71
60msgid "List"60msgid "List"
61msgstr ""61msgstr ""
6262
63#: ../src/app/qml/ui/AuthenticationDialog.qml:2563#: ../src/app/qml/ui/AuthenticationDialog.qml:25
64#: ../src/app/qml/ui/NetAuthenticationDialog.qml:26
65msgid "Authentication required"64msgid "Authentication required"
66msgstr ""65msgstr ""
6766
@@ -76,9 +75,8 @@
76#: ../src/app/qml/ui/AuthenticationDialog.qml:4975#: ../src/app/qml/ui/AuthenticationDialog.qml:49
77#: ../src/app/qml/ui/ConfirmDialog.qml:3176#: ../src/app/qml/ui/ConfirmDialog.qml:31
78#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:4777#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:47
79#: ../src/app/qml/ui/FolderListPage.qml:679
80#: ../src/app/qml/ui/NotifyDialog.qml:2578#: ../src/app/qml/ui/NotifyDialog.qml:25
81msgid "OK"79msgid "Ok"
82msgstr ""80msgstr ""
8381
84#: ../src/app/qml/ui/AuthenticationDialog.qml:6082#: ../src/app/qml/ui/AuthenticationDialog.qml:60
@@ -86,10 +84,10 @@
86#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:5784#: ../src/app/qml/ui/ConfirmDialogWithInput.qml:57
87#: ../src/app/qml/ui/FileActionDialog.qml:4585#: ../src/app/qml/ui/FileActionDialog.qml:45
88#: ../src/app/qml/ui/FileOperationProgressDialog.qml:4486#: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
89#: ../src/app/qml/ui/FolderListPage.qml:35787#: ../src/app/qml/ui/FolderListPage.qml:343
90#: ../src/app/qml/ui/FolderListPage.qml:67088#: ../src/app/qml/ui/FolderListPage.qml:673
91#: ../src/app/qml/ui/FolderListPage.qml:737 ../src/app/qml/ui/GoToDialog.qml:6789#: ../src/app/qml/ui/FolderListPage.qml:740
92#: ../src/app/qml/ui/NetAuthenticationDialog.qml:10890#: ../src/app/qml/ui/GoToDialog.qml:67
93msgid "Cancel"91msgid "Cancel"
94msgstr ""92msgstr ""
9593
@@ -167,7 +165,7 @@
167165
168#: ../src/app/qml/ui/FolderListPage.qml:79166#: ../src/app/qml/ui/FolderListPage.qml:79
169#: ../src/app/qml/ui/FolderListPage.qml:97167#: ../src/app/qml/ui/FolderListPage.qml:97
170#: ../src/app/qml/ui/FolderListPage.qml:607168#: ../src/app/qml/ui/FolderListPage.qml:610
171msgid "Properties"169msgid "Properties"
172msgstr ""170msgstr ""
173171
@@ -187,158 +185,158 @@
187msgid "Authentication failed"185msgid "Authentication failed"
188msgstr ""186msgstr ""
189187
190#: ../src/app/qml/ui/FolderListPage.qml:210188#: ../src/app/qml/ui/FolderListPage.qml:206
191#, qt-format189#, qt-format
192msgid "%1 file"190msgid "%1 file"
193msgid_plural "%1 files"191msgid_plural "%1 files"
194msgstr[0] ""192msgstr[0] ""
195msgstr[1] ""193msgstr[1] ""
196194
197#: ../src/app/qml/ui/FolderListPage.qml:254195#: ../src/app/qml/ui/FolderListPage.qml:240
198msgid "Open in a new tab"196msgid "Open in a new tab"
199msgstr ""197msgstr ""
200198
201#: ../src/app/qml/ui/FolderListPage.qml:262199#: ../src/app/qml/ui/FolderListPage.qml:248
202msgid "Close this tab"200msgid "Close this tab"
203msgstr ""201msgstr ""
204202
205#: ../src/app/qml/ui/FolderListPage.qml:275203#: ../src/app/qml/ui/FolderListPage.qml:261
206msgid "Create folder"204msgid "Create folder"
207msgstr ""205msgstr ""
208206
209#: ../src/app/qml/ui/FolderListPage.qml:276207#: ../src/app/qml/ui/FolderListPage.qml:262
210msgid "Enter name for new folder"208msgid "Enter name for new folder"
211msgstr ""209msgstr ""
212210
213#: ../src/app/qml/ui/FolderListPage.qml:292211#: ../src/app/qml/ui/FolderListPage.qml:278
214msgid "Create file"212msgid "Create file"
215msgstr ""213msgstr ""
216214
217#: ../src/app/qml/ui/FolderListPage.qml:293215#: ../src/app/qml/ui/FolderListPage.qml:279
218msgid "Enter name for new file"216msgid "Enter name for new file"
219msgstr ""217msgstr ""
220218
221#: ../src/app/qml/ui/FolderListPage.qml:342219#: ../src/app/qml/ui/FolderListPage.qml:328
222msgid "Select"220msgid "Select"
223msgstr ""221msgstr ""
224222
225#: ../src/app/qml/ui/FolderListPage.qml:439223#: ../src/app/qml/ui/FolderListPage.qml:425
226msgid "No files"224msgid "No files"
227msgstr ""225msgstr ""
228226
229#: ../src/app/qml/ui/FolderListPage.qml:459227#: ../src/app/qml/ui/FolderListPage.qml:445
230#: ../src/app/qml/ui/FolderListPage.qml:568228#: ../src/app/qml/ui/FolderListPage.qml:571
231msgid "Delete"229msgid "Delete"
232msgstr ""230msgstr ""
233231
234#: ../src/app/qml/ui/FolderListPage.qml:460232#: ../src/app/qml/ui/FolderListPage.qml:446
235#, qt-format233#, qt-format
236msgid "Are you sure you want to permanently delete '%1'?"234msgid "Are you sure you want to permanently delete '%1'?"
237msgstr ""235msgstr ""
238236
239#: ../src/app/qml/ui/FolderListPage.qml:465237#: ../src/app/qml/ui/FolderListPage.qml:451
240msgid "Deleting files"238msgid "Deleting files"
241msgstr ""239msgstr ""
242240
243#: ../src/app/qml/ui/FolderListPage.qml:483241#: ../src/app/qml/ui/FolderListPage.qml:469
244#: ../src/app/qml/ui/FolderListPage.qml:581242#: ../src/app/qml/ui/FolderListPage.qml:584
245msgid "Rename"243msgid "Rename"
246msgstr ""244msgstr ""
247245
248#: ../src/app/qml/ui/FolderListPage.qml:484246#: ../src/app/qml/ui/FolderListPage.qml:470
249msgid "Enter a new name"247msgid "Enter a new name"
250msgstr ""248msgstr ""
251249
252#: ../src/app/qml/ui/FolderListPage.qml:493250#: ../src/app/qml/ui/FolderListPage.qml:479
253msgid "Could not rename"251msgid "Could not rename"
254msgstr ""252msgstr ""
255253
256#: ../src/app/qml/ui/FolderListPage.qml:494254#: ../src/app/qml/ui/FolderListPage.qml:480
257msgid "Insufficient permissions or name already exists?"255msgid "Insufficient permissions or name already exists?"
258msgstr ""256msgstr ""
259257
260#: ../src/app/qml/ui/FolderListPage.qml:512258#: ../src/app/qml/ui/FolderListPage.qml:498
261msgid "Extract Archive"259msgid "Extract Archive"
262msgstr ""260msgstr ""
263261
264#: ../src/app/qml/ui/FolderListPage.qml:513262#: ../src/app/qml/ui/FolderListPage.qml:499
265#, qt-format263#, qt-format
266msgid "Are you sure you want to extract '%1' here?"264msgid "Are you sure you want to extract '%1' here?"
267msgstr ""265msgstr ""
268266
269#: ../src/app/qml/ui/FolderListPage.qml:545267#: ../src/app/qml/ui/FolderListPage.qml:548
270msgid "Cut"268msgid "Cut"
271msgstr ""269msgstr ""
272270
273#: ../src/app/qml/ui/FolderListPage.qml:556271#: ../src/app/qml/ui/FolderListPage.qml:559
274msgid "Copy"272msgid "Copy"
275msgstr ""273msgstr ""
276274
277#: ../src/app/qml/ui/FolderListPage.qml:596275#: ../src/app/qml/ui/FolderListPage.qml:599
278#: ../src/app/qml/ui/FolderListPage.qml:717276#: ../src/app/qml/ui/FolderListPage.qml:720
279msgid "Extract archive"277msgid "Extract archive"
280msgstr ""278msgstr ""
281279
282#: ../src/app/qml/ui/FolderListPage.qml:627280#: ../src/app/qml/ui/FolderListPage.qml:630
283msgid "File operation error"281msgid "File operation error"
284msgstr ""282msgstr ""
285283
286#: ../src/app/qml/ui/FolderListPage.qml:658284#: ../src/app/qml/ui/FolderListPage.qml:661
287#, qt-format285#, qt-format
288msgid "Extracting archive '%1'"286msgid "Extracting archive '%1'"
289msgstr ""287msgstr ""
290288
291#: ../src/app/qml/ui/FolderListPage.qml:694289#: ../src/app/qml/ui/FolderListPage.qml:682
290msgid "OK"
291msgstr ""
292
293#: ../src/app/qml/ui/FolderListPage.qml:697
292msgid "Extracting failed"294msgid "Extracting failed"
293msgstr ""295msgstr ""
294296
295#: ../src/app/qml/ui/FolderListPage.qml:695297#: ../src/app/qml/ui/FolderListPage.qml:698
296#, qt-format298#, qt-format
297msgid "Extracting the archive '%1' failed."299msgid "Extracting the archive '%1' failed."
298msgstr ""300msgstr ""
299301
300#: ../src/app/qml/ui/FolderListPage.qml:709302#: ../src/app/qml/ui/FolderListPage.qml:712
301msgid "Archive file"303msgid "Archive file"
302msgstr ""304msgstr ""
303305
304#: ../src/app/qml/ui/FolderListPage.qml:710306#: ../src/app/qml/ui/FolderListPage.qml:713
305msgid "Do you want to extract the archive here?"307msgid "Do you want to extract the archive here?"
306msgstr ""308msgstr ""
307309
308#: ../src/app/qml/ui/FolderListPage.qml:727310#: ../src/app/qml/ui/FolderListPage.qml:730
309msgid "Open with another app"311msgid "Open with another app"
310msgstr ""312msgstr ""
311313
312#: ../src/app/qml/ui/FolderListPage.qml:811314#: ../src/app/qml/ui/FolderListPage.qml:798
313msgid "~/Desktop"315msgid "~/Desktop"
314msgstr ""316msgstr ""
315317
316#: ../src/app/qml/ui/FolderListPage.qml:821318#: ../src/app/qml/ui/FolderListPage.qml:808
317msgid "~/Public"319msgid "~/Public"
318msgstr ""320msgstr ""
319321
320#: ../src/app/qml/ui/FolderListPage.qml:823322#: ../src/app/qml/ui/FolderListPage.qml:810
321msgid "~/Programs"323msgid "~/Programs"
322msgstr ""324msgstr ""
323325
324#: ../src/app/qml/ui/FolderListPage.qml:825326#: ../src/app/qml/ui/FolderListPage.qml:812
325msgid "~/Templates"327msgid "~/Templates"
326msgstr ""328msgstr ""
327329
328#: ../src/app/qml/ui/FolderListPage.qml:843330#: ../src/app/qml/ui/FolderListPage.qml:828
329msgid "Home"331msgid "Home"
330msgstr ""332msgstr ""
331333
332#: ../src/app/qml/ui/FolderListPage.qml:847334#: ../src/app/qml/ui/FolderListPage.qml:898
333msgid "Network"
334msgstr ""
335
336#: ../src/app/qml/ui/FolderListPage.qml:948
337msgid "Folder not accessible"335msgid "Folder not accessible"
338msgstr ""336msgstr ""
339337
340#. TRANSLATORS: this refers to a folder name338#. TRANSLATORS: this refers to a folder name
341#: ../src/app/qml/ui/FolderListPage.qml:950339#: ../src/app/qml/ui/FolderListPage.qml:900
342#, qt-format340#, qt-format
343msgid "Can not access %1"341msgid "Can not access %1"
344msgstr ""342msgstr ""
@@ -361,22 +359,6 @@
361msgid "Go"359msgid "Go"
362msgstr ""360msgstr ""
363361
364#: ../src/app/qml/ui/NetAuthenticationDialog.qml:55
365msgid "User"
366msgstr ""
367
368#: ../src/app/qml/ui/NetAuthenticationDialog.qml:66
369msgid "Password"
370msgstr ""
371
372#: ../src/app/qml/ui/NetAuthenticationDialog.qml:79
373msgid "Save password"
374msgstr ""
375
376#: ../src/app/qml/ui/NetAuthenticationDialog.qml:98
377msgid "Ok"
378msgstr ""
379
380#: ../src/app/qml/ui/SettingsSheet.qml:34362#: ../src/app/qml/ui/SettingsSheet.qml:34
381msgid "Close"363msgid "Close"
382msgstr ""364msgstr ""
@@ -421,136 +403,111 @@
421msgid "Filter"403msgid "Filter"
422msgstr ""404msgstr ""
423405
424#: ../src/plugin/folderlistmodel/dirmodel.cpp:376406#: ../src/plugin/folderlistmodel/dirmodel.cpp:418
425msgid "Unknown"
426msgstr ""
427
428#: ../src/plugin/folderlistmodel/dirmodel.cpp:491
429msgid "path or url may not exist or cannot be read"407msgid "path or url may not exist or cannot be read"
430msgstr ""408msgstr ""
431409
432#: ../src/plugin/folderlistmodel/dirmodel.cpp:682410#: ../src/plugin/folderlistmodel/dirmodel.cpp:585
433msgid "Rename error"411msgid "Rename error"
434msgstr ""412msgstr ""
435413
436#: ../src/plugin/folderlistmodel/dirmodel.cpp:703414#: ../src/plugin/folderlistmodel/dirmodel.cpp:610
437msgid "Error creating new folder"415msgid "Error creating new folder"
438msgstr ""416msgstr ""
439417
440#: ../src/plugin/folderlistmodel/dirmodel.cpp:1351418#: ../src/plugin/folderlistmodel/dirmodel.cpp:1252
441msgid "items"419msgid "items"
442msgstr ""420msgstr ""
443421
444#: ../src/plugin/folderlistmodel/filesystemaction.cpp:327422#: ../src/plugin/folderlistmodel/filesystemaction.cpp:263
445msgid "File or Directory does not exist"423msgid "File or Directory does not exist"
446msgstr ""424msgstr ""
447425
448#: ../src/plugin/folderlistmodel/filesystemaction.cpp:328426#: ../src/plugin/folderlistmodel/filesystemaction.cpp:264
449msgid " does not exist"427msgid " does not exist"
450msgstr ""428msgstr ""
451429
452#: ../src/plugin/folderlistmodel/filesystemaction.cpp:334430#: ../src/plugin/folderlistmodel/filesystemaction.cpp:590
453msgid "Cannot access File or Directory"
454msgstr ""
455
456#: ../src/plugin/folderlistmodel/filesystemaction.cpp:335
457msgid " it needs Authentication"
458msgstr ""
459
460#: ../src/plugin/folderlistmodel/filesystemaction.cpp:366
461msgid "Cannot copy/move items"
462msgstr ""
463
464#: ../src/plugin/folderlistmodel/filesystemaction.cpp:367
465#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1626
466msgid "no write permission on folder "
467msgstr ""
468
469#: ../src/plugin/folderlistmodel/filesystemaction.cpp:692
470msgid "Could not remove the item "431msgid "Could not remove the item "
471msgstr ""432msgstr ""
472433
473#: ../src/plugin/folderlistmodel/filesystemaction.cpp:733434#: ../src/plugin/folderlistmodel/filesystemaction.cpp:631
474msgid "Could not find a suitable name to backup"435msgid "Could not find a suitable name to backup"
475msgstr ""436msgstr ""
476437
477#: ../src/plugin/folderlistmodel/filesystemaction.cpp:791438#: ../src/plugin/folderlistmodel/filesystemaction.cpp:685
478msgid "Could not create the directory"439msgid "Could not create the directory"
479msgstr ""440msgstr ""
480441
481#: ../src/plugin/folderlistmodel/filesystemaction.cpp:800442#: ../src/plugin/folderlistmodel/filesystemaction.cpp:694
482msgid "Could not create link to"443msgid "Could not create link to"
483msgstr ""444msgstr ""
484445
485#: ../src/plugin/folderlistmodel/filesystemaction.cpp:812446#: ../src/plugin/folderlistmodel/filesystemaction.cpp:706
486msgid "Could not set permissions to dir"447msgid "Could not set permissions to dir"
487msgstr ""448msgstr ""
488449
489#: ../src/plugin/folderlistmodel/filesystemaction.cpp:826450#: ../src/plugin/folderlistmodel/filesystemaction.cpp:720
490msgid "Could not open file"451msgid "Could not open file"
491msgstr ""452msgstr ""
492453
493#: ../src/plugin/folderlistmodel/filesystemaction.cpp:845454#: ../src/plugin/folderlistmodel/filesystemaction.cpp:739
494msgid "There is no space to copy"455msgid "There is no space on disk to copy"
495msgstr ""456msgstr ""
496457
497#: ../src/plugin/folderlistmodel/filesystemaction.cpp:855458#: ../src/plugin/folderlistmodel/filesystemaction.cpp:749
498msgid "Could not create file"459msgid "Could not create file"
499msgstr ""460msgstr ""
500461
501#: ../src/plugin/folderlistmodel/filesystemaction.cpp:920462#: ../src/plugin/folderlistmodel/filesystemaction.cpp:813
502msgid "Could not remove the directory/file "463msgid "Could not remove the directory/file "
503msgstr ""464msgstr ""
504465
505#: ../src/plugin/folderlistmodel/filesystemaction.cpp:936466#: ../src/plugin/folderlistmodel/filesystemaction.cpp:829
506msgid "Could not move the directory/file "467msgid "Could not move the directory/file "
507msgstr ""468msgstr ""
508469
509#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1196470#: ../src/plugin/folderlistmodel/filesystemaction.cpp:863
471msgid "Cannot copy items"
472msgstr ""
473
474#: ../src/plugin/folderlistmodel/filesystemaction.cpp:864
475#: ../src/plugin/folderlistmodel/filesystemaction.cpp:883
476msgid "no write permission on folder "
477msgstr ""
478
479#: ../src/plugin/folderlistmodel/filesystemaction.cpp:882
480msgid "Cannot move items"
481msgstr ""
482
483#: ../src/plugin/folderlistmodel/filesystemaction.cpp:888
484msgid "origin and destination folders are the same"
485msgstr ""
486
487#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1104
510msgid "Write error in "488msgid "Write error in "
511msgstr ""489msgstr ""
512490
513#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1212491#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1120
514msgid "Read error in "492msgid "Read error in "
515msgstr ""493msgstr ""
516494
517#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1450495#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1354
518msgid " Copy"496msgid " Copy"
519msgstr ""497msgstr ""
520498
521#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1510499#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1410
522msgid "Set permissions error in "500msgid "Set permissions error in "
523msgstr ""501msgstr ""
524502
525#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1579503#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1494
526msgid "Could not create trash info file"504msgid "Could not create trash info file"
527msgstr ""505msgstr ""
528506
529#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1592507#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1507
530msgid "Could not remove the trash info file"508msgid "Could not remove the trash info file"
531msgstr ""509msgstr ""
532510
533#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1617
534#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1625
535msgid "Cannot move items"
536msgstr ""
537
538#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1619
539msgid "origin and destination folders are the same"
540msgstr ""
541
542#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1663
543msgid "There is no space to download"
544msgstr ""
545
546#: ../src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.cpp:72
547msgid "net tool not found, check samba installation"
548msgstr ""
549
550#: ../src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.cpp:80
551msgid "cannot write in "
552msgstr ""
553
554#: com.ubuntu.filemanager.desktop.in.in.h:1511#: com.ubuntu.filemanager.desktop.in.in.h:1
555msgid "File Manager"512msgid "File Manager"
556msgstr ""513msgstr ""
557514
=== modified file 'src/app/qml/components/PathHistoryRow.qml'
--- src/app/qml/components/PathHistoryRow.qml 2016-01-28 20:47:21 +0000
+++ src/app/qml/components/PathHistoryRow.qml 2016-01-28 20:47:21 +0000
@@ -84,7 +84,7 @@
84 text: i18n.tr("Device")84 text: i18n.tr("Device")
85 fontSize: flickable.textSize85 fontSize: flickable.textSize
86 anchors.verticalCenter: parent.verticalCenter86 anchors.verticalCenter: parent.verticalCenter
87 color: folder === "/" ? "white" : UbuntuColors.warmGrey87 color: UbuntuColors.darkGrey
88 clip: true88 clip: true
89 /* Maximum Width = Flickable Width */89 /* Maximum Width = Flickable Width */
90 width: if (contentWidth > flickable.width) { flickable.width }90 width: if (contentWidth > flickable.width) { flickable.width }
@@ -139,7 +139,7 @@
139 text: pathText(folder,index)139 text: pathText(folder,index)
140 fontSize: flickable.textSize140 fontSize: flickable.textSize
141 anchors.verticalCenter: parent.verticalCenter141 anchors.verticalCenter: parent.verticalCenter
142 color: repeater.model === index + 1 ? "white" : UbuntuColors.warmGrey142 color: repeater.model === index + 1 ? UbuntuColors.darkGrey : UbuntuColors.darkGrey
143 clip: true143 clip: true
144144
145 /* Maximum Width = Flickable Width */145 /* Maximum Width = Flickable Width */
@@ -153,7 +153,7 @@
153 width: flickable.iconWidth153 width: flickable.iconWidth
154 anchors.verticalCenter: parent.verticalCenter154 anchors.verticalCenter: parent.verticalCenter
155 anchors.right: label.left155 anchors.right: label.left
156 color: "white"156 color: UbuntuColors.darkGrey
157 // clip: true157 // clip: true
158 }158 }
159159
@@ -196,7 +196,7 @@
196 : pathText(repeater.memoryPath,index)196 : pathText(repeater.memoryPath,index)
197 fontSize: flickable.textSize197 fontSize: flickable.textSize
198 anchors.verticalCenter: parent.verticalCenter198 anchors.verticalCenter: parent.verticalCenter
199 color: UbuntuColors.warmGrey199 color: UbuntuColors.darkGrey
200 clip: true200 clip: true
201201
202 /* Maximum Width = Flickable Width */202 /* Maximum Width = Flickable Width */
@@ -210,7 +210,7 @@
210 width: flickable.iconWidth210 width: flickable.iconWidth
211 anchors.verticalCenter: parent.verticalCenter211 anchors.verticalCenter: parent.verticalCenter
212 anchors.right: memoryLabel.left212 anchors.right: memoryLabel.left
213 color: "white"213 color: UbuntuColors.darkGrey
214 // clip: true214 // clip: true
215 }215 }
216216
217217
=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml 2016-01-28 20:47:21 +0000
+++ src/app/qml/components/PlacesSidebar.qml 2016-01-28 20:47:21 +0000
@@ -25,6 +25,7 @@
25 id: root25 id: root
2626
27 //color: Qt.rgba(0.5,0.5,0.5,0.3)27 //color: Qt.rgba(0.5,0.5,0.5,0.3)
28 color: "#F5F5F5"
28 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 029 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
2930
30 property bool collapsed: collapsedSidebar31 property bool collapsed: collapsedSidebar
3132
=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml 2016-01-28 20:47:21 +0000
+++ src/app/qml/filemanager.qml 2016-01-28 20:47:21 +0000
@@ -50,9 +50,9 @@
5050
51 property bool showSidebar: width >= units.gu(50)51 property bool showSidebar: width >= units.gu(50)
5252
53 headerColor: "#464646"53 headerColor: "#F5F5F5"
54 backgroundColor: "#464646"54 backgroundColor: "#F5F5F5"
55 footerColor: "#464646"55 footerColor: "#F5F5F5"
5656
57 QtObject {57 QtObject {
58 id: fileSelector58 id: fileSelector
5959
=== modified file 'src/app/qml/upstream/FakeHeader.qml'
--- src/app/qml/upstream/FakeHeader.qml 2016-01-28 20:47:21 +0000
+++ src/app/qml/upstream/FakeHeader.qml 2016-01-28 20:47:21 +0000
@@ -25,9 +25,9 @@
25 Rectangle {25 Rectangle {
26 height: units.gu(7)26 height: units.gu(7)
27 width: parent.width27 width: parent.width
28 color: "#464646"28 color: "#F5F5F5"
29 }29 }
30 30
31 Rectangle {31 Rectangle {
32 color: Qt.rgba(0.2,0.2,0.2,0.97)32 color: Qt.rgba(0.2,0.2,0.2,0.97)
33 height: units.gu(2)33 height: units.gu(2)
3434
=== modified file 'src/app/qml/upstream/PageWithBottomEdge.qml'
--- src/app/qml/upstream/PageWithBottomEdge.qml 2016-01-28 20:47:21 +0000
+++ src/app/qml/upstream/PageWithBottomEdge.qml 2016-01-28 20:47:21 +0000
@@ -176,7 +176,7 @@
176 z: 1176 z: 1
177 width: tipLabel.paintedWidth + units.gu(6)177 width: tipLabel.paintedWidth + units.gu(6)
178 height: bottomEdge.tipHeight + units.gu(1)178 height: bottomEdge.tipHeight + units.gu(1)
179 color: "#464646"179 color: "#F5F5F5"
180 Label {180 Label {
181 id: tipLabel181 id: tipLabel
182182
@@ -292,7 +292,7 @@
292 readonly property int pageStartY: fakeHeader.height292 readonly property int pageStartY: fakeHeader.height
293293
294 z: 1294 z: 1
295 color: "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97)295 color: "#F5F5F5" // "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97)
296 // color: Theme.palette.normal.background296 // color: Theme.palette.normal.background
297 clip: true297 clip: true
298 anchors {298 anchors {

Subscribers

People subscribed via source and target branches