From 06efeae598c6dafbe56d2ea323a0dccdd5bf2b8e Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 6 Mar 2014 10:13:22 +0100 Subject: Added --previous flag to msgmerge command used by makemessages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also took the opportunity to slightly refactor gettext options so as to ease customization by subclassing the command. Thanks Michal Čihař for the report and initial patch. --- docs/ref/django-admin.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/ref') 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. -- cgit v1.3