[Libreoffice-commits] online.git: loleaflet/Makefile

[Pranav Kant]

 loleaflet/Makefile |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5938962e0ec98ad9cb75ab8daa40b6f840e7e307
Author: Pranav Kant 
Date:   Mon Dec 12 15:54:43 2016 +0530

loleaflet: build: Skip expensive 'npm install'

This always takes ~2 seconds irrespective of whether node_modules
needs updating or not. Lets add appropriate dependencies and save
these precious 2 seconds.

Change-Id: Ided4ff334316c16521e5ea7a69d15736a1cc170f

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 9bb26f1..b9a3303 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -12,12 +12,15 @@ DEBUG=false
 MINIFY=false
 
 .PHONY: build
-build:
-   npm install
+build: node_modules
rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p 
dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist 
../../dist/plugins/draw-$(DRAW_VERSION)
jake build debug=$(DEBUG) minify=$(MINIFY)
 
+node_modules: npm-shrinkwrap.json
+   npm install
+   touch node_modules
+
 .PHONY: build-l10n
 build-l10n:
mkdir -p dist/l10n/styles
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile

[Andras Timar]

 loleaflet/Makefile |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a65f7d34d19761d60c9bc47492bb40d1dade03a6
Author: Andras Timar 
Date:   Tue Nov 15 20:38:46 2016 +0100

loleaflet: add missing ui-bg_highlight-soft_100_ee_1x100.png to dist

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 0715080..fbb9adb 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -38,6 +38,8 @@ dist: all
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
cp -ar dist loleaflet-$(VERSION)
+   mkdir -p 
loleaflet-$(VERSION)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
+   cp -a 
node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_ee_1x100.png
 loleaflet-$(VERSION)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
rm -rf loleaflet-$(VERSION)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile

[Pranav Kant]

 loleaflet/Makefile |2 --
 1 file changed, 2 deletions(-)

New commits:
commit c2f0b84dd1871913e797c74fcb58b6388eb592d5
Author: Pranav Kant 
Date:   Wed Sep 21 13:14:52 2016 +0530

loleaflet: Don't try to delete .pot files

The behavior has changed to include .pot files in git as well in
7839aecac6a9715294eb56f8bbe2e522668ae4d1

So, don't try to delete these .pot files now

Change-Id: I6f5d015596ff1f2d98adca426b1458f66bc7d4b4
Reviewed-on: https://gerrit.libreoffice.org/29130
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index e4b1ac6..1a4d7e5 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -62,8 +62,6 @@ pot:
 l10n: pot
for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
for i in po/help-*.po; do pot2po 
--input=po/templates/loleaflet-help.pot --template=$$i --output=$$i.new; mv 
$$i.new $$i;done
-   rm po/loleaflet-ui.pot
-   rm po/loleaflet-help.pot
 
 spec/data/load-test:
if [ ! -d spec/data/load_test ]; then \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile

[Andras Timar]

 loleaflet/Makefile |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7465853d34863cbf148e4524c00c353c89d5d187
Author: Andras Timar 
Date:   Tue Sep 20 09:52:24 2016 +0200

l10n: add src/control/Control.DocumentRepair.js for string extraction to 
pot file

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index d249a5a..4cc64a8 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -48,6 +48,7 @@ pot:
src/admin/AdminStrings.js \
src/admin/Util.js \
src/control/Control.ColumnHeader.js \
+   src/control/Control.DocumentRepair.js \
src/control/Control.Menubar.js \
src/control/Control.RowHeader.js \
src/control/Control.Tabs.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/src

[Andras Timar]

 loleaflet/Makefile|3 ++-
 loleaflet/src/core/Socket.js  |2 +-
 loleaflet/src/map/handler/Map.FileInserter.js |2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a68274c1deb0490d1f6b50825a2fe4547ac95460
Author: Andras Timar 
Date:   Fri Aug 19 14:34:21 2016 +0200

loleaflet: spinner l10n

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index e6fc663..d249a5a 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -53,7 +53,8 @@ pot:
src/control/Control.Tabs.js \
src/control/Toolbar.js \
src/core/Socket.js \
-   src/map/Map.js
+   src/map/Map.js \
+   src/map/handler/Map.FileInserter.js
 
