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

diff --git a/src/config/config.vala b/src/config/config.vala
index 60fd835..bc476f4 100644
--- a/src/config/config.vala
+++ b/src/config/config.vala
@@ -23,39 +23,39 @@ public class Cfg {
 			this.file = new KeyFile();
 			this.file.load_from_file(file, KeyFileFlags.NONE);
 		} catch(Error e) {
-			error("Could not load configuration file: %s", e.message);
+			error(_("Could not load configuration file: %s"), e.message);
 		}
 	}
 
-	public bool has_group(string group_name) throws KeyFileError {
+	public bool has_group(string group_name) throws DBusError, IOError, KeyFileError {
 		return file.has_group(group_name);
 	}
 
-	public bool has_key(string group_name, string key) throws KeyFileError {
+	public bool has_key(string group_name, string key) throws DBusError, IOError, KeyFileError {
 		return file.has_key(group_name, key);
 	}
 
-	public string get_string(string group_name, string key) throws KeyFileError {
+	public string get_string(string group_name, string key) throws DBusError, IOError, KeyFileError {
 		return file.get_string(group_name, key);
 	}
 
-	public bool get_boolean(string group_name, string key) throws KeyFileError {
+	public bool get_boolean(string group_name, string key) throws DBusError, IOError, KeyFileError {
 		return file.get_boolean(group_name, key);
 	}
 
-	public int get_integer(string group_name, string key) throws KeyFileError {
+	public int get_integer(string group_name, string key) throws DBusError, IOError, KeyFileError {
 		return file.get_integer(group_name, key);
 	}
 
-	public int64 get_int64(string group_name, string key) throws KeyFileError {
+	public int64 get_int64(string group_name, string key) throws DBusError, IOError, KeyFileError {
 		return file.get_int64(group_name, key);
 	}
 
-	public uint64 get_uint64(string group_name, string key) throws KeyFileError {
+	public uint64 get_uint64(string group_name, string key) throws DBusError, IOError, KeyFileError {
 		return file.get_uint64(group_name, key);
 	}
 
-	public double get_double(string group_name, string key) throws KeyFileError {
+	public double get_double(string group_name, string key) throws DBusError, IOError, KeyFileError {
 		return file.get_double(group_name, key);
 	}