#11515: Merge with 3.1.

This commit is contained in:
Ezio Melotti 2011-03-15 05:59:46 +02:00
commit 4969f709cc
49 changed files with 58 additions and 58 deletions

View file

@ -282,7 +282,7 @@ class GNUTranslations(NullTranslations):
# Note: we unconditionally convert both msgids and msgstrs to
# Unicode using the character encoding specified in the charset
# parameter of the Content-Type header. The gettext documentation
# strongly encourages msgids to be us-ascii, but some appliations
# strongly encourages msgids to be us-ascii, but some applications
# require alternative encodings (e.g. Zope's ZCML and ZPT). For
# traditional gettext applications, the msgid conversion will
# cause no problems since us-ascii should always be a subset of