Merge lp:~dpm/ubuntu-filemanager-app/enable-translations into lp:ubuntu-filemanager-app

[David Planella]

Enable the translations infrastructure: expose translations in Launchpad and build/ship them in the Debian package.

NOTE: if you do a review, feel free to approve/disapprove in the comments, but do not top-approve yet, as this needs to be coordinated with the package name change in the seeds.

Enable the translations infrastructure: expose translations in Launchpad and build/ship them in the Debian package.

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

FAILED: Continuous integration, rev:69
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/38/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/499/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/38

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/38/rebuild

review: Needs Fixing (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

It looks good.

review: Approve

Unmerged revisions

69. By David Planella on 2013-09-27

Remove unneded files to show in the project, update Debian changelog

68. By David Planella on 2013-09-27

Added rule to build and install translations

67. By David Planella on 2013-09-27

Created .pot file, improved some messages to ease translation

66. By David Planella on 2013-09-27

Do not scan for translations in JavaScript files, the project does not seem to have any

65. By David Planella on 2013-09-27

Renamed all paths files and code from ubuntu-filemanager-app to filemanager-app for consistency. We want to drop the ubuntu- prefix from all apps progressively, so this might be a good point for the file manager

64. By David Planella on 2013-09-27

Added basic translations infrastructure

=== modified file '.bzrignore'
--- .bzrignore	2013-04-04 11:05:43 +0000
+++ .bzrignore	2013-09-27 05:10:56 +0000
@@ -4,3 +4,7 @@
 debian/app-template/
 debian/*.debhelper.log
 debian/*.substvars
+.build
+po/Makefile
+debian/filemanager-app
+debian/filemanager-app-autopilot
 
=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-09-17 16:47:57 +0000
+++ FolderListPage.qml	2013-09-27 05:10:56 +0000
@@ -179,9 +179,10 @@
         // Properties to emulate a model entry for use by FileDetailsPopover
         property bool isDir: true
         property string fileName: pathName(pageModel.path)
-        property string fileSize: (folderListView.count === 1
-                                   ? i18n.tr("1 file")
-                                   : i18n.tr("%1 files").arg(folderListView.count))
+        property string fileSize: i18n.tr("%1 file",
+                                          "%1 files",
+                                          folderListView.count).arg(folderListView.count)
+
         property date accessedDate: pageModel.pathAccessedDate
         property date modifiedDate: pageModel.pathModifiedDate
         property bool isWritable: pageModel.pathIsWritable
@@ -229,9 +230,9 @@
                 Action {
                     text: pageModel.clipboardUrlsCounter === 0
                           ? i18n.tr("Paste")
-                          : pageModel.clipboardUrlsCounter === 1
-                            ? i18n.tr("Paste %1 File").arg(pageModel.clipboardUrlsCounter)
-                            : i18n.tr("Paste %1 Files").arg(pageModel.clipboardUrlsCounter)
+                          : i18n.tr("Paste %1 file",
+                                    "Paste %1 files",
+                                    pageModel.clipboardUrlsCounter).arg(pageModel.clipboardUrlsCounter)
                     onTriggered: {
                         console.log("Pasting to current folder items of count " + pageModel.clipboardUrlsCounter)
                         fileOperationDialog.startOperation(i18n.tr("Paste files"))
 
=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-09-17 16:40:38 +0000
+++ FolderListView.qml	2013-09-27 05:10:56 +0000
@@ -30,9 +30,11 @@
 
     header: Header {
         objectName: "directoryHeader"
-        text: (root.count == 1
-               ? i18n.tr("%1 (1 file)").arg(root.folderPath)
-               : i18n.tr("%1 (%2 files)").arg(root.folderPath).arg(root.count))
+        // TRANSLATORS: this refers to the header shown for a folder
+        // %1 is the folder path and %2 the number of files it contains
+        text: i18n.tr("%1 (%2 file)",
+                      "%1 (%2 files)",
+                      root.count).arg(root.folderPath).arg(root.count)
     }
 
     Component {
 
=== modified file 'Makefile'
--- Makefile	2013-09-17 17:05:56 +0000
+++ Makefile	2013-09-27 05:10:56 +0000
@@ -1,7 +1,7 @@
 all:
 
 run:
-	/usr/bin/qmlscene $@ ubuntu-filemanager-app.qml
+	/usr/bin/qmlscene $@ filemanager-app.qml
 
 icon:
 	inkscape --export-png=icons/$(ICON).png --export-dpi=32 --export-background-opacity=0 --without-gui /usr/share/icons/ubuntu-mobile/actions/scalable/$(ICON).svg
 
=== modified file 'README'
--- README	2013-06-14 05:55:15 +0000
+++ README	2013-09-27 05:10:56 +0000
@@ -10,4 +10,4 @@
 Running filemanager
 ===================
 
-qmlscene ubuntu-filemanager-app.qml
+qmlscene filemanager-app.qml
 
=== added file 'README.translations'
--- README.translations	1970-01-01 00:00:00 +0000
+++ README.translations	2013-09-27 05:10:56 +0000
@@ -0,0 +1,36 @@
+# Updating translations
+
+Translations for the File Manager app happen in [Launchpad Translations][] and
+are automatically committed daily on the trunk branch in the po/ folder.
+
+They are then built and installed as part of the package build, so that
+developers don't really need to worry about them.
+
+However, there is one task that needs to be taken care of: exposing new
+translatable messages to translators. So whenever you add new translatable
+messages in the code, make sure to follow these steps:
+
+ 1. Change directory to the po/ folder: `cd po`
+ 2. Update the translations template: `qmake && make pot`
+ 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
+ 4. Push the branch and send a merge proposal as usual
+
+And that's it, once the branch lands Launchpad should take care of all the rest!
+
+# Behind the scenes
+
+Behind the scenes, whenever the po/*.pot file (also known as translations template)
+is committed to trunk Launchpad reads it and updates the translatable strings
+exposed in the web UI. This will enable translators to work on the new strings.
+The translations template contains all translatable strings that have been
+extracted from the source code files.
+
+Launchpad will then store translations in its database and will commit them daily
+in the form of textual po/*.po files to trunk. The PO files are also usually
+referred to as the translations files. You'll find a translation file for each
+language the app has got at least a translated message available for.
+
+Translations for core apps follow the standard [gettext format].
+
+ [Launchpad Translations]: https://translations.launchpad.net/ubuntu-filemanager-app
+ [gettext format]: https://www.gnu.org/software/gettext/
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-04-19 20:30:19 +0000
+++ debian/changelog	2013-09-27 05:10:56 +0000
@@ -1,3 +1,9 @@
+ubuntu-filemanager-app (0.2) saucy; urgency=low
+
+  * Added translations infrastructure, renamed package and paths
+
+ -- David Planella <[e-mail]>  Fri, 27 Sep 2013 07:02:14 +0200
+
 ubuntu-filemanager-app (0.1.1) raring; urgency=low
 
   * Initial release
 
=== modified file 'debian/control'
--- debian/control	2013-08-30 17:49:35 +0000
+++ debian/control	2013-09-27 05:10:56 +0000
@@ -1,30 +1,31 @@
 Source: ubuntu-filemanager-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
-Build-Depends: debhelper (>= 9), 
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-filemanager-app
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-filemanager-dev/ubuntu-filemanager-app/trunk
 
-Package: ubuntu-filemanager-app
+Package: filemanager-app
 Section: misc
 Architecture: all
-Depends: ${misc:Depends},
-         qmlscene,
+Depends: qmlscene,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-nemo-qml-plugin-folderlistmodel,
-         qtdeclarative5-u1db1.0
+         qtdeclarative5-u1db1.0,
+         ${misc:Depends},
 Description: File Manager application
  Core File Manager application
 
-Package: ubuntu-filemanager-app-autopilot
+Package: filemanager-app-autopilot
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
          python-mock,
          ubuntu-ui-toolkit-autopilot,
-         ubuntu-filemanager-app (= ${source:Version})
+         filemanager-app (= ${source:Version}),
+         ${misc:Depends},
 Description: Autopilot tests for File Manager Application
  This package contains the autopilot tests for the File Manager
 
=== renamed file 'debian/ubuntu-filemanager-app-autopilot.install' => 'debian/filemanager-app-autopilot.install'
--- debian/ubuntu-filemanager-app-autopilot.install	2013-05-31 12:23:54 +0000
+++ debian/filemanager-app-autopilot.install	2013-09-27 05:10:56 +0000
@@ -1,1 +1,1 @@
-tests/autopilot/ubuntu_filemanager_app/* usr/lib/python2.7/dist-packages/ubuntu_filemanager_app/
+tests/autopilot/filemanager_app/* usr/lib/python2.7/dist-packages/filemanager_app/
 
=== renamed file 'debian/ubuntu-filemanager-app.install' => 'debian/filemanager-app.install'
--- debian/ubuntu-filemanager-app.install	2013-07-07 11:16:44 +0000
+++ debian/filemanager-app.install	2013-09-27 05:10:56 +0000
@@ -1,5 +1,5 @@
-ubuntu-filemanager-app usr/bin/
-ubuntu-filemanager-app.desktop usr/share/applications/
-*.qml usr/share/ubuntu-filemanager-app/
-*.png usr/share/ubuntu-filemanager-app/
-icons/ usr/share/ubuntu-filemanager-app/
+filemanager-app usr/bin/
+filemanager-app.desktop usr/share/applications/
+*.qml usr/share/filemanager-app/
+*.png usr/share/filemanager-app/
+icons/ usr/share/filemanager-app/
 
=== modified file 'debian/rules'
--- debian/rules	2013-04-11 21:15:17 +0000
+++ debian/rules	2013-09-27 05:10:56 +0000
@@ -9,3 +9,12 @@
 
 override_dh_install:
 	dh_install --fail-missing
+	appname=ubuntu-weather-app; \
+	for pofile in $(shell find ./po -name "*.po"); do \
+		pofilename="$${pofile##*/}"; \
+		langcode="$${pofilename%.*}"; \
+		localedir="debian/$$appname/usr/share/locale/$$langcode/LC_MESSAGES"; \
+		mkdir -p $$localedir; \
+		mofile="$$localedir/$$appname.mo"; \
+		msgfmt -o $$mofile $$pofile; \
+	done
 
