Merge lp://staging/~seb128/ubiquity/nonfree-mp3-label into lp://staging/ubiquity

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 6593
Proposed branch: lp://staging/~seb128/ubiquity/nonfree-mp3-label
Merge into: lp://staging/ubiquity
Diff against target: 78170 lines (+12687/-13528)
136 files modified
autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py (+2/-2)
debian/changelog (+5/-0)
debian/real-po/aa.po (+111/-120)
debian/real-po/ace.po (+111/-120)
debian/real-po/af.po (+77/-80)
debian/real-po/am.po (+111/-120)
debian/real-po/an.po (+115/-124)
debian/real-po/ar.po (+87/-91)
debian/real-po/as.po (+115/-124)
debian/real-po/ast.po (+76/-80)
debian/real-po/az.po (+115/-124)
debian/real-po/be.po (+79/-83)
debian/real-po/bg.po (+75/-79)
debian/real-po/bn.po (+107/-111)
debian/real-po/bo.po (+87/-91)
debian/real-po/br.po (+107/-116)
debian/real-po/bs.po (+76/-80)
debian/real-po/ca.po (+76/-80)
debian/real-po/ca@valencia.po (+87/-91)
debian/real-po/ce.po (+115/-124)
debian/real-po/ckb.po (+115/-124)
debian/real-po/cs.po (+76/-80)
debian/real-po/csb.po (+102/-111)
debian/real-po/cv.po (+115/-124)
debian/real-po/cy.po (+75/-79)
debian/real-po/da.po (+76/-80)
debian/real-po/de.po (+77/-81)
debian/real-po/dv.po (+119/-128)
debian/real-po/dz.po (+115/-124)
debian/real-po/el.po (+76/-80)
debian/real-po/en_AU.po (+143/-147)
debian/real-po/en_CA.po (+134/-138)
debian/real-po/en_GB.po (+143/-147)
debian/real-po/eo.po (+76/-80)
debian/real-po/es.po (+76/-80)
debian/real-po/et.po (+76/-80)
debian/real-po/eu.po (+76/-80)
debian/real-po/fa.po (+115/-124)
debian/real-po/fi.po (+76/-80)
debian/real-po/fil.po (+96/-105)
debian/real-po/fo.po (+119/-128)
debian/real-po/fr.po (+76/-80)
debian/real-po/fr_CA.po (+76/-80)
debian/real-po/frp.po (+115/-124)
debian/real-po/fy.po (+111/-120)
debian/real-po/ga.po (+115/-124)
debian/real-po/gd.po (+76/-80)
debian/real-po/gl.po (+76/-80)
debian/real-po/gu.po (+119/-128)
debian/real-po/gv.po (+115/-124)
debian/real-po/he.po (+76/-80)
debian/real-po/hi.po (+87/-91)
debian/real-po/hr.po (+76/-80)
debian/real-po/hu.po (+76/-80)
debian/real-po/hy.po (+115/-124)
debian/real-po/ia.po (+76/-80)
debian/real-po/id.po (+76/-80)
debian/real-po/is.po (+76/-80)
debian/real-po/it.po (+76/-80)
debian/real-po/ja.po (+76/-80)
debian/real-po/ka.po (+119/-128)
debian/real-po/kab.po (+119/-128)
debian/real-po/kk.po (+75/-79)
debian/real-po/kl.po (+115/-124)
debian/real-po/km.po (+76/-80)
debian/real-po/kn.po (+115/-124)
debian/real-po/ko.po (+76/-80)
debian/real-po/ku.po (+123/-132)
debian/real-po/kw.po (+115/-124)
debian/real-po/ky.po (+111/-120)
debian/real-po/lb.po (+115/-124)
debian/real-po/lo.po (+115/-124)
debian/real-po/lt.po (+77/-80)
debian/real-po/lv.po (+76/-80)
debian/real-po/mg.po (+115/-124)
debian/real-po/mhr.po (+115/-124)
debian/real-po/mk.po (+119/-128)
debian/real-po/ml.po (+115/-124)
debian/real-po/mr.po (+76/-80)
debian/real-po/ms.po (+76/-80)
debian/real-po/my.po (+110/-114)
debian/real-po/nb.po (+76/-80)
debian/real-po/nds.po (+115/-124)
debian/real-po/ne.po (+76/-80)
debian/real-po/nl.po (+76/-80)
debian/real-po/nl_NL.po (+115/-124)
debian/real-po/nn.po (+103/-107)
debian/real-po/ny.po (+115/-124)
debian/real-po/oc.po (+76/-80)
debian/real-po/oj.po (+115/-124)
debian/real-po/om.po (+115/-124)
debian/real-po/or.po (+115/-124)
debian/real-po/os.po (+115/-124)
debian/real-po/pa.po (+107/-116)
debian/real-po/pl.po (+80/-84)
debian/real-po/pt.po (+76/-80)
debian/real-po/pt_BR.po (+76/-80)
debian/real-po/ro.po (+76/-80)
debian/real-po/ru.po (+76/-80)
debian/real-po/sa.po (+106/-115)
debian/real-po/sco.po (+115/-124)
debian/real-po/sd.po (+111/-120)
debian/real-po/se.po (+115/-124)
debian/real-po/shn.po (+119/-128)
debian/real-po/si.po (+103/-107)
debian/real-po/sk.po (+76/-80)
debian/real-po/sl.po (+76/-80)
debian/real-po/sn.po (+111/-120)
debian/real-po/sq.po (+76/-80)
debian/real-po/sr.po (+76/-80)
debian/real-po/sv.po (+76/-80)
debian/real-po/sw.po (+115/-124)
debian/real-po/ta.po (+76/-80)
debian/real-po/ta_LK.po (+115/-124)
debian/real-po/te.po (+99/-103)
debian/real-po/templates.pot (+115/-124)
debian/real-po/tet.po (+115/-124)
debian/real-po/tg.po (+75/-79)
debian/real-po/th.po (+76/-80)
debian/real-po/tl.po (+115/-124)
debian/real-po/tr.po (+76/-80)
debian/real-po/tt.po (+111/-120)
debian/real-po/ug.po (+76/-80)
debian/real-po/uk.po (+76/-80)
debian/real-po/ur.po (+119/-128)
debian/real-po/uz.po (+76/-80)
debian/real-po/vec.po (+75/-79)
debian/real-po/vi.po (+87/-91)
debian/real-po/wae.po (+115/-124)
debian/real-po/wo.po (+115/-124)
debian/real-po/xh.po (+115/-124)
debian/real-po/zh_CN.po (+76/-80)
debian/real-po/zh_HK.po (+76/-80)
debian/real-po/zh_TW.po (+76/-80)
debian/ubiquity.templates (+1/-7)
gui/gtk/stepPrepare.ui (+1/-20)
To merge this branch: bzr merge lp://staging/~seb128/ubiquity/nonfree-mp3-label
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Didier Roche-Tolomelli (community) Approve
Review via email: mp+341159@code.staging.launchpad.net

Commit message

gui/gtk/stepPrepare.ui: updated the non-free-software text to not
include the mention to the MP3 fluendo codecs since those have
been superseeded in the recent gstreamer version.

Description of the change

gui/gtk/stepPrepare.ui: updated the non-free-software text to not
include the mention to the MP3 fluendo codecs since those have
been superseeded in the recent gstreamer version.

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

For translations, it's a little bit misleading, but you need to update manually debian/ubiquity.templates, then, you can regenerate the debian/real-po template file.

It seems as well that there is a test in autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py relying on the label.

review: Needs Fixing
6594. By Sebastien Bacher

updated the template and autopilot test

6595. By Sebastien Bacher

updated debconf template

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks Didier, I updated those

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

+1 for me (but I don't have commit rights)

review: Approve
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

+1, Thanks!

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

to status/vote changes: