[MERGE] merge from trunk addons

[odoo/odoo.git] / addons / product_manufacturer / i18n / product_manufacturer.pot

diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
old mode 100644 (file)
new mode 100755 (executable)
index cee8019..255ee8b
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
+"POT-Creation-Date: 2011-01-11 11:15:49+0000\n"
+"PO-Revision-Date: 2011-01-11 11:15:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
+#. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer Product Code"
 msgstr ""