Ubuntu Help App

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

  1. content-fixes2
  2. Merge into trunk
Proposed by Daniel Holbach
Status: Merged
Approved by: David Planella
Approved revision: 77
Merged at revision: 75
Proposed branch: lp:~dholbach/help-app/content-fixes2
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 402 lines (+118/-95)
9 files modified
edit-here/Makefile (+1/-0)
edit-here/content/pages/index.md (+1/-1)
edit-here/po/de.po (+18/-15)
edit-here/po/es.po (+18/-15)
edit-here/po/fr.po (+18/-15)
edit-here/po/help.pot (+8/-4)
edit-here/po/it.po (+18/-15)
edit-here/po/pt.po (+18/-15)
edit-here/po/ro.po (+18/-15)
To merge this branch: bzr merge lp:~dholbach/help-app/content-fixes2
Reviewer Review Type Date Requested Status
David Planella Approve
Review via email: mp+252076@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Looks good to me. I actually noticed the missing index.html file for the web build on another MP I reviewed, but I thought it was intentional.

I think on the server it won't be needed, as it should serve the right $LANG.html file according to the user's browser language, but it won't hurt to have it to test translations locally.

Ack on adding the line break.

review: Approve
Revision history for this message
Daniel Holbach (dholbach) wrote :

Ok, let's figure out the index.html situation via bug 1425025, especially once we have the pages deployed on the server.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'edit-here/Makefile'
--- edit-here/Makefile 2015-02-27 08:25:43 +0000
+++ edit-here/Makefile 2015-03-06 10:42:46 +0000
@@ -63,6 +63,7 @@
63web:63web:
64 ./generate-translations64 ./generate-translations
65 $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR_WEB) -s $(CONFFILE) $(PELICANOPTS) -t $(THEMEDIR_WEB)65 $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR_WEB) -s $(CONFFILE) $(PELICANOPTS) -t $(THEMEDIR_WEB)
66 cp index.html $(OUTPUTDIR_WEB)
6667
67html:68html:
68 ./generate-translations69 ./generate-translations
6970
=== modified file 'edit-here/content/pages/index.md'
--- edit-here/content/pages/index.md 2015-03-05 20:41:53 +0000
+++ edit-here/content/pages/index.md 2015-03-06 10:42:46 +0000
@@ -9,7 +9,7 @@
99
10in this app for you.10in this app for you.
1111
12[Take me to the FAQ!]({filename}faq.md)12[Take me to the FAQ!]({filename}faq.md)
13[Get in touch]({filename}get-in-touch.md)13[Get in touch]({filename}get-in-touch.md)
1414
15---15---
1616
=== modified file 'edit-here/po/de.po'
--- edit-here/po/de.po 2015-03-06 08:40:27 +0000
+++ edit-here/po/de.po 2015-03-06 10:42:46 +0000
@@ -339,15 +339,6 @@
339msgstr "[First Day Tasks]({filename}basic.de.md)"339msgstr "[First Day Tasks]({filename}basic.de.md)"
340340
341#. type: Plain text341#. type: Plain text
342#: content/pages/index.md:14
343msgid ""
344"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
345"touch.md)"
346msgstr ""
347"[Take me to the FAQ!]({filename}faq.de.md) [Get in touch]({filename}get-in-"
348"touch.md)"
349
350#. type: Plain text
351#: content/pages/settings.md:4342#: content/pages/settings.md:4
352#, no-wrap343#, no-wrap
353msgid "*How do I change my phone settings?*\n"344msgid "*How do I change my phone settings?*\n"
@@ -690,6 +681,24 @@
690": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"681": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"
691msgstr ""682msgstr ""
692683
684#. type: Plain text
685#: content/pages/index.md:12
686#, no-wrap
687msgid "[Take me to the FAQ!]({filename}faq.md) \n"
688msgstr "[Gib mir die Antworten!]({filename}faq.de.md) \n"
689
690#. type: Plain text
691#: content/pages/index.md:14
692msgid "[Get in touch]({filename}get-in-touch.md)"
693msgstr "[Kontakt]({filename}get-in-touch.de.md)"
694
695#~ msgid ""
696#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
697#~ "touch.md)"
698#~ msgstr ""
699#~ "[Take me to the FAQ!]({filename}faq.de.md) [Get in touch]({filename}get-in-"
700#~ "touch.md)"
701
693#~ msgid "Wondering how to make your phone more secure?"702#~ msgid "Wondering how to make your phone more secure?"
694#~ msgstr "Willst Du wissen, wie Du Dein Telefon sicherer machst?"703#~ msgstr "Willst Du wissen, wie Du Dein Telefon sicherer machst?"
695704
@@ -727,12 +736,6 @@
727#~ msgid "**Q:** How do I remove applications? \n"736#~ msgid "**Q:** How do I remove applications? \n"
728#~ msgstr ""737#~ msgstr ""
729738
730#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
731#~ msgstr "[Gib mir die Antworten!]({filename}faq.md) \n"
732
733#~ msgid "[Get in touch]({filename}get-in-touch.md)"
734#~ msgstr "[Kontakt]({filename}get-in-touch.md)"
735
736#~ msgid "How do I change my phone settings?"739#~ msgid "How do I change my phone settings?"
737#~ msgstr ""740#~ msgstr ""
738741
739742
=== modified file 'edit-here/po/es.po'
--- edit-here/po/es.po 2015-03-06 08:40:27 +0000
+++ edit-here/po/es.po 2015-03-06 10:42:46 +0000
@@ -330,15 +330,6 @@
330msgstr "[First Day Tasks]({filename}basic.es.md)"330msgstr "[First Day Tasks]({filename}basic.es.md)"
331331
332#. type: Plain text332#. type: Plain text
333#: content/pages/index.md:14
334msgid ""
335"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
336"touch.md)"
337msgstr ""
338"[Take me to the FAQ!]({filename}faq.es.md) [Get in touch]({filename}get-in-"
339"touch.md)"
340
341#. type: Plain text
342#: content/pages/settings.md:4333#: content/pages/settings.md:4
343#, no-wrap334#, no-wrap
344msgid "*How do I change my phone settings?*\n"335msgid "*How do I change my phone settings?*\n"
@@ -681,6 +672,24 @@
681": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"672": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"
682msgstr ""673msgstr ""
683674
675#. type: Plain text
676#: content/pages/index.md:12
677#, no-wrap
678msgid "[Take me to the FAQ!]({filename}faq.md) \n"
679msgstr "[Take me to the FAQ!]({filename}faq.es.md) \n"
680
681#. type: Plain text
682#: content/pages/index.md:14
683msgid "[Get in touch]({filename}get-in-touch.md)"
684msgstr "[Get in touch]({filename}get-in-touch.es.md)"
685
686#~ msgid ""
687#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
688#~ "touch.md)"
689#~ msgstr ""
690#~ "[Take me to the FAQ!]({filename}faq.es.md) [Get in touch]({filename}get-in-"
691#~ "touch.md)"
692
684#~ msgid "Wondering how to make your phone more secure?"693#~ msgid "Wondering how to make your phone more secure?"
685#~ msgstr ""694#~ msgstr ""
686695
@@ -714,12 +723,6 @@
714#~ msgid "**Q:** How do I remove applications? \n"723#~ msgid "**Q:** How do I remove applications? \n"
715#~ msgstr ""724#~ msgstr ""
716725
717#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
718#~ msgstr ""
719
720#~ msgid "[Get in touch]({filename}get-in-touch.md)"
721#~ msgstr ""
722
723#~ msgid "How do I change my phone settings?"726#~ msgid "How do I change my phone settings?"
724#~ msgstr ""727#~ msgstr ""
725728
726729
=== modified file 'edit-here/po/fr.po'
--- edit-here/po/fr.po 2015-03-06 08:40:27 +0000
+++ edit-here/po/fr.po 2015-03-06 10:42:46 +0000
@@ -326,15 +326,6 @@
326msgstr "[First Day Tasks]({filename}basic.fr.md)"326msgstr "[First Day Tasks]({filename}basic.fr.md)"
327327
328#. type: Plain text328#. type: Plain text
329#: content/pages/index.md:14
330msgid ""
331"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
332"touch.md)"
333msgstr ""
334"[Take me to the FAQ!]({filename}faq.fr.md) [Get in touch]({filename}get-in-"
335"touch.md)"
336
337#. type: Plain text
338#: content/pages/settings.md:4329#: content/pages/settings.md:4
339#, no-wrap330#, no-wrap
340msgid "*How do I change my phone settings?*\n"331msgid "*How do I change my phone settings?*\n"
@@ -677,6 +668,24 @@
677": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"668": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"
678msgstr ""669msgstr ""
679670
671#. type: Plain text
672#: content/pages/index.md:12
673#, no-wrap
674msgid "[Take me to the FAQ!]({filename}faq.md) \n"
675msgstr "[Take me to the FAQ!]({filename}faq.fr.md) \n"
676
677#. type: Plain text
678#: content/pages/index.md:14
679msgid "[Get in touch]({filename}get-in-touch.md)"
680msgstr "[Get in touch]({filename}get-in-touch.fr.md)"
681
682#~ msgid ""
683#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
684#~ "touch.md)"
685#~ msgstr ""
686#~ "[Take me to the FAQ!]({filename}faq.fr.md) [Get in touch]({filename}get-in-"
687#~ "touch.md)"
688
680#~ msgid "Wondering how to make your phone more secure?"689#~ msgid "Wondering how to make your phone more secure?"
681#~ msgstr ""690#~ msgstr ""
682691
@@ -710,12 +719,6 @@
710#~ msgid "**Q:** How do I remove applications? \n"719#~ msgid "**Q:** How do I remove applications? \n"
711#~ msgstr ""720#~ msgstr ""
712721
713#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
714#~ msgstr ""
715
716#~ msgid "[Get in touch]({filename}get-in-touch.md)"
717#~ msgstr ""
718
719#~ msgid "How do I change my phone settings?"722#~ msgid "How do I change my phone settings?"
720#~ msgstr ""723#~ msgstr ""
721724
722725
=== modified file 'edit-here/po/help.pot'
--- edit-here/po/help.pot 2015-03-06 08:40:27 +0000
+++ edit-here/po/help.pot 2015-03-06 10:42:46 +0000
@@ -7,7 +7,7 @@
7msgid ""7msgid ""
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"POT-Creation-Date: 2015-03-06 09:38+0100\n"10"POT-Creation-Date: 2015-03-06 11:41+0100\n"
11"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"11"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: LANGUAGE <LL@li.org>\n"13"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -280,10 +280,14 @@
280msgstr ""280msgstr ""
281281
282#. type: Plain text282#. type: Plain text
283#: content/pages/index.md:12
284#, no-wrap
285msgid "[Take me to the FAQ!]({filename}faq.md) \n"
286msgstr ""
287
288#. type: Plain text
283#: content/pages/index.md:14289#: content/pages/index.md:14
284msgid ""290msgid "[Get in touch]({filename}get-in-touch.md)"
285"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
286"touch.md)"
287msgstr ""291msgstr ""
288292
289#. type: Plain text293#. type: Plain text
290294
=== modified file 'edit-here/po/it.po'
--- edit-here/po/it.po 2015-03-06 08:40:27 +0000
+++ edit-here/po/it.po 2015-03-06 10:42:46 +0000
@@ -330,15 +330,6 @@
330msgstr "[First Day Tasks]({filename}basic.it.md)"330msgstr "[First Day Tasks]({filename}basic.it.md)"
331331
332#. type: Plain text332#. type: Plain text
333#: content/pages/index.md:14
334msgid ""
335"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
336"touch.md)"
337msgstr ""
338"[Take me to the FAQ!]({filename}faq.it.md) [Get in touch]({filename}get-in-"
339"touch.md)"
340
341#. type: Plain text
342#: content/pages/settings.md:4333#: content/pages/settings.md:4
343#, no-wrap334#, no-wrap
344msgid "*How do I change my phone settings?*\n"335msgid "*How do I change my phone settings?*\n"
@@ -681,6 +672,24 @@
681": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"672": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"
682msgstr ""673msgstr ""
683674
675#. type: Plain text
676#: content/pages/index.md:12
677#, no-wrap
678msgid "[Take me to the FAQ!]({filename}faq.md) \n"
679msgstr "[Portami alle FAQ!]({filename}faq.it.md) \n"
680
681#. type: Plain text
682#: content/pages/index.md:14
683msgid "[Get in touch]({filename}get-in-touch.md)"
684msgstr "[Get in touch]({filename}get-in-touch.it.md)"
685
686#~ msgid ""
687#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
688#~ "touch.md)"
689#~ msgstr ""
690#~ "[Take me to the FAQ!]({filename}faq.it.md) [Get in touch]({filename}get-in-"
691#~ "touch.md)"
692
684#~ msgid "Wondering how to make your phone more secure?"693#~ msgid "Wondering how to make your phone more secure?"
685#~ msgstr ""694#~ msgstr ""
686695
@@ -714,12 +723,6 @@
714#~ msgid "**Q:** How do I remove applications? \n"723#~ msgid "**Q:** How do I remove applications? \n"
715#~ msgstr ""724#~ msgstr ""
716725
717#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
718#~ msgstr "[Portami alle FAQ!]({filename}faq.md) \n"
719
720#~ msgid "[Get in touch]({filename}get-in-touch.md)"
721#~ msgstr ""
722
723#~ msgid "How do I change my phone settings?"726#~ msgid "How do I change my phone settings?"
724#~ msgstr ""727#~ msgstr ""
725728
726729
=== modified file 'edit-here/po/pt.po'
--- edit-here/po/pt.po 2015-03-06 08:40:27 +0000
+++ edit-here/po/pt.po 2015-03-06 10:42:46 +0000
@@ -340,15 +340,6 @@
340msgstr "[First Day Tasks]({filename}basic.pt.md)"340msgstr "[First Day Tasks]({filename}basic.pt.md)"
341341
342#. type: Plain text342#. type: Plain text
343#: content/pages/index.md:14
344msgid ""
345"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
346"touch.md)"
347msgstr ""
348"[Take me to the FAQ!]({filename}faq.pt.md) [Get in touch]({filename}get-in-"
349"touch.md)"
350
351#. type: Plain text
352#: content/pages/settings.md:4343#: content/pages/settings.md:4
353#, no-wrap344#, no-wrap
354msgid "*How do I change my phone settings?*\n"345msgid "*How do I change my phone settings?*\n"
@@ -691,6 +682,24 @@
691": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"682": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"
692msgstr ""683msgstr ""
693684
685#. type: Plain text
686#: content/pages/index.md:12
687#, no-wrap
688msgid "[Take me to the FAQ!]({filename}faq.md) \n"
689msgstr "[Ir para perguntas mais frequentes!]({filename}faq.pt.md) \n"
690
691#. type: Plain text
692#: content/pages/index.md:14
693msgid "[Get in touch]({filename}get-in-touch.md)"
694msgstr "[Entrar em contacto]({filename}get-in-touch.pt.md)"
695
696#~ msgid ""
697#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
698#~ "touch.md)"
699#~ msgstr ""
700#~ "[Take me to the FAQ!]({filename}faq.pt.md) [Get in touch]({filename}get-in-"
701#~ "touch.md)"
702
694#~ msgid "Wondering how to make your phone more secure?"703#~ msgid "Wondering how to make your phone more secure?"
695#~ msgstr ""704#~ msgstr ""
696705
@@ -724,12 +733,6 @@
724#~ msgid "**Q:** How do I remove applications? \n"733#~ msgid "**Q:** How do I remove applications? \n"
725#~ msgstr ""734#~ msgstr ""
726735
727#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
728#~ msgstr "[Ir para perguntas mais frequentes!]({filename}faq.md) \n"
729
730#~ msgid "[Get in touch]({filename}get-in-touch.md)"
731#~ msgstr "[Entrar em contacto]({filename}get-in-touch.md)"
732
733#~ msgid "How do I change my phone settings?"736#~ msgid "How do I change my phone settings?"
734#~ msgstr ""737#~ msgstr ""
735738
736739
=== modified file 'edit-here/po/ro.po'
--- edit-here/po/ro.po 2015-03-06 08:40:27 +0000
+++ edit-here/po/ro.po 2015-03-06 10:42:46 +0000
@@ -326,15 +326,6 @@
326msgstr "[First Day Tasks]({filename}basic.ro.md)"326msgstr "[First Day Tasks]({filename}basic.ro.md)"
327327
328#. type: Plain text328#. type: Plain text
329#: content/pages/index.md:14
330msgid ""
331"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
332"touch.md)"
333msgstr ""
334"[Take me to the FAQ!]({filename}faq.ro.md) [Get in touch]({filename}get-in-"
335"touch.md)"
336
337#. type: Plain text
338#: content/pages/settings.md:4329#: content/pages/settings.md:4
339#, no-wrap330#, no-wrap
340msgid "*How do I change my phone settings?*\n"331msgid "*How do I change my phone settings?*\n"
@@ -677,6 +668,24 @@
677": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"668": Swipe up from the bottom edge of the dash to reveal a scopes manager. You can remove a scopes by selecting it from the list of your favorites. This will remove it from your dash. If you'd like to remove it completely, visit the scope page in the ubuntu store and select *Uninstall*.\n"
678msgstr ""669msgstr ""
679670
671#. type: Plain text
672#: content/pages/index.md:12
673#, no-wrap
674msgid "[Take me to the FAQ!]({filename}faq.md) \n"
675msgstr "[Take me to the FAQ!]({filename}faq.ro.md) \n"
676
677#. type: Plain text
678#: content/pages/index.md:14
679msgid "[Get in touch]({filename}get-in-touch.md)"
680msgstr "[Get in touch]({filename}get-in-touch.ro.md)"
681
682#~ msgid ""
683#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
684#~ "touch.md)"
685#~ msgstr ""
686#~ "[Take me to the FAQ!]({filename}faq.ro.md) [Get in touch]({filename}get-in-"
687#~ "touch.md)"
688
680#~ msgid "Wondering how to make your phone more secure?"689#~ msgid "Wondering how to make your phone more secure?"
681#~ msgstr ""690#~ msgstr ""
682691
@@ -710,12 +719,6 @@
710#~ msgid "**Q:** How do I remove applications? \n"719#~ msgid "**Q:** How do I remove applications? \n"
711#~ msgstr ""720#~ msgstr ""
712721
713#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
714#~ msgstr ""
715
716#~ msgid "[Get in touch]({filename}get-in-touch.md)"
717#~ msgstr ""
718
719#~ msgid "How do I change my phone settings?"722#~ msgid "How do I change my phone settings?"
720#~ msgstr ""723#~ msgstr ""
721724

Subscribers

People subscribed via source and target branches