← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/plugins-renaming into lp:ubuntu-docviewer-app

 

Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/plugins-renaming into lp:ubuntu-docviewer-app.

Commit message:
- Moved DocumentsModel class in the DocumentViewer module.
- Refactored DocviewerFile class
- Refactored DocumentsModel class
- Use SortFilterModel from Ubuntu.Components, instead of QSortFilterProxyModel
- Renamed com.ubuntu.popplerqmlplugin module in DocumentViewer.PDF
- Renamed com.ubuntu.fileqmlplugin module in DocumentViewer
- Removed FileReader class
- Added support for testing DocumentsModel class through Autopilot

Requested reviews:
  Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot): continuous-integration
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
  Bug #1445011 in Ubuntu Document Viewer App: "DocviewerFile class sends pathChanged signal twice"
  https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1445011

For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/plugins-renaming/+merge/256353

First 3169 lines of diff are about translations.
We really need to stop this, by removing automatic update of the template.

I say sorry to any victim that will review this MP. :-)

*** List of changes:
* Refactored DocviewerFile class
This solves a long standing issue that used to make PDF plugin to load pages twice. No more need for workaround it.

* Renamed com.ubuntu.popplerqmlplugin module in DocumentViewer.PDF
I just don't like the old name.

* Renamed com.ubuntu.fileqmlplugin module in DocumentViewer
Same as above.

* Moved DocumentsModel class in the DocumentViewer module.
As pointed out in the second last DocViewer meeting, we should move the ContentHub code (and so all the code that currently handles arguments parsing) on the "dark side" of QML.
This is a first step toward this goal.

* Also, there's no more a usage of QSortFilterProxyModel, but SortFilterModel from Ubuntu.Components is used to sort entries by date.

* Refactored DocumentsModel class
The current implementation of this class was pretty poor.
Now the FileSystemWatcher lives in a separate class and provide all the signals to track any change in a folder.
This will make things a lot easier, when we start working on SD card support.

* FileReader class has been deleted.
It has been never used during all the time we had it in the code.
We have another branch that will introduce a brand-new advanced text editor.

* Added a new argument (--documents-dir) for the application, when running it from command line.
That's supposed to be useful when we'll have to write some Autopilot test for the DocumentsModel class.
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/plugins-renaming into lp:ubuntu-docviewer-app.
=== modified file 'po/am.po'
--- po/am.po	2015-04-28 05:30:52 +0000
+++ po/am.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-08 19:28+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <am@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "ሰነድ መመልከቻ"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr "ከዚያ ቀደም ብሎ..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "ሰነድ መመልከቻ"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr "በመጫን ላይ..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "ሰነዶች: መመልከቻ: pdf: ማንበቢያ:"

=== modified file 'po/ast.po'
--- po/ast.po	2015-04-28 05:30:52 +0000
+++ po/ast.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-02-11 21:00+0000\n"
 "Last-Translator: ivarela <ivarela@xxxxxxxxxx>\n"
 "Language-Team: Asturian <ast@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Visor de documentos"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -236,6 +216,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visor de documentos"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -311,16 +296,16 @@
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documentos;visor;pdf;llector;"

=== modified file 'po/br.po'
--- po/br.po	2015-04-29 05:25:43 +0000
+++ po/br.po	2015-04-29 21:37:30 +0000
@@ -7,36 +7,16 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
-"PO-Revision-Date: 2015-04-28 08:02+0000\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
+"PO-Revision-Date: 2015-03-13 10:02+0000\n"
 "Last-Translator: Fohanno Thierry <thierry.fohanno@xxxxxxxxxxxx>\n"
 "Language-Team: Breton <br@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr "eilañ %1"
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Lenner teulioù"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -83,27 +63,27 @@
 
 #: ../src/app/qml/common/PickImportedDialog.qml:29
 msgid "Multiple documents imported"
-msgstr "Meur a deul enporzhiet"
+msgstr ""
 
 #: ../src/app/qml/common/PickImportedDialog.qml:30
 msgid "Choose which one to open:"
-msgstr "Choaz pehini digeriñ :"
+msgstr ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:28
 msgid "File not supported"
 msgid_plural "Files not supported"
-msgstr[0] "Restr ne c'haller ket ober ganti"
-msgstr[1] "Restroù ne c'haller ket ober ganto"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:29
 msgid "Following document has not been imported:"
 msgid_plural "Following documents have not been imported:"
-msgstr[0] "N'eo ket bet enporzhiet an teul-mañ :"
-msgstr[1] "N'eo ket bet enporzhiet an teulioù-mañ :"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/ToastWithAction.qml:97
 msgid "Dismiss"
-msgstr "Disteurel"
+msgstr ""
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
 msgid "Unknown file type"
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Abretoc'h c'hoazh..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Lenner teulioù"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -268,7 +253,7 @@
 
 #: ../src/app/qml/pdfView/PdfContentsPage.qml:32
 msgid "Hide table of contents"
-msgstr "Kuzhat an daolenn"
+msgstr ""
 
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
@@ -289,12 +274,12 @@
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
 msgid "Disable night mode"
-msgstr "diweredekaat ar mod noz"
+msgstr ""
 
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
 msgid "Enable night mode"
-msgstr "Gweredekaat ar mod noz"
+msgstr ""
 
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
 msgid "Go to page"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "O kargañ..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
-msgstr[0] "Teul enporzhiet evel ma oa dleet !"
-msgstr[1] "Teulioù enporzhiet evel ma oa dleet !"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
-msgstr "Digeriñ"
+msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "teulioù;diskouezer;pdf;lenner"

=== modified file 'po/ca.po'
--- po/ca.po	2015-04-28 05:30:52 +0000
+++ po/ca.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 11:20+0000\n"
 "Last-Translator: David Planella <david.planella@xxxxxxxxxx>\n"
 "Language-Team: Catalan <ca@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Visualitzador de documents"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visualitzador de documents"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-04-27 16:02:40 +0000
+++ po/com.ubuntu.docviewer.pot	2015-04-29 21:37:30 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-29 23:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -32,9 +32,9 @@
 msgid "copy %1"
 msgstr ""
 
-#: ../src/app/docviewer-application.cpp:164
+#: ../src/app/docviewer-application.cpp:171
 #: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /home/stefano/Progetti/doc-viewer/build-plugins-renaming-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
 msgid "Document Viewer"
 msgstr ""
 
@@ -214,23 +214,23 @@
 msgid "dd-MM-yyyy hh:mm"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentListView.qml:135
+#: ../src/app/qml/documentPage/DocumentListView.qml:136
 msgid "Today"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentListView.qml:138
+#: ../src/app/qml/documentPage/DocumentListView.qml:139
 msgid "Yesterday"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentListView.qml:141
+#: ../src/app/qml/documentPage/DocumentListView.qml:142
 msgid "Earlier this week"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentListView.qml:144
+#: ../src/app/qml/documentPage/DocumentListView.qml:145
 msgid "Earlier this month"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentListView.qml:146
+#: ../src/app/qml/documentPage/DocumentListView.qml:147
 msgid "Even earlier..."
 msgstr ""
 
@@ -309,16 +309,16 @@
 msgid "Loading..."
 msgstr ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:202
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:205
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-plugins-renaming-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'po/cs.po'
--- po/cs.po	2015-04-28 05:30:52 +0000
+++ po/cs.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 13:53+0000\n"
 "Last-Translator: Vojtěch Daněk <vdanek@xxxxxxxxxxx>\n"
 "Language-Team: Czech <cs@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr ""
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr ""
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'po/da.po'
--- po/da.po	2015-04-28 05:30:52 +0000
+++ po/da.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-26 14:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr ""
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr ""
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'po/de.po'
--- po/de.po	2015-04-28 05:30:52 +0000
+++ po/de.po	2015-04-29 21:37:30 +0000
@@ -7,36 +7,16 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
-"PO-Revision-Date: 2015-04-21 13:50+0000\n"
-"Last-Translator: Tobias Bannert <Unknown>\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
+"PO-Revision-Date: 2015-03-07 13:50+0000\n"
+"Last-Translator: Phillip Sz <Unknown>\n"
 "Language-Team: German <de@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Dokumentenbetrachter"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -83,27 +63,27 @@
 
 #: ../src/app/qml/common/PickImportedDialog.qml:29
 msgid "Multiple documents imported"
-msgstr "Mehrere Dokumente importiert"
+msgstr ""
 
 #: ../src/app/qml/common/PickImportedDialog.qml:30
 msgid "Choose which one to open:"
-msgstr "Ein zu öffnendes Dokument auswählen:"
+msgstr ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:28
 msgid "File not supported"
 msgid_plural "Files not supported"
-msgstr[0] "Datei wird nicht unterstützt"
-msgstr[1] "Dateien werden nicht unterstützt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:29
 msgid "Following document has not been imported:"
 msgid_plural "Following documents have not been imported:"
-msgstr[0] "Das folgende Dokument ist nicht importiert worden:"
-msgstr[1] "Die folgenden Dokumente sind nicht importiert worden:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/ToastWithAction.qml:97
 msgid "Dismiss"
-msgstr "Verwerfen"
+msgstr ""
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
 msgid "Unknown file type"
@@ -114,8 +94,6 @@
 "Sorry but we can't find a way to display this file. Do you want to open it "
 "as a plain text?"
 msgstr ""
-"Leider kann diese Datei nicht angezeigt werden. Möchten Sie sie als "
-"einfachen Text öffnen?"
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:29
 msgid "Yes"
@@ -147,7 +125,7 @@
 #: ../src/app/qml/common/utils.js:33
 #, qt-format
 msgid "%1 byte"
-msgstr "%1 Byte"
+msgstr "%1 byte"
 
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:28
 msgid "Delete file"
