Merge lp://staging/~marcobiscaro2112/ubuntu/natty/ubiquity-slideshow-ubuntu/fix-692879 into lp://staging/ubuntu/natty/ubiquity-slideshow-ubuntu
Proposed by
Marco Biscaro
| Status: | Merged |
|---|---|
| Merged at revision: | 29 |
| Proposed branch: | lp://staging/~marcobiscaro2112/ubuntu/natty/ubiquity-slideshow-ubuntu/fix-692879 |
| Merge into: | lp://staging/ubuntu/natty/ubiquity-slideshow-ubuntu |
| Diff against target: |
529 lines (+170/-57) 16 files modified
debian/changelog (+8/-0) po/edubuntu/slideshow-edubuntu.pot (+6/-5) po/kubuntu/slideshow-kubuntu.pot (+8/-7) po/lubuntu/slideshow-lubuntu.pot (+8/-7) po/ubuntu/slideshow-ubuntu.pot (+118/-17) po/xubuntu/slideshow-xubuntu.pot (+8/-7) slideshows/edubuntu/slides/desktop-software.html (+1/-1) slideshows/edubuntu/slides/welcome.html (+1/-1) slideshows/kubuntu/slides/office.html (+2/-2) slideshows/kubuntu/slides/welcome.html (+1/-1) slideshows/lubuntu/slides/abiword-gnumeric.html (+1/-1) slideshows/lubuntu/slides/welcome.html (+1/-1) slideshows/ubuntu/slides/office.html (+3/-3) slideshows/ubuntu/slides/welcome.html (+1/-1) slideshows/xubuntu/slides/office.html (+2/-2) slideshows/xubuntu/slides/welcome.html (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~marcobiscaro2112/ubuntu/natty/ubiquity-slideshow-ubuntu/fix-692879 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Didier Roche-Tolomelli | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Marco Biscaro (marcobiscaro2112) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
All looks good, thanks for your fixes there!
Just note that you should keep the changelog < 80 caracters to display nicely on terminals and update-manager.
Also, this syntax is easier to read for the second line: (LP: #692879, #712548)
Also the revision should be ubiquity-
(note the 30 and the UNRELEASED). Your sponsor will commit to put it as released.
That's minor things though.
I've made those few changes and will sponsor that now :)
Thanks!