Merge lp://staging/~ara/ubuntu/oneiric/checkbox/checkbox_0.12.5 into lp://staging/ubuntu/oneiric/checkbox
Status: | Merged |
---|---|
Merged at revision: | 32 |
Proposed branch: | lp://staging/~ara/ubuntu/oneiric/checkbox/checkbox_0.12.5 |
Merge into: | lp://staging/ubuntu/oneiric/checkbox |
Diff against target: |
10026 lines (+2000/-2108) 45 files modified
checkbox/lib/usb.py (+2/-0) checkbox/parsers/udev.py (+10/-2) data/whitelists/default.whitelist (+55/-63) debian/changelog (+30/-0) debian/po/de.po (+1/-2) debian/po/en_AU.po (+1/-2) debian/po/en_GB.po (+3/-4) debian/po/es.po (+11/-9) debian/po/fr.po (+1/-2) debian/po/he.po (+1/-2) debian/po/hu.po (+1/-2) debian/po/it.po (+1/-2) debian/po/ja.po (+4/-8) debian/po/nl.po (+7/-8) debian/po/pl.po (+1/-2) debian/po/pt_BR.po (+1/-2) debian/po/ru.po (+1/-2) debian/po/zh_TW.po (+2/-5) jobs/audio.txt.in (+3/-2) jobs/bluetooth.txt.in (+5/-8) jobs/disk.txt.in (+4/-14) jobs/hibernate.txt.in (+14/-0) jobs/info.txt.in (+1/-0) jobs/install.txt.in (+1/-1) jobs/keys.txt.in (+1/-0) jobs/local.txt.in (+15/-0) jobs/miscellanea.txt.in (+7/-0) jobs/networking.txt.in (+3/-28) jobs/power-management.txt.in (+0/-237) jobs/suspend.txt.in (+209/-0) jobs/usb.txt.in (+3/-8) jobs/wireless.txt.in (+20/-0) plugins/launchpad_exchange.py (+16/-10) po/POTFILES.in (+3/-0) po/checkbox.pot (+305/-276) po/cs.po (+114/-187) po/es.po (+479/-405) po/fr.po (+113/-198) po/nl.po (+181/-223) po/pt.po (+89/-169) po/tr.po (+227/-182) scripts/audio_detect_silence (+0/-42) scripts/audio_test (+49/-0) setup.cfg (+4/-1) setup.py (+1/-0) |
To merge this branch: | bzr merge lp://staging/~ara/ubuntu/oneiric/checkbox/checkbox_0.12.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+73654@code.staging.launchpad.net |
Description of the change
Feature Freeze exception requested for Checkbox
The new features are minimum and should have no impact or regressions:
* Only two changes are in the core of the code and it will help categorize better the different categories of components for a system
* The rest of the changes, that are not bug fixes, are just changes on the test themselves, and changes on the naming of the tests, to allow categorize better the tests. This shouldn't have any impact on the application.
This change is very important for the success of the Ubuntu Friendly programme (https:/