@@ -157,16 +135,14 @@
 #, qt-format
 msgid "Delete %1 file"
 msgid_plural "Delete %1 files"
-msgstr[0] "%1 Datei löschen"
-msgstr[1] "%1 Dateien löschen"
+msgstr[0] "Datei %1 löschen"
+msgstr[1] "Dateien %1 löschen"
 
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:30
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:31
 msgid "Are you sure you want to permanently delete this file?"
 msgid_plural "Are you sure you want to permanently delete these files?"
-msgstr[0] "Sind Sie sicher, dass Sie diese Datei dauerhaft löschen möchten?"
-msgstr[1] ""
-"Sind Sie sicher, dass Sie diese Dateien dauerhaft löschen möchten?"
+msgstr[0] "Sind Sie sicher, dass Sie diese Datei permanent löschen möchten?"
 
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
@@ -188,8 +164,6 @@
 "Connect your device to any computer and simply drag files to the Documents "
 "folder."
 msgstr ""
-"Verbinden Sie Ihr Gerät mit einem Rechner und ziehen Sie die Dateien ganz "
-"einfach in den Dokumentenordner."
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
@@ -210,14 +184,14 @@
 #: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45
 #: ../src/app/qml/documentPage/DocumentListDelegate.qml:35
 msgid "dddd, hh:mm"
-msgstr "dddd, hh:mm"
+msgstr ""
 
 #. TRANSLATORS: this is a datetime formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
 #: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49
 #: ../src/app/qml/documentPage/DocumentListDelegate.qml:39
 msgid "dd-MM-yyyy hh:mm"
-msgstr "dd.MM.yyyy hh:mm"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentListView.qml:135
 msgid "Today"
@@ -229,25 +203,30 @@
 
 #: ../src/app/qml/documentPage/DocumentListView.qml:141
 msgid "Earlier this week"
-msgstr "Anfang der  Woche"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentListView.qml:144
 msgid "Earlier this month"
-msgstr "Anfang des Monats"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentListView.qml:146
 msgid "Even earlier..."
-msgstr "Noch früher …"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Dokumentenbetrachter"
 
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
-msgstr "Zur Listenansicht wechseln"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to grid"
-msgstr "Zur Rasteransicht wechseln"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
 msgid "Pick"
@@ -269,7 +248,7 @@
 
 #: ../src/app/qml/pdfView/PdfContentsPage.qml:32
 msgid "Hide table of contents"
-msgstr "Inhaltsverzeichnis ausblenden"
+msgstr ""
 
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
@@ -285,26 +264,26 @@
 
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
 msgid "Go to page..."
-msgstr "Zu Seite gehen …"
+msgstr ""
 
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
 msgid "Disable night mode"
-msgstr "Nachtmodus deaktivieren"
+msgstr ""
 
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
 msgid "Enable night mode"
-msgstr "Nachtmodus aktivieren"
+msgstr ""
 
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
 msgid "Go to page"
-msgstr "Zu Seite gehen"
+msgstr "Gehe zu Seite"
 
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
 #, qt-format
 msgid "Choose a page between 1 and %1"
-msgstr "Bitte eine Seite zwischen 1 und %1 auswählen"
+msgstr ""
 
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
 msgid "GO!"
@@ -312,18 +291,18 @@
 
 #: ../src/app/qml/textView/TextView.qml:42
 msgid "Loading..."
-msgstr "Wird geladen …"
+msgstr "Laden …"
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
-msgstr[0] "Dokument erfolgreich importiert!"
-msgstr[1] "Dokumente erfolgreich importiert!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
-msgstr "Öffnen"
+msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
-msgstr "Dokumente;Betrachter;PDF;Leser;Dokumentenbetrachter;PDF-Betrachter"
+msgstr ""

=== modified file 'po/el.po'
--- po/el.po	2015-04-28 05:30:52 +0000
+++ po/el.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-08 18:24+0000\n"
 "Last-Translator: Aggelos Arnaoutis <angelosarn@xxxxxxxxxxx>\n"
 "Language-Team: Greek <el@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Προβολέας εγγράφων"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Ακόμα νωρίτερα"
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Προβολέας εγγράφων"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Φόρτωση..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2015-04-28 05:30:52 +0000
+++ po/en_AU.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 11:15+0000\n"
 "Last-Translator: Joel Addison <jaddi27@xxxxxxxxx>\n"
 "Language-Team: English (Australia) <en_AU@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Document Viewer"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Even earlier..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Document Viewer"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Loading..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documents;viewer;pdf;reader;"

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2015-04-28 05:30:52 +0000
+++ po/en_GB.po	2015-04-29 21:37:30 +0000
@@ -7,36 +7,16 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
-"PO-Revision-Date: 2015-04-17 13:29+0000\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
+"PO-Revision-Date: 2015-04-13 13:05+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Document Viewer"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -83,27 +63,27 @@
 
 #: ../src/app/qml/common/PickImportedDialog.qml:29
 msgid "Multiple documents imported"
-msgstr "Multiple documents imported"
+msgstr ""
 
 #: ../src/app/qml/common/PickImportedDialog.qml:30
 msgid "Choose which one to open:"
-msgstr "Choose which one to open:"
+msgstr ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:28
 msgid "File not supported"
 msgid_plural "Files not supported"
-msgstr[0] "File not supported"
-msgstr[1] "Files not supported"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:29
 msgid "Following document has not been imported:"
 msgid_plural "Following documents have not been imported:"
-msgstr[0] "Following document has not been imported:"
-msgstr[1] "Following documents have not been imported:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/ToastWithAction.qml:97
 msgid "Dismiss"
-msgstr "Dismiss"
+msgstr ""
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
 msgid "Unknown file type"
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Even earlier..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Document Viewer"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Loading..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
-msgstr[0] "Document successfully imported!"
-msgstr[1] "Documents successfully imported!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
-msgstr "Open"
+msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documents;viewer;pdf;reader;"

=== modified file 'po/eo.po'
--- po/eo.po	2015-04-28 05:30:52 +0000
+++ po/eo.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-03 23:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr ""
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr ""
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'po/es.po'
--- po/es.po	2015-04-28 05:30:52 +0000
+++ po/es.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-05 17:59+0000\n"
 "Last-Translator: Adolfo Jayme <fitoschido@xxxxxxxxx>\n"
 "Language-Team: Spanish <es@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Visor de documentos"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -237,6 +217,11 @@
 msgid "Even earlier..."
 msgstr "Aún antes…"
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visor de documentos"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -312,16 +297,16 @@
 msgid "Loading..."
 msgstr "Cargando…"
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documentos;visor;pdf;lector;"

=== modified file 'po/eu.po'
--- po/eu.po	2015-04-28 05:30:52 +0000
+++ po/eu.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-23 21:50+0000\n"
 "Last-Translator: Asier Iturralde Sarasola <Unknown>\n"
 "Language-Team: Basque <eu@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Dokumentu-ikustailea"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Dokumentu-ikustailea"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "dokumentu;ikustailea;pdf;irakurlea"

=== modified file 'po/fi.po'
--- po/fi.po	2015-04-28 05:30:52 +0000
+++ po/fi.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-06 06:29+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@xxxxxxxxxxxxx>\n"
 "Language-Team: Finnish <fi@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Asiakirjakatselin"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Vielä aiemmin..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Asiakirjakatselin"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documents;viewer;pdf;reader;asiakirjat;dokumentit;katselin;lukija;"

=== modified file 'po/fr.po'
--- po/fr.po	2015-04-28 05:30:52 +0000
+++ po/fr.po	2015-04-29 21:37:30 +0000
@@ -7,36 +7,16 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
-"PO-Revision-Date: 2015-04-21 14:48+0000\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
+"PO-Revision-Date: 2015-04-10 00:23+0000\n"
 "Last-Translator: Anne <anneonyme017@xxxxxxxxx>\n"
 "Language-Team: French <fr@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Visionneuse de document"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -83,27 +63,27 @@
 
 #: ../src/app/qml/common/PickImportedDialog.qml:29
 msgid "Multiple documents imported"
-msgstr "Plusieurs documents ont été importés"
+msgstr ""
 
 #: ../src/app/qml/common/PickImportedDialog.qml:30
 msgid "Choose which one to open:"
-msgstr "Choisir lequel ouvrir :"
+msgstr ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:28
 msgid "File not supported"
 msgid_plural "Files not supported"
-msgstr[0] "Fichier non pris en charge"
-msgstr[1] "Fichiers non pris en charge"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:29
 msgid "Following document has not been imported:"
 msgid_plural "Following documents have not been imported:"
-msgstr[0] "Le document suivant n'a pas été importé :"
-msgstr[1] "Les documents suivants n'ont pas été importés :"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/ToastWithAction.qml:97
 msgid "Dismiss"
-msgstr "Faire disparaître"
+msgstr ""
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
 msgid "Unknown file type"
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Encore plus tôt ..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visionneuse de document"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -268,7 +253,7 @@
 
 #: ../src/app/qml/pdfView/PdfContentsPage.qml:32
 msgid "Hide table of contents"
-msgstr "Masquer la table des matières"
+msgstr ""
 
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
-msgstr[0] "Document importé avec succès !"
-msgstr[1] "Documents importés avec succès !"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
-msgstr "Ouvrir"
+msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documents;visionneuse;pdf;lecteur;"

=== modified file 'po/gd.po'
--- po/gd.po	2015-04-28 05:30:52 +0000
+++ po/gd.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-04-08 09:51+0000\n"
 "Last-Translator: GunChleoc <Unknown>\n"
 "Language-Team: Fòram na Gàidhlig\n"
