From b12fb53ee2e1597f0246a961dc5ff29f8af04d47 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 19 May 2016 12:07:58 +0200
Subject: work work work work work

---
 modules-available/main/category-icons.json      |  5 +++--
 modules-available/main/config.json              |  1 -
 modules-available/main/lang/de/categories.json  |  3 ++-
 modules-available/main/lang/de/global-tags.json |  2 ++
 modules-available/main/lang/en/categories.json  | 11 ++++++-----
 modules-available/main/lang/en/global-tags.json |  2 ++
 modules-available/main/lang/pt/categories.json  |  5 +++--
 modules-available/main/lang/pt/global-tags.json | 11 ++++++++++-
 8 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'modules-available/main')

diff --git a/modules-available/main/category-icons.json b/modules-available/main/category-icons.json
index 97b76eac..08cb2a64 100644
--- a/modules-available/main/category-icons.json
+++ b/modules-available/main/category-icons.json
@@ -1,7 +1,8 @@
 {
 	"cities":"tower",
 	"content":"th",
-	"settings":"cog",
+	"settings-client":"cog",
+	"settings-server":"cog",
 	"status":"tasks",
 	"users":"user"
-}
\ No newline at end of file
+}
diff --git a/modules-available/main/config.json b/modules-available/main/config.json
index 4da67ef8..2c63c085 100644
--- a/modules-available/main/config.json
+++ b/modules-available/main/config.json
@@ -1,3 +1,2 @@
 {
-	"enabled":"true"
 }
diff --git a/modules-available/main/lang/de/categories.json b/modules-available/main/lang/de/categories.json
index 3d9b50a3..8fd292ec 100644
--- a/modules-available/main/lang/de/categories.json
+++ b/modules-available/main/lang/de/categories.json
@@ -1,6 +1,7 @@
 {
     "content": "Inhalt",
-    "settings": "Einstellungen",
+    "settings-client": "Einstellungen (Client)",
+    "settings-server": "Einstellungen (Server)",
     "status": "Status",
     "users": "Benutzer"
 }
\ No newline at end of file
diff --git a/modules-available/main/lang/de/global-tags.json b/modules-available/main/lang/de/global-tags.json
index a8fa0034..6664caac 100644
--- a/modules-available/main/lang/de/global-tags.json
+++ b/modules-available/main/lang/de/global-tags.json
@@ -4,9 +4,11 @@
     "lang_close": "Schlie\u00dfen",
     "lang_days": "Tag(e)",
     "lang_delete": "L\u00f6schen",
+    "lang_edit": "Bearbeiten",
     "lang_hint": "Hinweis",
     "lang_hours": "Stunde(n)",
     "lang_next": "Weiter",
+    "lang_reset": "Zur\u00fccksetzen",
     "lang_save": "Speichern",
     "lang_today": "Heute",
     "lang_yesterday": "Gestern"
diff --git a/modules-available/main/lang/en/categories.json b/modules-available/main/lang/en/categories.json
index 3d67bcfd..defbd652 100644
--- a/modules-available/main/lang/en/categories.json
+++ b/modules-available/main/lang/en/categories.json
@@ -1,6 +1,7 @@
 {
-	"settings": "Settings",
-	"status": "Status",
-	"content": "Content",
-	"users": "Users"
-}
+    "content": "Content",
+    "settings-client": "Settings (Client)",
+    "settings-server": "Settings (Server)",
+    "status": "Status",
+    "users": "Users"
+}
\ No newline at end of file
diff --git a/modules-available/main/lang/en/global-tags.json b/modules-available/main/lang/en/global-tags.json
index 181f600a..26cbdfde 100644
--- a/modules-available/main/lang/en/global-tags.json
+++ b/modules-available/main/lang/en/global-tags.json
@@ -4,9 +4,11 @@
     "lang_close": "Close",
     "lang_days": "day(s)",
     "lang_delete": "Delete",
+    "lang_edit": "Edit",
     "lang_hint": "Hint",
     "lang_hours": "hour(s)",
     "lang_next": "Next",
+    "lang_reset": "Reset",
     "lang_save": "Save",
     "lang_today": "Today",
     "lang_yesterday": "Yesterday"
diff --git a/modules-available/main/lang/pt/categories.json b/modules-available/main/lang/pt/categories.json
index 4b6ed82f..b7c8382e 100644
--- a/modules-available/main/lang/pt/categories.json
+++ b/modules-available/main/lang/pt/categories.json
@@ -1,6 +1,7 @@
 {
     "content": "Conte\u00fado",
-    "settings": "Configura\u00e7\u00f5es",
+    "settings-client": "Configura\u00e7\u00f5es (Client)",
+    "settings-server": "Configura\u00e7\u00f5es (Server)",
     "status": "Status",
     "users": "Usu\u00e1rios"
-}
+}
\ No newline at end of file
diff --git a/modules-available/main/lang/pt/global-tags.json b/modules-available/main/lang/pt/global-tags.json
index a462651b..11e032e2 100644
--- a/modules-available/main/lang/pt/global-tags.json
+++ b/modules-available/main/lang/pt/global-tags.json
@@ -1,5 +1,14 @@
 {
+    "lang_back": "Voltar",
+    "lang_cancel": "Cancelar",
     "lang_close": "Fechar",
+    "lang_days": "Dia(s)",
+    "lang_delete": "Excluir",
+    "lang_edit": "Editar",
+    "lang_hours": "Hora(s)",
     "lang_next": "Pr\u00f3ximo",
-    "lang_save": "Salvar"
+    "lang_reset": "Limpar",
+    "lang_save": "Salvar",
+    "lang_today": "Hoje",
+    "lang_yesterday": "Ontem"
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522