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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Dec 20 11:52:21 UTC 2018


 loleaflet/po/templates/loleaflet-ui.pot |  182 ++++++++++++++++----------------
 loleaflet/src/control/Signing.js        |    6 -
 2 files changed, 96 insertions(+), 92 deletions(-)

New commits:
commit 48b683f3192afbb278d3c65a432d42aacb0198f5
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Dec 19 10:01:04 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Dec 20 12:52:03 2018 +0100

    loleaflet: fix localizable strings in Signing.js
    
    Change-Id: I64a7861e389f2f6be8447aeab476ea253909c47b
    Reviewed-on: https://gerrit.libreoffice.org/65410
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/po/templates/loleaflet-ui.pot b/loleaflet/po/templates/loleaflet-ui.pot
index 5760c1f9b..eb2d43158 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-12-09 21:52+0100\n"
+"POT-Creation-Date: 2018-12-19 10:04+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"
@@ -213,148 +213,144 @@ msgstr ""
 msgid " s"
 msgstr ""
 
-#: js/toolbar.js:224
+#: js/toolbar.js:198
 msgid "Are you sure you want to delete this page?"
 msgstr ""
 
-#: js/toolbar.js:767
+#: js/toolbar.js:741
 msgid "Borders"
 msgstr ""
 
-#: js/toolbar.js:775
+#: js/toolbar.js:749
 msgid "More..."
 msgstr ""
 
-#: js/toolbar.js:820
+#: js/toolbar.js:794
 msgid "Insert table"
 msgstr ""
 
-#: js/toolbar.js:825
+#: js/toolbar.js:799
 msgid "Insert Local Image"
 msgstr ""
 
-#: js/toolbar.js:828
+#: js/toolbar.js:802
 msgid "Insert shapes"
 msgstr ""
 
-#: js/toolbar.js:865 js/toolbar.js:1204
+#: js/toolbar.js:839 js/toolbar.js:1191
 msgid "Always follow the editor"
 msgstr ""
 
-#: js/toolbar.js:868 js/toolbar.js:1207
+#: js/toolbar.js:842 js/toolbar.js:1194
 msgid "Current"
 msgstr ""
 
-#: js/toolbar.js:901 js/toolbar.js:1074 js/toolbar.js:1614
+#: js/toolbar.js:888 js/toolbar.js:1061 js/toolbar.js:1626
 msgid "Sum"
 msgstr ""
 
-#: js/toolbar.js:902 js/toolbar.js:1075
+#: js/toolbar.js:889 js/toolbar.js:1062
 msgid "Function"
 msgstr ""
 
-#: js/toolbar.js:903 js/toolbar.js:1076 src/layer/marker/Annotation.js:181
+#: js/toolbar.js:890 js/toolbar.js:1063 src/layer/marker/Annotation.js:181
 msgid "Cancel"
 msgstr ""
 
-#: js/toolbar.js:904 js/toolbar.js:1077
+#: js/toolbar.js:891 js/toolbar.js:1064
 msgid "Accept"
 msgstr ""
 
-#: js/toolbar.js:937 js/toolbar.js:1142
+#: js/toolbar.js:924 js/toolbar.js:1129
 msgid "First sheet"
 msgstr ""
 
-#: js/toolbar.js:938 js/toolbar.js:1143
+#: js/toolbar.js:925 js/toolbar.js:1130
 msgid "Previous sheet"
 msgstr ""
 
-#: js/toolbar.js:939 js/toolbar.js:1144
+#: js/toolbar.js:926 js/toolbar.js:1131
 msgid "Next sheet"
 msgstr ""
 
-#: js/toolbar.js:940 js/toolbar.js:1145
+#: js/toolbar.js:927 js/toolbar.js:1132
 msgid "Last sheet"
 msgstr ""
 
-#: js/toolbar.js:941 js/toolbar.js:1146
+#: js/toolbar.js:928 js/toolbar.js:1133
 msgid "Insert sheet"
 msgstr ""
 
-#: js/toolbar.js:1108
+#: js/toolbar.js:1095
 msgid "Sign"
 msgstr ""
 
-#: js/toolbar.js:1108 src/control/Control.Menubar.js:30
+#: js/toolbar.js:1095 src/control/Control.Menubar.js:30
 msgid "Sign document"
 msgstr ""
 
-#: js/toolbar.js:1109
+#: js/toolbar.js:1096
 msgid "Upload"
 msgstr ""
 
-#: js/toolbar.js:1109
+#: js/toolbar.js:1096
 msgid "Upload document"
 msgstr ""
 
-#: js/toolbar.js:1111
+#: js/toolbar.js:1098
 msgid "Identity:"
 msgstr ""
 
-#: js/toolbar.js:1112 js/toolbar.js:1118
+#: js/toolbar.js:1099 js/toolbar.js:1105
 msgid "N/A"
 msgstr ""
 
-#: js/toolbar.js:1114
+#: js/toolbar.js:1101
 msgid "Select passport"
 msgstr ""
 
-#: js/toolbar.js:1115
+#: js/toolbar.js:1102
 msgid "Passport: N/A"
 msgstr ""
 
-#: js/toolbar.js:1117
+#: js/toolbar.js:1104
 msgid "Status:"
 msgstr ""
 
-#: js/toolbar.js:1120
+#: js/toolbar.js:1107
 msgid "Logout"
 msgstr ""
 
-#: js/toolbar.js:1121
+#: js/toolbar.js:1108
 msgid "Login"
 msgstr ""
 
-#: js/toolbar.js:1122
+#: js/toolbar.js:1109
 msgid "Close"
 msgstr ""
 
-#: js/toolbar.js:1164 src/control/Control.Menubar.js:295
+#: js/toolbar.js:1151 src/control/Control.Menubar.js:295
 msgid "Fullscreen presentation"
 msgstr ""
 
-#: js/toolbar.js:1188
+#: js/toolbar.js:1175
 msgid "Search:"
 msgstr ""
 
-#: js/toolbar.js:1195
+#: js/toolbar.js:1182
 msgid "Cancel the search"
 msgstr ""
 
-#: js/toolbar.js:1200
-msgid "No users"
-msgstr ""
-
-#: js/toolbar.js:1214 src/control/Control.Menubar.js:63
+#: js/toolbar.js:1201 src/control/Control.Menubar.js:63
 #: src/control/Control.Menubar.js:261
 msgid "Reset zoom"
 msgstr ""
 
-#: js/toolbar.js:1258
+#: js/toolbar.js:1257
 msgid "%user has joined"
 msgstr ""
 
-#: js/toolbar.js:1259
+#: js/toolbar.js:1258
 msgid "%user has left"
 msgstr ""
 
@@ -362,108 +358,108 @@ msgstr ""
 msgid "Number of Sheets"
 msgstr ""
 
-#: js/toolbar.js:1595
+#: js/toolbar.js:1597
 msgid "Selected range of cells"
 msgstr ""
 
-#: js/toolbar.js:1598 js/toolbar.js:1640
+#: js/toolbar.js:1602 js/toolbar.js:1659
 msgid "Entering text mode"
 msgstr ""
 
-#: js/toolbar.js:1601 js/toolbar.js:1646 js/toolbar.js:1666
+#: js/toolbar.js:1607 js/toolbar.js:1669 js/toolbar.js:1691
 msgid "Text Language"
 msgstr ""
 
-#: js/toolbar.js:1604 js/toolbar.js:1643
+#: js/toolbar.js:1612 js/toolbar.js:1664
 msgid "Selection Mode"
 msgstr ""
 
-#: js/toolbar.js:1607
+#: js/toolbar.js:1617
 msgid "Choice of functions"
 msgstr ""
 
-#: js/toolbar.js:1609
+#: js/toolbar.js:1621
 msgid "Average"
 msgstr ""
 
