[MERGE] merge from trunk addons

[odoo/odoo.git] / addons / product_manufacturer / i18n / sr@latin.po

diff --git a/addons/product_manufacturer/i18n/sr@latin.po b/addons/product_manufacturer/i18n/sr@latin.po
old mode 100644 (file)
new mode 100755 (executable)
index 54c5e81..1cae6b0
--- a/addons/product_manufacturer/i18n/sr@latin.po
+++ b/addons/product_manufacturer/i18n/sr@latin.po
@@ -1,4 +1,4 @@
-# Serbian translation for openobject-addons
+# Serbian latin translation for openobject-addons
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
@@ -7,83 +7,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-14 16:37+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2010-12-10 18:55+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
+"Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\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 "Proizvođačka šifra artikla"
+msgstr ""
 
 #. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
-msgstr "Naziv predloška proizvoda"
-
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
-msgstr "Atributi Proizvoda"
+msgstr "Osobine Proizvoda"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 #: view:product.product:0
 msgid "Product Attributes"
-msgstr "Atributi Proizvoda"
+msgstr ""
 
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,name:0
 msgid "Attribute"
-msgstr "Atribut"
-
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Proizvod"
+msgstr ""
 
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
-msgstr "Vrednost"
+msgstr ""
+
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
 msgid "Attributes"
-msgstr "Aтрибути"
+msgstr ""
 
 #. module: product_manufacturer
 #: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
 msgid "Products Attributes & Manufacturers"
-msgstr "Atributi i Proizvođači Proizvoda"
+msgstr ""
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
 msgid "Manufacturer Product Name"
-msgstr "Proizvođačev Naziv Proizvoda"
+msgstr ""
 
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
-msgstr "Proizvođač"
+msgstr ""