From 60d6c5402b3ecb705756a566b3e712b7bd8c0dcc Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 24 Apr 2019 08:51:34 +0000 Subject: [FIX] web: change bootstrap fonts only for reports Commit 42530b02fe14 was fixing a bug in reports that were using the standard bootstrap fonts instead of the changes we made in $font-family-sans-serif To solve this, 42530b02fe14 replicated the change in the file web_editor/static/src/scss/bootstrap_overridden.scss which is imported in report_assets_common **before** web._assets_bootstrap This was solving the issue for the report but had also the side-effect of changing body font-family in enterprise as the bootstrap_overridden.scss file is also used in web_editor._assets_backend_helpers and web_editor._assets_frontend_helpers 42530b02fe14 had effect only on enterprise where the desired font is Roboto/Noto Create a new bootstrap_overridden (6th of the name) file only for report closes odoo/odoo#32902 Signed-off-by: Martin Trigaux (mat) --- addons/web_editor/static/src/scss/bootstrap_overridden.scss | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/web_editor') diff --git a/addons/web_editor/static/src/scss/bootstrap_overridden.scss b/addons/web_editor/static/src/scss/bootstrap_overridden.scss index 849a891392b..5c64d275d56 100644 --- a/addons/web_editor/static/src/scss/bootstrap_overridden.scss +++ b/addons/web_editor/static/src/scss/bootstrap_overridden.scss @@ -83,5 +83,3 @@ $gray-700: gray('700') !default; $gray-800: gray('800') !default; $gray-900: gray('900') !default; $black: gray('black') !default; - -$font-family-sans-serif: "Noto", "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; -- cgit v1.2.3 From c924356d9e95d592b6834a6ecc443a598c12530d Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 5 May 2019 01:35:12 +0200 Subject: [I18N] Update translation terms from Transifex --- addons/web_editor/i18n/cs.po | 80 ++++++++++++++++++++++---------------------- addons/web_editor/i18n/hr.po | 8 ++--- 2 files changed, 44 insertions(+), 44 deletions(-) (limited to 'addons/web_editor') diff --git a/addons/web_editor/i18n/cs.po b/addons/web_editor/i18n/cs.po index e00f266a3cd..76a3b5d56a5 100644 --- a/addons/web_editor/i18n/cs.po +++ b/addons/web_editor/i18n/cs.po @@ -89,7 +89,7 @@ msgstr "" #: code:addons/web_editor/static/src/xml/editor.xml:200 #, python-format msgid "Accepts" -msgstr "" +msgstr "Přijmout" #. module: web_editor #. openerp-web @@ -110,12 +110,12 @@ msgstr "Přidat" #: code:addons/web_editor/static/src/xml/editor.xml:108 #, python-format msgid "Add an image URL" -msgstr "" +msgstr "Přidat URL obrázku" #. module: web_editor #: model_terms:ir.ui.view,arch_db:web_editor.snippets msgid "Add blocks" -msgstr "" +msgstr "Přidat bloky" #. module: web_editor #. openerp-web @@ -129,7 +129,7 @@ msgstr "Na střed" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1062 #, python-format msgid "Align left" -msgstr "" +msgstr "Zarovnat vlevo" #. module: web_editor #. openerp-web @@ -143,21 +143,21 @@ msgstr "Zarovnat vpravo" #: code:addons/web_editor/static/src/xml/editor.xml:101 #, python-format msgid "Alternate Upload" -msgstr "" +msgstr "Alternativní nahrávání" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:331 #, python-format msgid "Aspect Ratio" -msgstr "" +msgstr "Poměr stran" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:370 #, python-format msgid "Assign a focal point that will always be visible" -msgstr "" +msgstr "Přiřadit ohnisko, které bude vždy viditelné" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_attachment @@ -203,7 +203,7 @@ msgstr "" #: code:addons/web_editor/static/src/xml/editor.xml:411 #, python-format msgid "Background height" -msgstr "" +msgstr "Výška pozadí" #. module: web_editor #. openerp-web @@ -217,14 +217,14 @@ msgstr "" #: code:addons/web_editor/static/src/xml/editor.xml:449 #, python-format msgid "Background repeat" -msgstr "" +msgstr "Opakování pozadí" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:397 #, python-format msgid "Background size" -msgstr "" +msgstr "Velikost pozadí" #. module: web_editor #. openerp-web @@ -238,7 +238,7 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/snippets.editor.js:255 #, python-format msgid "Block" -msgstr "" +msgstr "Blok" #. module: web_editor #. openerp-web @@ -252,14 +252,14 @@ msgstr "Tučný" #: code:addons/web_editor/static/src/js/widgets/ace.js:833 #, python-format msgid "Careful !" -msgstr "" +msgstr "Opatrně!" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:136 #, python-format msgid "Center" -msgstr "" +msgstr "Střed" #. module: web_editor #. openerp-web @@ -325,7 +325,7 @@ msgstr "Běžné barvy" #: code:addons/web_editor/static/src/xml/editor.xml:365 #, python-format msgid "Contain" -msgstr "" +msgstr "Obsahuje" #. module: web_editor #. openerp-web @@ -407,7 +407,7 @@ msgstr "Výchozí" #: code:addons/web_editor/static/src/xml/editor.xml:450 #, python-format msgid "Define if/how the background image will be repeated" -msgstr "" +msgstr "Definujte, zda / jak bude obrázek na pozadí opakován" #. module: web_editor #. openerp-web @@ -466,7 +466,7 @@ msgstr "Přetáhněte obrázek zde" #: code:addons/web_editor/static/src/xml/snippets.xml:18 #, python-format msgid "Drag to Move" -msgstr "" +msgstr "Tažením přesunout" #. module: web_editor #. openerp-web @@ -668,7 +668,7 @@ msgstr "Skrýt Youtube logo" #: code:addons/web_editor/static/src/xml/editor.xml:215 #, python-format msgid "Hide fullscreen button" -msgstr "" +msgstr "Skrýt tlačítko na celou obrazovku" #. module: web_editor #. openerp-web @@ -862,7 +862,7 @@ msgstr "Naposled upraveno" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:996 #, python-format msgid "Line Height" -msgstr "" +msgstr "Výška řádku" #. module: web_editor #. openerp-web @@ -948,7 +948,7 @@ msgstr "Ok" #: code:addons/web_editor/static/src/js/editor/translator.js:97 #, python-format msgid "Ok, never show me this again" -msgstr "" +msgstr "Ok, už mi to nikdy neukazuj" #. module: web_editor #. openerp-web @@ -977,7 +977,7 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1060 #, python-format msgid "Outdent" -msgstr "" +msgstr "Outdent" #. module: web_editor #. openerp-web @@ -1129,7 +1129,7 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/rte.js:326 #, python-format msgid "Readonly field" -msgstr "" +msgstr "Pole jen pro čtení" #. module: web_editor #. openerp-web @@ -1150,21 +1150,21 @@ msgstr "Odebrat" #: code:addons/web_editor/static/src/xml/snippets.xml:20 #, python-format msgid "Remove Block" -msgstr "" +msgstr "Odstranit blok" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:995 #, python-format msgid "Remove Font Style" -msgstr "" +msgstr "Odstranit styl písma" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1012 #, python-format msgid "Remove Image" -msgstr "" +msgstr "Odebrat obrázek" #. module: web_editor #. openerp-web @@ -1185,7 +1185,7 @@ msgstr "" #: code:addons/web_editor/static/src/xml/editor.xml:454 #, python-format msgid "Repeat x" -msgstr "" +msgstr "Opakovat x" #. module: web_editor #. openerp-web @@ -1255,7 +1255,7 @@ msgstr "Otočit doprava" #: code:addons/web_editor/static/src/xml/editor.xml:271 #, python-format msgid "Rounded" -msgstr "" +msgstr "Zaoblené" #. module: web_editor #. openerp-web @@ -1336,7 +1336,7 @@ msgstr "Chyba serveru" #: code:addons/web_editor/static/src/xml/editor.xml:424 #, python-format msgid "Set the starting position of the background image." -msgstr "" +msgstr "Nastavit výchozí polohu obrázku na pozadí." #. module: web_editor #. openerp-web @@ -1375,7 +1375,7 @@ msgstr "Malý" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:169 #, python-format msgid "Spin" -msgstr "" +msgstr "Rotace" #. module: web_editor #. openerp-web @@ -1397,7 +1397,7 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:993 #, python-format msgid "Subscript" -msgstr "" +msgstr "Index" #. module: web_editor #. openerp-web @@ -1425,14 +1425,14 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1077 #, python-format msgid "Text formatting" -msgstr "" +msgstr "Formátování textu" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1019 #, python-format msgid "Text to display" -msgstr "" +msgstr "Text k zobrazení" #. module: web_editor #. openerp-web @@ -1450,7 +1450,7 @@ msgstr "" #: code:addons/web_editor/static/src/js/widgets/widgets.js:1056 #, python-format msgid "The provided url does not reference any supported video" -msgstr "" +msgstr "Zadaná adresa URL neodkazuje na žádné podporované video" #. module: web_editor #. openerp-web @@ -1479,7 +1479,7 @@ msgstr "Tento dokument není uložen!" #: code:addons/web_editor/static/src/xml/editor.xml:148 #, python-format msgid "This file is a public view attachment" -msgstr "" +msgstr "Tento soubor je veřejná příloha" #. module: web_editor #. openerp-web @@ -1535,7 +1535,7 @@ msgstr "Přeložit atribut" #: code:addons/web_editor/static/src/xml/translator.xml:8 #, python-format msgid "Translated content" -msgstr "" +msgstr "Přeložený obsah" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_translation @@ -1596,28 +1596,28 @@ msgstr "Odpojit" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1050 #, python-format msgid "Unordered list" -msgstr "" +msgstr "Neseřazený seznam" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:99 #, python-format msgid "Upload an image" -msgstr "" +msgstr "Nahrát obrázek" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:104 #, python-format msgid "Upload image without optimization" -msgstr "" +msgstr "Nahrát obrázek bez optimalizace" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:437 #, python-format msgid "Vertical" -msgstr "" +msgstr "Vertikální" #. module: web_editor #. openerp-web @@ -1718,7 +1718,7 @@ msgstr "Youtube" #: code:addons/web_editor/static/src/xml/editor.xml:340 #, python-format msgid "Zoom In" -msgstr "" +msgstr "Přiblížit" #. module: web_editor #. openerp-web @@ -1742,7 +1742,7 @@ msgstr "and" #: code:addons/web_editor/static/src/xml/editor.xml:440 #, python-format msgid "auto" -msgstr "" +msgstr "automaticky" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/hr.po b/addons/web_editor/i18n/hr.po index cf1ee1b4177..011d5f3a921 100644 --- a/addons/web_editor/i18n/hr.po +++ b/addons/web_editor/i18n/hr.po @@ -7,11 +7,11 @@ # Marko Carević , 2019 # Mario Jureša , 2019 # Martin Trigaux, 2019 -# Bole , 2019 # Đurđica Žarković , 2019 # Ivica Dimjašević , 2019 # Karolina Tonković , 2019 # Tina Milas, 2019 +# Bole , 2019 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" "PO-Revision-Date: 2018-08-24 09:33+0000\n" -"Last-Translator: Tina Milas, 2019\n" +"Last-Translator: Bole , 2019\n" "Language-Team: Croatian (https://www.transifex.com/odoo/teams/41243/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1034,7 +1034,7 @@ msgstr "Pregled" #: code:addons/web_editor/static/src/xml/editor.xml:68 #, python-format msgid "Previous" -msgstr "" +msgstr "Prethodni" #. module: web_editor #. openerp-web @@ -1076,7 +1076,7 @@ msgstr "" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_float msgid "Qweb Field Float" -msgstr "" +msgstr "Qweb decimalno polje" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_html -- cgit v1.2.3