Merge lp://staging/~roadmr/ubuntu/quantal/checkbox/0.14.8 into lp://staging/ubuntu/quantal/checkbox

Proposed by Daniel Manrique
Status: Merged
Merged at revision: 53
Proposed branch: lp://staging/~roadmr/ubuntu/quantal/checkbox/0.14.8
Merge into: lp://staging/ubuntu/quantal/checkbox
Diff against target: 4032 lines (+691/-1663)
52 files modified
backend (+7/-3)
checkbox/parsers/udevadm.py (+8/-1)
data/whitelists/default.whitelist (+1/-0)
debian/changelog (+56/-0)
debian/control (+7/-2)
debian/po/ast.po (+2/-2)
debian/po/cs.po (+2/-2)
debian/po/de.po (+2/-2)
debian/po/en_AU.po (+2/-2)
debian/po/en_GB.po (+2/-2)
debian/po/es.po (+4/-3)
debian/po/fr.po (+13/-13)
debian/po/he.po (+2/-2)
debian/po/hu.po (+2/-2)
debian/po/id.po (+2/-2)
debian/po/it.po (+2/-2)
debian/po/ja.po (+2/-2)
debian/po/nl.po (+2/-2)
debian/po/oc.po (+2/-2)
debian/po/pl.po (+2/-2)
debian/po/pt_BR.po (+2/-2)
debian/po/ro.po (+2/-2)
debian/po/ru.po (+2/-2)
debian/po/tr.po (+2/-2)
debian/po/uk.po (+2/-2)
debian/po/zh_CN.po (+2/-2)
debian/po/zh_TW.po (+2/-2)
jobs/cpu.txt.in (+1/-0)
jobs/esata.txt.in (+0/-6)
jobs/firewire.txt.in (+0/-6)
jobs/mediacard.txt.in (+0/-48)
jobs/optical.txt.in (+90/-52)
jobs/resource.txt.in (+1/-1)
jobs/usb.txt.in (+7/-19)
jobs/wireless.txt.in (+17/-3)
plugins/apport_prompt.py (+0/-280)
plugins/backend_info.py (+60/-21)
plugins/suites_prompt.py (+8/-1)
po/POTFILES.in (+0/-1)
po/ar.po (+13/-12)
po/fi.po (+28/-14)
po/fr.po (+131/-109)
po/pt_BR.po (+5/-5)
qt/checkbox-qt.ui (+0/-935)
qt/frontend/qtfront.cpp (+2/-1)
qt/frontend/qtfront.ui (+8/-5)
scripts/display_resource (+84/-0)
scripts/graphics_driver (+81/-50)
scripts/network_info (+15/-2)
scripts/network_wireless_test (+0/-25)
scripts/optical_write_test (+3/-4)
setup.py (+1/-1)
To merge this branch: bzr merge lp://staging/~roadmr/ubuntu/quantal/checkbox/0.14.8
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Micah Gersten Needs Fixing
Ubuntu branches Pending
Review via email: mp+127923@code.staging.launchpad.net

Description of the change

Another batch of bugfixes for checkbox. Also note a series of translations that were automatically pulled into trunk by Launchpad.

Thanks!

To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

This looks fine except for the following looks like a new feature which probably needs an FFe:
 * scripts/graphics_driver: Added NVIDIA driver detection (LP: #1060211)

Also, you don't mention the running of wrap-and-sort on debian/control

review: Needs Fixing
54. By Daniel Manrique

Added mention of wrap-and-sort

Revision history for this message
Ara Pulido (ara) wrote :

The FFe has been granted by the release team. Can we get the upload now, please?

Revision history for this message
Daniel Holbach (dholbach) wrote :

Uploaded. Sitting in the review queue now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches