loleaflet/po/templates/loleaflet-ui.pot | 244 ++++++++++++++++---------------
loleaflet/src/control/Control.Menubar.js | 6
2 files changed, 131 insertions(+), 119 deletions(-)
New commits:
commit 7e99607e31d00f76299670621745e6454cf1ef3e
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Feb 15 22:33:49 2018 +0100
loleaflet: updated UI pot file
diff --git a/loleaflet/po/templates/loleaflet-ui.pot
b/loleaflet/po/templates/loleaflet-ui.pot
index e3bcd7d8..88b2448f 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-01-17 16:48+0100\n"
+"POT-Creation-Date: 2018-02-15 22:32+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -117,7 +117,7 @@ msgstr ""
msgid "Network Graph"
msgstr ""
-#: admin.strings.js:30 src/layer/marker/Annotation.js:222
+#: admin.strings.js:30 src/layer/marker/Annotation.js:224
msgid "Save"
msgstr ""
@@ -268,234 +268,238 @@ msgid ""
"server administrator."
msgstr ""
-#: dist/toolbar/toolbar.js:104
+#: dist/toolbar/toolbar.js:106
msgid "%n users"
msgstr ""
-#: dist/toolbar/toolbar.js:105
+#: dist/toolbar/toolbar.js:107
msgid "1 user"
msgstr ""
-#: dist/toolbar/toolbar.js:106
+#: dist/toolbar/toolbar.js:108
msgid "0 users"
msgstr ""
-#: dist/toolbar/toolbar.js:270
+#: dist/toolbar/toolbar.js:276
msgid "Are you sure you want to delete this page?"
msgstr ""
-#: dist/toolbar/toolbar.js:456
+#: dist/toolbar/toolbar.js:465
msgid "Textwrap"
msgstr ""
-#: dist/toolbar/toolbar.js:457
+#: dist/toolbar/toolbar.js:466
msgid "No wrap"
msgstr ""
-#: dist/toolbar/toolbar.js:458
+#: dist/toolbar/toolbar.js:467
msgid "Page wrap"
msgstr ""
-#: dist/toolbar/toolbar.js:459
+#: dist/toolbar/toolbar.js:468
msgid "Wrap anchor only"
msgstr ""
-#: dist/toolbar/toolbar.js:460
+#: dist/toolbar/toolbar.js:469
msgid "Ideal wrap"
msgstr ""
-#: dist/toolbar/toolbar.js:461
+#: dist/toolbar/toolbar.js:470
msgid "Left wrap"
msgstr ""
-#: dist/toolbar/toolbar.js:462
+#: dist/toolbar/toolbar.js:471
msgid "Right wrap"
msgstr ""
-#: dist/toolbar/toolbar.js:463
+#: dist/toolbar/toolbar.js:472
msgid "Wrap through"
msgstr ""
-#: dist/toolbar/toolbar.js:469
+#: dist/toolbar/toolbar.js:478
msgid "Document repair"
msgstr ""
-#: dist/toolbar/toolbar.js:512
+#: dist/toolbar/toolbar.js:521
msgid "Insert table"
msgstr ""
-#: dist/toolbar/toolbar.js:517
+#: dist/toolbar/toolbar.js:526
msgid "More"
msgstr ""
-#: dist/toolbar/toolbar.js:615 dist/toolbar/toolbar.js:1089
+#: dist/toolbar/toolbar.js:624 dist/toolbar/toolbar.js:1099
msgid "Sum"
msgstr ""
-#: dist/toolbar/toolbar.js:616
+#: dist/toolbar/toolbar.js:625
msgid "Function"
msgstr ""
-#: dist/toolbar/toolbar.js:617 src/layer/marker/Annotation.js:161
+#: dist/toolbar/toolbar.js:626 src/layer/marker/Annotation.js:163
msgid "Cancel"
msgstr ""
-#: dist/toolbar/toolbar.js:618
+#: dist/toolbar/toolbar.js:627
msgid "Accept"
msgstr ""
-#: dist/toolbar/toolbar.js:634
+#: dist/toolbar/toolbar.js:643
msgid "First sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:635
+#: dist/toolbar/toolbar.js:644
msgid "Previous sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:636
+#: dist/toolbar/toolbar.js:645
msgid "Next sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:637
+#: dist/toolbar/toolbar.js:646
msgid "Last sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:647 src/control/Control.Menubar.js:269
+#: dist/toolbar/toolbar.js:647
+msgid "Insert sheet"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:657 src/control/Control.Menubar.js:274
msgid "Fullscreen presentation"
msgstr ""
-#: dist/toolbar/toolbar.js:664
+#: dist/toolbar/toolbar.js:674
msgid "Search:"
msgstr ""
-#: dist/toolbar/toolbar.js:671
+#: dist/toolbar/toolbar.js:681
msgid "Cancel the search"
msgstr ""
-#: dist/toolbar/toolbar.js:676
+#: dist/toolbar/toolbar.js:686
msgid "No users"
msgstr ""
-#: dist/toolbar/toolbar.js:680
+#: dist/toolbar/toolbar.js:690
msgid "Always follow the editor"
msgstr ""
-#: dist/toolbar/toolbar.js:683
+#: dist/toolbar/toolbar.js:693
msgid "Current"
msgstr ""
-#: dist/toolbar/toolbar.js:690 src/control/Control.Menubar.js:59
-#: src/control/Control.Menubar.js:237
+#: dist/toolbar/toolbar.js:700 src/control/Control.Menubar.js:60
+#: src/control/Control.Menubar.js:242
msgid "Reset zoom"
msgstr ""
-#: dist/toolbar/toolbar.js:722
+#: dist/toolbar/toolbar.js:732
msgid "%user has joined"
msgstr ""
-#: dist/toolbar/toolbar.js:723
+#: dist/toolbar/toolbar.js:733
msgid "%user has left"
msgstr ""
-#: dist/toolbar/toolbar.js:889 dist/toolbar/toolbar.js:1469
+#: dist/toolbar/toolbar.js:899 dist/toolbar/toolbar.js:1484
msgid "Size"
msgstr ""
-#: dist/toolbar/toolbar.js:1067
+#: dist/toolbar/toolbar.js:1077
msgid "Number of Sheets"
msgstr ""
-#: dist/toolbar/toolbar.js:1070
+#: dist/toolbar/toolbar.js:1080
msgid "Selected range of cells"
msgstr ""
-#: dist/toolbar/toolbar.js:1073 dist/toolbar/toolbar.js:1111
+#: dist/toolbar/toolbar.js:1083 dist/toolbar/toolbar.js:1121
msgid "Entering text mode"
msgstr ""
-#: dist/toolbar/toolbar.js:1076 dist/toolbar/toolbar.js:1117
-#: dist/toolbar/toolbar.js:1140
+#: dist/toolbar/toolbar.js:1086 dist/toolbar/toolbar.js:1127
+#: dist/toolbar/toolbar.js:1150
msgid "Text Language"
msgstr ""
-#: dist/toolbar/toolbar.js:1079 dist/toolbar/toolbar.js:1114
+#: dist/toolbar/toolbar.js:1089 dist/toolbar/toolbar.js:1124
msgid "Selection Mode"
msgstr ""
-#: dist/toolbar/toolbar.js:1082
+#: dist/toolbar/toolbar.js:1092
msgid "Choice of functions"
msgstr ""
-#: dist/toolbar/toolbar.js:1084
+#: dist/toolbar/toolbar.js:1094
msgid "Average"
msgstr ""
-#: dist/toolbar/toolbar.js:1085
+#: dist/toolbar/toolbar.js:1095
msgid "CountA"
msgstr ""
-#: dist/toolbar/toolbar.js:1086
+#: dist/toolbar/toolbar.js:1096
msgid "Count"
msgstr ""
-#: dist/toolbar/toolbar.js:1087
+#: dist/toolbar/toolbar.js:1097
msgid "Maximum"
msgstr ""
-#: dist/toolbar/toolbar.js:1088
+#: dist/toolbar/toolbar.js:1098
msgid "Minimum"
msgstr ""
-#: dist/toolbar/toolbar.js:1090
+#: dist/toolbar/toolbar.js:1100
msgid "Selection count"
msgstr ""
-#: dist/toolbar/toolbar.js:1091
+#: dist/toolbar/toolbar.js:1101
msgid "None"
msgstr ""
-#: dist/toolbar/toolbar.js:1105
+#: dist/toolbar/toolbar.js:1115
msgid "Number of Pages"
msgstr ""
-#: dist/toolbar/toolbar.js:1108
+#: dist/toolbar/toolbar.js:1118
msgid "Word Counter"
msgstr ""
-#: dist/toolbar/toolbar.js:1137
+#: dist/toolbar/toolbar.js:1147
msgid "Number of Slides"
msgstr ""
-#: dist/toolbar/toolbar.js:1286
+#: dist/toolbar/toolbar.js:1296
msgid "Document saved"
msgstr ""
-#: dist/toolbar/toolbar.js:1439
+#: dist/toolbar/toolbar.js:1454
msgid "Style"
msgstr ""
-#: dist/toolbar/toolbar.js:1461
+#: dist/toolbar/toolbar.js:1476
msgid "Font"
msgstr ""
-#: dist/toolbar/toolbar.js:1497
+#: dist/toolbar/toolbar.js:1512
msgid "Previous slide"
msgstr ""
-#: dist/toolbar/toolbar.js:1498
+#: dist/toolbar/toolbar.js:1513
msgid "Next slide"
msgstr ""
-#: dist/toolbar/toolbar.js:1559
+#: dist/toolbar/toolbar.js:1575
msgid ""
"Conflict Undo/Redo with multiple users. Please use document repair to resolve"
msgstr ""
-#: dist/toolbar/toolbar.js:1807 src/control/Control.DocumentRepair.js:93
+#: dist/toolbar/toolbar.js:1823 src/control/Control.DocumentRepair.js:93
msgid "You"
msgstr ""
-#: dist/toolbar/toolbar.js:1813
+#: dist/toolbar/toolbar.js:1829
msgid "Readonly"
msgstr ""
@@ -603,18 +607,18 @@ msgstr ""
msgid "Jump to state"
msgstr ""
-#: src/control/Control.Menubar.js:21 src/control/Control.Menubar.js:211
-#: src/control/Control.Menubar.js:288
+#: src/control/Control.Menubar.js:21 src/control/Control.Menubar.js:216
+#: src/control/Control.Menubar.js:293
msgid "See revision history"
msgstr ""
-#: src/control/Control.Menubar.js:22 src/control/Control.Menubar.js:212
-#: src/control/Control.Menubar.js:289
+#: src/control/Control.Menubar.js:22 src/control/Control.Menubar.js:217
+#: src/control/Control.Menubar.js:294
msgid "Download as"
msgstr ""
-#: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:213
-#: src/control/Control.Menubar.js:290
+#: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:218
+#: src/control/Control.Menubar.js:295
msgid "PDF Document (.pdf)"
msgstr ""
@@ -630,76 +634,76 @@ msgstr ""
msgid "Microsoft Word (.docx)"
msgstr ""
-#: src/control/Control.Menubar.js:33 src/control/Control.Menubar.js:223
-#: src/control/Control.Menubar.js:300
+#: src/control/Control.Menubar.js:27
+msgid "Rich Text (.rtf)"
+msgstr ""
+
+#: src/control/Control.Menubar.js:34 src/control/Control.Menubar.js:228
+#: src/control/Control.Menubar.js:305
msgid "Repair"
msgstr ""
-#: src/control/Control.Menubar.js:116
+#: src/control/Control.Menubar.js:71 src/control/Control.Menubar.js:73
+msgid "All"
+msgstr ""
+
+#: src/control/Control.Menubar.js:120
msgid "Text orientation"
msgstr ""
-#: src/control/Control.Menubar.js:191 src/control/Control.Menubar.js:193
-#: src/control/Control.Menubar.js:195 src/control/Control.Menubar.js:274
-#: src/control/Control.Menubar.js:364
+#: src/control/Control.Menubar.js:196 src/control/Control.Menubar.js:198
+#: src/control/Control.Menubar.js:200 src/control/Control.Menubar.js:279
+#: src/control/Control.Menubar.js:369
msgid "None (Do not check spelling)"
msgstr ""
-#: src/control/Control.Menubar.js:200 src/control/Control.Menubar.js:277
-#: src/control/Control.Menubar.js:367
+#: src/control/Control.Menubar.js:205 src/control/Control.Menubar.js:282
+#: src/control/Control.Menubar.js:372
msgid "Keyboard shortcuts"
msgstr ""
-#: src/control/Control.Menubar.js:201 src/control/Control.Menubar.js:278
-#: src/control/Control.Menubar.js:368
+#: src/control/Control.Menubar.js:206 src/control/Control.Menubar.js:283
+#: src/control/Control.Menubar.js:373
msgid "About"
msgstr ""
-#: src/control/Control.Menubar.js:203 src/control/Control.Menubar.js:280
-#: src/control/Control.Menubar.js:370
+#: src/control/Control.Menubar.js:208 src/control/Control.Menubar.js:285
+#: src/control/Control.Menubar.js:375
msgid "Close document"
msgstr ""
-#: src/control/Control.Menubar.js:214
+#: src/control/Control.Menubar.js:219
msgid "ODF presentation (.odp)"
msgstr ""
-#: src/control/Control.Menubar.js:215
+#: src/control/Control.Menubar.js:220
msgid "Microsoft Powerpoint 2003 (.ppt)"
msgstr ""
-#: src/control/Control.Menubar.js:216
+#: src/control/Control.Menubar.js:221
msgid "Microsoft Powerpoint (.pptx)"
msgstr ""
-#: src/control/Control.Menubar.js:291
+#: src/control/Control.Menubar.js:296
msgid "ODF spreadsheet (.ods)"
msgstr ""
-#: src/control/Control.Menubar.js:292
+#: src/control/Control.Menubar.js:297
msgid "Microsoft Excel 2003 (.xls)"
msgstr ""
-#: src/control/Control.Menubar.js:293
+#: src/control/Control.Menubar.js:298
msgid "Microsoft Excel (.xlsx)"
msgstr ""
-#: src/control/Control.Menubar.js:427
+#: src/control/Control.Menubar.js:440
msgid "Reset to Default Language"
msgstr ""
-#: src/control/Control.Menubar.js:645
+#: src/control/Control.Menubar.js:703
msgid "Are you sure you want to delete this slide?"
msgstr ""
-#: src/control/Control.Menubar.js:675
-msgid "Are you sure you want to delete the header?"
-msgstr ""
-
-#: src/control/Control.Menubar.js:676
-msgid "Are you sure you want to delete the footer?"
-msgstr ""
-
#: src/control/Control.MetricInput.js:38
msgid "(100th/mm)"
msgstr ""
@@ -744,7 +748,7 @@ msgstr ""
msgid "Downloading..."
msgstr ""
-#: src/control/Toolbar.js:98 src/map/Map.js:1025
+#: src/control/Toolbar.js:98 src/map/Map.js:1029
msgid "Saving..."
msgstr ""
@@ -760,85 +764,91 @@ msgstr ""
msgid "Unsupported server version."
msgstr ""
-#: src/core/Socket.js:263
+#: src/core/Socket.js:264
msgid "Session terminated by document owner"
msgstr ""
-#: src/core/Socket.js:267
+#: src/core/Socket.js:268
msgid "Idle document - please click to reload and resume editing"
msgstr ""
-#: src/core/Socket.js:274
+#: src/core/Socket.js:275
msgid "Server is shutting down for maintenance (auto-saving)"
msgstr ""
-#: src/core/Socket.js:278
+#: src/core/Socket.js:279
msgid "Oops, there is a problem connecting the document"
msgstr ""
-#: src/core/Socket.js:282
+#: src/core/Socket.js:283
msgid "Server is recycling and will be available shortly"
msgstr ""
-#: src/core/Socket.js:313
+#: src/core/Socket.js:314
msgid ""
"Document has changed in storage. Loading the new document. Your version is "
"available as revision."
msgstr ""
-#: src/core/Socket.js:426
+#: src/core/Socket.js:320
+msgid ""
+"Restoring older revision. Any unsaved changes will be available in version "
+"history"
+msgstr ""
+
+#: src/core/Socket.js:438
msgid ""
"Document has been changed in storage. Do you want to discard your changes, "
"and load the document from the storage?"
msgstr ""
-#: src/core/Socket.js:428
+#: src/core/Socket.js:440
msgid "Discard changes"
msgstr ""
-#: src/core/Socket.js:429
+#: src/core/Socket.js:441
msgid "Overwrite document"
msgstr ""
-#: src/core/Socket.js:486
+#: src/core/Socket.js:498
msgid "Document requires password to view."
msgstr ""
-#: src/core/Socket.js:489
+#: src/core/Socket.js:501
msgid "Document requires password to modify."
msgstr ""
-#: src/core/Socket.js:491
+#: src/core/Socket.js:503
msgid "Hit Cancel to open in view-only mode."
msgstr ""
-#: src/core/Socket.js:495
+#: src/core/Socket.js:507
msgid "Wrong password provided. Please try again."
msgstr ""
-#: src/core/Socket.js:602
+#: src/core/Socket.js:614
msgid "Connecting..."
msgstr ""
-#: src/core/Socket.js:751
+#: src/core/Socket.js:763
msgid ""
"Well, this is embarrassing, we cannot connect to your document. Please try "
"again."
msgstr ""
-#: src/layer/marker/Annotation.js:191
+#: src/layer/marker/Annotation.js:193
msgid "Accept change"
msgstr ""
-#: src/layer/marker/Annotation.js:196
+#: src/layer/marker/Annotation.js:198
msgid "Reject change"
msgstr ""
-#: src/layer/marker/Annotation.js:205
+#: src/layer/marker/Annotation.js:207
msgid "Open menu"
msgstr ""
-#: src/layer/marker/Annotation.js:225 src/layer/tile/TileLayer.js:206
+#: src/layer/marker/Annotation.js:227 src/layer/tile/TileLayer.js:206
msgid "Reply"
msgstr ""
@@ -854,11 +864,11 @@ msgstr ""
msgid "Initializing..."
msgstr ""
-#: src/map/Map.js:889
+#: src/map/Map.js:893
msgid "Inactive document - please click to resume editing"
msgstr ""
-#: src/map/Map.js:1028
+#: src/map/Map.js:1032
msgid "Loading..."
msgstr ""
commit ba669bbe7f493becef63fc4f0d1881b16c6a5a80
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Feb 15 22:00:07 2018 +0100
loleaflet: fix Insert Header and Footer menu
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index e60f7c6f..5e5fc925 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -67,8 +67,10 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertAnnotation', 'text'),
id: 'insertcomment', type: 'action'},
{type: 'separator'},
{name: _UNO('.uno:InsertHeaderFooterMenu',
'text'), type: 'menu', menu: [
- {uno: '.uno:InsertPageHeader', type:
'menu', menu: [{name: _('All'), disabled: true, id: 'insertheader', tag:
'_ALL_', uno: '.uno:InsertPageHeader?'}]},
- {uno: '.uno:InsertPageFooter', type:
'menu', menu: [{name: _('All'), disabled: true, id: 'insertfooter', tag:
'_ALL_', uno: '.uno:InsertPageFooter?'}]}
+ {name: _UNO('.uno:InsertPageHeader',
'text'), type: 'menu', menu: [
+ {name: _('All'), disabled:
true, id: 'insertheader', tag: '_ALL_', uno: '.uno:InsertPageHeader?'}]},
+ {name: _UNO('.uno:InsertPageFooter',
'text'), type: 'menu', menu: [
+ {name: _('All'), disabled:
true, id: 'insertfooter', tag: '_ALL_', uno: '.uno:InsertPageFooter?'}]}
]},
{uno: '.uno:InsertFootnote'},
{uno: '.uno:InsertEndnote'},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
