Ubuntu Help App

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

  1. 1433957
  2. Merge into trunk
Proposed by Daniel Holbach on 2015-03-19
Status: Merged
Approved by: David Planella on 2015-03-19
Approved revision: 116
Merged at revision: 114
Proposed branch: lp:~dholbach/help-app/1433957
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 415 lines (+182/-58)
8 files modified
edit-here/content/pages/index.md (+1/-0)
edit-here/po/de.po (+29/-9)
edit-here/po/es.po (+29/-9)
edit-here/po/fr.po (+29/-9)
edit-here/po/help.pot (+7/-4)
edit-here/po/it.po (+29/-9)
edit-here/po/pt.po (+29/-9)
edit-here/po/ro.po (+29/-9)
To merge this branch: bzr merge lp:~dholbach/help-app/1433957
Reviewer Review Type Date Requested Status
David Planella 2015-03-19 Approve on 2015-03-19
Review via email: mp+253481@code.launchpad.net
To post a comment you must log in.
David Planella (dpm) wrote :

This in turn breaks the phone build :)

http://i.imgur.com/p0WO0Qz.png

The issue is that I disabled links on the front page for the phone until we could open them properly. Before they were just hidden. Now they appear hidden on the list, but the list remains.

I would suggest making them paragraphs instead by adding a line break between them. That is, just:

[Take me to the FAQ!]({filename}faq.md)

[Get in touch]({filename}get-in-touch.md)

That ends up with valid index pages for both the phone and web builds

review: Needs Fixing
lp:~dholbach/help-app/1433957 updated on 2015-03-19
114. By Daniel Holbach on 2015-03-19

factor in feedback from David, thanks - links are disabled in the phone build, don't have no empty list items

115. By Daniel Holbach on 2015-03-19

merge trunk

116. By Daniel Holbach on 2015-03-19

update .pot and .po files

David Planella (dpm) wrote :