@@ -16,30 +16,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 "Language: gd\n"
 
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Sealladair sgrìobhainnean"
-
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
@@ -252,6 +232,11 @@
 msgid "Even earlier..."
 msgstr "Fiù 's nas tràithe..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Sealladair sgrìobhainnean"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -327,17 +312,17 @@
 msgid "Loading..."
 msgstr "'Ga luchdadh..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""
 "documents;viewer;pdf;reader;sgrìobhainnean;sealladair;leughadair;inneal-"

=== modified file 'po/gl.po'
--- po/gl.po	2015-04-29 05:25:43 +0000
+++ po/gl.po	2015-04-29 21:37:30 +0000
@@ -7,36 +7,16 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
-"PO-Revision-Date: 2015-04-28 09:28+0000\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
+"PO-Revision-Date: 2015-04-14 14:01+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <gl@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr "copia %1"
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Visor de documentos"
+"X-Launchpad-Export-Date: 2015-04-15 05:28+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Incluso antes..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visor de documentos"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] "Documento importado correctamente."
 msgstr[1] "Documentos importados correctamente."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr "Abrir"
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documentos;visor;pdf;lector;"

=== modified file 'po/hu.po'
--- po/hu.po	2015-04-29 05:25:43 +0000
+++ po/hu.po	2015-04-29 21:37:30 +0000
@@ -7,36 +7,16 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
-"PO-Revision-Date: 2015-04-28 07:38+0000\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
+"PO-Revision-Date: 2015-04-13 06:43+0000\n"
 "Last-Translator: Richard Somlói <ricsipontaz@xxxxxxxxx>\n"
 "Language-Team: Hungarian <hu@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr "másolat %1"
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Dokumentummegjelenítő"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -83,27 +63,27 @@
 
 #: ../src/app/qml/common/PickImportedDialog.qml:29
 msgid "Multiple documents imported"
-msgstr "Több dokumentum lett importálva"
+msgstr ""
 
 #: ../src/app/qml/common/PickImportedDialog.qml:30
 msgid "Choose which one to open:"
-msgstr "Válassza ki a megnyitandót:"
+msgstr ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:28
 msgid "File not supported"
 msgid_plural "Files not supported"
-msgstr[0] "A fájl nem támogatott"
-msgstr[1] "A fájlok nem támogatottak"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:29
 msgid "Following document has not been imported:"
 msgid_plural "Following documents have not been imported:"
-msgstr[0] "A következő dokumentum nem került importálásra:"
-msgstr[1] "A következő dokumentumok nem kerültek importálásra:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/ToastWithAction.qml:97
 msgid "Dismiss"
-msgstr "Elvetés"
+msgstr ""
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
 msgid "Unknown file type"
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Még korábban…"
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Dokumentummegjelenítő"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -294,7 +279,7 @@
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
 msgid "Enable night mode"
-msgstr "Éjjeli mód"
+msgstr "Éjjeli mód engedélyezése"
 
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
 msgid "Go to page"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Betöltés…"
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
-msgstr[0] "A dokumentum sikeresen importálva!"
-msgstr[1] "A dokumentumok sikeresen importálva!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
-msgstr "Megnyitás"
+msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "dokumentumok;megtekintő;pdf;olvasó;"

=== modified file 'po/it.po'
--- po/it.po	2015-04-28 05:30:52 +0000
+++ po/it.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-05 09:46+0000\n"
 "Last-Translator: Claudio Arseni <claudio.arseni@xxxxxxxxx>\n"
 "Language-Team: Italian <it@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Visualizzatore di documenti"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Più vecchi..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visualizzatore di documenti"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Caricamento..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documenti;visualizzatore;pdf;lettore;viewer;reader;"

=== modified file 'po/lo.po'
--- po/lo.po	2015-04-28 05:30:52 +0000
+++ po/lo.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 07:27+0000\n"
 "Last-Translator: Anousak <anousak@xxxxxxxxx>\n"
 "Language-Team: Lao <lo@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "ຕົວເບີ່ງເອກະສານ"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "ຕົວເບີ່ງເອກະສານ"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr "ກໍາລັງໂຫຼດ...."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "ເກະສານ;ຕົວເບີ່ງ;ພີດີເເຟບ;ຕົວອ່ານ;"

=== modified file 'po/lv.po'
--- po/lv.po	2015-04-28 05:30:52 +0000
+++ po/lv.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-02-28 13:37+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
 "Language-Team: Latvian <lv@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Dokumentu skatītājs"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -236,6 +216,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Dokumentu skatītājs"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -311,16 +296,16 @@
 msgid "Loading..."
 msgstr "Ielādē..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "dokumenti;skatītājs;pdf;lasītājs;"

=== modified file 'po/nb.po'
--- po/nb.po	2015-04-28 05:30:52 +0000
+++ po/nb.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-31 14:53+0000\n"
 "Last-Translator: Mathias Bynke <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Dokumentvisning"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr "Enda tidligere"
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Dokumentvisning"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr "Laster inn …"
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "dokumenter;visning;pdf;leser;"

=== modified file 'po/nl.po'
--- po/nl.po	2015-04-28 05:30:52 +0000
+++ po/nl.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 15:47+0000\n"
 "Last-Translator: Hannie Dumoleyn <Unknown>\n"
 "Language-Team: Dutch <nl@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Documentenviewer"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Nog eerder…"
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Documentenviewer"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Bezig met laden…"
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documenten;viewer;pdf;lezer;"

=== modified file 'po/ny.po'
--- po/ny.po	2015-04-28 05:30:52 +0000
+++ po/ny.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-09 08:42+0000\n"
 "Last-Translator: Herald Luwizghie <luwizghieherald@xxxxxxxxx>\n"
 "Language-Team: Chewa; Chichewa; Nyanja <ny@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Chonela ma dokumenti"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Ngakhale m'mbuyomo"
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Chonela ma dokumenti"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Kusanthula..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "dokumenti;choonela;pdf;chowelengela;"

=== modified file 'po/pa.po'
--- po/pa.po	2015-04-28 05:30:52 +0000
+++ po/pa.po	2015-04-29 21:37:30 +0000
@@ -7,36 +7,16 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
-"PO-Revision-Date: 2015-04-18 07:15+0000\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
+"PO-Revision-Date: 2015-04-08 11:16+0000\n"
 "Last-Translator: Gursharnjit_Singh <ubuntuser13@xxxxxxxxx>\n"
 "Language-Team: Punjabi <pa@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "ਦਸਤਾਵੇਜ ਦਰਸ਼ਕ"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -83,27 +63,27 @@
 
 #: ../src/app/qml/common/PickImportedDialog.qml:29
 msgid "Multiple documents imported"
-msgstr "ਬਹੁਤਾਂਤ ਦਸਤਾਵੇਜ਼ਾਂ ਦੀ ਆਮਦ ਹੋਈ"
+msgstr ""
 
 #: ../src/app/qml/common/PickImportedDialog.qml:30
 msgid "Choose which one to open:"
-msgstr "ਚੁਣੋ ਕਿਸ ਵਾਲੇ ਨੂੰ ਖੋਲ੍ਹਣਾ:"
+msgstr ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:28
 msgid "File not supported"
 msgid_plural "Files not supported"
-msgstr[0] "ਫ਼ਾਈਲ ਸਹਿਯੋਗ ਨਹੀਂ ਕਰਦੀ"
-msgstr[1] "ਫ਼ਾਈਲਾਂ ਸਹਿਯੋਗ ਨਹੀਂ ਕਰਦੀਆਂ"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/RejectedImportDialog.qml:29
 msgid "Following document has not been imported:"
 msgid_plural "Following documents have not been imported:"
-msgstr[0] "ਅੱਗੇ ਦਿੱਤੇ ਦਸਤਾਵੇਜ਼ ਦੀ ਆਮਦ ਨਹੀਂ ਹੋ ਸਕੀ"
-msgstr[1] "ਅੱਗੇ ਦਿੱਤੇ ਦਸਤਾਵੇਜ਼ਾਂ ਦੀ ਆਮਦ ਨਹੀਂ ਹੋ ਸਕੀ"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/app/qml/common/ToastWithAction.qml:97
 msgid "Dismiss"
-msgstr "ਅਣਡਿੱਠ ਕਰੋ"
+msgstr ""
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
 msgid "Unknown file type"
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "ਇਸ ਤੋਂ ਪਹਿਲਾਂ..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "ਦਸਤਾਵੇਜ ਦਰਸ਼ਕ"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -268,7 +253,7 @@
 
 #: ../src/app/qml/pdfView/PdfContentsPage.qml:32
 msgid "Hide table of contents"
-msgstr "ਸਮੱਗਰੀ ਦੇ ਟੇਬਲ ਹਟਾਓ"
+msgstr ""
 
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "ਲੋਡ ਕਰ ਰਿਹਾ"
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
-msgstr[0] "ਦਸਤਾਵੇਜ਼ ਦੀ ਸਫ਼ਲਤਾਪੂਰਨ ਆਮਦ ਹੋਈ!"
-msgstr[1] "ਦਸਤਾਵੇਜ਼ਾਂ ਦੀ ਸਫ਼ਲਤਾਪੂਰਨ ਆਮਦ ਹੋਈ!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
-msgstr "ਖੋਲ੍ਹੋ"
+msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "ਦਸਤਾਵੇਜ;ਦਰਸਕ;pdf;ਰੀਡਰ;"

=== modified file 'po/pl.po'
--- po/pl.po	2015-04-28 05:30:52 +0000
+++ po/pl.po	2015-04-29 21:37:30 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
-"PO-Revision-Date: 2015-04-20 14:34+0000\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
+"PO-Revision-Date: 2015-01-26 13:29+0000\n"
 "Last-Translator: Bartosz Kosiorek <Unknown>\n"
 "Language-Team: Polish <pl@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -16,28 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Przeglądarka dokumentów"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -104,7 +84,7 @@
 
 #: ../src/app/qml/common/ToastWithAction.qml:97
 msgid "Dismiss"
