Merge lp:~sense/ubuntu/maverick/evolution/fix-588298 into lp:ubuntu/maverick/evolution

Proposed by Sense Egbert Hofstede
Status: Merged
Merge reported by: Didier Roche
Merged at revision: not available
Proposed branch: lp:~sense/ubuntu/maverick/evolution/fix-588298
Merge into: lp:ubuntu/maverick/evolution
Diff against target: 12 lines (+1/-1)
1 file modified
mail/mail-config.ui (+1/-1)
To merge this branch: bzr merge lp:~sense/ubuntu/maverick/evolution/fix-588298
Reviewer Review Type Date Requested Status
Didier Roche Approve
Ubuntu branches Pending
Review via email: mp+30212@code.launchpad.net

Description of the change

Fixes bug #588298

PO files will have to be generated and translations will require updates.

To post a comment you must log in.
Revision history for this message
Didier Roche (didrocks) wrote :

Hey sense, thanks for your patch!

Some remarks:
* we tend to avoid patching inline the file, but rather using a patch system. You can find good documentation on patch system used in debian/ubuntu there:
https://wiki.ubuntu.com/PackagingGuide/Howtos/CDBSSimplePatchsys
https://wiki.ubuntu.com/PackagingGuide/Howtos/Dpatch
https://wiki.ubuntu.com/PackagingGuide/Howtos/Quilt
You will find some classroom too about how to use them.

* in debian/changelog, you have sometimes a Vcs-Bzr: url. This point to where we store the packaging into ubuntu (if not present, it assumes lp:ubuntu/<package>). For desktop package, most of them contain a debian/ only directory and are located under ~ubuntu-desktop launchpad team. So, you should next time pay attention to that to propose merging against the right branch. This is only because the "packaging in bzr" is work in progress and we will soon (next cycle?) merge them to the canonical location (lp:ubuntu/<package>.

Not a very big deal, I have done that for you, if you are interested in the result, you can have a look at this commit: http://bazaar.launchpad.net/~ubuntu-desktop/evolution/ubuntu/revision/79

Thanks a lot for your patch there!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mail/mail-config.ui'
2--- mail/mail-config.ui 2010-06-21 15:14:56 +0000
3+++ mail/mail-config.ui 2010-07-18 16:30:55 +0000
4@@ -4492,7 +4492,7 @@
5 <property name="visible">True</property>
6 <property name="xalign">0</property>
7 <property name="yalign">0.47999998927116394</property>
8- <property name="label" translatable="yes">&lt;b&gt;Top Posting Option&lt;/b&gt; (Not Recommended)</property>
9+ <property name="label" translatable="yes">&lt;b&gt;Top Posting Option&lt;/b&gt;</property>
10 <property name="use_markup">True</property>
11 </object>
12 <packing>

Subscribers

People subscribed via source and target branches