=== renamed file 'ubuntu-filemanager-app' => 'filemanager-app'
--- ubuntu-filemanager-app	2013-04-11 21:15:17 +0000
+++ filemanager-app	2013-09-27 05:10:56 +0000
@@ -1,2 +1,2 @@
 #!/bin/bash
-qmlscene /usr/share/ubuntu-filemanager-app/ubuntu-filemanager-app.qml
+qmlscene /usr/share/filemanager-app/filemanager-app.qml
 
=== renamed file 'ubuntu-filemanager-app.desktop' => 'filemanager-app.desktop'
--- ubuntu-filemanager-app.desktop	2013-05-20 19:57:23 +0000
+++ filemanager-app.desktop	2013-09-27 05:10:56 +0000
@@ -2,8 +2,9 @@
 Version=1.0
 Type=Application
 Terminal=false
-Exec=qmlscene /usr/share/ubuntu-filemanager-app/ubuntu-filemanager-app.qml
-Icon=/usr/share/ubuntu-filemanager-app/filemanager64.png
+Exec=qmlscene /usr/share/filemanager-app/filemanager-app.qml
+Icon=/usr/share/filemanager-app/filemanager64.png
 Name=File Manager
+Keywords=file;files;file manager;folders
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
 
=== renamed file 'ubuntu-filemanager-app.qml' => 'filemanager-app.qml'
--- ubuntu-filemanager-app.qml	2013-09-17 16:47:57 +0000
+++ filemanager-app.qml	2013-09-27 05:10:56 +0000
@@ -31,7 +31,7 @@
     id: root
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "filemanager"
-    applicationName: "ubuntu-filemanager-app"
+    applicationName: "filemanager-app"
 
     width: units.gu(100)
     height: units.gu(75)
