diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-08 15:24:41 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-08 15:24:41 +0100 |
| commit | 0fd2e8ea33af1bccf6dfa0351efccaa5696bd01d (patch) | |
| tree | 0a88a3b07e3148c71bb08e51d69793f4b7cafb97 /addons/plugin | |
| parent | 75e1bf1787385187b66a3a0b34d223b8685fd511 (diff) | |
| parent | a5819a49d297bf5f6c4bab83485f9bc7600c7e75 (diff) | |
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120208142441-r51m3wxvpp6673dk
Diffstat (limited to 'addons/plugin')
| -rw-r--r-- | addons/plugin/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/plugin/i18n/plugin.pot | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py index e12bceb51bf..3d527918953 100644 --- a/addons/plugin/__openerp__.py +++ b/addons/plugin/__openerp__.py @@ -39,7 +39,7 @@ The common interface for pugin. 'demo': [], 'test': [], 'installable': True, - 'active': False, + 'auto_install': False, 'images': [], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/plugin/i18n/plugin.pot b/addons/plugin/i18n/plugin.pot index ed95b4c18e8..076af801e31 100644 --- a/addons/plugin/i18n/plugin.pot +++ b/addons/plugin/i18n/plugin.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.1beta\n" +"Project-Id-Version: OpenERP Server 6.1rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2011-12-22 18:46+0000\n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-02-08 00:36+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" |