Merge lp://staging/~nosklo/infobat/gettext-translations-1 into lp://staging/infobat

Proposed by Aaron Gallagher
Status: Merged
Merged at revision: 65
Proposed branch: lp://staging/~nosklo/infobat/gettext-translations-1
Merge into: lp://staging/infobat
Diff against target: 780 lines (+492/-53) (has conflicts)
8 files modified
compile.sh (+8/-0)
generate.sh (+9/-0)
infobat.cfg.example (+4/-0)
infobat/config.py (+36/-2)
infobat/irc.py (+74/-51)
infobat/locale/en/infobat.po (+127/-0)
infobat/locale/infobat.pot (+120/-0)
infobat/locale/pt_BR/infobat.po (+114/-0)
Text conflict in infobat/irc.py
To merge this branch: bzr merge lp://staging/~nosklo/infobat/gettext-translations-1
Reviewer Review Type Date Requested Status
Aaron Gallagher Approve
Review via email: mp+24655@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Aaron Gallagher (habnabit) wrote :

Looks fine. Going to merge this with some other database-related stuff on Wednesday.

review: Approve
65. By Clóvis Fabrício <bazaar.nosklo@0sg.net>

Made "inf" translatable so it doesn't error with UnicodeDecodeError.

66. By Clóvis Fabrício <bazaar.nosklo@0sg.net>

Added misc.locale examples to config

67. By Clóvis Fabrício <bazaar.nosklo@0sg.net>

Added script that generates the .pot file and the en translation file
Added credits to the Brazilian Portuguese translation

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