[MERGE] forward port of branch 9.0 up to 97e87a4

8 files changed, 39 insertions, 30 deletions

diff --git a/addons/web_editor/i18n/af.po b/addons/web_editor/i18n/af.po
index 07bd4453bfe..be7b36ca318 100644
--- a/addons/web_editor/i18n/af.po
+++ b/addons/web_editor/i18n/af.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-11-13 10:48+0000\n"
+"PO-Revision-Date: 2015-12-22 13:37+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Afrikaans (http://www.transifex.com/odoo/odoo-9/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -1204,7 +1204,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_float
 msgid "ir.qweb.field.float"
-msgstr ""
+msgstr "ir.qweb.field.float"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_html
diff --git a/addons/web_editor/i18n/es_DO.po b/addons/web_editor/i18n/es_DO.po
index 514ef8a500a..3a5e854a404 100644
--- a/addons/web_editor/i18n/es_DO.po
+++ b/addons/web_editor/i18n/es_DO.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-11-08 17:05+0000\n"
+"PO-Revision-Date: 2015-12-26 21:02+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Spanish (Dominican Republic) (http://www.transifex.com/odoo/odoo-9/language/es_DO/)\n"
 "MIME-Version: 1.0\n"
@@ -1046,7 +1046,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:784
 #, python-format
 msgid "Undo"
-msgstr ""
+msgstr "Deshacer"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/fr.po b/addons/web_editor/i18n/fr.po
index f4544beb08f..785aff9d991 100644
--- a/addons/web_editor/i18n/fr.po
+++ b/addons/web_editor/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-11-24 23:07+0000\n"
+"PO-Revision-Date: 2015-12-22 17:35+0000\n"
 "Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/odoo/odoo-9/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -994,7 +994,7 @@ msgstr "Texte à afficher"
 msgid ""
 "The image could not be deleted because it is used in the\n"
 "               following pages or views:"
-msgstr "L'image n'a pu être annulée car elle est utilisée dans les\nvues ou pages suivantes:"
+msgstr "L'image n'a pu être annulée car elle est utilisée dans les\nvues ou pages suivantes :"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/it.po b/addons/web_editor/i18n/it.po
index 21064fdf8b6..9112beb667d 100644
--- a/addons/web_editor/i18n/it.po
+++ b/addons/web_editor/i18n/it.po
@@ -3,13 +3,14 @@
 # * web_editor
 # 
 # Translators:
+# Riccardo Di Maio <riccardodimaio11@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-11-18 13:51+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2015-12-29 11:08+0000\n"
+"Last-Translator: Riccardo Di Maio <riccardodimaio11@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +78,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:760
 #, python-format
 msgid "Align left"
-msgstr ""
+msgstr "Allinea a sinistra"
 
 #. module: web_editor
 #. openerp-web
@@ -1150,7 +1151,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:179
 #, python-format
 msgid "all"
-msgstr ""
+msgstr "tutti"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/pt_BR.po b/addons/web_editor/i18n/pt_BR.po
index 97ad24ef36d..0b07fb06ffc 100644
--- a/addons/web_editor/i18n/pt_BR.po
+++ b/addons/web_editor/i18n/pt_BR.po
@@ -6,13 +6,14 @@
 # Grazziano Duarte <g.negocios@outlook.com.br>, 2015
 # Martin Trigaux, 2015
 # Mateus Cerqueira Lopes <mateus1@gmail.com>, 2015
+# Rodrigo Macedo <rodrigomacedo@rmsolucoeseminformatica.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-12-14 01:04+0000\n"
-"Last-Translator: Grazziano Duarte <g.negocios@outlook.com.br>\n"
+"PO-Revision-Date: 2015-12-29 18:16+0000\n"
+"Last-Translator: Rodrigo Macedo <rodrigomacedo@rmsolucoeseminformatica.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,21 +74,21 @@ msgstr "Adicionar uma imagem URL"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:761
 #, python-format
 msgid "Align center"
-msgstr ""
+msgstr "Alinhar ao Centro"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:760
 #, python-format
 msgid "Align left"
-msgstr ""
+msgstr "Alinhar a esquerda"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:762
 #, python-format
 msgid "Align right"
-msgstr ""
+msgstr "Alinhar a Direita"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/vi.po b/addons/web_editor/i18n/vi.po
index a05e026f964..fcd6471e209 100644
--- a/addons/web_editor/i18n/vi.po
+++ b/addons/web_editor/i18n/vi.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-30 09:29+0000\n"
+"PO-Revision-Date: 2015-12-29 08:18+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Vietnamese (http://www.transifex.com/odoo/odoo-9/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -261,7 +261,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Tên hiển thị"
 
 #. module: web_editor
 #. openerp-web
@@ -549,7 +549,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub___last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Sửa lần cuối vào"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_write_uid
diff --git a/addons/web_editor/i18n/zh_CN.po b/addons/web_editor/i18n/zh_CN.po
index 545f29a6959..c1724df36f4 100644
--- a/addons/web_editor/i18n/zh_CN.po
+++ b/addons/web_editor/i18n/zh_CN.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # fausthuang, 2015
+# fausthuang, 2015
 # Gary Wei <Gary.wei@elico-corp.com>, 2015
 # Xia Fajin <xia.fajin@elico-corp.com>, 2015
 # Xu Lei <xulei8@qq.com>, 2015
@@ -13,8 +14,8 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-11-21 06:46+0000\n"
-"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>\n"
+"PO-Revision-Date: 2015-12-24 03:20+0000\n"
+"Last-Translator: 珠海-老天 <liangjia@qq.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -365,14 +366,14 @@ msgstr "右浮动"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:696
 #, python-format
 msgid "Font Family"
-msgstr "字体"
+msgstr "字体系列"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:697
 #, python-format
 msgid "Font Size"
-msgstr "字号"
+msgstr "字体大小"
 
 #. module: web_editor
 #. openerp-web
@@ -660,7 +661,7 @@ msgstr "有序列表"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:758
 #, python-format
 msgid "Outdent"
-msgstr "减少缩进"
+msgstr "凸出"
 
 #. module: web_editor
 #. openerp-web
@@ -730,7 +731,7 @@ msgstr "引用"
 #: code:addons/web_editor/static/src/js/rte.js:341
 #, python-format
 msgid "Readonly field"
-msgstr "只读选项"
+msgstr "只读字段"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 17a2df31c6e..3d3b6cb27ee 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -103,17 +103,23 @@ var FieldTextHtmlSimple = widget.extend({
         return value;
     },
     focus: function() {
-        var input = !this.get("effective_readonly") && this.$textarea;
-        return input ? input.focus() : false;
+        if (this.get("effective_readonly")) {
+            return false;
+        }
+        // on IE an error may occur when creating range on not displayed element
+        try {
+            return this.$content.focusInEnd();
+        } catch (e) {
+            return this.$content.focus();
+        };
     },
     render_value: function() {
         var value = this.get('value');
         this.$textarea.val(value || '');
         this.$content.html(this.text_to_html(value));
-        // on ie an error may occur when creating range on not displayed element
-        try {
-            this.$content.focusInEnd();
-        } catch (e) {}
+        if (this.$content.is(document.activeElement)) {
+            this.focus();
+        }
         var history = this.$content.data('NoteHistory');
         if (history && history.recordUndo()) {
             this.$('.note-toolbar').find('button[data-event="undo"]').attr('disabled', false);