LGTM now, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'edit-here/content/pages/index.md'
2--- edit-here/content/pages/index.md 2015-03-18 08:18:10 +0000
3+++ edit-here/content/pages/index.md 2015-03-19 11:16:13 +0000
4@@ -8,4 +8,5 @@
5 * Links to get in touch with experts and other community members
6
7 [Take me to the FAQ!]({filename}faq.md)
8+
9 [Get in touch]({filename}get-in-touch.md)
10
11=== modified file 'edit-here/po/de.po'
12--- edit-here/po/de.po 2015-03-19 10:15:37 +0000
13+++ edit-here/po/de.po 2015-03-19 11:16:13 +0000
14@@ -326,15 +326,6 @@
15 msgstr ""
16
17 #. type: Plain text
18-#: content/pages/index.md:11
19-msgid ""
20-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
21-"touch.md)"
22-msgstr ""
23-"[Take me to the FAQ!]({filename}faq.de.md) [Get in touch]({filename}get-in-"
24-"touch.md)"
25-
26-#. type: Plain text
27 #: content/pages/settings.md:2
28 msgid "Settings"
29 msgstr ""
30@@ -862,6 +853,16 @@
31 msgid "I forgot my password or passcode. How can I unlock the phone?"
32 msgstr ""
33
34+#. type: Plain text
35+#: content/pages/index.md:11
36+msgid "[Take me to the FAQ!]({filename}faq.md)"
37+msgstr "[Take me to the FAQ!]({filename}faq.de.md)"
38+
39+#. type: Plain text
40+#: content/pages/index.md:12
41+msgid "[Get in touch]({filename}get-in-touch.md)"
42+msgstr "[Get in touch]({filename}get-in-touch.de.md)"
43+
44 #. !!T
45 #: content/pages/basic.md:16
46 #, no-wrap
47@@ -1146,6 +1147,25 @@
48 #~ "additional options. Enjoy taking your video!"
49 #~ msgstr ""
50
51+#~ msgid "Here are your next steps:"
52+#~ msgstr ""
53+
54+#~ msgid ""
55+#~ "Here are your next steps:\n"
56+#~ " * [Take me to the FAQ!]({filename}faq.md)\n"
57+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
58+#~ msgstr ""
59+#~ "Here are your next steps:\n"
60+#~ " * [Take me to the FAQ!]({filename}faq.de.md)\n"
61+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
62+
63+#~ msgid ""
64+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
65+#~ "touch.md)"
66+#~ msgstr ""
67+#~ "[Take me to the FAQ!]({filename}faq.de.md) [Get in touch]({filename}get-in-"
68+#~ "touch.md)"
69+
70 #~ msgid "[The Store]({filename}store.md)"
71 #~ msgstr ""
72
73
74=== modified file 'edit-here/po/es.po'
75--- edit-here/po/es.po 2015-03-19 10:15:37 +0000
76+++ edit-here/po/es.po 2015-03-19 11:16:13 +0000
77@@ -325,15 +325,6 @@
78 msgstr ""
79
80 #. type: Plain text
81-#: content/pages/index.md:11
82-msgid ""
83-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
84-"touch.md)"
85-msgstr ""
86-"[Take me to the FAQ!]({filename}faq.es.md) [Get in touch]({filename}get-in-"
87-"touch.md)"
88-
89-#. type: Plain text
90 #: content/pages/settings.md:2
91 msgid "Settings"
92 msgstr ""
93@@ -855,6 +846,16 @@
94 msgid "I forgot my password or passcode. How can I unlock the phone?"
95 msgstr ""
96
97+#. type: Plain text
98+#: content/pages/index.md:11
99+msgid "[Take me to the FAQ!]({filename}faq.md)"
100+msgstr "[Take me to the FAQ!]({filename}faq.es.md)"
101+
102+#. type: Plain text
103+#: content/pages/index.md:12
104+msgid "[Get in touch]({filename}get-in-touch.md)"
105+msgstr "[Get in touch]({filename}get-in-touch.es.md)"
106+
107 #. !!T
108 #: content/pages/basic.md:16
109 #, no-wrap
110@@ -1139,6 +1140,25 @@
111 #~ "additional options. Enjoy taking your video!"
112 #~ msgstr ""
113
114+#~ msgid "Here are your next steps:"
115+#~ msgstr ""
116+
117+#~ msgid ""
118+#~ "Here are your next steps:\n"
119+#~ " * [Take me to the FAQ!]({filename}faq.md)\n"
120+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
121+#~ msgstr ""
122+#~ "Here are your next steps:\n"
123+#~ " * [Take me to the FAQ!]({filename}faq.es.md)\n"
124+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
125+
126+#~ msgid ""
127+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
128+#~ "touch.md)"
129+#~ msgstr ""
130+#~ "[Take me to the FAQ!]({filename}faq.es.md) [Get in touch]({filename}get-in-"
131+#~ "touch.md)"
132+
133 #~ msgid "[The Store]({filename}store.md)"
134 #~ msgstr ""
135
136
137=== modified file 'edit-here/po/fr.po'
138--- edit-here/po/fr.po 2015-03-19 10:15:37 +0000
139+++ edit-here/po/fr.po 2015-03-19 11:16:13 +0000
140@@ -321,15 +321,6 @@
141 msgstr ""
142
143 #. type: Plain text
144-#: content/pages/index.md:11
145-msgid ""
146-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
147-"touch.md)"
148-msgstr ""
149-"[Take me to the FAQ!]({filename}faq.fr.md) [Get in touch]({filename}get-in-"
150-"touch.md)"
151-
152-#. type: Plain text
153 #: content/pages/settings.md:2
154 msgid "Settings"
155 msgstr ""
156@@ -851,6 +842,16 @@
157 msgid "I forgot my password or passcode. How can I unlock the phone?"
158 msgstr ""
159
160+#. type: Plain text
161+#: content/pages/index.md:11
162+msgid "[Take me to the FAQ!]({filename}faq.md)"
163+msgstr "[Take me to the FAQ!]({filename}faq.fr.md)"
164+
165+#. type: Plain text
166+#: content/pages/index.md:12
167+msgid "[Get in touch]({filename}get-in-touch.md)"
168+msgstr "[Get in touch]({filename}get-in-touch.fr.md)"
169+
170 #. !!T
171 #: content/pages/basic.md:16
172 #, no-wrap
173@@ -1135,6 +1136,25 @@
174 #~ "additional options. Enjoy taking your video!"
175 #~ msgstr ""
176
177+#~ msgid "Here are your next steps:"
178+#~ msgstr ""
179+
180+#~ msgid ""
181+#~ "Here are your next steps:\n"
182+#~ " * [Take me to the FAQ!]({filename}faq.md)\n"
183+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
184+#~ msgstr ""
185+#~ "Here are your next steps:\n"
186+#~ " * [Take me to the FAQ!]({filename}faq.fr.md)\n"
187+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
188+
189+#~ msgid ""
190+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
191+#~ "touch.md)"
192+#~ msgstr ""
193+#~ "[Take me to the FAQ!]({filename}faq.fr.md) [Get in touch]({filename}get-in-"
194+#~ "touch.md)"
195+
196 #~ msgid "[The Store]({filename}store.md)"
197 #~ msgstr ""
198
199
200=== modified file 'edit-here/po/help.pot'
201--- edit-here/po/help.pot 2015-03-19 10:15:37 +0000
202+++ edit-here/po/help.pot 2015-03-19 11:16:13 +0000
203@@ -7,7 +7,7 @@
204 msgid ""
205 msgstr ""
206 "Project-Id-Version: PACKAGE VERSION\n"
207-"POT-Creation-Date: 2015-03-19 11:15+0100\n"
208+"POT-Creation-Date: 2015-03-19 12:15+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@@ -338,9 +338,12 @@
213
214 #. type: Plain text
215 #: content/pages/index.md:11
216-msgid ""
217-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
218-"touch.md)"
219+msgid "[Take me to the FAQ!]({filename}faq.md)"
220+msgstr ""
221+
222+#. type: Plain text
223+#: content/pages/index.md:12
224+msgid "[Get in touch]({filename}get-in-touch.md)"
225 msgstr ""
226
227 #. type: Plain text
228
229=== modified file 'edit-here/po/it.po'
230--- edit-here/po/it.po 2015-03-19 10:15:37 +0000
231+++ edit-here/po/it.po 2015-03-19 11:16:13 +0000
232@@ -325,15 +325,6 @@
233 msgstr ""
234
235 #. type: Plain text
236-#: content/pages/index.md:11
237-msgid ""
238-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
239-"touch.md)"
240-msgstr ""
241-"[Take me to the FAQ!]({filename}faq.it.md) [Get in touch]({filename}get-in-"
242-"touch.md)"
243-
244-#. type: Plain text
245 #: content/pages/settings.md:2
246 msgid "Settings"
247 msgstr ""
248@@ -855,6 +846,16 @@
249 msgid "I forgot my password or passcode. How can I unlock the phone?"
250 msgstr ""
251
252+#. type: Plain text
253+#: content/pages/index.md:11
254+msgid "[Take me to the FAQ!]({filename}faq.md)"
255+msgstr "[Take me to the FAQ!]({filename}faq.it.md)"
256+
257+#. type: Plain text
258+#: content/pages/index.md:12
259+msgid "[Get in touch]({filename}get-in-touch.md)"
260+msgstr "[Get in touch]({filename}get-in-touch.it.md)"
261+
262 #. !!T
263 #: content/pages/basic.md:16
264 #, no-wrap
265@@ -1139,6 +1140,25 @@
266 #~ "additional options. Enjoy taking your video!"
267 #~ msgstr ""
268
269+#~ msgid "Here are your next steps:"
270+#~ msgstr ""
271+
272+#~ msgid ""
273+#~ "Here are your next steps:\n"
274+#~ " * [Take me to the FAQ!]({filename}faq.md)\n"
275+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
276+#~ msgstr ""
277+#~ "Here are your next steps:\n"
278+#~ " * [Take me to the FAQ!]({filename}faq.it.md)\n"
279+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
280+
281+#~ msgid ""
282+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
283+#~ "touch.md)"
284+#~ msgstr ""
285+#~ "[Take me to the FAQ!]({filename}faq.it.md) [Get in touch]({filename}get-in-"
286+#~ "touch.md)"
287+
288 #~ msgid "[The Store]({filename}store.md)"
289 #~ msgstr ""
290
291
292=== modified file 'edit-here/po/pt.po'
293--- edit-here/po/pt.po 2015-03-19 10:15:37 +0000
294+++ edit-here/po/pt.po 2015-03-19 11:16:13 +0000
295@@ -325,15 +325,6 @@
296 msgstr ""
297
298 #. type: Plain text
299-#: content/pages/index.md:11
300-msgid ""
301-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
302-"touch.md)"
303-msgstr ""
304-"[Take me to the FAQ!]({filename}faq.pt.md) [Get in touch]({filename}get-in-"
305-"touch.md)"
306-
307-#. type: Plain text
308 #: content/pages/settings.md:2
309 msgid "Settings"
310 msgstr ""
311@@ -866,6 +857,16 @@
312 msgid "I forgot my password or passcode. How can I unlock the phone?"
313 msgstr ""
314
315+#. type: Plain text
316+#: content/pages/index.md:11
317+msgid "[Take me to the FAQ!]({filename}faq.md)"
318+msgstr "[Take me to the FAQ!]({filename}faq.pt.md)"
319+
320+#. type: Plain text
321+#: content/pages/index.md:12
322+msgid "[Get in touch]({filename}get-in-touch.md)"
323+msgstr "[Get in touch]({filename}get-in-touch.pt.md)"
324+
325 #. !!T
326 #: content/pages/basic.md:16
327 #, no-wrap
328@@ -1152,6 +1153,25 @@
329 #~ "additional options. Enjoy taking your video!"
330 #~ msgstr ""
331
332+#~ msgid "Here are your next steps:"
333+#~ msgstr ""
334+
335+#~ msgid ""
336+#~ "Here are your next steps:\n"
337+#~ " * [Take me to the FAQ!]({filename}faq.md)\n"
338+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
339+#~ msgstr ""
340+#~ "Here are your next steps:\n"
341+#~ " * [Take me to the FAQ!]({filename}faq.pt.md)\n"
342+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
343+
344+#~ msgid ""
345+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
346+#~ "touch.md)"
347+#~ msgstr ""
348+#~ "[Take me to the FAQ!]({filename}faq.pt.md) [Get in touch]({filename}get-in-"
349+#~ "touch.md)"
350+
351 #~ msgid "[The Store]({filename}store.md)"
352 #~ msgstr ""
353
354
355=== modified file 'edit-here/po/ro.po'
356--- edit-here/po/ro.po 2015-03-19 10:15:37 +0000
357+++ edit-here/po/ro.po 2015-03-19 11:16:13 +0000
358@@ -321,15 +321,6 @@
359 msgstr ""
360
361 #. type: Plain text
362-#: content/pages/index.md:11
363-msgid ""
364-"[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
365-"touch.md)"
366-msgstr ""
367-"[Take me to the FAQ!]({filename}faq.ro.md) [Get in touch]({filename}get-in-"
368-"touch.md)"
369-
370-#. type: Plain text
371 #: content/pages/settings.md:2
372 msgid "Settings"
373 msgstr ""
374@@ -851,6 +842,16 @@
375 msgid "I forgot my password or passcode. How can I unlock the phone?"
376 msgstr ""
377
378+#. type: Plain text
379+#: content/pages/index.md:11
380+msgid "[Take me to the FAQ!]({filename}faq.md)"
381+msgstr "[Take me to the FAQ!]({filename}faq.ro.md)"
382+
383+#. type: Plain text
384+#: content/pages/index.md:12
385+msgid "[Get in touch]({filename}get-in-touch.md)"
386+msgstr "[Get in touch]({filename}get-in-touch.ro.md)"
387+
388 #. !!T
389 #: content/pages/basic.md:16
390 #, no-wrap
391@@ -1135,6 +1136,25 @@
392 #~ "additional options. Enjoy taking your video!"
393 #~ msgstr ""
394
395+#~ msgid "Here are your next steps:"
396+#~ msgstr ""
397+
398+#~ msgid ""
399+#~ "Here are your next steps:\n"
400+#~ " * [Take me to the FAQ!]({filename}faq.md)\n"
401+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
402+#~ msgstr ""
403+#~ "Here are your next steps:\n"
404+#~ " * [Take me to the FAQ!]({filename}faq.ro.md)\n"
405+#~ " * [Get in touch]({filename}get-in-touch.md)\n"
406+
407+#~ msgid ""
408+#~ "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
409+#~ "touch.md)"
410+#~ msgstr ""
411+#~ "[Take me to the FAQ!]({filename}faq.ro.md) [Get in touch]({filename}get-in-"
412+#~ "touch.md)"
413+
414 #~ msgid "[The Store]({filename}store.md)"
415 #~ msgstr ""
416

Subscribers

People subscribed via source and target branches