From 78a556601e6b1e72c6d1ac776e31588dd2ffa28f Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 23 Jan 2018 14:10:48 +0100
Subject: [FIX] web_editor: prevent crash when dropping snippets

For some unknown reasons, the editor sometimes crashes when dropping a
snippet. As a temporary fix, the non-critical line that causes the
problem is try/catch protected by this commit.
---
 addons/web_editor/static/src/js/rte.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/rte.js b/addons/web_editor/static/src/js/rte.js
index 20c70e9d235..7748ccf7762 100644
--- a/addons/web_editor/static/src/js/rte.js
+++ b/addons/web_editor/static/src/js/rte.js
@@ -280,7 +280,15 @@ var RTE = Widget.extend({
         } else {
             rng = $editable.data('range') || rng;
         }
-        rng.select();
+        try {
+            // TODO this line might break for unknown reasons. I suppose that
+            // the created range is an invalid one. As it might be tricky to
+            // adapt that line and that it is not a critical one, temporary fix
+            // is to ignore the errors that this generates.
+            rng.select();
+        } catch (e) {
+            console.log('error', e);
+        }
         history.recordUndo($editable, event, internal_history);
     },
     /**
-- 
cgit v1.2.3


From 2fad2e43b855e728f0534012012ec3720035768c Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 23 Jan 2018 16:16:20 +0100
Subject: [FIX] web_editor: solve all triple-click issues

... hopefully.

This *must* be forward-ported.

Depending on the browser, the triple-click behavior is different. This
is especially problematic on Chrome, where blank characters at the start
of the neighbor of the clicked element are selected.

A weak attempt to solve that was made by commit https://github.com/odoo/odoo/commit/b85bd358234684974f9af63bc5f28cfabb527767

This commit hopes to solve all the issues once and for all by fully
reimplementing the triple-click for all browsers. The concept is simple:
when a triple-click occurs, select the whole *inner* content of the
deepest DOM *element* that was clicked.
---
 addons/web_editor/static/src/js/rte.js | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/rte.js b/addons/web_editor/static/src/js/rte.js
index 7748ccf7762..adbc7d4bd49 100644
--- a/addons/web_editor/static/src/js/rte.js
+++ b/addons/web_editor/static/src/js/rte.js
@@ -583,8 +583,8 @@ var RTE = Widget.extend({
     onEnableEditableArea: function ($editable) {
     },
 
-    onMouseup: function (event) {
-        var $target = $(event.target);
+    onMouseup: function (ev) {
+        var $target = $(ev.target);
         var $editable = $target.closest('.o_editable');
 
         if (!$editable.size()) {
@@ -596,26 +596,16 @@ var RTE = Widget.extend({
             self.historyRecordUndo($target, 'activate',  true);
         },0);
 
-        // To Fix Google Chrome Tripleclick Issue, which selects the ending
-        // whitespace characters (so Tripleclicking then typing text will remove
-        // the whole paragraph instead of its content).
-        // http://stackoverflow.com/questions/38467334/why-does-google-chrome-always-add-space-after-selected-text
-        if ($.browser.chrome === true && event.originalEvent.detail === 3) {
-            var currentSelection = range.create();
-            if (currentSelection.sc.parentNode === currentSelection.ec) {
-                _selectSC(currentSelection);
-            } else if (currentSelection.eo === 0) {
-                var $hasNext = $(currentSelection.sc).parent();
-                while (!$hasNext.next().length && !$hasNext.is('body')) {
-                    $hasNext = $hasNext.parent();
-                }
-                if ($hasNext.next()[0] === currentSelection.ec) {
-                    _selectSC(currentSelection);
-                }
-            }
-        }
-        function _selectSC(selection) {
-            range.create(selection.sc, selection.so, selection.sc, selection.sc.length).select();
+        // Browsers select different content from one to another after a
+        // triple click (especially: if triple-clicking on a paragraph on
+        // Chrome, blank characters of the element following the paragraph are
+        // selected too)
+        //
+        // The triple click behavior is reimplemented for all browsers here
+        if (ev.originalEvent.detail === 3) {
+            // Select the whole content inside the deepest DOM element that was
+            // triple-clicked
+            range.create(ev.target, 0, ev.target, ev.target.childNodes.length).select();
         }
     },
 
-- 
cgit v1.2.3


From fb81c331f869a06ffa9332a294492d4307ea65b3 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 25 Jan 2018 12:38:32 +0100
Subject: [FIX] web_editor: fix double Shift + Enter

Pressing Shift + Enter twice was buggy because of small refactoring
made by https://github.com/odoo/odoo/commit/c227b8fd88e0ed635a8e807501b559b46fee7786#diff-cc5180b5ec2395c1df5c4e475aff43fbL416

opw-806003
---
 addons/web_editor/static/src/js/rte.summernote.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 5f28c9510bb..b8f3198dae2 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -422,6 +422,9 @@ dom.isImg = function (node) {
 };
 var fn_is_forbidden_node = dom.isForbiddenNode || function () {};
 dom.isForbiddenNode = function (node) {
+    if (node.tagName === "BR") {
+        return false;
+    }
     return fn_is_forbidden_node(node) || $(node).is(".media_iframe_video");
 };
 var fn_is_img_font = dom.isImgFont || function () {};
-- 
cgit v1.2.3


From 25849e918651eba080dac3af4e4fcdc8f1280241 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 25 Jan 2018 14:25:35 +0100
Subject: [FIX] web_editor: properly allow formatting text (normal/header
 1/...)

Sometimes the formatting buttons had no effect or formatted more than
they should (like a whole column when triple clicking on a paragraph
only). This was because of the `listBetween` function implementation.
This is supposed to return all the nodes between one element and another
one... but the logic is wrong without saying from which *point* to start
and which *point* to end. For example, when asking the list between an
element and its parent, the result is very wrong as there is no way to
go from the beginning of an element to the beginning of its parent using
the `walkPoint` function as the `listBetween` function is doing.

Ideally, the function should be entirely fixed but this can be tricky.
For now, the function is just extended to allow to specify points
instead of nodes, and those are used by the `formatBlock` function to
solve the current problem.
---
 addons/web_editor/static/src/js/summernote.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js
index 1f2176f3751..cdf4329c0b9 100644
--- a/addons/web_editor/static/src/js/summernote.js
+++ b/addons/web_editor/static/src/js/summernote.js
@@ -703,10 +703,16 @@ dom.isRemovableEmptyNode = function (node) {
 dom.isForbiddenNode = function (node) {
     return node.tagName === "BR" || $(node).is(".fa, img");
 };
-dom.listBetween = function (sc, ec) {
+/**
+ * @todo 'so' and 'eo' were added as a bugfix and are not given everytime. They
+ * however should be as the function may be wrong without them (for example,
+ * when asking the list between an element and its parent, as there is no path
+ * from the beginning of the former to the beginning of the later).
+ */
+dom.listBetween = function (sc, ec, so, eo) {
     var nodes = [];
     var ancestor = dom.commonAncestor(sc, ec);
-    dom.walkPoint({'node': sc, 'offset': 0}, {'node': ec, 'offset': 0}, function (point) {
+    dom.walkPoint({'node': sc, 'offset': so || 0}, {'node': ec, 'offset': eo || 0}, function (point) {
         if (ancestor !== point.node || ancestor === sc || ancestor === ec) {
             nodes.push(point.node);
         }
@@ -1923,7 +1929,7 @@ $.summernote.pluginEvents.formatBlock = function (event, editor, layoutInfo, sTa
     }
 
     // fix by odoo because if you select a style in a li with no p tag all the ul is wrapped by the style tag
-    var nodes = dom.listBetween(r.sc, r.ec);
+    var nodes = dom.listBetween(r.sc, r.ec, r.so, r.eo);
     for (var i=0; i<nodes.length; i++) {
         if (dom.isBR(nodes[i]) || (dom.isText(nodes[i]) && dom.isVisibleText(nodes[i])) || dom.isB(nodes[i]) || dom.isU(nodes[i]) || dom.isS(nodes[i]) || dom.isI(nodes[i]) || dom.isFont(nodes[i])) {
             var ancestor = dom.ancestor(nodes[i], isFormatNode);
-- 
cgit v1.2.3


From b27abee396a107e40b7f61a0df1e03c3cd23119a Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 23 Jan 2018 17:02:33 +0100
Subject: [FIX] web_editor: ready when translations ready

$('web_editor.base').ready() returns a deferred that:

- wait at least for $(document).ready()
- wait at least for require('web.ajax').loadXML()
- at most once starts translations configuration

But there is an issue since there is unexpectedly no reference to the
translations, whilst it should have also been ready when ready was
resolved.

This commit keep the reference so translations can be used after
$('web_editor.base').ready() is resolved as it was before 7dfdfa0103.

note: in 11.0 it should be solved with 29729769 (so fix is for [10,11[)

opw-804148
closes #22522
---
 addons/web_editor/static/src/js/base.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/base.js b/addons/web_editor/static/src/js/base.js
index 7bf9c2aa641..3135f7def66 100644
--- a/addons/web_editor/static/src/js/base.js
+++ b/addons/web_editor/static/src/js/base.js
@@ -32,14 +32,13 @@ data.dom_ready = dom_ready;
 var all_ready;
 data.ready = function () {
     if (!all_ready) {
-        all_ready = $.when(dom_ready, ajax.loadXML());
+        all_ready = dom_ready;
         if (!odoo._modules) {
-            all_ready.then(translations);
+            all_ready = all_ready.then(translations);
         }
-    } else { // can add async template
-        all_ready = $.when(dom_ready, ajax.loadXML());
     }
-    return all_ready;
+    // also load new templates since previous ready call
+    return $.when(all_ready, ajax.loadXML());
 };
 
 function translations() {
-- 
cgit v1.2.3


From 7c959e3fd55d8faab1c0a9ea0e32fc0fdb975165 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 26 Jan 2018 14:29:27 +0100
Subject: [FIX] web_editor: properly show link alignment in toolbar

When clicking on a link in the editor, the "center" alignment button
was always marked as active whatever the real alignment of the link.
This was because it considered the alignment of the text inside the
link instead of the link's one inside its parent.
---
 addons/web_editor/static/src/js/summernote.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js
index cdf4329c0b9..da837d67354 100644
--- a/addons/web_editor/static/src/js/summernote.js
+++ b/addons/web_editor/static/src/js/summernote.js
@@ -2015,6 +2015,14 @@ eventHandler.modules.editor.currentStyle = function(target) {
         if(r)
             styleInfo.image = r.isOnImg();
     }
+    // Fix when the target is a link: the text-align buttons state should
+    // indicate the alignment of the link in the parent, not the text inside
+    // the link (which is not possible to customize with summernote). Summernote fixed
+    // this in their newest version... by just not showing the active button
+    // for alignments.
+    if (styleInfo.anchor) {
+        styleInfo['text-align'] = $(styleInfo.anchor).parent().css('text-align');
+    }
     return styleInfo;
 }
 
-- 
cgit v1.2.3


From 53c9858656ddda861b9f90a06f2c08961d6e0f09 Mon Sep 17 00:00:00 2001
From: Odoo Translation Bot <c3p@odoo.com>
Date: Sun, 28 Jan 2018 04:29:24 +0100
Subject: [I18N] Update translation terms from Transifex

---
 addons/web_editor/i18n/it.po    |   9 ++--
 addons/web_editor/i18n/ko.po    |  21 ++++----
 addons/web_editor/i18n/lt.po    |  19 +++----
 addons/web_editor/i18n/mn.po    |   2 +-
 addons/web_editor/i18n/sl.po    |  29 ++++++-----
 addons/web_editor/i18n/zh_CN.po | 113 ++++++++++++++++++++--------------------
 6 files changed, 100 insertions(+), 93 deletions(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/i18n/it.po b/addons/web_editor/i18n/it.po
index e36584f38e0..5e20c0506ee 100644
--- a/addons/web_editor/i18n/it.po
+++ b/addons/web_editor/i18n/it.po
@@ -3,15 +3,16 @@
 # * web_editor
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Paolo Valier <paolo.valier@hotmail.it>, 2017
+# Martin Trigaux, 2017
+# Paolo Valier, 2017
+# Cesare Cugnasco <cesare.cugnasco@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Paolo Valier <paolo.valier@hotmail.it>, 2017\n"
+"Last-Translator: Cesare Cugnasco <cesare.cugnasco@gmail.com>, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -96,7 +97,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:114
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Aggiungi"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/ko.po b/addons/web_editor/i18n/ko.po
index d54ff0a14f2..165e826bcc0 100644
--- a/addons/web_editor/i18n/ko.po
+++ b/addons/web_editor/i18n/ko.po
@@ -3,16 +3,17 @@
 # * web_editor
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Link-Up <linkup.way@gmail.com>, 2018
+# Martin Trigaux, 2017
+# Up Link <linkup.way@gmail.com>, 2018
 # link up <link-up@naver.com>, 2018
+# Seongseok Shin <shinss61@hotmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: link up <link-up@naver.com>, 2018\n"
+"Last-Translator: Seongseok Shin <shinss61@hotmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/odoo/teams/41243/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -378,7 +379,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/editor/summernote.js:1899
 #, python-format
 msgid "Default"
-msgstr ""
+msgstr "기본"
 
 #. module: web_editor
 #. openerp-web
@@ -469,7 +470,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:912
 #, python-format
 msgid "Edit"
-msgstr ""
+msgstr "편집"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -593,7 +594,7 @@ msgstr "더 밝은 회색"
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
 msgid "HTTP routing"
-msgstr ""
+msgstr "HTTP 라우팅"
 
 #. module: web_editor
 #. openerp-web
@@ -877,7 +878,7 @@ msgstr "글줄 높이"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:909
 #, python-format
 msgid "Link"
-msgstr ""
+msgstr "링크"
 
 #. module: web_editor
 #. openerp-web
@@ -1488,7 +1489,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:107
 #, python-format
 msgid "Uploading..."
-msgstr ""
+msgstr "업로드 중…"
 
 #. module: web_editor
 #. openerp-web
@@ -1613,7 +1614,7 @@ msgstr "https://www.odoo.com/logo.png"
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb
@@ -1703,7 +1704,7 @@ msgstr "ir.translation"
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_ui_view
 msgid "ir.ui.view"
-msgstr ""
+msgstr "ir.ui.view"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/lt.po b/addons/web_editor/i18n/lt.po
index 8e66f318af8..cd414483be1 100644
--- a/addons/web_editor/i18n/lt.po
+++ b/addons/web_editor/i18n/lt.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # digitouch UAB <digitouchagencyeur@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # UAB "Draugiški sprendimai" <transifex@draugiskisprendimai.lt>, 2017
 # Arminas Grigonis <arminas@versada.lt>, 2017
 # Audrius Palenskis <audrius.palenskis@gmail.com>, 2017
@@ -12,14 +12,15 @@
 # Monika Raciunaite <monika.raciunaite@gmail.com>, 2017
 # Rytis Štreimikis <r.streimikis@hotmail.lt>, 2017
 # Rolandas <info@paninfo.lt>, 2017
-# Anatolij <an@cq.lt>, 2017
+# Anatolij, 2017
+# Viktoras Norkus <viktoras@bmx.lt>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Anatolij <an@cq.lt>, 2017\n"
+"Last-Translator: Viktoras Norkus <viktoras@bmx.lt>, 2018\n"
 "Language-Team: Lithuanian (https://www.transifex.com/odoo/teams/41243/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,32 +45,32 @@ msgstr "(YouTube, Vimeo, Vine, Instagram, DailyMotion arba Youku)"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "25% Black"
-msgstr ""
+msgstr "25% Juoda"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "25% White"
-msgstr ""
+msgstr "25% Balta"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "50% Black"
-msgstr ""
+msgstr "50% Juoda"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "50% White"
-msgstr ""
+msgstr "50% Balta"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "75% Black"
-msgstr ""
+msgstr "75% Juoda"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "75% White"
-msgstr ""
+msgstr "75% Balta"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.snippets
diff --git a/addons/web_editor/i18n/mn.po b/addons/web_editor/i18n/mn.po
index fc0de95dd51..0189f2c4889 100644
--- a/addons/web_editor/i18n/mn.po
+++ b/addons/web_editor/i18n/mn.po
@@ -824,7 +824,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:971
 #, python-format
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Гарын товчлол"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/sl.po b/addons/web_editor/i18n/sl.po
index faee3a33b5c..6327303b901 100644
--- a/addons/web_editor/i18n/sl.po
+++ b/addons/web_editor/i18n/sl.po
@@ -2,12 +2,15 @@
 # This file contains the translation of the following modules:
 # * web_editor
 # 
+# Translators:
+# matjaz k <matjaz@mentis.si>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
+"Last-Translator: matjaz k <matjaz@mentis.si>, 2018\n"
 "Language-Team: Slovenian (https://www.transifex.com/odoo/teams/41243/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,7 +95,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:114
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. module: web_editor
 #. openerp-web
@@ -335,12 +338,12 @@ msgstr ""
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Ustvaril"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_create_date
 msgid "Created on"
-msgstr ""
+msgstr "Ustvarjeno"
 
 #. module: web_editor
 #. openerp-web
@@ -392,7 +395,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:165
 #, python-format
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: web_editor
 #. openerp-web
@@ -691,7 +694,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: web_editor
 #. openerp-web
@@ -716,7 +719,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:50
 #, python-format
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: web_editor
 #. openerp-web
@@ -841,17 +844,17 @@ 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 "Zadnjič spremenjeno"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Zadnjič posodobil"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Zadnjič posodobljeno"
 
 #. module: web_editor
 #. openerp-web
@@ -913,7 +916,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_name
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: web_editor
 #. openerp-web
@@ -1177,7 +1180,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:13
 #, python-format
 msgid "Save"
-msgstr ""
+msgstr "Shrani"
 
 #. module: web_editor
 #. openerp-web
@@ -1538,12 +1541,12 @@ msgstr ""
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Warning"
-msgstr ""
+msgstr "Opozorilo"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "White"
-msgstr ""
+msgstr "Bela"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/zh_CN.po b/addons/web_editor/i18n/zh_CN.po
index f4781f51553..8fb4fe27191 100644
--- a/addons/web_editor/i18n/zh_CN.po
+++ b/addons/web_editor/i18n/zh_CN.po
@@ -5,14 +5,15 @@
 # Translators:
 # Talway <9010446@qq.com>, 2017
 # Gary Wei <Gary.wei@elico-corp.com>, 2017
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
 # Xia Fajin <xia.fajin@elico-corp.com>, 2017
-# liAnGjiA <liangjia@qq.com>, 2017
+# 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2017
 # Xu Lei <xulei8@qq.com>, 2017
-# fausthuang <faust_huang@hotmail.com>, 2017
+# fausthuang, 2017
 # waveyeung <waveyeung@qq.com>, 2017
 # SHOM <shanmuxin@yeah.net>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# liAnGjiA <liangjia@qq.com>, 2017
 # mrshelly <mrshelly@hotmail.com>, 2017
 # THL <wt39181819@gmail.com>, 2017
 # 苏州远鼎 <tiexinliu@126.com>, 2017
@@ -47,12 +48,12 @@ msgstr "(YouTube, Vimeo, Vine, Instagram, DailyMotion 或 优酷)"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "25% Black"
-msgstr "黑色 25%"
+msgstr " 25% 黑色"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "25% White"
-msgstr ""
+msgstr "25% 白"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -86,14 +87,14 @@ msgstr "<i class=\"fa fa-th-large\"/> 首个面板"
 msgid ""
 "A server error occured. Please check you correctly signed in and that the "
 "file you are saving is well-formed."
-msgstr ""
+msgstr "服务器发生错误。 请检查您是否正确登录，并且保存的文件格式正确。"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Accepts"
-msgstr ""
+msgstr " 接受"
 
 #. module: web_editor
 #. openerp-web
@@ -145,7 +146,7 @@ msgstr "居右"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Alpha"
-msgstr ""
+msgstr "Alpha"
 
 #. module: web_editor
 #. openerp-web
@@ -159,7 +160,7 @@ msgstr "替代上传"
 #: code:addons/web_editor/static/src/xml/editor.xml:315
 #, python-format
 msgid "Assign a focal point that will always be visible"
-msgstr ""
+msgstr "指定一个总是可见的焦点"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_ir_attachment_local_url
@@ -233,7 +234,7 @@ msgstr "背景宽度"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Beta"
-msgstr ""
+msgstr "Beta"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -259,7 +260,7 @@ msgstr "加粗"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:827
 #, python-format
 msgid "Careful !"
-msgstr ""
+msgstr "小心！"
 
 #. module: web_editor
 #. openerp-web
@@ -338,7 +339,7 @@ msgstr "待翻译的内容"
 #: code:addons/web_editor/static/src/xml/editor.xml:194
 #, python-format
 msgid "Copy-paste your URL or embed code here"
-msgstr ""
+msgstr "复制粘贴您的URL或在这里嵌入代码"
 
 #. module: web_editor
 #. openerp-web
@@ -376,7 +377,7 @@ msgstr "定制"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Dailymotion"
-msgstr ""
+msgstr "Dailymotion"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -395,7 +396,7 @@ msgstr "默认"
 #: code:addons/web_editor/static/src/xml/editor.xml:387
 #, python-format
 msgid "Define if/how the background image will be repeated"
-msgstr ""
+msgstr "定义背景图像是否重复"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -414,7 +415,7 @@ msgstr "说明"
 #: code:addons/web_editor/static/src/xml/editor.xml:34
 #, python-format
 msgid "Description (alt tag)"
-msgstr ""
+msgstr "描述(ALT标签)"
 
 #. module: web_editor
 #. openerp-web
@@ -484,14 +485,14 @@ msgstr "编辑"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Epsilon"
-msgstr ""
+msgstr "Epsilon"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/ace.js:93
 #, python-format
 msgid "Expected "
-msgstr ""
+msgstr "预期"
 
 #. module: web_editor
 #. openerp-web
@@ -573,7 +574,7 @@ msgstr "全屏"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -588,7 +589,7 @@ msgstr "深灰"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray Darker"
-msgstr ""
+msgstr "暗灰色"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -598,7 +599,7 @@ msgstr "浅灰"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray Lighter"
-msgstr ""
+msgstr "亮灰色"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
@@ -666,35 +667,35 @@ msgstr "这是用来帮助你提高翻译效率的可视化工具："
 #: code:addons/web_editor/static/src/xml/editor.xml:219
 #, python-format
 msgid "Hide Dailymotion logo"
-msgstr ""
+msgstr "隐藏Dailymotion标志"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:216
 #, python-format
 msgid "Hide Youtube logo"
-msgstr ""
+msgstr "隐藏Youtube标志"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:213
 #, python-format
 msgid "Hide fullscreen button"
-msgstr ""
+msgstr "隐藏全屏按钮"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:210
 #, python-format
 msgid "Hide player controls"
-msgstr ""
+msgstr "隐藏播放器控件"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:222
 #, python-format
 msgid "Hide sharing button"
-msgstr ""
+msgstr "隐藏分享按钮"
 
 #. module: web_editor
 #. openerp-web
@@ -715,7 +716,7 @@ msgstr "ID"
 msgid ""
 "If you discard the current edition, all unsaved changes will be lost. You "
 "can cancel to return to the edition mode."
-msgstr ""
+msgstr "如果放弃当前版本，则所有未保存的更改都将丢失。 您可以取消返回到编辑模式。"
 
 #. module: web_editor
 #. openerp-web
@@ -724,7 +725,7 @@ msgstr ""
 msgid ""
 "If you reset this file, all your customizations will be lost as it will be "
 "reverted to the default file."
-msgstr ""
+msgstr "如果您重置此文件，所有您的自定义将丢失，因为它将被还原为默认文件。"
 
 #. module: web_editor
 #. openerp-web
@@ -747,21 +748,21 @@ msgstr "图像网址"
 msgid ""
 "In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n"
 "        Each modification on the master page is automatically applied to all translated versions."
-msgstr ""
+msgstr "在这种模式下，您只能翻译文本。若要更改页的结构，必须编辑母版页。 母版页上的每一项修改都会自动应用于所有已翻译的版本。"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:23
 #, python-format
 msgid "Include All LESS Files"
-msgstr ""
+msgstr "包括所有LESS文件"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:17
 #, python-format
 msgid "Include Asset Bundles"
-msgstr "包括资产捆绑"
+msgstr "包含资产包"
 
 #. module: web_editor
 #. openerp-web
@@ -808,7 +809,7 @@ msgstr "插入视频"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Instagram"
-msgstr ""
+msgstr "Instagram"
 
 #. module: web_editor
 #. openerp-web
@@ -843,7 +844,7 @@ msgstr "键盘快捷键"
 #: code:addons/web_editor/static/src/xml/ace.xml:11
 #, python-format
 msgid "LESS (CSS)"
-msgstr ""
+msgstr "LESS (CSS)"
 
 #. module: web_editor
 #. openerp-web
@@ -873,7 +874,7 @@ msgstr "最后更新时间"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:360
 #, python-format
 msgid "Less file: %s"
-msgstr ""
+msgstr "Less 文件: %s"
 
 #. module: web_editor
 #. openerp-web
@@ -908,7 +909,7 @@ msgstr "链接到"
 #: code:addons/web_editor/static/src/xml/editor.xml:207
 #, python-format
 msgid "Loop"
-msgstr ""
+msgstr "循环"
 
 #. module: web_editor
 #. openerp-web
@@ -972,7 +973,7 @@ msgstr "确定"
 #: code:addons/web_editor/static/src/js/editor/translator.js:93
 #, python-format
 msgid "Ok, never show me this again"
-msgstr ""
+msgstr "好了, 别再给我看这个"
 
 #. module: web_editor
 #. openerp-web
@@ -1044,7 +1045,7 @@ msgstr "预览"
 #: code:addons/web_editor/static/src/xml/editor.xml:57
 #, python-format
 msgid "Previous"
-msgstr ""
+msgstr "以前"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1155,7 +1156,7 @@ msgstr "设置为默认"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:485
 #, python-format
 msgid "Reseting views is not supported yet"
-msgstr ""
+msgstr "不支持重置视图"
 
 #. module: web_editor
 #. openerp-web
@@ -1213,7 +1214,7 @@ msgstr "搜索联系人"
 #: code:addons/web_editor/static/src/xml/snippets.xml:17
 #, python-format
 msgid "Select Parent Container"
-msgstr ""
+msgstr "选择父容器"
 
 #. module: web_editor
 #. openerp-web
@@ -1241,14 +1242,14 @@ msgstr "从文件中选择"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:567
 #, python-format
 msgid "Server error"
-msgstr ""
+msgstr "服务器错误"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:365
 #, python-format
 msgid "Set the starting position of the background image."
-msgstr ""
+msgstr "设置背景图像的起始位置。"
 
 #. module: web_editor
 #. openerp-web
@@ -1264,7 +1265,7 @@ msgstr "设置透明"
 msgid ""
 "Sets the width and height of the background image in percent of the parent "
 "element."
-msgstr ""
+msgstr "设置背景图像的宽度和高度，以父元素的百分比表示。"
 
 #. module: web_editor
 #. openerp-web
@@ -1372,21 +1373,21 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:871
 #, python-format
 msgid "The provided url does not reference any supported video"
-msgstr ""
+msgstr "提供的网址不存在任何支持的视频"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:865
 #, python-format
 msgid "The provided url is not valid"
-msgstr ""
+msgstr "提供的网址无效"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:53
 #, python-format
 msgid "Theme colors"
-msgstr ""
+msgstr "主题颜色"
 
 #. module: web_editor
 #. openerp-web
@@ -1429,7 +1430,7 @@ msgstr "已翻译的内容"
 #: code:addons/web_editor/static/src/js/editor/translator.js:91
 #, python-format
 msgid "Translation Info"
-msgstr ""
+msgstr "翻译信息"
 
 #. module: web_editor
 #. openerp-web
@@ -1444,7 +1445,7 @@ msgstr "透明"
 #: code:addons/web_editor/static/src/xml/editor.xml:248
 #, python-format
 msgid "URL or Email"
-msgstr ""
+msgstr "网址或电子邮件"
 
 #. module: web_editor
 #. openerp-web
@@ -1465,7 +1466,7 @@ msgstr "取消"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:86
 #, python-format
 msgid "Unexpected "
-msgstr ""
+msgstr "意外"
 
 #. module: web_editor
 #. openerp-web
@@ -1536,21 +1537,21 @@ msgstr "视频网址?"
 #: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
 msgid "Video code"
-msgstr ""
+msgstr "视频代码"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vimeo"
-msgstr ""
+msgstr "Vimeo"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vine.co"
-msgstr ""
+msgstr "Vine.co"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1568,7 +1569,7 @@ msgstr "白"
 #: code:addons/web_editor/static/src/xml/ace.xml:10
 #, python-format
 msgid "XML (HTML)"
-msgstr ""
+msgstr "XML (HTML)"
 
 #. module: web_editor
 #. openerp-web
@@ -1589,14 +1590,14 @@ msgstr "你将进入翻译模式。"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youku"
-msgstr ""
+msgstr "Youku"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youtube"
-msgstr ""
+msgstr "Youtube"
 
 #. module: web_editor
 #. openerp-web
@@ -1620,7 +1621,7 @@ msgstr "自动"
 #: code:addons/web_editor/static/src/xml/editor.xml:113
 #, python-format
 msgid "https://www.odoo.com/logo.png"
-msgstr ""
+msgstr "https://www.odoo.com/logo.png"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_attachment
@@ -1722,7 +1723,7 @@ msgstr "ir.ui.view"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "videos"
-msgstr ""
+msgstr "视频"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test
-- 
cgit v1.2.3


From d06bf070cbdf89bbf8d0c8c8aceef5f2bbf66238 Mon Sep 17 00:00:00 2001
From: Odoo Translation Bot <c3p@odoo.com>
Date: Sun, 28 Jan 2018 07:04:23 +0100
Subject: [I18N] Update translation terms from Transifex

---
 addons/web_editor/i18n/zh_CN.po | 109 ++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 54 deletions(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/i18n/zh_CN.po b/addons/web_editor/i18n/zh_CN.po
index fd2945a38c5..900425d9274 100644
--- a/addons/web_editor/i18n/zh_CN.po
+++ b/addons/web_editor/i18n/zh_CN.po
@@ -3,25 +3,26 @@
 # * web_editor
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# fausthuang, 2016
 # Xia Fajin <xia.fajin@elico-corp.com>, 2016
 # Xu Lei <xulei8@qq.com>, 2016
 # Talway <9010446@qq.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # liAnGjiA <liangjia@qq.com>, 2016
 # SHOM <shanmuxin@yeah.net>, 2016
 # mrshelly <mrshelly@hotmail.com>, 2016
 # Gary Wei <Gary.wei@elico-corp.com>, 2016
 # THL <wt39181819@gmail.com>, 2016
 # waveyeung <waveyeung@qq.com>, 2016
+# 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: waveyeung <waveyeung@qq.com>, 2016\n"
+"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +52,7 @@ msgstr "25% 黑"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "25% White"
-msgstr ""
+msgstr "25% 白"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -85,14 +86,14 @@ msgstr "<i class=\"fa fa-th-large\"/> 首个面板"
 msgid ""
 "A server error occured. Please check you correctly signed in and that the "
 "file you are saving is well-formed."
-msgstr ""
+msgstr "服务器发生错误。 请检查您是否正确登录，并且保存的文件格式正确。"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Accepts"
-msgstr ""
+msgstr " 接受"
 
 #. module: web_editor
 #. openerp-web
@@ -144,7 +145,7 @@ msgstr "居右"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Alpha"
-msgstr ""
+msgstr "Alpha"
 
 #. module: web_editor
 #. openerp-web
@@ -158,7 +159,7 @@ msgstr "替代上传"
 #: code:addons/web_editor/static/src/xml/editor.xml:315
 #, python-format
 msgid "Assign a focal point that will always be visible"
-msgstr ""
+msgstr "指定一个总是可见的焦点"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_ir_attachment_local_url
@@ -232,7 +233,7 @@ msgstr "背景宽度"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Beta"
-msgstr ""
+msgstr "Beta"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -258,7 +259,7 @@ msgstr "加粗"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:827
 #, python-format
 msgid "Careful !"
-msgstr ""
+msgstr "小心！"
 
 #. module: web_editor
 #. openerp-web
@@ -337,7 +338,7 @@ msgstr "待翻译的内容"
 #: code:addons/web_editor/static/src/xml/editor.xml:194
 #, python-format
 msgid "Copy-paste your URL or embed code here"
-msgstr ""
+msgstr "复制粘贴您的URL或在这里嵌入代码"
 
 #. module: web_editor
 #. openerp-web
@@ -375,7 +376,7 @@ msgstr "定制"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Dailymotion"
-msgstr ""
+msgstr "Dailymotion"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -394,7 +395,7 @@ msgstr "默认"
 #: code:addons/web_editor/static/src/xml/editor.xml:387
 #, python-format
 msgid "Define if/how the background image will be repeated"
-msgstr ""
+msgstr "定义背景图像是否重复"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -413,7 +414,7 @@ msgstr "说明"
 #: code:addons/web_editor/static/src/xml/editor.xml:34
 #, python-format
 msgid "Description (alt tag)"
-msgstr ""
+msgstr "描述(ALT标签)"
 
 #. module: web_editor
 #. openerp-web
@@ -483,14 +484,14 @@ msgstr "编辑"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Epsilon"
-msgstr ""
+msgstr "Epsilon"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/ace.js:93
 #, python-format
 msgid "Expected "
-msgstr ""
+msgstr "预期"
 
 #. module: web_editor
 #. openerp-web
@@ -572,7 +573,7 @@ msgstr "全屏"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -587,7 +588,7 @@ msgstr "深灰"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray Darker"
-msgstr ""
+msgstr "暗灰色"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -597,7 +598,7 @@ msgstr "浅灰"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray Lighter"
-msgstr ""
+msgstr "亮灰色"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
@@ -665,35 +666,35 @@ msgstr "这是用来帮助你提高翻译效率的可视化工具："
 #: code:addons/web_editor/static/src/xml/editor.xml:219
 #, python-format
 msgid "Hide Dailymotion logo"
-msgstr ""
+msgstr "隐藏Dailymotion标志"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:216
 #, python-format
 msgid "Hide Youtube logo"
-msgstr ""
+msgstr "隐藏Youtube标志"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:213
 #, python-format
 msgid "Hide fullscreen button"
-msgstr ""
+msgstr "隐藏全屏按钮"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:210
 #, python-format
 msgid "Hide player controls"
-msgstr ""
+msgstr "隐藏播放器控件"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:222
 #, python-format
 msgid "Hide sharing button"
-msgstr ""
+msgstr "隐藏分享按钮"
 
 #. module: web_editor
 #. openerp-web
@@ -714,7 +715,7 @@ msgstr "ID"
 msgid ""
 "If you discard the current edition, all unsaved changes will be lost. You "
 "can cancel to return to the edition mode."
-msgstr ""
+msgstr "如果放弃当前版本，则所有未保存的更改都将丢失。 您可以取消返回到编辑模式。"
 
 #. module: web_editor
 #. openerp-web
@@ -723,7 +724,7 @@ msgstr ""
 msgid ""
 "If you reset this file, all your customizations will be lost as it will be "
 "reverted to the default file."
-msgstr ""
+msgstr "如果您重置此文件，所有您的自定义将丢失，因为它将被还原为默认文件。"
 
 #. module: web_editor
 #. openerp-web
@@ -746,14 +747,14 @@ msgstr "图像网址"
 msgid ""
 "In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n"
 "        Each modification on the master page is automatically applied to all translated versions."
-msgstr ""
+msgstr "在这种模式下，您只能翻译文本。若要更改页的结构，必须编辑母版页。 母版页上的每一项修改都会自动应用于所有已翻译的版本。"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:23
 #, python-format
 msgid "Include All LESS Files"
-msgstr ""
+msgstr "包括所有LESS文件"
 
 #. module: web_editor
 #. openerp-web
@@ -807,7 +808,7 @@ msgstr "插入视频"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Instagram"
-msgstr ""
+msgstr "Instagram"
 
 #. module: web_editor
 #. openerp-web
@@ -842,7 +843,7 @@ msgstr "键盘快捷键"
 #: code:addons/web_editor/static/src/xml/ace.xml:11
 #, python-format
 msgid "LESS (CSS)"
-msgstr ""
+msgstr "LESS (CSS)"
 
 #. module: web_editor
 #. openerp-web
@@ -872,7 +873,7 @@ msgstr "最后更新时间"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:360
 #, python-format
 msgid "Less file: %s"
-msgstr ""
+msgstr "Less 文件: %s"
 
 #. module: web_editor
 #. openerp-web
@@ -907,7 +908,7 @@ msgstr "链接到"
 #: code:addons/web_editor/static/src/xml/editor.xml:207
 #, python-format
 msgid "Loop"
-msgstr ""
+msgstr "循环"
 
 #. module: web_editor
 #. openerp-web
@@ -971,7 +972,7 @@ msgstr "确定"
 #: code:addons/web_editor/static/src/js/editor/translator.js:93
 #, python-format
 msgid "Ok, never show me this again"
-msgstr ""
+msgstr "好了, 别再给我看这个"
 
 #. module: web_editor
 #. openerp-web
@@ -1043,7 +1044,7 @@ msgstr "预览"
 #: code:addons/web_editor/static/src/xml/editor.xml:57
 #, python-format
 msgid "Previous"
-msgstr ""
+msgstr "以前"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1154,7 +1155,7 @@ msgstr "设置为默认"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:485
 #, python-format
 msgid "Reseting views is not supported yet"
-msgstr ""
+msgstr "不支持重置视图"
 
 #. module: web_editor
 #. openerp-web
@@ -1212,7 +1213,7 @@ msgstr "搜索联系人"
 #: code:addons/web_editor/static/src/xml/snippets.xml:17
 #, python-format
 msgid "Select Parent Container"
-msgstr ""
+msgstr "选择父容器"
 
 #. module: web_editor
 #. openerp-web
@@ -1240,14 +1241,14 @@ msgstr "从文件中选择"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:567
 #, python-format
 msgid "Server error"
-msgstr ""
+msgstr "服务器错误"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:365
 #, python-format
 msgid "Set the starting position of the background image."
-msgstr ""
+msgstr "设置背景图像的起始位置。"
 
 #. module: web_editor
 #. openerp-web
@@ -1263,7 +1264,7 @@ msgstr "设置透明"
 msgid ""
 "Sets the width and height of the background image in percent of the parent "
 "element."
-msgstr ""
+msgstr "设置背景图像的宽度和高度，以父元素的百分比表示。"
 
 #. module: web_editor
 #. openerp-web
@@ -1371,21 +1372,21 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:871
 #, python-format
 msgid "The provided url does not reference any supported video"
-msgstr ""
+msgstr "提供的网址不存在任何支持的视频"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:865
 #, python-format
 msgid "The provided url is not valid"
-msgstr ""
+msgstr "提供的网址无效"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:53
 #, python-format
 msgid "Theme colors"
-msgstr ""
+msgstr "主题颜色"
 
 #. module: web_editor
 #. openerp-web
@@ -1428,7 +1429,7 @@ msgstr "已翻译的内容"
 #: code:addons/web_editor/static/src/js/editor/translator.js:91
 #, python-format
 msgid "Translation Info"
-msgstr ""
+msgstr "翻译信息"
 
 #. module: web_editor
 #. openerp-web
@@ -1443,7 +1444,7 @@ msgstr "透明"
 #: code:addons/web_editor/static/src/xml/editor.xml:248
 #, python-format
 msgid "URL or Email"
-msgstr ""
+msgstr "网址或电子邮件"
 
 #. module: web_editor
 #. openerp-web
@@ -1464,7 +1465,7 @@ msgstr "取消"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:86
 #, python-format
 msgid "Unexpected "
-msgstr ""
+msgstr "意外"
 
 #. module: web_editor
 #. openerp-web
@@ -1535,21 +1536,21 @@ msgstr "视频网址?"
 #: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
 msgid "Video code"
-msgstr ""
+msgstr "视频代码"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vimeo"
-msgstr ""
+msgstr "Vimeo"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vine.co"
-msgstr ""
+msgstr "Vine.co"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1567,7 +1568,7 @@ msgstr "白"
 #: code:addons/web_editor/static/src/xml/ace.xml:10
 #, python-format
 msgid "XML (HTML)"
-msgstr ""
+msgstr "XML (HTML)"
 
 #. module: web_editor
 #. openerp-web
@@ -1588,14 +1589,14 @@ msgstr "你将进入翻译模式。"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youku"
-msgstr ""
+msgstr "Youku"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youtube"
-msgstr ""
+msgstr "Youtube"
 
 #. module: web_editor
 #. openerp-web
@@ -1619,7 +1620,7 @@ msgstr "自动"
 #: code:addons/web_editor/static/src/xml/editor.xml:113
 #, python-format
 msgid "https://www.odoo.com/logo.png"
-msgstr ""
+msgstr "https://www.odoo.com/logo.png"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_attachment
@@ -1721,7 +1722,7 @@ msgstr "ir.ui.view"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "videos"
-msgstr ""
+msgstr "视频"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test
-- 
cgit v1.2.3


From 109ecd5205ad684a3ba85e94ce419c326696ec34 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Mon, 29 Jan 2018 15:05:02 +0100
Subject: [FIX] web_editor: firefox RTEWidget if hidden

It seems that firefox has some difference of behavior from other
browsers as said in:

- https://bugzilla.mozilla.org/show_bug.cgi?id=548397
- https://github.com/whatwg/html/issues/1813
- https://github.com/w3c/csswg-drafts/issues/571

It seems that at least in one instance (a html field hidden on the pos
configuration), firefox fails because of something similar:
window.getComputedStyle(element) returns `null` instead of the element
styles.

In my tests, using the parent window (possible if current frame and
parent have the same origin which should be the case) worked in this
instance, this is examplified by this jsfiddle:
 https://jsfiddle.net/Lpv898ve/2/

This work with window.parent and not using window directly.

So this commit adds fallback on doing getComputedStyle from the parent
window (when testing on chromium this gave exactly the same result that
before).

opw-813363
fixes #22211
closes #22610
---
 addons/web_editor/static/src/js/editor/rte.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/editor/rte.js b/addons/web_editor/static/src/js/editor/rte.js
index 014a3faf40e..ee0ec7932c0 100644
--- a/addons/web_editor/static/src/js/editor/rte.js
+++ b/addons/web_editor/static/src/js/editor/rte.js
@@ -281,8 +281,10 @@ var RTEWidget = Widget.extend({
         .each(function () {
             var $node = $(this);
 
+            // fallback for firefox iframe display:none see https://github.com/odoo/odoo/pull/22610
+            var computedStyles = window.getComputedStyle(this) || window.parent.getComputedStyle(this);
             // add class to display inline-block for empty t-field
-            if (window.getComputedStyle(this).display === 'inline' && $node.data('oe-type') !== 'image') {
+            if (computedStyles.display === 'inline' && $node.data('oe-type') !== 'image') {
                 $node.addClass('o_is_inline_editable');
             }
         });
-- 
cgit v1.2.3


From 13c326caaa38eb8c1f9341da854a5045949fcf24 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 30 Jan 2018 15:01:39 +0100
Subject: [FIX] web_editor: firefox editor hidden mass mail

When saving a modified mass mailing, the editor will do a number of
things to improve the mail readability accross mail client.

One of those is replacing font awesome icons by image, but firefox acts
differently than other browser. On a display:none iframe, doing
.css('color') or .height() on an element returns respectively
`undefined` and 0.

This caused an error when getting the color that we could solve by
doing a fallback for firefox like this:

 window.parent.getComputedStyle($font[0]).color

But to get the height() of an element, it seems we always need the
iframe displayed.

With this change, when the iframe is hidden and the browser is firefox,
the code try to display the iframe (with "visibility:hidden;height:1px")
when this part of the code happen.

opw-807180
closes #22639
---
 addons/web_editor/static/src/js/backend.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index f4f8d7144b6..23505c082fa 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -405,7 +405,19 @@ var FieldTextHtml = widget.extend({
                 var layoutInfo = this.editor.rte.editable().data('layoutInfo');
                 $.summernote.pluginEvents.codeview(undefined, undefined, layoutInfo, false);
             }
+            var $ancestors = this.$iframe.filter(':not(:visible)').parentsUntil(':visible').addBack();
+            var ancestorsStyle = [];
+            // temporarily force displaying iframe (needed for firefox)
+            _.each($ancestors, function (el) {
+                var $el = $(el);
+                ancestorsStyle.unshift($el.attr('style') || null);
+                $el.css({display: 'initial', visibility: 'hidden', height: 1});
+            });
             this.editor.buildingBlock.clean_for_save();
+            _.each($ancestors, function (el) {
+                var $el = $(el);
+                $el.attr('style', ancestorsStyle.pop());
+            });
             this.internal_set_value( this.$content.html() );
         }
     },
-- 
cgit v1.2.3


From cbaecc5cbb82ea847a22cb3efbdbbfe9b18849ed Mon Sep 17 00:00:00 2001
From: Odoo Translation Bot <c3p@odoo.com>
Date: Thu, 1 Feb 2018 02:40:21 +0100
Subject: [I18N] Update translation terms from Transifex

---
 addons/web_editor/i18n/eu.po |  10 +--
 addons/web_editor/i18n/fi.po |   4 +-
 addons/web_editor/i18n/ko.po | 182 +++++++++++++++++++++----------------------
 3 files changed, 98 insertions(+), 98 deletions(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/i18n/eu.po b/addons/web_editor/i18n/eu.po
index ffc4b520fde..72634aa992b 100644
--- a/addons/web_editor/i18n/eu.po
+++ b/addons/web_editor/i18n/eu.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: 2017-02-21 17:48+0000\n"
+"PO-Revision-Date: 2018-01-20 14:15+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Basque (http://www.transifex.com/odoo/odoo-9/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -249,7 +249,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/translator.xml:9
 #, python-format
 msgid "Discard"
-msgstr ""
+msgstr "Baztertu"
 
 #. module: web_editor
 #. openerp-web
@@ -386,7 +386,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
 msgid "HTTP routing"
-msgstr ""
+msgstr "HTTP bideratzea"
 
 #. 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 "Azken aldaketa"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_write_uid
@@ -1169,7 +1169,7 @@ msgstr "http://openerp.com/logo.png"
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb
diff --git a/addons/web_editor/i18n/fi.po b/addons/web_editor/i18n/fi.po
index 892927d5937..39954a2e630 100644
--- a/addons/web_editor/i18n/fi.po
+++ b/addons/web_editor/i18n/fi.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: 2017-03-07 08:35+0000\n"
+"PO-Revision-Date: 2018-01-28 19:52+0000\n"
 "Last-Translator: Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "&lt;!DOCTYPE html&gt;"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:727
 #, python-format
 msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
-msgstr ""
+msgstr "(YouTube, Vimeo, Vine, Instagram, DailyMotion tai Youku)"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/ko.po b/addons/web_editor/i18n/ko.po
index 52d1090cc8b..78d20f73d8a 100644
--- a/addons/web_editor/i18n/ko.po
+++ b/addons/web_editor/i18n/ko.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: 2016-01-25 08:56+0000\n"
+"PO-Revision-Date: 2018-01-19 06:48+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Korean (http://www.transifex.com/odoo/odoo-9/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:727
 #, python-format
 msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
-msgstr ""
+msgstr "(유투브, 비메오, 인스타그램, 데일리모션 또는 요쿠)"
 
 #. module: web_editor
 #. openerp-web
@@ -70,21 +70,21 @@ msgstr "이미지 URL 추가"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:761
 #, python-format
 msgid "Align center"
-msgstr ""
+msgstr "중심 정렬"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:760
 #, python-format
 msgid "Align left"
-msgstr ""
+msgstr "왼쪽 정렬"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:762
 #, python-format
 msgid "Align right"
-msgstr ""
+msgstr "오른쪽 정렬"
 
 #. module: web_editor
 #. openerp-web
@@ -124,7 +124,7 @@ msgstr "자동 재생"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:768
 #, python-format
 msgid "Background Color"
-msgstr ""
+msgstr "배경 색상"
 
 #. module: web_editor
 #. openerp-web
@@ -145,7 +145,7 @@ msgstr "블록 스타일"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:688
 #, python-format
 msgid "Bold"
-msgstr ""
+msgstr "굵게"
 
 #. module: web_editor
 #. openerp-web
@@ -159,7 +159,7 @@ msgstr "취소"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:72
 #, python-format
 msgid "Center"
-msgstr ""
+msgstr "중앙"
 
 #. module: web_editor
 #. openerp-web
@@ -193,7 +193,7 @@ msgstr "코드"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:754
 #, python-format
 msgid "Code View"
-msgstr ""
+msgstr "코드 보기"
 
 #. module: web_editor
 #. openerp-web
@@ -275,14 +275,14 @@ msgstr "문서"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:781
 #, python-format
 msgid "Document Style"
-msgstr ""
+msgstr "문서 스타일"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:708
 #, python-format
 msgid "Drag an image here"
-msgstr ""
+msgstr "이미지를 여기로 끌어서 옮기십시오"
 
 #. module: web_editor
 #. openerp-web
@@ -318,14 +318,14 @@ msgstr "비디오 (HTML)를 포함"
 #: code:addons/web_editor/static/src/xml/backend.xml:44
 #, python-format
 msgid "English"
-msgstr ""
+msgstr "영어"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/backend.xml:43
 #, python-format
 msgid "English (edit mode)"
-msgstr ""
+msgstr "영어 (편집 모드)"
 
 #. module: web_editor
 #. openerp-web
@@ -339,35 +339,35 @@ msgstr "매우 작은"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:705
 #, python-format
 msgid "Float Left"
-msgstr ""
+msgstr "왼쪽 떠오르게"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:707
 #, python-format
 msgid "Float None"
-msgstr ""
+msgstr "플로트 없음"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:706
 #, python-format
 msgid "Float Right"
-msgstr ""
+msgstr "오른쪽 떠오르게"
 
 #. module: web_editor
 #. openerp-web
 #: 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
@@ -381,7 +381,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:753
 #, python-format
 msgid "Full Screen"
-msgstr ""
+msgstr "전체 화면"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
@@ -393,42 +393,42 @@ msgstr "HTTP 라우팅"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:740
 #, python-format
 msgid "Header 1"
-msgstr ""
+msgstr "머리글 1"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:741
 #, python-format
 msgid "Header 2"
-msgstr ""
+msgstr "머리글 2"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:742
 #, python-format
 msgid "Header 3"
-msgstr ""
+msgstr "머리글 3"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:743
 #, python-format
 msgid "Header 4"
-msgstr ""
+msgstr "머리글 4"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:744
 #, python-format
 msgid "Header 5"
-msgstr ""
+msgstr "머리글 5"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:745
 #, python-format
 msgid "Header 6"
-msgstr ""
+msgstr "머리글 6"
 
 #. module: web_editor
 #. openerp-web
@@ -461,14 +461,14 @@ msgstr "이미지"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:710
 #, python-format
 msgid "Image URL"
-msgstr ""
+msgstr "이미지 URL"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:759
 #, python-format
 msgid "Indent"
-msgstr ""
+msgstr "들여쓰기"
 
 #. module: web_editor
 #. openerp-web
@@ -494,49 +494,49 @@ msgstr "블록 삽입"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:733
 #, python-format
 msgid "Insert Horizontal Rule"
-msgstr ""
+msgstr "가로 규칙 삽입"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:701
 #, python-format
 msgid "Insert Image"
-msgstr ""
+msgstr "이미지 삽입"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:715
 #, python-format
 msgid "Insert Link"
-msgstr ""
+msgstr "링크 삽입"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:725
 #, python-format
 msgid "Insert Video"
-msgstr ""
+msgstr "비디오 삽입"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:689
 #, python-format
 msgid "Italic"
-msgstr ""
+msgstr "이탤릭"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:763
 #, python-format
 msgid "Justify full"
-msgstr ""
+msgstr "양쪽 맞춤"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:776
 #, python-format
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "단축키"
 
 #. module: web_editor
 #. openerp-web
@@ -571,7 +571,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:695
 #, python-format
 msgid "Line Height"
-msgstr ""
+msgstr "글줄 높이"
 
 #. module: web_editor
 #. openerp-web
@@ -586,7 +586,7 @@ msgstr "링크"
 #: code:addons/web_editor/static/src/xml/editor.xml:284
 #, python-format
 msgid "Link Label"
-msgstr ""
+msgstr "링크 라벨"
 
 #. module: web_editor
 #. openerp-web
@@ -607,7 +607,7 @@ msgstr "중간"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:767
 #, python-format
 msgid "More Color"
-msgstr ""
+msgstr "다른 색상"
 
 #. module: web_editor
 #. openerp-web
@@ -648,35 +648,35 @@ msgstr "새 창으로 열기"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:749
 #, python-format
 msgid "Ordered list"
-msgstr ""
+msgstr "정렬된 목록"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:758
 #, python-format
 msgid "Outdent"
-msgstr ""
+msgstr "내어쓰기"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:87
 #, python-format
 msgid "Padding"
-msgstr ""
+msgstr "안쪽여백"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:757
 #, python-format
 msgid "Paragraph"
-msgstr ""
+msgstr "문장"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:780
 #, python-format
 msgid "Paragraph formatting"
-msgstr ""
+msgstr "단락 서식"
 
 #. module: web_editor
 #. openerp-web
@@ -725,21 +725,21 @@ msgstr "인용"
 #: code:addons/web_editor/static/src/js/rte.js:341
 #, python-format
 msgid "Readonly field"
-msgstr ""
+msgstr "읽기 전용"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:766
 #, python-format
 msgid "Recent Color"
-msgstr ""
+msgstr "최근 색"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:785
 #, python-format
 msgid "Redo"
-msgstr ""
+msgstr "되돌리기"
 
 #. module: web_editor
 #. openerp-web
@@ -760,14 +760,14 @@ msgstr "블록 제거"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:694
 #, python-format
 msgid "Remove Font Style"
-msgstr ""
+msgstr "글꼴 스타일 제거"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:711
 #, python-format
 msgid "Remove Image"
-msgstr ""
+msgstr "이미지 제거"
 
 #. module: web_editor
 #. openerp-web
@@ -781,14 +781,14 @@ msgstr "초기화"
 #: code:addons/web_editor/static/src/xml/backend.xml:18
 #, python-format
 msgid "Reset from source"
-msgstr ""
+msgstr "소스에서 재설정"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:773
 #, python-format
 msgid "Reset to default"
-msgstr ""
+msgstr "기본값으로 재설정"
 
 #. module: web_editor
 #. openerp-web
@@ -802,21 +802,21 @@ msgstr "크기 조정"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:702
 #, python-format
 msgid "Resize Full"
-msgstr ""
+msgstr "전체 크기 조정"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:703
 #, python-format
 msgid "Resize Half"
-msgstr ""
+msgstr "절반 크기 조정"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:704
 #, python-format
 msgid "Resize Quarter"
-msgstr ""
+msgstr "사분의 일 크기 조정"
 
 #. module: web_editor
 #. openerp-web
@@ -840,7 +840,7 @@ msgstr "검색"
 #: code:addons/web_editor/static/src/xml/snippets.xml:64
 #, python-format
 msgid "Search Contact"
-msgstr ""
+msgstr "연락처 검색"
 
 #. module: web_editor
 #. openerp-web
@@ -868,7 +868,7 @@ msgstr "그림 선택"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:709
 #, python-format
 msgid "Select from files"
-msgstr ""
+msgstr "파일에서 선택"
 
 #. module: web_editor
 #. openerp-web
@@ -882,7 +882,7 @@ msgstr "비디오 URL 설정"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:771
 #, python-format
 msgid "Set transparent"
-msgstr ""
+msgstr "투명하게 설정"
 
 #. module: web_editor
 #. openerp-web
@@ -925,7 +925,7 @@ msgstr "회전"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:691
 #, python-format
 msgid "Strikethrough"
-msgstr ""
+msgstr "취소선"
 
 #. module: web_editor
 #. openerp-web
@@ -940,7 +940,7 @@ msgstr "스타일"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:692
 #, python-format
 msgid "Subscript"
-msgstr ""
+msgstr "아래 첨자"
 
 #. module: web_editor
 #. openerp-web
@@ -959,28 +959,28 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:693
 #, python-format
 msgid "Superscript"
-msgstr ""
+msgstr "위 첨자"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:730
 #, python-format
 msgid "Table"
-msgstr ""
+msgstr "표"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:778
 #, python-format
 msgid "Text formatting"
-msgstr ""
+msgstr "텍스트 서식 지정"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:718
 #, python-format
 msgid "Text to display"
-msgstr ""
+msgstr "표시 할 텍스트"
 
 #. module: web_editor
 #. openerp-web
@@ -997,7 +997,7 @@ msgstr "다음 페이지 또는 화면에서 사용되는 이미지는 \n
 #: code:addons/web_editor/static/src/js/translator.js:148
 #, python-format
 msgid "This document is not saved!"
-msgstr ""
+msgstr "이 문서는 저장 되지 않았습니다!"
 
 #. module: web_editor
 #. openerp-web
@@ -1011,14 +1011,14 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:719
 #, python-format
 msgid "To what URL should this link go?"
-msgstr ""
+msgstr "이 링크는 어떤 URL에 연결해야합니까?"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/translator.xml:20
 #, python-format
 msgid "Translate Attribute"
-msgstr ""
+msgstr "특성 변환"
 
 #. module: web_editor
 #. openerp-web
@@ -1039,28 +1039,28 @@ msgstr "URL 또는 이메일 주소"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:690
 #, python-format
 msgid "Underline"
-msgstr ""
+msgstr "밑줄"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:784
 #, python-format
 msgid "Undo"
-msgstr ""
+msgstr "취소"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:716
 #, python-format
 msgid "Unlink"
-msgstr ""
+msgstr "연결해제"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:748
 #, python-format
 msgid "Unordered list"
-msgstr ""
+msgstr "정렬되지 않은 목록"
 
 #. module: web_editor
 #. openerp-web
@@ -1096,14 +1096,14 @@ msgstr "동영상"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:724
 #, python-format
 msgid "Video Link"
-msgstr ""
+msgstr "동영상 링크"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:726
 #, python-format
 msgid "Video URL?"
-msgstr ""
+msgstr "동영상 URL?"
 
 #. module: web_editor
 #. openerp-web
@@ -1122,21 +1122,21 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/editor.js:104
 #, python-format
 msgid "Write Your Text Here"
-msgstr ""
+msgstr "여기에 글을 쓰십시요."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor.js:108
 #, python-format
 msgid "Write Your Text or Drag a Block Here"
-msgstr ""
+msgstr "여기에 글을 쓰거나 또는 블록을 끌어 넣기"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:95
 #, python-format
 msgid "Xl"
-msgstr ""
+msgstr "Xl"
 
 #. module: web_editor
 #. openerp-web
@@ -1174,82 +1174,82 @@ msgstr "ir.attachment"
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb
 msgid "ir.qweb"
-msgstr ""
+msgstr "ir.qweb"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field
 msgid "ir.qweb.field"
-msgstr ""
+msgstr "ir.qweb.field"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_contact
 msgid "ir.qweb.field.contact"
-msgstr ""
+msgstr "ir.qweb.field.contact"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_date
 msgid "ir.qweb.field.date"
-msgstr ""
+msgstr "ir.qweb.field.date"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_datetime
 msgid "ir.qweb.field.datetime"
-msgstr ""
+msgstr "ir.qweb.field.datetime"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_duration
 msgid "ir.qweb.field.duration"
-msgstr ""
+msgstr "ir.qweb.field.duration"
 
 #. 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
 msgid "ir.qweb.field.html"
-msgstr ""
+msgstr "ir.qweb.field.html"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_image
 msgid "ir.qweb.field.image"
-msgstr ""
+msgstr "ir.qweb.field.image"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_integer
 msgid "ir.qweb.field.integer"
-msgstr ""
+msgstr "ir.qweb.field.integer"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_many2one
 msgid "ir.qweb.field.many2one"
-msgstr ""
+msgstr "ir.qweb.field.many2one"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_monetary
 msgid "ir.qweb.field.monetary"
-msgstr ""
+msgstr "ir.qweb.field.monetary"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_qweb
 msgid "ir.qweb.field.qweb"
-msgstr ""
+msgstr "ir.qweb.field.qweb"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_relative
 msgid "ir.qweb.field.relative"
-msgstr ""
+msgstr "ir.qweb.field.relative"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_selection
 msgid "ir.qweb.field.selection"
-msgstr ""
+msgstr "ir.qweb.field.selection"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_qweb_field_text
 msgid "ir.qweb.field.text"
-msgstr ""
+msgstr "ir.qweb.field.text"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_translation
@@ -1287,12 +1287,12 @@ msgstr "저장하지 않은 변경 내용이 소실됩니다."
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test
 msgid "web_editor.converter.test"
-msgstr ""
+msgstr "web_editor.converter.test"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test_sub
 msgid "web_editor.converter.test.sub"
-msgstr ""
+msgstr "web_editor.converter.test.sub"
 
 #. module: web_editor
 #. openerp-web
-- 
cgit v1.2.3


From 5af12238781a147b56572d5b576f64a4e1473083 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 1 Feb 2018 12:34:16 +0100
Subject: [FIX] web_editor: xml editor first level not shown

There is a slight visual inconsistency since: 9af8d5e6 the xml/less
editor for first level of descendants were just prefixed by an invisible
space.

opw-807624
closes #22704
---
 addons/web_editor/static/src/js/widgets/ace.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/src/js/widgets/ace.js b/addons/web_editor/static/src/js/widgets/ace.js
index 80bb28a4c01..6c28c1e2332 100644
--- a/addons/web_editor/static/src/js/widgets/ace.js
+++ b/addons/web_editor/static/src/js/widgets/ace.js
@@ -742,7 +742,7 @@ var ViewEditor = Widget.extend({
 
             var text = data.text || '';
             if (!isSelected) {
-                text = Array($elem.data('level')).join('-') + ' ' + text;
+                text = Array($elem.data('level') + 1).join('-') + ' ' + text;
             }
             var $div = $('<div/>',  {
                 text: text,
-- 
cgit v1.2.3


From 8a1cb4758df385a75c759e04a9d7ae79b712ad85 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 31 Jan 2018 19:43:51 +0100
Subject: [FIX] web_editor: avoid useless 404 during test

removeSrcAttribute should avoid these rpc, but for some
unknown reasons, on firefox it works but not with chrome.

Because the purpose of the test is to check the url and
not the content, that works to use an existing route.

Courtesy of @kangol for the fix
---
 addons/web_editor/static/tests/web_editor_tests.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'addons/web_editor')

diff --git a/addons/web_editor/static/tests/web_editor_tests.js b/addons/web_editor/static/tests/web_editor_tests.js
index 3f46edde64c..2ea6078c44b 100644
--- a/addons/web_editor/static/tests/web_editor_tests.js
+++ b/addons/web_editor/static/tests/web_editor_tests.js
@@ -136,12 +136,12 @@ QUnit.test('field html_frame widget', function (assert) {
         model: 'mass.mailing',
         data: this.data,
         arch: '<form string="Partners">' +
-                '<field name="body" widget="html_frame" options="{\'editor_url\': \'/test\'}"/>' +
+                '<field name="body" widget="html_frame" options="{\'editor_url\': \'/logo\'}"/>' +
             '</form>',
         res_id: 1,
         session: {user_context: {lang: "en_us"}},
         mockRPC: function (route) {
-            if (_.str.startsWith(route, '/test')) {
+            if (_.str.startsWith(route, '/logo')) {
                 // those tests will be executed twice, once in readonly and once in edit
                 assert.ok(route.search('model=mass.mailing') > 0,
                     "the route should specify the correct model");
@@ -200,7 +200,7 @@ QUnit.test('html_frame does not crash when saving in readonly', function (assert
         data: this.data,
         arch: '<form string="Partners">' +
                 '<sheet>' +
-                    '<field name="body" widget="html_frame" options="{\'editor_url\': \'/test\'}"/>' +
+                    '<field name="body" widget="html_frame" options="{\'editor_url\': \'/logo\'}"/>' +
                 '</sheet>' +
             '</form>',
         res_id: 1,
@@ -208,7 +208,7 @@ QUnit.test('html_frame does not crash when saving in readonly', function (assert
             if (args.method) {
                 assert.step(args.method);
             }
-            if (_.str.startsWith(route, '/test')) {
+            if (_.str.startsWith(route, '/logo')) {
                 // manually call the callback to simulate that the iframe has
                 // been loaded (note: just the content, not the editor)
                 window.odoo[$.deparam(route).callback + '_content'].call();
@@ -237,7 +237,7 @@ QUnit.test('html_frame does not crash when saving in edit mode (editor not loade
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="display_name"/>' +
-                    '<field name="body" widget="html_frame" options="{\'editor_url\': \'/test\'}"/>' +
+                    '<field name="body" widget="html_frame" options="{\'editor_url\': \'/logo\'}"/>' +
                 '</sheet>' +
             '</form>',
         res_id: 1,
@@ -245,7 +245,7 @@ QUnit.test('html_frame does not crash when saving in edit mode (editor not loade
             if (args.method) {
                 assert.step(args.method);
             }
-            if (_.str.startsWith(route, '/test')) {
+            if (_.str.startsWith(route, '/logo')) {
                 // manually call the callback to simulate that the iframe has
                 // been partially loaded (just the content, not the editor)
                 window.odoo[$.deparam(route).callback + '_content']();
@@ -279,7 +279,7 @@ QUnit.test('html_frame saving in edit mode (editor and content fully loaded)', f
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="display_name"/>' +
-                    '<field name="body" widget="html_frame" options="{\'editor_url\': \'/test\'}"/>' +
+                    '<field name="body" widget="html_frame" options="{\'editor_url\': \'/logo\'}"/>' +
                 '</sheet>' +
             '</form>',
         res_id: 1,
@@ -290,7 +290,7 @@ QUnit.test('html_frame saving in edit mode (editor and content fully loaded)', f
                     writeDeferred.resolve();    
                 }
             }
-            if (_.str.startsWith(route, '/test')) {
+            if (_.str.startsWith(route, '/logo')) {
                 // manually call the callback to simulate that the iframe has
                 // been fully loaded (content + editor)
                 var callback = $.deparam(route).callback;
-- 
cgit v1.2.3