-msgstr "Odrzuć"
+msgstr ""
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
 msgid "Unknown file type"
@@ -130,29 +110,29 @@
 #: ../src/app/qml/common/utils.js:22
 #, qt-format
 msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
 
 #. TRANSLATORS: %1 is the size of a file, expressed in MB
 #: ../src/app/qml/common/utils.js:26
 #, qt-format
 msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
 
 #. TRANSLATORS: %1 is the size of a file, expressed in kB
 #: ../src/app/qml/common/utils.js:30
 #, qt-format
 msgid "%1 kB"
-msgstr "%1 kB"
+msgstr ""
 
 #. TRANSLATORS: %1 is the size of a file, expressed in byte
 #: ../src/app/qml/common/utils.js:33
 #, qt-format
 msgid "%1 byte"
-msgstr "%1 bajtów"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:28
 msgid "Delete file"
-msgstr "Usuń plik"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:29
 #, qt-format
@@ -177,7 +157,7 @@
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
 msgid "Delete"
-msgstr "Usuń"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
 msgid "No document found"
@@ -219,11 +199,11 @@
 
 #: ../src/app/qml/documentPage/DocumentListView.qml:135
 msgid "Today"
-msgstr "Dzisiaj"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentListView.qml:138
 msgid "Yesterday"
-msgstr "Wczoraj"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentListView.qml:141
 msgid "Earlier this week"
@@ -237,6 +217,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Przeglądarka dokumentów"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -249,15 +234,15 @@
 
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
 msgid "Pick"
-msgstr "Wybierz"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
 msgid "Select None"
-msgstr "Odznacz wszystko"
+msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
 msgid "Select All"
-msgstr "Zaznacz wszystko"
+msgstr ""
 
 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
 #: ../src/app/qml/pdfView/PdfContentsPage.qml:26
@@ -312,16 +297,16 @@
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "dokumenty;przeglądarka;pdf;czytnik"

=== modified file 'po/pt.po'
--- po/pt.po	2015-04-28 05:30:52 +0000
+++ po/pt.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-04-02 16:24+0000\n"
 "Last-Translator: António Miranda <Unknown>\n"
 "Language-Team: Portuguese <pt@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Documentos"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Anteriormente"
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Documentos"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "A carregar..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "visualizador;documentos;leitor;pdf"

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2015-04-28 05:30:52 +0000
+++ po/pt_BR.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 02:07+0000\n"
 "Last-Translator: Rafael Neri <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Visualizador de documentos"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visualizador de documentos"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documentos;visualizador;pdf;leitor"

=== modified file 'po/ru.po'
--- po/ru.po	2015-04-28 05:30:52 +0000
+++ po/ru.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 06:59+0000\n"
 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <ru@xxxxxx>\n"
@@ -16,28 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Программа просмотра документов"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Программа просмотра документов"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "документы;просмотр;pdf;чтение;"

=== modified file 'po/sl.po'
--- po/sl.po	2015-04-28 05:30:52 +0000
+++ po/sl.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 18:08+0000\n"
 "Last-Translator: Damir Jerovšek <Unknown>\n"
 "Language-Team: Slovenian <sl@xxxxxx>\n"
@@ -16,28 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Pregledovalnik dokumentov"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -239,6 +219,11 @@
 msgid "Even earlier..."
 msgstr "Še prej ..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Pregledovalnik dokumentov"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -314,16 +299,16 @@
 msgid "Loading..."
 msgstr "Nalaganje …"
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "dokumenti;pregledovalnik;pdf;bralnik;"

=== modified file 'po/tr.po'
--- po/tr.po	2015-04-28 05:30:52 +0000
+++ po/tr.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-22 15:24+0000\n"
 "Last-Translator: Arda Ünlü <aarda.uunlu@xxxxxxxxx>\n"
 "Language-Team: Turkish <tr@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Belge Görüntüleyici"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -238,6 +218,11 @@
 msgid "Even earlier..."
 msgstr "Daha da eski..."
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Belge Görüntüleyici"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -313,16 +298,16 @@
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "belgeler;görüntüleyici;pdf;okuyucu;gösterici;"

=== modified file 'po/uk.po'
--- po/uk.po	2015-04-28 05:30:52 +0000
+++ po/uk.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 17:35+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@xxxxxxxxx>\n"
 "Language-Team: Ukrainian <uk@xxxxxx>\n"
@@ -16,28 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "Перегляд документів"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -239,6 +219,11 @@
 msgid "Even earlier..."
 msgstr "Раніше…"
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Перегляд документів"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -314,16 +299,16 @@
 msgid "Loading..."
 msgstr "Завантаження…"
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documents;viewer;pdf;reader;документи;перегляд;пдф;читання;"

=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2015-04-28 05:30:52 +0000
+++ po/zh_CN.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-04 01:02+0000\n"
 "Last-Translator: Luo Lei <luolei@xxxxxxxxxxxxxxx>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr ""
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr ""
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2015-04-28 05:30:52 +0000
+++ po/zh_TW.po	2015-04-29 21:37:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-27 18:02+0200\n"
+"POT-Creation-Date: 2015-04-13 17:55+0200\n"
 "PO-Revision-Date: 2015-03-01 07:42+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@xxxxxxxxx>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@xxxxxx>\n"
@@ -15,28 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-28 05:30+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:164
-#: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr "文件檢視器"
+"X-Launchpad-Export-Date: 2015-04-14 05:30+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
@@ -234,6 +214,11 @@
 msgid "Even earlier..."
 msgstr ""
 
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "文件檢視器"
+
 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
 msgid "Switch to single column list"
@@ -309,16 +294,16 @@
 msgid "Loading..."
 msgstr "載入中..."
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:183
+#: ../src/app/qml/ubuntu-docviewer-app.qml:167
 msgid "Document successfully imported!"
 msgid_plural "Documents successfully imported!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:186
+#: ../src/app/qml/ubuntu-docviewer-app.qml:170
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/tmp/build-ch-imported-documents-name-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-adv-import-handler-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documents;viewer;pdf;reader;文件;檢視器;閱讀器;"

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2015-04-20 16:24:06 +0000
+++ src/app/CMakeLists.txt	2015-04-29 21:37:30 +0000
@@ -14,7 +14,6 @@
     command-line-parser.cpp
     docviewer-application.cpp
     urlhandler.cpp
-    quick/documentmodel.cpp
     ${QML_SRCS}
 )
 

=== modified file 'src/app/command-line-parser.cpp'
--- src/app/command-line-parser.cpp	2015-04-10 15:41:35 +0000
+++ src/app/command-line-parser.cpp	2015-04-29 21:37:30 +0000
@@ -32,7 +32,8 @@
     : m_pickMode(false),
       m_testability(false),
       m_isFullscreen(false),
-      m_documentFile("")
+      m_documentFile(""),
+      m_documentsDir("")
 {
     m_urlHandler = new UrlHandler();
 }
@@ -61,6 +62,28 @@
         else if (args[i] == "--testability") {
             m_testability = true;
         }
+        else if (args[i].contains("--documents-dir")) {
+            // Extract the given path
+            QString dirPath = args[i].split("--documents-dir=").last();
+
+            if (!dirPath.isEmpty()) {
+                QDir di(dirPath);
+
+                if (di.exists())
+                    m_documentsDir = di.absolutePath();
+                else {
+                    QTextStream(stderr) << m_documentsDir << ": Not found" << endl;
+                    valid_args = false;
+                }
+
+                i++;
+            }
+            else {
+                QTextStream(stderr) << "Missing PATH argument for --documents-dir'" << endl;
+                usage();
+                valid_args = false;
+            }
+        }
         else {
             if (args[i].startsWith("--desktop_file_hint")) {
                 // ignore this command line switch, hybris uses it to get application info
@@ -95,6 +118,7 @@
     out << "  --fullscreen\trun fullscreen" << endl;
     out << "  --pick-mode\t\tEnable mode to pick photos" << endl;
     out << "  file_path\t\tOpens ubuntu-docviewer-app displaying the selected file" << endl;
+    out << "  --documents-dir=PATH\n\t\tLoad the list of documents from the given folder, instead of default ~/Documents.\nThe path must exist prior to running ubuntu-docviewer-app" << endl;
 }
 
 /*!

=== modified file 'src/app/command-line-parser.h'
--- src/app/command-line-parser.h	2015-04-10 15:41:35 +0000
+++ src/app/command-line-parser.h	2015-04-29 21:37:30 +0000
@@ -39,6 +39,7 @@
     bool processArguments(const QStringList& args);
 
     bool isFullscreen() const { return m_isFullscreen; }
+    const QString &documentsDir() const { return m_documentsDir; }
     bool pickModeEnabled() const { return m_pickMode; }
     bool testability() const { return m_testability; }
     const QString &documentFile() const { return m_documentFile; }
@@ -53,6 +54,7 @@
     bool m_pickMode;
     bool m_testability;
     QString m_documentFile;
+    QString m_documentsDir;
 };
 
 #endif // COMMANDLINEPARSER_H

=== modified file 'src/app/docviewer-application.cpp'
--- src/app/docviewer-application.cpp	2015-04-10 15:41:35 +0000
+++ src/app/docviewer-application.cpp	2015-04-29 21:37:30 +0000
@@ -21,7 +21,6 @@
 #include "content-communicator.h"
 #include "command-line-parser.h"
 #include "urlhandler.h"
-#include "quick/documentmodel.h"
 
 #include <QQuickItem>
 #include <QStandardPaths>
@@ -119,8 +118,6 @@
     // in the sistem if there is one
     importPathList.prepend(QCoreApplication::applicationDirPath() + "/../plugin/");
     m_view->engine()->setImportPathList(importPathList);
-
-    qmlRegisterType<SortFilterDocumentModel>("DocumentViewer", 1, 0, "DocumentsModel");
 }
 
 /*!
@@ -156,6 +153,16 @@
 }
 
 /*!
+ * \brief DocViewerApplication::getDocumentsDir
+ * Returns the documents dir passed as a parameter
+ */
+const QString& DocViewerApplication::getDocumentsDir() const
+{
+    return m_cmdLineParser->documentsDir();
+}
+
+
+/*!
  * \brief DocViewerApplication::createView
  * Create the master QDeclarativeView that all the pages will operate within
  */

=== modified file 'src/app/docviewer-application.h'
--- src/app/docviewer-application.h	2015-04-10 15:41:35 +0000
+++ src/app/docviewer-application.h	2015-04-29 21:37:30 +0000
@@ -41,6 +41,7 @@
     Q_PROPERTY(bool desktopMode READ isDesktopMode CONSTANT)
     Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged)
     Q_PROPERTY(QString documentFile READ getDocumentFile WRITE setDocumentFile NOTIFY documentFileChanged)
