loleaflet/po/templates/loleaflet-ui.pot | 58 ++++++++++++++++++--------------
loleaflet/src/map/Map.js | 4 +-
2 files changed, 36 insertions(+), 26 deletions(-)
New commits:
commit 223aaf242df148b3fd7713a10c1b8e4268050256
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Mar 30 23:14:45 2019 +0100
Commit: Ashod Nakashian <ashnak...@gmail.com>
CommitDate: Wed Feb 26 02:13:24 2020 +0100
make these strings better localizable: minutes ago/seconds ago
Change-Id: Idf46c11bc4fccb14e4a3955e9ac88901ed94586b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89113
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loleaflet/po/templates/loleaflet-ui.pot
b/loleaflet/po/templates/loleaflet-ui.pot
index 0c2520c14..add48dd1d 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: 2020-02-18 23:51+0100\n"
+"POT-Creation-Date: 2020-02-20 15:23+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"
@@ -183,14 +183,14 @@ msgstr ""
#: admin/src/AdminSocketOverview.js:104 admin/src/AdminSocketSettings.js:36
#: js/toolbar.js:200 src/control/Control.Menubar.js:769
-#: src/control/Control.Tabs.js:74
+#: src/control/Control.Tabs.js:74 src/control/Control.Tabs.js:91
msgid "OK"
msgstr ""
#: admin/src/AdminSocketOverview.js:105 admin/src/AdminSocketSettings.js:37
#: js/toolbar.js:201 js/toolbar.js:894 js/toolbar.js:1076
#: src/control/Control.Menubar.js:770 src/control/Control.Tabs.js:75
-#: src/layer/marker/Annotation.js:181
+#: src/control/Control.Tabs.js:92 src/layer/marker/Annotation.js:181
msgid "Cancel"
msgstr ""
@@ -756,7 +756,7 @@ msgstr ""
msgid "Downloading..."
msgstr ""
-#: src/control/Toolbar.js:103 src/map/Map.js:1193
+#: src/control/Toolbar.js:103 src/map/Map.js:1206
msgid "Saving..."
msgstr ""
@@ -780,81 +780,81 @@ msgstr ""
msgid "Oops, there is a problem connecting to LibreOffice Online : "
msgstr ""
-#: src/core/Socket.js:278
+#: src/core/Socket.js:280
msgid "Unsupported server version."
msgstr ""
-#: src/core/Socket.js:334
+#: src/core/Socket.js:336
msgid "Session terminated by document owner"
msgstr ""
-#: src/core/Socket.js:338
+#: src/core/Socket.js:340
msgid "Idle document - please click to reload and resume editing"
msgstr ""
-#: src/core/Socket.js:345
+#: src/core/Socket.js:347
msgid "Server is shutting down for maintenance (auto-saving)"
msgstr ""
-#: src/core/Socket.js:349
+#: src/core/Socket.js:351
msgid "Oops, there is a problem connecting the document"
msgstr ""
-#: src/core/Socket.js:353
+#: src/core/Socket.js:355
msgid "Server is recycling and will be available shortly"
msgstr ""
-#: src/core/Socket.js:385
+#: src/core/Socket.js:387
msgid ""
"Document has changed in storage. Loading the new document. Your version is "
"available as revision."
msgstr ""
-#: src/core/Socket.js:391
+#: src/core/Socket.js:393
msgid ""
"Restoring older revision. Any unsaved changes will be available in version "
"history"
msgstr ""
-#: src/core/Socket.js:513
+#: src/core/Socket.js:515
msgid ""
"Document has been changed in storage. What would you like to do with your "
"unsaved changes?"
msgstr ""
-#: src/core/Socket.js:518
+#: src/core/Socket.js:520
msgid "Discard"
msgstr ""
-#: src/core/Socket.js:523
+#: src/core/Socket.js:525
msgid "Overwrite"
msgstr ""
-#: src/core/Socket.js:528
+#: src/core/Socket.js:530
msgid "Save to new file"
msgstr ""
-#: src/core/Socket.js:599
+#: src/core/Socket.js:601
msgid "Document requires password to view."
msgstr ""
-#: src/core/Socket.js:602
+#: src/core/Socket.js:604
msgid "Document requires password to modify."
msgstr ""
-#: src/core/Socket.js:604
+#: src/core/Socket.js:606
msgid "Hit Cancel to open in view-only mode."
msgstr ""
-#: src/core/Socket.js:608
+#: src/core/Socket.js:610
msgid "Wrong password provided. Please try again."
msgstr ""
-#: src/core/Socket.js:724
+#: src/core/Socket.js:726
msgid "Connecting..."
msgstr ""
-#: src/core/Socket.js:884
+#: src/core/Socket.js:886
msgid ""
"Well, this is embarrassing, we cannot connect to your document. Please try "
"again."
@@ -989,11 +989,21 @@ msgstr ""
msgid "Initializing..."
msgstr ""
-#: src/map/Map.js:1052
+#: src/map/Map.js:344
+#, javascript-format
+msgid "%d seconds ago"
+msgstr ""
+
+#: src/map/Map.js:347
+#, javascript-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: src/map/Map.js:1065
msgid "Inactive document - please click to resume editing"
msgstr ""
-#: src/map/Map.js:1196
+#: src/map/Map.js:1209
msgid "Loading..."
msgstr ""
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index dabf7023e..b91a3d779 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -341,10 +341,10 @@ L.Map = L.Evented.extend({
var elapsed = Date.now() - dateTime;
if (elapsed < 60000) {
- dateValue = Math.round(elapsed / 1000) + ' ' +
_('seconds ago');
+ dateValue = _('%d seconds ago').replace('%d',
Math.round(elapsed / 1000));
timeout = 6000;
} else if (elapsed < 3600000) {
- dateValue = Math.round(elapsed / 60000) + ' ' +
_('minutes ago');
+ dateValue = _('%d minutes ago').replace('%d',
Math.round(elapsed / 60000));
timeout = 60000;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