-#: js/toolbar.js:1610
+#: js/toolbar.js:1622
 msgid "CountA"
 msgstr ""
 
-#: js/toolbar.js:1611
+#: js/toolbar.js:1623
 msgid "Count"
 msgstr ""
 
-#: js/toolbar.js:1612
+#: js/toolbar.js:1624
 msgid "Maximum"
 msgstr ""
 
-#: js/toolbar.js:1613
+#: js/toolbar.js:1625
 msgid "Minimum"
 msgstr ""
 
-#: js/toolbar.js:1615
+#: js/toolbar.js:1627
 msgid "Selection count"
 msgstr ""
 
-#: js/toolbar.js:1616
+#: js/toolbar.js:1628
 msgid "None"
 msgstr ""
 
-#: js/toolbar.js:1634
+#: js/toolbar.js:1649
 msgid "Number of Pages"
 msgstr ""
 
-#: js/toolbar.js:1637
+#: js/toolbar.js:1654
 msgid "Word Counter"
 msgstr ""
 
-#: js/toolbar.js:1661
+#: js/toolbar.js:1686
 msgid "Number of Slides"
 msgstr ""
 
-#: js/toolbar.js:1690
+#: js/toolbar.js:1717
 msgid "%n users"
 msgstr ""
 
-#: js/toolbar.js:1691
+#: js/toolbar.js:1718
 msgid "1 user"
 msgstr ""
 
-#: js/toolbar.js:1692
+#: js/toolbar.js:1719
 msgid "0 users"
 msgstr ""
 
-#: js/toolbar.js:1849
+#: js/toolbar.js:1871
 msgid "Document saved"
 msgstr ""
 
-#: js/toolbar.js:1999
+#: js/toolbar.js:2021
 msgid "Style"
 msgstr ""
 
-#: js/toolbar.js:2021
+#: js/toolbar.js:2043
 msgid "Font"
 msgstr ""
 
-#: js/toolbar.js:2054
+#: js/toolbar.js:2076
 msgid "Previous slide"
 msgstr ""
 
-#: js/toolbar.js:2055
+#: js/toolbar.js:2077
 msgid "Next slide"
 msgstr ""
 
-#: js/toolbar.js:2101
+#: js/toolbar.js:2123
 msgid ""
 "Conflict Undo/Redo with multiple users. Please use document repair to resolve"
 msgstr ""
 
-#: js/toolbar.js:2357 src/control/Control.DocumentRepair.js:95
+#: js/toolbar.js:2388 src/control/Control.DocumentRepair.js:95
 msgid "You"
 msgstr ""
 
-#: js/toolbar.js:2363
+#: js/toolbar.js:2394
 msgid "Readonly"
 msgstr ""
 
@@ -634,19 +630,19 @@ msgstr ""
 msgid "Scroll down annotations"
 msgstr ""
 
-#: src/control/Control.Tabs.js:64
+#: src/control/Control.Tabs.js:66
 msgid "Insert sheet before this"
 msgstr ""
 
-#: src/control/Control.Tabs.js:65
+#: src/control/Control.Tabs.js:67
 msgid "Insert sheet after this"
 msgstr ""
 
-#: src/control/Control.Tabs.js:70
+#: src/control/Control.Tabs.js:72
 msgid "Are you sure you want to delete sheet, %sheet% ?"
 msgstr ""
 
-#: src/control/Control.Tabs.js:83
+#: src/control/Control.Tabs.js:85
 msgid "Enter new sheet name"
 msgstr ""
 
@@ -662,63 +658,71 @@ msgstr ""
 msgid "Check your email"
 msgstr ""
 
-#: src/control/Signing.js:325
+#: src/control/Signing.js:319
+msgid "Select document type to upload"
+msgstr ""
+
+#: src/control/Signing.js:320
+msgid "Type:"
+msgstr ""
+
+#: src/control/Signing.js:359
 msgid "Document uploaded."
 msgstr ""
 
