merged with trunk

bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv

31 files changed, 28 insertions, 18 deletions

diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py
index af514df8985..af514df8985 100644..100755
--- a/addons/document_ftp/__init__.py
+++ b/addons/document_ftp/__init__.py
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 798ecba72c3..798ecba72c3 100644..100755
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index d110267f175..d110267f175 100644..100755
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 65b17a52c51..7580a8831cf 100644..100755
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -386,7 +386,7 @@ class abstracted_fs(object):
     def rename(self, src, datacr):
         """ Renaming operation, the effect depends on the src:
             * A file: read, create and remove
-            * A directory: change the parent and reassign childs to ressource
+            * A directory: change the parent and reassign children to ressource
         """
         cr = datacr[0]
         try:
diff --git a/addons/document_ftp/ftpserver/authorizer.py b/addons/document_ftp/ftpserver/authorizer.py
index 5a64ca8f7a0..5a64ca8f7a0 100644..100755
--- a/addons/document_ftp/ftpserver/authorizer.py
+++ b/addons/document_ftp/ftpserver/authorizer.py
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index bd727427541..bd727427541 100644..100755
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
index b6e56a4adbd..5340c2babba 100644..100755
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:50+0000\n"
+"PO-Revision-Date: 2010-12-28 12:48+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -32,6 +32,12 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Zeigt die Netzwerk IP Adresse über die der OpenERP Server für Endbenutzer "
+"erreicht werden kann. Diese Adresse hängt ab von der Architektur des "
+"Netzwerks, und wird lediglich einen Einfluss auf die Anzeige der Adresse "
+"beim Benutzer haben. Das Format der Adresse ist HOST:PORT, wobei der "
+"Standard Host (localhost) lediglich gültig ist für einen direkten Zugriff "
+"vom Server selbst."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -51,7 +57,7 @@ msgstr "Bild"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -104,7 +110,7 @@ msgstr "Abbrechen"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Configure FTP Server"
-msgstr ""
+msgstr "Konfigurieren FTP Server"
 
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
@@ -124,7 +130,7 @@ msgstr "Suche per FTP Dokument"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Konfiguration Knowledge"
 
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
index db9204eb64d..db9204eb64d 100644..100755
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ b/addons/document_ftp/i18n/document_ftp.pot
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index 00b41791bbb..00b41791bbb 100644..100755
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index 7d83a16501d..71b774e9678 100644..100755
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 14:37+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 22:56+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -57,7 +56,7 @@ msgstr "Image"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index 87c0fba318c..0554595dd1b 100644..100755
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-24 08:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:35+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -31,6 +31,11 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Indica l'indirizzo di rete su cui i vostri server OpenERP possono essere "
+"disponibili all'utente finale. Questo dipende dalla topologia di rete e "
+"dalla configurazione, e interessa solamente i link visualizzati dagli "
+"utenti. Il formato è HOST:PORTA e il default host (localhost) è adatto "
+"solamente per l'accesso dal server su se stesso.."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -50,7 +55,7 @@ msgstr "Immagine"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Indirizzo"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -105,7 +110,7 @@ msgstr "_Annulla"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Configure FTP Server"
-msgstr ""
+msgstr "Configura FTP server"
 
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
diff --git a/addons/document_ftp/i18n/nl.po b/addons/document_ftp/i18n/nl.po
index adde0687574..adde0687574 100644..100755
--- a/addons/document_ftp/i18n/nl.po
+++ b/addons/document_ftp/i18n/nl.po
diff --git a/addons/document_ftp/i18n/pl.po b/addons/document_ftp/i18n/pl.po
index c69fb7bcf05..c69fb7bcf05 100644..100755
--- a/addons/document_ftp/i18n/pl.po
+++ b/addons/document_ftp/i18n/pl.po
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
index e54a8f6a50b..e54a8f6a50b 100644..100755
--- a/addons/document_ftp/i18n/pt.po
+++ b/addons/document_ftp/i18n/pt.po
diff --git a/addons/document_ftp/i18n/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
index 6fa3f963dad..6fa3f963dad 100644..100755
--- a/addons/document_ftp/i18n/pt_BR.po
+++ b/addons/document_ftp/i18n/pt_BR.po
diff --git a/addons/document_ftp/i18n/sr.po b/addons/document_ftp/i18n/sr.po
index 3537258616d..3537258616d 100644..100755
--- a/addons/document_ftp/i18n/sr.po
+++ b/addons/document_ftp/i18n/sr.po
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
index ae2d0c9d871..ae2d0c9d871 100644..100755
--- a/addons/document_ftp/i18n/sr@latin.po
+++ b/addons/document_ftp/i18n/sr@latin.po
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index c6362b63e0a..c6362b63e0a 100644..100755
--- a/addons/document_ftp/i18n/sv.po
+++ b/addons/document_ftp/i18n/sv.po
diff --git a/addons/document_ftp/i18n/zh_CN.po b/addons/document_ftp/i18n/zh_CN.po
index 9d7c482711b..9d7c482711b 100644..100755
--- a/addons/document_ftp/i18n/zh_CN.po
+++ b/addons/document_ftp/i18n/zh_CN.po
diff --git a/addons/document_ftp/security/ir.model.access.csv b/addons/document_ftp/security/ir.model.access.csv
index 0a6c192eb56..0a6c192eb56 100644..100755
--- a/addons/document_ftp/security/ir.model.access.csv
+++ b/addons/document_ftp/security/ir.model.access.csv
diff --git a/addons/document_ftp/test/document_ftp_test.yml b/addons/document_ftp/test/document_ftp_test.yml
index b3ff2a89250..b3ff2a89250 100644..100755
--- a/addons/document_ftp/test/document_ftp_test.yml
+++ b/addons/document_ftp/test/document_ftp_test.yml
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 872456e7191..872456e7191 100644..100755
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
diff --git a/addons/document_ftp/test/document_ftp_test3.yml b/addons/document_ftp/test/document_ftp_test3.yml
index a51f259f44e..a51f259f44e 100644..100755
--- a/addons/document_ftp/test/document_ftp_test3.yml
+++ b/addons/document_ftp/test/document_ftp_test3.yml
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index f05fac397bf..f05fac397bf 100644..100755
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
diff --git a/addons/document_ftp/test/document_ftp_test5.yml b/addons/document_ftp/test/document_ftp_test5.yml
index a66f409905b..a66f409905b 100644..100755
--- a/addons/document_ftp/test/document_ftp_test5.yml
+++ b/addons/document_ftp/test/document_ftp_test5.yml
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index 1f7324b821e..04a480fce36 100644..100755
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -37,7 +37,7 @@ def get_plain_ftp(timeout=10.0):
 def get_ftp_login(cr, uid, ormobj):
     ftp = get_plain_ftp()
     user = ormobj.pool.get('res.users').read(cr, uid, uid)
-    ftp.login(user.get('login',''), user.get('password',''))
+    ftp.login(user.get('login',''), user.get('login',''))
     ftp.cwd("/" + cr.dbname)
     return ftp
 
@@ -62,4 +62,4 @@ def get_ftp_fulldata(ftp, fname, limit=8192):
     ftp.retrbinary('RETR %s' % fname, partial(ffp,data))
     return ''.join(data)
 
-#eof
\ No newline at end of file
+#eof
diff --git a/addons/document_ftp/wizard/__init__.py b/addons/document_ftp/wizard/__init__.py
index 40997cc6b90..40997cc6b90 100644..100755
--- a/addons/document_ftp/wizard/__init__.py
+++ b/addons/document_ftp/wizard/__init__.py
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index 3e5787819b2..3e5787819b2 100644..100755
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 90182b70e0d..90182b70e0d 100644..100755
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 17dc99d202e..17dc99d202e 100644..100755
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 151e2ce49c6..151e2ce49c6 100644..100755
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml