diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-09 19:59:27 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-09 19:59:27 +0100 |
| commit | d7c5bc02cc2b27442f0d4c8aca70266762be2a32 (patch) | |
| tree | 3a675d15b539a4474be38704405b318bebecdce7 /addons/web_editor | |
| parent | 37b518f1749aff3d6ffb2246c32f2aa1e67d9067 (diff) | |
| parent | 8aa8548d8ab68feb13f3bde51c557db84877e809 (diff) | |
[MERGE] forward port branch saas-12.1 up to 8aa8548d8ab
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/i18n/ja.po | 11 | ||||
| -rw-r--r-- | addons/web_editor/i18n/nb.po | 134 | ||||
| -rw-r--r-- | addons/web_editor/i18n/pt_BR.po | 20 | ||||
| -rw-r--r-- | addons/web_editor/i18n/web_editor.pot | 474 | ||||
| -rw-r--r-- | addons/web_editor/models/ir_ui_view.py | 20 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/editor/transcoder.js | 10 | ||||
| -rw-r--r-- | addons/web_editor/static/src/scss/web_editor.ui.scss | 1 |
7 files changed, 372 insertions, 298 deletions
diff --git a/addons/web_editor/i18n/ja.po b/addons/web_editor/i18n/ja.po index b606b416a82..54758ebe021 100644 --- a/addons/web_editor/i18n/ja.po +++ b/addons/web_editor/i18n/ja.po @@ -3,18 +3,19 @@ # * web_editor # # Translators: -# Martin Trigaux, 2018 -# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 # Manami Hashi <manami@roomsfor.hk>, 2018 # 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018 +# Martin Trigaux, 2018 # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 +# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1027,7 +1028,7 @@ msgstr "プレビュー表示" #: code:addons/web_editor/static/src/xml/editor.xml:68 #, python-format msgid "Previous" -msgstr "" +msgstr "前" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/nb.po b/addons/web_editor/i18n/nb.po index 417795dce50..44973e24910 100644 --- a/addons/web_editor/i18n/nb.po +++ b/addons/web_editor/i18n/nb.po @@ -3,16 +3,18 @@ # * web_editor # # Translators: -# Martin Trigaux, 2018 # Aleksander, 2018 +# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,27 +30,29 @@ msgid "" "'Alt tag' specifies an alternate text for an image, if the image cannot be " "displayed (slow connection, missing image, screen reader ...)." msgstr "" +"'Alt'-taggen spesifiserer en alternativ tekst for et bilde, om bildet ikke " +"kan vises (treg oppkobling, manglende bilde, skjermleser ...)." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:44 #, python-format msgid "'Title tag' is shown as a tooltip when you hover the picture." -msgstr "" +msgstr "'Title'-taggen vises som et verktøytips når du holder over bildet." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:36 #, python-format msgid "(ALT Tag)" -msgstr "" +msgstr "(ALT Tag)" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:45 #, python-format msgid "(TITLE Tag)" -msgstr "" +msgstr "(TITLE Tag)" #. module: web_editor #. openerp-web @@ -77,6 +81,8 @@ msgid "" "A server error occured. Please check you correctly signed in and that the " "file you are saving is correctly formatted." msgstr "" +"En serverfeil oppstod. Forsikre deg om at du er logget inn og at filen du " +"lagrer er korrekt formatert." #. module: web_editor #. openerp-web @@ -144,7 +150,7 @@ msgstr "Alternativ opplasting" #: code:addons/web_editor/static/src/xml/editor.xml:331 #, python-format msgid "Aspect Ratio" -msgstr "" +msgstr "Størrelsesforhold" #. module: web_editor #. openerp-web @@ -168,7 +174,7 @@ msgstr "URL til vedlegg" #: code:addons/web_editor/static/src/xml/editor.xml:197 #, python-format msgid "Attention" -msgstr "" +msgstr "Oppmerksomhet" #. module: web_editor #. openerp-web @@ -267,7 +273,7 @@ msgstr "Endre beskrivelse og hjelpetekst for media" #: code:addons/web_editor/static/src/xml/editor.xml:197 #, python-format msgid "Checked" -msgstr "" +msgstr "Huket av" #. module: web_editor #. openerp-web @@ -312,14 +318,14 @@ msgstr "Kolonne" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:82 #, python-format msgid "Common colors" -msgstr "" +msgstr "Vanlige farger" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:365 #, python-format msgid "Contain" -msgstr "" +msgstr "Begrens" #. module: web_editor #. openerp-web @@ -358,7 +364,7 @@ msgstr "Opprettet" #: code:addons/web_editor/static/src/js/widgets/widgets.js:1628 #, python-format msgid "Crop Image" -msgstr "" +msgstr "Beskjær bilde" #. module: web_editor #. openerp-web @@ -372,7 +378,7 @@ msgstr "Tilpasset" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1068 #, python-format msgid "Custom Color" -msgstr "" +msgstr "Tilpasset farge" #. module: web_editor #. openerp-web @@ -503,14 +509,14 @@ msgstr "Flat" #: code:addons/web_editor/static/src/xml/editor.xml:348 #, python-format msgid "Flip Horizontal" -msgstr "" +msgstr "Vend horisontalt" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:349 #, python-format msgid "Flip Vertical" -msgstr "" +msgstr "Vend vertikalt" #. module: web_editor #. openerp-web @@ -580,12 +586,12 @@ msgstr "Fullskjerm" #: code:addons/web_editor/static/src/xml/backend.xml:21 #, python-format msgid "Fullscreen" -msgstr "" +msgstr "Fullskjerm" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: web_editor #. openerp-web @@ -698,6 +704,8 @@ msgid "" "If you discard the current edition, all unsaved changes will be lost. You " "can cancel to return to the edition mode." msgstr "" +"Hvis du forkaster den nåværende versjonen, vil du miste alle endringer. Du " +"kan avbryte og returnere til redigeringsmodus." #. module: web_editor #. openerp-web @@ -707,6 +715,8 @@ msgid "" "If you reset this file, all your customizations will be lost as it will be " "reverted to the default file." msgstr "" +"Hvis du tilbakestiller denne filen, vil du miste alle tilpasninger, da den " +"vil bli tilbakestilt til originalfilen." #. module: web_editor #. openerp-web @@ -716,6 +726,8 @@ msgid "" "If you want to crop it, please first download it from the original source " "and upload it in Odoo." msgstr "" +"Hvis du vil beskjære det, må du først laste det ned fra originalkilden for " +"så å laste det opp i Odoo." #. module: web_editor #. openerp-web @@ -739,20 +751,22 @@ 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 "" +"I denne modusen kan du bare oversette tekst. For å endre strukturen på siden, må du redigere malsiden.\n" +"Alle modifikasjoner på malsiden blir automatisk påført alle oversatte versjoner." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:31 #, python-format msgid "Include All SCSS Files" -msgstr "" +msgstr "Inkluder alle SCSS-filer" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:22 #, python-format msgid "Include Asset Bundles" -msgstr "" +msgstr "Inkluder ressursbunter" #. module: web_editor #. openerp-web @@ -766,7 +780,7 @@ msgstr "Innrykk" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1034 #, python-format msgid "Insert Horizontal Rule" -msgstr "" +msgstr "Sett inn horisontal strek" #. module: web_editor #. openerp-web @@ -815,7 +829,7 @@ msgstr "Kursiv" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1065 #, python-format msgid "Justify full" -msgstr "" +msgstr "Juster full" #. module: web_editor #. openerp-web @@ -866,7 +880,7 @@ msgstr "Link" #: code:addons/web_editor/static/src/xml/editor.xml:244 #, python-format msgid "Link Label" -msgstr "" +msgstr "Linketikett" #. module: web_editor #. openerp-web @@ -967,28 +981,28 @@ msgstr "Nummerert liste" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1060 #, python-format msgid "Outdent" -msgstr "" +msgstr "Uttrykk" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:270 #, python-format msgid "Outline" -msgstr "" +msgstr "Omriss" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:272 #, python-format msgid "Outline-Rounded" -msgstr "" +msgstr "Avrundet omriss" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:154 #, python-format msgid "Padding" -msgstr "" +msgstr "Polstring" #. module: web_editor #. openerp-web @@ -1037,82 +1051,82 @@ msgstr "Sitat" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb msgid "Qweb" -msgstr "" +msgstr "Qweb" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field msgid "Qweb Field" -msgstr "" +msgstr "Qweb-felt" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_contact msgid "Qweb Field Contact" -msgstr "" +msgstr "Qweb-felt Kontakt" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_date msgid "Qweb Field Date" -msgstr "" +msgstr "Qweb-felt Dato" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_datetime msgid "Qweb Field Datetime" -msgstr "" +msgstr "Qweb-felt Datotid" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_duration msgid "Qweb Field Duration" -msgstr "" +msgstr "Qweb-felt Varighet" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_float msgid "Qweb Field Float" -msgstr "" +msgstr "Qweb-felt Desimaltall" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_html msgid "Qweb Field HTML" -msgstr "" +msgstr "Qweb-felt HTML" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_image msgid "Qweb Field Image" -msgstr "" +msgstr "Qweb Felt-bilde" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_integer msgid "Qweb Field Integer" -msgstr "" +msgstr "Qweb-felt Heltall" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_many2one msgid "Qweb Field Many to One" -msgstr "" +msgstr "Qweb-felt Mange til én" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_monetary msgid "Qweb Field Monerary" -msgstr "" +msgstr "Qweb-felt Valuta" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_relative msgid "Qweb Field Relative" -msgstr "" +msgstr "Qweb-felt Relativ" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_selection msgid "Qweb Field Selection" -msgstr "" +msgstr "Qweb-felt Utvalg" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_text msgid "Qweb Field Text" -msgstr "" +msgstr "Qweb-felt Tekst" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_qweb msgid "Qweb Field qweb" -msgstr "" +msgstr "Qweb-felt qweb" #. module: web_editor #. openerp-web @@ -1210,56 +1224,56 @@ msgstr "Tilbakestilling av visninger er ikke støttet enda" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1003 #, python-format msgid "Resize Full" -msgstr "" +msgstr "Endre størrelse full" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1004 #, python-format msgid "Resize Half" -msgstr "" +msgstr "Endre størrelse halv" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1005 #, python-format msgid "Resize Quarter" -msgstr "" +msgstr "Endre størrelse kvart" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:344 #, python-format msgid "Rotate Left" -msgstr "" +msgstr "Roter til venstre" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:345 #, python-format msgid "Rotate Right" -msgstr "" +msgstr "Roter til høyre" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:271 #, python-format msgid "Rounded" -msgstr "" +msgstr "Avrundet" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:11 #, python-format msgid "SCSS (CSS)" -msgstr "" +msgstr "SCSS (CSS)" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets/ace.js:364 #, python-format msgid "SCSS file: %s" -msgstr "" +msgstr "SCSS-fil: %s" #. module: web_editor #. openerp-web @@ -1291,7 +1305,7 @@ msgstr "Søk etter kontakt" #: code:addons/web_editor/static/src/xml/snippets.xml:13 #, python-format msgid "Select Parent Container" -msgstr "" +msgstr "Velg overordnet beholder" #. module: web_editor #. openerp-web @@ -1336,6 +1350,8 @@ msgid "" "Sets the width and height of the background image in percent of the parent " "element." msgstr "" +"Setter bredde og høyde for bakgrunnsbilde prosentvis i forhold til det " +"overordnede elementet." #. module: web_editor #. openerp-web @@ -1387,14 +1403,14 @@ msgstr "Stil" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:993 #, python-format msgid "Subscript" -msgstr "" +msgstr "Senket skrift" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:994 #, python-format msgid "Superscript" -msgstr "" +msgstr "Hevet skrift" #. module: web_editor #. openerp-web @@ -1469,28 +1485,28 @@ msgstr "Dokumentet er ikke lagret!" #: code:addons/web_editor/static/src/xml/editor.xml:148 #, python-format msgid "This file is a public view attachment" -msgstr "" +msgstr "Denne filen er et offentlig visningsvedlegg" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:149 #, python-format msgid "This file is attached to the current record" -msgstr "" +msgstr "Denne filen er vedlagt nåværende oppføring" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:320 #, python-format msgid "This image is an external image" -msgstr "" +msgstr "Dette er et eksternt bilde" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:321 #, python-format msgid "This type of image is not supported for cropping." -msgstr "" +msgstr "Denne type bilde kan ikke beskjæres" #. module: web_editor #. openerp-web @@ -1708,14 +1724,14 @@ msgstr "YouTube" #: code:addons/web_editor/static/src/xml/editor.xml:340 #, python-format msgid "Zoom In" -msgstr "" +msgstr "Zoom inn" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:341 #, python-format msgid "Zoom Out" -msgstr "" +msgstr "Zoom ut" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/pt_BR.po b/addons/web_editor/i18n/pt_BR.po index d25fdcfbfcb..affe91ffb1f 100644 --- a/addons/web_editor/i18n/pt_BR.po +++ b/addons/web_editor/i18n/pt_BR.po @@ -3,29 +3,31 @@ # * web_editor # # Translators: -# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 # danimaribeiro <danimaribeiro@gmail.com>, 2018 -# Rui Andrada <shingonoide@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Mateus Lopes <mateus1@gmail.com>, 2018 -# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 # Thiago MACÊDO <thiago95macedo@gmail.com>, 2018 # Caio Leonardo Mendes de Sousa <caleozao@gmail.com>, 2018 # falexandresilva <falexandresilva@gmail.com>, 2018 -# grazziano <gra.negocia@gmail.com>, 2018 # Thiago Menezes <thg.mnzs@gmail.com>, 2018 # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 # Silmar <pinheirosilmar@gmail.com>, 2018 # Pablo Valentini <pablondrina@gmail.com>, 2018 +# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 +# Rui Andrada <shingonoide@gmail.com>, 2018 # Wagner Pereira <wagner@wagner.pereira.nom.br>, 2018 +# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 +# Martin Trigaux, 2018 +# Mateus Lopes <mateus1@gmail.com>, 2018 +# grazziano <gra.negocia@gmail.com>, 2018 # Yannick Belot <yannickbh@gmail.com>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Yannick Belot <yannickbh@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -459,7 +461,7 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:966 #, python-format msgid "Double-click to edit" -msgstr "" +msgstr "Clique-duplo para editar" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot index 6392b78dc6d..4b7d946f994 100644 --- a/addons/web_editor/i18n/web_editor.pot +++ b/addons/web_editor/i18n/web_editor.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~11.5\n" +"Project-Id-Version: Odoo Server saas~12.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" +"POT-Creation-Date: 2018-12-24 10:58+0000\n" +"PO-Revision-Date: 2018-12-24 10:58+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -45,14 +45,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:195 +#: code:addons/web_editor/static/src/xml/editor.xml:209 #, python-format msgid "(URL or Embed)" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1028 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1029 #, python-format msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)" msgstr "" @@ -71,30 +71,30 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "Accepts" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1078 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1079 #, python-format msgid "Action" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:112 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1150 #, python-format msgid "Add" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:108 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:647 #, python-format -msgid "Add an image URL" +msgid "Add as document" msgstr "" #. module: web_editor @@ -104,42 +104,71 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1063 +#: code:addons/web_editor/static/src/xml/editor.xml:130 +#, python-format +msgid "Add document" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/widgets/widgets.js:647 +#: code:addons/web_editor/static/src/xml/editor.xml:131 +#, python-format +msgid "Add image" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1064 #, python-format msgid "Align center" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1062 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1063 #, python-format msgid "Align left" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1064 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1065 #, python-format msgid "Align right" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:101 +#: code:addons/web_editor/static/src/xml/editor.xml:100 +#, python-format +msgid "All attachments have been loaded" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/editor.xml:118 #, python-format msgid "Alternate Upload" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:331 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:601 +#, python-format +msgid "Are you sure you want to delete this file ?" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/editor.xml:348 #, python-format msgid "Aspect Ratio" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:370 +#: code:addons/web_editor/static/src/xml/editor.xml:387 #, python-format msgid "Assign a focal point that will always be visible" msgstr "" @@ -156,21 +185,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:197 +#: code:addons/web_editor/static/src/xml/editor.xml:212 #, python-format msgid "Attention" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:206 +#: code:addons/web_editor/static/src/xml/editor.xml:222 #, python-format msgid "Autoplay" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1069 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1070 #: code:addons/web_editor/static/src/xml/snippets.xml:28 #, python-format msgid "Background Color" @@ -178,42 +207,42 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/snippets.options.js:951 +#: code:addons/web_editor/static/src/js/editor/snippets.options.js:972 #, python-format msgid "Background Image Sizing" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:411 +#: code:addons/web_editor/static/src/xml/editor.xml:428 #, python-format msgid "Background height" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:423 +#: code:addons/web_editor/static/src/xml/editor.xml:440 #, python-format msgid "Background position" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:449 +#: code:addons/web_editor/static/src/xml/editor.xml:466 #, python-format msgid "Background repeat" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:397 +#: code:addons/web_editor/static/src/xml/editor.xml:414 #, python-format msgid "Background size" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:400 +#: code:addons/web_editor/static/src/xml/editor.xml:417 #, python-format msgid "Background width" msgstr "" @@ -227,14 +256,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:989 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:990 #, python-format msgid "Bold" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/widgets/ace.js:833 +#: code:addons/web_editor/static/src/js/widgets/ace.js:834 #, python-format msgid "Careful !" msgstr "" @@ -255,16 +284,16 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:197 +#: code:addons/web_editor/static/src/xml/editor.xml:211 #, python-format msgid "Checked" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1076 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1077 #: code:addons/web_editor/static/src/js/editor/translator.js:56 -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1630 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1626 #: code:addons/web_editor/static/src/xml/ace.xml:36 #, python-format msgid "Close" @@ -272,21 +301,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1040 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1041 #, python-format msgid "Code" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1056 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1057 #, python-format msgid "Code View" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:278 +#: code:addons/web_editor/static/src/xml/editor.xml:295 #, python-format msgid "Color" msgstr "" @@ -307,7 +336,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:365 +#: code:addons/web_editor/static/src/xml/editor.xml:382 #, python-format msgid "Contain" msgstr "" @@ -321,14 +350,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:196 +#: code:addons/web_editor/static/src/xml/editor.xml:215 #, python-format msgid "Copy-paste your URL or embed code here" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:364 +#: code:addons/web_editor/static/src/xml/editor.xml:381 #, python-format msgid "Cover" msgstr "" @@ -346,21 +375,21 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:201 -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1628 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1624 #, python-format msgid "Crop Image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:366 +#: code:addons/web_editor/static/src/xml/editor.xml:383 #, python-format msgid "Custom" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1068 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1069 #, python-format msgid "Custom Color" msgstr "" @@ -374,22 +403,22 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "Dailymotion" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/summernote.js:2021 -#: code:addons/web_editor/static/src/xml/editor.xml:269 +#: code:addons/web_editor/static/src/js/editor/summernote.js:2034 +#: code:addons/web_editor/static/src/xml/editor.xml:286 #, python-format msgid "Default" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:450 +#: code:addons/web_editor/static/src/xml/editor.xml:467 #, python-format msgid "Define if/how the background image will be repeated" msgstr "" @@ -404,11 +433,10 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/snippets.options.js:955 +#: code:addons/web_editor/static/src/js/editor/snippets.options.js:976 #: code:addons/web_editor/static/src/js/widgets/widgets.js:38 -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1637 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1633 #: code:addons/web_editor/static/src/xml/editor.xml:12 -#: code:addons/web_editor/static/src/xml/editor.xml:138 #, python-format msgid "Discard" msgstr "" @@ -427,21 +455,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1080 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1081 #, python-format msgid "Document Style" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:966 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:967 #, python-format msgid "Double-click to edit" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1009 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1010 #, python-format msgid "Drag an image here" msgstr "" @@ -463,7 +491,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:192 -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1018 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1019 #, python-format msgid "Edit" msgstr "" @@ -477,70 +505,70 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1001 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1002 #, python-format msgid "File / Image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:273 +#: code:addons/web_editor/static/src/xml/editor.xml:290 #, python-format msgid "Flat" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:348 +#: code:addons/web_editor/static/src/xml/editor.xml:365 #, python-format msgid "Flip Horizontal" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:349 +#: code:addons/web_editor/static/src/xml/editor.xml:366 #, python-format msgid "Flip Vertical" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1006 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1007 #, python-format msgid "Float Left" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1008 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1009 #, python-format msgid "Float None" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1007 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1008 #, python-format msgid "Float Right" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1070 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1071 #, python-format msgid "Font Color" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:997 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:998 #, python-format msgid "Font Family" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:998 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:999 #, python-format msgid "Font Size" msgstr "" @@ -554,14 +582,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1614 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1610 #, python-format msgid "Free" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1055 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1056 #, python-format msgid "Full Screen" msgstr "" @@ -580,49 +608,49 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1042 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1043 #, python-format msgid "Header 1" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1043 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1044 #, python-format msgid "Header 2" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1044 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1045 #, python-format msgid "Header 3" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1045 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1046 #, python-format msgid "Header 4" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1046 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1047 #, python-format msgid "Header 5" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1047 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1048 #, python-format msgid "Header 6" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1054 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1055 #, python-format msgid "Help" msgstr "" @@ -636,42 +664,42 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:221 +#: code:addons/web_editor/static/src/xml/editor.xml:237 #, python-format msgid "Hide Dailymotion logo" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:218 +#: code:addons/web_editor/static/src/xml/editor.xml:234 #, python-format msgid "Hide Youtube logo" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:215 +#: code:addons/web_editor/static/src/xml/editor.xml:231 #, python-format msgid "Hide fullscreen button" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:212 +#: code:addons/web_editor/static/src/xml/editor.xml:228 #, python-format msgid "Hide player controls" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:224 +#: code:addons/web_editor/static/src/xml/editor.xml:240 #, python-format msgid "Hide sharing button" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:426 +#: code:addons/web_editor/static/src/xml/editor.xml:443 #, python-format msgid "Horizontal" msgstr "" @@ -690,14 +718,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/widgets/ace.js:832 +#: code:addons/web_editor/static/src/js/widgets/ace.js:833 #, python-format msgid "If you reset this file, all your customizations will be lost as it will be reverted to the default file." msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:322 +#: code:addons/web_editor/static/src/xml/editor.xml:339 #, python-format msgid "If you want to crop it, please first download it from the original source and upload it in Odoo." msgstr "" @@ -711,7 +739,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1011 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1012 #, python-format msgid "Image URL" msgstr "" @@ -740,70 +768,70 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1061 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1062 #, python-format msgid "Indent" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1034 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1035 #, python-format msgid "Insert Horizontal Rule" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1002 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1003 #, python-format msgid "Insert Image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1016 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1017 #, python-format msgid "Insert Link" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1026 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1027 #, python-format msgid "Insert Video" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "Instagram" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:1064 +#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:1067 #, python-format msgid "Install" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:990 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:991 #, python-format msgid "Italic" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1065 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1066 #, python-format msgid "Justify full" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1075 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1076 #, python-format msgid "Keyboard shortcuts" msgstr "" @@ -811,7 +839,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:150 -#: code:addons/web_editor/static/src/xml/editor.xml:261 +#: code:addons/web_editor/static/src/xml/editor.xml:278 #, python-format msgid "Large" msgstr "" @@ -833,35 +861,42 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:996 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:997 #, python-format msgid "Line Height" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1015 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1016 #, python-format msgid "Link" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:244 +#: code:addons/web_editor/static/src/xml/editor.xml:261 #, python-format msgid "Link Label" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1346 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1342 #, python-format msgid "Link to" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:209 +#: code:addons/web_editor/static/src/xml/editor.xml:98 +#, python-format +msgid "Load more..." +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/editor.xml:225 #, python-format msgid "Loop" msgstr "" @@ -869,7 +904,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:149 -#: code:addons/web_editor/static/src/xml/editor.xml:260 +#: code:addons/web_editor/static/src/xml/editor.xml:277 #, python-format msgid "Medium" msgstr "" @@ -881,14 +916,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:69 -#, python-format -msgid "Next" -msgstr "" - -#. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:452 +#: code:addons/web_editor/static/src/xml/editor.xml:469 #, python-format msgid "No repeat" msgstr "" @@ -896,7 +924,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:147 -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1072 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1073 #: code:addons/web_editor/static/src/xml/snippets.xml:30 #, python-format msgid "None" @@ -904,14 +932,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1038 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1039 #, python-format msgid "Normal" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/snippets.options.js:954 +#: code:addons/web_editor/static/src/js/editor/snippets.options.js:975 #: code:addons/web_editor/static/src/js/editor/translator.js:98 #, python-format msgid "Ok" @@ -926,43 +954,36 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1021 -#: code:addons/web_editor/static/src/xml/editor.xml:299 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1022 +#: code:addons/web_editor/static/src/xml/editor.xml:316 #, python-format msgid "Open in new window" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:203 -#, python-format -msgid "Options" -msgstr "" - -#. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1051 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1052 #, python-format msgid "Ordered list" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1060 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1061 #, python-format msgid "Outdent" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:270 +#: code:addons/web_editor/static/src/xml/editor.xml:287 #, python-format msgid "Outline" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:272 +#: code:addons/web_editor/static/src/xml/editor.xml:289 #, python-format msgid "Outline-Rounded" msgstr "" @@ -976,14 +997,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1059 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1060 #, python-format msgid "Paragraph" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1079 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1080 #, python-format msgid "Paragraph formatting" msgstr "" @@ -997,23 +1018,16 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:230 -#: code:addons/web_editor/static/src/xml/editor.xml:307 -#: code:addons/web_editor/static/src/xml/editor.xml:309 +#: code:addons/web_editor/static/src/xml/editor.xml:246 +#: code:addons/web_editor/static/src/xml/editor.xml:324 +#: code:addons/web_editor/static/src/xml/editor.xml:326 #, python-format msgid "Preview" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:68 -#, python-format -msgid "Previous" -msgstr "" - -#. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1039 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1040 #, python-format msgid "Quote" msgstr "" @@ -1100,14 +1114,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.js:326 +#: code:addons/web_editor/static/src/js/editor/rte.js:344 #, python-format msgid "Readonly field" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1084 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1085 #, python-format msgid "Redo" msgstr "" @@ -1128,42 +1142,42 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:995 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:996 #, python-format msgid "Remove Font Style" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1012 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1013 #, python-format msgid "Remove Image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:384 +#: code:addons/web_editor/static/src/xml/editor.xml:401 #, python-format msgid "Repeat" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:453 +#: code:addons/web_editor/static/src/xml/editor.xml:470 #, python-format msgid "Repeat both" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:454 +#: code:addons/web_editor/static/src/xml/editor.xml:471 #, python-format msgid "Repeat x" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:455 +#: code:addons/web_editor/static/src/xml/editor.xml:472 #, python-format msgid "Repeat y" msgstr "" @@ -1177,7 +1191,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:352 +#: code:addons/web_editor/static/src/xml/editor.xml:369 #, python-format msgid "Reset Image" msgstr "" @@ -1191,42 +1205,42 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1003 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1004 #, python-format msgid "Resize Full" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1004 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1005 #, python-format msgid "Resize Half" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1005 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1006 #, python-format msgid "Resize Quarter" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:344 +#: code:addons/web_editor/static/src/xml/editor.xml:361 #, python-format msgid "Rotate Left" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:345 +#: code:addons/web_editor/static/src/xml/editor.xml:362 #, python-format msgid "Rotate Right" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:271 +#: code:addons/web_editor/static/src/xml/editor.xml:288 #, python-format msgid "Rounded" msgstr "" @@ -1248,7 +1262,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets/widgets.js:37 -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1633 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1629 #: code:addons/web_editor/static/src/xml/ace.xml:35 #: code:addons/web_editor/static/src/xml/editor.xml:13 #, python-format @@ -1257,7 +1271,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:63 +#: code:addons/web_editor/static/src/xml/editor.xml:74 #: code:addons/web_editor/static/src/xml/snippets.xml:44 #, python-format msgid "Search" @@ -1272,28 +1286,42 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/snippets.xml:13 +#: code:addons/web_editor/static/src/xml/editor.xml:143 #, python-format -msgid "Select Parent Container" +msgid "Search a document" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1123 +#: code:addons/web_editor/static/src/xml/editor.xml:182 #, python-format -msgid "Select a Media" +msgid "Search a pictogram" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:130 +#: code:addons/web_editor/static/src/xml/editor.xml:144 #, python-format -msgid "Select a Picture" +msgid "Search an image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1010 +#: code:addons/web_editor/static/src/xml/snippets.xml:13 +#, python-format +msgid "Select Parent Container" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1149 +#, python-format +msgid "Select a Media" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1011 #, python-format msgid "Select from files" msgstr "" @@ -1307,14 +1335,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:424 +#: code:addons/web_editor/static/src/xml/editor.xml:441 #, python-format msgid "Set the starting position of the background image." msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:398 +#: code:addons/web_editor/static/src/xml/editor.xml:415 #, python-format msgid "Sets the width and height of the background image in percent of the parent element." msgstr "" @@ -1328,7 +1356,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:256 +#: code:addons/web_editor/static/src/xml/editor.xml:273 #, python-format msgid "Size" msgstr "" @@ -1336,8 +1364,8 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:148 -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1041 -#: code:addons/web_editor/static/src/xml/editor.xml:259 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1042 +#: code:addons/web_editor/static/src/xml/editor.xml:276 #, python-format msgid "Small" msgstr "" @@ -1351,36 +1379,36 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:992 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:993 #, python-format msgid "Strikethrough" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1037 -#: code:addons/web_editor/static/src/xml/editor.xml:266 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1038 +#: code:addons/web_editor/static/src/xml/editor.xml:283 #, python-format msgid "Style" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:993 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:994 #, python-format msgid "Subscript" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:994 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:995 #, python-format msgid "Superscript" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1031 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1032 #, python-format msgid "Table" msgstr "" @@ -1394,21 +1422,42 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1077 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1078 #, python-format msgid "Text formatting" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1019 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1020 #, python-format msgid "Text to display" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:157 +#: code:addons/web_editor/static/src/xml/editor.xml:135 +#, python-format +msgid "The URL does not contain any image. The file will be added in the document section." +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/editor.xml:136 +#, python-format +msgid "The URL does not seem to work" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/editor.xml:134 +#, python-format +msgid "The URL seems valid" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/editor.xml:165 #, python-format msgid "The image could not be deleted because it is used in the\n" " following pages or views:" @@ -1416,14 +1465,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1056 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1085 #, python-format msgid "The provided url does not reference any supported video" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/widgets/widgets.js:1050 +#: code:addons/web_editor/static/src/js/widgets/widgets.js:1079 #, python-format msgid "The provided url is not valid" msgstr "" @@ -1445,35 +1494,35 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:148 +#: code:addons/web_editor/static/src/xml/editor.xml:153 #, python-format msgid "This file is a public view attachment" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:149 +#: code:addons/web_editor/static/src/xml/editor.xml:154 #, python-format msgid "This file is attached to the current record" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:320 +#: code:addons/web_editor/static/src/xml/editor.xml:337 #, python-format msgid "This image is an external image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:321 +#: code:addons/web_editor/static/src/xml/editor.xml:338 #, python-format msgid "This type of image is not supported for cropping." msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1020 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1021 #, python-format msgid "To what URL should this link go?" msgstr "" @@ -1520,28 +1569,28 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1071 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1072 #, python-format msgid "Transparent" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:250 +#: code:addons/web_editor/static/src/xml/editor.xml:267 #, python-format msgid "URL or Email" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:991 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:992 #, python-format msgid "Underline" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1083 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1084 #, python-format msgid "Undo" msgstr "" @@ -1555,42 +1604,49 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1017 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1018 #, python-format msgid "Unlink" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1050 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1051 #, python-format msgid "Unordered list" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:99 +#: code:addons/web_editor/static/src/xml/editor.xml:113 +#, python-format +msgid "Upload a document" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/editor.xml:114 #, python-format msgid "Upload an image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:104 +#: code:addons/web_editor/static/src/xml/editor.xml:121 #, python-format msgid "Upload image without optimization" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:437 +#: code:addons/web_editor/static/src/xml/editor.xml:454 #, python-format msgid "Vertical" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1024 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1025 #: code:addons/web_editor/static/src/xml/editor.xml:59 #, python-format msgid "Video" @@ -1598,21 +1654,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1025 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1026 #, python-format msgid "Video Link" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1027 +#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1028 #, python-format msgid "Video URL?" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:195 +#: code:addons/web_editor/static/src/xml/editor.xml:208 #, python-format msgid "Video code" msgstr "" @@ -1624,14 +1680,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "Vimeo" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "Vine.co" msgstr "" @@ -1670,67 +1726,53 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "Youku" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "Youtube" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:340 +#: code:addons/web_editor/static/src/xml/editor.xml:357 #, python-format msgid "Zoom In" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:341 +#: code:addons/web_editor/static/src/xml/editor.xml:358 #, python-format msgid "Zoom Out" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "and" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:403 -#: code:addons/web_editor/static/src/xml/editor.xml:414 -#: code:addons/web_editor/static/src/xml/editor.xml:429 -#: code:addons/web_editor/static/src/xml/editor.xml:440 +#: code:addons/web_editor/static/src/xml/editor.xml:420 +#: code:addons/web_editor/static/src/xml/editor.xml:431 +#: code:addons/web_editor/static/src/xml/editor.xml:446 +#: code:addons/web_editor/static/src/xml/editor.xml:457 #, python-format msgid "auto" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:110 -#, python-format -msgid "https://www.odoo.com/logo.png" -msgstr "" - -#. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:200 +#: code:addons/web_editor/static/src/xml/editor.xml:218 #, python-format msgid "videos" msgstr "" -#. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:107 -#, python-format -msgid "— or —" -msgstr "" - diff --git a/addons/web_editor/models/ir_ui_view.py b/addons/web_editor/models/ir_ui_view.py index f0c295787a2..e281d9f9ecc 100644 --- a/addons/web_editor/models/ir_ui_view.py +++ b/addons/web_editor/models/ir_ui_view.py @@ -199,12 +199,21 @@ class IrUiView(models.Model): self.write({'arch': self._pretty_arch(new_arch)}) @api.model + def _view_get_inherited_children(self, view, options): + extensions = view.inherit_children_ids + if not options: + # only active children + extensions = extensions.filtered(lambda view: view.active) + return extensions + + @api.model def _view_obj(self, view_id): if isinstance(view_id, str): return self.search([('key', '=', view_id)], limit=1) or self.env.ref(view_id) elif isinstance(view_id, int): return self.browse(view_id) - # assume it's already a view object (WTF?) + # It can already be a view object when called by '_views_get()' that is calling '_view_obj' + # for it's inherit_children_ids, passing them directly as object record. return view_id # Returns all views (called and inherited) related to a view @@ -223,7 +232,7 @@ class IrUiView(models.Model): view = self._view_obj(view_id) except ValueError: _logger.warning("Could not find view object with view_id '%s'", view_id) - return [] + return self.env['ir.ui.view'] while root and view.inherit_id: view = view.inherit_id @@ -239,13 +248,10 @@ class IrUiView(models.Model): called_view = self._view_obj(child.get('t-call', child.get('t-call-assets'))) except ValueError: continue - if called_view not in views_to_return: + if called_view and called_view not in views_to_return: views_to_return += self._views_get(called_view, options=options, bundles=bundles) - extensions = view.inherit_children_ids - if not options: - # only active children - extensions = view.inherit_children_ids.filtered(lambda view: view.active) + extensions = self._view_get_inherited_children(view, options) # Keep options in a deterministic order regardless of their applicability for extension in extensions.sorted(key=lambda v: v.id): diff --git a/addons/web_editor/static/src/js/editor/transcoder.js b/addons/web_editor/static/src/js/editor/transcoder.js index fb161a3887e..85903f6b4eb 100644 --- a/addons/web_editor/static/src/js/editor/transcoder.js +++ b/addons/web_editor/static/src/js/editor/transcoder.js @@ -251,6 +251,9 @@ function applyOverDescendants(node, func) { if (node.nodeName === 'A' && $node.hasClass('btn') && !$node.children().length && $(node).parents('.o_outlook_hack').length) { node = $(node).parents('.o_outlook_hack')[0]; } + else if (node.nodeName === 'IMG' && $node.parent('p').hasClass('o_outlook_hack')) { + node = $node.parent()[0]; + } node = node.nextSibling; } } @@ -307,6 +310,9 @@ function classToStyle($editable) { $(node).remove(); } } + else if (node.nodeName === 'IMG' && $target.is('.mx-auto.d-block')) { + $target.wrap('<p class="o_outlook_hack" style="text-align:center;margin:0"/>'); + } }); } @@ -318,8 +324,8 @@ function classToStyle($editable) { */ function styleToClass($editable) { // Outlook revert - $editable.find('table.o_outlook_hack').each(function () { - $(this).after($('a', this)); + $editable.find('.o_outlook_hack').each(function () { + $(this).after($('a,img', this)); }).remove(); getMatchedCSSRules($editable[0]); diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss index ad9da79f788..06e56ee657f 100644 --- a/addons/web_editor/static/src/scss/web_editor.ui.scss +++ b/addons/web_editor/static/src/scss/web_editor.ui.scss @@ -1239,6 +1239,7 @@ body.editor_enable { height: 70%; // in case flex is not supported flex: 1 1 auto; .ace_gutter { + display: block!important; // display even with aria-hidden cursor: ew-resize; .ace_gutter-cell.o_error { |
