Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix1 into lp:qtcreator-plugin-ubuntu

Proposed by Benjamin Zeller
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 380
Merged at revision: 384
Proposed branch: lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix1
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 38 lines (+4/-2)
3 files modified
debian/control (+1/-0)
share/qtcreator/templates/wizards/ubuntu/scope/readme.txt (+2/-1)
src/ubuntu/wizards/ubuntufirstrunwizard.cpp (+1/-1)
To merge this branch: bzr merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix1
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zoltan Balogh Approve
Review via email: mp+258162@code.launchpad.net

Commit message

- Fix Bug lp:1402484 "A typo in the scope template readme file"
- Fix bug lp:1427138 and lp:1404672, add schroot to the deps
- Fix Bug lp:1450477 "Typo in initial startup wizard"

Description of the change

- Fix Bug lp:1402484 "A typo in the scope template readme file"
- Fix bug lp:1427138 and lp:1404672, add schroot to the deps
- Fix Bug lp:1450477 "Typo in initial startup wizard"

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-01-28 13:07:28 +0000
3+++ debian/control 2015-05-04 10:00:55 +0000
4@@ -53,6 +53,7 @@
5 click-reviewers-tools,
6 phablet-tools,
7 python-dbus,
8+ schroot,
9 ${shlibs:Depends},
10 ${misc:Depends},
11 Recommends: ubuntu-sdk,
12
13=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/readme.txt'
14--- share/qtcreator/templates/wizards/ubuntu/scope/readme.txt 2014-11-21 16:23:48 +0000
15+++ share/qtcreator/templates/wizards/ubuntu/scope/readme.txt 2015-05-04 10:00:55 +0000
16@@ -13,7 +13,8 @@
17
18 When you want to add a new language to the translation catalogue:
19
20- * Copy the .pot file from the "po" directory and rename it to e.g. "zh_CH.po".
21+ * Copy the .pot file from the "po" directory and rename it to e.g. "zh_CN.po",
22+ where "zh_CN" is the language code for China.
23 * Enter the language code in "Language:".
24 * Enter the "UTF-8" as the "Content-Type:".
25 * Enter the translations in the msgstr tags.
26
27=== modified file 'src/ubuntu/wizards/ubuntufirstrunwizard.cpp'
28--- src/ubuntu/wizards/ubuntufirstrunwizard.cpp 2014-11-27 16:23:51 +0000
29+++ src/ubuntu/wizards/ubuntufirstrunwizard.cpp 2015-05-04 10:00:55 +0000
30@@ -90,7 +90,7 @@
31 setTitle(tr("Build targets"));
32
33 QLabel *label = new QLabel(tr("<p>In order to create Apps for the Ubuntu platform, it is required to create Kits. Kits enable cross-platform and cross-configuration development. Kits consist of a set of values that define one environment, such as a target device, sysroot to build against, toolchain to build with, platform specific API set, and some metadata.</p>"
34- "<p><strong>Note: </strong>It is recommended to create Kits for each possible traget architecture (i386, armhf). When developing with the emulator, the best experience is provided by using a i386 emulator and Kit</p>"));
35+ "<p><strong>Note: </strong>It is recommended to create Kits for each possible target architecture (i386, armhf). When developing with the emulator, the best experience is provided by using a i386 emulator and Kit</p>"));
36 label->setWordWrap(true);
37
38 m_kitExistsLabel = new QLabel(tr("These Kits are already available on the machine, but it is also possible to create new ones."));

Subscribers

People subscribed via source and target branches