Merge lp://staging/~jsjgruber/lernid/lernid-proposed into lp://staging/lernid

Proposed by John S. Gruber
Status: Merged
Merged at revision: 234
Proposed branch: lp://staging/~jsjgruber/lernid/lernid-proposed
Merge into: lp://staging/lernid
Diff against target: 21800 lines (+10405/-5239)
52 files modified
bin/lernid (+3/-2)
data/ui/LernidWindow.ui (+1/-1)
debian/changelog (+31/-0)
lernid.1 (+2/-0)
lernid/EventManager.py (+2/-2)
lernid/lernidconfig.py (+1/-1)
lernid/widgets/Browser.py (+13/-1)
lernid/widgets/Classroom.py (+2/-0)
lernid/widgets/IrcWidget.py (+3/-1)
lernid/widgets/NativeChatroom.py (+2/-0)
lernid/widgets/Slide.py (+2/-0)
po/af.po (+221/-80)
po/ar.po (+233/-132)
po/ast.po (+227/-167)
po/ca.po (+230/-143)
po/cs.po (+229/-168)
po/da.po (+231/-184)
po/de.po (+234/-180)
po/el.po (+281/-177)
po/en_AU.po (+233/-176)
po/en_CA.po (+233/-180)
po/en_GB.po (+232/-173)
po/eo.po (+342/-234)
po/es.po (+254/-97)
po/es_AR.po (+374/-57)
po/eu.po (+231/-126)
po/fi.po (+381/-85)
po/fil.po (+375/-64)
po/fr.po (+232/-180)
po/he.po (+232/-169)
po/hr.po (+233/-92)
po/hu.po (+233/-173)
po/id.po (+342/-153)
po/it.po (+250/-94)
po/jbo.po (+377/-60)
po/lernid.pot (+6/-6)
po/ms.po (+236/-93)
po/nb.po (+229/-115)
po/nl.po (+233/-170)
po/oc.po (+231/-90)
po/pl.po (+230/-166)
po/pt.po (+370/-53)
po/pt_BR.po (+234/-185)
po/ro.po (+381/-105)
po/ru.po (+230/-162)
po/sl.po (+232/-177)
po/sv.po (+230/-178)
po/te.po (+378/-79)
po/tr.po (+217/-77)
po/uk.po (+233/-95)
po/zh_CN.po (+232/-135)
setup.py (+1/-1)
To merge this branch: bzr merge lp://staging/~jsjgruber/lernid/lernid-proposed
Reviewer Review Type Date Requested Status
John S. Gruber Pending
Review via email: mp+151340@code.staging.launchpad.net

Description of the change

Proposed 0.9.9 (or perhaps 1.0)

To post a comment you must log in.
234. By John S. Gruber

Merge changes from lernid-proposed

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