+    Q_PROPERTY(QString documentsDir READ getDocumentsDir CONSTANT)
 
 public:
     enum UiMode{
@@ -61,6 +62,7 @@
     bool isDesktopMode() const;
     bool isFullScreen() const;
     const QString &getDocumentFile() const;
+    const QString &getDocumentsDir() const;
 
     Q_INVOKABLE void returnPickedContent(QList<QString> paths);
     Q_INVOKABLE void contentPickingCanceled();

=== modified file 'src/app/qml/common/DetailsPage.qml'
--- src/app/qml/common/DetailsPage.qml	2015-03-04 17:44:36 +0000
+++ src/app/qml/common/DetailsPage.qml	2015-04-29 21:37:30 +0000
@@ -35,24 +35,24 @@
         }
         ListItem.Subtitled {
             text: i18n.tr("Size")
-            subText: Utils.printSize(i18n, file.size)
+            subText: Utils.printSize(i18n, file.info.size)
         }
 
         ListItem.Subtitled {
             text: i18n.tr("Created")
-            subText: file.creationTime.toLocaleString(Qt.locale())
+            subText: file.info.creationTime.toLocaleString(Qt.locale())
         }
 
         ListItem.Subtitled {
             text: i18n.tr("Last modified")
-            subText: file.lastModified.toLocaleString(Qt.locale())
+            subText: file.info.lastModified.toLocaleString(Qt.locale())
         }
 
         ListItem.Subtitled {
             id: mimetypeItem
             objectName: "mimetypeItem"
             text: i18n.tr("MIME type")
-            subText: file.mimetype
+            subText: file.mimetype.name
         }
     }
 }

=== modified file 'src/app/qml/documentPage/DeleteFileDialog.qml'
--- src/app/qml/documentPage/DeleteFileDialog.qml	2015-03-04 17:44:36 +0000
+++ src/app/qml/documentPage/DeleteFileDialog.qml	2015-04-29 21:37:30 +0000
@@ -43,13 +43,13 @@
 
         onClicked: {
             if (deleteFileDialog.path) {
-                folderModel.rm(path)
+                docModel.rm(path)
             } else {
                 var items = documentPage.view.item.selectedItems;
 
                 for (var i=0; i < items.count; i++) {
                     console.log("Removing:", items.get(i).model.path);
-                    folderModel.rm(items.get(i).model.path);
+                    docModel.rm(items.get(i).model.path);
                 }
             }
 

=== modified file 'src/app/qml/documentPage/DocumentGridView.qml'
--- src/app/qml/documentPage/DocumentGridView.qml	2015-02-13 15:30:01 +0000
+++ src/app/qml/documentPage/DocumentGridView.qml	2015-04-29 21:37:30 +0000
@@ -53,7 +53,7 @@
                 return
             }
             else {
-                file.path = model.path
+                mainView.openDocument(model.path)
             }
         }
 

=== modified file 'src/app/qml/documentPage/DocumentListView.qml'
--- src/app/qml/documentPage/DocumentListView.qml	2015-03-04 01:40:41 +0000
+++ src/app/qml/documentPage/DocumentListView.qml	2015-04-29 21:37:30 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
+import DocumentViewer 1.0
 
 import "../upstreamComponents"
 
@@ -114,7 +115,7 @@
             }
 
             else {
-                file.path = model.path
+                mainView.openDocument(model.path)
             }
         }
 
@@ -131,16 +132,16 @@
     section.property: "dateDiff"
     section.delegate: ListItem.Header {
         text: {
-            if (section == 0)
+            if (section == DocumentsModel.Today)
                 return i18n.tr("Today")
 
-            if (section == 1)
+            if (section == DocumentsModel.Yesterday)
                 return i18n.tr("Yesterday")
 
-            if (section == 2)
+            if (section == DocumentsModel.LastWeek)
                 return i18n.tr("Earlier this week")
 
-            if (section == 3)
+            if (section == DocumentsModel.LastMonth)
                 return i18n.tr("Earlier this month")
 
             return i18n.tr("Even earlier...")

=== modified file 'src/app/qml/pdfView/PdfView.qml'
--- src/app/qml/pdfView/PdfView.qml	2015-04-10 15:41:35 +0000
+++ src/app/qml/pdfView/PdfView.qml	2015-04-29 21:37:30 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.3
 import Ubuntu.Components 1.1
-import com.ubuntu.popplerqmlplugin 1.0 as PDF
+import DocumentViewer.PDF 1.0 as PDF
 
 import "../common/utils.js" as Utils
 import "../upstreamComponents"
@@ -99,8 +99,8 @@
         id: poppler
 
         property bool isLoading: true
+        path: file.path
 
-        Component.onCompleted: path = file.path
         onPagesLoaded: {
             isLoading = false;
 

=== modified file 'src/app/qml/textView/TextViewDefaultHeader.qml'
--- src/app/qml/textView/TextViewDefaultHeader.qml	2015-03-26 13:58:31 +0000
+++ src/app/qml/textView/TextViewDefaultHeader.qml	2015-04-29 21:37:30 +0000
@@ -51,7 +51,7 @@
                 elide: Text.ElideMiddle
 
                 fontSize: "small"
-                text: file.description
+                text: file.mimetype.description
             }
         }
     }

=== modified file 'src/app/qml/ubuntu-docviewer-app.qml'
--- src/app/qml/ubuntu-docviewer-app.qml	2015-04-14 14:16:16 +0000
+++ src/app/qml/ubuntu-docviewer-app.qml	2015-04-29 21:37:30 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.3
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
-import com.ubuntu.fileqmlplugin 1.0
 import DocumentViewer 1.0
 import QtQuick.Window 2.0
 
@@ -50,6 +49,13 @@
             path = path.replace("file://", "")
                        .replace("document://", "");
 
+            if (file.path === path) {
+                // File has been already initialized, so just open the viewer
+                LoadComponent.load(file.mimetype.name);
+
+                return
+            }
+
             file.path = path;
         }
     }
@@ -115,7 +121,7 @@
         id: file
         objectName: "file"
 
-        onMimetypeChanged: LoadComponent.load(mimetype)
+        onMimetypeChanged: LoadComponent.load(mimetype.name)
         onErrorChanged: {
             if (error == -1)
                 PopupUtils.open(Qt.resolvedUrl("common/FileNotFoundDialog.qml"),
@@ -123,7 +129,20 @@
         }
     }
 