-#: src/control/Signing.js:362
+#: src/control/Signing.js:396
 msgid "Select identity:"
 msgstr ""
 
-#: src/control/Signing.js:363
+#: src/control/Signing.js:397
 msgid "Login from mobile"
 msgstr ""
 
-#: src/control/Signing.js:364
+#: src/control/Signing.js:398
 msgid "Recover from email"
 msgstr ""
 
-#: src/control/Signing.js:467
+#: src/control/Signing.js:519
 msgid "Not Signed"
 msgstr ""
 
-#: src/control/Signing.js:470
+#: src/control/Signing.js:522
 msgid "Document signed and validated."
 msgstr ""
 
-#: src/control/Signing.js:471
+#: src/control/Signing.js:523
 msgid "Signed and validated"
 msgstr ""
 
-#: src/control/Signing.js:474
+#: src/control/Signing.js:526
 msgid "Document signed but signature is broken."
 msgstr ""
 
-#: src/control/Signing.js:475
+#: src/control/Signing.js:527
 msgid "Signature broken"
 msgstr ""
 
-#: src/control/Signing.js:478
+#: src/control/Signing.js:530
 msgid "Document signed but the document is already modified."
 msgstr ""
 
-#: src/control/Signing.js:479
+#: src/control/Signing.js:531
 msgid "Signed but document modified"
 msgstr ""
 
-#: src/control/Signing.js:482
+#: src/control/Signing.js:534
 msgid "Document signed but can not be validated."
 msgstr ""
 
-#: src/control/Signing.js:483
+#: src/control/Signing.js:535
 msgid "Signed but not validated"
 msgstr ""
 
-#: src/control/Signing.js:486
+#: src/control/Signing.js:538
 msgid "Document signed but not all files are signed."
 msgstr ""
 
-#: src/control/Signing.js:487
+#: src/control/Signing.js:539
 msgid "Signed but not all files are signed"
 msgstr ""
 
@@ -734,7 +738,7 @@ msgstr ""
 msgid "Downloading..."
 msgstr ""
 
-#: src/control/Toolbar.js:99 src/map/Map.js:1119
+#: src/control/Toolbar.js:99 src/map/Map.js:1118
 msgid "Saving..."
 msgstr ""
 
@@ -951,11 +955,11 @@ msgstr ""
 msgid "Initializing..."
 msgstr ""
 
-#: src/map/Map.js:991
+#: src/map/Map.js:990
 msgid "Inactive document - please click to resume editing"
 msgstr ""
 
-#: src/map/Map.js:1122
+#: src/map/Map.js:1121
 msgid "Loading..."
 msgstr ""
 
@@ -963,6 +967,6 @@ msgstr ""
 msgid "Uploading..."
 msgstr ""
 
-#: src/map/handler/Map.WOPI.js:277
+#: src/map/handler/Map.WOPI.js:280
 msgid "Creating copy..."
 msgstr ""
diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index b18ef4745..1450d2615 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -316,8 +316,8 @@ L.Map.include({
 		var map = this;
 
 		vex.dialog.open({
-			message: _('Select document type to upload:'),
-			input: 'Type: <select name="selection"><option value="ODT">ODT</option><option value="DOCX">DOCX</option><option value="PDF">PDF</option></select></p>',
+			message: _('Select document type to upload'),
+			input: _('Type:') + '<select name="selection"><option value="ODT">ODT</option><option value="DOCX">DOCX</option><option value="PDF">PDF</option></select>',
 			callback: function(data) {
 				var documentType = null;
 
@@ -356,7 +356,7 @@ L.Map.include({
 								map._socket.sendMessage(blob);
 								// Let the user know that we're done.
 								map.fire('infobar', {
-									msg: _('Document "' + filename + '"uploaded.'),
+									msg: _('Document uploaded.') + '\n\n' + filename,
 									action: null,
 									actionLabel: null
 								});


More information about the Libreoffice-commits mailing list