summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2013-08-20 11:16:38 +0200
committerOlivier Dony <odo@openerp.com>2013-08-20 11:16:38 +0200
commitfbd0758cb5c986f35543e3f64e4274dcb4fc7b18 (patch)
treedd1c91f6432c2bae4423ffc9df3fbbf03bbad4be /doc
parentba782d1acdf107e423e14fa4b6f05e97c32af816 (diff)
parent0995418289a1b225513272fd6e77f3b03ef48d33 (diff)
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5054 rev-id: odo@openerp.com-20130820091157-e5brwlxuhujf8rrd
bzr revid: chs@openerp.com-20130724085026-525l9apggc9yzx0h bzr revid: odo@openerp.com-20130730140644-1xih0as5jsks4pub bzr revid: dle@openerp.com-20130801130723-khgwjkglgsdn34fj bzr revid: odo@openerp.com-20130820091638-jpbcmh653bpa29em
Diffstat (limited to 'doc')
-rw-r--r--doc/changelog.rst11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 59c4a6bced5..352b0919398 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -21,3 +21,14 @@ Changelog
``openerp.exceptions.RedirectWarning``.
- Give a pair of new methods to ``res.config.settings`` and a helper to make
them easier to use: ``get_config_warning()``.
+
+
+`7.0`
+-----
+
+- Modules may now include an ``i18n_extra`` directory that will be treated like the
+ default ``i18n`` directory. This is typically useful for manual translation files
+ that are not managed by Launchpad's translation system. An example is l10n modules
+ that depend on ``l10n_multilang``.
+
+