Merge lp:~vthompson/ubuntu-filemanager-app/update-filemanager-translations into lp:ubuntu-filemanager-app

[Victor Thompson]

Updated translation template and add .pot file

Updated translation template and add .pot file

[lp:~vthompson/ubuntu-filemanager-app/update-filemanager-translations]

103. By Victor Thompson on 2013-12-30

Update README.translations

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

PASSED: Continuous integration, rev:102
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/106/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/558
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/106
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/106
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/56

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:103
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/107/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/559
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/57

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

review: Approve (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

It looks OK to me even I have not done any test.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-04-04 11:05:43 +0000
+++ .bzrignore	2013-12-30 20:40:22 +0000
@@ -1,5 +1,7 @@
 *.qmlproject.user
 
+.build
+po/Makefile
 debian/files
 debian/app-template/
 debian/*.debhelper.log

=== added file 'README.translations'
--- README.translations	1970-01-01 00:00:00 +0000
+++ README.translations	2013-12-30 20:40:22 +0000
@@ -0,0 +1,36 @@
+# Updating translations
+
+Translations for the Filemanager 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 'po/po.pro'
--- po/po.pro	2013-02-12 16:18:48 +0000
+++ po/po.pro	2013-12-30 20:40:22 +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
 

=== added file 'po/ubuntu-filemanager-app.pot'
--- po/ubuntu-filemanager-app.pot	1970-01-01 00:00:00 +0000
+++ po/ubuntu-filemanager-app.pot	2013-12-30 20:40:22 +0000
@@ -0,0 +1,320 @@
+# Filemanager App Translations
+# Copyright (C) 2013 Canonical Ltd. 
+# This file is distributed under the same license as the ubuntu-filemanager-app package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-filemanager-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-30 14:24-0600\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"
+
+#: ../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:61
+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:119
+msgid "~/Desktop"
+msgstr ""
+
+#: ../FolderListPage.qml:121
+msgid "~/Documents"
+msgstr ""
+
+#: ../FolderListPage.qml:123
+msgid "~/Downloads"
+msgstr ""
+
+#: ../FolderListPage.qml:125
+msgid "~/Music"
+msgstr ""
+
+#: ../FolderListPage.qml:127
+msgid "~/Pictures"
+msgstr ""
+
+#: ../FolderListPage.qml:129
+msgid "~/Public"
+msgstr ""
+
+#: ../FolderListPage.qml:131
+msgid "~/Programs"
+msgstr ""
+
+#: ../FolderListPage.qml:133
+msgid "~/Templates"
+msgstr ""
+
+#: ../FolderListPage.qml:135
+msgid "~/Videos"
+msgstr ""
+
+#: ../FolderListPage.qml:148
+msgid "Home"
+msgstr ""
+
+#: ../FolderListPage.qml:150
+msgid "File System"
+msgstr ""
+
+#: ../FolderListPage.qml:197
+msgid "1 file"
+msgstr ""
+
+#: ../FolderListPage.qml:198
+#, qt-format
+msgid "%1 files"
+msgstr ""
+
+#: ../FolderListPage.qml:222
+msgid "Create New Folder"
+msgstr ""
+
+#: ../FolderListPage.qml:242
+msgid "Paste"
+msgstr ""
+
+#: ../FolderListPage.qml:244
+#, qt-format
+msgid "Paste %1 File"
+msgstr ""
+
+#: ../FolderListPage.qml:245
+#, qt-format
+msgid "Paste %1 Files"
+msgstr ""
+
+#: ../FolderListPage.qml:248
+msgid "Paste files"
+msgstr ""
+
+#: ../FolderListPage.qml:260
+msgid "Open in Terminal"
+msgstr ""
+
+#: ../FolderListPage.qml:272 ../FolderListView.qml:150
+msgid "Properties"
+msgstr ""
+
+#: ../FolderListPage.qml:307
+msgid "Create folder"
+msgstr ""
+
+#: ../FolderListPage.qml:308
+msgid "Enter name for new folder"
+msgstr ""
+
+#: ../FolderListPage.qml:324
+msgid "Create file"
+msgstr ""
+
+#: ../FolderListPage.qml:325
+msgid "Enter name for new file"
+msgstr ""
+
+#: ../FolderListPage.qml:360
+msgid "Actions"
+msgstr ""
+
+#: ../FolderListPage.qml:370
+msgid "View"
+msgstr ""
+
+#: ../FolderListPage.qml:385
+msgid "Go To"
+msgstr ""
+
+#: ../FolderListPage.qml:398 ../PlacesSidebar.qml:73
+msgid "Places"
+msgstr ""
+
+#: ../FolderListPage.qml:465
+msgid "No files"
+msgstr ""
+
+#: ../FolderListPage.qml:486
+msgid "File operation error"
+msgstr ""
+
+#: ../FolderListView.qml:34
+#, qt-format
+msgid "%1 (1 file)"
+msgstr ""
+
+#: ../FolderListView.qml:35
+#, qt-format
+msgid "%1 (%2 files)"
+msgstr ""
+
+#: ../FolderListView.qml:43 ../FolderListView.qml:124
+msgid "Delete"
+msgstr ""
+
+#: ../FolderListView.qml:44
+#, qt-format
+msgid "Are you sure you want to permanently delete '%1'?"
+msgstr ""
+
+#: ../FolderListView.qml:67 ../FolderListView.qml:137
+msgid "Rename"
+msgstr ""
+
+#: ../FolderListView.qml:68
+msgid "Enter a new name"
+msgstr ""
+
+#: ../FolderListView.qml:77
+msgid "Could not rename"
+msgstr ""
+
+#: ../FolderListView.qml:78
+msgid "Insufficient permissions or name already exists?"
+msgstr ""
+
+#: ../FolderListView.qml:101
+msgid "Cut"
+msgstr ""
+
+#: ../FolderListView.qml:112
+msgid "Copy"
+msgstr ""
+
+#: ../FolderListView.qml:175
+msgid "Folder not accessible"
+msgstr ""
+
+#: ../FolderListView.qml:176
+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:39 ../PlacesPopover.qml:84
+msgid "Location..."
+msgstr ""
+
+#: ../GoToDialog.qml:48 ../PlacesPopover.qml:99
+msgid "Go"
+msgstr ""
+
+#: ../SettingsPage.qml:32 ../ubuntu-filemanager-app.qml:51
+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 ""
+
+#: ../ubuntu-filemanager-app.qml:52
+msgid "Change app settings"
+msgstr ""
+
+#: ../.build/ubuntu-filemanager-app.desktop.js:1
+msgid "File Manager"
+msgstr ""

=== renamed file 'filemanager.qmlproject' => 'ubuntu-filemanager-app.qmlproject'