[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - 3 commits - configure.ac loleaflet/js loleaflet/po
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Apr 12 07:04:26 UTC 2019
configure.ac | 2 +-
loleaflet/js/toolbar.js | 8 ++++++--
loleaflet/po/ui-tr.po | 38 ++++++++++++--------------------------
3 files changed, 19 insertions(+), 29 deletions(-)
New commits:
commit 8581d8f3236fe4145c097afa2d45eaadd7fd35c9
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Mar 21 14:09:35 2019 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Fri Apr 12 09:03:34 2019 +0200
Bump version to 6.2.2.2
Change-Id: If6a411a5330e6dbcc3e2e492bd7f947970deddb6
diff --git a/configure.ac b/configure.ac
index d5f079efb..c54138588 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [6.2.1.2], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [6.2.2.2], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit 86bff89b8db82f676d3a0ddecf0fa88bb76ba1f1
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Mar 21 14:06:56 2019 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Fri Apr 12 09:03:05 2019 +0200
Updated Turkish translation
Change-Id: Ic116cb502b89dc2cbb92febeff8155154412cb80
diff --git a/loleaflet/po/ui-tr.po b/loleaflet/po/ui-tr.po
index eb928ba0b..154a7b7b5 100644
--- a/loleaflet/po/ui-tr.po
+++ b/loleaflet/po/ui-tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 13:24+0100\n"
+"POT-Creation-Date: 2019-03-21 14:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.2.5\n"
"X-Pootle-Path: /tr/libo_online/loleaflet-ui-tr.po\n"
-"X-Pootle-Revision: 3650823\n"
+"X-Pootle-Revision: 3784870\n"
#: admin/admin.strings.js:6
msgid "Admin console"
@@ -242,7 +242,7 @@ msgstr "Şekil ekle"
#: js/toolbar.js:689
msgid "Insert Local Image"
-msgstr ""
+msgstr "Yerel Resim Ekle"
#: js/toolbar.js:717 js/toolbar.js:1031
msgid "Always follow the editor"
@@ -294,7 +294,7 @@ msgstr "Belgeyi imzala"
#: js/toolbar.js:951
msgid "Logout"
-msgstr ""
+msgstr "Çıkış"
#: js/toolbar.js:991 src/control/Control.Menubar.js:297
msgid "Fullscreen presentation"
@@ -429,11 +429,11 @@ msgstr ""
"Birden fazla kullanıcının Geri Al/Yeniden Yap eylemi çakıştı. Bunu çözmek "
"için belge kurtarmayı kullanın"
-#: js/toolbar.js:2139 src/control/Control.DocumentRepair.js:95
+#: js/toolbar.js:2143 src/control/Control.DocumentRepair.js:95
msgid "You"
msgstr "Siz"
-#: js/toolbar.js:2145
+#: js/toolbar.js:2149
msgid "Readonly"
msgstr "Salt okunur"
@@ -487,7 +487,7 @@ msgstr "Duruma atla"
#: src/control/Control.Menubar.js:21
msgid "Share..."
-msgstr ""
+msgstr "Paylaş..."
#: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:235
#: src/control/Control.Menubar.js:316
@@ -528,7 +528,7 @@ msgstr "Onar"
#: src/control/Control.Menubar.js:69 src/control/Control.Menubar.js:264
#: src/control/Control.Menubar.js:341
msgid "Local Image..."
-msgstr ""
+msgstr "Yerel Resim..."
#: src/control/Control.Menubar.js:85 src/control/Control.Menubar.js:87
msgid "All"
@@ -617,11 +617,11 @@ msgstr "Yeni sayfa adını girin"
#: src/control/Ruler.js:95
msgid "Left Margin"
-msgstr ""
+msgstr "Sol Kenar Boşluğu"
#: src/control/Ruler.js:96
msgid "Right Margin"
-msgstr ""
+msgstr "Sağ Kenar Boşluğu"
#: src/control/Toolbar.js:75 src/control/Toolbar.js:84
msgid "Downloading..."
@@ -897,20 +897,6 @@ msgstr "Yükleniyor..."
msgid "Uploading..."
msgstr "Yükleniyor..."
-#: src/map/handler/Map.WOPI.js:273
+#: src/map/handler/Map.WOPI.js:276
msgid "Creating copy..."
-msgstr ""
-
-#~ msgid "N/A"
-#~ msgstr "YOK"
-
-#, fuzzy
-#~ msgid "Type:"
-#~ msgstr "Tür"
-
-#~ msgid "Signed and validated"
-#~ msgstr "İmzalı ve doğrulanmış"
-
-#, fuzzy
-#~ msgid "Signed but not validated"
-#~ msgstr "İmzalı ve doğrulanmış"
+msgstr "Kopya oluşturuluyor..."
commit 61d6c18afa2fe5f7f85d3cd05973169c410e6d0f
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Mar 19 10:07:50 2019 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Fri Apr 12 09:03:05 2019 +0200
Escape username
In case of guest users it was possible to inject html.
Change-Id: I642de3efa0fa03cd2a8d63834605f46eacd0f464
Reviewed-on: https://gerrit.libreoffice.org/69410
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
Tested-by: Szymon Kłos <szymon.klos at collabora.com>
(cherry picked from commit 3084565981d85d5734436c3411266c529ad5d879)
(cherry picked from commit 7176214de3177ad3ecc2f79871cca686e2683ea3)
Reviewed-on: https://gerrit.libreoffice.org/69422
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index da07e9a74..ea740e610 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2119,11 +2119,16 @@ function updateUserListCount() {
$('#zoomlevel').html(zoomlevel);
}
+function escapeHtml(input) {
+ return $('<div>').text(input).html();
+}
+
function onAddView(e) {
+ var username = escapeHtml(e.username);
$('#tb_toolbar-down_item_userlist')
.w2overlay({
class: 'loleaflet-font',
- html: userJoinedPopupMessage.replace('%user', e.username),
+ html: userJoinedPopupMessage.replace('%user', username),
style: 'padding: 5px'
});
clearTimeout(userPopupTimeout);
@@ -2133,7 +2138,6 @@ function onAddView(e) {
userPopupTimeout = null;
}, 3000);
- var username = e.username;
var color = L.LOUtil.rgbToHex(map.getViewColor(e.viewId));
if (e.viewId === map._docLayer._viewId) {
username = _('You');
More information about the Libreoffice-commits
mailing list