Ubuntu Help App

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

  1. rename
  2. Merge into trunk
Proposed by Daniel Holbach on 2015-03-05
Status: Merged
Merged at revision: 71
Proposed branch: lp:~dholbach/help-app/rename
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 356 lines (+72/-54)
13 files modified
HACKING (+1/-1)
app/help.desktop (+1/-1)
app/manifest.json (+1/-1)
debian/changelog (+1/-1)
debian/control (+2/-2)
edit-here/content/pages/index.md (+1/-1)
edit-here/po/de.po (+8/-5)
edit-here/po/es.po (+11/-8)
edit-here/po/fr.po (+11/-8)
edit-here/po/help.pot (+2/-2)
edit-here/po/it.po (+11/-8)
edit-here/po/pt.po (+11/-8)
edit-here/po/ro.po (+11/-8)
To merge this branch: bzr merge lp:~dholbach/help-app/rename
Reviewer Review Type Date Requested Status
David Planella 2015-03-05 Approve on 2015-03-05
Review via email: mp+251964@code.launchpad.net
To post a comment you must log in.
David Planella (dpm) wrote :

Looks good to me, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2015-02-27 08:59:42 +0000
3+++ HACKING 2015-03-05 15:27:32 +0000
4@@ -130,7 +130,7 @@
5 To file bugs, or view/submit merge proposals, simply use this project in
6 Launchpad:
7
8- https://launchpad.net/ubuntu-devices-help
9+ https://launchpad.net/help-app
10
11 To update the .pot file, simply run the following command in the edit-here/
12 directory:
13
14=== modified file 'app/help.desktop'
15--- app/help.desktop 2015-02-03 10:20:07 +0000
16+++ app/help.desktop 2015-03-05 15:27:32 +0000
17@@ -1,5 +1,5 @@
18 [Desktop Entry]
19-Name=Help for Ubuntu for devices
20+Name=Help
21 Exec=ubuntu-html5-app-launcher $@ --www=www --inspector
22 Icon=help.svg
23 Terminal=false
24
25=== modified file 'app/manifest.json'
26--- app/manifest.json 2015-01-30 11:12:11 +0000
27+++ app/manifest.json 2015-03-05 15:27:32 +0000
28@@ -1,6 +1,6 @@
29 {
30 "name": "help",
31- "description": "Help for Ubuntu for devices",
32+ "description": "Help",
33 "architecture": "all",
34 "title": "help",
35 "hooks": {
36
37=== modified file 'debian/changelog'
38--- debian/changelog 2015-03-05 13:21:44 +0000
39+++ debian/changelog 2015-03-05 15:27:32 +0000
40@@ -1,4 +1,4 @@
41-ubuntu-devices-help (0.1) vivid; urgency=low
42+help-app (0.1) vivid; urgency=low
43
44 * Initial Release.
45
46
47=== modified file 'debian/control'
48--- debian/control 2015-03-05 13:21:44 +0000
49+++ debian/control 2015-03-05 15:27:32 +0000
50@@ -1,4 +1,4 @@
51-Source: ubuntu-devices-help
52+Source: help-app
53 Section: doc
54 Priority: optional
55 Maintainer: Daniel Holbach <daniel.holbach@ubuntu.com>
56@@ -11,7 +11,7 @@
57 Standards-Version: 3.9.6
58 Homepage: https://launchpad.net/ubuntu-devices-help
59
60-Package: ubuntu-devices-help-web
61+Package: help-app-web
62 Architecture: all
63 Depends: ${misc:Depends}
64 Description: Help for Ubuntu devices - web version
65
66=== modified file 'edit-here/content/pages/index.md'
67--- edit-here/content/pages/index.md 2015-02-25 15:51:30 +0000
68+++ edit-here/content/pages/index.md 2015-03-05 15:27:32 +0000
69@@ -1,4 +1,4 @@
70-Title: Welcome to Help for Ubuntu for devices!
71+Title: Welcome to the Ubuntu Help App!
72
73 The world-wide Ubuntu community wants to give you the best possible
74 experience on your Ubuntu device. This is why we collected:
75
76=== modified file 'edit-here/po/de.po'
77--- edit-here/po/de.po 2015-03-05 10:53:17 +0000
78+++ edit-here/po/de.po 2015-03-05 15:27:32 +0000
79@@ -139,11 +139,6 @@
80 msgstr "Antworten auf Deine Fragen."
81
82 #. type: Plain text
83-#: content/pages/index.md:2
84-msgid "Welcome to Help for Ubuntu for devices!"
85-msgstr "Willkommen zur Ubuntu Hilfe!"
86-
87-#. type: Plain text
88 #: content/pages/apps.md:2
89 msgid "FAQ - Apps"
90 msgstr ""
91@@ -547,6 +542,14 @@
92 msgid "**Q:** How do favorites work? \n"
93 msgstr ""
94
95+#. type: Plain text
96+#: content/pages/index.md:2
97+msgid "Welcome to the Ubuntu Help App!"
98+msgstr ""
99+
100+#~ msgid "Welcome to Help for Ubuntu for devices!"
101+#~ msgstr "Willkommen zur Ubuntu Hilfe!"
102+
103 #~ msgid "..."
104 #~ msgstr "..."
105
106
107=== modified file 'edit-here/po/es.po'
108--- edit-here/po/es.po 2015-03-05 10:53:17 +0000
109+++ edit-here/po/es.po 2015-03-05 15:27:32 +0000
110@@ -1,11 +1,11 @@
111-# Spanish translation for ubuntu-devices-help
112+# Spanish translation for help-app
113 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
114-# This file is distributed under the same license as the ubuntu-devices-help package.
115+# This file is distributed under the same license as the help-app package.
116 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
117 #
118 msgid ""
119 msgstr ""
120-"Project-Id-Version: ubuntu-devices-help\n"
121+"Project-Id-Version: help-app\n"
122 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
123 "POT-Creation-Date: 2015-02-26 15:28+0100\n"
124 "PO-Revision-Date: 2015-03-04 02:11+0000\n"
125@@ -125,11 +125,6 @@
126 msgstr ""
127
128 #. type: Plain text
129-#: content/pages/index.md:2
130-msgid "Welcome to Help for Ubuntu for devices!"
131-msgstr ""
132-
133-#. type: Plain text
134 #: content/pages/apps.md:2
135 msgid "FAQ - Apps"
136 msgstr ""
137@@ -533,6 +528,14 @@
138 msgid "**Q:** How do favorites work? \n"
139 msgstr ""
140
141+#. type: Plain text
142+#: content/pages/index.md:2
143+msgid "Welcome to the Ubuntu Help App!"
144+msgstr ""
145+
146+#~ msgid "Welcome to Help for Ubuntu for devices!"
147+#~ msgstr ""
148+
149 #~ msgid "..."
150 #~ msgstr ""
151
152
153=== modified file 'edit-here/po/fr.po'
154--- edit-here/po/fr.po 2015-03-05 10:53:17 +0000
155+++ edit-here/po/fr.po 2015-03-05 15:27:32 +0000
156@@ -1,11 +1,11 @@
157-# French translation for ubuntu-devices-help
158+# French translation for help-app
159 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
160-# This file is distributed under the same license as the ubuntu-devices-help package.
161+# This file is distributed under the same license as the help-app package.
162 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
163 #
164 msgid ""
165 msgstr ""
166-"Project-Id-Version: ubuntu-devices-help\n"
167+"Project-Id-Version: help-app\n"
168 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
169 "POT-Creation-Date: 2015-02-26 15:28+0100\n"
170 "PO-Revision-Date: 2015-02-27 12:21+0000\n"
171@@ -121,11 +121,6 @@
172 msgstr ""
173
174 #. type: Plain text
175-#: content/pages/index.md:2
176-msgid "Welcome to Help for Ubuntu for devices!"
177-msgstr ""
178-
179-#. type: Plain text
180 #: content/pages/apps.md:2
181 msgid "FAQ - Apps"
182 msgstr ""
183@@ -529,6 +524,14 @@
184 msgid "**Q:** How do favorites work? \n"
185 msgstr ""
186
187+#. type: Plain text
188+#: content/pages/index.md:2
189+msgid "Welcome to the Ubuntu Help App!"
190+msgstr ""
191+
192+#~ msgid "Welcome to Help for Ubuntu for devices!"
193+#~ msgstr ""
194+
195 #~ msgid "..."
196 #~ msgstr ""
197
198
199=== modified file 'edit-here/po/help.pot'
200--- edit-here/po/help.pot 2015-03-05 10:53:17 +0000
201+++ edit-here/po/help.pot 2015-03-05 15:27:32 +0000
202@@ -7,7 +7,7 @@
203 msgid ""
204 msgstr ""
205 "Project-Id-Version: PACKAGE VERSION\n"
206-"POT-Creation-Date: 2015-03-05 11:52+0100\n"
207+"POT-Creation-Date: 2015-03-05 16:25+0100\n"
208 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
209 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
210 "Language-Team: LANGUAGE <LL@li.org>\n"
211@@ -136,7 +136,7 @@
212
213 #. type: Plain text
214 #: content/pages/index.md:2
215-msgid "Welcome to Help for Ubuntu for devices!"
216+msgid "Welcome to the Ubuntu Help App!"
217 msgstr ""
218
219 #. type: Plain text
220
221=== modified file 'edit-here/po/it.po'
222--- edit-here/po/it.po 2015-03-05 10:53:17 +0000
223+++ edit-here/po/it.po 2015-03-05 15:27:32 +0000
224@@ -1,11 +1,11 @@
225-# Italian translation for ubuntu-devices-help
226+# Italian translation for help-app
227 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
228-# This file is distributed under the same license as the ubuntu-devices-help package.
229+# This file is distributed under the same license as the help-app package.
230 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
231 #
232 msgid ""
233 msgstr ""
234-"Project-Id-Version: ubuntu-devices-help\n"
235+"Project-Id-Version: help-app\n"
236 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
237 "POT-Creation-Date: 2015-02-26 15:28+0100\n"
238 "PO-Revision-Date: 2015-03-01 10:39+0000\n"
239@@ -121,11 +121,6 @@
240 msgstr ""
241
242 #. type: Plain text
243-#: content/pages/index.md:2
244-msgid "Welcome to Help for Ubuntu for devices!"
245-msgstr ""
246-
247-#. type: Plain text
248 #: content/pages/apps.md:2
249 msgid "FAQ - Apps"
250 msgstr ""
251@@ -529,6 +524,14 @@
252 msgid "**Q:** How do favorites work? \n"
253 msgstr ""
254
255+#. type: Plain text
256+#: content/pages/index.md:2
257+msgid "Welcome to the Ubuntu Help App!"
258+msgstr ""
259+
260+#~ msgid "Welcome to Help for Ubuntu for devices!"
261+#~ msgstr ""
262+
263 #~ msgid "..."
264 #~ msgstr ""
265
266
267=== modified file 'edit-here/po/pt.po'
268--- edit-here/po/pt.po 2015-03-05 10:53:17 +0000
269+++ edit-here/po/pt.po 2015-03-05 15:27:32 +0000
270@@ -1,11 +1,11 @@
271-# Portuguese translation for ubuntu-devices-help
272+# Portuguese translation for help-app
273 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
274-# This file is distributed under the same license as the ubuntu-devices-help package.
275+# This file is distributed under the same license as the help-app package.
276 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
277 #
278 msgid ""
279 msgstr ""
280-"Project-Id-Version: ubuntu-devices-help\n"
281+"Project-Id-Version: help-app\n"
282 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
283 "POT-Creation-Date: 2015-02-26 15:28+0100\n"
284 "PO-Revision-Date: 2015-02-28 10:57+0000\n"
285@@ -140,11 +140,6 @@
286 msgstr ""
287
288 #. type: Plain text
289-#: content/pages/index.md:2
290-msgid "Welcome to Help for Ubuntu for devices!"
291-msgstr ""
292-
293-#. type: Plain text
294 #: content/pages/apps.md:2
295 msgid "FAQ - Apps"
296 msgstr ""
297@@ -548,6 +543,14 @@
298 msgid "**Q:** How do favorites work? \n"
299 msgstr ""
300
301+#. type: Plain text
302+#: content/pages/index.md:2
303+msgid "Welcome to the Ubuntu Help App!"
304+msgstr ""
305+
306+#~ msgid "Welcome to Help for Ubuntu for devices!"
307+#~ msgstr ""
308+
309 #~ msgid "..."
310 #~ msgstr "..."
311
312
313=== modified file 'edit-here/po/ro.po'
314--- edit-here/po/ro.po 2015-03-05 10:53:17 +0000
315+++ edit-here/po/ro.po 2015-03-05 15:27:32 +0000
316@@ -1,11 +1,11 @@
317-# Romanian translation for ubuntu-devices-help
318+# Romanian translation for help-app
319 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
320-# This file is distributed under the same license as the ubuntu-devices-help package.
321+# This file is distributed under the same license as the help-app package.
322 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
323 #
324 msgid ""
325 msgstr ""
326-"Project-Id-Version: ubuntu-devices-help\n"
327+"Project-Id-Version: help-app\n"
328 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
329 "POT-Creation-Date: 2015-02-26 15:28+0100\n"
330 "PO-Revision-Date: 2015-02-27 11:15+0000\n"
331@@ -121,11 +121,6 @@
332 msgstr ""
333
334 #. type: Plain text
335-#: content/pages/index.md:2
336-msgid "Welcome to Help for Ubuntu for devices!"
337-msgstr ""
338-
339-#. type: Plain text
340 #: content/pages/apps.md:2
341 msgid "FAQ - Apps"
342 msgstr ""
343@@ -529,6 +524,14 @@
344 msgid "**Q:** How do favorites work? \n"
345 msgstr ""
346
347+#. type: Plain text
348+#: content/pages/index.md:2
349+msgid "Welcome to the Ubuntu Help App!"
350+msgstr ""
351+
352+#~ msgid "Welcome to Help for Ubuntu for devices!"
353+#~ msgstr ""
354+
355 #~ msgid "..."
356 #~ msgstr ""
357

Subscribers

People subscribed via source and target branches