applications/splash: Fix blacklisting mechanism, expose status on public freifunk page, add json output and autoupdate.

1 files changed, 80 insertions, 6 deletions

diff --git a/po/uk/splash.po b/po/uk/splash.po
index 7689a13ef..04993eaa2 100644
--- a/po/uk/splash.po
+++ b/po/uk/splash.po
@@ -1,17 +1,25 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 msgid "Accept"
 msgstr ""
 
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
 msgid "Active Clients"
 msgstr ""
 
@@ -24,9 +32,19 @@ msgid ""
 "Whitelisted clients are not limited."
 msgstr ""
 
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
 msgid "Blacklist"
 msgstr ""
 
+msgid "Blocked"
+msgstr ""
+
+msgid "By accepting these rules you can use this network for"
+msgstr ""
+
 msgid "Clearance time"
 msgstr ""
 
@@ -49,9 +67,15 @@ msgstr ""
 msgid "Clients upload speed is limited to this value (kbyte/s)"
 msgstr ""
 
+msgid "Contact"
+msgstr ""
+
 msgid "Decline"
 msgstr ""
 
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
 msgid "Download limit"
 msgstr ""
 
@@ -75,6 +99,13 @@ msgstr ""
 msgid "IP Address"
 msgstr ""
 
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
 msgid "Intercept client traffic on this Interface"
 msgstr ""
 
@@ -84,6 +115,11 @@ msgstr ""
 msgid "Interfaces that are used for Splash."
 msgstr ""
 
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
 msgid "MAC Address"
 msgstr ""
 
@@ -104,6 +140,11 @@ msgstr ""
 msgid "No clients connected"
 msgstr ""
 
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
 msgid "Policy"
 msgstr ""
 
@@ -119,20 +160,38 @@ msgstr ""
 msgid "Time remaining"
 msgstr ""
 
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
 msgid "Traffic in/out"
 msgstr ""
 
 msgid "Upload limit"
 msgstr ""
 
+msgid "Welcome"
+msgstr ""
+
 msgid "Whitelist"
 msgstr ""
 
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
 msgid ""
-"You can change the text that is displayed to clients here.<br /> It is "
+"You can enter your own text that is displayed to clients here.<br />It is "
 "possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
-"###LEASETIME### and ###ACCEPT###.<br />Click here to <a href='/luci/"
-"splash/'>test the splash page</a> after you saved it."
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
 msgstr ""
 
 msgid "blacklisted"
@@ -141,17 +200,32 @@ msgstr ""
 msgid "expired"
 msgstr ""
 
+msgid "hour(s). After this time you need to accept these rules again."
+msgstr ""
+
 msgid "optional when using host addresses"
 msgstr ""
 
+msgid "perform any kind of illegal activities"
+msgstr ""
+
 msgid "splashed"
 msgstr ""
 
 msgid "temporarily blocked"
 msgstr ""
 
+msgid "the owner of this access point."
+msgstr ""
+
 msgid "unknown"
 msgstr ""
 
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
 msgid "whitelisted"
 msgstr ""