Merge lp:~dobey/unity-scope-click/no-auto-pot into lp:unity-scope-click/devel

[dobey]

Don't build the pot file automatically.
Include the pot file in the tree.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-trusty-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-trusty-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-trusty-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-trusty-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/25/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good to me too.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-01-20 13:10:02 +0000
+++ .bzrignore	2014-04-29 19:23:33 +0000
@@ -25,7 +25,6 @@
 *.la
 *.lo
 *.o
-*.pot
 *.service
 *.tar.*
 *.typelib

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-04-03 16:06:05 +0000
+++ po/CMakeLists.txt	2014-04-29 19:23:33 +0000
@@ -17,9 +17,10 @@
 )
 
 # Creates the .pot file containing the translations template
-add_custom_target(${POT_FILE} ALL
+add_custom_target(${POT_FILE}
     COMMENT "Generating translation template"
     COMMAND XGETTEXT="${GETTEXT_XGETTEXT_EXECUTABLE}" srcdir="${CMAKE_CURRENT_SOURCE_DIR}" ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
+    COMMAND cp -f ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/
     DEPENDS POTFILES
 )
 

=== added file 'po/unity-scope-click.pot'
--- po/unity-scope-click.pot	1970-01-01 00:00:00 +0000
+++ po/unity-scope-click.pot	2014-04-29 19:23:33 +0000
@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-29 15:20-0400\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"
+
+#: ../data/clickscope.ini.in.in.h:1
+msgid "Apps"
+msgstr ""
+
+#: ../data/clickscope.ini.in.in.h:2
+msgid "Scope for searching the click app store"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:199
+msgid "Download Error"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:200
+msgid "Download or install failed. Please try again."
+msgstr ""
+
+#. TODO see bug LP: #1289434
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:202
+msgid "Close"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:207
+msgid "Login Error"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:208
+msgid "Please log in to your Ubuntu One account."
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:210
+msgid "Go to Accounts"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:391
+msgid "Open"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:399
+msgid "Uninstall"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:484
+msgid "Confirmation"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:486
+msgid ""
+"Uninstalling this app will delete all the related information. Are you sure "
+"you want to uninstall?"
+msgstr ""
+
+#. TODO: see bug LP: #1289434
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:493
+msgid "Not anymore"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:497
+msgid "Yes Uninstall"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/preview.cpp:545
+msgid "Install"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/query.cpp:95
+msgid "My apps"
+msgstr ""
+
+#: /home/dobey/Projects/canonical/unity-scope-click/no-auto-pot/po/../scope/click/query.cpp:184
+msgid "Available"
+msgstr ""