Merge lp:~dholbach/help-app/1434125 into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[Daniel Holbach]

[David Planella (dpm)]

Thanks! Added inline comments.

review: Needs Fixing

[lp:~dholbach/help-app/1434125]

122. By Daniel Holbach on 2015-03-20

Require 'web' target to be executed before 'web-publish'. Make it possible to print out Makefile variables to use elsewhere

123. By Daniel Holbach on 2015-03-20

translation change for testing

124. By Daniel Holbach on 2015-03-20

update branch location (~help-app-dev), get OUTPUTDIR_WEB from Makefile, add revno to commit message, quote properly, fix test for retcode

125. By Daniel Holbach on 2015-03-20

merge from trunk

126. By Daniel Holbach on 2015-03-20

update docs

127. By Daniel Holbach on 2015-03-20

use trap (http://redsymbol.net/articles/bash-exit-traps/), thanks mvo! don't test rc of 'bzr commit', we use 'set -e' already

128. By Daniel Holbach on 2015-03-20

merge from trunk

129. By Daniel Holbach on 2015-03-20

update .po files

130. By Daniel Holbach on 2015-03-20

we need bzrtools, thanks Nick!

131. By Daniel Holbach on 2015-03-23

fix logic to obtain OUTPUTDIR_WEB value from Makefile

Unmerged revisions

131. By Daniel Holbach on 2015-03-23

fix logic to obtain OUTPUTDIR_WEB value from Makefile

130. By Daniel Holbach on 2015-03-20

we need bzrtools, thanks Nick!

129. By Daniel Holbach on 2015-03-20

update .po files

128. By Daniel Holbach on 2015-03-20

merge from trunk

127. By Daniel Holbach on 2015-03-20

use trap (http://redsymbol.net/articles/bash-exit-traps/), thanks mvo! don't test rc of 'bzr commit', we use 'set -e' already

126. By Daniel Holbach on 2015-03-20

update docs

125. By Daniel Holbach on 2015-03-20

merge from trunk

124. By Daniel Holbach on 2015-03-20

update branch location (~help-app-dev), get OUTPUTDIR_WEB from Makefile, add revno to commit message, quote properly, fix test for retcode

123. By Daniel Holbach on 2015-03-20

translation change for testing

122. By Daniel Holbach on 2015-03-20

Require 'web' target to be executed before 'web-publish'. Make it possible to print out Makefile variables to use elsewhere

=== modified file 'HACKING'
--- HACKING	2015-03-19 15:36:04 +0000
+++ HACKING	2015-03-20 12:26:43 +0000
@@ -141,6 +141,11 @@
 
 Find the resulting files in the ./build/web directory.
 
+To update the publishing branch (you need to be member of ~help-app-dev), 
+run
+
+	make web-publish
+
 We plan to make use of 
 http://www.w3.org/International/questions/qa-apache-lang-neg for publishing
 this on the web.

=== modified file 'Makefile'
--- Makefile	2015-03-19 16:04:43 +0000
+++ Makefile	2015-03-20 12:26:43 +0000
@@ -27,6 +27,9 @@
 
 ignored := $(shell bzr ignored | cut -d' ' -f1)
 
+print-%:
+	@echo -n '$*=$($*)'
+
 clean:
 ifneq ($(strip $(ignored)),)
 	$(foreach fn, $(ignored), $(shell rm -r $(fn);))
@@ -74,4 +77,7 @@
 update-pot:
 	cd $(INTERNALS_DIR) && ./generate-pot
 
-.PHONY: html help clean web check launch click app update-pot translations
+web-publish: web
+	cd $(INTERNALS_DIR) && ./web-publish
+
+.PHONY: html help clean web check launch click app update-pot translations web-publish

=== added file 'internals/web-publish'
--- internals/web-publish	1970-01-01 00:00:00 +0000
+++ internals/web-publish	2015-03-20 12:26:43 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+web_branch="lp:~help-app-dev/help-app/help-app-web"
+outputdir_web=$(cd .. && make print-OUTPUTDIR_WEB | cut -d'=' -f2)
+current_rev=$(bzr revno)
+workingdir=$(pwd)
+
+tempdir=$(mktemp -d)
+cd "$tempdir"
+bzr branch "$web_branch" output-web
+
+cd output-web; bzr import "$outputdir_web"
+
+bzr commit -m "Update content (rev $current_rev)" -q
+rc=$?; if [ $rc = 0 ]; then
+	bzr push :parent
+fi
+
+cd "$workingdir" && rm -r "$tempdir"

=== modified file 'po/de.po'
--- po/de.po	2015-03-20 05:25:22 +0000
+++ po/de.po	2015-03-20 12:26:43 +0000
@@ -11,12 +11,12 @@
 "PO-Revision-Date: 2015-03-19 07:38+0000\n"
 "Last-Translator: Daniel Holbach <[e-mail]>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2015-03-20 05:25+0000\n"
 "X-Generator: Launchpad (build 17405)\n"
-"Language: \n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -30,9 +30,11 @@
 msgstr "*Fragst Du Dich, wie Du das Telefon sicherer machen kannst?*\n"
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7 content/pages/scopes.md:6
+#: content/pages/security.md:6 content/pages/basic.md:6
+#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
+#: content/pages/scopes.md:6
 msgid "[TOC]"
-msgstr ""
+msgstr "[TOC]"
 
 #. type: Title ###
 #: content/pages/security.md:7
@@ -91,23 +93,20 @@
 #. type: Title ###
 #: content/pages/security.md:19
 #, no-wrap
-msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)? !!T"
+msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)? !!T"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your "
-"pin/passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your pin/"
+"passcode is required. This is for your phone security."
 msgstr ""
 
 #. type: Title ###
 #: content/pages/security.md:22
 #, no-wrap
-msgid ""
-"How can I stop someone using the indicators when the phone is unlocked? !!T"
+msgid "How can I stop someone using the indicators when the phone is unlocked? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -154,6 +153,9 @@
 "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
 "music."
 msgstr ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.de.md) such as 7digital and Grooveshark can also "
+"play music."
 
 #. type: Title ###
 #: content/pages/basic.md:10
@@ -343,12 +345,12 @@
 #. type: Plain text
 #: content/pages/index.md:11
 msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
+msgstr "[Take me to the FAQ!]({filename}faq.de.md)"
 
 #. type: Plain text
 #: content/pages/index.md:12
 msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
+msgstr "[Get in touch]({filename}get-in-touch.de.md)"
 
 #. type: Plain text
 #: content/pages/settings.md:2
@@ -386,8 +388,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  "
-"![Icon]({filename}/images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
+"images/settings.gif)"
 msgstr ""
 
 #. type: Title ###
@@ -470,9 +472,7 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
 msgstr ""
 
 #. type: Title ###
@@ -579,8 +579,7 @@
 #. type: Title ###
 #: content/pages/ui.md:30
 #, no-wrap
-msgid ""
-"What are the small characters on the keyboard and how can I select them? !!T"
+msgid "What are the small characters on the keyboard and how can I select them? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -658,9 +657,7 @@
 #. type: Title ###
 #: content/pages/ui.md:48
 #, no-wrap
-msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it? !!T"
+msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -715,8 +712,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained "
-"store](https://appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained store](https://"
+"appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. type: Title ###
@@ -749,8 +746,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' "
-"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
+"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. type: Title ###