[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-4' - 35 commits - debian/changelog debian/control debian/loolwsd.postinst.in docker/Dockerfile docker/docker-nightly.sh kit/ChildSession.cpp kit/Kit.cpp loleaflet/css loleaflet/debug loleaflet/html loleaflet/images loleaflet/js loleaflet/l10n loleaflet/src loolwsd.spec.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Feb 11 14:22:14 UTC 2019
debian/changelog | 6
debian/control | 2
debian/loolwsd.postinst.in | 2
docker/Dockerfile | 2
docker/docker-nightly.sh | 168 ++++++++++++++++++++++
kit/ChildSession.cpp | 2
kit/Kit.cpp | 2
loleaflet/css/loleaflet.css | 183 +++++++++++++------------
loleaflet/css/spreadsheet.css | 4
loleaflet/css/toolbar.css | 12 -
loleaflet/debug/document/loleaflet.html | 1
loleaflet/html/loleaflet.html.m4 | 14 +
loleaflet/images/lc_basicshapes.cube.svg | 7
loleaflet/images/lc_signature.svg | 17 ++
loleaflet/images/sc_signature.svg | 4
loleaflet/js/jquery.mCustomScrollbar.js | 3
loleaflet/js/toolbar.js | 24 ---
loleaflet/l10n/uno-localizations-override.json | 5
loleaflet/l10n/uno/ab.json | 10 +
loleaflet/l10n/uno/af.json | 4
loleaflet/l10n/uno/am.json | 15 ++
loleaflet/l10n/uno/ar.json | 15 ++
loleaflet/l10n/uno/as.json | 9 +
loleaflet/l10n/uno/ast.json | 9 +
loleaflet/l10n/uno/be.json | 15 ++
loleaflet/l10n/uno/bg.json | 15 ++
loleaflet/l10n/uno/bn-IN.json | 9 +
loleaflet/l10n/uno/bn.json | 4
loleaflet/l10n/uno/bo.json | 4
loleaflet/l10n/uno/br.json | 14 +
loleaflet/l10n/uno/brx.json | 4
loleaflet/l10n/uno/bs.json | 9 +
loleaflet/l10n/uno/ca-valencia.json | 15 ++
loleaflet/l10n/uno/ca.json | 15 ++
loleaflet/l10n/uno/cs.json | 15 ++
loleaflet/l10n/uno/cy.json | 15 ++
loleaflet/l10n/uno/da.json | 15 ++
loleaflet/l10n/uno/de-override.json | 3
loleaflet/l10n/uno/de.json | 15 ++
loleaflet/l10n/uno/dgo.json | 4
loleaflet/l10n/uno/dz.json | 4
loleaflet/l10n/uno/el.json | 15 ++
loleaflet/l10n/uno/en-GB.json | 15 ++
loleaflet/l10n/uno/en-ZA.json | 4
loleaflet/l10n/uno/eo.json | 15 ++
loleaflet/l10n/uno/es-override.json | 4
loleaflet/l10n/uno/es.json | 15 ++
loleaflet/l10n/uno/et.json | 15 ++
loleaflet/l10n/uno/eu.json | 15 ++
loleaflet/l10n/uno/fa.json | 4
loleaflet/l10n/uno/fi.json | 15 ++
loleaflet/l10n/uno/fr.json | 15 ++
loleaflet/l10n/uno/fy.json | 15 ++
loleaflet/l10n/uno/ga.json | 15 ++
loleaflet/l10n/uno/gd.json | 15 ++
loleaflet/l10n/uno/gl.json | 15 ++
loleaflet/l10n/uno/gu.json | 9 +
loleaflet/l10n/uno/gug.json | 13 +
loleaflet/l10n/uno/he.json | 9 +
loleaflet/l10n/uno/hi.json | 9 +
loleaflet/l10n/uno/hr.json | 15 ++
loleaflet/l10n/uno/hsb.json | 15 ++
loleaflet/l10n/uno/hu.json | 15 ++
loleaflet/l10n/uno/id.json | 15 ++
loleaflet/l10n/uno/is.json | 15 ++
loleaflet/l10n/uno/it.json | 15 ++
loleaflet/l10n/uno/ja.json | 15 ++
loleaflet/l10n/uno/ka.json | 4
loleaflet/l10n/uno/kk.json | 15 ++
loleaflet/l10n/uno/km.json | 9 +
loleaflet/l10n/uno/kmr-Latn.json | 4
loleaflet/l10n/uno/kn.json | 4
loleaflet/l10n/uno/ko.json | 15 ++
loleaflet/l10n/uno/kok.json | 4
loleaflet/l10n/uno/ks.json | 4
loleaflet/l10n/uno/lb.json | 1
loleaflet/l10n/uno/lo.json | 4
loleaflet/l10n/uno/lt.json | 15 ++
loleaflet/l10n/uno/lv.json | 15 ++
loleaflet/l10n/uno/mai.json | 4
loleaflet/l10n/uno/mk.json | 4
loleaflet/l10n/uno/ml.json | 9 +
loleaflet/l10n/uno/mn.json | 4
loleaflet/l10n/uno/mni.json | 4
loleaflet/l10n/uno/mr.json | 9 +
loleaflet/l10n/uno/my.json | 4
loleaflet/l10n/uno/nb.json | 15 ++
loleaflet/l10n/uno/ne.json | 4
loleaflet/l10n/uno/nl.json | 15 ++
loleaflet/l10n/uno/nn.json | 15 ++
loleaflet/l10n/uno/nr.json | 2
loleaflet/l10n/uno/nso.json | 4
loleaflet/l10n/uno/oc.json | 15 ++
loleaflet/l10n/uno/om.json | 4
loleaflet/l10n/uno/or.json | 9 +
loleaflet/l10n/uno/pa-IN.json | 5
loleaflet/l10n/uno/pl.json | 15 ++
loleaflet/l10n/uno/pt-BR.json | 15 ++
loleaflet/l10n/uno/pt.json | 15 ++
loleaflet/l10n/uno/ro.json | 14 +
loleaflet/l10n/uno/ru.json | 15 ++
loleaflet/l10n/uno/rw.json | 4
loleaflet/l10n/uno/sa-IN.json | 4
loleaflet/l10n/uno/sat.json | 4
loleaflet/l10n/uno/sd.json | 4
loleaflet/l10n/uno/si.json | 4
loleaflet/l10n/uno/sid.json | 9 +
loleaflet/l10n/uno/sk.json | 15 ++
loleaflet/l10n/uno/sl.json | 15 ++
loleaflet/l10n/uno/sq.json | 7
loleaflet/l10n/uno/sr-Latn.json | 4
loleaflet/l10n/uno/sr.json | 4
loleaflet/l10n/uno/ss.json | 3
loleaflet/l10n/uno/st.json | 2
loleaflet/l10n/uno/sv.json | 15 ++
loleaflet/l10n/uno/sw-TZ.json | 4
loleaflet/l10n/uno/ta.json | 13 +
loleaflet/l10n/uno/te.json | 9 +
loleaflet/l10n/uno/tg.json | 4
loleaflet/l10n/uno/th.json | 4
loleaflet/l10n/uno/tn.json | 1
loleaflet/l10n/uno/tr.json | 15 ++
loleaflet/l10n/uno/ts.json | 2
loleaflet/l10n/uno/ug.json | 14 +
loleaflet/l10n/uno/uk.json | 15 ++
loleaflet/l10n/uno/uz.json | 3
loleaflet/l10n/uno/ve.json | 2
loleaflet/l10n/uno/vec.json | 15 ++
loleaflet/l10n/uno/vi.json | 5
loleaflet/l10n/uno/xh.json | 3
loleaflet/l10n/uno/zh-CN.json | 15 ++
loleaflet/l10n/uno/zh-TW.json | 15 ++
loleaflet/l10n/uno/zu.json | 3
loleaflet/src/control/Control.ColumnHeader.js | 7
loleaflet/src/control/Control.Header.js | 21 +-
loleaflet/src/control/Control.Menubar.js | 11 -
loleaflet/src/control/Control.RowHeader.js | 4
loleaflet/src/control/Control.Scroll.js | 6
loleaflet/src/control/Signing.js | 27 ++-
loleaflet/src/core/Socket.js | 1
loleaflet/src/layer/AnnotationManager.js | 3
loleaflet/src/layer/marker/Annotation.js | 12 -
loleaflet/src/layer/tile/TileLayer.js | 6
loleaflet/src/map/Map.js | 22 ++-
loleaflet/src/unocommands.js | 7
loolwsd.spec.in | 6
146 files changed, 1514 insertions(+), 181 deletions(-)
New commits:
commit 9d76cf10fd6e5e2cf5eb9a672c2eb84a61ff30d9
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Feb 11 15:21:48 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:21:48 2019 +0100
Bump package version to 4.0.0-6
Change-Id: I0c86cceb3f552c9ada0f710f9f2671e53d62a9d4
diff --git a/debian/changelog b/debian/changelog
index 252c78c81..3fb64ee81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.0-6) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool4
+
+ -- Andras Timar <andras.timar at collabora.com> Mon, 11 Feb 2019 15:10:00 +0100
+
loolwsd (4.0.0-5) unstable; urgency=medium
* see the git log: http://col.la/cool4
diff --git a/debian/control b/debian/control
index 6e136f51b..00f62f6dc 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3-gnutls, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, libxml2, libxslt1.1, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.21), collaboraofficebasis6.0-core (>= 6.0.10.21), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.21), collaboraofficebasis6.0-images (>= 6.0.10.21), collaboraofficebasis6.0-impress (>= 6.0.10.21), collaboraofficebasis6.0-ooofonts (>= 6.0.10.21), collaboraofficebasis6.0-writer (>= 6.0.10.21), collaboraoffice6.0 (>= 6.0.10.21), collaboraoffice6.0-ure (>= 6.0.10.21), collaboraofficebasis6.0-en-us (>= 6.0.10.21), collaboraofficebasis6.0-draw (>= 6.0.10.21), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.21), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.21), collaboraoffice6.0-dict-en (>= 6.0.10.21)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3-gnutls, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libpoppler58, libxml2, libxslt1.1, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.23), collaboraofficebasis6.0-core (>= 6.0.10.23), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.23), collaboraofficebasis6.0-images (>= 6.0.10.23), collaboraofficebasis6.0-impress (>= 6.0.10.23), collaboraofficebasis6.0-ooofonts (>= 6.0.10.23), collaboraofficebasis6.0-writer (>= 6.0.10.23), collaboraoffice6.0 (>= 6.0.10.23), collaboraoffice6.0-ure (>= 6.0.10.23), collaboraofficebasis6.0-en-us (>= 6.0.10.23), collaboraofficebasis6.0-draw (>= 6.0.10.23), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.23), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.23), collaboraoffice6.0-dict-en (>= 6.0.10.23)
Conflicts: collaboraofficebasis6.0-gnome-integration, collaboraofficebasis6.0-kde-integration
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 25253db87..5940bedaa 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 5%{?dist}
+Release: 6%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice6.0 >= 6.0.10.21 collaboraoffice6.0-ure >= 6.0.10.21 collaboraofficebasis6.0-core >= 6.0.10.21 collaboraofficebasis6.0-writer >= 6.0.10.21 collaboraofficebasis6.0-impress >= 6.0.10.21 collaboraofficebasis6.0-graphicfilter >= 6.0.10.21 collaboraofficebasis6.0-en-US >= 6.0.10.21 collaboraofficebasis6.0-calc >= 6.0.10.21 collaboraofficebasis6.0-ooofonts >= 6.0.10.21 collaboraofficebasis6.0-images >= 6.0.10.21 collaboraofficebasis6.0-draw >= 6.0.10.21 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.21 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.21 collaboraoffice6.0-dict-en >= 6.0.10.21
+Requires: collaboraoffice6.0 >= 6.0.10.23 collaboraoffice6.0-ure >= 6.0.10.23 collaboraofficebasis6.0-core >= 6.0.10.23 collaboraofficebasis6.0-writer >= 6.0.10.23 collaboraofficebasis6.0-impress >= 6.0.10.23 collaboraofficebasis6.0-graphicfilter >= 6.0.10.23 collaboraofficebasis6.0-en-US >= 6.0.10.23 collaboraofficebasis6.0-calc >= 6.0.10.23 collaboraofficebasis6.0-ooofonts >= 6.0.10.23 collaboraofficebasis6.0-images >= 6.0.10.23 collaboraofficebasis6.0-draw >= 6.0.10.23 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.23 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.23 collaboraoffice6.0-dict-en >= 6.0.10.23
Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
commit 7df176254ec7f857a19a279b7ced637261a81fa1
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Sun Feb 10 11:16:24 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
saveas: Explicitly ask for the command values only on saveas:
The loadDocument() is called from many places, let's isolate the
explicit call to sendInitUnoCommands() only to the SaveAs case.
Change-Id: I685152d9915ee17e9f5b464aed27cf2d06075447
Reviewed-on: https://gerrit.libreoffice.org/67606
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 28e3e3e03..76fd8d280 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -706,6 +706,7 @@ L.Socket = L.Class.extend({
this._map.options.doc = docUrl;
this._map.options.wopiSrc = encodeURIComponent(docUrl);
this._map.loadDocument();
+ this._map.sendInitUNOCommands();
}
// var name = command.name; - ignored, we get the new name via the wopi's BaseFileName
}
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6880b4b1b..92d36160c 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -224,7 +224,6 @@ L.Map = L.Evented.extend({
loadDocument: function() {
this._socket.connect();
- this.sendInitUNOCommands();
},
sendInitUNOCommands: function() {
commit ddaf91a51510425160f3686191a9a1f8437d0794
Author: merttumer <mert.tumer at collabora.com>
AuthorDate: Fri Feb 8 20:32:19 2019 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Added passing watermark text to saveAs for tiled watermark
Change-Id: I6a69c414e44b9a3c095d00b4101dd07b11d3fbb0
Signed-off-by: merttumer <mert.tumer at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/67552
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 2b8534c01..86c6dfe24 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -854,6 +854,8 @@ bool ChildSession::downloadAs(const char* /*buffer*/, int /*length*/, const std:
{
filterOptions += Poco::cat(std::string(" "), tokens.begin() + 5, tokens.end());
}
+ //HACK = add watermark to filteroptions
+ filterOptions += std::string(",Watermark=") + getWatermarkText() + std::string("WATERMARKEND");
}
// The file is removed upon downloading.
commit 6e33a3d1852e2b5ffecb9f7b359f5a0614c7a3bd
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Feb 8 09:52:16 2019 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
loleaflet: update shape signature icon
Change-Id: I1553bd792630a5c6040fa259cb47c04f0c2654a9
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 2e52c04ed..33f9c3a99 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -387,7 +387,7 @@ button.leaflet-control-search-next
.w2ui-icon.starshapes_concave-star6 { background: url('images/lc_starshapes.concave-star6.svg') no-repeat center !important; }
.w2ui-icon.starshapes_vertical-scroll { background: url('images/lc_starshapes.vertical-scroll.svg') no-repeat center !important; }
.w2ui-icon.starshapes_horizontal-scroll { background: url('images/lc_starshapes.horizontal-scroll.svg') no-repeat center !important; }
-.w2ui-icon.starshapes_signet { background: url('images/sc_signature.svg') no-repeat center !important; }
+.w2ui-icon.starshapes_signet { background: url('images/lc_signature.svg') no-repeat center !important; }
.w2ui-icon.starshapes_doorplate { background: url('images/lc_starshapes.doorplate.svg') no-repeat center !important; }
.w2ui-icon.calloutshapes_rectangular-callout { background: url('images/lc_calloutshapes.rectangular-callout.svg') no-repeat center !important; }
diff --git a/loleaflet/images/lc_signature.svg b/loleaflet/images/lc_signature.svg
new file mode 100644
index 000000000..8c5501c30
--- /dev/null
+++ b/loleaflet/images/lc_signature.svg
@@ -0,0 +1,17 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="m5 3v18h7v-3c0-1.090703.909297-2 2-2v-1c0-2.197294 1.802706-4 4-4 .346993 0 .678233.060164 1 .144531v-4.4160154l-4-3.7285156zm13 11c-.564129 0-1 .435871-1 1v1h2v-1c0-.564129-.435871-1-1-1z"
+ fill="#fff" />
+ <path
+ d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h7v-1h-7v-18h9v4c0 .554.446 1 1 1h4v3.144531c.355789.093288.689331.233855 1 .416016v-4.310547-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109z"
+ fill="#808080" />
+ <path
+ d="m15 7h4l-4-4z"
+ fill="#fff" />
+ <path
+ style="fill:#d65532"
+ d="M 11.490234 13.001953 A 0.49960701 0.49845209 0 0 0 10.998047 13.507812 L 10.998047 15.431641 A 0.49960701 0.49845209 0 0 0 10.998047 15.582031 L 10.998047 17.494141 A 0.5 0.49884417 0 0 0 11.998047 17.494141 L 11.998047 16.431641 L 12.466797 16.744141 C 12.696217 16.46589 12.992482 16.247454 13.335938 16.123047 L 12.398438 15.5 L 14.0625 14.394531 C 14.101129 14.145571 14.163296 13.905798 14.246094 13.673828 C 14.246303 13.67324 14.245884 13.672463 14.246094 13.671875 C 14.327619 13.443807 14.429034 13.228677 14.548828 13.021484 C 14.551309 13.017194 14.552191 13.012094 14.554688 13.007812 A 0.49960701 0.49845209 0 0 0 14.486328 13.005859 A 0.49960701 0.49845209 0 0 0 14.21875 13.091797 L 11.998047 14.568359 L 11.998047 13.507812 A 0.49960701 0.49845209 0 0 0 11.490234 13.001953 z M 8.4648438 13.009766 A 0.49960701 0.49845209 0 0 0 8.0546875 13.285156 L 6.0566406 17.273438 A 0.49960701 0.49845209 0 1 0 6.9492188 17.716797 L 7.5605469 16.498047 L 8.7363281 16.498047 L 9.0156
25 17.615234 A 0.49960701 0.49845209 0 1 0 9.984375 17.373047 L 8.984375 13.386719 A 0.49960701 0.49845209 0 0 0 8.515625 13.009766 A 0.49960701 0.49845209 0 0 0 8.4648438 13.009766 z M 8.3457031 14.933594 L 8.4863281 15.5 L 8.0605469 15.5 L 8.3457031 14.933594 z " />
+ <path
+ d="m18 12a3 3 0 0 0 -3 3v2h-1c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h8c.554 0 1-.446 1-1v-4c0-.554-.446-1-1-1h-1v-2a3 3 0 0 0 -3-3zm0 1a2 2 0 0 1 2 2v2h-4v-2a2 2 0 0 1 2-2z"
+ fill="#eac282" />
+</svg>
diff --git a/loleaflet/images/sc_signature.svg b/loleaflet/images/sc_signature.svg
deleted file mode 100644
index 049527140..000000000
--- a/loleaflet/images/sc_signature.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-
- />
- <path d="m3 1v14h4v-3c0-1.090703.9092972-2 2-2v-1c0-1.6450096 1.35499-3 3-3 .351851 0 .685106.0739423 1 .1875v-2.4824219l-2.695312-2.7050781z" fill="#fff"/><path d="m3 0c-.554 0-1 .446-1 1v14c0 .554.446 1 1 1h2 1.0292969 1.2539062c-.1754644-.296519-.2832031-.636031-.2832031-1h-.7988281-1.2011719-2v-14h6v3.5c0 .277.223.5.5.5h3.5v1.1875c.372977.1345038.710808.3377285 1 .5996094v-2.2871094-.8632812l-3.636719-3.6367188h-.863281zm7 1 3 3h-3z" fill="#808080"/><path d="m12 7a2 2 0 0 0 -2 2v2h-1c-.554 0-1 .446-1 1v3c0 .554.446 1 1 1h6c .554 0 1-.446 1-1v-3c0-.554-.446-1-1-1h-1v-2a2 2 0 0 0 -2-2zm0 1a1 1 0 0 1 1 1v2h-2v-2a1 1 0 0 1 1-1z" fill="#eac282"/><path d="m6.5097656 9.0117188c-.1934581-.0049598-.3723219.1023661-.4589844.2753906l-1.9980468 3.9882816c-.298191.595052.5943871 1.042317.8925781.447265l.6113281-1.220703h1.1757813l.2675781 1.070313v-1.572266c0-.413435.1318605-.799432.3535156-1.121094l-.3730468-1.488281c-.0538969-.217754-.2464532-.3727434-.4707032-.3789062zm-.1699218 1.925781
2.1425781.566406h-.4257813z" fill="#eac282" fill-rule="evenodd"/></svg>
\ No newline at end of file
commit c5fccb0d9fa8ae09d4531d1ae3a3442465a52cb4
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Feb 8 08:24:28 2019 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
loleaflet: update basic shape cube icon
Change-Id: I5b3edd8245ef24039857f9a5a988003c15f50c49
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 93d9f9215..2e52c04ed 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -322,7 +322,7 @@ button.leaflet-control-search-next
.w2ui-icon.basicshapes_ring { background: url('images/lc_basicshapes.ring.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_block-arc { background: url('images/lc_basicshapes.block-arc.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_can { background: url('images/lc_basicshapes.can.svg') no-repeat center !important; }
-.w2ui-icon.basicshapes_cube { background: url('images/lc_cube.svg') no-repeat center !important; }
+.w2ui-icon.basicshapes_cube { background: url('images/lc_basicshapes.cube.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_paper { background: url('images/lc_basicshapes.paper.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_frame { background: url('images/lc_rect_unfilled.svg') no-repeat center !important; }
diff --git a/loleaflet/images/lc_basicshapes.cube.svg b/loleaflet/images/lc_basicshapes.cube.svg
index e754b185a..36317ef15 100644
--- a/loleaflet/images/lc_basicshapes.cube.svg
+++ b/loleaflet/images/lc_basicshapes.cube.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#4d4d4d"
- d="M 6.6796875 4 L 4.6953125 6 L 17.291016 6 L 19.306641 4 L 6.6796875 4 z M 20 4.6992188 L 18 6.6875 L 18 18.306641 L 20 16.3125 L 20 4.6992188 z M 4 7 L 4 20 L 17 20 L 17 7 L 4 7 z "
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 6v15h15l3-3v-15h-15z" fill="#fff"/><path d="m6 2-4 4v16h16l4-4v-16zm .4140625 1h13.8789065l-2.646485 2.6464844-.353515.3535156h-13.8789065zm14.5859375.7070312v13.8789068l-3 3v-13.8789068l.353516-.3535156zm-18 3.2929688h14v14h-14z" fill="#808080"/></svg>
\ No newline at end of file
commit f5d8317189f9bc872e0eb4f232f82917152b7799
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Feb 6 23:02:32 2019 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
loleaflet: disable Conditional Formatting
Change-Id: Iad9150b16f56e9460a9277f29813419fc50de90c
Reviewed-on: https://gerrit.libreoffice.org/67480
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index eb152f82a..882481831 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -362,15 +362,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:FormatMenu', 'spreadsheet'), type: 'menu', menu: [
{uno: '.uno:ResetAttributes'},
{uno: '.uno:FormatCellDialog'},
- {uno: '.uno:PageFormatDialog'},
- {name: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet'), type: 'menu', menu: [
- {uno: '.uno:ConditionalFormatDialog'},
- {uno: '.uno:ColorScaleFormatDialog'},
- {uno: '.uno:DataBarFormatDialog'},
- {uno: '.uno:IconSetFormatDialog'},
- {uno: '.uno:CondDateFormatDialog'},
- {type: 'separator'},
- {uno: '.uno:ConditionalFormatManagerDialog'}]},
+ {uno: '.uno:PageFormatDialog'}
]},
{name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [
{name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [
commit f956fa9a5a912f71e7e9f70adf45f5ce561e0695
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Feb 6 17:07:16 2019 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
loleaflet: add menu item Format→Section
Change-Id: Iad9150b16f56e9460a9286f29813419fc50de90c
Reviewed-on: https://gerrit.libreoffice.org/67477
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index d49815751..eb152f82a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -181,6 +181,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:ParagraphDialog'},
{uno: '.uno:OutlineBullet'},
{uno: '.uno:PageDialog'},
+ {uno: '.uno:EditRegion'},
{type: 'separator'},
{uno: '.uno:FormatColumns'},
{type: 'separator'},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index e40ef6397..969a6292a 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -67,6 +67,7 @@ var unoCommandsArray = {
DuplicateSlide:{presentation:{menu:_('Duplicate ~Slide'),},},
EditHeaderAndFooter:{spreadsheet:{menu:_('~Headers and Footers...'),},},
EditMenu:{global:{menu:_('~Edit'),},},
+ EditRegion:{text:{menu:_('~Sections...'),}},
EditStyle:{global:{menu:_('~Edit Style...'),},presentation:{menu:_('E~dit Style...'),},},
EntireCell:{text:{menu:_('C~ell'),},},
EntireColumn:{presentation:{menu:_('~Columns'),},text:{menu:_('~Column'),},},
commit c44a06c2a4980de3f11a567ff213c5e74710b874
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Feb 6 15:53:50 2019 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
loleaflet: disable Watermarking dialog
Change-Id: I266fd6da07964a203f0a4a08f6641bdf82751a1c
Reviewed-on: https://gerrit.libreoffice.org/67471
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 9a090f6c3..d49815751 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -182,8 +182,6 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:OutlineBullet'},
{uno: '.uno:PageDialog'},
{type: 'separator'},
- {uno: '.uno:Watermark'},
- {type: 'separator'},
{uno: '.uno:FormatColumns'},
{type: 'separator'},
{uno: '.uno:ResetAttributes'}
commit 10e9f14f66b9bfe07d445fa42b82b93cf8c85295
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Feb 5 19:55:57 2019 +0000
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
systemplate files should not be writable by lool user
Change-Id: Ifb4fb7e5d5c1861b5e26bb6a710acb28e546c846
Reviewed-on: https://gerrit.libreoffice.org/67426
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in
index 110db43b6..bbbfcfeda 100755
--- a/debian/loolwsd.postinst.in
+++ b/debian/loolwsd.postinst.in
@@ -23,7 +23,7 @@ case "$1" in
fc-cache @LO_PATH@/share/fonts/truetype
- su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null 2>&1"
+ loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null 2>&1
cat << EOF > /etc/apt/apt.conf.d/25loolwsd
// Rebuild systemplate of LibreOffice Online
DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null 2>&1'"; };
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c5948bb00..bc0a06d15 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -32,7 +32,7 @@ RUN rm -rf /opt/lool
RUN mkdir -p /opt/lool/child-roots
RUN chown lool: /opt/lool
RUN chown lool: /opt/lool/child-roots
-RUN su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice >/dev/null 2>&1"
+RUN loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice >/dev/null 2>&1
RUN touch /var/log/loolwsd.log
RUN chown lool /var/log/loolwsd.log
CMD bash /run-lool.sh
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 9a7233932..25253db87 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -231,7 +231,7 @@ chown lool:lool ${loolparent}/lool
chown lool:lool ${loolparent}/lool/child-roots
fc-cache ${loroot}/share/fonts/truetype
-su lool -c "loolwsd-systemplate-setup ${loolparent}/lool/systemplate ${loroot} >/dev/null 2>&1"
+loolwsd-systemplate-setup ${loolparent}/lool/systemplate ${loroot} >/dev/null 2>&1
%if 0%{?rhel} == 6 || 0%{?suse_version} == 1110
if [ $LOOLWSD_IS_ACTIVE == "1" ]; then /etc/init.d/loolwsd start; fi
commit d03b496ba4fba41b90a652316583839cc1970f56
Author: merttumer <mert.tumer at collabora.com>
AuthorDate: Thu Jan 24 18:30:31 2019 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Fix Print is not shown on readonly mode
Change-Id: I360633cdaefafad42605b28aeffbbe4061bc4bdb
Signed-off-by: merttumer <mert.tumer at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/66876
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index c1ea59916..9a090f6c3 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -433,7 +433,7 @@ L.Control.Menubar = L.Control.extend({
allowedViewModeActions: [
'downloadas-pdf', 'downloadas-odt', 'downloadas-doc', 'downloadas-docx', 'downloadas-rtf', // file menu
- 'downloadas-odp', 'downloadas-ppt', 'downloadas-pptx', // file menu
+ 'downloadas-odp', 'downloadas-ppt', 'downloadas-pptx', 'print', // file menu
'downloadas-ods', 'downloadas-xls', 'downloadas-xlsx', // file menu
'fullscreen', 'zoomin', 'zoomout', 'zoomreset', // view menu
'about', 'keyboard-shortcuts' // help menu
commit 9dac7f449ebb85d87e567ba481e1ac1217289e36
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Feb 7 11:34:19 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Get languages, annotations, fonts on reload
Change-Id: If713092dab75bb744cf9c584a30006558d8d738c
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index fe40b2dd8..6880b4b1b 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -224,6 +224,15 @@ L.Map = L.Evented.extend({
loadDocument: function() {
this._socket.connect();
+ this.sendInitUNOCommands();
+ },
+
+ sendInitUNOCommands: function() {
+ // TODO: remove duplicated init code
+ this._socket.sendMessage('commandvalues command=.uno:LanguageStatus');
+ this._socket.sendMessage('commandvalues command=.uno:ViewAnnotations');
+ this.fire('updatescrolloffset');
+ this._docLayer._getToolbarCommandsValues();
},
// public methods that modify map state
commit de80d065282ed1edc8696e8da0bff7003b3bdb0f
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Feb 6 15:08:08 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Move toolbar init. to Signing.js, remove logout
Change-Id: I6d65a3cedbc0bce6d6792a8114537bcc6e014a37
(cherry picked from commit d10541cd58d030f36818084d7a39b2c815962986)
Reviewed-on: https://gerrit.libreoffice.org/67485
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Tested-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 591f96361..b23e58be7 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1092,22 +1092,7 @@ function initNormalToolbar(toolItems) {
toolbar.w2toolbar({
name: 'document-signing-bar',
tooltip: 'bottom',
- items: [
- {type: 'html', id: 'left'},
- {type: 'html', id: 'logo', html: '<img src="images/vereign.png" style="padding-right: 16px; padding-left: 6px; height: 32px"/>' },
- {type: 'menu', id: 'passport', caption: _('Select passport'), items: []},
- {type: 'html', id: 'current-passport', html: _('Passport: N/A')},
- {type: 'break', id: 'passport-break' },
- {type: 'button', id: 'sign-upload', caption: _('Sign & Upload'), img: '', hint: _('Sign and upload document')},
- {type: 'break', id: 'sign-upload-break' },
- {type: 'html', id: 'current-document-status-label', html: '<p><b>' + _('Status:') + ' </b></p>'},
- {type: 'html', id: 'current-document-status', html: _('N/A')},
- {type: 'spacer'},
- {type: 'html', id: 'identity', html: ''},
- {type: 'button', id: 'logout', caption: _('Logout'), img: '', hint: _('Logout')},
- {type: 'button', id: 'login', caption: _('Login'), img: '', hint: _('Login')},
- {type: 'button', id: 'close-document-signing-bar', img: 'closetoolbar', hint: _('Close')},
- ],
+ items: map.setupSigningToolbarItems(),
onClick: function (e) {
onClick(e, e.target);
hideTooltip(this, e.target);
diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index 3f795686f..da60783ea 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -158,7 +158,6 @@ function adjustUIState() {
w2ui['document-signing-bar'].show('identity');
w2ui['document-signing-bar'].hide('login');
- w2ui['document-signing-bar'].show('logout');
}
else {
w2ui['document-signing-bar'].hide('passport');
@@ -172,7 +171,6 @@ function adjustUIState() {
w2ui['document-signing-bar'].show('login');
else
w2ui['document-signing-bar'].hide('login');
- w2ui['document-signing-bar'].hide('logout');
}
w2ui['document-signing-bar'].get('current-document-status').html = '<p>' + currentDocumentSigningStatus + '</p>';
@@ -447,7 +445,7 @@ L.Map.include({
if (el)
el.resize();
},
- hideSignDocument: function() {
+ hideSignToolbar: function() {
$('#document-signing-bar').hide();
library = null;
identity = null;
@@ -577,14 +575,12 @@ L.Map.include({
},
handleSigningClickEvent: function(id, item) {
if (id === 'close-document-signing-bar') {
- this.hideSignDocument();
+ this.signingLogout();
+ this.hideSignToolbar();
}
- else if (id === 'login') {
+ else if (id === 'login' || id === 'identity') {
this.signingLogin();
}
- else if (id === 'logout') {
- this.signingLogout();
- }
else if (id === 'sign-upload') {
vereignSignAndUploadDocument();
}
@@ -593,6 +589,21 @@ L.Map.include({
}
return false;
},
+ setupSigningToolbarItems: function() {
+ return [
+ {type: 'html', id: 'logo', html: '<a href="http://www.vereign.com" target="_blank"><img src="images/vereign.png" style="padding-right: 16px; padding-left: 6px; height: 32px"/></a>' },
+ {type: 'menu', id: 'passport', caption: _('Select passport'), items: []},
+ {type: 'html', id: 'current-passport', html: _('Passport: N/A')},
+ {type: 'break', id: 'passport-break' },
+ {type: 'button', id: 'sign-upload', caption: _('Sign'), img: '', hint: _('Sign document')},
+ {type: 'break', id: 'sign-upload-break' },
+ {type: 'html', id: 'current-document-status-label', html: '<p><b>' + _('Status:') + ' </b></p>'},
+ {type: 'html', id: 'current-document-status', html: _('N/A')},
+ {type: 'spacer'},
+ {type: 'html', id: 'identity', html: ''},
+ {type: 'button', id: 'login', caption: _('Login'), img: '', hint: _('Login')},
+ {type: 'button', id: 'close-document-signing-bar', img: 'closetoolbar', hint: _('Close')}];
+ },
onChangeSignStatus: function(signstatus) {
var statusText = '';
// This is meant to be in sync with core.git
commit 0fe6ee048bb96cd09e865029689b6939cb93ca59
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Feb 6 14:35:47 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Change the signing toolbar color to Vereign color
Change-Id: I6b0cdd489e663a255ff427c2790b7b27382b4c32
(cherry picked from commit 2acfb2943a69423adf56aa3e8ad40ba32385ec4e)
Reviewed-on: https://gerrit.libreoffice.org/67484
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Tested-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 1276e14f3..93d9f9215 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -20,7 +20,7 @@
}
#document-signing-bar {
- background-color: #dd000088;
+ background-color: #ef324e;;
}
w2ui-toolbar {
commit 0e892ba7da15f61bf82853ff242fc275b64048d4
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Mon Feb 4 15:18:23 2019 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
loleaflet: calc: show 'merge cells' to the toolbar
Change-Id: I4ed9121a48b3b2dd368ff16d5d7a268f20566609
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index c5bd91ead..591f96361 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1572,7 +1572,7 @@ function onDocLayerInit() {
case 'spreadsheet':
toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'conditionalformaticonset',
'numberformatcurrency', 'numberformatpercent',
- 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
+ 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'togglemergecells', 'breakmergecells',
'setborderstyle');
toolbarUp.remove('styles');
commit 5445ada5fc44d81fba246c090dc26aad35217bb4
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Feb 6 10:32:11 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Show '>>' scroll on the top
Change-Id: I8d3a202f91f5dc7345010c4d7a04db5f0bbe94b5
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 56fe9bf66..1276e14f3 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -67,7 +67,7 @@ w2ui-toolbar {
.w2ui-scroll-left,
.w2ui-scroll-right {
- z-index: 15;
+ z-index: 1000;
}
/* center the toolbar */
commit 71f92014bad04b54a9d7910c359662f09d24f51b
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Mon Feb 4 14:26:34 2019 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
loleaflet: remove 'Sum' from toolbar
Change-Id: I6ced414a8be20a02aee6ed3e260405715d6a6fe3
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 5d948a786..c5bd91ead 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1572,7 +1572,7 @@ function onDocLayerInit() {
case 'spreadsheet':
toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'conditionalformaticonset',
'numberformatcurrency', 'numberformatpercent',
- 'numberformatincdecimals', 'numberformatdecdecimals', 'sum', 'break-number',
+ 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'setborderstyle');
toolbarUp.remove('styles');
commit df765d7df1698d7ee4fe4bbca9c66bb18ee658f4
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Feb 4 19:00:07 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
conditional formatting: Enable the toolbar button in calc.
Change-Id: I7191d367f8cb95e087b8e4899e94d4d241b9fae3
Reviewed-on: https://gerrit.libreoffice.org/67375
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 106a1dc71..5d948a786 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1570,7 +1570,8 @@ function onDocLayerInit() {
switch (docType) {
case 'spreadsheet':
- toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'numberformatcurrency', 'numberformatpercent',
+ toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'conditionalformaticonset',
+ 'numberformatcurrency', 'numberformatpercent',
'numberformatincdecimals', 'numberformatdecdecimals', 'sum', 'break-number',
'setborderstyle');
toolbarUp.remove('styles');
commit 62b4888446cb8758a6967a88c35c89366d097d92
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jan 30 11:07:13 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
we need share/template/common/internal/idxexample.odt for Insert TOC dialog
Change-Id: I1b33b3c74695605c0bf887d1e730f833f286c33f
Reviewed-on: https://gerrit.libreoffice.org/67119
Reviewed-by: Mert Tümer <mert.tumer at collabora.com>
Tested-by: Mert Tümer <mert.tumer at collabora.com>
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index f1846f9a4..a91514ed4 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -153,7 +153,6 @@ namespace
strcmp(path, "share/basic") != 0 &&
strcmp(path, "share/Scripts/java") != 0 &&
strcmp(path, "share/Scripts/javascript") != 0 &&
- strcmp(path, "share/template") != 0 &&
strcmp(path, "share/config/wizard") != 0;
default: // LinkOrCopyType::All
return true;
commit a5f24fec80b1d3d056db220300ec7d194a413cbd
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jan 31 11:01:41 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
docker: checkout online from $ONLINE_BRANCH
Change-Id: I62e2b88a9ffc68023246cf2ace9452b3810fd4dd
diff --git a/docker/docker-nightly.sh b/docker/docker-nightly.sh
index 88365b08f..ad7b49be0 100755
--- a/docker/docker-nightly.sh
+++ b/docker/docker-nightly.sh
@@ -79,7 +79,7 @@ if test ! -d online ; then
( cd online && ./autogen.sh ) || exit 1
fi
-( cd online && git checkout -f $LIBREOFFICE_BRANCH && git pull -r ) || exit 1
+( cd online && git checkout -f $ONLINE_BRANCH && git pull -r ) || exit 1
##### LibreOffice #####
commit fb9d159c6c62f9cbe0bf207688743734f8ded45a
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jan 31 10:53:25 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
docker: build docker from src
Change-Id: I9a60cb7b596a997a1f3be04bfa8165ca064e554f
diff --git a/docker/docker-nightly.sh b/docker/docker-nightly.sh
new file mode 100755
index 000000000..88365b08f
--- /dev/null
+++ b/docker/docker-nightly.sh
@@ -0,0 +1,168 @@
+#! /bin/bash
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# -- Available env vars --
+# * DOCKER_HUB_REPO - which Docker Hub repo to use
+# * DOCKER_HUB_TAG - which Docker Hub tag to create
+# * LIBREOFFICE_BRANCH - which core branch to build
+# * ONLINE_BRANCH - which online branch to build
+# * LIBREOFFICE_BUILD_TARGET - which make target to run (in core repo)
+# * ONLINE_EXTRA_BUILD_OPTIONS - extra build options for online
+# * NO_DOCKER_IMAGE - if set, don't build the docker image itself, just do all the preps
+
+LIBREOFFICE_BRANCH=distro/collabora/cp-6.0
+ONLINE_BRANCH=distro/collabora/collabora-online-4
+
+# check we can sudo without asking a pwd
+echo "Trying if sudo works without a password"
+echo
+echo "If you get a password prompt now, break, and fix your setup using 'sudo visudo'; add something like:"
+echo "yourusername ALL=(ALL) NOPASSWD: ALL"
+echo
+sudo echo "works"
+
+# Check env variables
+if [ -z "$DOCKER_HUB_REPO" ]; then
+ DOCKER_HUB_REPO="collabora/code"
+fi;
+if [ -z "$DOCKER_HUB_TAG" ]; then
+ DOCKER_HUB_TAG=""
+fi;
+echo "Using Docker Hub Repository: '$DOCKER_HUB_REPO' with tag '$DOCKER_HUB_TAG'."
+
+if [ -z "$LIBREOFFICE_BRANCH" ]; then
+ LIBREOFFICE_BRANCH="master"
+fi;
+echo "Building branch '$LIBREOFFICE_BRANCH'"
+
+if [ -z "$LIBREOFFICE_BUILD_TARGET" ]; then
+ LIBREOFFICE_BUILD_TARGET=""
+fi;
+echo "LibreOffice build target: '$LIBREOFFICE_BUILD_TARGET'"
+
+# check if we have jake
+which jake || { cat << EOF
+
+jake is not installed, get it like:
+
+ npm install -g jake
+EOF
+exit 1 ; }
+
+# do everything in the builddir
+SRCDIR=$(realpath `dirname $0`)
+INSTDIR="$SRCDIR/instdir"
+BUILDDIR="$SRCDIR/builddir"
+
+mkdir -p "$BUILDDIR"
+cd "$BUILDDIR"
+
+rm -rf "$INSTDIR" || true
+mkdir -p "$INSTDIR"
+
+##### cloning & updating #####
+
+# libreoffice repo
+if test ! -d libreoffice ; then
+ git clone https://git.libreoffice.org/core libreoffice || exit 1
+fi
+
+( cd libreoffice && git checkout $LIBREOFFICE_BRANCH && ./g pull -r ) || exit 1
+
+# online repo
+if test ! -d online ; then
+ git clone https://git.libreoffice.org/online online || exit 1
+ ( cd online && ./autogen.sh ) || exit 1
+fi
+
+( cd online && git checkout -f $LIBREOFFICE_BRANCH && git pull -r ) || exit 1
+
+##### LibreOffice #####
+
+# build LibreOffice
+cat > libreoffice/autogen.input << EOF
+--disable-cups
+--disable-dbus
+--disable-dconf
+--disable-epm
+--disable-evolution2
+--disable-ext-nlpsolver
+--disable-ext-wiki-publisher
+--disable-firebird-sdbc
+--disable-gio
+--disable-gstreamer-0-10
+--disable-gstreamer-1-0
+--disable-gtk
+--disable-gtk3
+--disable-qt5
+--disable-kde5
+--disable-odk
+--disable-online-update
+--disable-pdfimport
+--disable-postgresql-sdbc
+--disable-report-builder
+--disable-scripting-beanshell
+--disable-scripting-javascript
+--disable-sdremote
+--disable-sdremote-bluetooth
+--enable-extension-integration
+--enable-mergelibs
+--enable-python=internal
+--enable-release-build
+--with-external-dict-dir=/usr/share/hunspell
+--with-external-hyph-dir=/usr/share/hyphen
+--with-external-thes-dir=/usr/share/mythes
+--with-fonts
+--with-galleries=no
+--with-lang=ALL
+--with-linker-hash-style=both
+--with-system-dicts
+--with-system-zlib
+--with-theme=colibre
+--without-branding
+--without-help
+--without-java
+--without-junit
+--with-myspell-dicts
+--without-package-format
+--without-system-cairo
+--without-system-jars
+--without-system-jpeg
+--without-system-libpng
+--without-system-libxml
+--without-system-openssl
+--without-system-poppler
+--without-system-postgresql
+EOF
+
+( cd libreoffice && ./autogen.sh ) || exit 1
+( cd libreoffice && make $LIBREOFFICE_BUILD_TARGET ) || exit 1
+
+# copy stuff
+mkdir -p "$INSTDIR"/opt/
+cp -a libreoffice/instdir "$INSTDIR"/opt/libreoffice
+
+# FIXME fix RPATH of libcairo
+chrpath -r '$ORIGIN' "$INSTDIR"/opt/libreoffice/program/libcairo.so.2
+
+##### loolwsd & loleaflet #####
+
+# build
+( cd online && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-silent-rules --with-lokit-path="$BUILDDIR"/libreoffice/include --with-lo-path="$INSTDIR"/opt/libreoffice $ONLINE_EXTRA_BUILD_OPTIONS) || exit 1
+( cd online && make -j 8) || exit 1
+
+# copy stuff
+( cd online && DESTDIR="$INSTDIR" make install ) || exit 1
+
+# Create new docker image
+if [ -z "$NO_DOCKER_IMAGE" ]; then
+ cd "$SRCDIR"
+ docker build --no-cache -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG . || exit 1
+ docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG || exit 1
+else
+ echo "Skipping docker image build"
+fi;
commit c12ddb3503056bb3a601d532ad54823351b8f8e8
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jan 30 18:20:30 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Show combobox list on top
Change-Id: Id527d99cb6eaaf658eb628050e5a969cef0ccc39
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 00c50a3df..56fe9bf66 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -62,9 +62,7 @@ w2ui-toolbar {
* as a container
*/
.select2-container {
- margin-left: 3px;
- margin-right: 3px;
- z-index: 11;
+ z-index: 1000;
}
.w2ui-scroll-left,
commit dd4e0bb1460f12a835b05144f5cae023ac86af6d
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jan 30 17:04:15 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Check if annotation exists before use
Change-Id: I79204a8baeaa7b2896b153475cde2ba873b28738
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index a2c710eb5..fe40b2dd8 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -273,7 +273,8 @@ L.Map = L.Evented.extend({
for (var idxAnno in this._docLayer._annotations._items) {
var annotation = this._docLayer._annotations._items[idxAnno];
var username = annotation._data.author;
- annotation._data.avatar = this._viewInfoByUserName[username].userextrainfo.avatar;
+ if (this._viewInfoByUserName[username])
+ annotation._data.avatar = this._viewInfoByUserName[username].userextrainfo.avatar;
annotation._updateContent();
}
}
commit 1aacacff171a0fb53e4f60b5ed00883628869882
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jan 30 10:48:32 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Make avatar unified and colored
Change-Id: I2991f8d6a5e0660c2ea857e397588f162f557c60
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 798612ca7..a6aefc2b2 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -302,6 +302,11 @@ body {
display: inline-block;
}
+.avatar-img {
+ border: solid 2px;
+ border-radius: 50%;
+}
+
.loleaflet-annotation-author {
padding-left: 10px;
padding-right: 10px;
@@ -354,12 +359,6 @@ body {
font-size: 11px;
}
-.loleaflet-annotation-userline {
- background-color: darkblue;
- width: 32px;
- height: 6px;
-}
-
.loleaflet-annotation-menubar {
margin: 0;
padding: 0;
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index b122ad85b..106a1dc71 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2333,7 +2333,7 @@ function getUserItem(viewId, userName, extraInfo, color) {
var html = '<tr class="' + className + '" id="user-' + viewId + '" onclick="onUseritemClicked(event)">' +
'<td class=usercolor>';
if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
- html += '<img src="' + extraInfo.avatar + '" width="32" height="32" style="border: 5px solid ' + color + ';" />';
+ html += '<img class="avatar-img" src="' + extraInfo.avatar + '" style="border-color: ' + color + ';" />';
}
// TODO: Add mail and other links as sub-menu.
diff --git a/loleaflet/src/layer/AnnotationManager.js b/loleaflet/src/layer/AnnotationManager.js
index 80bdd01aa..c8a623639 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -796,15 +796,12 @@ L.AnnotationManager = L.Class.extend({
var initNeeded = (this._initialLayoutData === undefined);
var contentWrapperClass = $('.loleaflet-annotation-content-wrapper');
if (initNeeded && contentWrapperClass.length > 0) {
- var userlineClass = $('.loleaflet-annotation-userline');
var contentAuthor = $('.loleaflet-annotation-content-author');
var dateClass = $('.loleaflet-annotation-date');
this._initialLayoutData = {
wrapperWidth: parseInt(contentWrapperClass.css('width')),
wrapperFontSize: parseInt(contentWrapperClass.css('font-size')),
- authorLineWidth: parseInt(userlineClass.css('width')),
- authorLineHeight: parseInt(userlineClass.css('height')),
authorContentHeight: parseInt(contentAuthor.css('height')),
dateFontSize: parseInt(dateClass.css('font-size')),
};
diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index 2ea749f94..0eedb26a3 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -193,12 +193,11 @@ L.Annotation = L.Layer.extend({
var tr = L.DomUtil.create('tr', empty, tbody);
var tdImg = L.DomUtil.create(tagTd, 'loleaflet-annotation-img', tr);
var tdAuthor = L.DomUtil.create(tagTd, 'loleaflet-annotation-author', tr);
- var imgAuthor = L.DomUtil.create('img', empty, tdImg);
+ var imgAuthor = L.DomUtil.create('img', 'avatar-img', tdImg);
imgAuthor.setAttribute('src', L.Icon.Default.imagePath + '/user.png');
imgAuthor.setAttribute('width', this.options.imgSize.x);
imgAuthor.setAttribute('height', this.options.imgSize.y);
this._authorAvatarImg = imgAuthor;
- this._authorUserLine = L.DomUtil.create(tagDiv, 'loleaflet-annotation-userline', tdImg);
this._contentAuthor = L.DomUtil.create(tagDiv, 'loleaflet-annotation-content-author', tdAuthor);
this._contentDate = L.DomUtil.create(tagDiv, 'loleaflet-annotation-date', tdAuthor);
@@ -359,6 +358,11 @@ L.Annotation = L.Layer.extend({
$(this._nodeModifyText).text(this._data.text);
$(this._contentAuthor).text(this._data.author);
$(this._authorAvatarImg).attr('src', this._data.avatar);
+ var user = this._map.getViewId(this._data.author);
+ if (user >= 0) {
+ var color = L.LOUtil.rgbToHex(this._map.getViewColor(user));
+ $(this._authorAvatarImg).css('border-color', color);
+ }
var d = new Date(this._data.dateTime.replace(/,.*/, 'Z'));
var dateOptions = { weekday: 'short', year: 'numeric', month: 'short', day: 'numeric' };
@@ -385,10 +389,6 @@ L.Annotation = L.Layer.extend({
this._wrapper.style.width = wrapperWidth + 'px';
var wrapperFontSize = Math.round(initialLayoutData.wrapperFontSize * scaleFactor);
this._wrapper.style.fontSize = wrapperFontSize + 'px';
- var authorLineWidth = Math.round(initialLayoutData.authorLineWidth * scaleFactor);
- this._authorUserLine.style.width = authorLineWidth + 'px';
- var authorLineHeight = Math.round(initialLayoutData.authorLineHeight * scaleFactor);
- this._authorUserLine.style.height = authorLineHeight + 'px';
var contentAuthorHeight = Math.round(initialLayoutData.authorContentHeight * scaleFactor);
this._contentAuthor.style.height = contentAuthorHeight + 'px';
var dateFontSize = Math.round(initialLayoutData.dateFontSize * scaleFactor);
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 06e26f6ca..a2c710eb5 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -271,10 +271,10 @@ L.Map = L.Evented.extend({
updateAvatars: function() {
if (this._docLayer && this._docLayer._annotations && this._docLayer._annotations._items) {
for (var idxAnno in this._docLayer._annotations._items) {
- var username = this._docLayer._annotations._items[idxAnno]._data.author;
- if (this._viewInfoByUserName[username]) {
- $(this._docLayer._annotations._items[idxAnno]._authorAvatarImg).attr('src', this._viewInfoByUserName[username].userextrainfo.avatar);
- }
+ var annotation = this._docLayer._annotations._items[idxAnno];
+ var username = annotation._data.author;
+ annotation._data.avatar = this._viewInfoByUserName[username].userextrainfo.avatar;
+ annotation._updateContent();
}
}
},
commit 709a01db8ddc464bae31941c4547407db08f9b72
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jan 30 09:31:44 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Reduce readonly toolbar height in calc
Change-Id: If1784b0626080792b7f80c57ff956367be390198
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 8d39c9690..07f27f6e7 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -6,7 +6,7 @@
}
#document-container.spreadsheet-document.readonly {
- top: 61px;
+ top: 56px;
}
#document-container.spreadsheet-document.tablet {
@@ -74,7 +74,7 @@
}
#spreadsheet-row-column-frame.readonly {
- top: 41px;
+ top: 36px;
}
#spreadsheet-row-column-frame.tablet {
commit 903c871315831db6b867f16a4c3b01c12b3e1d52
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jan 30 11:05:29 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
remove duplicated check for 'share/config/wizard'
Change-Id: I46f274825a7be024c87ec9b3cc491c5dc91ffa14
Reviewed-on: https://gerrit.libreoffice.org/67118
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 181c99d1f..f1846f9a4 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -154,7 +154,6 @@ namespace
strcmp(path, "share/Scripts/java") != 0 &&
strcmp(path, "share/Scripts/javascript") != 0 &&
strcmp(path, "share/template") != 0 &&
- strcmp(path, "share/config/wizard") != 0 &&
strcmp(path, "share/config/wizard") != 0;
default: // LinkOrCopyType::All
return true;
commit 2027e324e666ac7c3b01ee1a6b1d48b0fcb1aaa6
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jan 29 20:51:16 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Unify whitespaces in loleaflet.css
Change-Id: I6d916acac8f6b7d4c71eab4fd63b5e13d61be4a1
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index d42c7c4e4..798612ca7 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -13,11 +13,11 @@
}
#document-container.readonly {
- top: 36px;
+ top: 36px;
}
#toolbar-wrapper.readonly {
- display: none;
+ display: none;
}
#map {
@@ -36,111 +36,112 @@
}
.loleaflet-scrollbar-show {
- opacity: 1 !important;
- filter: "alpha(opacity=100)" !important;
- -ms-filter: "alpha(opacity=100)" !important;
+ opacity: 1 !important;
+ filter: "alpha(opacity=100)" !important;
+ -ms-filter: "alpha(opacity=100)" !important;
}
body {
- margin: 0;
- overflow: hidden;
- overscroll-behavior-y: none; /* disable the pull to reload gesture */
- background: #ffffff;
- touch-action: none;
+ margin: 0;
+ overflow: hidden;
+ overscroll-behavior-y: none; /* disable the pull to reload gesture */
+ background: #ffffff;
+ touch-action: none;
}
#presentation-controls-wrapper {
- background: #dfdfdf;
- position: absolute;
- top: 77px;
- left: 0px;
- bottom: 66px;
- max-width: 218px;
- border-top: 1px solid #b6b6b6;
- display: block;
+ background: #dfdfdf;
+ position: absolute;
+ top: 77px;
+ left: 0px;
+ bottom: 66px;
+ max-width: 218px;
+ border-top: 1px solid #b6b6b6;
+ display: block;
}
#presentation-controls-wrapper.drawing {
- bottom: 40px; /* Hide the presentation toolbar (insert slide etc.) for doctype = drawing */
+ bottom: 40px; /* Hide the presentation toolbar (insert slide etc.) for doctype = drawing */
}
#presentation-controls-wrapper.readonly {
- top: 36px;
+ top: 36px;
}
#toolbar-wrapper {
- position: relative;
- table-layout: fixed;
- border-collapse: collapse;
+ position: relative;
+ table-layout: fixed;
+ border-collapse: collapse;
width: 100%;
border-top: 1px solid #bbbbbb;
}
#toolbar-logo {
- width: 0;
+ width: 0;
}
#toolbar-hamburger {
- width: 0;
+ width: 0;
}
#mobile-edit-button {
- position: absolute;
- width: 56px;
- height: 56px;
- right: 16px;
- bottom: 16px;
- background-color: #0b87e7;
- border-radius: 50%;
- box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
- z-index: 2000;
+ position: absolute;
+ width: 56px;
+ height: 56px;
+ right: 16px;
+ bottom: 16px;
+ background-color: #0b87e7;
+ border-radius: 50%;
+ box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+ z-index: 2000;
}
#mobile-edit-button-image {
- position: relative;
- left: 16px;
- top: 16px;
- width: 24px;
- height: 24px;
- background: url('images/baseline-edit-24px.svg') no-repeat center !important;
+ position: relative;
+ left: 16px;
+ top: 16px;
+ width: 24px;
+ height: 24px;
+ background: url('images/baseline-edit-24px.svg') no-repeat center !important;
}
@media (max-width: 767px),(max-device-height: 767px) {
- /* Show slidesorter beyond 768px only */
- #presentation-controls-wrapper {
+ /* Show slidesorter beyond 768px only */
+ #presentation-controls-wrapper {
display: none;
- }
+ }
- #document-container.tablet {
- top: 41px;
- }
+ #document-container.tablet {
+ top: 41px;
+ }
- #document-container.readonly {
- top: 41px;
- }
+ #document-container.readonly {
+ top: 41px;
+ }
- #document-container.parts-preview-document {
+ #document-container.parts-preview-document {
left: 0px !important;
- }
- #document-container.spreadsheet-document {
+ }
+ #document-container.spreadsheet-document {
top: 103px !important;
- }
- #document-container.spreadsheet-document.readonly {
+ }
+ #document-container.spreadsheet-document.readonly {
top: 61px !important;
- }
- #document-container {
+ }
+ #document-container {
top: 41px;
- }
- #spreadsheet-row-column-frame {
+
+ }
+ #spreadsheet-row-column-frame {
top: 83px !important;
- }
- #spreadsheet-row-column-frame.readonly {
+ }
+ #spreadsheet-row-column-frame.readonly {
top: 41px !important;
- }
- #toolbar-hamburger {
+ }
+ #toolbar-hamburger {
width: 41px;
- }
- #closebuttonwrapper {
+ }
+ #closebuttonwrapper {
display: none;
}
/* Show menubar even if folded */
@@ -150,9 +151,9 @@ body {
}
.loleaflet-font {
- font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif !important;
- font-size: 12px !important;
- font-weight: normal !important;
+ font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif !important;
+ font-size: 12px !important;
+ font-weight: normal !important;
}
.loleaflet-character {
@@ -248,8 +249,8 @@ body {
}
.loleaflet-dont-break {
- /* These are technically the same, but use both */
- overflow-wrap: break-word;
+ /* These are technically the same, but use both */
+ overflow-wrap: break-word;
word-wrap: break-word;
/* Don't eat new lines */
@@ -313,32 +314,32 @@ body {
.loleaflet-annotation-menu, .loleaflet-annotation-menu-redline, .loleaflet-redline-accept-button, .loleaflet-redline-reject-button {
margin: 0;
- padding: 0;
- width: 24px;
- height: 24px;
+ padding: 0;
+ width: 24px;
+ height: 24px;
vertical-align: top;
border: 1px solid transparent;
display: inline-block;
}
.loleaflet-redline-accept-button {
- background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important;
+ background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important;
}
.loleaflet-redline-reject-button {
- background: url('images/lc_rejecttrackedchange.svg') no-repeat center !important;
+ background: url('images/lc_rejecttrackedchange.svg') no-repeat center !important;
}
.loleaflet-context-copy {
- background: url('images/lc_copy.svg') no-repeat center !important;
+ background: url('images/lc_copy.svg') no-repeat center !important;
}
.loleaflet-context-cut {
- background: url('images/lc_cut.svg') no-repeat center !important;
+ background: url('images/lc_cut.svg') no-repeat center !important;
}
.loleaflet-context-paste {
- background: url('images/lc_paste.svg') no-repeat center !important;
+ background: url('images/lc_paste.svg') no-repeat center !important;
}
.loleaflet-annotation-menu, .loleaflet-annotation-menu-redline {
@@ -366,7 +367,7 @@ body {
}
.loleaflet-annotation-caption {
- font-weight: bold;
+ font-weight: bold;
}
.loleaflet-bar {
@@ -449,14 +450,14 @@ body {
}
.lokdialog_canvas {
- cursor: default;
- display: block; /* required to remove all borders around canvas element */
- caret-color: transparent; /* firefox shows a caret otherwise on top-left of the canvas */
- user-select: none;
- -moz-user-select: none;
- -khtml-user-select: none;
- -webkit-user-select: none;
- -o-user-select: none;
+ cursor: default;
+ display: block; /* required to remove all borders around canvas element */
+ caret-color: transparent; /* firefox shows a caret otherwise on top-left of the canvas */
+ user-select: none;
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ -webkit-user-select: none;
+ -o-user-select: none;
}
/* Infobar */
commit 36796a29138858c36effd3e15423ef4546f96183
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jan 29 16:43:23 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Reduce readonly toolbar height
Change-Id: I431a2f3e87374a1cb6cb75557cb0d1eecccf17d0
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index fefaab466..d42c7c4e4 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -9,11 +9,11 @@
}
#document-container.tablet {
- top: 41px;
+ top: 36px;
}
#document-container.readonly {
- top: 41px;
+ top: 36px;
}
#toolbar-wrapper.readonly {
@@ -65,7 +65,7 @@ body {
}
#presentation-controls-wrapper.readonly {
- top: 41px;
+ top: 36px;
}
#toolbar-wrapper {
@@ -110,6 +110,15 @@ body {
#presentation-controls-wrapper {
display: none;
}
+
+ #document-container.tablet {
+ top: 41px;
+ }
+
+ #document-container.readonly {
+ top: 41px;
+ }
+
#document-container.parts-preview-document {
left: 0px !important;
}
commit 685470c47336ee563378e778a25a8d240308b3bc
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jan 29 17:46:05 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Start with readonly UI, then extend
Change-Id: I96352890e9a76107aa1c1df9cf4f5979688a1969
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index c8cf895c6..96bd3704e 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -87,7 +87,7 @@ ifelse(MOBILEAPP,[true],
</div>
<!-- Mobile menu toggle button (hamburger/x icon) -->
<input id="main-menu-state" type="checkbox" style="display: none"/>
- <ul id="main-menu" class="sm sm-simple lo-menu"></ul>
+ <ul id="main-menu" class="sm sm-simple lo-menu readonly"></ul>
<div id="document-titlebar">
<div class="document-title">
<input id="document-name-input" type="text" disabled="true" style="display: none"/>
@@ -121,15 +121,15 @@ ifelse(MOBILEAPP,[true],
<div class="closebuttonimage" id="closebutton"></div>
</div>
- <div id="spreadsheet-row-column-frame"></div>
+ <div id="spreadsheet-row-column-frame" class="readonly"></div>
- <div id="document-container">
+ <div id="document-container" class="readonly">
<div id="map"></div>
</div>
<div id="spreadsheet-toolbar" style="display: none"></div>
- <div id="presentation-controls-wrapper">
+ <div id="presentation-controls-wrapper" class="readonly">
<div id="slide-sorter"></div>
<div id="presentation-toolbar" style="display: none"></div>
</div>
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index ca76a11da..06e26f6ca 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -56,6 +56,11 @@ L.Map = L.Evented.extend({
// hack for https://github.com/Leaflet/Leaflet/issues/1980
this._onResize = L.bind(this._onResize, this);
+ // Start with readonly toolbars on desktop
+ if (!L.Browser.mobile) {
+ L.DomUtil.addClass(L.DomUtil.get('toolbar-wrapper'), 'readonly');
+ }
+
this._initEvents();
if (options.maxBounds) {
commit 2a87e430e17bff006aa7413a1acc20a59cb0fddd
Author: Marco Cecchetti <mrcekets at gmail.com>
AuthorDate: Wed Jan 23 16:38:47 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
calc: header corner: group level ctrls are not scaled on hidpi display
Change-Id: I9b4e016a553a3c8fc2db1a7173f95f344e108256
diff --git a/loleaflet/src/control/Control.ColumnHeader.js b/loleaflet/src/control/Control.ColumnHeader.js
index 96539f3aa..da1a87a7b 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -323,11 +323,13 @@ L.Control.ColumnHeader = L.Control.Header.extend({
var ctx = this._cornerCanvasContext;
var ctrlHeadSize = this._groupHeadSize;
var levelSpacing = this._levelSpacing;
+ var scale = L.getDpiScaleFactor();
var startOrt = levelSpacing + (ctrlHeadSize + levelSpacing) * level;
- var startPar = this._cornerCanvas.width - (ctrlHeadSize + (L.Control.Header.rowHeaderWidth - ctrlHeadSize) / 2);
+ var startPar = this._cornerCanvas.width / scale - (ctrlHeadSize + (L.Control.Header.rowHeaderWidth - ctrlHeadSize) / 2);
ctx.save();
+ ctx.scale(scale, scale);
ctx.fillStyle = this._hoverColor;
ctx.fillRect(startPar, startOrt, ctrlHeadSize, ctrlHeadSize);
ctx.strokeStyle = 'black';
@@ -521,7 +523,8 @@ L.Control.ColumnHeader = L.Control.Header.extend({
return;
}
- var rowOutlineWidth = this._cornerCanvas.width - L.Control.Header.rowHeaderWidth - this._borderWidth;
+ var scale = L.getDpiScaleFactor();
+ var rowOutlineWidth = this._cornerCanvas.width / scale - L.Control.Header.rowHeaderWidth - this._borderWidth;
if (pos.x <= rowOutlineWidth) {
// empty rectangle on the left select all
this._map.sendUnoCommand('.uno:SelectAll');
diff --git a/loleaflet/src/control/Control.Header.js b/loleaflet/src/control/Control.Header.js
index 268faabca..0390cf4f2 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -615,12 +615,12 @@ L.Control.Header = L.Control.extend({
ctx.fillStyle = this._borderColor;
if (this._isColumn) {
- var startY = this._cornerCanvas.height - (L.Control.Header.colHeaderHeight + this._borderWidth);
+ var startY = this._cornerCanvas.height / scale - (L.Control.Header.colHeaderHeight + this._borderWidth);
if (startY > 0)
ctx.fillRect(0, startY, this._cornerCanvas.width, this._borderWidth);
}
else {
- var startX = this._cornerCanvas.width - (L.Control.Header.rowHeaderWidth + this._borderWidth);
+ var startX = this._cornerCanvas.width / scale - (L.Control.Header.rowHeaderWidth + this._borderWidth);
if (startX > 0)
ctx.fillRect(startX, 0, this._borderWidth, this._cornerCanvas.height);
}
diff --git a/loleaflet/src/control/Control.RowHeader.js b/loleaflet/src/control/Control.RowHeader.js
index 93a99081b..fa61c0516 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -312,11 +312,13 @@ L.Control.RowHeader = L.Control.Header.extend({
var ctx = this._cornerCanvasContext;
var ctrlHeadSize = this._groupHeadSize;
var levelSpacing = this._levelSpacing;
+ var scale = L.getDpiScaleFactor();
var startOrt = levelSpacing + (ctrlHeadSize + levelSpacing) * level;
- var startPar = this._cornerCanvas.height - (ctrlHeadSize + (L.Control.Header.colHeaderHeight - ctrlHeadSize) / 2);
+ var startPar = this._cornerCanvas.height / scale - (ctrlHeadSize + (L.Control.Header.colHeaderHeight - ctrlHeadSize) / 2);
ctx.save();
+ ctx.scale(scale, scale);
ctx.fillStyle = this._hoverColor;
ctx.fillRect(startOrt, startPar, ctrlHeadSize, ctrlHeadSize);
ctx.strokeStyle = 'black';
commit b4fdd7cb7e22d422c877390da12ddd8d3516106b
Author: Marco Cecchetti <mrcekets at gmail.com>
AuthorDate: Wed Jan 23 16:28:00 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
loleaflet: calc: headers not adjusted when grouping rows or columns
Change-Id: Icfe2ce0bb03de34848faf8f1bee7e1d568156ca7
diff --git a/loleaflet/src/control/Control.Header.js b/loleaflet/src/control/Control.Header.js
index c8beb0c78..268faabca 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -472,7 +472,7 @@ L.Control.Header = L.Control.extend({
return Math.round(this._getParallelPos(this.converter(point)));
},
- _setCanvasSizeImpl: function (container, canvas, property, value) {
+ _setCanvasSizeImpl: function (container, canvas, property, value, isCorner) {
if (!value) {
value = parseInt(L.DomUtil.getStyle(container, property));
}
@@ -483,28 +483,31 @@ L.Control.Header = L.Control.extend({
var scale = L.getDpiScaleFactor();
if (property === 'width') {
canvas.width = value * scale;
- this._canvasWidth = value;
+ if (!isCorner)
+ this._canvasWidth = value;
+ console.log('Header._setCanvasSizeImpl: _canvasWidth' + this._canvasWidth);
}
else if (property === 'height') {
canvas.height = value * scale;
- this._canvasHeight = value;
+ if (!isCorner)
+ this._canvasHeight = value;
}
},
_setCanvasWidth: function (width) {
- this._setCanvasSizeImpl(this._headerContainer, this._canvas, 'width', width);
+ this._setCanvasSizeImpl(this._headerContainer, this._canvas, 'width', width, /*isCorner: */ false);
},
_setCanvasHeight: function (height) {
- this._setCanvasSizeImpl(this._headerContainer, this._canvas, 'height', height);
+ this._setCanvasSizeImpl(this._headerContainer, this._canvas, 'height', height, /*isCorner: */ false);
},
_setCornerCanvasWidth: function (width) {
- this._setCanvasSizeImpl(this._cornerHeaderContainer, this._cornerCanvas, 'width', width);
+ this._setCanvasSizeImpl(this._cornerHeaderContainer, this._cornerCanvas, 'width', width, /*isCorner: */ true);
},
_setCornerCanvasHeight: function (height) {
- this._setCanvasSizeImpl(this._cornerHeaderContainer, this._cornerCanvas, 'height', height);
+ this._setCanvasSizeImpl(this._cornerHeaderContainer, this._cornerCanvas, 'height', height, /*isCorner: */ true);
},
_hitOutline: function (e) {
commit 2dc56fdcf02ffaca62cd8bf7de0f696a99dce7d9
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Jan 29 15:03:17 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 11 15:18:43 2019 +0100
Updated UNO command translations
Change-Id: I2f68e6e7c89f7274da3c5005990937c8aa53053e
diff --git a/loleaflet/l10n/uno/ab.json b/loleaflet/l10n/uno/ab.json
index 3ed69178c..69b461014 100644
--- a/loleaflet/l10n/uno/ab.json
+++ b/loleaflet/l10n/uno/ab.json
@@ -23,6 +23,7 @@
"Columns ~Right":"Аиҵагылақәа арыӷьарахь",
"Comme~nt":"Акомментари",
"Comm~ent":"Акомментари",
+"Condition...":"Аҭагылазаашьа...",
"Continue previous numbering":"Иацҵатәуп аномерркра",
"Copy Hyperlink Location":"Агиперзхьарԥш акопиа ахыхтәуп",
"Co~lumns...":"Аиҵаҩқәа...",
@@ -30,6 +31,8 @@
"Current ~Index":"Уажәтәи арбага",
"C~ell":"Абларҭа",
"C~haracter...":"Асимволқәа...",
+"Data Bar...":"Агистограмма...",
+"Date...":"Арыцхә...",
"Decrease Size":"Еиҵатәтәуп акегль",
"Delete All Comments":"Ианыхтәуп акомментариқәа зегьы",
"Delete All Comments by This Author":"Ианыхтәуп автор икомментариқәа зегьы",
@@ -61,6 +64,7 @@
"H~ide":"Иҵәахтәуп",
"H~ide Columns":"Иҵәахтәуп аиҵагылақәа",
"H~ide Rows":"Иҵәахтәуп ацәаҳәақәа",
+"Icon Set...":"Адыргаҷқәа реизак...",
"In ~Background":"Аҿаҧшыра аҟны",
"Increase Size":"Еизырҳатәуп акегль",
"Insert Chart":"Ибжьаргылатәуп адиаграмма",
@@ -75,6 +79,7 @@
"Line Spacing: 2":"Ацәаҳәабжьаратә интервал: 2",
"Lis~ts":"Ахьӡынҵақәа",
"L~ine...":"Аҵәаӷәа...",
+"Manage...":"Анапхгара...",
"Merge Cells":"Еидҵатәуп абларҭақәа",
"More ~Filters":"Афильтрқәа иҵегь",
"Move Down":"Ииагатәуп алада",
@@ -130,6 +135,7 @@
"Underline: Double":"Аҵшьра: ҩынтәны",
"Undo":"Иаҟәыхтәуп",
"Update index":"Ирҿыцтәуп арбага",
+"Watermark...":"Аӡдырга...",
"Wrap Text":"Ииагатәуп атеқст",
"Zoom In":"Ирдуны",
"Zoom Out":"Ирхәыҷны",
@@ -156,7 +162,10 @@
"~First Paragraph":"Актәи абзац",
"~Footnote":"Албаага",
"~Format Cells...":"Абларҭақәа рформат...",
+"~Goal Seek...":"Апараметр азалхра...",
"~Group and Outline":"Агәыҧи аструктуреи",
+"~Header and Footer...":"Аколонтитулқәа...",
+"~Headers and Footers...":"Аколонтитулқәа...",
"~Help":"~Аилыркаага",
"~Hide":"Иҵәахтәуп",
"~Hide AutoFilter":"Иҵәахтәуп автофильтр",
@@ -171,6 +180,7 @@
"~Page Break":"Адаҟьа аимҟьара",
"~Page Number":"Адаҟьа аномер",
"~Page Numbers...":"Адаҟьақәа рномерқәа...",
+"~Page Properties...":"Адаҟьа аҷыдаҟазшьақәа...",
"~Page...":"Адаҟьа...",
"~Print...":"Акьыԥхьра...",
"~Properties...":"Аҷыдаҟазшьақәа...",
diff --git a/loleaflet/l10n/uno/af.json b/loleaflet/l10n/uno/af.json
index 9a71fb22d..1c0abdffc 100644
--- a/loleaflet/l10n/uno/af.json
+++ b/loleaflet/l10n/uno/af.json
@@ -18,6 +18,7 @@
"Ce~lls...":"~Selle...",
"Comme~nt":"Opmerki~ng",
"Comm~ent":"Opmerking",
+"Condition...":"Voorwaarde",
"Continue previous numbering":"Gaan voort met vorige nommering",
"Copy Hyperlink Location":"Kopieer hiperskakelligging",
"Co~lumns...":"Ko~lomme...",
@@ -119,6 +120,7 @@
"~Advanced Filter...":"~Gevorderde filter...",
"~Arrange":"~Rangskik",
"~Author":"~Outeur",
+"~Bibliography Entry...":"~Bibliografiese inskrywing...",
"~Bring to Front":"~Bring na vore",
"~Bullets and Numbering...":"~Koeëltjies en nommering...",
"~Chart...":"~Grafiek...",
@@ -132,8 +134,10 @@
"~Edit":"~Redigeer",
"~File":"~Lêer",
"~First Paragraph":"~Eerste paragraaf",
+"~Goal Seek...":"~Doelwit soek...",
"~Group and Outline":"~Groepeer en buitelyn",
"~Group...":"~Groepeer...",
+"~Header and Footer...":"~Kopstuk en voetstuk...",
"~Help":"~Hulp",
"~Hide":"~Versteek",
"~Hide AutoFilter":"~Versteek OutoFilter",
diff --git a/loleaflet/l10n/uno/am.json b/loleaflet/l10n/uno/am.json
index d22a895a0..e7542a486 100644
--- a/loleaflet/l10n/uno/am.json
+++ b/loleaflet/l10n/uno/am.json
@@ -24,11 +24,13 @@
"Clear ~Direct Formatting":"በ ~ቀጥታ አቀራረብ ማጽጃ",
"Clone":"ማባዣ",
"Clone Formatting (double click for multi-selection)":"አቀራረብ ማባዣ (ሁለት ጊዜ ይጫኑ ለ በርካታ-ምርጫ)",
+"Color Scale...":"የ ቀለም መጠን...",
"Columns R~ight":"አምዶች በ ቀ~ኝ",
"Columns ~Left":"አምዶች በ ~ግራ",
"Columns ~Right":"አምዶች በ ~ቀኝ",
"Comme~nt":"አስተያ~የት",
"Comm~ent":"አስተ~ያየት",
+"Condition...":"ሁኔታው...",
"Continue previous numbering":"ያለፈውን ቁጥር መስጫ መቀጠያ",
"Copy Hyperlink Location":"ኮፒ Hyperlink Location",
"Co~lumns...":"አም~ዶች...",
@@ -38,6 +40,8 @@
"C~ell":"ክ~ፍል",
"C~haracter...":"ባ~ህሪ ...",
"C~onditional Formatting":"እ~ንደ ሁኔታው አቀራረብ",
+"Data Bar...":"የ ዳታ መደርደሪያ...",
+"Date...":"ቀን...",
"Decrease Indent":"ማስረጊያ መቀነሻ",
"Decrease Paragraph Spacing":"የ አንቀጽ ክፍተት መቀነሻ",
"Decrease Size":"መጠን መቀነሻ",
@@ -76,6 +80,7 @@
"H~ide":"መ~ደበቂያ",
"H~ide Columns":"አምዶች መ~ደበቂያ...",
"H~ide Rows":"ረድፎች መ~ደበቂያ",
+"Icon Set...":"ምልክት ማሰናጃ...",
"In ~Background":"በ ~መደብ ውስጥ",
"Increase Indent":"ማስረጊያ መጨመሪያ",
"Increase Paragraph Spacing":"የ አንቀጽ ክፍተት መጨመሪያ",
@@ -111,6 +116,7 @@
"Line Spacing: 2":"የ መስመር ክፍተት: 2",
"Lis~ts":"ዝርዝ~ሮች",
"L~ine...":"መ~ስመር...",
+"Manage...":"ማስተዳደሪያ...",
"Merge Cells":"ክፍሎች ማዋሀጃ",
"More ~Filters":"ተጨማሪ ~ማጣሪያዎች",
"Move Down":"ወደ ታች ማንቀሳቀሻ",
@@ -153,6 +159,7 @@
"Rows ~Below":"ረድፎች ከ ~ታች",
"Save ~As...":"ማስቀመጫ ~እንደ...",
"Select ~All":"~ሁሉንም መምረጫ",
+"Se~ction...":"ክ~ፍል...",
"Shadow":"ጥላ",
"Sho~w Rows":"ረድፎች ማሳ~ያ",
"Small capitals":"በ ትንሹ አቢይ ፊደል",
@@ -167,6 +174,8 @@
"S~lide":"ተ~ንሸራታች",
"S~oft hyphen":"ለ~ስላሳ ጭረት",
"S~pecial Character...":"የ ~ተለየ ባህሪ...",
+"Table of Contents and Inde~x":"የ ሰንጠረዥ ይዞታዎች እና ማው~ጫ",
+"Table of Contents, ~Index or Bibliography...":"የ ሰንጠረዥ ማውጫ ~ማውጫ: ወይንም የ ጽሁፎች ዝርዝር...",
"Ta~ble Properties...":"የሰ~ንጠረዥ ባህሪዎች",
"Te~xt":"ጽሁ~ፍ",
"Time Field":"የ ሰአት ሜዳ",
@@ -186,6 +195,7 @@
"Underline: Double":"ከ ስሩ ማስመሪያ: በ ድርብ",
"Undo":"መተው",
"Update index":"ማውጫ ማሻሻያ",
+"Watermark...":"የ ውሀ ምልክት...",
"Wrap Left":"በ ግራ መጠቅለያ",
"Wrap Off":"መጠቅለያ ማጥፊያ",
"Wrap Right":"በ ቀኝ መጠቅለያ",
@@ -196,6 +206,7 @@
"~Arrange":"~ማስተካከያ",
"~Author":"~ደራሲው",
"~Automatic Spell Checking":"~ራሱ በራሱ ፊደል ማረሚያ",
+"~Bibliography Entry...":"የ ~ጽሁፎች ዝርዝር ማስገቢያ...",
"~Bring to Front":"ወደ ፊት ~ማምጫ",
"~Bulleted List":"~ነጥብ የ ተደረገበት ዝርዝር",
"~Bullets and Numbering...":"~ነጥቦች እና ቁጥር መስጫ...",
@@ -220,8 +231,11 @@
"~First Paragraph":"የ ~መጀመሪያው አንቀጽ",
"~Footnote":"የ ~ግርጌ ማስታወሻ",
"~Format Cells...":"የ ክፍሎች ~አቀራረብ...",
+"~Goal Seek...":"~ግብ መፈለጊያ...",
"~Group and Outline":"~ቡድን እና ረቂቅ",
"~Group...":"~ቡድን...",
+"~Header and Footer...":"~ራስጌ እና ግርጌ...",
+"~Headers and Footers...":"~ራስጌዎች እና ግርጌዎች...",
"~Help":"~እርዳታ",
"~Hide":"~መደበቂያ",
"~Hide AutoFilter":"በራሱ ማጣሪያ ~መደበቂያ",
@@ -243,6 +257,7 @@
"~Page Break":"የ ~ገጽ መጨረሻ",
"~Page Number":"የ ~ገጽ ቁጥር",
"~Page Numbers...":"የ ~ገጽ ቁጥሮች...",
+"~Page Properties...":"የ ~ገጽ ባህሪዎች...",
"~Page Wrap":"የ ~ገጽ መጠቅለያ",
"~Page...":"~ገጽ...",
"~Paste":"~መለጠፊያ",
diff --git a/loleaflet/l10n/uno/ar.json b/loleaflet/l10n/uno/ar.json
index 062a143ba..c5b6a5e5d 100644
--- a/loleaflet/l10n/uno/ar.json
+++ b/loleaflet/l10n/uno/ar.json
@@ -24,11 +24,13 @@
"Clear ~Direct Formatting":"امسح ال~تنسيق المباشر",
"Clone":"استنسخ",
"Clone Formatting (double click for multi-selection)":"استنسخ التنسيق (النقر المزدوج للتحديد المتعدد)",
+"Color Scale...":"مقياس الألوان...",
"Columns R~ight":"الأعمدة ي~مينًا",
"Columns ~Left":"الأعمدة ي~سارًا",
"Columns ~Right":"أعمدة للي~مين",
"Comme~nt":"~تعليق",
"Comm~ent":"ت~عليق",
+"Condition...":"الشرط...",
"Continue previous numbering":"أكمل الترقيم السابق",
"Copy Hyperlink Location":"انسخ مكان الرابط",
"Co~lumns...":"الأع~مدة...",
@@ -38,6 +40,8 @@
"C~ell":"ال~خليّة",
"C~haracter...":"م~حرف...",
"C~onditional Formatting":"~تنسيق شرطي",
+"Data Bar...":"شريط البيانات...",
+"Date...":"التاريخ...",
"Decrease Indent":"أنقص الإزاحة",
"Decrease Paragraph Spacing":"قلل تباعد الفقرات",
"Decrease Size":"قلل الحجم",
@@ -76,6 +80,7 @@
"H~ide":"إخ~فاء",
"H~ide Columns":"أ~خف الأعمدة",
"H~ide Rows":"أ~خف الصفوف",
+"Icon Set...":"مجموعة الأيقونات...",
"In ~Background":"~في الخلفية",
"Increase Indent":"زد الإزاحة",
"Increase Paragraph Spacing":"زِد تباعد الفقرات",
@@ -111,6 +116,7 @@
"Line Spacing: 2":"تباعد الأسطر: ٢",
"Lis~ts":"ال~قوائم",
"L~ine...":"~سطر...",
+"Manage...":"أدِر...",
"Merge Cells":"ادمج الخلايا",
"More ~Filters":"مر~شحات أخرى",
"Move Down":"انقل لأسفل",
@@ -153,6 +159,7 @@
"Rows ~Below":"الصّفوف ~تحت",
"Save ~As...":"احفظ باس~م...",
"Select ~All":"~حدّد الكل",
+"Se~ction...":"~قسم...",
"Shadow":"ظل",
"Sho~w Rows":"أ~ظهر الصفوف",
"Small capitals":"حروف كبيرة مُصغّرة",
@@ -167,6 +174,8 @@
"S~lide":"شري~حة",
"S~oft hyphen":"شَرطة ا~ختيارية",
"S~pecial Character...":"ر~مز خاص...",
+"Table of Contents and Inde~x":"الف~هرس و جدول المحتويات",
+"Table of Contents, ~Index or Bibliography...":"جدول محتويات، أو ~فهرس، أو ببلوجرافيا...",
"Ta~ble Properties...":"خصائ~ص الجدول...",
"Te~xt":"النّ~صّ",
"Time Field":"حقل وقت",
@@ -186,6 +195,7 @@
"Underline: Double":"تسطير: مزدوج",
"Undo":"تراجع",
"Update index":"حدّث الفهرس",
+"Watermark...":"علامة مائيّة...",
"Wrap Left":"لف إلى اليسار",
"Wrap Off":"إيقاف الالتفاف",
"Wrap Right":"لف إلى اليمين",
@@ -196,6 +206,7 @@
"~Arrange":"~رتّب",
"~Author":"المؤ~لف",
"~Automatic Spell Checking":"تدقيق الإملاء ~تلقائيا",
+"~Bibliography Entry...":"مُدخل ببلو~جرافيا...",
"~Bring to Front":"ا~جلب إلى الأمام",
"~Bulleted List":"قائمة ~منقوطة",
"~Bullets and Numbering...":"~ترقيم و نقاط...",
@@ -220,8 +231,11 @@
"~First Paragraph":"الف~قرة الأولى",
"~Footnote":"حا~شية",
"~Format Cells...":"ن~سق الخلايا...",
+"~Goal Seek...":"الا~ستهداف...",
"~Group and Outline":"~تجميع وتخطيط",
"~Group...":"~جمّع...",
+"~Header and Footer...":"التروي~سة و التذييل...",
+"~Headers and Footers...":"ال~ترويسات و التذييلات...",
"~Help":"م~ساعدة",
"~Hide":"إخ~فاء",
"~Hide AutoFilter":"أ~خفِ الترشيح التلقائي",
@@ -243,6 +257,7 @@
"~Page Break":"فاصل ~صفحات",
"~Page Number":"رقم الص~فحة",
"~Page Numbers...":"أ~رقام الصفحات...",
+"~Page Properties...":"خصائص ال~صفحة...",
"~Page Wrap":"ال~تفاف الصفحة",
"~Page...":"ص~فحة...",
"~Paste":"أ~لصق",
diff --git a/loleaflet/l10n/uno/as.json b/loleaflet/l10n/uno/as.json
index 424fc679b..a6967fa48 100644
--- a/loleaflet/l10n/uno/as.json
+++ b/loleaflet/l10n/uno/as.json
@@ -17,13 +17,17 @@
"Centered":"কেন্দ্ৰীকৃত",
"Ce~lls...":"কোষসমূহ (~l)...",
"Clear ~Direct Formatting":"প্ৰত্যক্ষ ফৰমেটিং সফা কৰক (~D)",
+"Color Scale...":"ৰঙৰ স্কেইল...",
"Comme~nt":"মন্তব্য (~n)",
"Comm~ent":"মন্তব্য (~n)",
+"Condition...":"চুক্তি...",
"Continue previous numbering":"নাম্বাৰীং কৰা হৈছে",
"Copy Hyperlink Location":"হাইপাৰলিংক স্থান নকল কৰক",
"Co~lumns...":"স্তম্ভসমূহ (~C)...",
"Currency":"মুদ্ৰা",
"C~onditional Formatting":"চৰ্তসাপেক্ষ ফৰমেটিং (~o)",
+"Data Bar...":"তথ্য বাৰ...",
+"Date...":"তাৰিখ...",
"Delete All Comments":"সকলো মন্তব্য মচক",
"Delete All Comments by This Author":"এই লিখকৰ সকলো টোকা মচক",
"Delete Column":"স্তম্ভ মচক",
@@ -50,6 +54,7 @@
"He~ader":"হেডাৰ (~a)",
"H~ide":"লুকুৱাওক (~i)",
"H~ide Rows":"শাৰীসমূহ লুকাওক (~i)",
+"Icon Set...":"আইকন সংহতি...",
"In ~Background":"পৃষ্ঠভূমিত (~B)",
"Increase Indent":"ইণ্ডেন্ট বৃদ্ধি কৰক",
"Insert Chart":"ছার্ট সুমুৱাওক",
@@ -65,6 +70,7 @@
"Left-To-Right":"বাওঁফালৰ পৰা সোঁফাললৈ",
"Line Spacing: 1":"ৰেখাৰ ব্যৱধান : 1",
"L~ine...":"ৰেখা (~i)...",
+"Manage...":"ব্যৱস্থাপনা কৰক...",
"Merge Cells":"কক্ষসমূহ একত্ৰিত কৰক",
"Move Down":"তললৈ যাওক",
"Move Down with Subpoints":"ছাব পইন্টসমূহৰ লগত তললৈ যাওক",
@@ -130,6 +136,7 @@
"~Advanced Filter...":"উন্নত ফিল্টাৰ (~A)...",
"~Arrange":"সঁজাওক (~A)",
"~Author":"লিখক (~A)",
+"~Bibliography Entry...":"গ্ৰন্থসূচী প্ৰৱিষ্টি (~B)...",
"~Bring to Front":"আগলৈ আনক (~B)",
"~Bullets and Numbering...":"বুলেটসমূহ আৰু নাম্বাৰীং (~B)...",
"~Capitalize Every Word":"প্ৰতিটো শব্দ উপৰফলাত আনক (~C)",
@@ -145,8 +152,10 @@
"~Edit":"সম্পাদনা কৰক (~E)",
"~File":"ফাইল (~F)",
"~First Paragraph":"প্রথম দফা (~F)",
+"~Goal Seek...":"লক্ষ্য সন্ধান কৰক (~G)...",
"~Group and Outline":"দল আৰু ৰূপৰেখা (~G)",
"~Group...":"দল (~G)...",
+"~Header and Footer...":"হেডাৰ আৰু ফুটাৰ (~H)...",
"~Help":"সহায় (~H)",
"~Hide":"লুকোৱাই থওক (~H)",
"~Hide AutoFilter":"স্বচালিত ফিল্টাৰ লুকুৱাই থওক (~H)",
diff --git a/loleaflet/l10n/uno/ast.json b/loleaflet/l10n/uno/ast.json
index 80db8df19..dea5df852 100644
--- a/loleaflet/l10n/uno/ast.json
+++ b/loleaflet/l10n/uno/ast.json
@@ -17,13 +17,17 @@
"Centered":"Centráu",
"Ce~lls...":"Caxell~es...",
"Clear ~Direct Formatting":"Llimpiar formatu ~direutu",
+"Color Scale...":"Escala de color...",
"Comme~nt":"Come~ntariu",
"Comm~ent":"Com~entariu",
+"Condition...":"Condición...",
"Continue previous numbering":"Continuar numberación anterior",
"Copy Hyperlink Location":"Copiar allugamientu d'hipervínculu",
"Co~lumns...":"Co~lumnes...",
"Currency":"Moneda",
"C~onditional Formatting":"Formatéu co~ndicional",
+"Data Bar...":"Barra de datos...",
+"Date...":"Data...",
"Decrease Indent":"Amenorgar sangría",
"Delete All Comments":"Desaniciar Tolos Comentarios",
"Delete All Comments by This Author":"Desaniciar tolos comentarios d'esti Autor",
@@ -51,6 +55,7 @@
"He~ader":"~Testera",
"H~ide":"A~nubrir",
"H~ide Rows":"Ta~pecer fileres",
+"Icon Set...":"Conxuntu d'iconos...",
"In ~Background":"Nel ~fondu",
"Increase Indent":"Aumentar sangría",
"Insert Chart":"Inxertar diagrama",
@@ -66,6 +71,7 @@
"Left-To-Right":"De izquierda a drecha",
"Line Spacing: 1":"Interlliñáu: 1",
"L~ine...":"Ll~inia...",
+"Manage...":"Xestionar...",
"Merge Cells":"Xunir caxelles",
"Move Down":"Mover p'abaxo",
"Move Down with Subpoints":"Baxar un nivel con subniveles",
@@ -129,6 +135,7 @@
"~Advanced Filter...":"Peñera ~especial...",
"~Arrange":"~Posición",
"~Author":"~Autor",
+"~Bibliography Entry...":"Entrada ~bibliográfica...",
"~Bring to Front":"~Trayer alantre",
"~Bullets and Numbering...":"~Numberación y Viñetes...",
"~Capitalize Every Word":"~Camudar A Mayúscules Les Iniciales",
@@ -144,8 +151,10 @@
"~Edit":"~Editar",
"~File":"~Ficheru",
"~First Paragraph":"~Primer párrafu",
+"~Goal Seek...":"~Gueta del valor de destín...",
"~Group and Outline":"A~conceyar y Esquema",
"~Group...":"~Aconceyar...",
+"~Header and Footer...":"~Testera y pie de páxina...",
"~Help":"~Ayuda",
"~Hide":"~Anubrir",
"~Hide AutoFilter":"~Anubrir AutoPeñera",
diff --git a/loleaflet/l10n/uno/be.json b/loleaflet/l10n/uno/be.json
index de5f5fa8a..030fc1314 100644
--- a/loleaflet/l10n/uno/be.json
+++ b/loleaflet/l10n/uno/be.json
@@ -24,11 +24,13 @@
"Clear ~Direct Formatting":"Зняць дадатковае афармленне",
"Clone":"Кланаваць",
"Clone Formatting (double click for multi-selection)":"Капіроўшчык фармата (двойчы-клік пазначае абсяг)",
+"Color Scale...":"Колерная шкала...",
"Columns R~ight":"Калонкі справа",
"Columns ~Left":"Калонкі злева",
"Columns ~Right":"Калонкі справа",
"Comme~nt":"Заўвага",
"Comm~ent":"Comm~ent",
+"Condition...":"Умова...",
"Continue previous numbering":"Працягваць папярэдняе нумараванне",
"Copy Hyperlink Location":"Капіраваць адрас спасылкі",
"Co~lumns...":"Калонкі...",
@@ -38,6 +40,8 @@
"C~ell":"Клетка",
"C~haracter...":"Знак...",
"C~onditional Formatting":"Узгодненае фарматаванне",
+"Data Bar...":"Гістаграма...",
+"Date...":"Дата.",
"Decrease Indent":"Паменшыць водступ",
"Decrease Paragraph Spacing":"Паменшыць інтэрвал між абзацамі",
"Decrease Size":"Паменшыць памер",
@@ -76,6 +80,7 @@
"H~ide":"Не паказваць",
"H~ide Columns":"Не паказваць калонкі",
"H~ide Rows":"Не паказваць радкі",
+"Icon Set...":"Значок Мноства.",
"In ~Background":"Тэкст спераду",
"Increase Indent":"Павялічыць водступ",
"Increase Paragraph Spacing":"Павялічыць інтэрвал між абзацамі",
@@ -111,6 +116,7 @@
"Line Spacing: 2":"Інтэрвал радкоў: 2",
"Lis~ts":"Спісы",
"L~ine...":"Лінія...",
+"Manage...":"Арганізаваць...",
"Merge Cells":"Аб'яднаць клеткі",
"More ~Filters":"Іншыя фільтры",
"Move Down":"Пасунуць уніз",
@@ -153,6 +159,7 @@
"Rows ~Below":"Радкі ніжэй",
"Save ~As...":"Запісаць як...",
"Select ~All":"Пазначыць усё",
+"Se~ction...":"Раздзел...",
"Shadow":"З ценем",
"Sho~w Rows":"Паказваць радкі",
"Small capitals":"Малыя капітэлі",
@@ -167,6 +174,8 @@
"S~lide":"Слайд",
"S~oft hyphen":"Мяккі перанос",
"S~pecial Character...":"Адвольны знак...",
+"Table of Contents and Inde~x":"Змест і паказальнікі",
+"Table of Contents, ~Index or Bibliography...":"Змест, паказальнік, ці бібліяграфія",
"Ta~ble Properties...":"Уласцівасці табліцы...",
"Te~xt":"Тэкст",
"Time Field":"Поле часу",
@@ -186,6 +195,7 @@
"Underline: Double":"Падкрэсленне: падвойнае",
"Undo":"Адкаціць",
"Update index":"Абнавіць паказальнік",
+"Watermark...":"Вадзяны знак...",
"Wrap Left":"Тэкст злева",
"Wrap Off":"Без абгортвання",
"Wrap Right":"Тэкст справа",
@@ -196,6 +206,7 @@
"~Arrange":"Набліжэнне",
"~Author":"Аўтар",
"~Automatic Spell Checking":"Аўтаматычная праверка правапісу",
+"~Bibliography Entry...":"Складнік бібліяграфіі...",
"~Bring to Front":"Спераду",
"~Bulleted List":"Маркіраваны спіс",
"~Bullets and Numbering...":"Пункты і нумараванне...",
@@ -220,8 +231,11 @@
"~First Paragraph":"Наступны абзац знізу",
"~Footnote":"Зноска",
"~Format Cells...":"Фармат клетак...",
+"~Goal Seek...":"Дасяганне мэты...",
"~Group and Outline":"Група і структура",
"~Group...":"Згрупаваць...",
+"~Header and Footer...":"Верхні і ніжні калантытулы...",
+"~Headers and Footers...":"Верхні і ніжні калантытулы...",
"~Help":"~Даведка",
"~Hide":"Не паказваць",
"~Hide AutoFilter":"Не паказваць Аўта-фільтр",
@@ -243,6 +257,7 @@
"~Page Break":"Ра~зрыў старонкі",
"~Page Number":"Нумар старонкі",
"~Page Numbers...":"Нумары старонак...",
+"~Page Properties...":"Уласцівасці старонкі...",
"~Page Wrap":"Тэкст навокал",
"~Page...":"Старонка...",
"~Paste":"Уставіць",
diff --git a/loleaflet/l10n/uno/bg.json b/loleaflet/l10n/uno/bg.json
index 434431bc6..ae2af9bbc 100644
--- a/loleaflet/l10n/uno/bg.json
+++ b/loleaflet/l10n/uno/bg.json
@@ -24,11 +24,13 @@
"Clear ~Direct Formatting":"Изчистване на прякото форматиране",
"Clone":"Клониране",
"Clone Formatting (double click for multi-selection)":"Клониране на форматирането (щракнете двукратно за групов избор)",
+"Color Scale...":"Цветна скала...",
"Columns R~ight":"Колони отдясно",
"Columns ~Left":"Колони отляво",
"Columns ~Right":"Колони отдясно",
"Comme~nt":"~Коментар",
"Comm~ent":"Ком~ентар",
+"Condition...":"Условие...",
"Continue previous numbering":"Продължаване на предишното номериране",
"Copy Hyperlink Location":"Копиране на хипервръзка",
"Co~lumns...":"Ко~лони...",
@@ -38,6 +40,8 @@
"C~ell":"Клетка",
"C~haracter...":"Знак...",
"C~onditional Formatting":"~Условно форматиране",
+"Data Bar...":"Лента за данни...",
+"Date...":"Дата…",
"Decrease Indent":"Намаляване на отстъпа",
"Decrease Paragraph Spacing":"Намаляване отстоянието на абзаца",
"Decrease Size":"Намаляване на шрифта",
@@ -76,6 +80,7 @@
"H~ide":"Скр~иване",
"H~ide Columns":"Скриване на колони",
"H~ide Rows":"Скриване на редове",
+"Icon Set...":"Комплект икони...",
"In ~Background":"Във фона",
"Increase Indent":"Увеличаване на отстъпа",
"Increase Paragraph Spacing":"Увеличаване отстоянието на абзаца",
@@ -111,6 +116,7 @@
"Line Spacing: 2":"Междуредие: 2",
"Lis~ts":"Списъци",
"L~ine...":"~Линия...",
+"Manage...":"Управление...",
"Merge Cells":"Сливане на клетки",
"More ~Filters":"Още филтри",
"Move Down":"Местене надолу",
@@ -153,6 +159,7 @@
"Rows ~Below":"Редове отдолу",
"Save ~As...":"Записване като...",
"Select ~All":"Избор - ~всички",
+"Se~ction...":"Раздел...",
"Shadow":"Сянка",
"Sho~w Rows":"Показване на редове",
"Small capitals":"Малки главни букви",
@@ -167,6 +174,8 @@
"S~lide":"Кадър",
"S~oft hyphen":"Меко тире",
"S~pecial Character...":"Специален знак...",
+"Table of Contents and Inde~x":"Съдържание и указател",
+"Table of Contents, ~Index or Bibliography...":"Съдържание, указател или библиография...",
"Ta~ble Properties...":"~Свойства на таблица...",
"Te~xt":"Текст",
"Time Field":"Поле за час",
@@ -186,6 +195,7 @@
"Underline: Double":"Подчертаване: двойно",
"Undo":"Отмяна",
"Update index":"Обновяване на указателя",
+"Watermark...":"Воден знак...",
"Wrap Left":"Обтичане отляво",
"Wrap Off":"Без обтичане",
"Wrap Right":"Обтичане отдясно",
@@ -196,6 +206,7 @@
"~Arrange":"~Подреждане",
"~Author":"~Автор",
"~Automatic Spell Checking":"Автоматична проверка на правописа",
+"~Bibliography Entry...":"~Библиографски запис...",
"~Bring to Front":"~Изнасяне отпред",
"~Bulleted List":"Списък с водещи знаци",
"~Bullets and Numbering...":"~Водачи и номерация...",
@@ -220,8 +231,11 @@
"~First Paragraph":"~Първи абзац",
"~Footnote":"Бележка под линия",
"~Format Cells...":"Форматиране на клетки...",
+"~Goal Seek...":"~Удовлетворяване на условие...",
"~Group and Outline":"~Групиране и план",
"~Group...":"~Групиране...",
+"~Header and Footer...":"~Колонтитули",
+"~Headers and Footers...":"Колонтитули...",
"~Help":"~Помощ",
"~Hide":"~Скриване",
"~Hide AutoFilter":"~Скриване на автофилтъра",
@@ -243,6 +257,7 @@
"~Page Break":"Нова страница",
"~Page Number":"~Номер на страница",
"~Page Numbers...":"~Номер на страница...",
+"~Page Properties...":"Свойства на страница...",
"~Page Wrap":"~Обтичане по страницата",
"~Page...":"~Страница...",
"~Paste":"Поста~вяне",
diff --git a/loleaflet/l10n/uno/bn-IN.json b/loleaflet/l10n/uno/bn-IN.json
index 2a2648371..dd52d7300 100644
--- a/loleaflet/l10n/uno/bn-IN.json
+++ b/loleaflet/l10n/uno/bn-IN.json
@@ -19,13 +19,17 @@
"Centered":"কেন্দ্রস্থিত",
"Ce~lls...":"ঘর... (~l)",
"Clear ~Direct Formatting":"সরাসরি বিন্যাস মুছে ফেলা (~D)",
+"Color Scale...":"রঙ স্কেল...",
"Comme~nt":"মন্তব্য (~n)",
"Comm~ent":"মন্তব্য (~e)",
+"Condition...":"শর্ত",
"Continue previous numbering":"পূর্ববর্তী সংখ্যায়ন বজায় রাখা হবে",
"Copy Hyperlink Location":"হাইপারলিংকের অবস্থান অনুলিপি",
"Co~lumns...":"কলাম... (~l)",
"Currency":"মুদ্রা",
"C~onditional Formatting":"শর্তাধীন বিন্যাস... (~o)",
+"Data Bar...":"ডেটা বার...",
+"Date...":"তারিখ...",
"Delete All Comments":"সব মন্তব্য মুছে ফেলা হবে",
"Delete All Comments by This Author":"এই লেখকের সব মন্তব্য মুছে ফেলা হবে",
"Delete Column":"কলাম মুছে ফেলা",
@@ -53,6 +57,7 @@
"He~ader":"শীর্ষচরণ (~a)",
"H~ide":"আড়াল (~i)",
"H~ide Rows":"সারি আড়াল (~i)",
+"Icon Set...":"আইকন সেট...",
"In ~Background":"পটভূমিতে (~B)",
"Insert Chart":"লেখচিত্র সন্নিবেশ",
"Insert Column Break":"কলাম বিভাজক সন্নিবেশ ",
@@ -69,6 +74,7 @@
"Line Spacing: 1.5":"লাইনের মধ্যবর্তী দূরত্ব: ১.৫",
"Line Spacing: 2":"লাইনের মধ্যবর্তী দূরত্ব: ১.৫",
"L~ine...":"লাইন... (~i)",
+"Manage...":"পরিচালনা...",
"Merge Cells":"ঘর মিলিতকরণ",
"Move Down":"নীচে নামানো",
"Move Down with Subpoints":"উপবিন্দু সহ নিচে নামান",
@@ -136,6 +142,7 @@
"~Advanced Filter...":"উন্নত পরিশোধক... (~A)",
"~Arrange":"সাজানো (~A)",
"~Author":"লেখক (~A)",
+"~Bibliography Entry...":"তথ্যসূত্রের ভুক্তি... (~B)",
"~Bring to Front":"সবার সামনে আনা (~B)",
"~Bullets and Numbering...":"বুলেট ও সংখ্যায়ন... (~B)",
"~Capitalize Every Word":"প্রতিটি শব্দ বড় হাতের (~C)",
@@ -151,8 +158,10 @@
"~Edit":"সম্পাদনা (~E)",
"~File":"ফাইল (~F)",
"~First Paragraph":"প্রথম অনুচ্ছেদ (~F)",
+"~Goal Seek...":"লক্ষ্য অর্জন... (~G)",
"~Group and Outline":"গ্রুপ ও রূপরেখা (~G)",
"~Group...":"গ্রুপ... (~G)",
+"~Header and Footer...":"শীর্ষচরণ ও পাদচরণ... (~H)",
"~Help":"সহায়তা (~H)",
"~Hide":"আড়াল (~H)",
"~Hide AutoFilter":"স্বয়ংক্রিয়-পরিশোধক আড়াল করা (~H)",
diff --git a/loleaflet/l10n/uno/bn.json b/loleaflet/l10n/uno/bn.json
index c45c583bc..b128313ce 100644
--- a/loleaflet/l10n/uno/bn.json
+++ b/loleaflet/l10n/uno/bn.json
@@ -19,6 +19,7 @@
"Clear ~Direct Formatting":"সরাসরি বিন্যাস মুছে ফেলা (~D)",
"Comme~nt":"মন্তব্য (~n)",
"Comm~ent":"মন্তব্য (~e)",
+"Condition...":"শর্ত",
"Continue previous numbering":"পূর্ববর্তী সংখ্যায়ন বজায় রাখা হবে",
"Copy Hyperlink Location":"হাইপারলিংকের অবস্থান অনুলিপি",
"Co~lumns...":"কলাম... (~l)",
@@ -122,6 +123,7 @@
"~Advanced Filter...":"উন্নত পরিশোধক... (~A)",
"~Arrange":"সাজানো (~A)",
"~Author":"লেখক (~A)",
+"~Bibliography Entry...":"তথ্যসূত্রের ভুক্তি... (~B)",
"~Bring to Front":"সবার সামনে আনা (~B)",
"~Bullets and Numbering...":"বুলেট ও সংখ্যায়ন... (~B)",
"~Capitalize Every Word":"প্রতিটি শব্দ বড় হাতের (~C)",
@@ -136,8 +138,10 @@
"~Edit":"সম্পাদনা (~E)",
"~File":"ফাইল (~F)",
"~First Paragraph":"প্রথম অনুচ্ছেদ (~F)",
+"~Goal Seek...":"লক্ষ্য অর্জন... (~G)",
"~Group and Outline":"গ্রুপ ও রূপরেখা (~G)",
"~Group...":"গ্রুপ... (~G)",
+"~Header and Footer...":"শীর্ষচরণ ও পাদচরণ... (~H)",
"~Help":"সহায়তা (~H)",
"~Hide":"আড়াল (~H)",
"~Hide AutoFilter":"স্বয়ংক্রিয়-পরিশোধক আড়াল করা (~H)",
diff --git a/loleaflet/l10n/uno/bo.json b/loleaflet/l10n/uno/bo.json
index 75b3c9d2e..052c7ca94 100644
--- a/loleaflet/l10n/uno/bo.json
+++ b/loleaflet/l10n/uno/bo.json
@@ -18,6 +18,7 @@
"Ce~lls...":"སྡེ་ཚན་ཁྲ་མིག(~L)...",
"Comme~nt":"ནང་དོན།",
"Comm~ent":"ནང་དོན།",
+"Condition...":"ཆ་རྐྱེན།",
"Continue previous numbering":"གོང་གི་ཨང་ཀི་མུ་མཐུད་སྒྲིག་རྒྱུ།",
"Copy Hyperlink Location":"རིམ་འདས་སྦྲེལ་མཐུད་ཀྱི་གནས་ས་པར་སློག",
"Co~lumns...":"ཚང་དབྱེ།(~L)...",
@@ -113,6 +114,7 @@
"~Advanced Filter...":"མཐོ་རིམ་འཚག་འདེམས།(~A)...",
"~Arrange":"བརྩེགས་འཇོག་རིམ་པ།(~A)",
"~Author":"རྩོམ་པ་པོ།(~A)",
+"~Bibliography Entry...":"ཡིག་ཚང་དཀར་ཆག་བཤར་བྱང་།(~B)...",
"~Bring to Front":"རྩེ་རིམ་ལ་འཇོག་པ།(~B)",
"~Bullets and Numbering...":"རྣམ་གྲངས་མཚོན་རྟགས་དང་ཨང་སྒྲིག(~N)...",
"~Chart...":"རིས་འགོད།(~C)...",
@@ -126,8 +128,10 @@
"~Edit":"རྩོམ་སྒྲིག(~E)",
"~File":"ཡིག་ཆ།(~F)",
"~First Paragraph":"དུམ་མཚམས་དང་པོ།(~F)",
+"~Goal Seek...":"འགྱུར་ཚད་རྐྱང་པ་འགྲོལ་བ།(~L)...",
"~Group and Outline":"ཚོ་དང་རིམ་དབྱེ་མངོན་པ།(~O)",
"~Group...":"ཚོ་སྒྲིག(~G)...",
+"~Header and Footer...":"ཤོག་སྨིན་དང་ཤོག་ཞབས།(~H)...",
"~Help":"རོགས་རམ།(~H)",
"~Hide":"གབ་ཡིབ།(~H)",
"~Hide AutoFilter":"རང་འགུལ་འཚག་འདེམས་གབ་པ།(~H)",
diff --git a/loleaflet/l10n/uno/br.json b/loleaflet/l10n/uno/br.json
index c7b4c2fd1..e2a4399e2 100644
--- a/loleaflet/l10n/uno/br.json
+++ b/loleaflet/l10n/uno/br.json
@@ -22,17 +22,21 @@
"Ce~lls...":"~Kelligoù...",
"Clear ~Direct Formatting":"~Diverkañ ar mentrezhañ dihanterat",
"Clone Formatting (double click for multi-selection)":"Klonañ ar mentrezhañ (daouglikañ evit al liesdiuzañ)",
+"Color Scale...":"Skeuliad livioù...",
"Columns R~ight":"Bannoù a-~zehou",
"Columns ~Left":"Bannoù a-~gleiz",
"Columns ~Right":"Bannoù a-~zehou",
"Comme~nt":"~Notenn...",
"Comm~ent":"As~kelenn",
+"Condition...":"Diferadenn...",
"Continue previous numbering":"Kenderc'hel gant an niverenniñ kent",
"Copy Hyperlink Location":"Eilañ lec'hiadur ar gourere",
"Co~lumns...":"~Bannoù...",
"Cycle Case":"Gwintañ an direnneg",
"C~ell":"K~ellig",
"C~onditional Formatting":"~Mentrezhañ amplegadek...",
+"Data Bar...":"Barrennad roadennoù...",
+"Date...":"Deiziad...",
"Decrease Indent":"Digreskiñ ar pukañ",
"Decrease Size":"Digreskiñ ar vent",
"Delete All Comments":"Lemel kuit an holl askelennoù",
@@ -66,6 +70,7 @@
"H~ide":"K~uzhat",
"H~ide Columns":"~Kuzhat bannoù",
"H~ide Rows":"Ku~zhat ar renkoù",
+"Icon Set...":"Stirad arlunioù...",
"In ~Background":"En drek~leur",
"Increase Indent":"Kreskaat ar pukad",
"Increase Size":"Kreskaat ar vent",
@@ -93,6 +98,7 @@
"Line Spacing: 2":"Etrelinennañ : 2",
"Lis~ts":"Lis~tennoù",
"L~ine...":"~Linenn...",
+"Manage...":"Ardeiñ...",
"Merge Cells":"Toueziañ ar c'helligoù",
"More ~Filters":"Muic'h a ~siloù",
"Move Down":"Dilec'hiañ d'an traoñ",
@@ -132,6 +138,7 @@
"Rows ~Below":"Renkoù ~dindan",
"Save ~As...":"~Enrollañ evel...",
"Select ~All":"~Diuz pep tra",
+"Se~ction...":"~Kevrenn...",
"Shadow":"Skeud",
"Sho~w Rows":"S~krammañ renkoù",
"Small capitals":"Pennlizherennoù bihan",
@@ -145,6 +152,8 @@
"S~how Columns":"S~krammañ bannoù",
"S~lide":"Tre~yonenn",
"S~oft hyphen":"H~osk",
+"Table of Contents and Inde~x":"I~bil ha daolenn an danvezioù",
+"Table of Contents, ~Index or Bibliography...":"Levrlennadur, ~ibil pe un daolenn eus an danvezioù",
"Ta~ble Properties...":"~Perzhioù an daolenn...",
"Te~xt":"Te~stenn",
"Time Field":"Maezienn eur",
@@ -171,6 +180,7 @@
"~Advanced Filter...":"~Sil arbennik...",
"~Arrange":"Framma~dur",
"~Author":"~Aozer",
+"~Bibliography Entry...":"~Enankad levrlennadur...",
"~Bring to Front":"Pep tr~a war raok",
"~Bullets and Numbering...":"~Padelligoù ha niverenniñ...",
"~Capitalize Every Word":"Lakaat pep ger da bennliz~herennoù",
@@ -190,8 +200,11 @@
"~File":"~Restr",
"~First Paragraph":"~Rannbennad kentañ",
"~Format Cells...":"Mentrezhañ ~kelligoù...",
+"~Goal Seek...":"Klask gw~erzh vukenn...",
"~Group and Outline":"~Trolinenn",
"~Group...":"~Strollañ...",
+"~Header and Footer...":"~Reollin ha troad pajenn...",
+"~Headers and Footers...":"~Reollinoù ha treid pajennoù...",
"~Help":"~Skoazell",
"~Hide":"~Kuzhat",
"~Hide AutoFilter":"~Masklañ an EmSilañ",
@@ -210,6 +223,7 @@
"~Page Break":"L~amm pajenn",
"~Page Number":"~Niverenn bajenn",
"~Page Numbers...":"Niverennoù p~ajenn...",
+"~Page Properties...":"~Perzhioù ar bajenn...",
"~Page Wrap":"~Adkas daveel d'ar bajenn",
"~Page...":"~Pajenn...",
"~Paste":"~Pegañ",
diff --git a/loleaflet/l10n/uno/brx.json b/loleaflet/l10n/uno/brx.json
index f603b5e7e..e2d290db9 100644
--- a/loleaflet/l10n/uno/brx.json
+++ b/loleaflet/l10n/uno/brx.json
@@ -16,6 +16,7 @@
"Center Horizontal":"समानथि बादि मिरु",
"Centered":"गेजेराव",
"Comme~nt":"~सुंद' लिरनाय...",
+"Condition...":"थासारि",
"Continue previous numbering":"सिगांनि अनजिमा होनाय सालाय लांबाय था",
"Co~lumns...":"~खाम्फाफोर...",
"Currency":"रां",
@@ -99,6 +100,7 @@
"~Advanced Filter...":"दावगानाय फिल्टार...",
"~Arrange":"~साजाय",
"~Author":"~लिरगिरि",
+"~Bibliography Entry...":"~लेखानि फारिलाइ हाबनाय",
"~Bring to Front":"~सिगाङाव लाबो",
"~Bullets and Numbering...":"~बुलेट्स आरो अनजिमा होनाय",
"~Chart...":"~चार्ट...",
@@ -112,7 +114,9 @@
"~Edit":"~सुजु",
"~File":"~फाइल",
"~First Paragraph":"~गिबि आनथोर",
+"~Goal Seek...":"~थांखि नागिरनाय",
"~Group...":"~हानजा...",
+"~Header and Footer...":"~हेडार आरो फुटार",
"~Help":"~मदत",
"~Hide":"~एरसो",
"~Hide AutoFilter":"~गावआरि फिल्टार एरसो",
diff --git a/loleaflet/l10n/uno/bs.json b/loleaflet/l10n/uno/bs.json
index 1408c4c36..b09d75ceb 100644
--- a/loleaflet/l10n/uno/bs.json
+++ b/loleaflet/l10n/uno/bs.json
@@ -17,13 +17,17 @@
"Centered":"Centrirano",
"Ce~lls...":"Će~lije...",
"Clear ~Direct Formatting":"Očisti ~direktno formatiranje",
+"Color Scale...":"Skala boja...",
"Comme~nt":"Kome~ntar",
"Comm~ent":"Kom~entar",
+"Condition...":"Uslov...",
"Continue previous numbering":"Nastavi prethodno numerisanje",
"Copy Hyperlink Location":"Kopiraj lokaciju linka",
"Co~lumns...":"Ko~lone...",
"Currency":"Valuta",
"C~onditional Formatting":"U~slovno formatiranje",
+"Data Bar...":"Traka podataka...",
+"Date...":"Datum...",
"Decrease Indent":"Smanji uvlačenje",
"Delete All Comments":"Obriši sve komentare",
"Delete All Comments by This Author":"Obriši sve komentare ovog autora",
@@ -51,6 +55,7 @@
"He~ader":"~Zaglavlje",
"H~ide":"~Sakrij",
"H~ide Rows":"~Sakrij redove",
+"Icon Set...":"Postavljanje ikone...",
"In ~Background":"U p~ozadinu",
"Increase Indent":"Povećaj uvlačenje",
"Insert Chart":"Ubaci grafikon",
@@ -66,6 +71,7 @@
"Left-To-Right":"Slijeva nadesno",
"Line Spacing: 1":"Prored : 1",
"L~ine...":"L~inija...",
+"Manage...":"Upravljaj...",
"Merge Cells":"Spoji ćelije",
"Move Down":"Pomjeri dolje",
"Move Down with Subpoints":"Pomjeri naniže sa podtačkama",
@@ -130,6 +136,7 @@
"~Advanced Filter...":"N~apredni filter...",
"~Arrange":"~Rasporedi",
"~Author":"~Autor",
+"~Bibliography Entry...":"~Bibliografski unos...",
"~Bring to Front":"P~omjeri na vrh",
"~Bullets and Numbering...":"~Tačke i numerisanje...",
"~Capitalize Every Word":"~Svaka Riječ Velikim Slovom",
@@ -145,8 +152,10 @@
"~Edit":"~Izmijeni",
"~File":"~Datoteka",
"~First Paragraph":"~Prvi odlomak",
+"~Goal Seek...":"Traženje ~cilja...",
"~Group and Outline":"~Grupisanje i okviri",
"~Group...":"~Grupiši...",
+"~Header and Footer...":"~Zaglavlje i podnožje...",
"~Help":"Po~moć",
"~Hide":"~Sakrij",
"~Hide AutoFilter":"~Sakrij automatski filter",
diff --git a/loleaflet/l10n/uno/ca-valencia.json b/loleaflet/l10n/uno/ca-valencia.json
index 0a4a61041..4576fd1bb 100644
--- a/loleaflet/l10n/uno/ca-valencia.json
+++ b/loleaflet/l10n/uno/ca-valencia.json
@@ -24,11 +24,13 @@
"Clear ~Direct Formatting":"Neteja la formatació ~directa",
"Clone":"Clona",
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list