html2po --pot --input=dist/loleaflet-help.html 
--output=po/templates/loleaflet-help.pot
 
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 87f1ce6..f2f3672 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -192,7 +192,7 @@ L.Socket = L.Class.extend({
}
else if (textMsg.startsWith('statusindicator:')) {
//FIXME: We should get statusindicator when saving too, 
no?
-   this._map.showBusy('Connecting...', false);
+   this._map.showBusy(_('Connecting...'), false);
}
else if (!textMsg.startsWith('tile:') && 
!textMsg.startsWith('renderfont:')) {
// log the tile msg separately as we need the tile 
coordinates
diff --git a/loleaflet/src/map/handler/Map.FileInserter.js 
b/loleaflet/src/map/handler/Map.FileInserter.js
index 7e90a2a..a8a98f0 100644
--- a/loleaflet/src/map/handler/Map.FileInserter.js
+++ b/loleaflet/src/map/handler/Map.FileInserter.js
@@ -50,7 +50,7 @@ L.Map.FileInserter = L.Handler.extend({
var xmlHttp = new XMLHttpRequest();
var socket = this._map._socket;
var map = this._map;
-   this._map.showBusy('Uploading...', false);
+   this._map.showBusy(_('Uploading...'), false);
xmlHttp.onreadystatechange = function () {
if (xmlHttp.readyState === 4 && xmlHttp.status === 200) 
{
map.hideBusy();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/po

[Jan Iversen]

 loleaflet/Makefile|8 
 loleaflet/po/README   |4 
 loleaflet/po/template/loleaflet-help.pot  | 1428 --
 loleaflet/po/template/loleaflet-ui.pot|  857 --
 loleaflet/po/templates/loleaflet-help.pot | 1428 ++
 loleaflet/po/templates/loleaflet-ui.pot   |  857 ++
 6 files changed, 2293 insertions(+), 2289 deletions(-)

New commits:
commit ff1b071a8f8289baab22441fedc7cb6b76d108e3
Author: Jan Iversen 
Date:   Wed Aug 10 10:36:57 2016 +

pot file update, to help automate the pootle connection

Added more explanation in the README.
Corrected template -> templates

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index a409396..be9c11a 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -45,7 +45,7 @@ dist: all
rm -rf loleaflet-$(VERSION)
 
 pot:
-   xgettext --from-code=UTF-8 --keyword=_ 
--output=po/template/loleaflet-ui.pot \
+   xgettext --from-code=UTF-8 --keyword=_ 
--output=po/templates/loleaflet-ui.pot \
evol.colorpicker.strings.js \
unocommands.js \
dist/errormessages.js \
@@ -62,11 +62,11 @@ pot:
src/core/Socket.js \
src/map/Map.js
 
-   html2po --pot --input=dist/loleaflet-help.html 
--output=po/template/loleaflet-help.pot
+   html2po --pot --input=dist/loleaflet-help.html 
--output=po/templates/loleaflet-help.pot
 
 l10n: pot
-   for i in po/ui-*.po; do pot2po --input=po/loleaflet-ui.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
-   for i in po/help-*.po; do pot2po --input=po/loleaflet-help.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
+   for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
+   for i in po/help-*.po; do pot2po 
--input=po/templates/loleaflet-help.pot --template=$$i --output=$$i.new; mv 
$$i.new $$i;done
rm po/loleaflet-ui.pot
rm po/loleaflet-help.pot
 
diff --git a/loleaflet/po/README b/loleaflet/po/README
index fa966a3..02f3d9c 100644
--- a/loleaflet/po/README
+++ b/loleaflet/po/README
@@ -6,3 +6,7 @@ The translated .po files are then committed from the pootle 
server.
 
 Remark the directory styles, are not translated by merged from the core 
translation.
 
+if files are added to the po directory, they are automatically 
compared/updated from pootle.
+
+Automatic commits from pootle are done with the user "pootlebot"
+
diff --git a/loleaflet/po/template/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
similarity index 100%
rename from loleaflet/po/template/loleaflet-help.pot
rename to loleaflet/po/templates/loleaflet-help.pot
diff --git a/loleaflet/po/template/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
similarity index 100%
rename from loleaflet/po/template/loleaflet-ui.pot
rename to loleaflet/po/templates/loleaflet-ui.pot
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/po

[Jan Iversen]

 loleaflet/Makefile   |4 
 loleaflet/po/README  |8 
 loleaflet/po/template/loleaflet-help.pot | 1428 +++
 loleaflet/po/template/loleaflet-ui.pot   |  857 ++
 4 files changed, 2295 insertions(+), 2 deletions(-)

New commits:
commit 7839aecac6a9715294eb56f8bbe2e522668ae4d1
Author: Jan Iversen 
Date:   Tue Aug 9 07:02:56 2016 +

Changed  Makefile and po directory, to prepare for automatic pootle commit

Changed "make pot" to deliver files in po/template, so the .pot files
are committed as well as the resulting .po files.

Added a README to explain, that styles is not part of translation.

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index df0da8f..23910cc 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -43,7 +43,7 @@ dist: all
rm -rf loleaflet-$(VERSION)
 
 pot:
-   xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \
+   xgettext --from-code=UTF-8 --keyword=_ 
--output=po/template/loleaflet-ui.pot \
evol.colorpicker.strings.js \
unocommands.js \
dist/errormessages.js \
@@ -60,7 +60,7 @@ pot:
src/core/Socket.js \
src/map/Map.js
 
-   html2po --pot --input=dist/loleaflet-help.html 
--output=po/loleaflet-help.pot
+   html2po --pot --input=dist/loleaflet-help.html 
--output=po/template/loleaflet-help.pot
 
 l10n: pot
for i in po/ui-*.po; do pot2po --input=po/loleaflet-ui.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
diff --git a/loleaflet/po/README b/loleaflet/po/README
new file mode 100644
index 000..fa966a3
--- /dev/null
+++ b/loleaflet/po/README
@@ -0,0 +1,8 @@
+** Description **
+This directory is mainly maintained from the pootle server, that manages all 
translations.
+
+The input to for the pootle server is template files (.pot), which are 
generated by "make pot"
+The translated .po files are then committed from the pootle server.
+
+Remark the directory styles, are not translated by merged from the core 
translation.
+
diff --git a/loleaflet/po/template/loleaflet-help.pot 
b/loleaflet/po/template/loleaflet-help.pot
new file mode 100644
index 000..4226c27
--- /dev/null
+++ b/loleaflet/po/template/loleaflet-help.pot
@@ -0,0 +1,1428 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-09 07:00+\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.13.0\n"
+
+#: dist/loleaflet-help.html+div.h1:25
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.h2:27
+msgid "General Keyboard Shortcuts"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:29
+msgid "Undo"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:29
+msgid "Ctrl + Z"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:30
+msgid "Redo"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:30
+msgid "Ctrl + Y"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:31
+msgid "Cut"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:31
+msgid "Ctrl + X"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:32
+msgid "Paste as unformatted text"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:32
+msgid "Ctrl + Alt + Shift + V"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:33
+msgid "Print (Download as PDF)"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:33
+msgid "Ctrl + P"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.h2:37
+msgctxt "dist/loleaflet-help.html div.div.h2:37"
+msgid "Text formatting"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:39
+msgctxt "dist/loleaflet-help.html div.div.table.tr.td:39"
+msgid "Bold"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:39
+msgctxt "dist/loleaflet-help.html div.div.table.tr.td:39"
+msgid "Ctrl + B"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:40
+msgctxt "dist/loleaflet-help.html div.div.table.tr.td:40"
+msgid "Italic"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:40
+msgctxt "dist/loleaflet-help.html div.div.table.tr.td:40"
+msgid "Ctrl + I"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:41
+msgctxt "dist/loleaflet-help.html div.div.table.tr.td:41"
+msgid "Underline"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:41
+msgctxt "dist/loleaflet-help.html div.div.table.tr.td:41"
+msgid "Ctrl + U"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:42
+msgid "Double Underline"
+msgstr ""
+
+#: dist/loleaflet-help.html+div.div.table.tr.td:42
+msgctxt 

[Libreoffice-commits] online.git: loleaflet/Makefile

[Pranav Kant]

 loleaflet/Makefile |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 3761e5e9c2af0aefac3233f117dcf8fb531619f4
Author: Pranav Kant 
Date:   Sun Aug 7 21:57:29 2016 +0530

loleaflet: Debug mode bundle.js with source maps

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 823fcd6..df0da8f 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -8,13 +8,26 @@ VERSION=1.9.0
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
 
-all:
+DEBUG=false
+
+.PHONY: build
+build:
npm install
jake lint
jake build
rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p 
dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist 
../../dist/plugins/draw-$(DRAW_VERSION)
-   npm run bundle
+   if $(DEBUG); then \
+   npm run bundle-debug; \
+   else \
+   npm run bundle; \
+   fi;
+
+all: build
+
+.PHONY: debug
+debug: DEBUG=true
+debug: build
 
 .PHONY: dist
 dist: all
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loolwsd/configure.ac

[Andras Timar]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3db6d719ef72f6f150b131439c97c2822e0fe3b
Author: Andras Timar 
Date:   Mon Jun 27 09:20:09 2016 +0200

reserve version 2.0.0 for actual release...

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 7d9c550..16cfec0 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=2.0.0
+VERSION=1.9.0
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 440c04f..e4ac4ab 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [2.0.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.9.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile

[Andras Timar]

 loleaflet/Makefile |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9e7b978f9fe9548e6f238e680feb412cadd04166
Author: Andras Timar 
Date:   Tue Jun 21 16:44:20 2016 +0200

loleaflet: bccu#1901 Control.RowHeader.js and Control.ColumnHeader.js for 
l10n

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 45e9a69..7d9c550 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -38,7 +38,9 @@ pot:
src/admin/AdminSocketOverview.js \
src/admin/AdminStrings.js \
src/admin/Util.js \
+   src/control/Control.ColumnHeader.js \
src/control/Control.Menubar.js \
+   src/control/Control.RowHeader.js \
src/control/Control.Tabs.js \
src/control/Toolbar.js \
src/core/Socket.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/src

[Andras Timar]

 loleaflet/Makefile   |1 +
 loleaflet/src/control/Toolbar.js |6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ec15d9e9fff3eb40e6841d3d5e659d7f3719e5ca
Author: Andras Timar 
Date:   Thu Jun 9 15:26:08 2016 +0200

loleaflet: l10n of src/control/Toolbar.js

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index b9ea4b7..45e9a69 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -40,6 +40,7 @@ pot:
src/admin/Util.js \
src/control/Control.Menubar.js \
src/control/Control.Tabs.js \
+   src/control/Toolbar.js \
src/core/Socket.js \
src/map/Map.js
 
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index cee4561..5ec6050 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -40,7 +40,7 @@ L.Map.include({
}
id = id || -1; // not a special download
 
-   this.showBusy('Downloading...', false);
+   this.showBusy(_('Downloading...'), false);
this._socket.sendMessage('downloadas ' +
'name=' + name + ' ' +
'id=' + id + ' ' +
@@ -49,7 +49,7 @@ L.Map.include({
},
 
print: function () {
-   this.showBusy('Downloading...', false);
+   this.showBusy(_('Downloading...'), false);
this.downloadAs('print.pdf', 'pdf', null, 'print');
},
 
@@ -61,7 +61,7 @@ L.Map.include({
options = '';
}
 
-   this.showBusy('Saving...', false);
+   this.showBusy(_('Saving...'), false);
// TakeOwnership: we are performing a 'real' save-as, the 
document
// is just getting a new place, ie. it will get the
// '.uno:ModifiedStatus' upon completion.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/src

[Andras Timar]

 loleaflet/Makefile   |3 ++-
 loleaflet/src/map/Map.js |6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 611bbe3814a01c610fd4aad6b2ef5b4bce8350b2
Author: Andras Timar 
Date:   Tue May 31 16:36:21 2016 +0200

loleaflet: mark-up strings for l10n in src/map/Map.js

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 00a58a1..ab851c1 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -35,7 +35,8 @@ pot:
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
src/control/Control.Menubar.js \
-   src/core/Socket.js
+   src/core/Socket.js \
+   src/map/Map.js
html2po --pot --input=dist/loleaflet-help.html 
--output=po/loleaflet-help.pot
 
 l10n: pot
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 22e569f..099d284 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -113,7 +113,7 @@ L.Map = L.Evented.extend({
this.setPermission(options.permission);
}
 
-   this.showBusy('Initializing...', false);
+   this.showBusy(_('Initializing...'), false);
this.on('statusindicator', this._onUpdateProgress, this);
},
 
@@ -799,10 +799,10 @@ L.Map = L.Evented.extend({
if (e.statusType === 'start') {
if (this._socket.readyState === 1) {
// auto-save
-   this.showBusy('Saving...', true);
+   this.showBusy(_('Saving...'), true);
}
else {
-   this.showBusy('Loading...', true);
+   this.showBusy(_('Loading...'), true);
}
}
else if (e.statusType === 'setvalue') {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/unocommands.js

[Andras Timar]

 loleaflet/Makefile   |1 +
 loleaflet/unocommands.js |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit fa8acdc8577abe337fcf80f3ebc493d57172c123
Author: Andras Timar 
Date:   Tue May 24 08:53:07 2016 +0200

loleaflet: enable l10n of context menu items which come from src files from 
LO

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 22206fa..00a58a1 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -30,6 +30,7 @@ dist: all
 
 pot:
xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \
+   unocommands.js \
dist/errormessages.js \
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
new file mode 100644
index 000..af53d00
--- /dev/null
+++ b/loleaflet/unocommands.js
@@ -0,0 +1,11 @@
+var CopyHyperlinkLocation = _('Copy Hyperlink');
+var DecrementLevel = _('Down One Level');
+var IncrementLevel = _('Up One Level');
+var EditAnnotation = _('Edit Comment');
+var InsertAnnotation = _('Insert Comment');
+var Merge = _('Merge');
+var MergeCells = _('Merge Cells...');
+var ObjectBackOne = _('Bring Forward');
+var ObjectForwardOne = _('Send Backward');
+var PasteSpecial = _('Paste Special');
+var PasteUnformatted = _('Unformatted Text');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/src

[Andras Timar]

 loleaflet/Makefile   |1 
 loleaflet/src/control/Control.Menubar.js |  172 +++
 2 files changed, 87 insertions(+), 86 deletions(-)

New commits:
commit 62896c66eadd36d0ae01bb05a8911c294562e0c3
Author: Andras Timar 
Date:   Mon May 23 22:49:11 2016 +0200

loleaflet: enable l10n of menus

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 5cff678..22206fa 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -33,6 +33,7 @@ pot:
dist/errormessages.js \
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
+   src/control/Control.Menubar.js \
src/core/Socket.js
html2po --pot --input=dist/loleaflet-help.html 
--output=po/loleaflet-help.pot
 
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 2e6da81..d89c05e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -6,127 +6,127 @@
 L.Control.Menubar = L.Control.extend({
options: {
text:  [
-   {name: 'File', type: 'menu', menu: [{name: 'Save', 
type: 'unocommand', uno: '.uno:Save'},
-   
{name: 'Print', id: 'print', type: 'action'},
-   
{name: 'Download as', type: 'menu', menu: [{name: 'PDF Document 
(.pdf)', id: 'downloadas-pdf', type: 'action'},
-   

   {name: 'ODF text document (.odt)', id: 'downloadas-odt', 
type: 'action'},
-   

   {name: 'Microsoft Word 2003 (.doc)', id: 'downloadas-doc', 
type: 'action'},
-   

   {name: 'Microsoft Word (.docx)', id: 'downloadas-docx', 
type: 'action'}]}]
+   {name: _('File'), type: 'menu', menu: [{name: 
_('Save'), type: 'unocommand', uno: '.uno:Save'},
+   
{name: _('Print'), id: 'print', type: 'action'},
+   
{name: _('Download as'), type: 'menu', menu: [{name: _('PDF 
Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+   

   {name: _('ODF text document (.odt)'), id: 'downloadas-odt', 
type: 'action'},
+   

   {name: _('Microsoft Word 2003 (.doc)'), id: 
'downloadas-doc', type: 'action'},
+   

   {name: _('Microsoft Word (.docx)'), id: 'downloadas-docx', 
type: 'action'}]}]
},
-   {name: 'Edit', type: 'menu', menu: [{name: 'Undo', 
type: 'unocommand', uno: '.uno:Undo'},
-   
{name: 'Redo', type: 'unocommand', uno: '.uno:Redo'},
+   {name: _('Edit'), type: 'menu', menu: [{name: 
_('Undo'), type: 'unocommand', uno: '.uno:Undo'},
+   
{name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},

{type: 'separator'},
-   
{name: 'Cut', type: 'unocommand', uno: '.uno:Cut'},
-   
{name: 'Copy', type: 'unocommand', uno: '.uno:Copy'},
-   
{name: 'Paste', type: 'unocommand', uno: '.uno:Paste'},
+   
{name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
+  

[Libreoffice-commits] online.git: loleaflet/Makefile

[Pranav Kant]

 loleaflet/Makefile |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d2a7be0b6ed9f9d82e2cff5687841ab22562d747
Author: Pranav Kant 
Date:   Mon May 23 20:08:06 2016 +0530

loleaflet: Enforce linting during make

Change-Id: I509b13cb9f70c6de66b1906b76c4a968e05322f4

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index d1cd094..f7b575e 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -11,6 +11,7 @@ DRAW_VERSION=0.2.4
 all:
npm install
jake build
+   jake lint
rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p 
dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist 
../../dist/plugins/draw-$(DRAW_VERSION)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile

[Andras Timar]

 loleaflet/Makefile |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1af287e437cc61d6563bc9cec890e343e0010c91
Author: Andras Timar 
Date:   Mon May 23 13:29:16 2016 +0200

loleaflet: add --from-code=UTF-8 to xgettext call

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 99d685d..d1cd094 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -28,7 +28,9 @@ dist: all
rm -rf loleaflet-$(VERSION)
 
 pot:
-   xgettext --keyword=_ --output=po/loleaflet-ui.pot 
dist/toolbar/toolbar.js src/control/Control.Tabs.js \
+   xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \
+   dist/toolbar/toolbar.js \
+   src/control/Control.Tabs.js \
src/core/Socket.js
html2po --pot --input=dist/loleaflet-help.html 
--output=po/loleaflet-help.pot
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loolwsd/configure.ac

[Andras Timar]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d63d200a239b002b17de442fa9ecc9463ad4d903
Author: Andras Timar 
Date:   Wed May 11 09:55:17 2016 +0200

Bump version to 2.0.0

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index c301df6..4e752f5 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.6.4
+VERSION=2.0.0
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index e7f903c..440c04f 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.6.4], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [2.0.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loolwsd/configure.ac

[Andras Timar]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dd21e402d4055a24d9da4c46c8adfafd38bbff27
Author: Andras Timar 
Date:   Tue May 3 23:31:47 2016 +0200

Bump version to 1.6.4

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 6e3af48..c301df6 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.6.2
+VERSION=1.6.4
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 3a28a22..2158771 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.6.2], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.6.4], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile

[Andras Timar]

 loleaflet/Makefile |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c00f3535fa620eb59f865ecccd867d91cfcfe353
Author: Andras Timar 
Date:   Thu Apr 28 14:48:49 2016 +0200

silence po2json.py

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index f6a9f07..6e3af48 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -19,9 +19,9 @@ dist: all
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
cp -ar dist loleaflet-$(VERSION)
-   util/po2json.py po/*.po
+   util/po2json.py --quiet po/*.po
mv po/*.json loleaflet-$(VERSION)/dist/l10n
-   util/po2json.py po/styles/*.po
+   util/po2json.py --quiet po/styles/*.po
mkdir -p loleaflet-$(VERSION)/dist/l10n/styles/
mv po/styles/*.json loleaflet-$(VERSION)/dist/l10n/styles/
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loolwsd/configure.ac

[Andras Timar]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 39203290d88e91474138febe18229d0555fd40f7
Author: Andras Timar 
Date:   Sun Apr 10 12:53:06 2016 +0200

bump version number, because we branched off 1.5.x

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 5742504..61799b0 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.5.5
+VERSION=1.6.0
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 7f0c2f8..5434980 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.5.5], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.6.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([disable-static])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/src

[Andras Timar]

 loleaflet/Makefile   |2 +-
 loleaflet/src/core/Socket.js |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 63cc475ffc1c3095fd82034ac25924b11faf1a64
Author: Andras Timar 
Date:   Mon Feb 15 10:06:10 2016 +0100

loleaflet: enable l10n of socket error messages

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index beda56e..a0ebe1d 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -30,7 +30,7 @@ dist: all
rm -rf loleaflet-$(VERSION)
 
 pot:
-   xgettext --keyword=_ --output=po/loleaflet-toolbar.pot 
dist/toolbar/toolbar.js src/control/Control.Tabs.js
+   xgettext --keyword=_ --output=po/loleaflet-toolbar.pot 
dist/toolbar/toolbar.js src/control/Control.Tabs.js src/core/Socket.js
html2po --pot --input=dist/loleaflet-help.html 
--output=po/loleaflet-help.pot
 
 l10n: pot
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index a287cbd..af793a6 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -10,7 +10,7 @@ L.Socket = L.Class.extend({
try {
this.socket = new WebSocket(map.options.server);
} catch (e) {
-   this.fire('error', {msg: 'Socket connection error', 
cmd: 'socket', kind: 'failed', id: 3});
+   this.fire('error', {msg: _('Socket connection error'), 
cmd: 'socket', kind: 'failed', id: 3});
return null;
}
this._msgQueue = [];
@@ -97,11 +97,11 @@ L.Socket = L.Class.extend({
if (textMsg.startsWith('loolserver ')) {
// This must be the first message.
if (this._map._docLayer) {
-   this.fire('error', {msg: 'Unexpected loolserver 
message.'});
+   this.fire('error', {msg: _('Unexpected 
loolserver message.')});
}
// TODO: For now we expect perfect match.
if (textMsg.substring(11) !== 
this.ProtocolVersionNumber) {
-   this.fire('error', {msg: 'Unsupported server 
version.'});
+   this.fire('error', {msg: _('Unsupported server 
version.')});
}
}
else if (!textMsg.startsWith('tile:') && 
!textMsg.startsWith('renderfont:')) {
@@ -196,11 +196,11 @@ L.Socket = L.Class.extend({
},
 
_onSocketError: function () {
-   this.fire('error', {msg: 'Socket connection error', cmd: 
'socket', kind: 'failed', id: 3});
+   this.fire('error', {msg: _('Socket connection error'), cmd: 
'socket', kind: 'failed', id: 3});
},
 
_onSocketClose: function () {
-   this.fire('error', {msg: 'Socket connection closed', cmd: 
'socket', kind: 'closed', id: 4});
+   this.fire('error', {msg: _('Socket connection closed'), cmd: 
'socket', kind: 'closed', id: 4});
},
 
parseServerCmd: function (msg) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loleaflet/src

[Andras Timar]

 loleaflet/Makefile|2 +-
 loleaflet/src/control/Control.Tabs.js |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 691b40fedceaf0d777347fbba9d4b11b77a82caa
Author: Andras Timar 
Date:   Mon Feb 15 09:25:44 2016 +0100

loleaflet: enable l10n of add/remove/rename sheet tab feature

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 6e5dfa4..beda56e 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -30,7 +30,7 @@ dist: all
rm -rf loleaflet-$(VERSION)
 
 pot:
-   xgettext --keyword=_ --output=po/loleaflet-toolbar.pot 
dist/toolbar/toolbar.js
+   xgettext --keyword=_ --output=po/loleaflet-toolbar.pot 
dist/toolbar/toolbar.js src/control/Control.Tabs.js
html2po --pot --input=dist/loleaflet-help.html 
--output=po/loleaflet-help.pot
 
 l10n: pot
diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 1efcd8e..b8022cb 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -21,13 +21,13 @@ L.Control.Tabs = L.Control.extend({
map.insertPage(nPos + 1);
},
items: {
-   'insertsheetbefore': {name: 'Insert sheet 
before this'},
-   'insertsheetafter': {name: 'Insert sheet after 
this'},
-   'deletesheet': {name: 'Delete sheet',
+   'insertsheetbefore': {name: _('Insert sheet 
before this')},
+   'insertsheetafter': {name: _('Insert sheet 
after this')},
+   'deletesheet': {name: _('Delete sheet'),
callback: function(key, 
options) {
var nPos = 
parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);
vex.dialog.confirm({
-   message: 'Are 
you sure you want to delete this sheet?',
+   message: _('Are 
you sure you want to delete this sheet?'),
callback: 
function(data) {
if 
(data)

map.deletePage(nPos);
@@ -35,11 +35,11 @@ L.Control.Tabs = L.Control.extend({
});
}
 },
-   'renamesheet': {name: 'Rename sheet',
+   'renamesheet': {name: _('Rename sheet'),
callback: function(key, 
options){
var nPos = 
parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);
vex.dialog.open({
-   message: 'Enter 
new sheet name',
+   message: 
_('Enter new sheet name'),
input: '',
callback: 
function(data){

map.renamePage(data.sheetname, nPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loolwsd/configure.ac

[Mihai Varga]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0d655ca7ac181c0c24fad9baa9b756f4b66e5f7f
Author: Mihai Varga 
Date:   Wed Dec 16 20:55:30 2015 +0200

Bump the minor version number

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 0768cde..a7097ab 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.4.25
+VERSION=1.5.0
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 8690c4e..dce87dc 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.4.21], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.5.0], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loolwsd/configure.ac

[Mihai Varga]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eca5a95ecf6bf05940910e91fc83a566b03fbc9a
Author: Mihai Varga 
Date:   Wed Sep 16 18:40:37 2015 +0300

Bump 'minor' number in version

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 6599877..f8abdeb 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.3.1
+VERSION=1.4.1
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 2316aba..86ad875 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.3.1], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.4.1], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile

[Tor Lillqvist]

 loleaflet/Makefile |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 47ee691084001cbcd90ca5443d4fda0c13e54ad2
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 4 20:57:38 2015 +0300

Bump major.minor to 1.3 here in master

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index e1ea498..841d69b 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,9 @@
-# Version number of loleaflet, no need to be in sync with the loolwsd one
+# Version number of loleaflet, no need to be in sync with the loolwsd
+# one, but do please follow the same even/odd convention for the third
+# (micro) part: Between releases odd, even for releases (no other
+# changes inbetween).
 
-VERSION=1.1.18
+VERSION=1.3.1
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile

[Mihai Varga]

 loleaflet/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a205889e35c72bd40775ba627f03506d647e0ffb
Author: Mihai Varga mihai.va...@collabora.com
Date:   Fri Jul 31 21:01:40 2015 +0300

loleaflet: update version in master branch

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 94c2f80..29473e3 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.2.1
+VERSION=1.1.16
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loolwsd/configure.ac

[Tor Lillqvist]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8864d8432bbf1287e501a3f71f13949cd51e5f2a
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Jul 7 18:32:55 2015 +0300

Bump minor version in this branch

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 1995689..94c2f80 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.1.5
+VERSION=1.2.1
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 4ce0d45..8d556fe 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.1.5], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.2.1], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/Makefile loolwsd/configure.ac

[Tor Lillqvist]

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 391d17831dc3e387b1172e110400a98db9b1708d
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jun 5 16:28:49 2015 +0300

Bump minor number in this master branch

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4b95dc5..af9323a 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.11
+VERSION=1.1.1
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 395cec2..d48924c 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.35], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.1.1], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits