[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - 4 commits - configure.ac loleaflet/dist loleaflet/src loolwsd-systemplate-setup
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 31 13:39:41 UTC 2018
configure.ac | 2 +-
loleaflet/dist/loleaflet-help.html | 2 +-
loleaflet/src/control/Control.ContextMenu.js | 6 +++---
loleaflet/src/control/Toolbar.js | 4 ++++
loolwsd-systemplate-setup | 1 +
5 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 8a864f8315584964e80f5c71b7c703d0b2af1e98
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Oct 31 14:30:41 2018 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Oct 31 14:30:41 2018 +0100
Bump version to 6.0.7.2
Change-Id: I1294b65c8f411115ff8ef67ce21888bafbe3da96
diff --git a/configure.ac b/configure.ac
index 42c4f08ce..b9c57b68b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([libreoffice-online], [6.0.4.2], [libreoffice at lists.freedesktop.org])
+AC_INIT([libreoffice-online], [6.0.7.2], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit ace4874a1053764785908305f0fce0172361a993
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Oct 30 21:17:53 2018 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Oct 31 14:28:58 2018 +0100
/etc/resolv.conf can be a symlink
Change-Id: I23396e598306b7c8ab1498962ab5c09150c6795b
Reviewed-on: https://gerrit.libreoffice.org/62674
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 4e5528e5f8b6abbd9ca715d5ac0ec410cbc783af)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 29fa54209815ff12a3e106aa95852e3e5d5381fd)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 263a489a9..638b06730 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -42,6 +42,7 @@ find etc/passwd etc/group etc/hosts \
-type f
find etc/fonts \
+ etc/resolv.conf \
lib/ld-* lib64/ld-* \
lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
commit ee31379784a67dcb10ea4273924f7f28ae80ba16
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Jul 31 09:24:39 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Oct 31 14:27:25 2018 +0100
loleaflet: fix Keyboard Shortcuts help localization
Change-Id: I1bbe88a37127fb13cba7c065ce03cb6799c6b7fa
(cherry picked from commit 7f28c65de90a1d9ba3491dd5b22c09751d99dec8)
(cherry picked from commit 51afb71cdfcd5806b3c42e0f75e19423d73f993f)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 67722ae3fb0895d2ce0f6416c63bced0019a09e5)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loleaflet/dist/loleaflet-help.html b/loleaflet/dist/loleaflet-help.html
index 15c79d3c7..eaa3313f2 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -109,7 +109,7 @@
<tr> <td class="shortcut">Ctrl + Alt + Shift + Arrow Keys</td> <td class="function">Like Alt, but only the active cell is modified</td> </tr>
<tr> <td class="shortcut">Alt + Insert</td> <td class="function">3 seconds in Insert mode, Arrow Key inserts row/column, Ctrl + Arrow Key inserts cell</td> </tr>
<tr> <td class="shortcut">Alt + Del</td> <td class="function">3 seconds in Delete mode, Arrow key deletes row/column, Ctrl + Arrow key merges cell with neighboring cell</td> </tr>
- <tr> <td class="shortcut">Shift + Ctrl + Del</td> <td class="function">If no whole cell is selected, the text from the cursor to the end of the current sentence is deleted. If the cursor is at the end of a cell, and no whole cell is selected, the contents of the next cell are deleted.
+ <tr> <td class="shortcut">Shift + Ctrl + Del</td> <td class="function"> <p>If no whole cell is selected, the text from the cursor to the end of the current sentence is deleted. If the cursor is at the end of a cell, and no whole cell is selected, the contents of the next cell are deleted.</p>
<p>If no whole cell is selected and the cursor is at the end of the table, the paragraph following the table will be deleted, unless it is the last paragraph in the document.</p>
<p>If one or more cells are selected, the whole rows containing the selection will be deleted. If all rows are selected completely or partially, the entire table will be deleted.</p>
</td> </tr>
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 6d5e7ae97..d417d3dbd 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -210,6 +210,10 @@ L.Map.include({
for (i = 0, max = translatableContent.length; i < max; i++) {
translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
}
+ translatableContent = $vexContent.find('p');
+ for (i = 0, max = translatableContent.length; i < max; i++) {
+ translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
+ }
$('.vex-content').attr('tabindex', -1);
$('.vex-content').focus();
commit 66e22f4e44b1289eeb37b8cd9e58ed0d7c1a8d97
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Aug 3 13:09:16 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Oct 31 14:19:26 2018 +0100
loleaflet: fix l10n of context menus
Change-Id: I96ea9d572288796587bc2be194c94c83a9b53f8d
Reviewed-on: https://gerrit.libreoffice.org/58559
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit 735a1d177aba8d5cb311c2715cd966f1ad46a3e6)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit fbe38710a1ce46d013313a12b2576a0b552a63e9)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 70f726f93..068caf8c0 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -156,8 +156,8 @@ L.Control.ContextMenu = L.Control.extend({
isLastItemText = true;
} else if (item.type === 'menu') {
- itemName = item.text.replace('~', '');
- if (itemName === 'Paste Special') {
+ itemName = item.text;
+ if (itemName.replace('~', '') === 'Paste Special') {
itemName = _('Internal Paste Special');
}
var submenu = this._createContextMenuStructure(item);
@@ -167,7 +167,7 @@ L.Control.ContextMenu = L.Control.extend({
}
contextMenu[item.command] = {
- name: _(itemName),
+ name: _(itemName).replace(/\(~[A-Za-z]\)/, '').replace('~', ''),
items: submenu
};
isLastItemText = true;
More information about the Libreoffice-commits
mailing list