Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes

1 files changed, 225 insertions, 31 deletions

diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 4f986f9b2d..3ac0c52e2f 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -34,6 +34,12 @@ msgstr "-- Bitte auswählen --"
 msgid "-- custom --"
 msgstr "-- benutzerdefiniert --"
 
+msgid "-- match by device --"
+msgstr ""
+
+msgid "-- match by label --"
+msgstr ""
+
 msgid "1 Minute Load:"
 msgstr "Systemlast (1 Minute):"
 
@@ -117,6 +123,9 @@ msgstr ""
 msgid "ADSL Status"
 msgstr ""
 
+msgid "AICCU (SIXXS)"
+msgstr ""
+
 msgid "APN"
 msgstr "APN"
 
@@ -147,6 +156,9 @@ msgstr ""
 msgid "ATM device number"
 msgstr "ATM Geräteindex"
 
+msgid "AYIYA"
+msgstr ""
+
 msgid "Access Concentrator"
 msgstr "Access Concentrator"
 
@@ -236,16 +248,13 @@ msgstr ""
 "Dies erlaubt DNS-Antworten im 127.0.0.0/8 Bereich der z.B. für RBL Dienste "
 "genutzt wird"
 
-msgid "Always announce default router"
+msgid ""
+"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison"
+"\">Tunneling Comparison</a> on SIXXS"
 msgstr ""
 
-msgid ""
-"Always use 40MHz channels even if the secondary channel overlaps. Using this "
-"option does not comply with IEEE 802.11n-2009!"
+msgid "Always announce default router"
 msgstr ""
-"Immer 40MHz Kanalbreite nutzen, auch wenn der sekundäre Kanal andere "
-"Netzwerke überschneidet. Die Benutzung dieser Option verletzt den IEEE "
-"802.11n-2009 Standard!"
 
 msgid "An additional network will be created if you leave this unchecked."
 msgstr ""
@@ -295,6 +304,9 @@ msgstr "Assoziierte Clients"
 msgid "Atheros 802.11%s Wireless Controller"
 msgstr "Atheros 802.11%s W-LAN Adapter"
 
+msgid "AuthGroup"
+msgstr ""
+
 msgid "Authentication"
 msgstr "Authentifizierung"
 
@@ -358,6 +370,9 @@ msgstr "Ungültige Adresse angegeben!"
 msgid "Band"
 msgstr ""
 
+msgid "Behind NAT"
+msgstr ""
+
 msgid ""
 "Below is the determined list of files to backup. It consists of changed "
 "configuration files marked by opkg, essential base files and the user "
@@ -398,15 +413,15 @@ msgstr "Gepuffert"
 msgid "Buttons"
 msgstr "Knöpfe"
 
+msgid "CA certificate; if empty it will be saved after the first connection."
+msgstr ""
+
 msgid "CPU"
 msgstr "Prozessor"
 
 msgid "CPU usage (%)"
 msgstr "CPU-Nutzung (%)"
 
-msgid "Cached"
-msgstr "Zwischengespeichert"
-
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -498,11 +513,6 @@ msgstr "Konfiguration angewendet."
 msgid "Configuration files will be kept."
 msgstr "Konfigurationsdateien sichern"
 
-msgid "Configures this mount as overlay storage for block-extroot"
-msgstr ""
-"Konfiguriert diesen Mountpunkt als Overlay-Speicher für <em>block-extroot</"
-"em>"
-
 msgid "Confirmation"
 msgstr "Bestätigung"
 
@@ -515,6 +525,9 @@ msgstr "Verbunden"
 msgid "Connection Limit"
 msgstr "Verbindungslimit"
 
+msgid "Connection to server fails when TLS cannot be used"
+msgstr ""
+
 msgid "Connections"
 msgstr "Verbindungen"
 
@@ -607,6 +620,9 @@ msgstr "Standard %d"
 msgid "Default gateway"
 msgstr "Default Gateway"
 
+msgid "Default route"
+msgstr ""
+
 msgid "Default state"
 msgstr "Ausgangszustand"
 
@@ -798,9 +814,18 @@ msgstr "TFTP-Server aktivieren"
 msgid "Enable VLAN functionality"
 msgstr "VLAN-Funktionalität aktivieren"
 
+msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
+msgstr ""
+
 msgid "Enable learning and aging"
 msgstr "Learning und Aging aktivieren"
 
+msgid "Enable mirroring of incoming packets"
+msgstr ""
+
+msgid "Enable mirroring of outgoing packets"
+msgstr ""
+
 msgid "Enable this mount"
 msgstr "Diesen Mountpunkt aktivieren"
 