-    DocumentsModel { id: folderModel }
+    SortFilterModel {
+        id: folderModel
+        model: DocumentsModel {
+            id: docModel
+
+            // Used for autopilot tests! If customDir is empty, this property is not used.
+            customDir: DOC_VIEWER.documentsDir
+        }
+
+        sort.property: "date"
+        sort.order: Qt.DescendingOrder
+        sortCaseSensitivity: Qt.CaseSensitive
+    }
+
     PageStack { id: pageStack }
 
     Connections {

=== removed directory 'src/app/quick'
=== modified file 'src/plugin/file-qml-plugin/CMakeLists.txt'
--- src/plugin/file-qml-plugin/CMakeLists.txt	2015-01-29 16:35:28 +0000
+++ src/plugin/file-qml-plugin/CMakeLists.txt	2015-04-29 21:37:30 +0000
@@ -1,11 +1,12 @@
-set(PLUGIN_DIR com/ubuntu/fileqmlplugin)
+set(PLUGIN_DIR DocumentViewer)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 #add the sources to compile
 set(fileqmlplugin_SRCS
 	backend.cpp
-	docviewerFile.cpp
-	fileReader.cpp
+	documentmodel.cpp
+        fswatcher.cpp
+	docviewerfile.cpp
 )
 
 add_library(fileqmlplugin MODULE

=== modified file 'src/plugin/file-qml-plugin/backend.cpp'
--- src/plugin/file-qml-plugin/backend.cpp	2015-01-29 16:24:50 +0000
+++ src/plugin/file-qml-plugin/backend.cpp	2015-04-29 21:37:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -19,18 +19,17 @@
 #include <QtQml/QQmlContext>
 
 #include "backend.h"
-#include "docviewerFile.h"
-#include "fileReader.h"
+#include "documentmodel.h"
+#include "docviewerfile.h"
 
 void BackendPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("com.ubuntu.fileqmlplugin"));
+    Q_ASSERT(uri == QLatin1String("DocumentViewer"));
     
-    //@uri com.ubuntu.fileqmlplugin
+    //@uri DocumentViewer
 
+    qmlRegisterType<DocumentModel>(uri, 1, 0, "DocumentsModel");
     qmlRegisterType<DocviewerFile>(uri, 1, 0, "File");
-    qmlRegisterType<FileReader>(uri, 1, 0, "FileReader");    
-
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/plugin/file-qml-plugin/backend.h'
--- src/plugin/file-qml-plugin/backend.h	2015-01-29 16:24:50 +0000
+++ src/plugin/file-qml-plugin/backend.h	2015-04-29 21:37:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013 - 2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -24,7 +24,7 @@
 /*
  ----8<-----
  
- import org.docviewer.file 1.0
+ import DocumentViewer 1.0
  
  Rectangle {
    width: 200

=== renamed file 'src/app/quick/documentmodel.cpp' => 'src/plugin/file-qml-plugin/documentmodel.cpp'
--- src/app/quick/documentmodel.cpp	2015-02-26 20:16:32 +0000
+++ src/plugin/file-qml-plugin/documentmodel.cpp	2015-04-29 21:37:30 +0000
@@ -16,95 +16,108 @@
  */
 
 #include "documentmodel.h"
+#include "fswatcher.h"
+
+#include <QStandardPaths>
+#include <QDirIterator>
+
+#include <QDir>
+#include <QFileInfo>
 
 #include <QMimeDatabase>
 #include <QDateTime>
-#include <QFileInfo>
-#include <QDir>
+
 #include <QDebug>
 
 DocumentModel::DocumentModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    m_docsMonitor = new QFileSystemWatcher;
-
-    connect(m_docsMonitor, SIGNAL(directoryChanged(QString)), this,
-            SLOT(_q_directoryChanged(QString)));
-
-    m_docsMonitor->addPath(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
-
-    Q_FOREACH (const QString dir, m_docsMonitor->directories()) {
-        parseDirectoryContent(dir);
-    }
-}
-
-void DocumentModel::_q_directoryChanged(QString path)
-{
-    QMutableListIterator<DocumentItem> i(m_docs);
-    int n = 0;
-    int m = 0;
-
-    while (i.hasNext()) {
-        if (i.next().path.startsWith(path)) {
-            beginRemoveRows(QModelIndex(), n-m, n-m);
-            i.remove();
-            endRemoveRows();
-            m++;
-        }
-        n++;
-    }
-
-    parseDirectoryContent(path);
-}
-
-void DocumentModel::parseDirectoryContent(QString path)
-{
-    QDirIterator dir(path, QDir::Files | QDir::NoDotAndDotDot | QDir::Readable,
-                     QDirIterator::Subdirectories);
-
-    while (dir.hasNext()) {
-        dir.next();
-
-        QDateTime now = QDateTime::currentDateTime();
-        //qDebug() << "Current date is:" << now.toString("dd-MM-yyyy");
-
-        QMimeDatabase db;
-        QString mimetype = db.mimeTypeForFile(dir.filePath()).name();
-
-        if (mimetype.startsWith("text/") || mimetype == "application/pdf") {
-            QFileInfo file(dir.filePath());
-            DocumentItem item;
-
-            QDateTime lastAccess = file.lastRead();
-
-            item.name = file.fileName();
-            item.path = file.absoluteFilePath();
-            item.mimetype = mimetype;
-            item.date = lastAccess.toMSecsSinceEpoch();
-            item.size = file.size();
-
-            qint64 dateDiff = lastAccess.daysTo(now);
-            if (dateDiff == 0) {
-                item.dateDiff = 0;
-            }
-            else if (dateDiff == 1) {
-                item.dateDiff = 1;
-            }
-            else if (dateDiff < 7) {
-                item.dateDiff = 2;
-            }
-            else if (dateDiff < 30) {
-                item.dateDiff = 3;
-            }
-            else {
-                item.dateDiff = 4;
-            }
-            //qDebug() << "Item" << item.name << "Date:" << item.date;
-            //qDebug() << "Item" << item.name << "Item date is:" << lastAccess.toString("dd-MM-yyyy") << "diff is" << dateDiff << "DateDiff is:" << item.dateDiff;
-
-            addDocumentEntry(item);
-        }
-    }
+    m_docsMonitor = new FSWatcher;
+
+    connect(m_docsMonitor, SIGNAL(fileAdded(QString)), this,
+            SLOT(q_fileAdded(QString)));
+    connect(m_docsMonitor, SIGNAL(fileRemoved(QString)), this,
+            SLOT(q_fileRemoved(QString)));
+    connect(m_docsMonitor, SIGNAL(fileModified(QString)), this,
+            SLOT(q_fileModified(QString)));
+
+    setWatchedDirs();
+}
+
+void DocumentModel::q_fileRemoved(const QString & path)
+{
+    for (int i=0; i<m_docs.length(); i++) {
+        if (m_docs.at(i).path == path) {
+            removeDocumentEntry(i);
+            break;
+        }
+    }
+}
+
+void DocumentModel::q_fileAdded(const QString & path)
+{
+    if (isFileSupported(path)) {
+        addDocumentEntry(createEntry(path));
+    }
+}
+
+void DocumentModel::q_fileModified(const QString & path)
+{
+    for (int i=0; i<m_docs.length(); i++) {
+        if (m_docs.at(i).path == path) {
+            m_docs[i] = createEntry(path);
+
+            break;
+        }
+    }
+}
+
+DocumentItem DocumentModel::createEntry(const QString &path)
+{
+    DocumentItem item;
+
+    QDateTime now = QDateTime::currentDateTime();
+    //qDebug() << "Current date is:" << now.toString("dd-MM-yyyy");
+
+    QFileInfo file(path);
+    QMimeDatabase db;
+
+    QDateTime lastAccess = file.lastRead();
+
+    item.name = file.fileName();
+    item.path = file.absoluteFilePath();
+    item.mimetype = db.mimeTypeForFile(path).name();
+    item.date = lastAccess.toMSecsSinceEpoch();
+    item.size = file.size();
+
+    qint64 dateDiff = lastAccess.daysTo(now);
+    if (dateDiff == 0)
+        item.dateDiff = DateDiffEnums::Today;
+
+    else if (dateDiff == 1)
+        item.dateDiff = DateDiffEnums::Yesterday;
+
+    else if (dateDiff < 7)
+        item.dateDiff = DateDiffEnums::LastWeek;
+
+    else if (dateDiff < 30)
+        item.dateDiff = DateDiffEnums::LastMonth;
+
+    else
+        item.dateDiff = DateDiffEnums::Earlier;
+
+    //qDebug() << "Item" << item.name << "Date:" << item.date;
+    //qDebug() << "Item" << item.name << "Item date is:" << lastAccess.toString("dd-MM-yyyy") << "diff is" << dateDiff << "DateDiff is:" << item.dateDiff;
+
+    return item;
+}
+
+bool DocumentModel::isFileSupported(const QString &path)
+{
+    QMimeDatabase db;
+    QString mimetype = db.mimeTypeForFile(path).name();
+
+    return (mimetype.startsWith("text/") || mimetype == "application/pdf");
 }
 
 QHash<int, QByteArray> DocumentModel::roleNames() const
@@ -129,7 +142,7 @@
 
 void DocumentModel::removeDocumentEntry(int index)
 {
-    beginRemoveRows(QModelIndex(), rowCount(), rowCount());
+    beginRemoveRows(QModelIndex(), index, index);
     m_docs.removeAt(index);
     endRemoveRows();
 }
@@ -165,38 +178,7 @@
     }
 }
 
-DocumentModel::~DocumentModel()
-{
-    delete m_docsMonitor;
-}
-
-SortFilterDocumentModel::SortFilterDocumentModel(QObject *parent)
-    : QSortFilterProxyModel(parent)
-{
-    m_model = new DocumentModel();
-    setSourceModel(m_model);
-    connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(countChanged()));
-    connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(countChanged()));
-
-    setSortRole(DocumentModel::DateRole);
-    setSortCaseSensitivity(Qt::CaseInsensitive);
-    setSortLocaleAware(true);
-
-    sort(0, Qt::DescendingOrder);
-    setDynamicSortFilter(true);
-}
-
-SortFilterDocumentModel::~SortFilterDocumentModel()
-{
-    delete m_model;
-}
-
-int SortFilterDocumentModel::rowCount()
-{
-    return m_model->rowCount();
-}
-
-bool SortFilterDocumentModel::rm(QString path)
+bool DocumentModel::rm(QString path)
 {
     bool result = false;
     QDir dir(path);
@@ -210,3 +192,34 @@
 
     return result;
 }
