diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 5 | ||||
| -rw-r--r-- | docs/releases/1.7.txt | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 853f64b936..4571c24d3d 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -569,6 +569,11 @@ Example usage:: Added the ability to specify multiple locales. +.. versionchanged:: 1.7 + + Added the ``--previous`` option to the ``msgmerge`` command when merging + with existing po files. + .. django-admin-option:: --domain Use the ``--domain`` or ``-d`` option to change the domain of the messages files. diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index 6c1ab36c90..359bc4d217 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -572,6 +572,10 @@ Internationalization app or project message file. See :ref:`how-to-create-language-files` for details. +* The :djadmin:`makemessages` command now always adds the ``--previous`` + command line flag to the ``msgmerge`` command, keeping previously translated + strings in po files for fuzzy strings. + * The following settings to adjust the language cookie options were introduced: :setting:`LANGUAGE_COOKIE_AGE`, :setting:`LANGUAGE_COOKIE_DOMAIN` and :setting:`LANGUAGE_COOKIE_PATH`. |