[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20111013170327-9rvfdkbgj01hdgxb

3 files changed, 74 insertions, 7 deletions

diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index c4a7f033993..3deceff9d6f 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -2,7 +2,7 @@
     "name" : "Html View",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
     "demo_xml" : [],
diff --git a/addons/html_view/i18n/et.po b/addons/html_view/i18n/et.po
new file mode 100644
index 00000000000..5c7c9a6e909
--- /dev/null
+++ b/addons/html_view/i18n/et.po
@@ -0,0 +1,63 @@
+# Estonian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-10-11 17:49+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@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: 2011-10-12 04:40+0000\n"
+"X-Generator: Launchpad (build 14124)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr ""
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr ""
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr ""
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr ""
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Pangad"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr ""
diff --git a/addons/html_view/i18n/sr@latin.po b/addons/html_view/i18n/sr@latin.po
index 3c9bf842001..b6ba1e8c4b1 100644
--- a/addons/html_view/i18n/sr@latin.po
+++ b/addons/html_view/i18n/sr@latin.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-23 11:14+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-06 13:56+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian <sr@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: 2011-09-05 05:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-07 04:36+0000\n"
+"X-Generator: Launchpad (build 14085)\n"
 
 #. module: html_view
 #: field:html.view,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: html_view
 #: field:html.view,comp_id:0
 msgid "Company"
-msgstr "Preduzece"
+msgstr "Preduzeće"
 
 #. module: html_view
 #: model:ir.actions.act_window,name:html_view.action_html_view_form
@@ -56,6 +56,10 @@ msgid ""
 "view.\n"
 "    "
 msgstr ""
+"\n"
+"    Ovo je test-modul koji pokazuje html podršku za tegove u uobičajenom xml "
+"obliku pregleda.\n"
+"    "
 
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view