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

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

1 files changed, 57 insertions, 42 deletions

diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
index 5e552a732c0..46e080aa241 100644
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ b/addons/document_ftp/i18n/document_ftp.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:25+0000\n"
-"PO-Revision-Date: 2010-10-18 17:46:25+0000\n"
+"POT-Creation-Date: 2010-11-18 16:12:00+0000\n"
+"PO-Revision-Date: 2010-11-18 16:12:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,6 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
 msgid "Auto Directory Configuration"
 msgstr ""
@@ -36,52 +31,48 @@ msgid "The Object name must start with x_ and not contain any special character
 msgstr ""
 
 #. module: document_ftp
-#: field:document.ftp.configuration,progress:0
-msgid "Configuration Progress"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: document_ftp
-#: model:ir.actions.url,name:document_ftp.action_document_browse
-msgid "Browse Files"
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
 msgstr ""
 
 #. module: document_ftp
-#: field:document.ftp.configuration,config_logo:0
-msgid "Image"
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "title"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
+#: view:document.ftp.browse:0
+msgid "Browse Document"
 msgstr ""
 
 #. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
 msgstr ""
 
 #. module: document_ftp
-#: model:ir.module.module,description:document_ftp.module_meta_information
-msgid "This is a support FTP Interface with document management system.\n"
-"    With this module you would not only be able to access documents through OpenERP\n"
-"    but you would also be able to connect with them through the file system using the\n"
-"    FTP client.\n"
-""
+#: view:document.ftp.browse:0
+msgid "_Browse"
 msgstr ""
 
 #. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
-msgid "res_config_contents"
+msgid "title"
 msgstr ""
 
 #. module: document_ftp
@@ -90,37 +81,61 @@ msgid "Shared Repository (FTP)"
 msgstr ""
 
 #. module: document_ftp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
 msgstr ""
 
 #. module: document_ftp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
 msgstr ""
 
 #. module: document_ftp
-#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
-msgid "Integrated FTP Server with Document Management System"
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
 msgstr ""
 
 #. module: document_ftp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
 msgstr ""
 
 #. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
 msgstr ""
 
 #. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid "This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through OpenERP\n"
+"    but you would also be able to connect with them through the file system using the\n"
+"    FTP client.\n"
+""
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
-msgid "Browse Document"
+msgid "_Cancel"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr ""
+
+#. module: document_ftp
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
 msgstr ""