Merge lp:~roadmr/ubuntu/quantal/checkbox/0.14.6 into lp:ubuntu/quantal/checkbox

Proposed by Daniel Manrique
Status: Merged
Merged at revision: 51
Proposed branch: lp:~roadmr/ubuntu/quantal/checkbox/0.14.6
Merge into: lp:ubuntu/quantal/checkbox
Diff against target: 39 lines (+11/-2)
2 files modified
debian/changelog (+9/-0)
qt/frontend/qtfront.ui (+2/-2)
To merge this branch: bzr merge lp:~roadmr/ubuntu/quantal/checkbox/0.14.6
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+124033@code.launchpad.net

Description of the change

This short merge request fixes the linked bug by including the missing header image file. After discussion with the translations team, I also made a couple of minor changes to accomodate longer translated strings.

The bug has a UIFe request which has been OKd by both the translations and documentation teams, relevant comments are in the bug report.

Thanks!

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-10 08:33:56 +0000
3+++ debian/changelog 2012-09-12 19:06:18 +0000
4@@ -1,3 +1,12 @@
5+checkbox (0.14.6) quantal; urgency=low
6+
7+ * New upstream release (LP: #1049130)
8+
9+ * qt/frontend/images/checkbox-qt-head.png: updated header image
10+ (LP: #1044035)
11+
12+ -- Daniel Manrique <roadmr@ubuntu.com> Tue, 11 Sep 2012 09:47:33 -0400
13+
14 checkbox (0.14.5) quantal; urgency=low
15
16 * New upstream release (LP: #1042911)
17
18=== modified file 'qt/frontend/images/checkbox-qt-head.png'
19Binary files qt/frontend/images/checkbox-qt-head.png 2012-02-15 00:11:21 +0000 and qt/frontend/images/checkbox-qt-head.png 2012-09-12 19:06:18 +0000 differ
20=== modified file 'qt/frontend/qtfront.ui'
21--- qt/frontend/qtfront.ui 2012-08-30 19:51:51 +0000
22+++ qt/frontend/qtfront.ui 2012-09-12 19:06:18 +0000
23@@ -123,14 +123,14 @@
24 <rect>
25 <x>0</x>
26 <y>10</y>
27- <width>120</width>
28+ <width>131</width>
29 <height>100</height>
30 </rect>
31 </property>
32 <property name="font">
33 <font>
34 <family>Ubuntu</family>
35- <pointsize>18</pointsize>
36+ <pointsize>14</pointsize>
37 </font>
38 </property>
39 <property name="styleSheet">

Subscribers

People subscribed via source and target branches