[MERGE] Sync wirth trunk.

bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42

4 files changed, 38 insertions, 36 deletions

diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
index 092d39f22e9..f74cfe02a21 100644
--- a/addons/document_page/document_page.py
+++ b/addons/document_page/document_page.py
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
 import difflib
-import tools
+from openerp import tools
 
 class document_page(osv.osv):
     _name = "document.page"
diff --git a/addons/document_page/i18n/pl.po b/addons/document_page/i18n/pl.po
index b9403be4ca2..86b17782569 100644
--- a/addons/document_page/i18n/pl.po
+++ b/addons/document_page/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-08-13 12:16+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
+"PO-Revision-Date: 2012-12-17 10:25+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:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -22,13 +22,13 @@ msgstr ""
 #: selection:document.page,type:0
 #: model:ir.actions.act_window,name:document_page.action_category
 msgid "Category"
-msgstr ""
+msgstr "Kategoria"
 
 #. module: document_page
 #: view:document.page:0
 #: field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Ostatni kontrybutor"
 
 #. module: document_page
 #: view:document.page:0
@@ -45,12 +45,12 @@ msgstr "Menu"
 #: view:document.page:0
 #: model:ir.model,name:document_page.model_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Strona dokumentu"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_related_page_history
 msgid "Page History"
-msgstr ""
+msgstr "Historia strony"
 
 #. module: document_page
 #: view:document.page:0
@@ -63,18 +63,20 @@ msgstr "Zawartość"
 #. module: document_page
 #: view:document.page:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: document_page
 #: view:document.page:0
 msgid "Template"
-msgstr ""
+msgstr "Szablon"
 
 #. module: document_page
 #: view:document.page:0
 msgid ""
 "that will be used as a content template for all new page of this category."
 msgstr ""
+"które będzie stosowane jako szablon zawartości dla nowych stron tej "
+"kategorii."
 
 #. module: document_page
 #: field:document.page,name:0
@@ -89,7 +91,7 @@ msgstr ""
 #. module: document_page
 #: field:document.page,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
@@ -99,39 +101,39 @@ msgstr ""
 #. module: document_page
 #: field:document.page.history,create_uid:0
 msgid "Modified By"
-msgstr ""
+msgstr "Zmodyfikowane przez"
 
 #. module: document_page
 #: view:document.page.create.menu:0
 msgid "or"
-msgstr ""
+msgstr "lub"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Page type"
-msgstr ""
+msgstr "Typ strony"
 
 #. module: document_page
 #: view:document.page.create.menu:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Informacja o menu"
 
 #. module: document_page
 #: view:document.page.history:0
 #: model:ir.model,name:document_page.model_document_page_history
 msgid "Document Page History"
-msgstr ""
+msgstr "Historia strony dokumentu"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_page_history
 msgid "Pages history"
-msgstr ""
+msgstr "Historia strony"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
 #, python-format
 msgid "There are no changes in revisions."
-msgstr ""
+msgstr "Brak zmian w wersjach"
 
 #. module: document_page
 #: field:document.page.history,create_date:0
@@ -143,7 +145,7 @@ msgstr "Data"
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
 #: view:wizard.document.page.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "Różnica"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_page
@@ -155,7 +157,7 @@ msgstr "Strony"
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_category
 msgid "Categories"
-msgstr ""
+msgstr "Kategorie"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
@@ -171,12 +173,12 @@ msgstr "Utworzono"
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "You need to select minimum one or maximum two history revisions!"
-msgstr ""
+msgstr "Musisz wybrać minimum jedną a maksymalnie dwie wersje historii !"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_history
 msgid "Page history"
-msgstr ""
+msgstr "Historia strony"
 
 #. module: document_page
 #: field:document.page.history,summary:0
@@ -186,12 +188,12 @@ msgstr "Podsumowanie"
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
 msgid "Create web pages"
-msgstr ""
+msgstr "Twórz strony web"
 
 #. module: document_page
 #: view:document.page.history:0
 msgid "Document History"
-msgstr ""
+msgstr "Historia Dokumentu"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
@@ -201,12 +203,12 @@ msgstr "Nazwa menu"
 #. module: document_page
 #: field:document.page.history,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Strona"
 
 #. module: document_page
 #: field:document.page,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: document_page
 #: field:document.page,write_date:0
@@ -223,14 +225,14 @@ msgstr "Utwórz menu"
 #. module: document_page
 #: field:document.page,display_content:0
 msgid "Displayed Content"
-msgstr ""
+msgstr "Wyświetlana zawartość"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Ostrzeżenie !"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -246,9 +248,9 @@ msgstr "Różnice"
 #. module: document_page
 #: view:document.page:0
 msgid "Document Type"
-msgstr ""
+msgstr "Typ dokumentu"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Podrzędne"
diff --git a/addons/document_page/wizard/document_page_create_menu.py b/addons/document_page/wizard/document_page_create_menu.py
index 79a43f952f0..9f20fab0d99 100644
--- a/addons/document_page/wizard/document_page_create_menu.py
+++ b/addons/document_page/wizard/document_page_create_menu.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, osv
 
 class document_page_create_menu(osv.osv_memory):
     """ Create Menu """
diff --git a/addons/document_page/wizard/document_page_show_diff.py b/addons/document_page/wizard/document_page_show_diff.py
index 13e8e79b3b7..0c20ee79c74 100644
--- a/addons/document_page/wizard/document_page_show_diff.py
+++ b/addons/document_page/wizard/document_page_show_diff.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
 import base64
 
 class showdiff(osv.osv_memory):