[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/js scripts/locorestrings.py

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js  |   10 +++++-----
 scripts/locorestrings.py |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 1cb884b925a55f203ffa0adab330c3426c581cce
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Dec 27 22:12:47 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Dec 27 22:33:12 2018 +0100

    enable l10n of shape group names of insert shapes dropdown panel
    
    Change-Id: I4999fef8f40b09b81fd27c333a74b8575640ed29
    (cherry picked from commit a998c4af7c0ffe545404867fa51b77db061af25f)

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 82fd2eaa1..cdfc43352 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -424,7 +424,7 @@ function insertTable() {
 }
 
 var shapes = {
-	'Basic': [
+	'Basic Shapes': [
 		{img: 'basicshapes_rectangle', uno: 'BasicShapes.rectangle'},
 		{img: 'basicshapes_round-rectangle', uno: 'BasicShapes.round-rectangle'},
 		{img: 'basicshapes_quadrat', uno: 'BasicShapes.quadrat'},
@@ -475,7 +475,7 @@ var shapes = {
 		{img: 'symbolshapes_diamond-bevel', uno: 'SymbolShapes.diamond-bevel'}
 	],
 
-	'Arrows': [
+	'Block Arrows': [
 		{img: 'arrowshapes_left-arrow', uno: 'ArrowShapes.left-arrow'},
 		{img: 'arrowshapes_right-arrow', uno: 'ArrowShapes.right-arrow'},
 		{img: 'arrowshapes_up-arrow', uno: 'ArrowShapes.up-arrow'},
@@ -508,7 +508,7 @@ var shapes = {
 		{img: 'arrowshapes_s-sharped-arrow', uno: 'ArrowShapes.s-sharped-arrow'}
 	],
 
-	'Star': [
+	'Stars': [
 		{img: 'starshapes_bang', uno: 'StarShapes.bang'},
 		{img: 'starshapes_star4', uno: 'StarShapes.star4'},
 		{img: 'starshapes_star5', uno: 'StarShapes.star5'},
@@ -524,7 +524,7 @@ var shapes = {
 		{img: 'starshapes_doorplate', uno: 'StarShapes.doorplate'}
 	],
 
-	'Callout': [
+	'Callouts': [
 		{img: 'calloutshapes_rectangular-callout', uno: 'CalloutShapes.rectangular-callout'},
 		{img: 'calloutshapes_round-rectangular-callout', uno: 'CalloutShapes.round-rectangular-callout'},
 		{img: 'calloutshapes_round-callout', uno: 'CalloutShapes.round-callout'},
@@ -578,7 +578,7 @@ function insertShapes() {
 		return;
 
 	for (var s in shapes) {
-		var $rowHeader = $('<div/>').addClass('row-header loleaflet-font').append(s);
+		var $rowHeader = $('<div/>').addClass('row-header loleaflet-font').append(_(s));
 		$grid.append($rowHeader);
 
 		var rows = Math.ceil(shapes[s].length / width);
diff --git a/scripts/locorestrings.py b/scripts/locorestrings.py
index e485d181d..537d520d0 100755
--- a/scripts/locorestrings.py
+++ b/scripts/locorestrings.py
@@ -48,9 +48,9 @@ if __name__ == "__main__":
 
         sys.stderr.write('Generating ' + lang + '...\n')
 
-        # extract 'Clear formatting' and some status bar strings
+        # extract 'Clear formatting', shape group names, and some status bar strings
         poFile = dir + lang + '/svx/messages.po'
-        extractFromPo(poFile, ["RID_SVXSTR_CLEARFORM", "RID_SVXSTR_OVERWRITE_TEXT", "selectionmenu|"], translations)
+        extractFromPo(poFile, ["RID_SVXSTR_CLEARFORM", "RID_SVXSTR_OVERWRITE_TEXT", "selectionmenu|", "defaultshapespanel|"], translations)
 
         # extract Writer style names and status bar strings
         poFile = dir + lang + '/sw/messages.po'