+
+void DocumentModel::setCustomDir(QString path)
+{
+    if (m_customDir != path) {
+        m_customDir = path;
+
+        setWatchedDirs();
+        Q_EMIT customDirChanged();
+    }
+}
+
+void DocumentModel::setWatchedDirs()
+{
+    // Clear old watched paths
+    m_docsMonitor->clear();
+
+    // Clear document list
+    beginRemoveRows(QModelIndex(), 0, rowCount());
+    m_docs.clear();
+    endRemoveRows();
+
+    if (!m_customDir.isEmpty())
+        m_docsMonitor->addDirectory(m_customDir);
+    else
+        m_docsMonitor->addDirectory(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
+}
+
+DocumentModel::~DocumentModel()
+{
+    delete m_docsMonitor;
+}

=== renamed file 'src/app/quick/documentmodel.h' => 'src/plugin/file-qml-plugin/documentmodel.h'
--- src/app/quick/documentmodel.h	2015-02-26 20:16:32 +0000
+++ src/plugin/file-qml-plugin/documentmodel.h	2015-04-29 21:37:30 +0000
@@ -18,11 +18,6 @@
 #define DOCUMENTMODEL_H
 
 #include <QAbstractListModel>
-#include <QSortFilterProxyModel>
-
-#include <QStandardPaths>
-#include <QFileSystemWatcher>
-#include <QDirIterator>
 
 struct DocumentItem {
     QString name;
@@ -33,12 +28,17 @@
     qint64 size;
 };
 
+class FSWatcher;
+
 class DocumentModel : public QAbstractListModel
 {
     Q_OBJECT
+    Q_PROPERTY(QString customDir READ getCustomDir WRITE setCustomDir NOTIFY customDirChanged)
+    Q_ENUMS(DateDiffEnums)
+
 public:
     enum Roles {
-        NameRole = Qt::UserRole + 1,
+        NameRole,
         PathRole,
         MimetypeRole,
         DateRole,
@@ -46,6 +46,14 @@
         SizeRole
     };
 
+    enum DateDiffEnums {
+        Today = 0,
+        Yesterday = 1,
+        LastWeek = 2,
+        LastMonth = 3,
+        Earlier = 4
+    };
+
     DocumentModel(QObject *parent = 0);
     ~DocumentModel();
 
@@ -54,36 +62,32 @@
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
 
-    void parseDirectoryContent(QString path);
+    QString getCustomDir() const { return m_customDir; }
+
+    Q_INVOKABLE bool rm(QString path);
+
+signals:
+    void customDirChanged();
+
+public Q_SLOTS:
+    void setCustomDir(QString path);
 
 private Q_SLOTS:
-    void _q_directoryChanged(QString path);
+    void q_fileRemoved(const QString & path);
+    void q_fileAdded(const QString & path);
+    void q_fileModified(const QString & path);
 
 private:   
+    void setWatchedDirs();
     void addDocumentEntry(DocumentItem item);
     void removeDocumentEntry(int index);
 
+    DocumentItem createEntry(const QString & path);
+    bool isFileSupported(const QString & path);
+
     QList<DocumentItem> m_docs;
-    QFileSystemWatcher *m_docsMonitor;
-};
-
-class SortFilterDocumentModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
-
-public:        
-    SortFilterDocumentModel(QObject *parent = 0);
-    ~SortFilterDocumentModel();
-
-    int rowCount();
-    Q_INVOKABLE bool rm(QString path);
-
-Q_SIGNALS:
-    void countChanged();
-
-private:
-    DocumentModel *m_model;
+    FSWatcher *m_docsMonitor;
+    QString m_customDir;
 };
 
 #endif // DOCUMENTMODEL_H

=== renamed file 'src/plugin/file-qml-plugin/docviewerFile.cpp' => 'src/plugin/file-qml-plugin/docviewerfile.cpp'
--- src/plugin/file-qml-plugin/docviewerFile.cpp	2015-02-04 08:35:41 +0000
+++ src/plugin/file-qml-plugin/docviewerfile.cpp	2015-04-29 21:37:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -15,18 +15,19 @@
  *
  */
 
-#include <QObject>
-#include <QDebug>
+#include "docviewerfile.h"
+
+#include <QDir>
 #include <QFileInfo>
-#include <QDir>
 #include <QMimeDatabase>
+#include <QDateTime>
 
-#include "docviewerFile.h"
+#include <QDebug>
 
 /*
  ----8<-----
 
- import org.docviewer.file 1.0
+ import DocumentViewer 1.0
 
  Rectangle {
    width: 200
@@ -37,13 +38,13 @@
       path: "the/path/of/file"
 
       onMimetypeChanged: {
-        do.something(mimetype);
+        do.something(mimetype.name);
       }
    }
 
    Text {
      anchors.centerIn: parent
-     text: helloType.helloworld
+     text: mimetype.description
    }
  }
 
@@ -52,70 +53,68 @@
 
 DocviewerFile::DocviewerFile(QObject *parent) :
     QObject(parent),
-    path("")
-{
-}
-DocviewerFile::~DocviewerFile() {
-    
-}
-
-void DocviewerFile::setPath(QString p) {
-    if (p.isEmpty()) {
-        this->path = "";
+    m_path("")
+{
+    connect(this, SIGNAL(pathChanged()), this, SLOT(open()));
+}
+
+DocviewerFile::~DocviewerFile()
+{
+    //
+}
+
+void DocviewerFile::setPath(const QString &path)
+{
+    if (m_path == path)
+        return;
+
+    QFileInfo file(QDir::currentPath(), path);
+
+    m_path = file.absoluteFilePath();
+    Q_EMIT pathChanged();
+
+    qDebug() << "[FILE] Path parsed as:" << m_path;
+}
+
+void DocviewerFile::open()
+{
+    if (m_path.isEmpty())
+        return;
+
+    QFileInfo file(m_path);
+
+    if (file.exists()) {
+        qDebug() << "[FILE] Extracting information from the file...";
+
+        /** Get info of the file **/
+        m_info["size"] = file.size();
+        m_info["lastModified"] = file.lastModified();
+        m_info["creationTime"] = file.created();
+        Q_EMIT infoChanged();
+
+        /** Get mimetype **/
+        this->setMimetype();
     }
+
     else {
-        this->path = QFileInfo(QDir::currentPath(), p).absoluteFilePath();
-    }
-
-    qDebug() << "[FILE] Path parsed as:" << this->path;
-
-    this->open();
-
-    emit pathChanged();
-}
-
-void DocviewerFile::open() {
-    if (!path.isEmpty())
-    {
-        QFileInfo file(path);
-
-        if (file.exists()) {
-            qDebug() << "[FILE] Extracting information from the file...";
-
-            /**Get info of the file**/
-            size = file.size();
-            emit sizeChanged();
-
-            lastmodified = file.lastModified();
-            emit lastmodifiedChanged();
-
-            creationTime = file.created();
-            emit creationTimeChanged();
-
-            /**Get mimetype**/
-            this->readMimeType();
-        }
-        else {
-            qDebug() << "[FILE] ERROR: Requested file does not exist!";
-            error = -1;
-            emit errorChanged();
-        }
-    }
-}
-
-void DocviewerFile::readMimeType()
+        qDebug() << "[FILE] ERROR: Requested file does not exist!";
+        m_error = -1;
+        Q_EMIT errorChanged();
+    }
+}
+
+void DocviewerFile::setMimetype()
 {
-    QMimeDatabase db;
-    mimetype = db.mimeTypeForFile(this->path).name();
-    description = db.mimeTypeForFile(this->path).comment();
-
-    if (mimetype == "application/octet-stream") {
-        // Returned by Qt when it cannot determinate the mime type
-        mimetype = "Unknown";
-    }
-
-    qDebug() << "[FILE] Requested file mime type:" << mimetype;
-    qDebug() << "[FILE] Requested file description:" << description;
-    emit mimetypeChanged();
-    emit descriptionChanged();
+    QMimeType mime = QMimeDatabase().mimeTypeForFile(m_path);
+
+    m_mimetype["name"] = mime.name();
+    m_mimetype["description"] = mime.comment();
+
+    // Use a more user-friendly value for 'name' when Qt can not determinate the
+    // mime type.
+    if (m_mimetype.value("name") == "application/octet-stream")
+        m_mimetype["name"] = "Unknown";
+
+    qDebug() << "[FILE] Requested file mime type:" << m_mimetype.value("name");
+    Q_EMIT mimetypeChanged();
 }

=== renamed file 'src/plugin/file-qml-plugin/docviewerFile.h' => 'src/plugin/file-qml-plugin/docviewerfile.h'
--- src/plugin/file-qml-plugin/docviewerFile.h	2015-01-30 16:38:10 +0000
+++ src/plugin/file-qml-plugin/docviewerfile.h	2015-04-29 21:37:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -18,20 +18,15 @@
 #ifndef DOCVIEWERFILE_H
 #define DOCVIEWERFILE_H
 
-#include <QString>
 #include <QObject>
-#include <QProcess>
-#include <QDateTime>
+#include <QVariantMap>
 
 class DocviewerFile : public QObject
 {
     Q_OBJECT
     Q_PROPERTY( QString path READ getPath WRITE setPath NOTIFY pathChanged )
-    Q_PROPERTY( QString mimetype READ getMimetype NOTIFY mimetypeChanged )
-    Q_PROPERTY( QString description READ getDescription NOTIFY descriptionChanged )
-    Q_PROPERTY( qint64 size READ getSize NOTIFY sizeChanged )
-    Q_PROPERTY( QDateTime lastModified READ getLastmodified NOTIFY lastmodifiedChanged )
-    Q_PROPERTY( QDateTime creationTime READ getCreationTime NOTIFY creationTimeChanged )
+    Q_PROPERTY( QVariantMap mimetype READ getMimetype NOTIFY mimetypeChanged)
+    Q_PROPERTY( QVariantMap info READ getInfo NOTIFY infoChanged)
     Q_PROPERTY( int error READ getError NOTIFY errorChanged )
     
 public:
@@ -39,41 +34,29 @@
     ~DocviewerFile();
     
 protected:
-    QString getPath() { return path; }
-    void setPath(QString p);
-
-    QString getMimetype() { return mimetype; }
-
-    QString getDescription() { return description; }
-
-    qint64 getSize() { return size; }
-
-    QDateTime getLastmodified() { return lastmodified; }
-
-    QDateTime getCreationTime() { return creationTime; }
-
-    int getError() { return error; }
+    QString getPath() { return m_path; }
+    void setPath(const QString &path);
+
+    QVariantMap getMimetype() { return m_mimetype; }
+    QVariantMap getInfo() { return m_info; }
+    int getError() { return m_error; }
     
-    QString path;
-    QString mimetype;
-    QString description;
-    qint64 size;
-    QDateTime lastmodified;
-    QDateTime creationTime;
-    int error;
-
-private:
-    void open();
-    void readMimeType();
-
 Q_SIGNALS:
     void pathChanged();
     void mimetypeChanged();
-    void descriptionChanged();
-    void sizeChanged();
-    void lastmodifiedChanged();
-    void creationTimeChanged();
     void errorChanged();
+    void infoChanged();
+
+private slots:
+    void open();
+
+private:
+    void setMimetype();
+
+    QString m_path;
+    QVariantMap m_mimetype;
+    QVariantMap m_info;
+    int m_error;
 };
 
 #endif // DOCVIEWERFILE_H

