Merge lp:~aacid/ubuntu-filemanager-app/addi18ntr into lp:ubuntu-filemanager-app

[Albert Astals Cid]

Add i18n.tr

[David Planella (dpm)]

LGTM, thanks!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/135/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/594/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-autolanding/65/console

review: Needs Fixing (continuous-integration)

[lp:~aacid/ubuntu-filemanager-app/addi18ntr]

287. By Albert Astals Cid on 2014-09-29

Merge

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot	2014-09-22 21:43:02 +0000
+++ po/com.ubuntu.filemanager.pot	2014-09-29 13:29:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-22 15:39-0400\n"
+"POT-Creation-Date: 2014-09-29 15:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -135,6 +135,10 @@
 msgid "Operation in progress"
 msgstr ""
 
+#: ../src/app/qml/ui/FileOperationProgressDialog.qml:29
+msgid "File operation"
+msgstr ""
+
 #: ../src/app/qml/ui/FolderListPage.qml:94
 #, qt-format
 msgid "%1 file"

=== modified file 'src/app/qml/ui/FileOperationProgressDialog.qml'
--- src/app/qml/ui/FileOperationProgressDialog.qml	2014-09-02 05:45:19 +0000
+++ src/app/qml/ui/FileOperationProgressDialog.qml	2014-09-29 13:29:21 +0000
@@ -26,7 +26,7 @@
     property Page page
     property string descriptionPrepend: i18n.tr("Operation in progress")
 
-    title: "File operation"
+    title: i18n.tr("File operation")
     text: descriptionPrepend
 
     function startOperation(name) {