ubuntu-touch-coreapps-reviewers team mailing list archive

[Akiva <akiva@xxxxxxxxx>]

Akiva has proposed merging lp:~akiva/ubuntu-filemanager-app/testing-jenkins-ignore-me into lp:ubuntu-filemanager-app.

Commit message:
Testing Jenkins. Ignore me

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)

For more details, see:
https://code.launchpad.net/~akiva/ubuntu-filemanager-app/testing-jenkins-ignore-me/+merge/264253

Testing Jenkins. Ignore me

No changes were made to this branch, so if it fails, then trunk is a corrupt image.
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~akiva/ubuntu-filemanager-app/testing-jenkins-ignore-me into lp:ubuntu-filemanager-app.

=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot	2015-06-03 11:54:36 +0000
+++ po/com.ubuntu.filemanager.pot	2015-07-09 10:19:08 +0000
@@ -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: 2015-07-09 01:29-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -403,19 +403,23 @@
 msgid "Filter"
 msgstr ""
 
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:418
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:374
+msgid "unkown"
+msgstr ""
+
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:470
 msgid "path or url may not exist or cannot be read"
 msgstr ""
 
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:585
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:638
 msgid "Rename error"
 msgstr ""
 
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:610
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:663
 msgid "Error creating new folder"
 msgstr ""
 
-#: ../src/plugin/folderlistmodel/dirmodel.cpp:1252
+#: ../src/plugin/folderlistmodel/dirmodel.cpp:1299
 msgid "items"
 msgstr ""
 
@@ -508,6 +512,14 @@
 msgid "Could not remove the trash info file"
 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 'src/app/qml/ui/AuthenticationDialog.qml'
--- src/app/qml/ui/AuthenticationDialog.qml	2014-10-28 22:21:55 +0000
+++ src/app/qml/ui/AuthenticationDialog.qml	2015-07-09 10:19:08 +0000
@@ -20,7 +20,7 @@
 import Ubuntu.Components.Popups 1.0
 
 Dialog {
-    id: root
+    id:  root
 
     title: i18n.tr("Authentication required")