=== removed file 'src/plugin/file-qml-plugin/fileReader.cpp'
--- src/plugin/file-qml-plugin/fileReader.cpp	2015-01-29 16:24:50 +0000
+++ src/plugin/file-qml-plugin/fileReader.cpp	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QFile>
-#include <QObject>
-#include <QDebug>
-#include <QTextStream>
-
-#include "fileReader.h"
-
-/*
- ----8<-----
-
- import org.docviewer.file 1.0
-
- Rectangle {
-   width: 200
-   height: 200
-
-   FileReader {
-      id: readFile
-      path: "/path/of/file"
-   }
-
-   Text {
-     anchors.centerIn: parent
-     text: readFile.fileString
-   }
- }
-
- -----8<------
-*/
-
-FileReader::FileReader(QObject *parent) :
-    QObject(parent),
-    path("")
-{
-
-}
-
-FileReader::~FileReader() {
-
-}
-
-void FileReader::setPath(QString p) {
-    if (p.isEmpty())
-    {
-        this->path = "";
-    }
-    else
-    {
-        this->path = p;
-    }
-
-    this->readString();
-
-    emit pathChanged();
-}
-
-void FileReader::readString() {
-    if (!path.isEmpty()) {
-
-        QFile mfile(path);
-
-        if (!mfile.open(QFile::ReadOnly | QFile::Text))
-        {
-            qDebug() << "Could not open file for reading";
-            error = -1;
-            emit errorChanged();
-            return;
-        }
-
-        QTextStream in(&mfile);
-        fileString = in.readAll();
-        emit fileStringChanged();
-
-        mfile.flush();
-        mfile.close();
-    }
-    else
-    {
-        error = -1;
-        emit errorChanged();
-    }
-}

=== removed file 'src/plugin/file-qml-plugin/fileReader.h'
--- src/plugin/file-qml-plugin/fileReader.h	2015-01-29 16:24:50 +0000
+++ src/plugin/file-qml-plugin/fileReader.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef FILEREADER_H
-#define FILEREADER_H
-
-#include <QObject>
-#include <QString>
-
-class FileReader: public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString path READ getPath WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(QString fileString READ getfileString NOTIFY fileStringChanged)
-    Q_PROPERTY(int error READ getError NOTIFY errorChanged)
-
-public:
-    explicit FileReader(QObject *parent = 0);
-    ~FileReader();
-
-protected:
-    QString getPath() { return path; }
-    void setPath(QString p);
-
-    QString getfileString() { return fileString; }
-
-    int getError() { return error; }
-
-    QString path;
-    QString fileString;
-    int error;
-
-private:
-    void readString();
-
-Q_SIGNALS:
-    void pathChanged();
-    void fileStringChanged();
-    void errorChanged();
-};
-
-#endif // FILEREADER_H

=== added file 'src/plugin/file-qml-plugin/fswatcher.cpp'
--- src/plugin/file-qml-plugin/fswatcher.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/fswatcher.cpp	2015-04-29 21:37:30 +0000
@@ -0,0 +1,118 @@
+/*
+ *  Copyright (C) 2014, 2015
+ *                  Stefano Verzegnassi <stefano92.100@xxxxxxxxx>
+ *
+ *  This is free software: you can redistribute it and/or modify
+ *  it under the terms of the  GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License.
+ *
+ *  This is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#include "fswatcher.h"
+#include <QDirIterator>
+
+#include <QFile>
+#include <QDir>
+
+#include <QDebug>
+
+FSWatcher::FSWatcher(QObject *parent)
+    : QFileSystemWatcher(parent)
+{
+    connect(this, SIGNAL(fileChanged(QString)), this, SLOT(q_fileChanged(QString)));
+    connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(q_dirChanged(QString)));
+}
+
+void FSWatcher::clear()
+{
+    if (!this->directories().isEmpty())
+        this->removePaths(this->directories());
+
+    if (!this->files().isEmpty())
+        this->removePaths(this->files());
+}
+
+void FSWatcher::addDirectory(const QString &path)
+{
+    if (!this->directories().contains(path))
+    {
+        this->addPath(path);
+        Q_EMIT directoryAdded(path);
+
+        parseDirectoryContent(path);
+    }
+}
+
+void FSWatcher::q_fileChanged(const QString &path)
+{
+    // Check if file has been removed
+    if (!QFile::exists(path))
+    {
+        Q_EMIT fileRemoved(path);
+        return;
+    }
+
+    /* We got a signal for a file already watched, but it's not been deleted.
+       That means that it has been modified. */
+    Q_EMIT fileModified(path);
+}
+
+void FSWatcher::q_dirChanged(const QString &path)
+{
+    QDir dir(path);
+
+    /* Check if file has been removed.
+       When this happens, files in that folder are automatically removed
+       from watcher. We need to manually notify their removal.
+       */
+    if (!dir.exists())
+    {
+        Q_FOREACH (const QString& file, m_cachedFilesList)
+        {
+            if (!this->files().contains(file))
+            {
+                Q_EMIT fileRemoved(file);
+                qDebug() << "file removed" << file;
+            }
+        }
+
+        m_cachedFilesList = this->files();
+
+        Q_EMIT directoryRemoved(path);
+        return;
+    }
+
+    // The content of the directory has changed (a file has been added or removed)
+    // Let's check it out!
+    parseDirectoryContent(path);
+}
+
+void FSWatcher::parseDirectoryContent(QString path)
+{
+    QString filePath;
+    QDirIterator dir(path, QDir::Files | QDir::NoDotAndDotDot | QDir::Readable,
+                     QDirIterator::Subdirectories);
+
+    while (dir.hasNext())
+    {
+        dir.next();
+        filePath = dir.filePath();
+
+        // Do not check for files already watched.
+        if (!this->files().contains(filePath))
+        {
+            // Add the file to the tracker
+            this->addPath(filePath);
+            Q_EMIT fileAdded(filePath);
+        }
+    }
+
+    m_cachedFilesList = this->files();
+}

=== added file 'src/plugin/file-qml-plugin/fswatcher.h'
--- src/plugin/file-qml-plugin/fswatcher.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/fswatcher.h	2015-04-29 21:37:30 +0000
@@ -0,0 +1,52 @@
+/*
+  Copyright (C) 2014, 2015 Stefano Verzegnassi <stefano92.100@xxxxxxxxx>
+
+    This is free software: you can redistribute it and/or modify
+  it under the terms of the  GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License.
+
+    This is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+  along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef FSWATCHER_H
+#define FSWATCHER_H
+
+#include <QFileSystemWatcher>
+#include <QStringList>
+
+class FSWatcher : public QFileSystemWatcher
+{
+    Q_OBJECT
+
+public:
+    FSWatcher(QObject *parent = 0);
+
+    void addDirectory(const QString &path);
+    void clear();
+
+Q_SIGNALS:
+    void fileRemoved(const QString & path);
+    void fileAdded(const QString & path);
+    void fileModified(const QString & path);
+
+    void directoryAdded(const QString & path);
+    void directoryRemoved(const QString & path);
+
+private Q_SLOTS:
+    void q_fileChanged(const QString & path);
+    void q_dirChanged(const QString & path);
+
+private:
+    void parseDirectoryContent(QString path);
+
+    // Used for tracking removed files when a folder is removed.
+    QStringList m_cachedFilesList;
+};
+
+#endif // FSWATCHER_H

=== modified file 'src/plugin/file-qml-plugin/qmldir'
--- src/plugin/file-qml-plugin/qmldir	2014-10-25 19:01:07 +0000
+++ src/plugin/file-qml-plugin/qmldir	2015-04-29 21:37:30 +0000
@@ -1,2 +1,2 @@
-module com.ubuntu.fileqmlplugin
+module DocumentViewer
 plugin fileqmlplugin

=== modified file 'src/plugin/poppler-qml-plugin/CMakeLists.txt'
--- src/plugin/poppler-qml-plugin/CMakeLists.txt	2015-02-04 19:19:21 +0000
+++ src/plugin/poppler-qml-plugin/CMakeLists.txt	2015-04-29 21:37:30 +0000
@@ -1,4 +1,4 @@
-set(PLUGIN_DIR com/ubuntu/popplerqmlplugin)
+set(PLUGIN_DIR DocumentViewer/PDF)
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}

=== modified file 'src/plugin/poppler-qml-plugin/plugin.cpp'
--- src/plugin/poppler-qml-plugin/plugin.cpp	2015-01-30 19:20:39 +0000
+++ src/plugin/poppler-qml-plugin/plugin.cpp	2015-04-29 21:37:30 +0000
@@ -24,9 +24,9 @@
 
 void PopplerPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("com.ubuntu.popplerqmlplugin"));
+    Q_ASSERT(uri == QLatin1String("DocumentViewer.PDF"));
     
-    //@uri com.ubuntu.popplerqmlplugin
+    //@uri DocumentViewer.PDF
     qmlRegisterType<PdfDocument>(uri, 1, 0, "Document");
     qmlRegisterType<VerticalView>(uri, 1, 0, "VerticalView");
 }

=== modified file 'src/plugin/poppler-qml-plugin/qmldir'
--- src/plugin/poppler-qml-plugin/qmldir	2014-10-28 22:10:16 +0000
+++ src/plugin/poppler-qml-plugin/qmldir	2015-04-29 21:37:30 +0000
@@ -1,2 +1,2 @@
-module com.ubuntu.popplerqmlplugin
+module DocumentViewer.PDF
 plugin popplerqmlplugin


Follow ups