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, 7 insertions, 4 deletions

diff --git a/src/invoice/main.vala b/src/invoice/main.vala
index b341adb..f5ec69b 100644
--- a/src/invoice/main.vala
+++ b/src/invoice/main.vala
@@ -16,11 +16,14 @@
 InvoiceImplementation invoice;
 
 public static void help(string name) {
-	stderr.printf("Usage: %s <temporary> [timestamp]\n", name);
-	stderr.printf("Possible values for <temporary>: temporary, final\n");
+	stderr.printf(_("Usage: %s <temporary> [timestamp]\n"), name);
+	stderr.printf(_("Possible values for <temporary>: temporary, final\n"));
 }
 
 public static int main(string[] args) {
+	Intl.setlocale(LocaleCategory.ALL, "");
+	Intl.textdomain("shopsystem");
+
 	bool temporary = false;
 	int64 timestamp = new DateTime.now_local().to_unix();
 
@@ -45,14 +48,14 @@ public static int main(string[] args) {
 	try {
 		invoice = new InvoiceImplementation();
 	} catch(Error e) {
-		stderr.printf("Error: %s\n", e.message);
+		stderr.printf(_("Error: %s\n"), e.message);
 		return 1;
 	}
 
 	try {
 		invoice.send_invoices(temporary, timestamp);
 	} catch(Error e) {
-		stderr.printf("Error: %s\n", e.message);
+		stderr.printf(_("Error: %s\n"), e.message);
 		return 1;
 	}