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 on 2015-03-06
Status: Merged
Approved by: David Planella on 2015-03-06
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 2015-03-06 Approve on 2015-03-06
Review via email: mp+252076@code.launchpad.net
To post a comment you must log in.
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
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
1=== modified file 'edit-here/Makefile'
2--- edit-here/Makefile 2015-02-27 08:25:43 +0000
3+++ edit-here/Makefile 2015-03-06 10:42:46 +0000
4@@ -63,6 +63,7 @@
5 web:
6 ./generate-translations
7 $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR_WEB) -s $(CONFFILE) $(PELICANOPTS) -t $(THEMEDIR_WEB)
8+ cp index.html $(OUTPUTDIR_WEB)
9
10 html:
11 ./generate-translations
12
13=== modified file 'edit-here/content/pages/index.md'
14--- edit-here/content/pages/index.md 2015-03-05 20:41:53 +0000
15+++ edit-here/content/pages/index.md 2015-03-06 10:42:46 +0000
16@@ -9,7 +9,7 @@
17
18 in this app for you.
19
20-[Take me to the FAQ!]({filename}faq.md)
21+[Take me to the FAQ!]({filename}faq.md)
22 [Get in touch]({filename}get-in-touch.md)
23
24 ---
25
26=== modified file 'edit-here/po/de.po'
27--- edit-here/po/de.po 2015-03-06 08:40:27 +0000
28+++ edit-here/po/de.po 2015-03-06 10:42:46 +0000
29@@ -339,15 +339,6 @@
30 msgstr "[First Day Tasks]({filename}basic.de.md)"
31
32 #. type: Plain text
33-#: content/pages/index.md:14
34-msgid ""
35-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
36-"touch.md)"
37-msgstr ""
38-"[Take me to the FAQ!]({filename}faq.de.md) [Get in touch]({filename}get-in-"
39-"touch.md)"
40-
41-#. type: Plain text
42 #: content/pages/settings.md:4
43 #, no-wrap
44 msgid "*How do I change my phone settings?*\n"
45@@ -690,6 +681,24 @@
46 ": 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"
47 msgstr ""
48
49+#. type: Plain text
50+#: content/pages/index.md:12
51+#, no-wrap
52+msgid "[Take me to the FAQ!]({filename}faq.md) \n"
53+msgstr "[Gib mir die Antworten!]({filename}faq.de.md) \n"
54+
55+#. type: Plain text
56+#: content/pages/index.md:14
57+msgid "[Get in touch]({filename}get-in-touch.md)"
58+msgstr "[Kontakt]({filename}get-in-touch.de.md)"
59+
60+#~ msgid ""
61+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
62+#~ "touch.md)"
63+#~ msgstr ""
64+#~ "[Take me to the FAQ!]({filename}faq.de.md) [Get in touch]({filename}get-in-"
65+#~ "touch.md)"
66+
67 #~ msgid "Wondering how to make your phone more secure?"
68 #~ msgstr "Willst Du wissen, wie Du Dein Telefon sicherer machst?"
69
70@@ -727,12 +736,6 @@
71 #~ msgid "**Q:** How do I remove applications? \n"
72 #~ msgstr ""
73
74-#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
75-#~ msgstr "[Gib mir die Antworten!]({filename}faq.md) \n"
76-
77-#~ msgid "[Get in touch]({filename}get-in-touch.md)"
78-#~ msgstr "[Kontakt]({filename}get-in-touch.md)"
79-
80 #~ msgid "How do I change my phone settings?"
81 #~ msgstr ""
82
83
84=== modified file 'edit-here/po/es.po'
85--- edit-here/po/es.po 2015-03-06 08:40:27 +0000
86+++ edit-here/po/es.po 2015-03-06 10:42:46 +0000
87@@ -330,15 +330,6 @@
88 msgstr "[First Day Tasks]({filename}basic.es.md)"
89
90 #. type: Plain text
91-#: content/pages/index.md:14
92-msgid ""
93-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
94-"touch.md)"
95-msgstr ""
96-"[Take me to the FAQ!]({filename}faq.es.md) [Get in touch]({filename}get-in-"
97-"touch.md)"
98-
99-#. type: Plain text
100 #: content/pages/settings.md:4
101 #, no-wrap
102 msgid "*How do I change my phone settings?*\n"
103@@ -681,6 +672,24 @@
104 ": 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"
105 msgstr ""
106
107+#. type: Plain text
108+#: content/pages/index.md:12
109+#, no-wrap
110+msgid "[Take me to the FAQ!]({filename}faq.md) \n"
111+msgstr "[Take me to the FAQ!]({filename}faq.es.md) \n"
112+
113+#. type: Plain text
114+#: content/pages/index.md:14
115+msgid "[Get in touch]({filename}get-in-touch.md)"
116+msgstr "[Get in touch]({filename}get-in-touch.es.md)"
117+
118+#~ msgid ""
119+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
120+#~ "touch.md)"
121+#~ msgstr ""
122+#~ "[Take me to the FAQ!]({filename}faq.es.md) [Get in touch]({filename}get-in-"
123+#~ "touch.md)"
124+
125 #~ msgid "Wondering how to make your phone more secure?"
126 #~ msgstr ""
127
128@@ -714,12 +723,6 @@
129 #~ msgid "**Q:** How do I remove applications? \n"
130 #~ msgstr ""
131
132-#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
133-#~ msgstr ""
134-
135-#~ msgid "[Get in touch]({filename}get-in-touch.md)"
136-#~ msgstr ""
137-
138 #~ msgid "How do I change my phone settings?"
139 #~ msgstr ""
140
141
142=== modified file 'edit-here/po/fr.po'
143--- edit-here/po/fr.po 2015-03-06 08:40:27 +0000
144+++ edit-here/po/fr.po 2015-03-06 10:42:46 +0000
145@@ -326,15 +326,6 @@
146 msgstr "[First Day Tasks]({filename}basic.fr.md)"
147
148 #. type: Plain text
149-#: content/pages/index.md:14
150-msgid ""
151-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
152-"touch.md)"
153-msgstr ""
154-"[Take me to the FAQ!]({filename}faq.fr.md) [Get in touch]({filename}get-in-"
155-"touch.md)"
156-
157-#. type: Plain text
158 #: content/pages/settings.md:4
159 #, no-wrap
160 msgid "*How do I change my phone settings?*\n"
161@@ -677,6 +668,24 @@
162 ": 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"
163 msgstr ""
164
165+#. type: Plain text
166+#: content/pages/index.md:12
167+#, no-wrap
168+msgid "[Take me to the FAQ!]({filename}faq.md) \n"
169+msgstr "[Take me to the FAQ!]({filename}faq.fr.md) \n"
170+
171+#. type: Plain text
172+#: content/pages/index.md:14
173+msgid "[Get in touch]({filename}get-in-touch.md)"
174+msgstr "[Get in touch]({filename}get-in-touch.fr.md)"
175+
176+#~ msgid ""
177+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
178+#~ "touch.md)"
179+#~ msgstr ""
180+#~ "[Take me to the FAQ!]({filename}faq.fr.md) [Get in touch]({filename}get-in-"
181+#~ "touch.md)"
182+
183 #~ msgid "Wondering how to make your phone more secure?"
184 #~ msgstr ""
185
186@@ -710,12 +719,6 @@
187 #~ msgid "**Q:** How do I remove applications? \n"
188 #~ msgstr ""
189
190-#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
191-#~ msgstr ""
192-
193-#~ msgid "[Get in touch]({filename}get-in-touch.md)"
194-#~ msgstr ""
195-
196 #~ msgid "How do I change my phone settings?"
197 #~ msgstr ""
198
199
200=== modified file 'edit-here/po/help.pot'
201--- edit-here/po/help.pot 2015-03-06 08:40:27 +0000
202+++ edit-here/po/help.pot 2015-03-06 10:42:46 +0000
203@@ -7,7 +7,7 @@
204 msgid ""
205 msgstr ""
206 "Project-Id-Version: PACKAGE VERSION\n"
207-"POT-Creation-Date: 2015-03-06 09:38+0100\n"
208+"POT-Creation-Date: 2015-03-06 11:41+0100\n"
209 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
210 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
211 "Language-Team: LANGUAGE <LL@li.org>\n"
212@@ -280,10 +280,14 @@
213 msgstr ""
214
215 #. type: Plain text
216+#: content/pages/index.md:12
217+#, no-wrap
218+msgid "[Take me to the FAQ!]({filename}faq.md) \n"
219+msgstr ""
220+
221+#. type: Plain text
222 #: content/pages/index.md:14
223-msgid ""
224-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
225-"touch.md)"
226+msgid "[Get in touch]({filename}get-in-touch.md)"
227 msgstr ""
228
229 #. type: Plain text
230
231=== modified file 'edit-here/po/it.po'
232--- edit-here/po/it.po 2015-03-06 08:40:27 +0000
233+++ edit-here/po/it.po 2015-03-06 10:42:46 +0000
234@@ -330,15 +330,6 @@
235 msgstr "[First Day Tasks]({filename}basic.it.md)"
236
237 #. type: Plain text
238-#: content/pages/index.md:14
239-msgid ""
240-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
241-"touch.md)"
242-msgstr ""
243-"[Take me to the FAQ!]({filename}faq.it.md) [Get in touch]({filename}get-in-"
244-"touch.md)"
245-
246-#. type: Plain text
247 #: content/pages/settings.md:4
248 #, no-wrap
249 msgid "*How do I change my phone settings?*\n"
250@@ -681,6 +672,24 @@
251 ": 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"
252 msgstr ""
253
254+#. type: Plain text
255+#: content/pages/index.md:12
256+#, no-wrap
257+msgid "[Take me to the FAQ!]({filename}faq.md) \n"
258+msgstr "[Portami alle FAQ!]({filename}faq.it.md) \n"
259+
260+#. type: Plain text
261+#: content/pages/index.md:14
262+msgid "[Get in touch]({filename}get-in-touch.md)"
263+msgstr "[Get in touch]({filename}get-in-touch.it.md)"
264+
265+#~ msgid ""
266+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
267+#~ "touch.md)"
268+#~ msgstr ""
269+#~ "[Take me to the FAQ!]({filename}faq.it.md) [Get in touch]({filename}get-in-"
270+#~ "touch.md)"
271+
272 #~ msgid "Wondering how to make your phone more secure?"
273 #~ msgstr ""
274
275@@ -714,12 +723,6 @@
276 #~ msgid "**Q:** How do I remove applications? \n"
277 #~ msgstr ""
278
279-#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
280-#~ msgstr "[Portami alle FAQ!]({filename}faq.md) \n"
281-
282-#~ msgid "[Get in touch]({filename}get-in-touch.md)"
283-#~ msgstr ""
284-
285 #~ msgid "How do I change my phone settings?"
286 #~ msgstr ""
287
288
289=== modified file 'edit-here/po/pt.po'
290--- edit-here/po/pt.po 2015-03-06 08:40:27 +0000
291+++ edit-here/po/pt.po 2015-03-06 10:42:46 +0000
292@@ -340,15 +340,6 @@
293 msgstr "[First Day Tasks]({filename}basic.pt.md)"
294
295 #. type: Plain text
296-#: content/pages/index.md:14
297-msgid ""
298-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
299-"touch.md)"
300-msgstr ""
301-"[Take me to the FAQ!]({filename}faq.pt.md) [Get in touch]({filename}get-in-"
302-"touch.md)"
303-
304-#. type: Plain text
305 #: content/pages/settings.md:4
306 #, no-wrap
307 msgid "*How do I change my phone settings?*\n"
308@@ -691,6 +682,24 @@
309 ": 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"
310 msgstr ""
311
312+#. type: Plain text
313+#: content/pages/index.md:12
314+#, no-wrap
315+msgid "[Take me to the FAQ!]({filename}faq.md) \n"
316+msgstr "[Ir para perguntas mais frequentes!]({filename}faq.pt.md) \n"
317+
318+#. type: Plain text
319+#: content/pages/index.md:14
320+msgid "[Get in touch]({filename}get-in-touch.md)"
321+msgstr "[Entrar em contacto]({filename}get-in-touch.pt.md)"
322+
323+#~ msgid ""
324+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
325+#~ "touch.md)"
326+#~ msgstr ""
327+#~ "[Take me to the FAQ!]({filename}faq.pt.md) [Get in touch]({filename}get-in-"
328+#~ "touch.md)"
329+
330 #~ msgid "Wondering how to make your phone more secure?"
331 #~ msgstr ""
332
333@@ -724,12 +733,6 @@
334 #~ msgid "**Q:** How do I remove applications? \n"
335 #~ msgstr ""
336
337-#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
338-#~ msgstr "[Ir para perguntas mais frequentes!]({filename}faq.md) \n"
339-
340-#~ msgid "[Get in touch]({filename}get-in-touch.md)"
341-#~ msgstr "[Entrar em contacto]({filename}get-in-touch.md)"
342-
343 #~ msgid "How do I change my phone settings?"
344 #~ msgstr ""
345
346
347=== modified file 'edit-here/po/ro.po'
348--- edit-here/po/ro.po 2015-03-06 08:40:27 +0000
349+++ edit-here/po/ro.po 2015-03-06 10:42:46 +0000
350@@ -326,15 +326,6 @@
351 msgstr "[First Day Tasks]({filename}basic.ro.md)"
352
353 #. type: Plain text
354-#: content/pages/index.md:14
355-msgid ""
356-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
357-"touch.md)"
358-msgstr ""
359-"[Take me to the FAQ!]({filename}faq.ro.md) [Get in touch]({filename}get-in-"
360-"touch.md)"
361-
362-#. type: Plain text
363 #: content/pages/settings.md:4
364 #, no-wrap
365 msgid "*How do I change my phone settings?*\n"
366@@ -677,6 +668,24 @@
367 ": 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"
368 msgstr ""
369
370+#. type: Plain text
371+#: content/pages/index.md:12
372+#, no-wrap
373+msgid "[Take me to the FAQ!]({filename}faq.md) \n"
374+msgstr "[Take me to the FAQ!]({filename}faq.ro.md) \n"
375+
376+#. type: Plain text
377+#: content/pages/index.md:14
378+msgid "[Get in touch]({filename}get-in-touch.md)"
379+msgstr "[Get in touch]({filename}get-in-touch.ro.md)"
380+
381+#~ msgid ""
382+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
383+#~ "touch.md)"
384+#~ msgstr ""
385+#~ "[Take me to the FAQ!]({filename}faq.ro.md) [Get in touch]({filename}get-in-"
386+#~ "touch.md)"
387+
388 #~ msgid "Wondering how to make your phone more secure?"
389 #~ msgstr ""
390
391@@ -710,12 +719,6 @@
392 #~ msgid "**Q:** How do I remove applications? \n"
393 #~ msgstr ""
394
395-#~ msgid "[Take me to the FAQ!]({filename}faq.md) \n"
396-#~ msgstr ""
397-
398-#~ msgid "[Get in touch]({filename}get-in-touch.md)"
399-#~ msgstr ""
400-
401 #~ msgid "How do I change my phone settings?"
402 #~ msgstr ""
403

Subscribers

People subscribed via source and target branches