@@ -98,7 +98,7 @@
 
     U1db.Database {
         id: storage
-        path: "ubuntu-filemanager-app.db"
+        path: "filemanager-app.db"
     }
 
     U1db.Document {
 
=== renamed file 'filemanager.qmlproject' => 'filemanager-app.qmlproject'
--- filemanager.qmlproject	2013-06-25 16:22:38 +0000
+++ filemanager-app.qmlproject	2013-09-27 05:10:56 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "ubuntu-filemanager-app.qml"
+    mainFile: "filemanager-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
@@ -15,6 +15,20 @@
     ImageFiles {
         directory: "."
     }
+    Files {
+        filter: "*.desktop"
+    }
+    /* Shows the README files in the project view */
+    Files {
+        filter: "README*"
+    }
+    /* Shows the translation files and the .pro file used to generate the .pot template */
+    Files {
+        filter: "*.po*"
+    }
+    Files {
+        filter: "*.pro"
+    }
     /* List of plugin directories passed to QML runtime */
     importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
 }
 
=== added file 'po/filemanager-app.pot'
--- po/filemanager-app.pot	1970-01-01 00:00:00 +0000
+++ po/filemanager-app.pot	2013-09-27 05:10:56 +0000
@@ -0,0 +1,311 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd. 
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: filemanager-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-27 06:56+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../ConfirmDialog.qml:31 ../ConfirmDialogWithInput.qml:41
+#: ../NotifyDialog.qml:25
+msgid "Ok"
+msgstr ""
+
+#: ../ConfirmDialog.qml:41 ../ConfirmDialogWithInput.qml:51
+#: ../FileActionDialog.qml:45 ../FileOperationProgressDialog.qml:44
+#: ../GoToDialog.qml:59
+msgid "Cancel"
+msgstr ""
+
+#: ../FileActionDialog.qml:30
+msgid "Choose action"
+msgstr ""
+
+#: ../FileActionDialog.qml:31
+#, qt-format
+msgid "For file: %1"
+msgstr ""
+
+#: ../FileActionDialog.qml:35
+msgid "Open"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:37
+msgid "Readable"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:40
+msgid "Writable"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:43
+msgid "Executable"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:91
+msgid "Path:"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:102
+msgid "Contents:"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:103
+msgid "Size:"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:112
+msgid "Accessed:"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:121
+msgid "Modified:"
+msgstr ""
+
+#: ../FileDetailsPopover.qml:130
+msgid "Permissions:"
+msgstr ""
+
+#: ../FileOperationProgressDialog.qml:27
+msgid "Operation in progress"
+msgstr ""
+
+#: ../FolderListPage.qml:101
+msgid "~/Desktop"
+msgstr ""
+
+#: ../FolderListPage.qml:103
+msgid "~/Documents"
+msgstr ""
+
+#: ../FolderListPage.qml:105
+msgid "~/Downloads"
+msgstr ""
+
+#: ../FolderListPage.qml:107
+msgid "~/Music"
+msgstr ""
+
+#: ../FolderListPage.qml:109
+msgid "~/Pictures"
+msgstr ""
+
+#: ../FolderListPage.qml:111
+msgid "~/Public"
+msgstr ""
+
+#: ../FolderListPage.qml:113
+msgid "~/Programs"
+msgstr ""
+
+#: ../FolderListPage.qml:115
+msgid "~/Templates"
+msgstr ""
+
+#: ../FolderListPage.qml:117
+msgid "~/Videos"
+msgstr ""
+
+#: ../FolderListPage.qml:134
+msgid "Home"
+msgstr ""
+
+#: ../FolderListPage.qml:136
+msgid "File System"
+msgstr ""
+
+#: ../FolderListPage.qml:182
+#, qt-format
+msgid "%1 file"
+msgid_plural "%1 files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../FolderListPage.qml:212
+msgid "Create New Folder"
+msgstr ""
+
+#: ../FolderListPage.qml:232
+msgid "Paste"
+msgstr ""
+
+#: ../FolderListPage.qml:233
+#, qt-format
+msgid "Paste %1 file"
+msgid_plural "Paste %1 files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../FolderListPage.qml:238
+msgid "Paste files"
+msgstr ""
+
+#: ../FolderListPage.qml:250
+msgid "Open in Terminal"
+msgstr ""
+
+#: ../FolderListPage.qml:262 ../FolderListView.qml:152
+msgid "Properties"
+msgstr ""
+
+#: ../FolderListPage.qml:297
+msgid "Create folder"
+msgstr ""
+
+#: ../FolderListPage.qml:298
+msgid "Enter name for new folder"
+msgstr ""
+
+#: ../FolderListPage.qml:314
+msgid "Create file"
+msgstr ""
+
+#: ../FolderListPage.qml:315
+msgid "Enter name for new file"
+msgstr ""
+
+#: ../FolderListPage.qml:350
+msgid "Actions"
+msgstr ""
+
+#: ../FolderListPage.qml:360
+msgid "View"
+msgstr ""
+
+#: ../FolderListPage.qml:375
+msgid "Go To"
+msgstr ""
+
+#: ../FolderListPage.qml:388 ../PlacesSidebar.qml:73
+msgid "Places"
+msgstr ""
+
+#: ../FolderListPage.qml:448
+msgid "No files"
+msgstr ""
+
+#: ../FolderListPage.qml:469
+msgid "File operation error"
+msgstr ""
+
+#. TRANSLATORS: this refers to the header shown for a folder
+#. %1 is the folder path and %2 the number of files it contains
+#: ../FolderListView.qml:35
+#, qt-format
+msgid "%1 (%2 file)"
+msgid_plural "%1 (%2 files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../FolderListView.qml:45 ../FolderListView.qml:126
+msgid "Delete"
+msgstr ""
+
+#: ../FolderListView.qml:46
+#, qt-format
+msgid "Are you sure you want to permanently delete '%1'?"
+msgstr ""
+
+#: ../FolderListView.qml:69 ../FolderListView.qml:139
+msgid "Rename"
+msgstr ""
+
+#: ../FolderListView.qml:70
+msgid "Enter a new name"
+msgstr ""
+
+#: ../FolderListView.qml:79
+msgid "Could not rename"
+msgstr ""
+
+#: ../FolderListView.qml:80
+msgid "Insufficient permissions or name already exists?"
+msgstr ""
+
+#: ../FolderListView.qml:103
+msgid "Cut"
+msgstr ""
+
+#: ../FolderListView.qml:114
+msgid "Copy"
+msgstr ""
+
+#: ../FolderListView.qml:177
+msgid "Folder not accessible"
+msgstr ""
+
+#: ../FolderListView.qml:178
+msgid "Can not access "
+msgstr ""
+
+#: ../GoToDialog.qml:25
+msgid "Go To Location"
+msgstr ""
+
+#: ../GoToDialog.qml:27
+msgid "Enter a location to go to:"
+msgstr ""
+
+#: ../GoToDialog.qml:38 ../PlacesPopover.qml:83
+msgid "Location..."
+msgstr ""
+
+#: ../GoToDialog.qml:47 ../PlacesPopover.qml:97
+msgid "Go"
+msgstr ""
+
+#: ../SettingsPage.qml:32
+msgid "Settings"
+msgstr ""
+
+#: ../SettingsPage.qml:38
+msgid "Show Advanced Features"
+msgstr ""
+
+#: ../ViewPopover.qml:39
+msgid "Show Hidden Files"
+msgstr ""
+
+#: ../ViewPopover.qml:59
+msgid "Sort By"
+msgstr ""
+
+#: ../ViewPopover.qml:70
+msgid "Name"
+msgstr ""
+
+#: ../ViewPopover.qml:71
+msgid "Date"
+msgstr ""
+
+#: ../ViewPopover.qml:81
+msgid "Sort Order"
+msgstr ""
+
+#: ../ViewPopover.qml:92 ../ViewPopover.qml:97
+msgid "Ascending"
+msgstr ""
+
+#: ../ViewPopover.qml:93
+msgid "Descending"
+msgstr ""
+
+#: ../ViewPopover.qml:105
+msgid "Filter"
+msgstr ""
+
+#: ../.build/filemanager-app.desktop.js:1
+msgid "File Manager"
+msgstr ""
 
