[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: atp@tinyerp.co.in-20101119052138-ho6f10t244zib4n3

1 files changed, 68 insertions, 38 deletions

diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
index 49267f83709..7820ce419ec 100644
--- a/addons/document_webdav/i18n/document_webdav.pot
+++ b/addons/document_webdav/i18n/document_webdav.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46:26+0000\n"
-"PO-Revision-Date: 2010-10-18 17:46:26+0000\n"
+"POT-Creation-Date: 2010-11-18 16:12:01+0000\n"
+"PO-Revision-Date: 2010-11-18 16:12:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,28 +16,29 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
 #. module: document_webdav
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: document_webdav
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
 msgstr ""
 
 #. module: document_webdav
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+msgid "Namespace"
 msgstr ""
 
 #. module: document_webdav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
 msgstr ""
 
 #. module: document_webdav
@@ -46,19 +47,23 @@ msgid "Group By..."
 msgstr ""
 
 #. module: document_webdav
-#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
-msgid "WebDAV server for Document Management"
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
 msgstr ""
 
 #. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-msgid "Namespace"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
 msgstr ""
 
 #. module: document_webdav
@@ -68,28 +73,38 @@ msgstr ""
 
 #. module: document_webdav
 #: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
+msgid "WebDAV properties"
 msgstr ""
 
 #. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-msgid "Substitute"
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
 msgstr ""
 
 #. module: document_webdav
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
 msgstr ""
 
 #. module: document_webdav
 #: view:document.directory:0
-msgid "WebDAV properties"
+#: view:document.webdav.dir.property:0
+msgid "Properties"
 msgstr ""
 
 #. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+msgid "Name"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
 msgstr ""
 
 #. module: document_webdav
@@ -98,28 +113,43 @@ msgid "Value"
 msgstr ""
 
 #. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: document_webdav
 #: view:document.webdav.dir.property:0
-msgid "Search Document storage"
+msgid "Dir"
 msgstr ""
 
 #. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_dir_props
-msgid "DAV properties for folders"
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-msgid "Properties"
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
 msgstr ""
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
-msgid "Dir"
+msgid "Search Document storage"
 msgstr ""
 
 #. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-msgid "Name"
+#: field:document.webdav.dir.property,do_subst:0
+msgid "Substitute"
 msgstr ""