Merge remote branch 'aaronw/bug608_checkbox_labels'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Sat, 15 Oct 2011 12:15:36 +0000 (14:15 +0200)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Sat, 15 Oct 2011 12:15:36 +0000 (14:15 +0200)
commit404d8fa9ae6e305f7b06750b67b5dac1d9634af2
treef9def726b876ce3fd869e5071e5cfe65854d024e
parentb06e4f3b2d47cf55dfe4784eeab05e981f3131b4
parent29264e0d74ef4020cd87a2ed4d22bdda2421f784
Merge remote branch 'aaronw/bug608_checkbox_labels'

* aaronw/bug608_checkbox_labels:
  No need to translate label name.
  Add label tag to fix translation issue.
  Update english translation file.
  Checkbox label is being translated in the form definition -- translating it in the template is redundant and breaks <label> functionality.

Conflicts:
mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po