=== modified file 'po/po.pro'
--- po/po.pro	2013-02-12 16:18:48 +0000
+++ po/po.pro	2013-09-27 05:10:56 +0000
@@ -1,48 +1,56 @@
+## This .pro file is used to create a Makefile with the necessary rules
+## to create an initial translations template and to update it whenever
+## there are new translatable strings in the project that are ready to be
+## exposed to translators
+##
+## See the ../README.translations file for more information
+
 TEMPLATE = subdirs
 
 PROJECTNAME = $$system(basename ../*.qmlproject)
 PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
 
+DESKTOPFILE = ../$${PROJECTNAME}.desktop
+
 SOURCECODE = ../*.qml
 
+BUILDDIR = ../.build
+DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
+
 message("")
 message(" Project Name: $$PROJECTNAME ")
 message(" Source Code: $$SOURCECODE ")
 message("")
-message(" run 'make pot' to generate the pot file from source code. ")
-message(" run 'make translate' to create a new translation (po) based on pot. ")
-message(" run 'make mo' to generate the mo files from po files. ")
-message(" run 'qmake; make install' to install the mo files. ")
+message(" Run 'make pot' to generate the pot file from source code. ")
 message("")
 
-## generate pot file 'make pot'
+## Generate pot file 'make pot'
 potfile.target = pot
-potfile.commands = xgettext -o $${PROJECTNAME}.pot --package-name $${PROJECTNAME} --qt --c++ --add-comments=TRANSLATORS --keyword=tr $${SOURCECODE}
+potfile.commands = xgettext \
+                   -o $${PROJECTNAME}.pot \
+                   --copyright=\"Canonical Ltd. \" \
+                   --package-name $${PROJECTNAME} \
+                   --qt --c++ --add-comments=TRANSLATORS \
+                   --keyword=tr --keyword=tr:1,2 \
+                   $${SOURCECODE} $${DESKTOPFILETEMP}
+potfile.depends = desktopfile
 QMAKE_EXTRA_TARGETS += potfile
 
-## poedit target for new translations 'make translate'
-poedit.target = translate
-poedit.commands = cp messages.pot new_language.po; poedit new_language.po
-QMAKE_EXTRA_TARGETS += poedit
-
-## generate mo files 'make mo'
-mofiles.target = mo
-mofiles.commands = msgfmt *.po
-QMAKE_EXTRA_TARGETS += mofiles
-
-## Installation steps for mo files. 'make install'
-MO_FILES = $$system(ls *.mo)
-
-install_mo_commands =
-for(mo_file, MO_FILES) {
-  mo_name = $$replace(mo_file,.mo,)
-  mo_targetpath = $(INSTALL_ROOT)/usr/share/locale/$${mo_name}/LC_MESSAGES
-  mo_target = $${mo_targetpath}/$${PROJECTNAME}.mo
-  !isEmpty(install_mo_commands): install_mo_commands += &&
-  install_mo_commands += test -d $$mo_targetpath || mkdir -p $$mo_targetpath
-  install_mo_commands += && cp $$mo_file $$mo_target
-}
-
-install.commands = $$install_mo_commands
-QMAKE_EXTRA_TARGETS += install
+## Do not use this rule directly. It's a dependency rule to
+## generate an intermediate .js file to extract translatable
+## strings from the .desktop file
+desktopfile.target = desktopfile
+desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP}
+desktopfile.depends = makebuilddir
+QMAKE_EXTRA_TARGETS += desktopfile
+
+## Dependency rule to create the temporary build dir
+makebuilddir.target = makebuilddir
+makebuilddir.commands = mkdir -p $${BUILDDIR}
+QMAKE_EXTRA_TARGETS += makebuilddir
+
+## Rule to clean the products of the build
+clean.target = clean
+clean.commands = rm -Rf $${BUILDDIR}
+QMAKE_EXTRA_TARGETS += clean
 
 
=== renamed directory 'tests/autopilot/ubuntu_filemanager_app' => 'tests/autopilot/filemanager_app'
=== modified file 'tests/autopilot/filemanager_app/tests/__init__.py'
--- tests/autopilot/ubuntu_filemanager_app/tests/__init__.py	2013-07-26 17:12:14 +0000
+++ tests/autopilot/filemanager_app/tests/__init__.py	2013-09-27 05:10:56 +0000
@@ -14,7 +14,7 @@
 from autopilot.testcase import AutopilotTestCase
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
-from ubuntu_filemanager_app import emulators
+from filemanager_app import emulators
 
 
 class FileManagerTestCase(AutopilotTestCase):
@@ -28,7 +28,7 @@
     else:
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
-    local_location = "../../ubuntu-filemanager-app.qml"
+    local_location = "../../filemanager-app.qml"
 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
@@ -48,9 +48,9 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/ubuntu-filemanager-app/ubuntu-filemanager-app.qml",
+            "/usr/share/filemanager-app/filemanager-app.qml",
             "--desktop_file_hint="
-            "/usr/share/applications/ubuntu-filemanager-app.desktop",
+            "/usr/share/applications/filemanager-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
 
=== modified file 'tests/autopilot/filemanager_app/tests/test_filemanager.py'
--- tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-09-09 21:34:54 +0000
+++ tests/autopilot/filemanager_app/tests/test_filemanager.py	2013-09-27 05:10:56 +0000
@@ -30,7 +30,7 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals, Not, Is
 
-from ubuntu_filemanager_app.tests import FileManagerTestCase
+from filemanager_app.tests import FileManagerTestCase
 
 
 class TestFolderListPage(FileManagerTestCase):