From 463d695c4f7ba87ba99f0ffc548ad6f994ff49d0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 18 Nov 2014 19:48:44 +0100
Subject: Added proxy server settings

---
 lang/de/templates/internetaccess/_page.json   | 14 ++++++++++++++
 lang/de/templates/internetaccess/restart.json |  5 +++++
 lang/de/templates/main-menu.json              |  1 +
 lang/en/templates/internetaccess/_page.json   | 14 ++++++++++++++
 lang/en/templates/internetaccess/restart.json |  5 +++++
 lang/en/templates/main-menu.json              |  1 +
 6 files changed, 40 insertions(+)
 create mode 100644 lang/de/templates/internetaccess/_page.json
 create mode 100644 lang/de/templates/internetaccess/restart.json
 create mode 100644 lang/en/templates/internetaccess/_page.json
 create mode 100644 lang/en/templates/internetaccess/restart.json

(limited to 'lang')

diff --git a/lang/de/templates/internetaccess/_page.json b/lang/de/templates/internetaccess/_page.json
new file mode 100644
index 00000000..61e324a8
--- /dev/null
+++ b/lang/de/templates/internetaccess/_page.json
@@ -0,0 +1,14 @@
+{
+    "lang_automatic": "Automatisch",
+    "lang_description": "Hier k\u00f6nnen Sie konfigurieren, wie der Satellitenserver auf das Internet zugreifen soll. Dies wird in erster Linie f\u00fcr das Aktualisieren des Systems sowie das Synchronisieren von Virtuellen Maschinen mit dem Zentralserver verwendet. Gegenw\u00e4rtig wird neben Direktzugriff noch SOCKS4\/5 unterst\u00fctzt.",
+    "lang_internetAccess": "Internetzugriff",
+    "lang_manual": "Manuelle Angabe",
+    "lang_manualProxyConfig": "Wenn Sie einen SOCKS-Proxy manuell konfigurieren m\u00f6chten, geben Sie bitte hier die Verbindungsdaten an.",
+    "lang_no": "Keiner",
+    "lang_proxyAddress": "Adresse",
+    "lang_proxyPassword": "Passwort",
+    "lang_proxyPort": "Port",
+    "lang_proxyType": "Proxy Typ",
+    "lang_proxyUsername": "Benutzername",
+    "lang_save": "Speichern"
+}
\ No newline at end of file
diff --git a/lang/de/templates/internetaccess/restart.json b/lang/de/templates/internetaccess/restart.json
new file mode 100644
index 00000000..899a1d28
--- /dev/null
+++ b/lang/de/templates/internetaccess/restart.json
@@ -0,0 +1,5 @@
+{
+    "lang_restartFailed": "Neustart eines oder mehrerer Dienste fehlgeschlagen!",
+    "lang_restarting": "Neustart",
+    "lang_serviceRestart": "Neustarten der Dienste"
+}
\ No newline at end of file
diff --git a/lang/de/templates/main-menu.json b/lang/de/templates/main-menu.json
index 564865a8..36ecf597 100644
--- a/lang/de/templates/main-menu.json
+++ b/lang/de/templates/main-menu.json
@@ -6,6 +6,7 @@
     "lang_configurationBasic": "Grundkonfiguration",
     "lang_configurationVariables": "KonfigurationsVariablen",
     "lang_eventLog": "Server Log",
+    "lang_internetAccess": "Internetzugriff",
     "lang_language": "Sprachen",
     "lang_localization": "Lokalisierung",
     "lang_login": "Anmelden",
diff --git a/lang/en/templates/internetaccess/_page.json b/lang/en/templates/internetaccess/_page.json
new file mode 100644
index 00000000..c02ca4f5
--- /dev/null
+++ b/lang/en/templates/internetaccess/_page.json
@@ -0,0 +1,14 @@
+{
+    "lang_automatic": "Auto",
+    "lang_description": "Here you can configure how the satellite server has to access the internet.",
+    "lang_internetAccess": "Internet access",
+    "lang_manual": "Manual",
+    "lang_manualProxyConfig": "If you want to configure a proxy server manually, please supply the credentials here.",
+    "lang_no": "None",
+    "lang_proxyAddress": "Address",
+    "lang_proxyPassword": "Password",
+    "lang_proxyPort": "Port",
+    "lang_proxyType": "Proxy type",
+    "lang_proxyUsername": "User",
+    "lang_save": "Save"
+}
\ No newline at end of file
diff --git a/lang/en/templates/internetaccess/restart.json b/lang/en/templates/internetaccess/restart.json
new file mode 100644
index 00000000..badad460
--- /dev/null
+++ b/lang/en/templates/internetaccess/restart.json
@@ -0,0 +1,5 @@
+{
+    "lang_restartFailed": "Restarting one or more services failed!",
+    "lang_restarting": "Restarting",
+    "lang_serviceRestart": "Restart of services"
+}
\ No newline at end of file
diff --git a/lang/en/templates/main-menu.json b/lang/en/templates/main-menu.json
index 16fe70d4..50ffabb5 100644
--- a/lang/en/templates/main-menu.json
+++ b/lang/en/templates/main-menu.json
@@ -6,6 +6,7 @@
     "lang_configurationBasic": "Basic Configuration",
     "lang_configurationVariables": "Configuration Variables",
     "lang_eventLog": "Server Log",
+    "lang_internetAccess": "Internet access",
     "lang_language": "Language",
     "lang_localization": "Localization",
     "lang_login": "Login",
-- 
cgit v1.2.3-55-g7522