[MERGE] trunk

bzr revid: al@openerp.com-20121218140311-1rw9bqc1nwztfobb

4 files changed, 26 insertions, 25 deletions

diff --git a/addons/document/document.py b/addons/document/document.py
index 444ddd74781..437fb9ff28d 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -28,18 +28,19 @@ import string
 import time
 from StringIO import StringIO
 
-import openerp
-import netsvc
-import pooler
 import psycopg2
-import tools
-import pooler
+
+import openerp
+from openerp import netsvc
+from openerp import pooler
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.osv.orm import except_orm
+from openerp.tools.misc import ustr
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
+
 from content_index import cntIndex
-from osv import osv, fields
-from osv.orm import except_orm
-from tools.misc import ustr
-from tools.translate import _
-from tools.safe_eval import safe_eval
 
 _logger = logging.getLogger(__name__)
 
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index 656b50a94ce..ff3509dd7b6 100644
--- a/addons/document/i18n/pl.po
+++ b/addons/document/i18n/pl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:42+0000\n"
+"PO-Revision-Date: 2012-12-17 10:30+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -137,7 +137,7 @@ msgstr "Nazwa katalogu musi być unikalna!"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "Filtr na moje dokumenty"
 
 #. module: document
 #: view:ir.attachment:0
@@ -274,7 +274,7 @@ msgstr "Typ zawartości"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modification"
-msgstr ""
+msgstr "Modyfikacja"
 
 #. module: document
 #: view:document.directory:0
@@ -289,7 +289,7 @@ msgstr "Typ"
 #: code:addons/document/document_directory.py:234
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -461,7 +461,7 @@ msgstr "jeśli zaznaczone, to pliki będą niedostępne."
 #. module: document
 #: field:report.document.user,user:0
 msgid "unknown"
-msgstr ""
+msgstr "nieznane"
 
 #. module: document
 #: view:document.directory:0
@@ -507,7 +507,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Knowledge"
-msgstr ""
+msgstr "Wiedza"
 
 #. module: document
 #: view:document.storage:0
@@ -554,7 +554,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:6
 #, python-format
 msgid "Attachment(s)"
-msgstr ""
+msgstr "Załącznik(i)"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -564,7 +564,7 @@ msgstr "Sierpień"
 #. module: document
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Moje dokumenty"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -640,7 +640,7 @@ msgstr "Tylko do Odczytu"
 #: view:document.directory:0
 #: view:process.node:0
 msgid "Document Directory"
-msgstr ""
+msgstr "Katalog Dokumentu"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -650,7 +650,7 @@ msgstr "Nazwa katalogu musi być unikalna !"
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachments"
-msgstr ""
+msgstr "Załączniki"
 
 #. module: document
 #: field:document.directory,create_uid:0
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 92e33c13746..c9df78e4272 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -20,8 +20,8 @@
 ##############################################################################
 
 
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
 
 class report_document_user(osv.osv):
     _name = "report.document.user"
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index 6a69e638b4e..aec7f9b75a4 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from openerp.osv import fields, osv
 
 class document_configuration(osv.osv_memory):
     _name='document.configuration'