@@ -922,9 +947,6 @@ msgstr "Firmware wird installiert..."
 msgid "Force"
 msgstr "Start erzwingen"
 
-msgid "Force 40MHz mode"
-msgstr "40MHz-Modus erzwingen"
-
 msgid "Force CCMP (AES)"
 msgstr "CCMP (AES) erzwingen"
 
@@ -960,9 +982,6 @@ msgstr "Frei"
 msgid "Free space"
 msgstr "Freier Platz"
 
-msgid "Frequency Hopping"
-msgstr "Frequenzsprung"
-
 msgid "GHz"
 msgstr "GHz"
 
@@ -1010,15 +1029,15 @@ msgstr "HE.net Passwort"
 msgid "HE.net username"
 msgstr ""
 
-msgid "HT mode (802.11n)"
-msgstr ""
-
 msgid "Handler"
 msgstr "Handler"
 
 msgid "Hang Up"
 msgstr "Auflegen"
 
+msgid "Heartbeat"
+msgstr ""
+
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -1056,6 +1075,9 @@ msgstr "Zu sendender Hostname bei DHCP Anfragen"
 msgid "Hostnames"
 msgstr "Rechnernamen"
 
+msgid "Hybrid"
+msgstr ""
+
 msgid "IP address"
 msgstr "IP-Adresse"
 
@@ -1101,6 +1123,9 @@ msgstr "IPv6"
 msgid "IPv6 Firewall"
 msgstr "IPv6 Firewall"
 
+msgid "IPv6 Neighbours"
+msgstr ""
+
 msgid "IPv6 Settings"
 msgstr ""
 
@@ -1113,6 +1138,9 @@ msgstr "IPv6 WAN Status"
 msgid "IPv6 address"
 msgstr "IPv6 Adresse"
 
+msgid "IPv6 address delegated to the local tunnel endpoint (optional)"
+msgstr ""
+
 msgid "IPv6 assignment hint"
 msgstr ""
 
@@ -1252,6 +1280,9 @@ msgstr "Schnittstelle heruntergefahren"
 msgid "Interfaces"
 msgstr "Schnittstellen"
 
+msgid "Internal"
+msgstr ""
+
 msgid "Internal Server Error"
 msgstr "Interner Serverfehler"
 
@@ -1330,6 +1361,9 @@ msgstr "Sprache"
 msgid "Language and Style"
 msgstr "Sprache und Aussehen"
 
+msgid "Leaf"
+msgstr ""
+
 msgid "Lease validity time"
 msgstr "Lease-Gültigkeitsdauer"
 
@@ -1438,8 +1472,8 @@ msgstr ""
 msgid "Localise queries"
 msgstr "Lokalisiere Anfragen"
 
-msgid "Locked to channel %d used by %s"
-msgstr "Festgelegt auf Kanal %d benutzt von %s"
+msgid "Locked to channel %d used by: %s"
+msgstr ""
 
 msgid "Log output level"
 msgstr "Protokolllevel"
@@ -1480,6 +1514,11 @@ msgstr "MHz"
 msgid "MTU"
 msgstr "MTU"
 
+msgid ""
+"Make sure to clone the root filesystem using something like the commands "
+"below:"
+msgstr ""
+
 msgid "Maximum Rate"
 msgstr "Höchstübertragungsrate"
 
@@ -1519,6 +1558,12 @@ msgstr "Mindestübertragungsrate"
 msgid "Minimum hold time"
 msgstr "Minimalzeit zum Halten der Verbindung"
 
+msgid "Mirror monitor port"
+msgstr ""
+
+msgid "Mirror source port"
+msgstr ""
+
 msgid "Missing protocol extension for proto %q"
 msgstr "Erweiterung für Protokoll %q fehlt"
 
@@ -1589,6 +1634,9 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "NTP Server Kandidaten"
 
+msgid "NTP sync time-out"
+msgstr ""
+
 msgid "Name"
 msgstr "Name"
 
@@ -1725,12 +1773,24 @@ msgstr "Ein oder mehr benötigte Felder sind nicht ausgefüllt!"
 msgid "Open list..."
 msgstr "Liste öffnen..."
 
+msgid "OpenConnect (CISCO AnyConnect)"
+msgstr ""
+
+msgid "Operating frequency"
+msgstr ""
+
 msgid "Option changed"
 msgstr "Option geändert"
 
 msgid "Option removed"
 msgstr "Option entfernt"
 
