loleaflet/po/help-hu.po | 2 +- loleaflet/po/help-sl.po | 2 +- loleaflet/po/ui-fr.po | 30 +++++++++++++++++------------- loleaflet/po/ui-hu.po | 31 ++++++++++++++++++------------- loleaflet/po/ui-sl.po | 31 ++++++++++++++++++------------- loolwsd/LOOLWSD.cpp | 2 +- 6 files changed, 56 insertions(+), 42 deletions(-)
New commits: commit 21cd9167c4ed9c0e716ecb3b00de626c456515dd Author: Andras Timar <andras.ti...@collabora.com> Date: Wed Mar 30 20:13:38 2016 +0200 serve loleaflet from apache2, until we solve access control problem diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 0fb89a9..4f6cb52 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -536,7 +536,7 @@ private: const std::string mediaType = "text/xml"; const std::string action = "action"; const std::string urlsrc = "urlsrc"; - const std::string uriValue = "https://" + uri.getHost() + ":" + std::to_string(uri.getPort()) + "/loleaflet/dist/loleaflet.html?"; + const std::string uriValue = "https://" + uri.getHost() + "/loleaflet/dist/loleaflet.html?"; InputSource inputSrc(discoveryPath); AutoPtr<Poco::XML::Document> docXML = parser.parse(&inputSrc); commit 198c266f8db2a23ace3670dc59e302a075effdf5 Author: Andras Timar <andras.ti...@collabora.com> Date: Wed Mar 30 20:13:02 2016 +0200 loleaflet: updated po files diff --git a/loleaflet/po/help-hu.po b/loleaflet/po/help-hu.po index ebe2622..878c4ba 100644 --- a/loleaflet/po/help-hu.po +++ b/loleaflet/po/help-hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CloudSuite Help\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-10 09:57+0200\n" +"POT-Creation-Date: 2016-03-29 15:41+0200\n" "PO-Revision-Date: 2016-01-10 22:10+0100\n" "Last-Translator: Andras Timar <andras.ti...@collabora.com>\n" "Language-Team: Hungarian <h...@li.org>\n" diff --git a/loleaflet/po/help-sl.po b/loleaflet/po/help-sl.po index d399b6f..af5523a 100644 --- a/loleaflet/po/help-sl.po +++ b/loleaflet/po/help-sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice Online - Help\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-10 09:57+0200\n" +"POT-Creation-Date: 2016-03-29 15:41+0200\n" "PO-Revision-Date: 2016-03-10 00:44+0100\n" "Last-Translator: Martin Srebotnjak <mi...@filmsi.net>\n" "Language-Team: sl.libreoffice.org <us...@sl.libreoffice.org>\n" diff --git a/loleaflet/po/ui-fr.po b/loleaflet/po/ui-fr.po index 7b98f79..248cd11 100644 --- a/loleaflet/po/ui-fr.po +++ b/loleaflet/po/ui-fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: CloudSuite Toolbar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-10 09:57+0100\n" +"POT-Creation-Date: 2016-03-29 15:41+0200\n" "PO-Revision-Date: 2015-12-20 14:14+0100\n" "Last-Translator: Andras Timar <andras.ti...@collabora.com>\n" "Language-Team: French <f...@li.org>\n" @@ -243,15 +243,15 @@ msgstr "Agrandir" msgid "Are you sure you want to delete this page?" msgstr "" -#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:749 +#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:790 msgid "Size" msgstr "Taille" -#: dist/toolbar/toolbar.js:736 +#: dist/toolbar/toolbar.js:777 msgid "Style" msgstr "Style" -#: dist/toolbar/toolbar.js:744 +#: dist/toolbar/toolbar.js:785 msgid "Font" msgstr "Police" @@ -279,34 +279,38 @@ msgstr "" msgid "Enter new sheet name" msgstr "" -#: src/core/Socket.js:14 src/core/Socket.js:236 -msgid "Socket connection error" +#: src/core/Socket.js:14 +msgid "Socket connection error: " msgstr "" -#: src/core/Socket.js:105 +#: src/core/Socket.js:108 msgid "Unexpected loolserver message." msgstr "" -#: src/core/Socket.js:109 +#: src/core/Socket.js:112 msgid "Unsupported server version." msgstr "" -#: src/core/Socket.js:120 +#: src/core/Socket.js:123 msgid "Document requires password to view." msgstr "" -#: src/core/Socket.js:123 +#: src/core/Socket.js:126 msgid "Document requires password to modify." msgstr "" -#: src/core/Socket.js:125 +#: src/core/Socket.js:128 msgid "Hit Cancel to open in view-only mode." msgstr "" -#: src/core/Socket.js:129 +#: src/core/Socket.js:132 msgid "Wrong password provided. Please try again." msgstr "" -#: src/core/Socket.js:240 +#: src/core/Socket.js:239 +msgid "Socket connection error" +msgstr "" + +#: src/core/Socket.js:243 msgid "Socket connection closed" msgstr "" diff --git a/loleaflet/po/ui-hu.po b/loleaflet/po/ui-hu.po index ca50591..8db5549 100644 --- a/loleaflet/po/ui-hu.po +++ b/loleaflet/po/ui-hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: CloudSuite Toolbar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-10 09:57+0100\n" +"POT-Creation-Date: 2016-03-29 15:41+0200\n" "PO-Revision-Date: 2016-02-15 10:39+0100\n" "Last-Translator: Andras Timar <andras.ti...@collabora.com>\n" "Language-Team: Hungarian <h...@li.org>\n" @@ -243,15 +243,15 @@ msgstr "NagyÃtás" msgid "Are you sure you want to delete this page?" msgstr "Biztosan törli ezt az oldalt?" -#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:749 +#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:790 msgid "Size" msgstr "Méret" -#: dist/toolbar/toolbar.js:736 +#: dist/toolbar/toolbar.js:777 msgid "Style" msgstr "StÃlus" -#: dist/toolbar/toolbar.js:744 +#: dist/toolbar/toolbar.js:785 msgid "Font" msgstr "Betűkészlet" @@ -279,34 +279,39 @@ msgstr "Munkalap átnevezése" msgid "Enter new sheet name" msgstr "Adja meg az munkalapnevet" -#: src/core/Socket.js:14 src/core/Socket.js:236 -msgid "Socket connection error" +#: src/core/Socket.js:14 +#, fuzzy +msgid "Socket connection error: " msgstr "Socket kapcsolat hiba" -#: src/core/Socket.js:105 +#: src/core/Socket.js:108 msgid "Unexpected loolserver message." msgstr "Váratlan loolserver-üzenet." -#: src/core/Socket.js:109 +#: src/core/Socket.js:112 msgid "Unsupported server version." msgstr "Nem támogatott kiszolgálóverzió." -#: src/core/Socket.js:120 +#: src/core/Socket.js:123 msgid "Document requires password to view." msgstr "" -#: src/core/Socket.js:123 +#: src/core/Socket.js:126 msgid "Document requires password to modify." msgstr "" -#: src/core/Socket.js:125 +#: src/core/Socket.js:128 msgid "Hit Cancel to open in view-only mode." msgstr "" -#: src/core/Socket.js:129 +#: src/core/Socket.js:132 msgid "Wrong password provided. Please try again." msgstr "" -#: src/core/Socket.js:240 +#: src/core/Socket.js:239 +msgid "Socket connection error" +msgstr "Socket kapcsolat hiba" + +#: src/core/Socket.js:243 msgid "Socket connection closed" msgstr "Socket kapcsolat bezáródott" diff --git a/loleaflet/po/ui-sl.po b/loleaflet/po/ui-sl.po index c7cca09..74675d6 100644 --- a/loleaflet/po/ui-sl.po +++ b/loleaflet/po/ui-sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice Online UI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-10 09:57+0100\n" +"POT-Creation-Date: 2016-03-29 15:41+0200\n" "PO-Revision-Date: 2016-02-28 23:04+0100\n" "Last-Translator: Martin Srebotnjak <mi...@filmsi.net>\n" "Language-Team: sl.libreoffice.org <us...@sl.libreoffice.org>\n" @@ -245,15 +245,15 @@ msgstr "Oddalji" msgid "Are you sure you want to delete this page?" msgstr "Ali ste prepriÄani, da želite izbrisati to stran?" -#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:749 +#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:790 msgid "Size" msgstr "Velikost" -#: dist/toolbar/toolbar.js:736 +#: dist/toolbar/toolbar.js:777 msgid "Style" msgstr "Slog" -#: dist/toolbar/toolbar.js:744 +#: dist/toolbar/toolbar.js:785 msgid "Font" msgstr "Pisava" @@ -281,34 +281,39 @@ msgstr "Preimenuj delovni list" msgid "Enter new sheet name" msgstr "Vnesite ime za nov delovni list" -#: src/core/Socket.js:14 src/core/Socket.js:236 -msgid "Socket connection error" +#: src/core/Socket.js:14 +#, fuzzy +msgid "Socket connection error: " msgstr "Napaka povezave vtiÄa" -#: src/core/Socket.js:105 +#: src/core/Socket.js:108 msgid "Unexpected loolserver message." msgstr "NepriÄakovano sporoÄilo loolserver." -#: src/core/Socket.js:109 +#: src/core/Socket.js:112 msgid "Unsupported server version." msgstr "Nepodprta razliÄica strežnika." -#: src/core/Socket.js:120 +#: src/core/Socket.js:123 msgid "Document requires password to view." msgstr "Za ogled dokumenta je potrebno geslo." -#: src/core/Socket.js:123 +#: src/core/Socket.js:126 msgid "Document requires password to modify." msgstr "Za spreminjanje dokumenta je potrebno geslo." -#: src/core/Socket.js:125 +#: src/core/Socket.js:128 msgid "Hit Cancel to open in view-only mode." msgstr "Pritisnite PrekliÄi za odpiranje v oglednem naÄinu." -#: src/core/Socket.js:129 +#: src/core/Socket.js:132 msgid "Wrong password provided. Please try again." msgstr "Vnesli ste napaÄno geslo. Poskusite znova." -#: src/core/Socket.js:240 +#: src/core/Socket.js:239 +msgid "Socket connection error" +msgstr "Napaka povezave vtiÄa" + +#: src/core/Socket.js:243 msgid "Socket connection closed" msgstr "Povezava vtiÄa zaprta"
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits