Merge lp://staging/~roadmr/ubuntu/oneiric/checkbox/0.12.4 into lp://staging/ubuntu/oneiric/checkbox
Proposed by
Daniel Manrique
Status: | Merged |
---|---|
Merged at revision: | 31 |
Proposed branch: | lp://staging/~roadmr/ubuntu/oneiric/checkbox/0.12.4 |
Merge into: | lp://staging/ubuntu/oneiric/checkbox |
Diff against target: |
264222 lines (+230443/-23395) 166 files modified
backend (+3/-0) checkbox_gtk/gtk_interface.py (+21/-12) data/settings/shutter.xml (+25/-0) data/whitelists/default.whitelist (+120/-120) debian/changelog (+50/-1) debian/control (+1/-1) debian/po/de.po (+119/-0) debian/po/en_AU.po (+123/-0) debian/po/en_GB.po (+123/-0) debian/po/es.po (+120/-0) debian/po/fr.po (+119/-0) debian/po/he.po (+119/-0) debian/po/hu.po (+121/-0) debian/po/it.po (+119/-0) debian/po/ja.po (+124/-0) debian/po/nl.po (+133/-0) debian/po/pl.po (+119/-0) debian/po/pt_BR.po (+119/-0) debian/po/ru.po (+119/-0) debian/po/zh_TW.po (+121/-0) gtk/checkbox.svg (+2478/-0) jobs/audio.txt.in (+30/-19) jobs/bluetooth.txt.in (+12/-12) jobs/certification.txt.in (+0/-50) jobs/cpu.txt.in (+5/-5) jobs/disk.txt.in (+10/-10) jobs/fingerprint.txt.in (+2/-2) jobs/firewire.txt.in (+1/-1) jobs/floppy.txt.in (+2/-2) jobs/graphics-2d.txt.in (+0/-56) jobs/graphics.txt.in (+143/-0) jobs/hardware.txt.in (+0/-31) jobs/info.txt.in (+125/-0) jobs/input.txt.in (+16/-0) jobs/install.txt.in (+1/-1) jobs/kernel.txt.in (+0/-25) jobs/keyboard.txt.in (+0/-72) jobs/keys.txt.in (+72/-0) jobs/kms.txt.in (+0/-13) jobs/lid.txt.in (+0/-29) jobs/local.txt.in (+92/-94) jobs/media.txt.in (+0/-148) jobs/mediacard.txt.in (+137/-0) jobs/memory.txt.in (+11/-11) jobs/miscellanea.txt.in (+37/-0) jobs/monitor.txt.in (+43/-1) jobs/netio.txt.in (+0/-16) jobs/network.txt.in (+0/-134) jobs/networking.txt.in (+144/-0) jobs/optical.txt.in (+23/-12) jobs/pcmcia-pcix.txt.in (+6/-0) jobs/pcmcia.txt.in (+0/-6) jobs/peripheral.txt.in (+0/-28) jobs/power-management.txt.in (+305/-0) jobs/power.txt.in (+0/-20) jobs/shutdown.txt.in (+0/-9) jobs/sleep.txt.in (+0/-202) jobs/sru_suite.txt.in (+0/-226) jobs/stress.txt.in (+26/-1) jobs/unity.txt.in (+3/-8) jobs/usb.txt.in (+35/-27) jobs/user_apps.txt.in (+36/-36) jobs/video.txt.in (+0/-123) jobs/xorg.txt.in (+0/-18) plugins/backend_info.py (+49/-13) plugins/jobs_info.py (+6/-3) plugins/jobs_prompt.py (+4/-0) plugins/launchpad_report.py (+2/-2) plugins/scripts_info.py (+3/-1) po/POTFILES.in (+31/-5) po/ace.po (+2613/-0) po/af.po (+2613/-0) po/am.po (+2619/-0) po/ar.po (+2641/-532) po/ast.po (+2926/-479) po/be.po (+2630/-0) po/bg.po (+2542/-516) po/bn.po (+2822/-0) po/bo.po (+2665/-0) po/br.po (+2685/-0) po/bs.po (+2911/-0) po/ca.po (+2868/-540) po/checkbox.pot (+1370/-381) po/ckb.po (+2624/-0) po/cs.po (+3003/-550) po/cy.po (+2616/-0) po/da.po (+2914/-463) po/de.po (+3117/-583) po/dv.po (+2610/-0) po/el.po (+2792/-530) po/en_AU.po (+3081/-0) po/en_CA.po (+2420/-363) po/en_GB.po (+3109/-527) po/eo.po (+3156/-0) po/es.po (+3098/-599) po/et.po (+2652/-0) po/eu.po (+2425/-384) po/fa.po (+2610/-0) po/fi.po (+2874/-522) po/fr.po (+3019/-628) po/gl.po (+3222/-0) po/he.po (+2685/-512) po/hi.po (+2702/-0) po/hr.po (+2492/-418) po/hu.po (+2942/-527) po/hy.po (+2610/-0) po/id.po (+2622/-511) po/is.po (+2433/-321) po/it.po (+2937/-561) po/ja.po (+2582/-506) po/jbo.po (+2277/-317) po/ka.po (+2296/-336) po/kk.po (+2644/-0) po/km.po (+2610/-0) po/kn.po (+2613/-0) po/ko.po (+2408/-336) po/ku.po (+2622/-0) po/ky.po (+2610/-0) po/lt.po (+2581/-529) po/lv.po (+2444/-374) po/mk.po (+2391/-430) po/ml.po (+2613/-0) po/mr.po (+2616/-0) po/ms.po (+3103/-0) po/my.po (+2635/-0) po/nb.po (+2564/-526) po/nds.po (+2277/-317) po/ne.po (+2625/-0) po/nl.po (+3050/-453) po/nn.po (+2617/-0) po/oc.po (+2911/-0) po/pl.po (+2836/-520) po/pt.po (+3022/-465) po/pt_BR.po (+2978/-469) po/ro.po (+2636/-455) po/ru.po (+2977/-545) po/si.po (+2613/-0) po/sk.po (+2864/-561) po/sl.po (+2850/-0) po/sq.po (+2445/-398) po/sr.po (+3069/-0) po/sv.po (+2951/-588) po/ta.po (+2616/-0) po/te.po (+2610/-0) po/th.po (+2645/-530) po/tr.po (+2706/-419) po/ug.po (+2602/-405) po/uk.po (+2682/-380) po/ur.po (+2610/-0) po/vi.po (+2431/-344) po/zh_CN.po (+2643/-498) po/zh_HK.po (+2782/-0) po/zh_TW.po (+2756/-531) scripts/bluetooth_scan (+7/-0) scripts/cdimage_resource (+2/-1) scripts/connect_wireless (+44/-0) scripts/keyboard_test (+9/-4) scripts/network_bandwidth_test (+9/-15) scripts/obex_send (+82/-0) scripts/reconnect (+5/-0) scripts/sleep_test (+14/-67) scripts/usb_test (+141/-0) scripts/wake_on_lan_test (+150/-0) scripts/xrandr_cycle (+77/-3) setup.cfg (+10/-18) setup.py (+2/-2) |
To merge this branch: | bzr merge lp://staging/~roadmr/ubuntu/oneiric/checkbox/0.12.4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+71114@code.staging.launchpad.net |
To post a comment you must log in.
Looks good, uploading.