+msgid "Optional, specify to override default server (tic.sixxs.net)"
+msgstr ""
+
+msgid "Optional, use when the SIXXS account has more than one tunnel"
+msgstr ""
+
 msgid "Options"
 msgstr "Optionen"
 
@@ -1746,6 +1806,9 @@ msgstr "Ausgehend:"
 msgid "Outdoor Channels"
 msgstr "Funkkanal für den Ausseneinsatz"
 
+msgid "Output Interface"
+msgstr ""
+
 msgid "Override MAC address"
 msgstr "MAC-Adresse überschreiben"
 
@@ -1825,6 +1888,9 @@ msgstr "Passwort des Privaten Schlüssels"
 msgid "Password successfully changed!"
 msgstr "Passwort erfolgreich geändert!"
 
+msgid "Path"
+msgstr "Pfad"
+
 msgid "Path to CA-Certificate"
 msgstr "Pfad zum CA-Zertifikat"
 
@@ -2083,6 +2149,9 @@ msgstr ""
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
+msgid "Require TLS"
+msgstr ""
+
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 "Wird von bestimmten Internet-Providern benötigt, z.B. Charter mit DOCSIS 3"
@@ -2123,6 +2192,12 @@ msgstr "Root"
 msgid "Root directory for files served via TFTP"
 msgstr "Wurzelverzeichnis für über TFTP ausgelieferte Dateien "
 
+msgid "Root preparation"
+msgstr ""
+
+msgid "Routed IPv6 prefix for downstream interfaces"
+msgstr ""
+
 msgid "Router Advertisement-Service"
 msgstr ""
 
@@ -2148,6 +2223,14 @@ msgstr "Vor dem Einhängen Dateisystemprüfung starten "
 msgid "Run filesystem check"
 msgstr "Dateisystemprüfung durchführen"
 
+msgid ""
+"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) "
+"use 6in4 instead"
+msgstr ""
+
+msgid "SIXXS-handle[/Tunnel-ID]"
+msgstr ""
+
 msgid "SSH Access"
 msgstr "SSH-Zugriff"
 
@@ -2197,6 +2280,17 @@ msgstr "Separates WDS"
 msgid "Server Settings"
 msgstr "Servereinstellungen"
 
+msgid "Server password"
+msgstr ""
+
+msgid ""
+"Server password, enter the specific password of the tunnel when the username "
+"contains the tunnel ID"
+msgstr ""
+
+msgid "Server username"
+msgstr ""
+
 msgid "Service Name"
 msgstr "Service-Name"
 
@@ -2272,6 +2366,9 @@ msgstr "Sortieren"
 msgid "Source"
 msgstr "Quelle"
 
+msgid "Source routing"
+msgstr ""
+
 msgid "Specifies the button state to handle"
 msgstr "Gibt den zu behandelnden Tastenstatus an"
 
@@ -2538,6 +2635,11 @@ msgstr ""
 "Adresse beziehen müssen um auf das Gerät zugreifen zu können."
 
 msgid ""
+"The tunnel end-point is behind NAT, defaults to disabled and only applies to "
+"AYIYA"
+msgstr ""
+
+msgid ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 msgstr ""
@@ -2697,6 +2799,15 @@ msgstr "Tunnelschnittstelle"
 msgid "Tunnel Link"
 msgstr ""
 
+msgid "Tunnel broker protocol"
+msgstr ""
+
+msgid "Tunnel setup server"
+msgstr ""
+
+msgid "Tunnel type"
+msgstr ""
+
 msgid "Turbo Mode"
 msgstr "Turbo Modus"
 
@@ -2778,8 +2889,11 @@ msgstr "Benutze MTU auf der Tunnelschnittstelle"
 msgid "Use TTL on tunnel interface"
 msgstr "Benutze TTL auf der Tunnelschnittstelle"
 
-msgid "Use as root filesystem"
-msgstr "Als Wurzeldateisystem benutzen"
+msgid "Use as external overlay (/overlay)"
+msgstr ""
+
+msgid "Use as root filesystem (/)"
+msgstr ""
 
 msgid "Use broadcast flag"
 msgstr "Benutze Broadcast-Flag"
@@ -2816,6 +2930,12 @@ msgstr "Belegt"
 msgid "Used Key Slot"
 msgstr "Benutzer Schlüsselindex"
 
+msgid "User certificate (PEM encoded)"
+msgstr ""
+
+msgid "User key (PEM encoded)"
+msgstr ""
+
 msgid "Username"
 msgstr "Benutzername"
 
@@ -2834,9 +2954,21 @@ msgstr "VLANs auf %q (%s)"
 msgid "VPN Server"
 msgstr "VPN-Server"
 
