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
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 Approve
Review via email: mp+251964@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
=== modified file 'HACKING'
--- HACKING 2015-02-27 08:59:42 +0000
+++ HACKING 2015-03-05 15:27:32 +0000
@@ -130,7 +130,7 @@
130To file bugs, or view/submit merge proposals, simply use this project in130To file bugs, or view/submit merge proposals, simply use this project in
131Launchpad:131Launchpad:
132132
133 https://launchpad.net/ubuntu-devices-help133 https://launchpad.net/help-app
134134
135To update the .pot file, simply run the following command in the edit-here/135To update the .pot file, simply run the following command in the edit-here/
136directory:136directory:
137137
=== modified file 'app/help.desktop'
--- app/help.desktop 2015-02-03 10:20:07 +0000
+++ app/help.desktop 2015-03-05 15:27:32 +0000
@@ -1,5 +1,5 @@
1[Desktop Entry]1[Desktop Entry]
2Name=Help for Ubuntu for devices2Name=Help
3Exec=ubuntu-html5-app-launcher $@ --www=www --inspector3Exec=ubuntu-html5-app-launcher $@ --www=www --inspector
4Icon=help.svg4Icon=help.svg
5Terminal=false5Terminal=false
66
=== modified file 'app/manifest.json'
--- app/manifest.json 2015-01-30 11:12:11 +0000
+++ app/manifest.json 2015-03-05 15:27:32 +0000
@@ -1,6 +1,6 @@
1{1{
2 "name": "help",2 "name": "help",
3 "description": "Help for Ubuntu for devices",3 "description": "Help",
4 "architecture": "all",4 "architecture": "all",
5 "title": "help",5 "title": "help",
6 "hooks": {6 "hooks": {
77
=== modified file 'debian/changelog'
--- debian/changelog 2015-03-05 13:21:44 +0000
+++ debian/changelog 2015-03-05 15:27:32 +0000
@@ -1,4 +1,4 @@
1ubuntu-devices-help (0.1) vivid; urgency=low1help-app (0.1) vivid; urgency=low
22
3 * Initial Release.3 * Initial Release.
44
55
=== modified file 'debian/control'
--- debian/control 2015-03-05 13:21:44 +0000
+++ debian/control 2015-03-05 15:27:32 +0000
@@ -1,4 +1,4 @@
1Source: ubuntu-devices-help1Source: help-app
2Section: doc2Section: doc
3Priority: optional3Priority: optional
4Maintainer: Daniel Holbach <daniel.holbach@ubuntu.com>4Maintainer: Daniel Holbach <daniel.holbach@ubuntu.com>
@@ -11,7 +11,7 @@
11Standards-Version: 3.9.611Standards-Version: 3.9.6
12Homepage: https://launchpad.net/ubuntu-devices-help12Homepage: https://launchpad.net/ubuntu-devices-help
1313
14Package: ubuntu-devices-help-web14Package: help-app-web
15Architecture: all15Architecture: all
16Depends: ${misc:Depends}16Depends: ${misc:Depends}
17Description: Help for Ubuntu devices - web version17Description: Help for Ubuntu devices - web version
1818
=== modified file 'edit-here/content/pages/index.md'
--- edit-here/content/pages/index.md 2015-02-25 15:51:30 +0000
+++ edit-here/content/pages/index.md 2015-03-05 15:27:32 +0000
@@ -1,4 +1,4 @@
1Title: Welcome to Help for Ubuntu for devices!1Title: Welcome to the Ubuntu Help App!
22
3The world-wide Ubuntu community wants to give you the best possible 3The world-wide Ubuntu community wants to give you the best possible
4experience on your Ubuntu device. This is why we collected:4experience on your Ubuntu device. This is why we collected:
55
=== modified file 'edit-here/po/de.po'
--- edit-here/po/de.po 2015-03-05 10:53:17 +0000
+++ edit-here/po/de.po 2015-03-05 15:27:32 +0000
@@ -139,11 +139,6 @@
139msgstr "Antworten auf Deine Fragen."139msgstr "Antworten auf Deine Fragen."
140140
141#. type: Plain text141#. type: Plain text
142#: content/pages/index.md:2
143msgid "Welcome to Help for Ubuntu for devices!"
144msgstr "Willkommen zur Ubuntu Hilfe!"
145
146#. type: Plain text
147#: content/pages/apps.md:2142#: content/pages/apps.md:2
148msgid "FAQ - Apps"143msgid "FAQ - Apps"
149msgstr ""144msgstr ""
@@ -547,6 +542,14 @@
547msgid "**Q:** How do favorites work? \n"542msgid "**Q:** How do favorites work? \n"
548msgstr ""543msgstr ""
549544
545#. type: Plain text
546#: content/pages/index.md:2
547msgid "Welcome to the Ubuntu Help App!"
548msgstr ""
549
550#~ msgid "Welcome to Help for Ubuntu for devices!"
551#~ msgstr "Willkommen zur Ubuntu Hilfe!"
552
550#~ msgid "..."553#~ msgid "..."
551#~ msgstr "..."554#~ msgstr "..."
552555
553556
=== modified file 'edit-here/po/es.po'
--- edit-here/po/es.po 2015-03-05 10:53:17 +0000
+++ edit-here/po/es.po 2015-03-05 15:27:32 +0000
@@ -1,11 +1,11 @@
1# Spanish translation for ubuntu-devices-help1# Spanish translation for help-app
2# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 20152# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3# This file is distributed under the same license as the ubuntu-devices-help package.3# This file is distributed under the same license as the help-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5# 5#
6msgid ""6msgid ""
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-devices-help\n"8"Project-Id-Version: help-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2015-02-26 15:28+0100\n"10"POT-Creation-Date: 2015-02-26 15:28+0100\n"
11"PO-Revision-Date: 2015-03-04 02:11+0000\n"11"PO-Revision-Date: 2015-03-04 02:11+0000\n"
@@ -125,11 +125,6 @@
125msgstr ""125msgstr ""
126126
127#. type: Plain text127#. type: Plain text
128#: content/pages/index.md:2
129msgid "Welcome to Help for Ubuntu for devices!"
130msgstr ""
131
132#. type: Plain text
133#: content/pages/apps.md:2128#: content/pages/apps.md:2
134msgid "FAQ - Apps"129msgid "FAQ - Apps"
135msgstr ""130msgstr ""
@@ -533,6 +528,14 @@
533msgid "**Q:** How do favorites work? \n"528msgid "**Q:** How do favorites work? \n"
534msgstr ""529msgstr ""
535530
531#. type: Plain text
532#: content/pages/index.md:2
533msgid "Welcome to the Ubuntu Help App!"
534msgstr ""
535
536#~ msgid "Welcome to Help for Ubuntu for devices!"
537#~ msgstr ""
538
536#~ msgid "..."539#~ msgid "..."
537#~ msgstr ""540#~ msgstr ""
538541
539542
=== modified file 'edit-here/po/fr.po'
--- edit-here/po/fr.po 2015-03-05 10:53:17 +0000
+++ edit-here/po/fr.po 2015-03-05 15:27:32 +0000
@@ -1,11 +1,11 @@
1# French translation for ubuntu-devices-help1# French translation for help-app
2# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 20152# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3# This file is distributed under the same license as the ubuntu-devices-help package.3# This file is distributed under the same license as the help-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5# 5#
6msgid ""6msgid ""
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-devices-help\n"8"Project-Id-Version: help-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2015-02-26 15:28+0100\n"10"POT-Creation-Date: 2015-02-26 15:28+0100\n"
11"PO-Revision-Date: 2015-02-27 12:21+0000\n"11"PO-Revision-Date: 2015-02-27 12:21+0000\n"
@@ -121,11 +121,6 @@
121msgstr ""121msgstr ""
122122
123#. type: Plain text123#. type: Plain text
124#: content/pages/index.md:2
125msgid "Welcome to Help for Ubuntu for devices!"
126msgstr ""
127
128#. type: Plain text
129#: content/pages/apps.md:2124#: content/pages/apps.md:2
130msgid "FAQ - Apps"125msgid "FAQ - Apps"
131msgstr ""126msgstr ""
@@ -529,6 +524,14 @@
529msgid "**Q:** How do favorites work? \n"524msgid "**Q:** How do favorites work? \n"
530msgstr ""525msgstr ""
531526
527#. type: Plain text
528#: content/pages/index.md:2
529msgid "Welcome to the Ubuntu Help App!"
530msgstr ""
531
532#~ msgid "Welcome to Help for Ubuntu for devices!"
533#~ msgstr ""
534
532#~ msgid "..."535#~ msgid "..."
533#~ msgstr ""536#~ msgstr ""
534537
535538
=== modified file 'edit-here/po/help.pot'
--- edit-here/po/help.pot 2015-03-05 10:53:17 +0000
+++ edit-here/po/help.pot 2015-03-05 15:27:32 +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-05 11:52+0100\n"10"POT-Creation-Date: 2015-03-05 16:25+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"
@@ -136,7 +136,7 @@
136136
137#. type: Plain text137#. type: Plain text
138#: content/pages/index.md:2138#: content/pages/index.md:2
139msgid "Welcome to Help for Ubuntu for devices!"139msgid "Welcome to the Ubuntu Help App!"
140msgstr ""140msgstr ""
141141
142#. type: Plain text142#. type: Plain text
143143
=== modified file 'edit-here/po/it.po'
--- edit-here/po/it.po 2015-03-05 10:53:17 +0000
+++ edit-here/po/it.po 2015-03-05 15:27:32 +0000
@@ -1,11 +1,11 @@
1# Italian translation for ubuntu-devices-help1# Italian translation for help-app
2# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 20152# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3# This file is distributed under the same license as the ubuntu-devices-help package.3# This file is distributed under the same license as the help-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5# 5#
6msgid ""6msgid ""
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-devices-help\n"8"Project-Id-Version: help-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2015-02-26 15:28+0100\n"10"POT-Creation-Date: 2015-02-26 15:28+0100\n"
11"PO-Revision-Date: 2015-03-01 10:39+0000\n"11"PO-Revision-Date: 2015-03-01 10:39+0000\n"
@@ -121,11 +121,6 @@
121msgstr ""121msgstr ""
122122
123#. type: Plain text123#. type: Plain text
124#: content/pages/index.md:2
125msgid "Welcome to Help for Ubuntu for devices!"
126msgstr ""
127
128#. type: Plain text
129#: content/pages/apps.md:2124#: content/pages/apps.md:2
130msgid "FAQ - Apps"125msgid "FAQ - Apps"
131msgstr ""126msgstr ""
@@ -529,6 +524,14 @@
529msgid "**Q:** How do favorites work? \n"524msgid "**Q:** How do favorites work? \n"
530msgstr ""525msgstr ""
531526
527#. type: Plain text
528#: content/pages/index.md:2
529msgid "Welcome to the Ubuntu Help App!"
530msgstr ""
531
532#~ msgid "Welcome to Help for Ubuntu for devices!"
533#~ msgstr ""
534
532#~ msgid "..."535#~ msgid "..."
533#~ msgstr ""536#~ msgstr ""
534537
535538
=== modified file 'edit-here/po/pt.po'
--- edit-here/po/pt.po 2015-03-05 10:53:17 +0000
+++ edit-here/po/pt.po 2015-03-05 15:27:32 +0000
@@ -1,11 +1,11 @@
1# Portuguese translation for ubuntu-devices-help1# Portuguese translation for help-app
2# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 20152# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3# This file is distributed under the same license as the ubuntu-devices-help package.3# This file is distributed under the same license as the help-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5# 5#
6msgid ""6msgid ""
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-devices-help\n"8"Project-Id-Version: help-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2015-02-26 15:28+0100\n"10"POT-Creation-Date: 2015-02-26 15:28+0100\n"
11"PO-Revision-Date: 2015-02-28 10:57+0000\n"11"PO-Revision-Date: 2015-02-28 10:57+0000\n"
@@ -140,11 +140,6 @@
140msgstr ""140msgstr ""
141141
142#. type: Plain text142#. type: Plain text
143#: content/pages/index.md:2
144msgid "Welcome to Help for Ubuntu for devices!"
145msgstr ""
146
147#. type: Plain text
148#: content/pages/apps.md:2143#: content/pages/apps.md:2
149msgid "FAQ - Apps"144msgid "FAQ - Apps"
150msgstr ""145msgstr ""
@@ -548,6 +543,14 @@
548msgid "**Q:** How do favorites work? \n"543msgid "**Q:** How do favorites work? \n"
549msgstr ""544msgstr ""
550545
546#. type: Plain text
547#: content/pages/index.md:2
548msgid "Welcome to the Ubuntu Help App!"
549msgstr ""
550
551#~ msgid "Welcome to Help for Ubuntu for devices!"
552#~ msgstr ""
553
551#~ msgid "..."554#~ msgid "..."
552#~ msgstr "..."555#~ msgstr "..."
553556
554557
=== modified file 'edit-here/po/ro.po'
--- edit-here/po/ro.po 2015-03-05 10:53:17 +0000
+++ edit-here/po/ro.po 2015-03-05 15:27:32 +0000
@@ -1,11 +1,11 @@
1# Romanian translation for ubuntu-devices-help1# Romanian translation for help-app
2# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 20152# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3# This file is distributed under the same license as the ubuntu-devices-help package.3# This file is distributed under the same license as the help-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5# 5#
6msgid ""6msgid ""
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-devices-help\n"8"Project-Id-Version: help-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2015-02-26 15:28+0100\n"10"POT-Creation-Date: 2015-02-26 15:28+0100\n"
11"PO-Revision-Date: 2015-02-27 11:15+0000\n"11"PO-Revision-Date: 2015-02-27 11:15+0000\n"
@@ -121,11 +121,6 @@
121msgstr ""121msgstr ""
122122
123#. type: Plain text123#. type: Plain text
124#: content/pages/index.md:2
125msgid "Welcome to Help for Ubuntu for devices!"
126msgstr ""
127
128#. type: Plain text
129#: content/pages/apps.md:2124#: content/pages/apps.md:2
130msgid "FAQ - Apps"125msgid "FAQ - Apps"
131msgstr ""126msgstr ""
@@ -529,6 +524,14 @@
529msgid "**Q:** How do favorites work? \n"524msgid "**Q:** How do favorites work? \n"
530msgstr ""525msgstr ""
531526
527#. type: Plain text
528#: content/pages/index.md:2
529msgid "Welcome to the Ubuntu Help App!"
530msgstr ""
531
532#~ msgid "Welcome to Help for Ubuntu for devices!"
533#~ msgstr ""
534
532#~ msgid "..."535#~ msgid "..."
533#~ msgstr ""536#~ msgstr ""
534537

Subscribers

People subscribed via source and target branches