summaryrefslogtreecommitdiffstats
path: root/modules-available/locationinfo/lang/en/template-tags.json
diff options
context:
space:
mode:
authorSimon Rettberg2020-10-21 16:02:11 +0200
committerSimon Rettberg2020-10-21 16:02:11 +0200
commitab66db334661477be29d11ac70045e9b2968c82e (patch)
tree8b73cf64965068d40960ed06ff7b92b06d1be30a /modules-available/locationinfo/lang/en/template-tags.json
parent[serversetup-bwlp-ipxe] Fix UUID validation (diff)
downloadslx-admin-ab66db334661477be29d11ac70045e9b2968c82e.tar.gz
slx-admin-ab66db334661477be29d11ac70045e9b2968c82e.tar.xz
slx-admin-ab66db334661477be29d11ac70045e9b2968c82e.zip
[locationinfo] URLPANEL: Allow black- and whitelist simultaneously
References #3790
Diffstat (limited to 'modules-available/locationinfo/lang/en/template-tags.json')
-rw-r--r--modules-available/locationinfo/lang/en/template-tags.json8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index 0ebae3f9..b4d2a516 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -6,6 +6,7 @@
"lang_autoscaleTooltip": "Calculates the optimum amount of days to show from the display width",
"lang_backend": "Backend",
"lang_backends": "Backends",
+ "lang_blacklist": "Blacklist",
"lang_bookmarks": "Bookmarks",
"lang_bookmarksTooltip": "Add bookmarks to the browser",
"lang_browser": "Browser",
@@ -148,15 +149,14 @@
"lang_typeTooltip": "Defines on which type of server you want to connect to",
"lang_updateRates": "Update rates",
"lang_url": "URL",
- "lang_urlBlacklist": "Blacklist",
- "lang_urlListHelp": "You can specify a list of URLs or host names that will be used as either a blacklist or a whitelist. You can use the special characters '?' to represent any character, '*' to represent any number of characters excluding '\/', or '**' meaning any number of characters, including '\/'. Examples are \"*.wikipedia.org\", \"https:\/\/www.bwlehrpool.de\/**\" or \"*:\/\/*.uni-freiburg.de\/*.html\".",
+ "lang_urlListHelp": "You can specify lists of URLs or hostnames here, which are then interpreted as a whitelist or blacklist. Depending on the selected browser, either the whitelist or the \"more precise\" rule takes precedence. If no rule applies, access will be allowed unless there is an entry \"*\" in the blacklist. Depending on the browser used, \"*\" is supported as a wildcard in different places. You can introduce comments at the end of or between lines using \"#\". Further information can be found in the bwLehrpool-Wiki.",
"lang_urlPanel": "URL panel",
"lang_urlTooltip": "URL which is shown by the panel",
- "lang_urlWhitelist": "Whitelist",
"lang_useDefault": "Use setting from location\/machine",
"lang_useRoomplanner": "Count PCs",
"lang_vertical": "Vertical mode",
"lang_verticalTooltip": "Defines whether the room and calendar are shown above each other",
"lang_wednesday": "Wednesday",
- "lang_when": "When"
+ "lang_when": "When",
+ "lang_whitelist": "Whitelist"
} \ No newline at end of file