+msgid "VPN Server port"
+msgstr ""
+
+msgid "VPN Server's certificate SHA1 hash"
+msgstr ""
+
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Bei DHCP-Anfragen gesendete Vendor-Klasse"
 
+msgid "Verbose"
+msgstr ""
+
+msgid "Verbose logging by aiccu daemon"
+msgstr ""
+
 msgid "Verify"
 msgstr "Verifizieren"
 
@@ -2868,6 +3000,10 @@ msgstr ""
 "WPA-Verschlüsselung benötigt wpa_supplicant (für Client-Modus) oder hostapd "
 "(für AP oder Ad-Hoc Modus)."
 
+msgid ""
+"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)"
+msgstr ""
+
 msgid "Waiting for changes to be applied..."
 msgstr "Änderungen werden angewandt..."
 
@@ -2882,6 +3018,15 @@ msgstr ""
 "Warnung: Es gibt ungespeicherte Änderungen, die bei einem Neustart verloren "
 "gehen!"
 
+msgid "Whether to create an IPv6 default route over the tunnel"
+msgstr ""
+
+msgid "Whether to route only packets from delegated prefixes"
+msgstr ""
+
+msgid "Width"
+msgstr ""
+
 msgid "Wifi"
 msgstr "Drahtlos"
 
@@ -2940,6 +3085,12 @@ msgstr ""
 "Im Browser muss Java-Script aktiviert sein oder LuCI wird nicht richtig "
 "funktionieren."
 
+msgid ""
+"Your Internet Explorer is too old to display this page correctly. Please "
+"upgrade it to at least version 7 or use another browser like Firefox, Opera "
+"or Safari."
+msgstr ""
+
 msgid "any"
 msgstr "beliebig"
 
@@ -3017,6 +3168,12 @@ msgstr "kbit/s"
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Lokale DNS-Datei"
 
+msgid "minimum 1280, maximum 1480"
+msgstr ""
+
+msgid "navigation Navigation"
+msgstr ""
+
 msgid "no"
 msgstr "nein"
 
@@ -3026,6 +3183,9 @@ msgstr "nicht verbunden"
 msgid "none"
 msgstr "keine"
 
+msgid "not present"
+msgstr ""
+
 msgid "off"
 msgstr "aus"
 
@@ -3035,6 +3195,9 @@ msgstr "ein"
 msgid "open"
 msgstr "offen"
 
+msgid "overlay"
+msgstr ""
+
 msgid "relay mode"
 msgstr ""
 
@@ -3044,6 +3207,12 @@ msgstr "routed"
 msgid "server mode"
 msgstr ""
 
+msgid "skiplink1 Skip to navigation"
+msgstr ""
+
+msgid "skiplink2 Skip to content"
+msgstr ""
+
 msgid "stateful-only"
 msgstr ""
 
@@ -3077,6 +3246,34 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Zurück"
 
+#~ msgid ""
+#~ "Always use 40MHz channels even if the secondary channel overlaps. Using "
+#~ "this option does not comply with IEEE 802.11n-2009!"
+#~ msgstr ""
+#~ "Immer 40MHz Kanalbreite nutzen, auch wenn der sekundäre Kanal andere "
+#~ "Netzwerke überschneidet. Die Benutzung dieser Option verletzt den IEEE "
+#~ "802.11n-2009 Standard!"
+
+#~ msgid "Cached"
+#~ msgstr "Zwischengespeichert"
+
+#~ msgid "Configures this mount as overlay storage for block-extroot"
+#~ msgstr ""
+#~ "Konfiguriert diesen Mountpunkt als Overlay-Speicher für <em>block-"
+#~ "extroot</em>"
+
+#~ msgid "Force 40MHz mode"
+#~ msgstr "40MHz-Modus erzwingen"
+
+#~ msgid "Frequency Hopping"
+#~ msgstr "Frequenzsprung"
+
+#~ msgid "Locked to channel %d used by %s"
+#~ msgstr "Festgelegt auf Kanal %d benutzt von %s"
+
+#~ msgid "Use as root filesystem"
+#~ msgstr "Als Wurzeldateisystem benutzen"
+
 #~ msgid "HE.net user ID"
 #~ msgstr "HE.net Benutzer-ID"
 
@@ -3973,9 +4170,6 @@ msgstr "« Zurück"
 #~ msgid "Number of leased addresses"
 #~ msgstr "Anzahl vergebener Adressen"
 
-#~ msgid "Path"
-#~ msgstr "Pfad"
-
 #~ msgid "Perform Actions"
 #~ msgstr "Aktionen ausführen"