Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 47 insertions, 0 deletions

diff --git a/data/po/POTFILES b/data/po/POTFILES
new file mode 100644
index 0000000..33e1f6a
--- /dev/null
+++ b/data/po/POTFILES
@@ -0,0 +1,47 @@
+audio/audio.vala
+audio/main.vala
+backup/main.vala
+cli/cli.vala
+cli/main.vala
+config/config.vala
+config/main.vala
+curses-ui/clock.vala
+curses-ui/curses-ui.vala
+curses-ui/dialog.vala
+curses-ui/logo.vala
+curses-ui/main.vala
+curses-ui/message_box.vala
+curses-ui/message_box_overlay.vala
+curses-ui/numbers.vala
+curses-ui/status.vala
+database/database.vala
+database/main.vala
+graph-data.vala
+input-device/input-device.vala
+input-device/main.vala
+invoice/invoice.vala
+invoice/main.vala
+invoice/single.vala
+libcairobarcode/code39.vala
+libcairobarcode/ean.vala
+libcairobarcode/error.vala
+mail/mail.vala
+mail/mailer.vala
+mail/main.vala
+pdf-invoice/main.vala
+pdf-invoice/pdf-invoice.vala
+pdf-invoice/test.vala
+pdf-stock/main.vala
+pdf-stock/pdf-stock.vala
+pdf-stock/test.vala
+pgp/main.vala
+pgp/pgp.vala
+scanner-session/main.vala
+scanner-session/scannersession.vala
+serial-device/main.vala
+serial-device/serial-device.vala
+web/csv.vala
+web/main.vala
+web/template.vala
+web/web.vala
+web/websession.vala