[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q

2 files changed, 62 insertions, 29 deletions

diff --git a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
index 32e04b28f84..c5a09d8095d 100644
--- a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
+++ b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11:45+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:45+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43:16+0000\n"
+"PO-Revision-Date: 2010-12-03 15:43:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base_module_doc_rst
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:ir.module.module:0
+msgid "You can save this image as .png file"
 msgstr ""
 
 #. module: base_module_doc_rst
@@ -41,11 +36,6 @@ msgid "(Relationship Graphs generated)"
 msgstr ""
 
 #. module: base_module_doc_rst
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_module_doc_rst
 #: wizard_view:tech.guide.rst,init:0
 msgid "Please choose a file where the Technical Guide will be written."
 msgstr ""
@@ -66,11 +56,6 @@ msgid "Create RST Technical Guide"
 msgstr ""
 
 #. module: base_module_doc_rst
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: base_module_doc_rst
 #: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
 msgid "Generate Relationship Graph"
 msgstr ""
@@ -83,11 +68,6 @@ msgid "Relationship Graph"
 msgstr ""
 
 #. module: base_module_doc_rst
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: base_module_doc_rst
 #: wizard_field:tech.guide.rst,init,rst_file:0
 msgid "file"
 msgstr ""
@@ -112,8 +92,3 @@ msgstr ""
 msgid "Create Technical Guide in rst format"
 msgstr ""
 
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/sr@latin.po b/addons/base_module_doc_rst/i18n/sr@latin.po
new file mode 100644
index 00000000000..d037d198bca
--- /dev/null
+++ b/addons/base_module_doc_rst/i18n/sr@latin.po
@@ -0,0 +1,58 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-28 00:58+0000\n"
+"PO-Revision-Date: 2010-01-26 10:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian <sr@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-04-24 04:03+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_module_doc_rst
+#: wizard_view:tech.guide.rst,init:0
+msgid "Technical Guide in rst format"
+msgstr ""
+
+#. module: base_module_doc_rst
+#: wizard_field:tech.guide.rst,init,name:0
+msgid "filename"
+msgstr ""
+
+#. module: base_module_doc_rst
+#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
+msgid "Create RST Technical Guide"
+msgstr ""
+
+#. module: base_module_doc_rst
+#: wizard_view:tech.guide.rst,init:0
+msgid "Please choose a file where the Technical Guide will be written."
+msgstr ""
+
+#. module: base_module_doc_rst
+#: wizard_field:tech.guide.rst,init,rst_file:0
+msgid "file"
+msgstr ""
+
+#. module: base_module_doc_rst
+#: wizard_button:tech.guide.rst,init,end:0
+msgid "Close"
+msgstr ""
+
+#. module: base_module_doc_rst
+#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
+msgid "Module Technical Guide in Restructured Text "
+msgstr ""
+
+#. module: base_module_doc_rst
+#: wizard_view:tech.guide.rst,init:0
+msgid "Create Technical Guide in rst format"
+msgstr ""