[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist loleaflet/po loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/dist/toolbar/toolbar.js        |    4 ++--
 loleaflet/po/templates/loleaflet-ui.pot  |   10 +++++++---
 loleaflet/src/control/Control.Menubar.js |    4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 315758db22d7dc2272cbf8f1c76bdd12a4cdce5b
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 8 15:48:33 2018 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Nov 8 22:06:05 2018 +0100

    loleaflet: rename menu/toolbar items for Insert Image
    
    Change-Id: I8cd04da84ab63e67353291acc5f9c9782cd7ea9d
    (cherry picked from commit ea9515ccf6d7a5a215566aa98531136aee33a404)
    Reviewed-on: https://gerrit.libreoffice.org/63106
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 9833cfc91..48157a8f8 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -472,8 +472,8 @@ $(function () {
 			{type: 'button',  id: 'insertgraphic',  img: 'insertgraphic', hint: _UNO('.uno:InsertGraphic', '', true)},
 			{type: 'menu', id: 'menugraphic', img: 'insertgraphic', hint: _UNO('.uno:InsertGraphic', '', true), hidden: true,
 				items: [
-					{id: 'localgraphic', text: _UNO('.uno:InsertGraphic', '', true), icon: 'insertgraphic'},
-					{id: 'remotegraphic', text: _('Remote Image...'), icon: 'insertgraphic'}
+					{id: 'localgraphic', text: _('Insert Local Image'), icon: 'insertgraphic'},
+					{id: 'remotegraphic', text: _UNO('.uno:InsertGraphic', '', true), icon: 'insertgraphic'},
 				]},
 			{type: 'button',  id: 'specialcharacter', img: 'specialcharacter', hint: _UNO('.uno:InsertSymbol', '', true), uno: '.uno:InsertSymbol'}
 		],
diff --git a/loleaflet/po/templates/loleaflet-ui.pot b/loleaflet/po/templates/loleaflet-ui.pot
index 207713c37..fa7c8a819 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-11 21:36+0200\n"
+"POT-Creation-Date: 2018-11-06 22:00+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"
@@ -290,8 +290,8 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: dist/toolbar/toolbar.js:476 src/control/Control.Menubar.js:66
-msgid "Remote Image..."
+#: js/toolbar.js:683 src/control/Control.Menubar.js:69
+msgid "Insert Local Image"
 msgstr ""
 
 #: dist/toolbar/toolbar.js:521 dist/toolbar/toolbar.js:1010
@@ -621,6 +621,10 @@ msgstr ""
 msgid "Repair"
 msgstr ""
 
+#: src/control/Control.Menubar.js:68
+msgid "Local Image..."
+msgstr ""
+
 #: src/control/Control.Menubar.js:81 src/control/Control.Menubar.js:83
 msgid "All"
 msgstr ""
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 2b33c4e4f..60a6b9140 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -62,8 +62,8 @@ L.Control.Menubar = L.Control.extend({
 			]
 			},
 			{name: _UNO('.uno:InsertMenu', 'text'), type: 'menu', menu: [
-				{name: _UNO('.uno:InsertGraphic', 'text'), id: 'insertgraphic', type: 'action'},
-				{name: _('Remote Image...'), id: 'insertgraphicremote', type: 'action'},
+				{name: _('Local Image...'), id: 'insertgraphic', type: 'action'},
+				{name: _UNO('.uno:InsertGraphic', 'text'), id: 'insertgraphicremote', type: 'action'},
 				{name: _UNO('.uno:InsertAnnotation', 'text'), id: 'insertcomment', type: 'action'},
 				{uno: '.uno:InsertObjectChart'},
 				{type: 'separator'},