Merge lp:~vthompson/ubuntu-terminal-app/fix-1290492-terminal into lp:ubuntu-terminal-app

[Victor Thompson]

* Fix po.pro file correct source files and options
* Update translation strings

* Fix po.pro file correct source files and options
* Update translation strings

[lp:~vthompson/ubuntu-terminal-app/fix-1290492-terminal]

45. By Victor Thompson on 2014-03-11

Add additional source files

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

PASSED: Continuous integration, rev:45
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/46/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1688
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/46
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/46
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/34

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me. It needs to add the README.translations file that's missing, but as we'll need to update the .pro files to cmake soon, we can take care of that then.

review: Approve

=== modified file 'po/po.pro'
--- po/po.pro	2013-02-12 16:18:48 +0000
+++ po/po.pro	2014-03-11 03:15:27 +0000
@@ -1,48 +1,57 @@
+## 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,)
-
-SOURCECODE = ../*.qml
+PROJECTNAME = ubuntu-terminal-app
+
+DESKTOPFILE = ../com.ubuntu.terminal_terminal.desktop.in
+
+SOURCECODE = ../*.qml \
+             ../config/*.qml \
+             ../extraPanel/*.qml
+
+BUILDDIR = ../.build
+DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.terminal_terminal.desktop.in
 
 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-terminal-app.pot'
--- po/ubuntu-terminal-app.pot	1970-01-01 00:00:00 +0000
+++ po/ubuntu-terminal-app.pot	2014-03-11 03:15:27 +0000
@@ -0,0 +1,51 @@
+# Terminal App Translations
+# Copyright (C) 2014 Canonical Ltd. 
+# This file is distributed under the same license as the ubuntu-terminal-app package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-terminal-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-10 22:08-0500\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"
+
+#: ../Configs.qml:48
+msgid "Color scheme"
+msgstr ""
+
+#: ../Configs.qml:64
+msgid "Font size"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:24
+msgid "Control keys"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:29
+msgid "Function keys"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:34
+msgid "Text ctrl keys"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:39
+msgid "Hide extra panel"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:58
+#: ../.build/com.ubuntu.terminal_terminal.desktop.in:1
+msgid "Terminal"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:98
+msgid "Settings"
+msgstr ""