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, 5 insertions, 6 deletions

diff --git a/src/cli/cli.vala b/src/cli/cli.vala
index bc6fe9d..0d0e9d4 100644
--- a/src/cli/cli.vala
+++ b/src/cli/cli.vala
@@ -15,14 +15,13 @@
 
 [DBus (name = "io.mainframe.shopsystem.Cli")]
 public class CliImpl {
-	
 	public signal void received_barcode(string barcode);
 
 	public CliImpl() {
- 	}
+	}
 
- 	public void send(string msg) {
- 		stdout.printf("Sending: %s\n", msg);                  
- 		received_barcode(msg);					
- 	}
+	public void send(string msg) throws IOError, DBusError {
+		stdout.printf(_("Sending: %s\n"), msg);
+		received_barcode(msg);
+	}
 }