diff --git a/plinth/locale/bg/LC_MESSAGES/django.po b/plinth/locale/bg/LC_MESSAGES/django.po
index 1ccbf21f9..7fd84b320 100644
--- a/plinth/locale/bg/LC_MESSAGES/django.po
+++ b/plinth/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -50,29 +50,29 @@ msgstr ""
 msgid "FreedomBox"
 msgstr ""
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr ""
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr ""
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr ""
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -525,7 +525,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -556,15 +556,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -640,47 +642,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -915,7 +917,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -936,11 +938,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -948,7 +950,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -959,9 +961,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1247,7 +1248,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1290,13 +1291,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1792,15 +1791,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1810,7 +1809,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2153,23 +2152,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2248,7 +2247,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2263,6 +2262,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2350,11 +2350,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2387,23 +2387,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2412,8 +2400,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3061,15 +3053,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3078,33 +3070,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3113,6 +3105,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3355,10 +3351,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4465,35 +4457,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4607,22 +4599,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4718,11 +4710,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/bn/LC_MESSAGES/django.po b/plinth/locale/bn/LC_MESSAGES/django.po
index 94da2070e..da56cd2ac 100644
--- a/plinth/locale/bn/LC_MESSAGES/django.po
+++ b/plinth/locale/bn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,29 +52,29 @@ msgstr ""
 msgid "FreedomBox"
 msgstr ""
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr ""
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr ""
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr ""
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -527,7 +527,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -558,15 +558,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -642,47 +644,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -917,7 +919,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -938,11 +940,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -950,7 +952,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -961,9 +963,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1249,7 +1250,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1292,13 +1293,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1794,15 +1793,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1812,7 +1811,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2155,23 +2154,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2250,7 +2249,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2265,6 +2264,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2352,11 +2352,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2389,23 +2389,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2414,8 +2402,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3063,15 +3055,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3080,33 +3072,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3115,6 +3107,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3357,10 +3353,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4467,35 +4459,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4609,22 +4601,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4720,11 +4712,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/cs/LC_MESSAGES/django.po b/plinth/locale/cs/LC_MESSAGES/django.po
index f5df45cb8..2f2d71d47 100644
--- a/plinth/locale/cs/LC_MESSAGES/django.po
+++ b/plinth/locale/cs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-08-02 21:11+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -53,15 +53,15 @@ msgstr "Nedaří se připojit k {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Zapnout aplikaci"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Vyberte doménový název který použít pro tuto aplikaci"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -69,15 +69,15 @@ msgstr ""
 "Varování! Pokud snad později změníte doménový název, může se stát, že "
 "aplikace nebude správně fungovat."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Jazyk"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Jazyk pro toto webové rozhraní"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Použít upřednostňovaný jazyk nastavený ve webovém prohlížeči"
 
@@ -570,7 +570,7 @@ msgstr "Zapnout DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Zapnout zabezpečovací rozšíření systému doménových názvů"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -609,15 +609,17 @@ msgstr ""
 "\"{users_url}\">uživatele s účtem na {box_name}</a>, náležejícím do skupiny "
 "admin."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Nastavit"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Doménový název"
 
@@ -709,47 +711,47 @@ msgstr "Zobrazit aplikace a funkce, které vyžadují techničtější znalosti.
 msgid "Learn more..."
 msgstr "Zjistit více…"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Obecná nastavení"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Chyba při nastavování názvu stroje: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Nastavení názvu stroje"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Chyba při nastavování doménového názvu: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Nastavení doménového názvu"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "Chyba při nastavování domovské stránky webového serveru: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Nastavení domovské stránky webového serveru"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr "Chyba při změně pokročilého režimu: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr "Jsou zobrazovány pokročilé aplikace a funkce"
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr "Jsou skryté pokročilé aplikace a funkce"
 
@@ -1017,7 +1019,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1038,11 +1040,11 @@ msgstr "Registrace uživatelů zapnuta"
 msgid "User registrations disabled"
 msgstr "Registrace uživatelů vypnuta"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Klient dynamické DNS"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1053,7 +1055,7 @@ msgstr ""
 "(např. každých 24h), může pro ostatní být být těžké najít vás na Internetu. "
 "Toto ostatním zabrání nalézt služby, které jsou poskytovány tímto {box_name}."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1071,10 +1073,11 @@ msgstr ""
 "někdo z Internetu zeptá na váš DNS název, dostane odpověď s vaší současnou "
 "IP adresou."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Služba dynamického DNS"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Doménový název"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1417,7 +1420,7 @@ msgstr "Spustit webového klienta"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Nastavení"
 
@@ -1468,13 +1471,11 @@ msgstr "Služba/port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Zapnuto"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Vypnuto"
@@ -2046,15 +2047,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "Licenční informace o JavaScriptu"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Certifikáty"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2069,7 +2070,7 @@ msgstr ""
 "dokázáním, že je vlastníkem domény vůči Let's Encrypt, certifikační autoritě "
 "(CA)."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2482,23 +2483,23 @@ msgid "Address"
 msgstr "Adresa"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Port"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Nastavení nejvyššího umožněného počtu hráčů aktualizováno"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Nastavení tvořivého režimu aktualizována"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "Nastavení PVP aktualizováno"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Nastavení poškozování aktualizováno"
 
@@ -2600,7 +2601,7 @@ msgstr "Zveřejňování klíče na serveru s klíči…"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Služba"
 
@@ -2615,6 +2616,7 @@ msgstr "OpenPGP otisk"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Zabezpečený shell"
 
@@ -2705,11 +2707,11 @@ msgstr "Importovaný klíč."
 msgid "Cancelled key publishing."
 msgstr "Zveřejnění klíče zrušeno."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Klíč zveřejněn na server s klíči."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Při zveřejňování klíče došlo k chybě."
 
@@ -2747,23 +2749,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Jmenné služby"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2776,9 +2766,13 @@ msgstr ""
 "typ názvu je zobrazeno, zda je pro příchozí spojení prostřednictvím daného "
 "názvu zapnutá či vypnutá služba HTTP, HTTPS a SSH."
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Není k dispozici"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3482,15 +3476,15 @@ msgstr "Nastavování dokončeno."
 msgid "Setup failed."
 msgstr "Nastavování se nezdařilo."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Viditelnost na veřejnosti"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3502,19 +3496,19 @@ msgstr ""
 "němu nejste připojení napřímo. Potřebujete ho pouze když jsou služby služby "
 "vašeho {box_name} nedostupné z Internetu. To zahrnuje následující situace:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} se nachází za omezující bránou firewall."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} je připojený k (bezdrátovému) směrovači, který není ve vaší "
 "správě."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3522,7 +3516,7 @@ msgstr ""
 "Váš poskytovatel připojení vám neposkytuje vnější (veřejnou) IP adresu a "
 "namísto toho poskytuje připojení prostřednictvím NAT překladu."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3530,11 +3524,11 @@ msgstr ""
 "Váš poskytovatel připojení vám neposkytuje pevnou IP adresu a ta se proto "
 "mění pokaždé, když se připojíte k Internetu."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Váš poskytovatel připojení k Internetu omezuje příchozí spojení."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3548,6 +3542,12 @@ msgstr ""
 "\">pagekite.net</a>. V budoucnu si pro toto může být možné s kamarádem "
 "smluvit využití jeho {box_name}."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PageKite účet"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "Zapnout PageKite"
@@ -3807,10 +3807,6 @@ msgstr ""
 "Viz <a href=\"https://pagekite.net/wiki/Howto/SshOverPageKite/\">instrukce</"
 "a> pro nastavení SSH klienta"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pagekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Standardní služby"
@@ -5119,35 +5115,35 @@ msgstr ""
 "\">Tor Browser</a>."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr "Tor Socks proxy"
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Předávájící Tor most"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "Tor skrytá služba"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr "Tor Socks proxy"
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Předávájící Tor most"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Port Tor předávání k dispozici"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3 transport zaregistrován"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4 transport zaregistrován"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Přistoupit k URL adrese {url} na tcp{kind} prostřednictvím Tor"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Potvrdit použití Tor na {url} na tcp{kind}"
@@ -5280,11 +5276,11 @@ msgstr "Skrytá služba"
 msgid "Ports"
 msgstr "Porty"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Předávání"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5294,11 +5290,11 @@ msgstr ""
 "byste ověřit, zda jsou otevřené a předávané následující porty (pokud je "
 "třeba):"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "Tor SOCKS port je k dispozici na vašem %(box_name)s na TCP portu 9050."
@@ -5407,16 +5403,21 @@ msgid "Updating..."
 msgstr "Aktualizace…"
 
 #: plinth/modules/upgrades/templates/upgrades.html:57
+#, fuzzy
+#| msgid ""
+#| "<strong>This may take a long time to complete</strong>. During an update, "
+#| "you can not install apps. Also, this web interface may be temporarily "
+#| "unavailable and show an error. In that case, refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "<strong>Dokončení tohoto může trvat dlouhou dobu</strong>. V průběhu "
 "aktualizace není možné instalovat aplikace. Také webové rozhraní může být "
 "dočasně nedostupné a zobrazovat chybu. V takovém případě ho načtěte znovu."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr "Vyp/zap. záznamy událostí při nedávných aktualizacích"
 
@@ -5993,6 +5994,24 @@ msgstr "Aplikace vypnuta"
 msgid "Gujarati"
 msgstr "gudžarátština"
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Služba dynamického DNS"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Není k dispozici"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pagekite"
+
 #~ msgid "Create new repository"
 #~ msgstr "Vytvořit nový repozitář"
 
diff --git a/plinth/locale/da/LC_MESSAGES/django.po b/plinth/locale/da/LC_MESSAGES/django.po
index 07d8c2e91..136550eae 100644
--- a/plinth/locale/da/LC_MESSAGES/django.po
+++ b/plinth/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2016-07-03 21:44+0000\n"
 "Last-Translator: Mikkel Kirkgaard Nielsen <memb_weblate@mikini.dk>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -55,33 +55,33 @@ msgstr "Kan ikke forbinde til {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Aktiver applikation"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 #, fuzzy
 #| msgid "Invalid domain name"
 msgid "Select a domain name to be used with this application"
 msgstr "Ugyldigt domænenavn"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Sprog"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 #, fuzzy
 #| msgid "Language for this web administration interface"
 msgid "Language to use for presenting this web interface"
 msgstr "Sprog i dette administrationsværktøj"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -600,7 +600,7 @@ msgstr "Aktiver Dynamisk DNS"
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -638,15 +638,17 @@ msgstr ""
 "Når aktiveret, vil Tiny Tiny RSS være tilgængelige på stien <a href=\"/tt-rss"
 "\">/tt-rss</a> på webserveren."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Domænenavn"
 
@@ -737,49 +739,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Lær mere &raquo;"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Generel Konfiguration"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Kunne ikke sætte værtsnavn: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Værtsnavn gemt"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Kunne ikke sætte domænenavn: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Domænenavn gemt"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "Kunne ikke sætte værtsnavn: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Kunne ikke sætte domænenavn: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1043,7 +1045,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1068,11 +1070,11 @@ msgstr "Applikation aktiveret"
 msgid "User registrations disabled"
 msgstr "Applikation deaktiveret"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Dynamisk DNS Klient"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1083,7 +1085,7 @@ msgstr ""
 "døgnet), kan det være svært for andre at finde dig på internettet. Dette vil "
 "forhindre andre i at finde de tjenester denne {box_name} udbyder."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1100,12 +1102,11 @@ msgstr ""
 "opdatere dit DNS-navn med den nye IP-adresse, således at hvis nogen på "
 "internettet spørger til adressen vil de få din aktuelle IP-adresse."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
+#: plinth/modules/dynamicdns/__init__.py:78
 #, fuzzy
-#| msgid "Dynamic DNS Client"
-msgid "Dynamic DNS Service"
-msgstr "Dynamisk DNS Klient"
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Domænenavn"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1444,7 +1445,7 @@ msgstr "Kør webklient"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -1496,13 +1497,11 @@ msgstr "Tjeneste/Port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Aktiveret"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Deaktiveret"
@@ -2083,19 +2082,19 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 #, fuzzy
 #| msgid "Certificates (Let's Encrypt)"
 msgid "Let's Encrypt"
 msgstr "Certifikater (Let's Encrypt)"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 #, fuzzy
 #| msgid "Certificate Status"
 msgid "Certificates"
 msgstr "Certifikat Status"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "A digital certficate allows users of a web service to verify the identity "
@@ -2116,7 +2115,7 @@ msgstr ""
 "Dette gøres ved at bekræfte overfor Let's Encrypt, en certifikat-autoritet "
 "(CA), at den har ejerskab over domænet."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 #, fuzzy
 #| msgid ""
 #| "Let's Encrypt is a free, automated, and open certificate authority, run "
@@ -2526,29 +2525,29 @@ msgid "Address"
 msgstr "Adresse"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Port"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Maximum players configuration updated"
 msgstr "Konfiguration opdateret"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Creative mode configuration updated"
 msgstr "Konfiguration opdateret"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "PVP configuration updated"
 msgstr "Konfiguration opdateret"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Damage configuration updated"
@@ -2654,7 +2653,7 @@ msgstr "Distribuerer nøgle til nøgleserver..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Tjeneste"
 
@@ -2669,6 +2668,7 @@ msgstr "OpenPGP-fingeraftryk"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Secure Shell"
 
@@ -2758,11 +2758,11 @@ msgstr "Nøglen blev importeret."
 msgid "Cancelled key publishing."
 msgstr "Distribution af nøglen annulleret."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Nøgle distribueret til nøgleserver."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Fejl under distribuering af nøgle."
 
@@ -2802,23 +2802,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Navnetjenester"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2827,9 +2815,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Ikke tilgængelig"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3570,19 +3562,19 @@ msgstr "Opsætning færdig."
 msgid "Setup failed."
 msgstr "Opsætning fejlede."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 #, fuzzy
 #| msgid "Pagekite"
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 #, fuzzy
 #| msgid "Public Visibility (PageKite)"
 msgid "Public Visibility"
 msgstr "Offentlig Tilgængelighed (PageKite)"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3595,19 +3587,19 @@ msgstr ""
 "hvis {box_name} tjenester ikke kan nås fra resten af internettet. Dette "
 "inkluderer de følgende situationer:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} er bag en restriktiv firewall."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} er forbundet til en (trådløs) router som du ikke selv "
 "kontrollerer."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3615,7 +3607,7 @@ msgstr ""
 "Din internetudbyder tildeler dig ikke en ekstern IP-adresse, men giver dig "
 "forbindelse gennem NAT."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 #, fuzzy
 #| msgid ""
 #| "Your ISP does not provide you a static IP address and your IP address "
@@ -3627,11 +3619,11 @@ msgstr ""
 "Din internetudbyder tildeler dig ikke en fast IP-adresse, og din IP-adresse "
 "ændres hver gang du fobinder til nettet."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Din internetudbyder begrænser indgående forbindelser."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3645,6 +3637,12 @@ msgstr ""
 "net</a>. I fremtiden vil det måske blive muligt at bruge din vens {box_name} "
 "til dette."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PageKite-konto"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "Aktiver PageKite"
@@ -3906,10 +3904,6 @@ msgstr ""
 "Se <a href=\"https://pagekite.net/wiki/Howto/SshOverPageKite/"
 "\">instruktioner</a> for opsætning af SSH-klient"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "PageKite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Standardtjenester"
@@ -5206,36 +5200,36 @@ msgstr ""
 "\">Tor-browseren</a>."
 
 #: plinth/modules/tor/__init__.py:80
+msgid "Tor Hidden Service"
+msgstr "Tor Skjult Tjeneste"
+
+#: plinth/modules/tor/__init__.py:84
 msgid "Tor Socks Proxy"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:84
+#: plinth/modules/tor/__init__.py:88
 #, fuzzy
 msgid "Tor Bridge Relay"
 msgstr "Tor Bridge Relay"
 
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
-msgid "Tor Hidden Service"
-msgstr "Tor Skjult Tjeneste"
-
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Tor videresendelsesport tilgængelig"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3 transport registreret"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4 transport registreret"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Tilgå URL {url} ved brug af tcp{kind} via Tor"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Bekræft brug af Tor på {url} ved brug af tcp{kind}"
@@ -5360,11 +5354,11 @@ msgstr "Skjult Tjeneste"
 msgid "Ports"
 msgstr "Porte"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, fuzzy, python-format
 #| msgid ""
 #| "Your %(box_name)s is configured as a Tor bridge with obfsproxy, so it can "
@@ -5380,11 +5374,11 @@ msgstr ""
 "router eller firewall, bør du sikre at de følgende porte er åbne, eller "
 "viderestillede, hvis nødvendigt:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "En Tor SOCKS-port er tilgængelig på din %(box_name)s TCP-port 9050."
@@ -5508,7 +5502,7 @@ msgstr ""
 #| "temporarily unavailable and show an error.  Refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "Afhængigt af antallet af pakker der skal installeres, kan dette tage lang "
@@ -5517,7 +5511,7 @@ msgstr ""
 "blive midlertidigt utilgængeligt og vise en fejl.  Genindlæs siden for at "
 "fortsætte."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -6112,6 +6106,26 @@ msgstr "Applikation deaktiveret"
 msgid "Gujarati"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Dynamic DNS Client"
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Dynamisk DNS Klient"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Ikke tilgængelig"
+
+#~ msgid "Pagekite"
+#~ msgstr "PageKite"
+
 #, fuzzy
 #~| msgid "Create User"
 #~ msgid "Create new repository"
diff --git a/plinth/locale/de/LC_MESSAGES/django.po b/plinth/locale/de/LC_MESSAGES/django.po
index 12fcc83da..334dc8601 100644
--- a/plinth/locale/de/LC_MESSAGES/django.po
+++ b/plinth/locale/de/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-07-29 22:36+0000\n"
 "Last-Translator: nautilusx <mail.ka@mailbox.org>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -55,15 +55,15 @@ msgstr "Verbindung mit {host}:{port} fehlgeschlagen"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Anwendung aktivieren"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Einen Domainnamen für die Nutzung dieser Anwendung wählen"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -71,15 +71,15 @@ msgstr ""
 "Achtung! Die Anwendung könnte fehlerhaft laufen, falls der Domainname später "
 "geändert wird."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Sprache"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Sprache für die Darstellung dieser Weboberfläche"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Die im Browser festgelegte Sprache verwenden"
 
@@ -599,7 +599,7 @@ msgstr "DNSSEC einschalten"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Domain-Name-System-Sicherheitserweiterungen (DNSSEC) aktivieren"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -638,15 +638,17 @@ msgstr ""
 "\">/_cockpit/</a> zur Verfügung. Zugriff hat <a href=\"{users_url}\">jeder "
 "Benutzer</a> auf {box_name}, der zur Gruppe der Administratoren gehört."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Domain-Name"
 
@@ -738,47 +740,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Mehr erfahren …"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Allgemeine Konfiguration"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Fehler beim Setzen des Hostnamens: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Hostname gesetzt"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Fehler beim Setzen des Domainnamens: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Domainname gesetzt"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "Fehler beim Setzen der Webserver-Startseite: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Webserver-Startseite wurde definiert"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr "Fehler beim Ändern des erweiterten Modus: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr "Zeige erweiterte Anwendungen und Funktionen an"
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr "Ausblenden von erweiterten Apps und Funktionen"
 
@@ -1043,7 +1045,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1064,11 +1066,11 @@ msgstr "Registrierung neuer Benutzer aktiviert"
 msgid "User registrations disabled"
 msgstr "Registrierung neuer Benutzer deaktiviert"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Dynamischer DNS-Client"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1080,7 +1082,7 @@ msgstr ""
 "aufzusuchen. Dadurch werden andere daran hindern, jene Dienste zu finden, "
 "die von Ihrer FreedomBox {box_name} angeboten werden."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1098,10 +1100,11 @@ msgstr ""
 "verknüpfen, und wenn jemand aus dem Internet Ihren DNS-Namen abfragt, wird "
 "als Antwort Ihre aktuelle IP-Adresse geliefert."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Dynamischer DNS-Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Domain-Name"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1447,7 +1450,7 @@ msgstr "Webclient starten"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -1498,13 +1501,11 @@ msgstr "Dienst/Port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Aktiviert"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Deaktiviert"
@@ -2087,15 +2088,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "JavaScript-Lizenzinformation"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2111,7 +2112,7 @@ msgstr ""
 "Zertifizierungsstelle Let's Encrypt nachweist, der Inhaber einer Domain zu "
 "sein."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2534,23 +2535,23 @@ msgid "Address"
 msgstr "Adresse"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Port"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Einstellung für Maximale Spielerzahl aktualisiert"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Kreativ-Modus-Konfiguration aktualisiert"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "Spieler-gegen-Spieler-Konfiguration aktualisiert"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Schaden-Konfiguration aktualisiert"
 
@@ -2655,7 +2656,7 @@ msgstr "Schlüssel werden auf Schlüsselserver veröffentlicht …"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Dienst"
 
@@ -2670,6 +2671,7 @@ msgstr "OpenPGP-Fingerabdruck"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Secure Shell"
 
@@ -2760,11 +2762,11 @@ msgstr "Schlüssel importiert."
 msgid "Cancelled key publishing."
 msgstr "Schlüsselveröffentlichung abgebrochen."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Veröffentlichte Schlüssel auf dem Server."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Fehler beim Veröffentlichen des Schlüssels."
 
@@ -2802,23 +2804,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Namen-Dienste"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2831,9 +2821,13 @@ msgstr ""
 "jeden Namens-Typ wird angezeigt, ob die HTTP-, HTTPS- und SSH-Dienste für "
 "eingehende Verbindungen eingeschaltet oder ausgeschaltet ist."
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Nicht verfügbar"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3545,15 +3539,15 @@ msgstr "Einrichtung beendet."
 msgid "Setup failed."
 msgstr "Einrichtung fehlgeschlagen."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Öffentliche Sichtbarkeit"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3566,19 +3560,19 @@ msgstr ""
 "die Dienste Ihrer {box_name} vom Internet nicht erreichbar sind. Dies "
 "umfasst folgende Situationen:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} ist hinter einer eingeschränkten Firewall."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} ist mit einem (wireless)-Router verbunden, den Sie nicht "
 "kontrollieren."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3586,7 +3580,7 @@ msgstr ""
 "Ihr ISP bietet Ihnen keine externe IP-Adresse, sondern statt dessen eine "
 "Internetverbindung über NAT."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3594,11 +3588,11 @@ msgstr ""
 "Ihr ISP bietet keine statische IP-Adresse und Ihre IP-Adresse ändert sich "
 "immer, wenn Sie sich mit dem Internet verbinden."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Ihr ISP schränkt eingehende Verbindungen ein."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3612,6 +3606,12 @@ msgstr ""
 "\"https://pagekite.net\">pagekite.net</a>. In Zukunft könnte es möglich "
 "sein, hierfür die {box_name} eines Freundes zu nutzen."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PageKite-Konto"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "PageKite einschalten"
@@ -3877,10 +3877,6 @@ msgstr ""
 "Siehe SSH-Client <a href=\"https://pagekite.net/wiki/Howto/SshOverPageKite/"
 "\">Konfigurationsanweisungen</a>"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pagekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Standarddienste"
@@ -5212,35 +5208,35 @@ msgstr ""
 "\">Tor Browser</a> verwenden."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr "Tor-Socks-Proxy"
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Tor-Bridge-Relay"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "Tor versteckte Dienste"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr "Tor-Socks-Proxy"
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Tor-Bridge-Relay"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Tor-Relay-Port ist verfügbar"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3-Transport registriert"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4-Transport registriert"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Zugangs-URL {url} auf TCP{kind} über Tor"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Tor-Nutzung auf {url} über TCP{kind} bestätigen"
@@ -5379,11 +5375,11 @@ msgstr "Verborgene Dienste"
 msgid "Ports"
 msgstr "Ports"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Relay"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5393,11 +5389,11 @@ msgstr ""
 "Sie sicherstellen, dass die folgenden Ports geöffnet und weitergeleitet "
 "werden, falls erforderlich:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "Tor SOCKS-Port ist auf Ihrer %(box_name)s auf TCP port 9050 verfügbar."
@@ -5509,9 +5505,14 @@ msgid "Updating..."
 msgstr "Aktualisierung läuft …"
 
 #: plinth/modules/upgrades/templates/upgrades.html:57
+#, fuzzy
+#| msgid ""
+#| "<strong>This may take a long time to complete</strong>. During an update, "
+#| "you can not install apps. Also, this web interface may be temporarily "
+#| "unavailable and show an error. In that case, refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "<strong>Bis der Vorgang abgeschlossen ist, kann es lange dauern</strong>. "
@@ -5519,7 +5520,7 @@ msgstr ""
 "Weboberfläche möglicherweise vorübergehend nicht verfügbar und zeigt einen "
 "Fehler an. In diesem Fall aktualisieren Sie die Seite, um fortzufahren."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr "Umschalten der letzten Update-Protokolle"
 
@@ -6102,6 +6103,24 @@ msgstr "Anwendung deaktiviert"
 msgid "Gujarati"
 msgstr "Gujarati"
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Dynamischer DNS-Service"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Nicht verfügbar"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pagekite"
+
 #~ msgid "Create new repository"
 #~ msgstr "Neues Archiv anlegen"
 
diff --git a/plinth/locale/django.pot b/plinth/locale/django.pot
index cf42a1db4..6f3f00263 100644
--- a/plinth/locale/django.pot
+++ b/plinth/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,29 +51,29 @@ msgstr ""
 msgid "FreedomBox"
 msgstr ""
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr ""
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr ""
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr ""
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -557,15 +557,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -641,47 +643,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -916,7 +918,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -937,11 +939,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -949,7 +951,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -960,9 +962,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1248,7 +1249,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1291,13 +1292,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1793,15 +1792,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1811,7 +1810,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2154,23 +2153,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2249,7 +2248,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2264,6 +2263,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2351,11 +2351,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2388,23 +2388,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2413,8 +2401,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3062,15 +3054,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3079,33 +3071,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3114,6 +3106,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3356,10 +3352,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4466,35 +4458,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4608,22 +4600,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4719,11 +4711,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/el/LC_MESSAGES/django.po b/plinth/locale/el/LC_MESSAGES/django.po
index 97a5f3025..cada795d1 100644
--- a/plinth/locale/el/LC_MESSAGES/django.po
+++ b/plinth/locale/el/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -50,29 +50,29 @@ msgstr ""
 msgid "FreedomBox"
 msgstr ""
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr ""
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr ""
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr ""
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -525,7 +525,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -556,15 +556,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -640,47 +642,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -915,7 +917,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -936,11 +938,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -948,7 +950,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -959,9 +961,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1247,7 +1248,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1290,13 +1291,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1792,15 +1791,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1810,7 +1809,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2153,23 +2152,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2248,7 +2247,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2263,6 +2262,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2350,11 +2350,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2387,23 +2387,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2412,8 +2400,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3061,15 +3053,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3078,33 +3070,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3113,6 +3105,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3355,10 +3351,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4465,35 +4457,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4607,22 +4599,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4718,11 +4710,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/es/LC_MESSAGES/django.po b/plinth/locale/es/LC_MESSAGES/django.po
index 2bf34ea73..9b1dbdf13 100644
--- a/plinth/locale/es/LC_MESSAGES/django.po
+++ b/plinth/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-07-12 17:01+0000\n"
 "Last-Translator: Luis A. Arizmendi <luis.arizmendi@mailfence.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/freedombox/"
@@ -53,15 +53,15 @@ msgstr "No se pudo conectar a {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Activar aplicación"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Seleccione el nombre de dominio que usará esta aplicación"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -69,15 +69,15 @@ msgstr ""
 "¡Atención! Puede que la aplicación no funcione correctamente si cambia el "
 "nombre de dominio más adelante."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Idioma"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Idioma para mostrar esta interfaz web"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Configure la preferencia de idioma en el navegador"
 
@@ -598,7 +598,7 @@ msgstr "Activar DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Activar Extensiones de Seguridad del Sistema de Nombre de Dominios"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -637,15 +637,17 @@ msgstr ""
 "\"{users_url}\">cualquier usuario</a> en {box_name} que pertenezca al grupo "
 "«admin»."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configurar"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Nombre de dominio"
 
@@ -739,47 +741,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Aprenda más..."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Configuración general"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Error al definir el nombre de anfitrión: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Asignar nombre de anfitrión"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Error al establecer nombre de dominio: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Asignar nombre de dominio"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "Error al configurar la página de inicio del servidor web: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Configurar la página de inicio del servidor web"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr "Error al cambiar al modo avanzado: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr "Mostrando aplicaciones y funciones avanzadas"
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr "Ocultando aplicaciones y funciones avanzadas"
 
@@ -1045,7 +1047,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1066,11 +1068,11 @@ msgstr "Registro de usuarias/os activado"
 msgid "User registrations disabled"
 msgstr "Registro de usuarias/os desactivado"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Cliente de DNS dinámico"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1081,7 +1083,7 @@ msgstr ""
 "24h) será muy difícil para los demás encontrarle en Internet. Este servicio "
 "permitirá a otros encontrar los servicios que ofrece {box_name}."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1098,10 +1100,11 @@ msgstr ""
 "asigna su nombre DNS a esta nueva IP de forma que cualquiera que pida su "
 "nombre DNS obtendrá la dirección IP actualizada."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Servicio de DNS dinámico"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Nombre de dominio"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1442,7 +1445,7 @@ msgstr "Lanzar cliente web"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -1492,13 +1495,11 @@ msgstr "Servicio/Puerto"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Activado"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Desactivado"
@@ -2078,15 +2079,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "Información de licencia de JavaScript"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2101,7 +2102,7 @@ msgstr ""
 "mostrándose a sí mismo como propietario de un dominio a Let's Encrypt, "
 "autoridad de certificación (CA)."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2521,23 +2522,23 @@ msgid "Address"
 msgstr "Dirección"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Puerto"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Configuración de número máximo de jugadoras/es actualizada"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Configuración del modo creativo actualizada"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "Configuración PVP actualizada"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Configuración de daño actualizada"
 
@@ -2640,7 +2641,7 @@ msgstr "Publicando la clave en el servidor de claves..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Servicio"
 
@@ -2655,6 +2656,7 @@ msgstr "Huella digital OpenPGP"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Intérprete de órdenes seguro"
 
@@ -2744,11 +2746,11 @@ msgstr "Clave importada."
 msgid "Cancelled key publishing."
 msgstr "Publicación de clave cancelada."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Publicada la clave en el servidor de claves."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Se ha producido un error al publicar la clave."
 
@@ -2786,23 +2788,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Servicios de nombres"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2816,9 +2806,13 @@ msgstr ""
 "muestra si los servicios HTTP, HTTPS y SSH están activados o desactivados "
 "para las conexiones entrantes a través del nombre dado."
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "No disponible"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3523,15 +3517,15 @@ msgstr "Configuración completada."
 msgid "Setup failed."
 msgstr "Ha fallado la configuración."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Visibilidad pública"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3544,18 +3538,18 @@ msgstr ""
 "servicios de su {box_name} no son accesibles desde Internet. Esto incluye "
 "las siguientes situaciones:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} está detrás de un firewall restringido."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} está conectado a un router (inalámbrico) que usted no controla."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3563,7 +3557,7 @@ msgstr ""
 "Su proveedor de servicio no le da una dirección IP externa y, por el "
 "contrario, le facilita conexión a Internet a través de un NAT."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3571,11 +3565,11 @@ msgstr ""
 "Su proveedor de servicios no le da una dirección IP estática por lo que su "
 "IP cambia cada vez que se conecta a Internet."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Su proveedor de servicios limita las conexiones entrantes."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3588,6 +3582,12 @@ msgstr ""
 "de servicios pagekite, por ejemplo <a href=\"https://pagekite.net\">pagekite."
 "net</a>. En el futuro será posible usar su amigable {box_name} para esto."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "Cuenta PageKite"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "Activar PageKite"
@@ -3847,10 +3847,6 @@ msgstr ""
 "Vea las <a href=\"https://pagekite.net/wiki/Howto/SshOverPageKite/"
 "\">instrucciones</a> para la configuración del cliente SSH"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "PageKite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Servicios estándar"
@@ -5170,35 +5166,35 @@ msgstr ""
 "protección cuando navega por la red."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr "Proxy Socks para Tor"
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Puente de retransmisión Tor"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "Servicio de ocultación Tor"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr "Proxy Socks para Tor"
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Puente de retransmisión Tor"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Puerto de servidor Tor disponible"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Transporte Obfs3 registrado"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Transporte Obfs4 registrado"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Acceso a URL {url} sobre tcp {kind} vía Tor"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Confirmar uso de Tor en {url} sobre tcp {kind}"
@@ -5335,11 +5331,11 @@ msgstr "Servicio de ocultación"
 msgid "Ports"
 msgstr "Puertos"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Retransmisión"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5349,11 +5345,11 @@ msgstr ""
 "de que los siguientes puertos están abiertos, y redireccionados si es "
 "necesario:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -5467,9 +5463,14 @@ msgid "Updating..."
 msgstr "Actualizando..."
 
 #: plinth/modules/upgrades/templates/upgrades.html:57
+#, fuzzy
+#| msgid ""
+#| "<strong>This may take a long time to complete</strong>. During an update, "
+#| "you can not install apps. Also, this web interface may be temporarily "
+#| "unavailable and show an error. In that case, refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "<strong>Esto puede tardar un buen rato en finalizar</strong>. Durante una "
@@ -5477,7 +5478,7 @@ msgstr ""
 "puede estar temporalmente inaccesible y mostrar un error. En ese caso, "
 "vuelva a cargar la página para continuar."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr "Alternar los registros de las actualizaciones recientes"
 
@@ -6053,6 +6054,24 @@ msgstr "Aplicación desactivada"
 msgid "Gujarati"
 msgstr "Gujarati"
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Servicio de DNS dinámico"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "No disponible"
+
+#~ msgid "Pagekite"
+#~ msgstr "PageKite"
+
 #~ msgid "Create new repository"
 #~ msgstr "Crear nuevo repositorio"
 
diff --git a/plinth/locale/fa/LC_MESSAGES/django.po b/plinth/locale/fa/LC_MESSAGES/django.po
index 2c3c66fed..7aad8bdb4 100644
--- a/plinth/locale/fa/LC_MESSAGES/django.po
+++ b/plinth/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2016-08-12 15:51+0000\n"
 "Last-Translator: Masoud Abkenar <ampbox@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/freedombox/"
@@ -54,33 +54,33 @@ msgstr "نمی‌توان به {host}:{port} وصل شد"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 #, fuzzy
 msgid "Enable application"
 msgstr "فعال‌سازی برنامه"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 #, fuzzy
 #| msgid "Invalid domain name"
 msgid "Select a domain name to be used with this application"
 msgstr "نام دامنه معتبر نیست"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "زبان"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 #, fuzzy
 msgid "Language to use for presenting this web interface"
 msgstr "زبان محیط این برنامهٔ مدیریتی"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -582,7 +582,7 @@ msgstr "فعال‌سازی DNS متغیر"
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -615,16 +615,18 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 #, fuzzy
 msgid "Configure"
 msgstr "پیکربندی"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "نام دامنه"
 
@@ -713,49 +715,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "بیشتر بدانید &raquo;"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "پیکربندی عمومی"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "خطا در هنگام تنظیم نام میزبان: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "نام میزبان تنظیم شد"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "خطا در هنگام تنظیم نام دامنه: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "نام دامنه تنظیم شد"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "خطا در هنگام تنظیم نام میزبان: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "خطا در هنگام تنظیم نام دامنه: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1015,7 +1017,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1036,12 +1038,12 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 #, fuzzy
 msgid "Dynamic DNS Client"
 msgstr "برنامهٔ DNS متغیر (Dynamic DNS Client)"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1052,7 +1054,7 @@ msgstr ""
 "می‌دهد، دیگران نمی‌توانند شما را به راحتی در اینترنت پیدا کنند. این باعث می‌شود "
 "که دیگران نتوانند سرویس‌هایی را که {box_name} شما ارائه می‌دهد پیدا کنند."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1069,11 +1071,11 @@ msgstr ""
 "نام DNS شما را به نشانی IP شما مرتبط می‌کند، و اگر کسی در اینترنت نام DNS شما "
 "را جستجو کرد، نشانی IP شما را در پاسخ خواهد گرفت."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
+#: plinth/modules/dynamicdns/__init__.py:78
 #, fuzzy
-msgid "Dynamic DNS Service"
-msgstr "برنامهٔ DNS متغیر (Dynamic DNS Client)"
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "نام دامنه"
 
 #: plinth/modules/dynamicdns/forms.py:43
 #, fuzzy
@@ -1399,7 +1401,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1451,13 +1453,11 @@ msgstr "سرویس/پورت"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "فعال"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "غیرفعال"
@@ -2020,19 +2020,19 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 #, fuzzy
 #| msgid "Certificates (Let's Encrypt)"
 msgid "Let's Encrypt"
 msgstr "گواهی دیجیتال (Let's Encrypt)"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 #, fuzzy
 #| msgid "Certificate Status"
 msgid "Certificates"
 msgstr "وضعیت گواهی دیجیتال"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "A digital certficate allows users of a web service to verify the identity "
@@ -2053,7 +2053,7 @@ msgstr ""
 "برای این کار {box_name} به Let's Encrypt (که یک مرجع صدور گواهی دیجیتال است) "
 "اثبات می‌کند که مالک دامنه است."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 #, fuzzy
 #| msgid ""
 #| "Let's Encrypt is a free, automated, and open certificate authority, run "
@@ -2438,29 +2438,29 @@ msgid "Address"
 msgstr "نشانی"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Maximum players configuration updated"
 msgstr "پیکربندی به‌روز شد"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Creative mode configuration updated"
 msgstr "پیکربندی به‌روز شد"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "PVP configuration updated"
 msgstr "پیکربندی به‌روز شد"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Damage configuration updated"
@@ -2558,7 +2558,7 @@ msgstr "انتشار کلید به پایگاه کلید..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "سرویس"
 
@@ -2573,6 +2573,7 @@ msgstr "اثر انگشت OpenPGP"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "پوستهٔ ایمن"
 
@@ -2663,11 +2664,11 @@ msgstr "کلید درون‌ریزی شد."
 msgid "Cancelled key publishing."
 msgstr "انتشار کلید لغو شد."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "کلید در پایگاه کلیدها منتشر شد."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "هنگام انتشار کلید خطایی رخ داد."
 
@@ -2705,26 +2706,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-#, fuzzy
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-#, fuzzy
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-#, fuzzy
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "سرویس نام‌ها"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2733,9 +2719,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "موجود نیست"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3435,15 +3425,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3452,33 +3442,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3487,6 +3477,12 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "Available Domains"
+msgid "PageKite Domain"
+msgstr "دامنه‌های موجود"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3734,10 +3730,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4917,35 +4909,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -5059,22 +5051,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -5173,11 +5165,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5729,6 +5721,25 @@ msgstr ""
 msgid "Gujarati"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "برنامهٔ DNS متغیر (Dynamic DNS Client)"
+
+#, fuzzy
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#, fuzzy
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#, fuzzy
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "موجود نیست"
+
 #, fuzzy
 #~| msgid "Certificate successfully revoked for domain {domain}"
 #~ msgid "Certificate renewal management enabled for {domain}."
diff --git a/plinth/locale/fake/LC_MESSAGES/django.po b/plinth/locale/fake/LC_MESSAGES/django.po
index 80e895750..c67841e7d 100644
--- a/plinth/locale/fake/LC_MESSAGES/django.po
+++ b/plinth/locale/fake/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Plinth 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2016-01-31 22:24+0530\n"
 "Last-Translator: Sunil Mohan Adapa <sunil@medhas.org>\n"
 "Language-Team: Plinth Developers <freedombox-discuss@lists.alioth.debian."
@@ -53,35 +53,35 @@ msgstr "CANNOT CONNECT TO {host}:{port}"
 msgid "FreedomBox"
 msgstr "FREEDOMBOX"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 #, fuzzy
 #| msgid "Applications"
 msgid "Enable application"
 msgstr "APPLICATIONS"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 #, fuzzy
 #| msgid "Invalid domain name"
 msgid "Select a domain name to be used with this application"
 msgstr "INVALID DOMAIN NAME"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "LANGUAGE"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 #, fuzzy
 #| msgid "Language for this web administration interface"
 msgid "Language to use for presenting this web interface"
 msgstr "LANGUAGE FOR THIS WEB ADMINISTRATION INTERFACE"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -609,7 +609,7 @@ msgstr "ENABLE DYNAMIC DNS"
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -647,15 +647,17 @@ msgstr ""
 "WHEN ENABLED, THE BLOGS AND WIKIS WILL BE AVAILABLE FROM <a href=\"/ikiwiki"
 "\">/IKIWIKI</a>."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "CONFIGURE"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "DOMAIN NAME"
 
@@ -747,49 +749,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "LEARN MORE &raquo;"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "GENERAL CONFIGURATION"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "ERROR SETTING HOSTNAME: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "HOSTNAME SET"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "ERROR SETTING DOMAIN NAME: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "DOMAIN NAME SET"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "ERROR SETTING HOSTNAME: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "ERROR SETTING DOMAIN NAME: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1053,7 +1055,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1078,11 +1080,11 @@ msgstr "APPLICATIONS"
 msgid "User registrations disabled"
 msgstr "APPLICATIONS"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "DYNAMIC DNS CLIENT"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "If your internet provider changes your IP address periodic (i.e. every "
@@ -1098,7 +1100,7 @@ msgstr ""
 "IT MAY BE HARD FOR OTHERS TO FIND YOU IN THE WEB. AND FOR THIS REASON NOBODY "
 "MAY FIND THE SERVICES WHICH ARE PROVIDED BY %(box_name)s, SUCH AS OWNCLOUD."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 #, fuzzy
 #| msgid ""
 #| "The solution is to assign a DNS name to your IP address and update the "
@@ -1124,12 +1126,11 @@ msgstr ""
 "THE SERVER WILL ASSIGN YOUR DNS NAME WITH THE NEW IP AND IF SOMEONE FROM THE "
 "INTERNET ASKS FOR YOUR DNS NAME HE WILL GET YOUR CURRENT IP ANSWERED."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
+#: plinth/modules/dynamicdns/__init__.py:78
 #, fuzzy
-#| msgid "Dynamic DNS Client"
-msgid "Dynamic DNS Service"
-msgstr "DYNAMIC DNS CLIENT"
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "DOMAIN NAME"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1509,7 +1510,7 @@ msgstr "LAUNCH WEB CLIENT"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "CONFIGURATION"
 
@@ -1565,13 +1566,11 @@ msgstr "SERVICE/PORT"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "ENABLED"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "DISABLED"
@@ -2139,19 +2138,19 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 #, fuzzy
 #| msgid "Certificates (Let's Encrypt)"
 msgid "Let's Encrypt"
 msgstr "CERTIFICATES (LET'S ENCRYPT)"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 #, fuzzy
 #| msgid "Certificate Status"
 msgid "Certificates"
 msgstr "CERTIFICATE STATUS"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "A digital certficate allows users of a web service to verify the identity "
@@ -2172,7 +2171,7 @@ msgstr ""
 "DOMAIN.  IT DOES SO BY PROVING ITSELF TO BE THE OWNER OF A DOMAIN TO LET'S "
 "ENCRYPT, A CERTFICATE AUTHORITY (CA)."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 #, fuzzy
 #| msgid ""
 #| "Let's Encrypt is a free, automated, and open certificate authority, run "
@@ -2576,29 +2575,29 @@ msgid "Address"
 msgstr "ADDRESS"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "PORT"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Maximum players configuration updated"
 msgstr "CONFIGURATION UPDATED"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Creative mode configuration updated"
 msgstr "CONFIGURATION UPDATED"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "PVP configuration updated"
 msgstr "CONFIGURATION UPDATED"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Damage configuration updated"
@@ -2723,7 +2722,7 @@ msgstr "PUBLISHING KEY TO KEYSERVER..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "SERVICE"
 
@@ -2742,6 +2741,7 @@ msgstr "GPG FINGERPRINT"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 #, fuzzy
 #| msgid "Secure Shell (SSH)"
 msgid "Secure Shell"
@@ -2849,11 +2849,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr "CANCELLED KEY PUBLISHING."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "PUBLISHED KEY TO KEYSERVER."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "ERROR OCCURRED WHILE PUBLISHING KEY."
 
@@ -2893,23 +2893,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "NAME SERVICES"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2918,9 +2906,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "NOT AVAILABLE"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3649,19 +3641,19 @@ msgstr "SETUP COMPLETED."
 msgid "Setup failed."
 msgstr "SETUP FAILED."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 #, fuzzy
 #| msgid "Pagekite"
 msgid "PageKite"
 msgstr "PAGEKITE"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 #, fuzzy
 #| msgid "Public Visibility (PageKite)"
 msgid "Public Visibility"
 msgstr "PUBLIC VISIBILITY (PAGEKITE)"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "PageKite is a system for exposing %(box_name)s services when you don't "
@@ -3679,13 +3671,13 @@ msgstr ""
 "SERVICES ARE UNREACHABLE FROM THE REST OF THE INTERNET. THIS INCLUDES THE "
 "FOLLOWING SITUATIONS:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, fuzzy, python-brace-format
 #| msgid "%(box_name)s is behind a restricted firewall."
 msgid "{box_name} is behind a restricted firewall."
 msgstr "%(box_name)s IS BEHIND A RESTRICTED FIREWALL."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "%(box_name)s is connected to a (wireless) router which you don't control."
@@ -3693,7 +3685,7 @@ msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "%(box_name)s IS CONNECTED TO A (WIRELESS) ROUTER WHICH YOU DON'T CONTROL."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3701,7 +3693,7 @@ msgstr ""
 "YOUR ISP DOES NOT PROVIDE YOU AN EXTERNAL IP ADDRESS AND INSTEAD PROVIDES "
 "INTERNET CONNECTION THROUGH NAT."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 #, fuzzy
 #| msgid ""
 #| "Your ISP does not provide you a static IP address and your IP address "
@@ -3713,11 +3705,11 @@ msgstr ""
 "YOUR ISP DOES NOT PROVIDE YOU A STATIC IP ADDRESS AND YOUR IP ADDRESS "
 "CHANGES EVERTIME YOU CONNECT TO INTERNET."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "YOUR ISP LIMITS INCOMING CONNECTIONS."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "PageKite works around NAT, firewalls and IP-address limitations by using "
@@ -3736,6 +3728,12 @@ msgstr ""
 "PROVIDER, FOR EXAMPLE <a href=\"https://pagekite.net\">PAGEKITE.NET</a>.  IN "
 "FUTURE IT MIGHT BE POSSIBLE TO USE YOUR BUDDY'S %(box_name)s FOR THIS."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PAGEKITE ACCOUNT"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "ENABLE PAGEKITE"
@@ -3997,10 +3995,6 @@ msgstr ""
 "SEE SSH CLIENT SETUP <a href=\"https://pagekite.net/wiki/Howto/"
 "SshOverPageKite/\">INSTRUCTIONS</a>"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "PAGEKITE"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "STANDARD SERVICES"
@@ -5308,35 +5302,35 @@ msgstr ""
 "TOR BROWSER</a>."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "TOR BRIDGE RELAY"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "TOR HIDDEN SERVICE"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "TOR BRIDGE RELAY"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "TOR RELAY PORT AVAILABLE"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "OBFS3 TRANSPORT REGISTERED"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "OBFS4 TRANSPORT REGISTERED"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "ACCESS URL {url} ON TCP{kind} VIA TOR"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "CONFIRM TOR USAGE AT {url} ON TCP{kind}"
@@ -5464,11 +5458,11 @@ msgstr "HIDDEN SERVICE"
 msgid "Ports"
 msgstr "PORT"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, fuzzy, python-format
 #| msgid ""
 #| "Your %(box_name)s is configured as a Tor bridge with obfsproxy, so it can "
@@ -5484,11 +5478,11 @@ msgstr ""
 "FIREWALL, YOU SHOULD MAKE SURE THE FOLLOWING PORTS ARE OPEN, AND PORT-"
 "FORWARDED, IF NECESSARY:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "A TOR SOCKS PORT IS AVAILABLE ON YOUR %(box_name)s ON TCP PORT 9050."
@@ -5609,7 +5603,7 @@ msgstr ""
 #| "temporarily unavailable and show an error.  Refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "DEPENDING ON THE NUMBER OF PACKAGES TO INSTALL, THIS MAY TAKE A LONG TIME TO "
@@ -5617,7 +5611,7 @@ msgstr ""
 "OTHER PACKAGES.  DURING THE UPGRADE, THIS WEB INTERFACE MAY BE TEMPORARILY "
 "UNAVAILABLE AND SHOW AN ERROR.  REFRESH THE PAGE TO CONTINUE."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -6223,6 +6217,26 @@ msgstr "APPLICATIONS"
 msgid "Gujarati"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Dynamic DNS Client"
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "DYNAMIC DNS CLIENT"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "NOT AVAILABLE"
+
+#~ msgid "Pagekite"
+#~ msgstr "PAGEKITE"
+
 #, fuzzy
 #~| msgid "Create User"
 #~ msgid "Create new repository"
diff --git a/plinth/locale/fr/LC_MESSAGES/django.po b/plinth/locale/fr/LC_MESSAGES/django.po
index 8ef63cc68..3e39e8c07 100644
--- a/plinth/locale/fr/LC_MESSAGES/django.po
+++ b/plinth/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-08-02 21:11+0000\n"
 "Last-Translator: pierre <dnanar@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -53,15 +53,15 @@ msgstr "Impossible de se connecter à {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Activer l'application"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Sélectionnez un nom de domaine à utiliser avec cette application"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -69,15 +69,15 @@ msgstr ""
 "Attention ! Cette application peut ne peut pas fonctionner correctement si "
 "le nom de domaine est modifié plus tard."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Langue"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Langue de cette interface web"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Utiliser les préférences de langue du navigateur"
 
@@ -586,7 +586,7 @@ msgstr "Activer DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Activer les extensions de sécurité DNS (DNSSEC)"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -629,15 +629,17 @@ msgstr ""
 "\">/_cockpit</a> sur le serveur web. Il peut être consulté par tout <a href="
 "\"{users_url}\">utilisateur avec un compte admin sur {box_name}</a>."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configurer"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Nom de Domaine"
 
@@ -726,50 +728,50 @@ msgstr ""
 msgid "Learn more..."
 msgstr "En savoir plus..."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Configuration générale"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Erreur lors de l'établissement du nom de machine : {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Nom de machine établi"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Erreur lors de l'établissement du nom de domaine : {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Nom de domaine établi"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 "Erreur lors de l'établissement de la page d’accueil du serveur Web : "
 "{exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Page d’accueil du serveur Web établie"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Erreur lors de l'établissement du nom de domaine : {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1027,7 +1029,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1048,11 +1050,11 @@ msgstr "L'enregistrement des utilisateurs est activé"
 msgid "User registrations disabled"
 msgstr "L'enregistrement des utilisateurs est désactivé"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Client DNS dynamique"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1064,7 +1066,7 @@ msgstr ""
 "fournis par {box_name} ne pourront pas être découverts par les autres "
 "utilisateurs."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1082,10 +1084,11 @@ msgstr ""
 "la nouvelle IP. Si quelqu'un sur Internet demande votre nom DNS, il "
 "obtiendra votre adresse IP actuelle."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Service de DNS dynamique"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Nom de Domaine"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1439,7 +1442,7 @@ msgstr "Lancer le client Web"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -1491,13 +1494,11 @@ msgstr "Service/Port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Activé"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Désactivé"
@@ -2093,15 +2094,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "Information de licence JavaScript"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Certificats"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2117,7 +2118,7 @@ msgstr ""
 "le propriétaire du domaine auprès de l'autorité de certification « Let's "
 "Encrypt »."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2532,23 +2533,23 @@ msgid "Address"
 msgstr "Adresse"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Port"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Configuration du nombre maximum de joueurs mise à jour"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Configuration du mode créatif mise à jour"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "Configuration PVP mise à jour"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Configuration des blessures mise à jour"
 
@@ -2643,7 +2644,7 @@ msgstr "Publication de la clef sur un serveur de clefs..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Service"
 
@@ -2658,6 +2659,7 @@ msgstr "Empreinte OpenPGP"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Secure Shell"
 
@@ -2748,11 +2750,11 @@ msgstr "Clé importée."
 msgid "Cancelled key publishing."
 msgstr "Publication de la clef annulée."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Clef publiée sur le serveur de clefs."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Une erreur est survenue lors de la publication de la clef."
 
@@ -2791,23 +2793,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Serveur de Noms"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2816,9 +2806,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Indisponible"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3536,15 +3530,15 @@ msgstr "Installation terminée."
 msgid "Setup failed."
 msgstr "Échec de l'installation."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Visibilité publique"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3557,18 +3551,18 @@ msgstr ""
 "besoin que si les services de {box_name} ne sont pas joignables depuis le "
 "reste de l'Internet. Cela comprend les situations suivantes :"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} est derrière un pare-feu restrictif."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} est connecté à un réseau (sans fil) que vous ne contrôlez pas."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3576,7 +3570,7 @@ msgstr ""
 "Votre FAI ne vous fournit pas une adresse IP externe, plutôt une connexion "
 "Internet via NAT."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 #, fuzzy
 #| msgid ""
 #| "Your ISP does not provide you a static IP address and your IP address "
@@ -3588,11 +3582,11 @@ msgstr ""
 "Votre FAI ne vous fournit pas une adresse statique, votre adresse IP change "
 "à chaque fois que vous vous connectez à l'Internet."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Votre FAI limite les connexions entrantes."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3607,6 +3601,12 @@ msgstr ""
 "futur, il sera peut-être possible d'utiliser {box_name} d'un ami pour ce "
 "faire."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "Compte PageKite"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "Activer PageKite"
@@ -3868,10 +3868,6 @@ msgstr ""
 "Voir comment configurer le client SSH sur le <a href=\"https://pagekite.net/"
 "wiki/Howto/SshOverPageKite/\">wiki pagekite</a> (en anglais)"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pagekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Services Standards"
@@ -5187,35 +5183,35 @@ msgstr ""
 "download-easy.html.en\">navigateur Tor</a>."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Relais pont Tor"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "Service Caché Tor"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Relais pont Tor"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Port du relais Tor disponible"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Transport Obfs3 enregistré"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Transport Obfs4 enregistré"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Accédez à l'URL {url} sur tcp{kind} via Tor"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Confirmez l'utilisation de Tor pour {url} sur tcp{kind}"
@@ -5350,11 +5346,11 @@ msgstr "Services Cachés"
 msgid "Ports"
 msgstr "Ports"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Relais"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5364,11 +5360,11 @@ msgstr ""
 "devez vous assurer que les ports suivants soient ouverts et réacheminés si "
 "nécessaire :"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -5493,7 +5489,7 @@ msgstr ""
 #| "temporarily unavailable and show an error.  Refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "En fonction du nombre de paquets à installer, <strong>cette opération peut "
@@ -5502,7 +5498,7 @@ msgstr ""
 "mise à niveau, cette interface web peut être temporairement indisponible et "
 "afficher une erreur. Rafraîchissez la page pour continuer."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -6093,6 +6089,24 @@ msgstr "Application désactivée"
 msgid "Gujarati"
 msgstr ""
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Service de DNS dynamique"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Indisponible"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pagekite"
+
 #~ msgid "Create new repository"
 #~ msgstr "Créer un nouveau dépôt"
 
diff --git a/plinth/locale/gl/LC_MESSAGES/django.po b/plinth/locale/gl/LC_MESSAGES/django.po
index 36e4fcd78..42078007d 100644
--- a/plinth/locale/gl/LC_MESSAGES/django.po
+++ b/plinth/locale/gl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-07-11 08:01+0000\n"
 "Last-Translator: Miguel A. Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/freedombox/"
@@ -53,15 +53,15 @@ msgstr "Non é posíbel conectar con {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Activar o aplicativo"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Seleccione o nome de dominio a usar por este aplicativo"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -69,15 +69,15 @@ msgstr ""
 "Aviso! É posíbel que o aplicativo non funcione correctamente se cambia o "
 "nome de dominio máis adiante."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Idioma"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Idioma para amosar esta interface web"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Usar a preferencia de idioma definida no navegador"
 
@@ -530,7 +530,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -561,15 +561,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -645,47 +647,47 @@ msgstr "Amosa aplicativos e funcións que requiren maior coñecemento técnico."
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Configurar a páxina de inicio do servidor web"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -920,7 +922,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -941,11 +943,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -953,7 +955,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -964,9 +966,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1252,7 +1253,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1295,13 +1296,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1797,15 +1796,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1815,7 +1814,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2158,23 +2157,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2253,7 +2252,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2268,6 +2267,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2355,11 +2355,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2392,23 +2392,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2417,8 +2405,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3066,15 +3058,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3083,33 +3075,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3118,6 +3110,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3360,10 +3356,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4470,35 +4462,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4612,22 +4604,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4723,11 +4715,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/gu/LC_MESSAGES/django.po b/plinth/locale/gu/LC_MESSAGES/django.po
index 838ad792f..c86e9bebb 100644
--- a/plinth/locale/gu/LC_MESSAGES/django.po
+++ b/plinth/locale/gu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2018-02-05 18:37+0000\n"
 "Last-Translator: drashti kaushik <drashtipandya37@gmail.com>\n"
 "Language-Team: Gujarati <https://hosted.weblate.org/projects/freedombox/"
@@ -53,32 +53,32 @@ msgstr "{host}:{port} નો સંપર્ક નથી સાધી શકત
 msgid "FreedomBox"
 msgstr "ફ્રિડમબોક્ષ"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "એપ્લીકેશનને પ્રસ્થાપિત કરો"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "આ એપ્લીકેશન સાથે ઉપયોગ કરવા માટે ડોમેઈન નામ પસંદ કરો"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 "ચેતવણી! જો ડોમેઈન નામમાં પાછળ થી કોઈ બદલાવ આવશે, તો એપ્લીકેશન યોગ્ય રીતે કામ નહિ કરે."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "ભાષા"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 #, fuzzy
 #| msgid "Language for this web administration interface"
 msgid "Language to use for presenting this web interface"
 msgstr "આ વેબ પ્રબંધક ઈન્ટરફેસ માટેની ભાષા"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -554,7 +554,7 @@ msgstr "DNSSEC ને શરુ કરો"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "ક્ષેત્રીય નામ વ્યવસ્થાની સુરક્ષા વૃદ્ધીઓ ને શરુ કરો"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -592,15 +592,17 @@ msgstr ""
 "સાથે{box_name} લૉગિન દ્વારા ઍક્સેસ કરી શકાય છે. સંવેદનશીલ માહિતી અને વ્યવસ્થાપનની "
 "ક્ષમતાઓ એડમિન ગ્રૂપના વપરાશકર્તાઓ માટે મર્યાદિત છે."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "ગોઠવો"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "ક્ષેત્રનું નામ"
 
@@ -685,49 +687,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "સામાન્ય ગોઠવણી"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "હોસ્ટનું નામ સ્થાપિત કરતાં ભૂલ થઇ: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "હોસ્ટનું નામ સ્થાપિત કર્યું"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "ક્ષેત્રીય નામ સ્થાપિત કરતાં ભૂલ થઇ: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "ક્ષેત્રીય નામ સ્થાપિત કર્યું"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "હોસ્ટનું નામ સ્થાપિત કરતાં ભૂલ થઇ: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "ક્ષેત્રીય નામ સ્થાપિત કરતાં ભૂલ થઇ: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -981,7 +983,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1002,11 +1004,11 @@ msgstr "વપરાશકર્તા રજીસ્ટ્રેશન સક
 msgid "User registrations disabled"
 msgstr "વપરાશકર્તા રજીસ્ટ્રેશન અક્ષમ છે"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "ડાયનેમિક DNS ક્લાયન્ટ"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, fuzzy, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1017,7 +1019,7 @@ msgstr ""
 "અન્ય લોકો માટે તમને ઇન્ટરનેટ પર શોધવા માટે મુશ્કેલ હોઈ શકે છે. આ અન્ય લોકો જે આ દ્વારા "
 "પ્રદાન કરવામાં આવે છે તે સેવાઓ શોધવાનું અટકાવશે {box_name}"
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1034,10 +1036,11 @@ msgstr ""
 "પર સોંપી દેશે, અને જો ઇન્ટરનેટમાંથી કોઈ વ્યક્તિ તમારા DNS નામ માટે પૂછે, તેઓને તમારા "
 "વર્તમાન IP સરનામા સાથે પ્રતિસાદ મળશે."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "ડાયનેમિક DNS સેવા"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "ક્ષેત્રનું નામ"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1376,7 +1379,7 @@ msgstr "વેબ ક્લાયન્ટ શરૂ કરો"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "રૂપરેખાંકન"
 
@@ -1426,13 +1429,11 @@ msgstr "સેવા/પોર્ટ"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "સક્ષમ કરેલું"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "અક્ષમ કરેલું"
@@ -1934,15 +1935,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1952,7 +1953,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2311,23 +2312,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2408,7 +2409,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2423,6 +2424,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2510,11 +2512,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2547,23 +2549,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2572,8 +2562,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3221,15 +3215,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3238,33 +3232,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3273,6 +3267,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3515,10 +3513,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4626,35 +4620,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4768,22 +4762,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4887,11 +4881,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5436,6 +5430,9 @@ msgstr "એપ્લિકેશન અક્ષમ છે"
 msgid "Gujarati"
 msgstr ""
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "ડાયનેમિક DNS સેવા"
+
 #~ msgid "Current status:"
 #~ msgstr "વર્તમાન સ્થિતિ:"
 
diff --git a/plinth/locale/hi/LC_MESSAGES/django.po b/plinth/locale/hi/LC_MESSAGES/django.po
index 9c4c349d6..f47e8aa87 100644
--- a/plinth/locale/hi/LC_MESSAGES/django.po
+++ b/plinth/locale/hi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2018-08-09 20:39+0000\n"
 "Last-Translator: Gayathri Das <gaya3das@live.unc.edu>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -53,30 +53,30 @@ msgstr "{host}:{port} से नहीं जोड़ सखता"
 msgid "FreedomBox"
 msgstr "फ्रीडमबोएक्स"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "एप्लिकेशन सक्षम करें"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "इस एप्लिकेशन के साथ एक डोमेन का नाम चुने"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 "वर्णइंग! अगर डोमेन का नाम बाद में बदल गया, एप्लिकेशन शायद ठीक से नहीं कर सकता है."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "भाषा"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "इस वेब इंटरफेस में इसतेमाल कि जाने वाली भाषा"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "जो भाषा ब्राउज़र में हैं, वो भाषा उपयोग करें"
 
@@ -588,7 +588,7 @@ msgstr "डीएनएसएसईसि सक्षम करें"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "डॉमेन नाम सिस्टम सुरक्षा एक्सटेंशनस सक्षम करें"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -631,15 +631,17 @@ msgstr ""
 "माैजूद होते है. यह <a href=\"{users_url}\"> कोई से </a> एक {box_name} के सात पहुंच "
 "सकते हैं. निजी जानकारी आैर सिस्टम बदलने का योग्यता सिर्फ व्यवस्थापक लोग के पास है."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "कॉन्फ़िगर करें"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "डोमेन नाम"
 
@@ -738,49 +740,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "और सीखिये..."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "सामान्य कॉन्फ़िगरेशन"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "{exception}: होस्ट नाम सेट करने में एरर"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "होस्ट नाम सेट हो गया"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "{exception}: डोमेन नाम सेट करने में एरर"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "डोमेन नाम सेट हो गया है"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "{exception}: होस्ट नाम सेट करने में एरर"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "{exception}: डोमेन नाम सेट करने में एरर"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1036,7 +1038,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1057,11 +1059,11 @@ msgstr "यूसर पंजीकरण सक्षम किया"
 msgid "User registrations disabled"
 msgstr "यूसर पंजीकरण अक्षम किया"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "डायनेमिक डिएनएस ग्राहक"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1071,7 +1073,7 @@ msgstr ""
 "अगर अापका इंटरनेट प्रदाता अक्सर अपना आईपी एड्रसॅ  बदलता है (i.e. हर चौबीस) दूसरे लोग "
 "अपसे मिलकर मुश्किल हेगा. यह दूसरे को यह {box_name} से प्रदान वाले सेवाएं खोजने से रोक देगे."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1088,10 +1090,11 @@ msgstr ""
 "डिएनएस नाम नया आईपी पर आवंटित करेगा और अगर इंटरनेट से कोई अपना  डिएनएस नाम पूछता "
 "है, अपना वर्तमान एड्रसॅ से जवाब मिलेगा."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "डायनेमिक डिएनएस ग्राहक"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "डोमेन नाम"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1426,7 +1429,7 @@ msgstr "वेब क्लाइंट लॉंच"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "कॉन्फ़िगरेशन"
 
@@ -1476,13 +1479,11 @@ msgstr "सर्विस/पोर्ट"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "सक्षम किया गया है"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "अक्षम किया गया है"
@@ -2038,15 +2039,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "जावास्क्रिप्ट लाइसेंस जानकारी"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "लेटस एंक्रिप्ट"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "प्रमाण पत्र"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2060,7 +2061,7 @@ msgstr ""
 "प्रमाणपत्र सेटअप प्राप्त कर सकता है. {box_name} यह लेटस एंक्रिप्ट का डोमेन का एकमात्र "
 "मालिक सताबित करके एेसा करता है."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2456,23 +2457,23 @@ msgid "Address"
 msgstr "ऍड्रेस"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "पोर्ट"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "अधिकतम खिलाड़ी कॉन्फ़िगरेशन अपडेट किया गया"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "क्रिएटिव मोड कॉन्फ़िगरेशन अपडेट किया गया"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "पिवीपि कॉन्फ़िगरेशन अपडेट किया गया"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "क्षति कॉन्फ़िगरेशन अपडेट किया गया"
 
@@ -2574,7 +2575,7 @@ msgstr "चाबी किसर्वर पर प्रकाशित क
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "सर्विस"
 
@@ -2589,6 +2590,7 @@ msgstr "अोपनपिजीपि फिंगरप्रिंट"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "सुरक्षित शेल"
 
@@ -2678,11 +2680,11 @@ msgstr "इमपोरटेड़ चाबी."
 msgid "Cancelled key publishing."
 msgstr "चाबी प्रकाशन रद्द किया गया."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "चाबी किसर्वर पर प्रकाशित किया गया."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "चाबी प्रकाशित करते समय एरर हो गया."
 
@@ -2718,23 +2720,11 @@ msgstr "पलमबल"
 msgid "Mumblefly"
 msgstr "ममबलफ्लाई"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "एचटीटीपिेएस"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "एसएसएच"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "नाम सरविस"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2743,9 +2733,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "उपलब्ध नहीं है"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3448,15 +3442,15 @@ msgstr "सेटअप पूरा हो गया."
 msgid "Setup failed."
 msgstr "सेटअप विफल."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "पेजकइट"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "सार्वजनिक विसिबिलिटी"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3468,17 +3462,17 @@ msgstr ""
 "सीधा कनेक्शन नहीं है. इसके जरूरत है सिर्फ आपके {box_name} के सर्विसस बाकी इंटरनेट से पहुँच "
 "योग्य नहीं. इसमें इन स्थितियों को शामिल किया गया है:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} एक प्रतिबंधित फ़ायरवॉल के पीछे है."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr "{box_name} एक (वायरलेस) रूटर से कनेक्टेड है जिसे आप नियंत्रित नहीं करते हैं."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3486,7 +3480,7 @@ msgstr ""
 "आपका ISP आपको एक बाहरी IP एड्रेस नहीं दता लेकिन NAT के माध्यम से  इंटरनेट कनेक्शन प्रदान "
 "करता है."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3494,11 +3488,11 @@ msgstr ""
 "आपके ISP आपको एक स्थिर IP एड्रेस प्रदान नहीं करता है और आपके IP एड्रेस बदलाएग जब आप "
 "इंटरनेट से कनेक्ट होते हैं."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "आपके ISP आने वाले कनेक्शंसस को सीमित करता है."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3511,6 +3505,12 @@ msgstr ""
 "<a href=\"https://pagekite.net\">pagekite.net</a>. भविष्य में अापका दोस्त का "
 "{box_name} इसके लिये उपयोग कर सकते हैं."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "पेजकईट अकाउंट"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "पेजकाइट सक्षम करें"
@@ -3767,10 +3767,6 @@ msgstr ""
 "SSH ग्राहक सेटअप देखें <a href=\"https://pagekite.net/wiki/Howto/SshOverPageKite/"
 "\">instructions</a>"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "पेजकइट"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "स्टैण्डर्ड सर्विसस"
@@ -5050,35 +5046,35 @@ msgstr ""
 "download-easy.html.en\">टो ब्राउज़र </a> उपयोग करें."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr "टोर सोक्स प्रॉक्सी"
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "टो ब्रिज रीले"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "टोर हिडन सर्विस"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr "टोर सोक्स प्रॉक्सी"
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "टो ब्रिज रीले"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "टोर रीले पोर्ट उपलब्ध है"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3 ट्रांसपोर्ट पंजीकृत"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4 ट्रांसपोर्ट पंजीकृत"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "यूआरएल एक्सेस करें {url} टीसीपी पर {kind} टोर के माध्यम से"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "टोर उपयोग की पुष्टि करें {url} पर टीसीपी पर {kind}"
@@ -5209,11 +5205,11 @@ msgstr "हिडन सर्विस"
 msgid "Ports"
 msgstr "पोर्टस"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "रीले"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5222,11 +5218,11 @@ msgstr ""
 "अगर आपका %(box_name)s एक रूटर या फ़ायरवॉल के पीछे है, आपको यह सुनिश्चित करना चाहिए "
 "कि पोर्टस खुले हैं, और अगर जरुरत है,पोर्ट-फॉरवर्डेड:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "सॉक्स"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "एक टोर सॉक्स पोर्ट आपका %(box_name)s र उपलब्ध है, TCP पोर्ट ९०५० पर."
@@ -5344,14 +5340,14 @@ msgstr ""
 #| "temporarily unavailable and show an error.  Refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "इंस्टॉल करने के लिए पैकेज की संख्या के आधार पर, यह पूरा करने के लिए बहुत समय लग सकता है. "
 "जब अपग्रेडस प्रगति पर हैं, दुसरे पैकेजस इंस्टॉल नहीं कर सकेगा. अपग्रेड करते समय, यह वेब इंटरफ़ेस "
 "शयद अस्थायी रूप से अनुपलब्ध है और एक त्रुटि दिखाएे. जारी रखने के लिए पेज रिफ्रेश करें."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5920,6 +5916,24 @@ msgstr "एप्लीकेशन अक्षम किया गया ह
 msgid "Gujarati"
 msgstr ""
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "डायनेमिक डिएनएस ग्राहक"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "एचटीटीपिेएस"
+
+#~ msgid "SSH"
+#~ msgstr "एसएसएच"
+
+#~ msgid "Not Available"
+#~ msgstr "उपलब्ध नहीं है"
+
+#~ msgid "Pagekite"
+#~ msgstr "पेजकइट"
+
 #, fuzzy
 #~| msgid "Create Snapshot"
 #~ msgid "Create new repository"
diff --git a/plinth/locale/hu/LC_MESSAGES/django.po b/plinth/locale/hu/LC_MESSAGES/django.po
index 3dc01f94c..9136e6ca8 100644
--- a/plinth/locale/hu/LC_MESSAGES/django.po
+++ b/plinth/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-08-02 21:11+0000\n"
 "Last-Translator: Doma Gergő <domag02@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/freedombox/"
@@ -53,15 +53,15 @@ msgstr "Nem tudok ide csatlakozni: {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Alkalmazás engedélyezése"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Válassz egy domain nevet, amit ezzel az alkalmazással fogsz használni"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -69,15 +69,15 @@ msgstr ""
 "Figyelem! Az alkalmazás lehet, hogy nem fog működni megfelelően, ha a domain "
 "név később módosul."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Nyelv"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "A webes felület megjelenítéséhez használt nyelv"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Használd a böngésző nyelvi beállítását"
 
@@ -578,7 +578,7 @@ msgstr "DNSSEC engedélyezése"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Domain Name System Security Extensions engedélyezése"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -617,15 +617,17 @@ msgstr ""
 "bármely adminisztrátori csoportba tartozó <a href="
 "\"{users_url}\">felhasználója</a>."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Beállítások"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Domain név"
 
@@ -718,47 +720,47 @@ msgstr "Több műszaki ismeretet igénylő alkalmazások és funkciók megjelen
 msgid "Learn more..."
 msgstr "Bővebben..."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Általános beállítások"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Hiba az állomásnév beállítása közben: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Állomásnév beállítva"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Hiba a domain név beállítása közben: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Domain név beállítva"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "Hiba a webkiszolgáló kezdőoldalának beállítása közben: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Webkiszolgáló kezdőoldal beállítva"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr "Hiba a haladó módba váltás során: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr "Haladó szintű alkalmazások és funkciók megjelenítése"
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr "Haladó szintű alkalmazások és funkciók elrejtése"
 
@@ -1025,7 +1027,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1046,11 +1048,11 @@ msgstr "Felhasználók regisztrációja engedélyezve"
 msgid "User registrations disabled"
 msgstr "Felhasználók regisztrációja letiltva"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Dynamic DNS ügyfél"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1062,7 +1064,7 @@ msgstr ""
 "Ez megakadályozza azt, hogy mások megtalálják ezen {box_name} eszköz által "
 "biztosított szolgáltatásokat."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1081,10 +1083,11 @@ msgstr ""
 "az Interneten lekérdezi a DNS neved, válaszként az aktuális IP címedet fogja "
 "megkapni."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Dynamic DNS szolgáltatás"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Domain név"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1430,7 +1433,7 @@ msgstr "Webes kliens indítása"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Beállítások"
 
@@ -1481,13 +1484,11 @@ msgstr "Szolgáltatás/port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Engedélyezve"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Letiltva"
@@ -2073,15 +2074,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "JavaScript licencinformáció"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Tanúsítványok"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2097,7 +2098,7 @@ msgstr ""
 "Teszi ezt oly módon, hogy bizonyítja a Let's Encrypt hitelesítésszolgáltató "
 "(CA) számára a domain tulajdonjogát."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2517,23 +2518,23 @@ msgid "Address"
 msgstr "Cím"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Port"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Maximális játékosszám beállítás frissítve"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Kreatív mód beállítás frissítve"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "PVP beállítás frissítve"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Sérülés beállítás frissítve"
 
@@ -2638,7 +2639,7 @@ msgstr "A kulcs közzététele a kulcskiszolgálónak…"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Szolgáltatás"
 
@@ -2653,6 +2654,7 @@ msgstr "OpenPGP ujjlenyomat"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Secure Shell (Biztonságos parancsértelmező)"
 
@@ -2743,11 +2745,11 @@ msgstr "Importált kulcs."
 msgid "Cancelled key publishing."
 msgstr "Kulcs közzététel megszakítva."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Kulcs közzétéve a kulcskiszolgálónak."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Hiba történt a kulcs közzététele során."
 
@@ -2785,23 +2787,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Névszolgáltatások"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2815,9 +2805,13 @@ msgstr ""
 "HTTP, HTTPS és az SSH szolgáltatások engedélyezettek-e vagy le vannak tiltva "
 "a bejövő kapcsolatok számára az adott néven."
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Nem hozzáférhető"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3530,15 +3524,15 @@ msgstr "Beállítás sikerült."
 msgid "Setup failed."
 msgstr "Beállítás sikertelen."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Nyilvános láthatóság"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3552,19 +3546,19 @@ msgstr ""
 "szolgáltatásai nem érhetőek el az internet felől. Ez magában foglalja az "
 "alábbi eseteket:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} eszközöd egy korlátozott tűzfal mögött van."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} eszközöd egy olyan (vezetéknélküli) router-hez kapcsolódik, "
 "amelyet te nem állíthatsz be."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3572,7 +3566,7 @@ msgstr ""
 "Az internetszolgáltatód nem biztosít neked külső IP címet, ehelyett hálózati "
 "címfordításon (NAT) keresztül tudod elérni az Internetet."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3580,11 +3574,11 @@ msgstr ""
 "Az internetszolgáltatód nem biztosít neked statikus IP címet és az IP címed "
 "mindig megváltozik, amikor az Internetre csatlakozol."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Az internetszolgáltatód korlátozza a bejövő kapcsolatokat."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3598,6 +3592,12 @@ msgstr ""
 "net</a>.  A jövőben talán a barátod {box_name} eszközét is lehetőséged lesz "
 "használni erre a célra."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PageKite fiók"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "PageKite engedélyezése"
@@ -3858,10 +3858,6 @@ msgstr ""
 "Tekintsd meg az SSH kliens beállítási <a href=\"https://pagekite.net/wiki/"
 "Howto/SshOverPageKite/\">instrukciókat</a>"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pagekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Szabványos szolgáltatások"
@@ -5192,35 +5188,35 @@ msgstr ""
 "javasolja."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr "Tor Socks proxy"
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Tor híd relay"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "Tor rejtett szolgáltatás"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr "Tor Socks proxy"
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Tor híd relay"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Tor relay port elérhető"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3 átvitel regisztrálva"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4 átvitel regisztrálva"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Hozzáférés a {url} URL-hez tcp{kind}-on Tor használatával"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Hagyd jóvá a Tor használatát {url} célcímhez tcp{kind} protokollon"
@@ -5356,11 +5352,11 @@ msgstr "Rejtett szolgáltatás"
 msgid "Ports"
 msgstr "Portok"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Továbbító"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5370,11 +5366,11 @@ msgstr ""
 "található, akkor győződj meg arról, hogy a következő portok nyitva vannak és "
 "port továbbításuk (port-forward) megfelelő:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -5488,9 +5484,14 @@ msgid "Updating..."
 msgstr "Frissítés…"
 
 #: plinth/modules/upgrades/templates/upgrades.html:57
+#, fuzzy
+#| msgid ""
+#| "<strong>This may take a long time to complete</strong>. During an update, "
+#| "you can not install apps. Also, this web interface may be temporarily "
+#| "unavailable and show an error. In that case, refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "<strong>Ez a művelet sokáig tarthat.</strong> Amíg a frissítés folyamatban "
@@ -5498,7 +5499,7 @@ msgstr ""
 "felület átmenetileg elérhetetlenné válhat és hibát jelezhet. Ebben az "
 "esetben frissítsd az oldalt a folytatáshoz."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr "Frissítésnapló megjelenítése"
 
@@ -6078,6 +6079,24 @@ msgstr "Alkalmazás letiltva"
 msgid "Gujarati"
 msgstr "Gudzsaráti"
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Dynamic DNS szolgáltatás"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Nem hozzáférhető"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pagekite"
+
 #~ msgid "Create new repository"
 #~ msgstr "Új tároló létrehozása"
 
diff --git a/plinth/locale/id/LC_MESSAGES/django.po b/plinth/locale/id/LC_MESSAGES/django.po
index 971d94a7d..b00e28be3 100644
--- a/plinth/locale/id/LC_MESSAGES/django.po
+++ b/plinth/locale/id/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Indonesian (FreedomBox)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2018-11-02 00:44+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/freedombox/"
@@ -48,31 +48,31 @@ msgstr "Tidak dapat terhubung ke {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Aktifkan aplikasi"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Bahasa"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 #, fuzzy
 #| msgid "Language for this web administration interface"
 msgid "Language to use for presenting this web interface"
 msgstr "Bahasa untuk antarmuka web administrasi"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -567,7 +567,7 @@ msgstr "Aktifkan Dynamic DNS"
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -600,15 +600,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfigurasi"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -688,49 +690,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Pelajari lainnya &raquo;"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Konfigurasi Umum"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Kesalahan pengaturan nama domain: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "Kesalahan pengaturan nama domain: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Kesalahan pengaturan nama domain: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -969,7 +971,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -990,11 +992,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1002,7 +1004,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1013,12 +1015,9 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-#, fuzzy
-#| msgid "Dynamic DNS Status"
-msgid "Dynamic DNS Service"
-msgstr "Status Dynamic DNS"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
+msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1309,7 +1308,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1354,13 +1353,11 @@ msgstr "Layanan/Port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Aktifkan"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Non-Aktifkan"
@@ -1874,17 +1871,17 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 #, fuzzy
 #| msgid "No certficate"
 msgid "Certificates"
 msgstr "Tidak ada Sertifikat"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1894,7 +1891,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2265,23 +2262,23 @@ msgid "Address"
 msgstr "Address"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Port"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2366,7 +2363,7 @@ msgstr "Publikasikan kunci ke keyserver..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Layanan"
 
@@ -2381,6 +2378,7 @@ msgstr "Sidik Jari OpenPGP"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Secure Shell"
 
@@ -2468,11 +2466,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr "Batalkan publikasi kunci."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Publikasikan kunci ke keyserver."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2507,23 +2505,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Nama Layanan"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2532,9 +2518,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Tidak tersedia"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3190,17 +3180,17 @@ msgstr "Pengaturan selesai."
 msgid "Setup failed."
 msgstr "Pengaturan gagal."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 #, fuzzy
 #| msgid "Pagekite"
 msgid "PageKite"
 msgstr "Pagekite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3209,33 +3199,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3244,6 +3234,12 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "Pagekite"
+msgid "PageKite Domain"
+msgstr "Pagekite"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "Aktifkan PageKite"
@@ -3486,10 +3482,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pagekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Layanan Standar"
@@ -4655,35 +4647,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4798,23 +4790,23 @@ msgstr ""
 msgid "Ports"
 msgstr "Ports"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 #, fuzzy
 msgid "Relay"
 msgstr "Relay"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4914,11 +4906,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5471,6 +5463,26 @@ msgstr ""
 msgid "Gujarati"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Dynamic DNS Status"
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Status Dynamic DNS"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Tidak tersedia"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pagekite"
+
 #, fuzzy
 #~| msgid "Download my profile"
 #~ msgid "Upload"
diff --git a/plinth/locale/it/LC_MESSAGES/django.po b/plinth/locale/it/LC_MESSAGES/django.po
index e86df74aa..4b1d46612 100644
--- a/plinth/locale/it/LC_MESSAGES/django.po
+++ b/plinth/locale/it/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-03-13 15:03+0000\n"
 "Last-Translator: Dietmar <sagen@permondes.de>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/freedombox/"
@@ -53,15 +53,15 @@ msgstr "Non è possibile connettersi a {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Abilita applicazione"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Seleziona un nome di dominio da usare con questa applicazione"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 #, fuzzy
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
@@ -70,15 +70,15 @@ msgstr ""
 "Attenzione! L'applicazione potrebbe non funzionare correttamente nel caso in "
 "cui il domino venga successivamente modificato"
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Lingua"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Lingua da usare per presentare questa interfaccia web"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Usa la lingua impostata nel browser"
 
@@ -573,7 +573,7 @@ msgstr "Abilita DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Abilita Domain Name System Security Extensions"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -614,15 +614,17 @@ msgstr ""
 "informazioni sensibili e le possibilità di alterare il sistema sono limitate "
 "agli utenti appartenenti al gruppo admin."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configura"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Nome Dominio"
 
@@ -711,50 +713,50 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Impara di più..."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Configurazione Generale"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Errore impostazione hostname: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 #, fuzzy
 msgid "Hostname set"
 msgstr "Imposta hostname"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Errore impostazione nome di dominio: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 #, fuzzy
 msgid "Domain name set"
 msgstr "Imposta nome di dominio"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "Errore impostazione home page server web: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Errore impostazione nome di dominio: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1026,7 +1028,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1047,11 +1049,11 @@ msgstr "Registrazione utenti abilitata"
 msgid "User registrations disabled"
 msgstr "Registrazione utenti disabilitqta"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Client DNS Dinamico"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, fuzzy, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1062,7 +1064,7 @@ msgstr ""
 "24 ore), può essere difficile per gli altri trovarti in Internet. Questo "
 "impedirà altri di raggiungere i servizi forniti da questo {box_name}"
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1079,10 +1081,11 @@ msgstr ""
 "tuo nome DNS al nuovo IP, e se qualcuno cercherà il tuo nome DNS in "
 "Internet, riceverà come risposta l'indirizzo IP corrente."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Servizio DNS Dinamico"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Nome Dominio"
 
 #: plinth/modules/dynamicdns/forms.py:43
 #, fuzzy
@@ -1434,7 +1437,7 @@ msgstr "Avvia client web"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -1486,13 +1489,11 @@ msgstr "Servizio/Porta"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Abilitato"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Disabilitato"
@@ -2063,15 +2064,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Certificati"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2086,7 +2087,7 @@ msgstr ""
 "disposizione. Ci riesce provando esso stesso di essere il proprietario del "
 "dominio a Let's Encrypt, un'autorità di certificazione (CA)."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2502,23 +2503,23 @@ msgid "Address"
 msgstr "Indirizzo"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Porta"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Configurazione \"numero massimo giocatori\" aggiornata"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Configurazione \"Modalità creativa\" aggiornata"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "Configurazione PVP aggiornata"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 #, fuzzy
 msgid "Damage configuration updated"
 msgstr "Configurazione \"danni\" abilitata"
@@ -2611,7 +2612,7 @@ msgstr "Pubblicazione della chiave nel keyserver…"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Servizio"
 
@@ -2626,6 +2627,7 @@ msgstr "OpenPGP Fingerprint"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Secure Shell"
 
@@ -2716,11 +2718,11 @@ msgstr "Chiave importata."
 msgid "Cancelled key publishing."
 msgstr "Pubblicazione chiave cancellata."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Chiave pubblicata nel keyserver."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Errore sorto durante la pubblicazione della chiave."
 
@@ -2758,23 +2760,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Name Services"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2783,9 +2773,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Non Disponibile"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3496,15 +3490,15 @@ msgstr "Setup completato."
 msgid "Setup failed."
 msgstr "Setup fallito."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Visibilità Pubblica"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3517,18 +3511,18 @@ msgstr ""
 "il tuo {box_name} non è raggiungibile dall'esterno. Questo include le "
 "situazioni seguenti:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} è valle di un firewall ristretto."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} è connesso ad un router (wireless) di cui non hai il controllo."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3536,7 +3530,7 @@ msgstr ""
 "Il tuo ISP non ti assegna un IP pubblico ma ti fornisce una connessione "
 "tramite NAT."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3544,11 +3538,11 @@ msgstr ""
 "Il tuo ISP non ti fornisce un IP statico e il tuo IP cambia ogni volta che "
 "ti connetti a Internet."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Il tuo ISP limita le connessioni in entrata."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3561,6 +3555,12 @@ msgstr ""
 "pagekite, per esempio <a href=\"https://pagekite.net\">pagekite.net</a>. In "
 "futuro potrebbe essere usare il {box_name} del tuo amico."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "Profilo PageKite"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "Abilita PageKite"
@@ -3822,10 +3822,6 @@ msgstr ""
 "Vedi le <a href=\"https://pagekite.net/wiki/Howto/SshOverPageKite/"
 "\">istruzioni</a> della configurazione del client SSH"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pagekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Servizi Standard"
@@ -4981,35 +4977,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -5123,22 +5119,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -5239,11 +5235,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5778,6 +5774,24 @@ msgstr "Applicazione disabilitata"
 msgid "Gujarati"
 msgstr ""
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Servizio DNS Dinamico"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Non Disponibile"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pagekite"
+
 #~ msgid "Upload"
 #~ msgstr "Carica"
 
diff --git a/plinth/locale/ja/LC_MESSAGES/django.po b/plinth/locale/ja/LC_MESSAGES/django.po
index 3cffa5f0b..befae6b8a 100644
--- a/plinth/locale/ja/LC_MESSAGES/django.po
+++ b/plinth/locale/ja/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,29 +52,29 @@ msgstr ""
 msgid "FreedomBox"
 msgstr ""
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr ""
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr ""
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr ""
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -527,7 +527,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -558,15 +558,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -642,47 +644,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -917,7 +919,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -938,11 +940,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -950,7 +952,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -961,9 +963,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1249,7 +1250,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1292,13 +1293,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1794,15 +1793,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1812,7 +1811,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2155,23 +2154,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2250,7 +2249,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2265,6 +2264,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2352,11 +2352,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2389,23 +2389,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2414,8 +2402,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3063,15 +3055,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3080,33 +3072,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3115,6 +3107,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3357,10 +3353,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4467,35 +4459,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4609,22 +4601,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4720,11 +4712,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/kn/LC_MESSAGES/django.po b/plinth/locale/kn/LC_MESSAGES/django.po
index 3cffa5f0b..befae6b8a 100644
--- a/plinth/locale/kn/LC_MESSAGES/django.po
+++ b/plinth/locale/kn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,29 +52,29 @@ msgstr ""
 msgid "FreedomBox"
 msgstr ""
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr ""
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr ""
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr ""
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -527,7 +527,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -558,15 +558,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -642,47 +644,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -917,7 +919,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -938,11 +940,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -950,7 +952,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -961,9 +963,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1249,7 +1250,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1292,13 +1293,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1794,15 +1793,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1812,7 +1811,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2155,23 +2154,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2250,7 +2249,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2265,6 +2264,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2352,11 +2352,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2389,23 +2389,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2414,8 +2402,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3063,15 +3055,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3080,33 +3072,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3115,6 +3107,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3357,10 +3353,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4467,35 +4459,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4609,22 +4601,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4720,11 +4712,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/lt/LC_MESSAGES/django.po b/plinth/locale/lt/LC_MESSAGES/django.po
index 7f1c2752e..6106a42c4 100644
--- a/plinth/locale/lt/LC_MESSAGES/django.po
+++ b/plinth/locale/lt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,29 +53,29 @@ msgstr ""
 msgid "FreedomBox"
 msgstr ""
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr ""
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr ""
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr ""
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -528,7 +528,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -559,15 +559,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -643,47 +645,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -918,7 +920,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -939,11 +941,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -951,7 +953,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -962,9 +964,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1250,7 +1251,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1293,13 +1294,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1795,15 +1794,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1813,7 +1812,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2156,23 +2155,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2251,7 +2250,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2266,6 +2265,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2353,11 +2353,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2390,23 +2390,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2415,8 +2403,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3064,15 +3056,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3081,33 +3073,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3116,6 +3108,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3358,10 +3354,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4468,35 +4460,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4610,22 +4602,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4721,11 +4713,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/nb/LC_MESSAGES/django.po b/plinth/locale/nb/LC_MESSAGES/django.po
index 7076d568f..f8a792328 100644
--- a/plinth/locale/nb/LC_MESSAGES/django.po
+++ b/plinth/locale/nb/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-08-08 00:23+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
@@ -61,30 +61,30 @@ msgstr "Klarer ikke koble til {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Aktiver program"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Velg et domenenavn som skal brukes med dette programmet"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 "ADVARSEL! Programmet kan slutte å virke rett hvis domenenavnet endres senere."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Språk"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Språk som skal brukes i dette nettgrensesnittet"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Bruk språkforvalg satt i nettleseren"
 
@@ -602,7 +602,7 @@ msgstr "Aktiver DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Aktiver domenenavnsystemets sikkerhetsutvidelser"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -640,15 +640,17 @@ msgstr ""
 "a>-banen på nettjeneren. Den kan brukes av <a href=\"{users_url}\">enhver "
 "bruker</a> på {box_name} som er medlem i admin-gruppen."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Sette opp"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Domenenavn"
 
@@ -739,47 +741,47 @@ msgstr "Vis programmer og funksjoner som krever dypere teknisk innsikt."
 msgid "Learn more..."
 msgstr "Lær mer…"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Generelt oppsett"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Feil ved setting av vertsnavn: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Vertsnavn satt"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Feil ved innstilling/setting av domenenavn: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Domenenavn satt"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "Feil ved setting av nettstedets hjemmeside: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Webtjenerforside satt"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr "Feil ved bytte til avansert modus: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr "Viser avanserte programmer og funksjoner"
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr "Viser ikke avanserte programmer og funksjoner"
 
@@ -1043,7 +1045,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1064,11 +1066,11 @@ msgstr "Brukerregistreringer aktivert"
 msgid "User registrations disabled"
 msgstr "Brukerregistreringer deaktivert"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Dynamisk DNS-klient"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1079,7 +1081,7 @@ msgstr ""
 "eks. hver 24 t), kan det være vanskelig for andre å finne deg på Internett. "
 "Dette vil hindre andre i å finne tjenester som tilbys av dette {box_name}et."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1096,10 +1098,11 @@ msgstr ""
 "tjeneren tildele DNS-navnet ditt til den nye IP-en. Hvis noen fra Internett "
 "ber om ditt DNS-navn, vil de da få  svar med din gjeldende IP-adresse."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Dynamisk DNS-tjeneste"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Domenenavn"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1438,7 +1441,7 @@ msgstr "Sette i gang en web-klient"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Oppsett"
 
@@ -1488,13 +1491,11 @@ msgstr "Tjeneste/Port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Aktivert"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Deaktivert"
@@ -2077,15 +2078,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "JavaScript lisensinformasjon"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Sertifikater"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2100,7 +2101,7 @@ msgstr ""
 "ved at det selv bekrefter eierskapet til et domene overfor  "
 "sertifiseringsinstansen (CA) Let's Encrypt."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2512,23 +2513,23 @@ msgid "Address"
 msgstr "Adresse"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Port"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Oppsett av maks spillere oppdatert"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Oppsett av kreativ modus oppdatert"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "PVP-oppsett oppdatert"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Skadeoppsett oppdatert"
 
@@ -2629,7 +2630,7 @@ msgstr "Publisering av nøkkel til nøkkeltjener…"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Tjeneste"
 
@@ -2644,6 +2645,7 @@ msgstr "OpenPGP Fingerprint (fingeravtrykk)"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Secure Shell (SSH)"
 
@@ -2734,11 +2736,11 @@ msgstr "Importert nøkkel."
 msgid "Cancelled key publishing."
 msgstr "Avbrutt nøkkelutlegging."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Publisert nøkkel til nøkkeltjener."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Feil oppstått under utlegging av nøkkel."
 
@@ -2776,23 +2778,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Navnetjenester"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2805,9 +2795,13 @@ msgstr ""
 "vises det om HTTP, HTTPS, og SSH-tjenester er på- eller avskrudd for "
 "innkommende tilkoblinger gjennom gitt navn."
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Ikke tilgjengelig"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3513,15 +3507,15 @@ msgstr "Oppsettet fullført."
 msgid "Setup failed."
 msgstr "Oppsettet mislyktes."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Offentlig synlighet"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3534,17 +3528,17 @@ msgstr ""
 "{box_name}-tjenester ikke nås fra resten av nettet. Dette omfatter de "
 "følgende situasjoner:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} er bak en begrensende brannmur."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr "{box_name} er koblet til en (trådløs) ruter du ikke kan kontrollere."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3552,7 +3546,7 @@ msgstr ""
 "Din Internett-leverandør gir deg ikke en ekstern IP-adresse, og gir i stedet "
 "en NAT-et Internett-tilkobling."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3560,11 +3554,11 @@ msgstr ""
 "Internett-leverandøren gir deg ikke en statisk IP-adresse, og IP-adressen "
 "endres hver gang du kobler deg til Internett."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Din Internett-leverandør begrenser innkommende oppkoblinger."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3578,6 +3572,12 @@ msgstr ""
 "\"https://pagekite.net\">pagekite.net</a>.  I fremtiden kan det bli mulig å "
 "bruke kameratens  {box_name} til dette."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PageKite-konto"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "Aktiver PageKite"
@@ -3840,10 +3840,6 @@ msgstr ""
 "Se oppsettet for SSH-klienten <a href=\"https://pagekite.net/wiki/Howto/"
 "SshOverPageKite/\">instructions (instruksjoner)</a>"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "PageKite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Standardtjenester"
@@ -5146,35 +5142,35 @@ msgstr ""
 "a>."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr "Tor Socks-mellomtjener"
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Tor bro-stafettvideresendingsoppsett"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "Skjult Tor-tjeneste"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr "Tor Socks-mellomtjener"
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Tor bro-stafettvideresendingsoppsett"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Tor relay-port tilgjengelig"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3-transport registrert"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4-transport registrert"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Adgang til URL {url} på tcp{kind} via Tor"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Bekreft Tor-bruk på {url} via tcp{kind}"
@@ -5309,11 +5305,11 @@ msgstr "Skjult tjeneste"
 msgid "Ports"
 msgstr "Porter"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Videresending"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5322,11 +5318,11 @@ msgstr ""
 "Hvis din %(box_name)s er bak en ruter eller brannvegg, må du forsikre deg om "
 "at de følgende portene er åpne, og at portene er videresendt, om nødvendig:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -5437,9 +5433,14 @@ msgid "Updating..."
 msgstr "Oppdaterer…"
 
 #: plinth/modules/upgrades/templates/upgrades.html:57
+#, fuzzy
+#| msgid ""
+#| "<strong>This may take a long time to complete</strong>. During an update, "
+#| "you can not install apps. Also, this web interface may be temporarily "
+#| "unavailable and show an error. In that case, refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "<strong>Det kan ta lang til å fullføre dette.</strong> Mens oppgraderingen "
@@ -5447,7 +5448,7 @@ msgstr ""
 "nettgrensesnittet være midlertidig utilgjengelig, og vise en feilmelding. "
 "Oppdater siden for å fortsette."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr "Veksle nylige oppdateringslogger"
 
@@ -6023,6 +6024,24 @@ msgstr "Programmet er deaktivert"
 msgid "Gujarati"
 msgstr "Gujarati"
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Dynamisk DNS-tjeneste"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Ikke tilgjengelig"
+
+#~ msgid "Pagekite"
+#~ msgstr "PageKite"
+
 #~ msgid "Create new repository"
 #~ msgstr "Opprett nytt depot"
 
diff --git a/plinth/locale/nl/LC_MESSAGES/django.po b/plinth/locale/nl/LC_MESSAGES/django.po
index 879040aa6..c96d5c9f6 100644
--- a/plinth/locale/nl/LC_MESSAGES/django.po
+++ b/plinth/locale/nl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-05-07 20:48+0000\n"
 "Last-Translator: Karel Trachet <karel@trachet.eu>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -55,15 +55,15 @@ msgstr "Kan niet verbinden met {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Toepassing inschakelen"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Selecteer een domeinnaam voor het gebruik van deze toepassing"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -71,15 +71,15 @@ msgstr ""
 "Waarschuwing! De toepassing werkt mogelijk niet correct als de domeinnaam "
 "later wordt gewijzigd."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Taal"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Te gebruiken taal voor de weergave van deze webinterface"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Gebruik de taalvoorkeuren die zijn ingesteld in de browser"
 
@@ -597,7 +597,7 @@ msgstr "DNSSEC Inschakelen"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Domeinnaamsysteem beveiliging-extensies inschakelen"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -644,15 +644,17 @@ msgstr ""
 "mogelijkheid om het systeem aan te passen is beperkt tot de gebruikers die "
 "tot de systeembeheerdergroep (admin) horen."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configureer"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Domeinnaam"
 
@@ -742,49 +744,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Lees meer..."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Algemene Instellingen"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Hostnaam instellen mislukt: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Hostnaam ingesteld"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Domeinnaam instellen mislukt: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Domeinnaam ingesteld"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "Hostnaam instellen mislukt: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Webserver start pagina ingesteld"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Domeinnaam instellen mislukt: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1048,7 +1050,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1069,11 +1071,11 @@ msgstr "Gebruikersregistratie ingeschakeld"
 msgid "User registrations disabled"
 msgstr "Gebruikersregistratie uitgeschakeld"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Dynamic DNS Cliënt"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1085,7 +1087,7 @@ msgstr ""
 "internet. Daardoor is het gebruik van de diensten van {box_name} vaak "
 "onmogelijk van buiten het lokale netwerk."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1103,10 +1105,11 @@ msgstr ""
 "naamswijziging doorvoeren, en als iemand op het internet om deze DNS naam "
 "vraagt wordt dit beantwoord met het juiste IP adres."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Domeinnaam"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1451,7 +1454,7 @@ msgstr "Start web cliënt"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Configuratie"
 
@@ -1501,13 +1504,11 @@ msgstr "Dienst/Poort"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Uitgeschakeld"
@@ -2082,15 +2083,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "JavaScript licentie-informatie"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2106,7 +2107,7 @@ msgstr ""
 "van een domein te zijn tegenover Let's Encrypt, een certificaatwaarmerker "
 "(CA)."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2519,23 +2520,23 @@ msgid "Address"
 msgstr "Adres"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Poort"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Instelling maximum aantal spelers bijgewerkt"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Instelling Creatieve modus bijgewerkt"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "Instelling PVP bijgewerkt"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Instelling schade bijgewerkt"
 
@@ -2642,7 +2643,7 @@ msgstr "Sleutel naar keyserver publiceren..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Dienst"
 
@@ -2657,6 +2658,7 @@ msgstr "OpenPGP Vingerafdruk"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Secure Shell"
 
@@ -2747,11 +2749,11 @@ msgstr "Geïmporteerde sleutel."
 msgid "Cancelled key publishing."
 msgstr "Sleutelpublicatie geannuleerd."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Sleutel gepubliceerd op keyserver."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Er is een fout opgetreden tijdens het publiceren van de sleutel."
 
@@ -2790,23 +2792,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Domeinnamen"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2815,9 +2805,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Niet Beschikbaar"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3532,15 +3526,15 @@ msgstr "Instelling voltooid."
 msgid "Setup failed."
 msgstr "Instelling mislukt."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Publieke zichtbaarheid"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3553,19 +3547,19 @@ msgstr ""
 "Dit is alleen vereist als de diensten op {box_name} niet te bereiken zijn "
 "vanaf de rest van internet. Dit is het geval in de volgende situaties:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} is verbonden achter een beperkende firewall."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} is verbonden met een (wireless) router die niet onder eigen "
 "controle staat."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3573,7 +3567,7 @@ msgstr ""
 "De internetprovider geeft geen extern IP adres maar maakt gebruik van een "
 "NAT verbinding."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3581,11 +3575,11 @@ msgstr ""
 "De internetprovider geeft geen statisch IP adres, en het IP adres verandert "
 "telkens wanneer u verbinding maakt met internet."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "De internetprovider beperkt inkomende verbindingen."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3599,6 +3593,12 @@ msgstr ""
 "\">pagekite.net</a>.  In de toekomst is het misschien mogelijk om de "
 "{box_name} van een van je vrienden te gebruiken."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PageKite Account"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "PageKite Inschakelen"
@@ -3862,10 +3862,6 @@ msgstr ""
 "Zie de SSH cliënt setup <a href=\"https://pagekite.net/wiki/Howto/"
 "SshOverPageKite/\">instructies (Engelstalig)</a>"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "PageKite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Standaard Diensten"
@@ -5200,35 +5196,35 @@ msgstr ""
 "Browser</a> aan."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr "Tor Socks Proxy"
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Tor Bridge Relay"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "Tor-Hidden Service"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr "Tor Socks Proxy"
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Tor Bridge Relay"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Tor relay poort beschikbaar"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3 transport geregistreerd"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4 transport geregistreerd"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Gebruik URL {url} op tcp{kind} via Tor"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Bevestig Tor gebruik met {url} via tcp{kind}"
@@ -5367,11 +5363,11 @@ msgstr "Hidden Service"
 msgid "Ports"
 msgstr "Poorten"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Relay"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5381,11 +5377,11 @@ msgstr ""
 "belangrijk te zorgen dat de volgende poorten open staan en indien nodig "
 "worden doorgeleid:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "Een Tor SOCKS poort is beschikbaar op %(box_name)s, op TCP poort 9050."
@@ -5507,7 +5503,7 @@ msgstr ""
 #| "temporarily unavailable and show an error.  Refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "Afhankelijk van het aantal te installeren pakketten, kan het updaten lang "
@@ -5516,7 +5512,7 @@ msgstr ""
 "beschikbaar zijn, en een foutmelding weergeven.  Vernieuw de pagina om door "
 "te gaan."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -6099,6 +6095,24 @@ msgstr "Toepassing uitgeschakeld"
 msgid "Gujarati"
 msgstr ""
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Dynamic DNS Service"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Niet Beschikbaar"
+
+#~ msgid "Pagekite"
+#~ msgstr "PageKite"
+
 #, fuzzy
 #~| msgid "Create Snapshot"
 #~ msgid "Create new repository"
diff --git a/plinth/locale/pl/LC_MESSAGES/django.po b/plinth/locale/pl/LC_MESSAGES/django.po
index 6984a558a..2f3c9d606 100644
--- a/plinth/locale/pl/LC_MESSAGES/django.po
+++ b/plinth/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-08-08 00:23+0000\n"
 "Last-Translator: Radek Pasiok <rpasiok@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -54,15 +54,15 @@ msgstr "Nie mogę się podłączyć do {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Aktywuj aplikację"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Określ nazwę domeny która będzie używana z tą aplikacją"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -70,15 +70,15 @@ msgstr ""
 "Ostrzeżenie! Aplikacja może nie działać poprawnie jeśli nazwa domeny "
 "zostanie zmieniona później."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Język"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Język tego interfejsu"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Użyj języka ustawionego w przeglądarce"
 
@@ -572,7 +572,7 @@ msgstr "Włącz DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Włącz rozszerzenia zabezpieczeń systemu nazw domen"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -605,15 +605,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Nazwa domeny"
 
@@ -699,49 +701,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Dowiedz się więcej &raquo;"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Ustawienia główne"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Błąd podczas ustawiania nazwy hosta: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Nazwa hosta ustawiona"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Błąd ustawiania nazwy domeny {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Nazwa domeny ustawiona"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "Błąd podczas ustawiania nazwy hosta: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Błąd ustawiania nazwy domeny {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -999,7 +1001,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1020,11 +1022,11 @@ msgstr "Rejestracja użytkowników włączona"
 msgid "User registrations disabled"
 msgstr "Rejestracja użytkowników wyłączona"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Klient Dynamic DNS"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1035,7 +1037,7 @@ msgstr ""
 "twój numer IP, innym użytkownikom może być trudno cię odnaleźć. Uniemożliwia "
 "to znajdowanie usług świadczonych przez {box_name}."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1053,10 +1055,11 @@ msgstr ""
 "nowego adresu IP i gdy ktoś zapyta o twoją nazwę DNS, otrzyma w odpowiedzi "
 "twój aktualny adres IP."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Usługa dynamicznego DNS"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Nazwa domeny"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1400,7 +1403,7 @@ msgstr "Uruchom klienta przeglądarkowego"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Konfiguracja"
 
@@ -1450,13 +1453,11 @@ msgstr "Usługa/Port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Włączony"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Wyłączony"
@@ -1987,16 +1988,16 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "Informacje o licencji JavaScript"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 #, fuzzy
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Certyfikaty"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2006,7 +2007,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2373,23 +2374,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Zaktualizowano maksymalną ilość graczy"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Zaktualizowano ustawienia trybu kreatywnego"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "Zaktualizowano ustawienia PVP"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Zaktualizowano ustawienia zniszczeń"
 
@@ -2468,7 +2469,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2483,6 +2484,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2570,11 +2572,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2607,23 +2609,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2632,8 +2622,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3281,15 +3275,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3298,33 +3292,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3333,6 +3327,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3580,10 +3578,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4733,35 +4727,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4875,22 +4869,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4990,11 +4984,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5578,6 +5572,9 @@ msgstr "Aplikacja wyłączona"
 msgid "Gujarati"
 msgstr ""
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Usługa dynamicznego DNS"
+
 #~ msgid "Create new repository"
 #~ msgstr "Utwórz nowe repozytorium"
 
diff --git a/plinth/locale/pt/LC_MESSAGES/django.po b/plinth/locale/pt/LC_MESSAGES/django.po
index 7d489b2c7..019307ad2 100644
--- a/plinth/locale/pt/LC_MESSAGES/django.po
+++ b/plinth/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-06-22 06:01+0000\n"
 "Last-Translator: adaragao <adaragao@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/freedombox/"
@@ -53,15 +53,15 @@ msgstr "Não é possível ligar a {host}:{port}"
 msgid "FreedomBox"
 msgstr "Freedombox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Ativar aplicação"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Selecionar um nome de domínio a ser utilizado pela aplicação"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -69,15 +69,15 @@ msgstr ""
 "Atenção! O aplicativo pode não responder corretamente se o nome de domínio "
 "for alterado mais tarde."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Língua"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Idioma a ser usado para apresentar a interface de administração web"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Use a preferência de idioma definida no navegador"
 
@@ -603,7 +603,7 @@ msgstr "Habilitar DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -634,15 +634,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configurar"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Nome de Domínio"
 
@@ -744,49 +746,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Configuração Geral"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Erro ao definir o nome do domínio: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Nome do domínio definido"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "Erro ao definir o nome do domínio: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Erro ao definir o nome do domínio: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1023,7 +1025,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1048,11 +1050,11 @@ msgstr "Aplicações"
 msgid "User registrations disabled"
 msgstr "Aplicações"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1060,7 +1062,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1071,10 +1073,11 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr ""
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Nome de Domínio"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1363,7 +1366,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -1406,13 +1409,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1918,15 +1919,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1936,7 +1937,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2303,29 +2304,29 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Maximum players configuration updated"
 msgstr "Configuração atualizada"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Creative mode configuration updated"
 msgstr "Configuração atualizada"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "PVP configuration updated"
 msgstr "Configuração atualizada"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Damage configuration updated"
@@ -2406,7 +2407,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2423,6 +2424,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2514,11 +2516,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2551,23 +2553,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2576,8 +2566,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3225,15 +3219,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3242,33 +3236,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3277,6 +3271,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3521,10 +3519,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4645,35 +4639,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4791,22 +4785,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4906,11 +4900,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/ru/LC_MESSAGES/django.po b/plinth/locale/ru/LC_MESSAGES/django.po
index f5b6786ab..c508b2048 100644
--- a/plinth/locale/ru/LC_MESSAGES/django.po
+++ b/plinth/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-07-22 17:06+0000\n"
 "Last-Translator: Igor <f2404@yandex.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/freedombox/"
@@ -54,15 +54,15 @@ msgstr "Невозможно подключиться к {host}:{port}"
 msgid "FreedomBox"
 msgstr "FrеedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Включить приложение"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Выберите доменное имя, которое будет использоваться этим приложением"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -70,15 +70,15 @@ msgstr ""
 "Предупреждение! Приложение может не работать должным образом, если доменное "
 "имя будет изменено."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Язык"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Язык, используемый для представления данного веб-интерфейса"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Использовать языковые настройки браузера"
 
@@ -595,7 +595,7 @@ msgstr "Включить DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Включить расширения безопасности системы доменных имен"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -633,15 +633,17 @@ msgstr ""
 "веб-сервере. Он может быть доступен на <a href=\"{users_url}\">любому "
 "пользователю</a> {box_name}, принадлежащему к группе админов."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Настроить"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Доменное имя"
 
@@ -732,48 +734,48 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Подробнее..."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Общие настройки"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Ошибка параметра hostname: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Смена имени хоста"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Ошибка параметра имени домена: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Смена доменного имени"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "Ошибка параметра домашней страницы веб-сервера: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "Установка домашней страницы веб-сервера"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Ошибка параметра имени домена: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1037,7 +1039,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1058,11 +1060,11 @@ msgstr "Регистрации пользователя включена"
 msgid "User registrations disabled"
 msgstr "Приложение отключено"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Клиент динамического DNS"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1073,7 +1075,7 @@ msgstr ""
 "в 24 часа) это может стать препятствиям, чтобы найти вас в Интернете. Это "
 "так-же может сделать недоступными предоставляемые {box_name} услуги."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1090,10 +1092,11 @@ msgstr ""
 "сервер будет назначать DNS-имя на новый IP-адрес, и если кто-то из Интернета "
 "запрашивает DNS-имя, они будут получать ответ ваш текущий IP-адрес."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Служба динамического DNS"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Доменное имя"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1436,7 +1439,7 @@ msgstr "Запустить веб-клиент"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Конфигурация"
 
@@ -1488,13 +1491,11 @@ msgstr "Служба/Порт"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Включено"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Выключено"
@@ -2061,15 +2062,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "Информация о лицензии JavaScript"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Сертификаты"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2083,7 +2084,7 @@ msgstr ""
 "автоматически получать и устанавливать цифровые сертификаты для каждого "
 "доступного домена."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2503,23 +2504,23 @@ msgid "Address"
 msgstr "Адрес"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Порт"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Максимум игроков обновлен"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Конфигурация творческого режима обновлена"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "Конфигурация PVP обновлена"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Конфигурация урона обновлена"
 
@@ -2622,7 +2623,7 @@ msgstr "Публикация ключа на сервер ключей..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Служба"
 
@@ -2637,6 +2638,7 @@ msgstr "OpenPGP отпечаток"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Sеcure Shell"
 
@@ -2726,11 +2728,11 @@ msgstr "Импортированный ключ."
 msgid "Cancelled key publishing."
 msgstr "Отменена публикация ключа."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Опубликованый ключ на сервере ключей."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Произошла ошибка при публикации ключа."
 
@@ -2768,23 +2770,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Название услуги"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2797,9 +2787,13 @@ msgstr ""
 "PageKite. Для каждого способа указывается, включён или отключён доступ по "
 "HTTP, HTTPS и SSH для входящих соединений на данное имя."
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Не доступно"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3504,15 +3498,15 @@ msgstr "Установка завершена."
 msgid "Setup failed."
 msgstr "Установка не удалась."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PаgeKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Публичная видимость"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3525,19 +3519,19 @@ msgstr ""
 "недоступны из остальной части интернета. Это включает в себя следующие "
 "ситуации:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} ограничен брандмауэром."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} подключен к маршрутизатору (беспроводному), который вы не "
 "контролируете."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3545,7 +3539,7 @@ msgstr ""
 "Ваш провайдер не предоставляет вам внешний IP-адрес и вместо этого "
 "обеспечивает подключение к Интернету через NAT."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
@@ -3553,11 +3547,11 @@ msgstr ""
 "Ваш провайдер не предоставляет вам статический IP-адрес, и ваш-IP адрес "
 "изменяется каждый раз при подключении к Интернету."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "Ваш провайдер ограничивает входящие соединения."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3570,6 +3564,12 @@ msgstr ""
 "услуг pagekite, например <a href=\"https://pagekite.net\">pagekite.net</a>. "
 "В будущем, для этого возможно будет использовать {box_name} вашего приятеля."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "Учетная запись PageKite"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "Включить PageKite"
@@ -3828,10 +3828,6 @@ msgstr ""
 "<a href=\"https://pagekite.net/wiki/Howto/SshOverPageKite/\">Инструкции</a> "
 "по настройке клиента SSH"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pаgekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Стандартные службы"
@@ -5141,35 +5137,35 @@ msgstr ""
 "a>."
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr "Tor Socks прокси"
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Ретранслятор Tor типа мост"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "Скрытый сервис Tor"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr "Tor Socks прокси"
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Ретранслятор Tor типа мост"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Доступен порт трансляции Tor"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3 транспорт зарегестрирован"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4 транспорт зарегистрирован"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "Доступ к {url} по tcp{kind} через Tor"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "Подтверждение использования Tor в {url} по tcp {kind}"
@@ -5303,11 +5299,11 @@ msgstr "Скрытая Служба"
 msgid "Ports"
 msgstr "Порты"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Ретранслятор"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5317,11 +5313,11 @@ msgstr ""
 "должны убедиться, что следующие порты являются открытыми и проброшены, если "
 "необходимо:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SОCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "Порт Tor SOCKS вашего %(box_name)s доступен по порту TCP 9050."
@@ -5430,9 +5426,14 @@ msgid "Updating..."
 msgstr "Обновляется..."
 
 #: plinth/modules/upgrades/templates/upgrades.html:57
+#, fuzzy
+#| msgid ""
+#| "<strong>This may take a long time to complete</strong>. During an update, "
+#| "you can not install apps. Also, this web interface may be temporarily "
+#| "unavailable and show an error. In that case, refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "<strong>Для завершения может потребоваться много времени</strong>. Во время "
@@ -5440,7 +5441,7 @@ msgstr ""
 "временно недоступен и показывать ошибку. В таком случае, чтобы продолжить, "
 "обновите страницу."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr "Переключите последние протоколы обновления"
 
@@ -6015,6 +6016,24 @@ msgstr "Приложение отключено"
 msgid "Gujarati"
 msgstr "Гуджарати"
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Служба динамического DNS"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Не доступно"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pаgekite"
+
 #~ msgid "Create new repository"
 #~ msgstr "Создать новый репозиторий"
 
diff --git a/plinth/locale/sl/LC_MESSAGES/django.po b/plinth/locale/sl/LC_MESSAGES/django.po
index 816702abf..4357af5c2 100644
--- a/plinth/locale/sl/LC_MESSAGES/django.po
+++ b/plinth/locale/sl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-05-07 20:48+0000\n"
 "Last-Translator: Erik Ušaj <erikusaj@hotmail.com>\n"
 "Language-Team: Slovenian <https://hosted.weblate.org/projects/freedombox/"
@@ -54,15 +54,15 @@ msgstr "Ne uspem se povezati na {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Omogoči aplikacijo"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Izberite domensko ime, ki bo uporabljeno za to aplikacijo"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -70,15 +70,15 @@ msgstr ""
 "Opozorilo! Aplikacija morda ne bo delovala pravilno, če domensko ime "
 "spreminjate naknadno."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Jezik"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Jezik, ki ga želite uporabljati za ta spletni vmesnik"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Uporabi jezikovne nastavitve brskalnika"
 
@@ -597,7 +597,7 @@ msgstr "Omogoči DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Omogoči varnostne razširitve DNSSEC"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -636,15 +636,17 @@ msgstr ""
 "\"{users_url}\">katerikoli uporabnik</a> na {box_name}, ki je član skupine "
 "skrbnikov."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Nastavitve"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Ime domene"
 
@@ -730,47 +732,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1005,7 +1007,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1026,11 +1028,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1038,7 +1040,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1049,10 +1051,11 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr ""
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Ime domene"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1337,7 +1340,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1380,13 +1383,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1882,15 +1883,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1900,7 +1901,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2243,23 +2244,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2338,7 +2339,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2353,6 +2354,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2440,11 +2442,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2477,23 +2479,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2502,8 +2492,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3151,15 +3145,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3168,33 +3162,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3203,6 +3197,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3445,10 +3443,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4557,35 +4551,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4699,22 +4693,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4810,11 +4804,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/sv/LC_MESSAGES/django.po b/plinth/locale/sv/LC_MESSAGES/django.po
index 425ec3288..88b6d48c2 100644
--- a/plinth/locale/sv/LC_MESSAGES/django.po
+++ b/plinth/locale/sv/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2016-07-23 19:30+0000\n"
 "Last-Translator: Caly <caly@aktivix.org>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/freedombox/"
@@ -53,33 +53,33 @@ msgstr "Kan inte ansluta till {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Aktivera applikation"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 #, fuzzy
 #| msgid "Invalid domain name"
 msgid "Select a domain name to be used with this application"
 msgstr "Ogiltigt domännamn"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Språkval"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 #, fuzzy
 #| msgid "Language for this web administration interface"
 msgid "Language to use for presenting this web interface"
 msgstr "Språkval för detta administrations-webbgränssnitt"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -583,7 +583,7 @@ msgstr "Aktivera Dynamisk DNS"
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -621,15 +621,17 @@ msgstr ""
 "När aktiverade kommer bloggar och wikis att vara tillgänglig på <a href=\"/"
 "ikiwiki\">/ikiwiki</a>."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Domännamn"
 
@@ -716,49 +718,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Läs mer &raquo;"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Allmän Konfiguration"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Fel inställning av värdnamn: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Värdnamn inställt"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Fel inställning av domännamn: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Domännamn inställt"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "Fel inställning av värdnamn: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Fel inställning av domännamn: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1022,7 +1024,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1047,11 +1049,11 @@ msgstr "Applikationer"
 msgid "User registrations disabled"
 msgstr "Applikationer"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Klient för Dynamisk DNS"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "If your internet provider changes your IP address periodic (i.e. every "
@@ -1067,7 +1069,7 @@ msgstr ""
 "kan det vara svårt för andra att hitta dig på nätet. Då kan ingen hitta de "
 "tjänster som tillhandahålls av %(box_name)s (tex. din ownCloud)."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 #, fuzzy
 #| msgid ""
 #| "The solution is to assign a DNS name to your IP address and update the "
@@ -1093,12 +1095,11 @@ msgstr ""
 "DNS-namn med din nya IP, och om någon från Internet ber om ditt DNS-namn, "
 "kommer han bli skickad till din aktuella IP."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
+#: plinth/modules/dynamicdns/__init__.py:78
 #, fuzzy
-#| msgid "Dynamic DNS Client"
-msgid "Dynamic DNS Service"
-msgstr "Klient för Dynamisk DNS"
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Domännamn"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1469,7 +1470,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -1525,13 +1526,11 @@ msgstr "Service/Port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Aktiverad"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Inaktiverad"
@@ -2088,19 +2087,19 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 #, fuzzy
 #| msgid "Certificates (Let's Encrypt)"
 msgid "Let's Encrypt"
 msgstr "Certifikat (Let's Encrypt)"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 #, fuzzy
 #| msgid "Certificate Status"
 msgid "Certificates"
 msgstr "Certifikatets status"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "A digital certficate allows users of a web service to verify the identity "
@@ -2121,7 +2120,7 @@ msgstr ""
 "domän.  Detta sker genom att den bevisar sig vara ägare till en domän för "
 "Let's Encrypt, en auktoriserad certifikatutfärdare ."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 #, fuzzy
 #| msgid ""
 #| "Let's Encrypt is a free, automated, and open certificate authority, run "
@@ -2516,29 +2515,29 @@ msgid "Address"
 msgstr "Adress"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Maximum players configuration updated"
 msgstr "Konfiguration uppdaterad"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Creative mode configuration updated"
 msgstr "Konfiguration uppdaterad"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "PVP configuration updated"
 msgstr "Konfiguration uppdaterad"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Damage configuration updated"
@@ -2661,7 +2660,7 @@ msgstr "Publicerar nyckeln till nyckelserver..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2680,6 +2679,7 @@ msgstr "GPG Fingeravtryck"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2777,11 +2777,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr "Publicering av nyckel avbruten."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Publicerade nyckeln till nyckelserver."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Fel uppstod när nyckeln publicerades."
 
@@ -2821,23 +2821,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "Namntjänster"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2846,9 +2834,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Inte tillgänglig"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3529,15 +3521,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3546,33 +3538,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3581,6 +3573,12 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "Not Available"
+msgid "PageKite Domain"
+msgstr "Inte tillgänglig"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3825,10 +3823,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4989,35 +4983,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -5133,22 +5127,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -5255,11 +5249,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5825,6 +5819,23 @@ msgstr "Applikationer"
 msgid "Gujarati"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Dynamic DNS Client"
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Klient för Dynamisk DNS"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Inte tillgänglig"
+
 #, fuzzy
 #~| msgid "Certificate successfully revoked for domain {domain}"
 #~ msgid "Certificate renewal management enabled for {domain}."
diff --git a/plinth/locale/ta/LC_MESSAGES/django.po b/plinth/locale/ta/LC_MESSAGES/django.po
index 94da2070e..da56cd2ac 100644
--- a/plinth/locale/ta/LC_MESSAGES/django.po
+++ b/plinth/locale/ta/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,29 +52,29 @@ msgstr ""
 msgid "FreedomBox"
 msgstr ""
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr ""
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr ""
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr ""
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr ""
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr ""
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr ""
 
@@ -527,7 +527,7 @@ msgstr ""
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -558,15 +558,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr ""
 
@@ -642,47 +644,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -917,7 +919,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -938,11 +940,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -950,7 +952,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -961,9 +963,8 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
+#: plinth/modules/dynamicdns/__init__.py:78
+msgid "Dynamic Domain Name"
 msgstr ""
 
 #: plinth/modules/dynamicdns/forms.py:43
@@ -1249,7 +1250,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1292,13 +1293,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1794,15 +1793,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1812,7 +1811,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2155,23 +2154,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2250,7 +2249,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2265,6 +2264,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2352,11 +2352,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2389,23 +2389,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2414,8 +2402,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3063,15 +3055,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3080,33 +3072,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3115,6 +3107,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3357,10 +3353,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4467,35 +4459,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4609,22 +4601,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4720,11 +4712,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/te/LC_MESSAGES/django.po b/plinth/locale/te/LC_MESSAGES/django.po
index 7c6beddc3..d8564d957 100644
--- a/plinth/locale/te/LC_MESSAGES/django.po
+++ b/plinth/locale/te/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-07-22 17:06+0000\n"
 "Last-Translator: Joseph Nuthalapati <joseph.kiran92@gmail.com>\n"
 "Language-Team: Telugu <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -55,29 +55,29 @@ msgstr "అనుసంధానించండం సాధ్యంకాద
 msgid "FreedomBox"
 msgstr "ఫ్రీడమ్‌బాక్స్"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "అనువర్తనాన్ని చేతనించు"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "ఈ అనువర్తనానికి కావలసిన డొమైన్ పేరును ఎంచుకోండి"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr "హెచ్చరిక! డొమైన్ పేరును తరువాత మార్చినచో ఈ అనువర్తనం పనిచేయకపోవచ్చు."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "భాష"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "ఈ జాల అంతరవర్తి కోసం వాడాల్సిన భాష"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "బ్రౌజర్లో ఉన్న భాషాప్రాధాన్యతనే ఉపయోగించు"
 
@@ -591,7 +591,7 @@ msgstr "DNSSEC అమలుచెయ్యి"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "డొమైన్ నేమ్ సిస్టం భద్రతా పొడిగింపు ని ప్రారంభించండి"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -635,15 +635,17 @@ msgstr ""
 "ద్వారా పొందవచ్చు {box_name}.\n"
 "అంగీకార సమాచారం మరియు సిస్టమ్ మార్చడం సామర్ధ్యాలు నిర్వాహక సమూహం చెందిన వినియోగదారులకు పరిమితం."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "ఆకృతీకరణ"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "డొమైను పేరు"
 
@@ -731,49 +733,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr "మరింత తెలుసుకోండి.."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "సాధారణ ఆకృతీకరణ"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "ఆతిథ్యనామం అమర్చుటలో లోపం: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "ఆతిథ్యనామం అమర్చు"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "అధికారక్షేత్రం పేరు అమర్పులోపం: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "అధికారక్షేత్రం పేరు అమర్పు"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "ఆతిథ్యనామం అమర్చుటలో లోపం: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting domain name: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "అధికారక్షేత్రం పేరు అమర్పులోపం: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1027,7 +1029,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1048,11 +1050,11 @@ msgstr "వినియోగదారుల నమోదు అనుమతి
 msgid "User registrations disabled"
 msgstr "కొత్త వినియోగదారుల నమోదు నిలిపివేయబడినది"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "గతిక DNS కక్షిదారు"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1063,7 +1065,7 @@ msgstr ""
 "అప్పుడు ఇతరులు అంతర్జాలంలో మిమల్ని కనుగొనడానికి కష్టం ఆవతుంది. అప్పుడు వారు ఈ {box_name} "
 "అందించే సేవలను కనుగోనలేరు."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1079,10 +1081,11 @@ msgstr ""
 "అనుమతిస్తుంది. తరువాత, సర్వర్ కొత్త IP మీ DNS పేరు కేటాయిస్తుంది, మరియు ఇంటర్నెట్ నుండి ఎవరైనా మీ "
 "DNS పేరు అడుగుతాడు ఉంటే, వారు మీ ప్రస్తుత ఐ.పీ. చిరునామాతో సమాధానం పొందుతారు."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "గతిక DNS క్లైంట్"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "డొమైను పేరు"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1415,7 +1418,7 @@ msgstr "వెబ్ క్లయింట్ ని ప్రారంభిం
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "ఆకృతీకరణ"
 
@@ -1464,13 +1467,11 @@ msgstr "సేవ/పోర్ట్"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "క్రియాశీలం"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "నిలిపివేయబడింది"
@@ -2032,15 +2033,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "జావాస్క్రిప్ట్  లైసెన్స్ సమాచరం"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "లెట్స్ ఎన్క్రిప్ట్"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "యోగ్యతాపత్రాలు"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, fuzzy, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2054,7 +2055,7 @@ msgstr ""
 "కొరకు సెటప్ డిజిటల్ సర్టిఫికెట్లు చేయవచ్చు. ఇది ఎన్క్రిప్ట్ తెలపండి ఒక డొమైన్ యొక్క యజమాని, ధృవపత్ర (CA) "
 "ఉన్నట్లు రుజువు చేసుకుంటూ అవుతున్నారు."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 #, fuzzy
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
@@ -2476,29 +2477,29 @@ msgid "Address"
 msgstr "చిరునామా"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "పోర్టు"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Maximum players configuration updated"
 msgstr "ఆకృతీకరణ నవీకరించబడింది"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Creative mode configuration updated"
 msgstr "ఆకృతీకరణ నవీకరించబడింది"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "PVP configuration updated"
 msgstr "ఆకృతీకరణ నవీకరించబడింది"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 #, fuzzy
 #| msgid "Configuration updated"
 msgid "Damage configuration updated"
@@ -2601,7 +2602,7 @@ msgstr "కీని కీసేవకానికి ప్రచురిస
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "సేవ"
 
@@ -2616,6 +2617,7 @@ msgstr "ఓపెన్‌పిజిపి వేలిముద్ర"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "సెక్యూర్ షెల్"
 
@@ -2705,11 +2707,11 @@ msgstr "కీ దిగుమతి చేయబడింది."
 msgid "Cancelled key publishing."
 msgstr "కీ ప్రచురణ రద్దుచేయబడింది."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "కీ కీసేవకానికి ప్రచురించబడింది."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "కీని ప్రచురించేటప్పుడు దోషం సంభవించింది."
 
@@ -2754,23 +2756,11 @@ msgstr "ప్లంబుల్"
 msgid "Mumblefly"
 msgstr "ముంబుల్ ఫ్లై"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "హెచ్‌టిటిపి"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "హెచ్‌టిటిపియస్"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "ఎస్‌ఎస్‌హెచ్"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "పేరు సేవలు"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2779,9 +2769,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "అందుబాటులో లేదు"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3493,18 +3487,18 @@ msgstr "అమరక పూర్తయ్యింది."
 msgid "Setup failed."
 msgstr "అమరక విఫలమైంది."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 #, fuzzy
 #| msgid "Pagekite"
 msgid "PageKite"
 msgstr "పేజ్ కైట్"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 #, fuzzy
 msgid "Public Visibility"
 msgstr "పబ్లిక్ దృష్టి గోచరత (PageKite)"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, fuzzy, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3516,17 +3510,17 @@ msgstr ""
 "లేనప్పుడు కోసం ఒక వ్యవస్థ. మీ {box_name} 2 సేవలు ఇంటర్నెట్ మిగిలిన నుండి అందుబాటులో ఉంటే మీరు "
 "మాత్రమే ఈ అవసరం. ఈ క్రింది సందర్భాలలో కలిగి:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, fuzzy, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{Box_name} 1 నిరోధిత ఫైర్వాల్ వెనుక ఉంది."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, fuzzy, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr "{Box_name} 1 మీరు నియంత్రించే లేని ఒక (వైర్లెస్) రౌటర్ అనుసంధానించబడిన."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 #, fuzzy
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
@@ -3535,7 +3529,7 @@ msgstr ""
 "మీ ISP మీరు ఒక బాహ్య IP చిరునామా అందించడం లేదు మరియు బదులుగా NAT ద్వారా ఇంటర్నెట్ కనెక్షన్ "
 "అందిస్తుంది."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 #, fuzzy
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
@@ -3544,12 +3538,12 @@ msgstr ""
 "మీ ISP మీరు స్టాటిక్ IP చిరునామా అందించడం లేదు మరియు మీ IP చిరునామా మీరు ఇంటర్నెట్ కు కనెక్ట్ ప్రతి "
 "సమయ మార్పులు."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 #, fuzzy
 msgid "Your ISP limits incoming connections."
 msgstr "మీ ISP ఇన్కమింగ్ కనెక్షన్లను పరిమితం చేస్తుంది."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3562,6 +3556,11 @@ msgstr ""
 "ఉపయోగించడానికి 3 సాధ్యం కావచ్చు ఉదాహరణకు <a href=\"https://pagekite.net\">pagekite."
 "net</a> కోసం, ఏ pagekite సేవా ప్రదాత ఉపయోగించవచ్చు."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+msgid "PageKite Domain"
+msgstr "PageKite ఖాతా"
+
 #: plinth/modules/pagekite/forms.py:69
 #, fuzzy
 msgid "Enable PageKite"
@@ -3835,10 +3834,6 @@ msgstr ""
 "SSH క్లైంట్ సెటప్ చూడండి <a href=\"https://pagekite.net/wiki/Howto/SshOverPageKite/"
 "\"> సూచనలు </a>"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "పేజ్ కైట్"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "ప్రామాణిక సేవలు"
@@ -5111,37 +5106,37 @@ msgstr ""
 "html.en\"> టార్  బ్రౌజర్ </a> ను ఉపయోగించాలని సిఫార్సు చేస్తున్నారు."
 
 #: plinth/modules/tor/__init__.py:80
+msgid "Tor Hidden Service"
+msgstr "దాచిన టార్ సర్వీస్"
+
+#: plinth/modules/tor/__init__.py:84
 #, fuzzy
 #| msgid "Socks5 Proxy"
 msgid "Tor Socks Proxy"
 msgstr "సాక్స్5 ప్రాక్సీ"
 
-#: plinth/modules/tor/__init__.py:84
+#: plinth/modules/tor/__init__.py:88
 msgid "Tor Bridge Relay"
 msgstr "టార్ బ్రిడ్జ్ రిలే"
 
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
-msgid "Tor Hidden Service"
-msgstr "దాచిన టార్ సర్వీస్"
-
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "టార్ రిలే పోర్ట్ అందుబాటులో ఉంది"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3 రవాణా నమోదు చేయబడింది"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4 రవాణా నమోదు చేయబడింది"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "టార్ ద్వారా {kind} లో {url} ను ఆక్సెస్ చెయ్యండి"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "టోర్ వాడుకను నిర్ధారించండి{url} టీ సి పి పై{kind}"
@@ -5269,11 +5264,11 @@ msgstr "దాగిన సేవ"
 msgid "Ports"
 msgstr "పోర్ట్స్"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "రిలే"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5282,11 +5277,11 @@ msgstr ""
 "మీ %(box_name)s లు రౌటర్ లేదా ఫైర్వాల్ వెనుక ఉంటే, మీరు ఈ క్రింది పోర్టులు తెరిచి ఉన్నారని "
 "నిర్ధారించుకోండి మరియు అవసరమైతే పోర్ట్-ఫార్వార్డ్ చేయబడిందని నిర్ధారించుకోండి:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "సాక్స్‌లు"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "టిసిపి  పోర్ట్ 9050 పై ఒక టార్ సొక్స్ పోర్ట్ మీ %(box_name)sలో అందుబాటులో ఉంది."
@@ -5400,11 +5395,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5963,6 +5958,24 @@ msgstr "అనువర్తనం ఆమోదింపబడలేదు"
 msgid "Gujarati"
 msgstr ""
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "గతిక DNS క్లైంట్"
+
+#~ msgid "HTTP"
+#~ msgstr "హెచ్‌టిటిపి"
+
+#~ msgid "HTTPS"
+#~ msgstr "హెచ్‌టిటిపియస్"
+
+#~ msgid "SSH"
+#~ msgstr "ఎస్‌ఎస్‌హెచ్"
+
+#~ msgid "Not Available"
+#~ msgstr "అందుబాటులో లేదు"
+
+#~ msgid "Pagekite"
+#~ msgstr "పేజ్ కైట్"
+
 #, fuzzy
 #~| msgid "Create Snapshot"
 #~ msgid "Create new repository"
diff --git a/plinth/locale/tr/LC_MESSAGES/django.po b/plinth/locale/tr/LC_MESSAGES/django.po
index e0b8e1f2f..5d382abf3 100644
--- a/plinth/locale/tr/LC_MESSAGES/django.po
+++ b/plinth/locale/tr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-08-08 00:22+0000\n"
 "Last-Translator: Mesut Akcan <makcan@gmail.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/freedombox/"
@@ -52,15 +52,15 @@ msgstr "{host}:{port} konumuna bağlanılamadı"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Uygulamayı etkinleştir"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Bu uygulamayla kullanılacak bir alan ismi seç"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -68,15 +68,15 @@ msgstr ""
 "İkaz! Alan adı daha sonra değiştirilirse uygulama beklendiği gibi "
 "çalışmayabilir."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Lisan"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Bu web yönetim arayüzü için kullanılacak dil"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Tarayıcıda ayarlanan dil tercihini kullanın"
 
@@ -564,7 +564,7 @@ msgstr "Dinamik DNSSEC'i Etkinleştir"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "Alan Adı Sistemi Güvenlik Uzantılarını Etkinleştir"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -610,15 +610,17 @@ msgstr ""
 "kullanılabilir. Hassas bilgiler ve sistem değiştirme kabiliyeti, yönetici "
 "(yani admin) grubuna ait kullanıcılar ile sınırlıdır."
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Yapılandır"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Alan Adı"
 
@@ -704,47 +706,47 @@ msgstr ""
 msgid "Learn more..."
 msgstr "Daha fazla bilgi edin..."
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Genel Yapılandırma"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Makine isminin ayarlanmasında hata: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "Makine ismi ayarlandı"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Alan adının ayarlanmasında hata: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "Alan adı ayarlandı"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "Web sunucusu ana sayfasını ayarlama hatası: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr "Gelişmiş mod değiştirilirken hata oluştu: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -1003,7 +1005,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -1024,11 +1026,11 @@ msgstr "Kullanıcı kayıtları etkinleştirildi"
 msgid "User registrations disabled"
 msgstr "Kullanıcı kayıtları devre dışı bırakıldı"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "Dinamik DNS istemcisi"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -1040,7 +1042,7 @@ msgstr ""
 "zorlanabilir. Ve bu sebeple kimse sizin ownCloud'unuz gibi {box_name} "
 "tarafından sunulan servisleri bulamayabilir."
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1057,10 +1059,11 @@ msgstr ""
 "sunucu DNS isminizi yeni IP adresi ile ilişkilendirecek ve İnternet'te "
 "birisi DNS isminizi sorguladığında güncel IP adresinizi elde edebilecektir."
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr "Dinamik DNS Servisi"
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Alan Adı"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1410,7 +1413,7 @@ msgstr "Ağ istemcisini başlat"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "Yapılandırma"
 
@@ -1462,13 +1465,11 @@ msgstr "Servis/Port"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "Etkin"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "Devre dışı"
@@ -2052,15 +2053,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr "JavaScript lisans bilgileri"
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr "Sertifikalar"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -2076,7 +2077,7 @@ msgstr ""
 "bir sertifika otoritesi (Certificate Authority, CA) olan Let's Encrypt'e "
 "ispatlayarak yapar."
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2506,23 +2507,23 @@ msgid "Address"
 msgstr "Adres"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "Port"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "Azami oyuncu sayısı yapılandırması güncellendi"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "Yaratıcı kip kurulumu güncellendi"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "PVP kurulumu güncellendi"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "Zarar verme kurulumu güncellendi"
 
@@ -2626,7 +2627,7 @@ msgstr "Anahtar, anahtar sunucusuna yayınlanıyor..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "Servis"
 
@@ -2641,6 +2642,7 @@ msgstr "OpenPGP Parmak izi"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "Güvenli Kabuk"
 
@@ -2731,11 +2733,11 @@ msgstr "Anahtar içe aktarıldı."
 msgid "Cancelled key publishing."
 msgstr "Anahtar yayını iptal edildi."
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "Anahtar, anahtar sunucusuna yayınlandı."
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "Anahtarın yayınlanmasında bir hata meydana geldi."
 
@@ -2773,23 +2775,11 @@ msgstr "Plumble"
 msgid "Mumblefly"
 msgstr "Mumblefly"
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "İsim Servisleri"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2798,9 +2788,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "Mevcut değil"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3515,15 +3509,15 @@ msgstr "Kurulum tamamlandı."
 msgid "Setup failed."
 msgstr "Kurulum başarısız oldu."
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr "PageKite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr "Herkese Açık Görünülürlük"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3535,19 +3529,19 @@ msgstr ""
 "erişmek için bir sistemdir. Buna sadece {box_name} servislerine İnternet'ten "
 "erişmek mümkün değilse ihtiyaç duyarsınız. Bu, şu durumları kapsar:"
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} kısıtlı bir güvenlik duvarının arkasında olduğunda."
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 "{box_name} kontrolünüzde olmayan bir (kablosuz) yönlendiriciye bağlı "
 "olduğunda."
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
@@ -3555,7 +3549,7 @@ msgstr ""
 "İnternet Erişim Sağlayıcınız size harici bir IP adresi sunmadığında ve bunun "
 "yerine İnternet bağlantısını NAT vasıtasıyla sağladığında."
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 #, fuzzy
 #| msgid ""
 #| "Your ISP does not provide you a static IP address and your IP address "
@@ -3567,11 +3561,11 @@ msgstr ""
 "İnternet Erişim Sağlayıcınız size statik bir IP adresi sağlamadığında ve IP "
 "adresiniz İnternet'e her bağlandığınızda değiştiğinde."
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "İnternet Erişim Sağlayıcınız içeri gelen bağlantıları kısıtladığında."
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3585,6 +3579,12 @@ msgstr ""
 "pagekite.net\">pagekite.net</a>. Gelecekte bunun için arkadaşlarınızın "
 "{box_name} kutusunu kullanmanız mümkün olacaktır."
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PageKite Hesabı"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "PageKite'ı Etkinleştir"
@@ -3846,10 +3846,6 @@ msgstr ""
 "SSH istemci kurulum <a href=\"https://pagekite.net/wiki/Howto/"
 "SshOverPageKite/\">talimatlarını</a> okuyun"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pagekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "Standart Servisler"
@@ -5208,37 +5204,37 @@ msgstr ""
 "Tarayıcısını</a> kullanmanızı tavsiye eder."
 
 #: plinth/modules/tor/__init__.py:80
+msgid "Tor Hidden Service"
+msgstr "Tor Gizli Servisi"
+
+#: plinth/modules/tor/__init__.py:84
 #, fuzzy
 #| msgid "Socks5 Proxy"
 msgid "Tor Socks Proxy"
 msgstr "Socks5 Vekil Sunucusu"
 
-#: plinth/modules/tor/__init__.py:84
+#: plinth/modules/tor/__init__.py:88
 msgid "Tor Bridge Relay"
 msgstr "Tor Köprü Aktarması"
 
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
-msgid "Tor Hidden Service"
-msgstr "Tor Gizli Servisi"
-
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Tor geçit portu mevcuttur"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "Obfs3 taşıma kayıtlıdır"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "Obfs4 taşıma kayıtlıdır"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "{url} bağlantısına tcp{kind} üzerinden Tor vasıtasıyla eriş"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "tcp{kind} üzerinden {url} konumunda Tor kullanımını teyit et"
@@ -5373,11 +5369,11 @@ msgstr "Gizli Servis"
 msgid "Ports"
 msgstr "Portlar"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "Aktarıcı"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5387,11 +5383,11 @@ msgstr ""
 "gerekiyorsa aşağıdaki bağlantı noktalarının (port) açık ve yönlendirilmiş "
 "olduğundan emin olun:"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -5522,7 +5518,7 @@ msgstr ""
 #| "temporarily unavailable and show an error.  Refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "Kurulacak paket sayısına göre bunun tamamlanması uzun bir süre alabilir. "
@@ -5530,7 +5526,7 @@ msgstr ""
 "Yükseltme sırasında bu ağ arayüzüne geçici olarak erişim mümkün olmayabilir "
 "ve bir hata gösterebilir. Devam etmek için sayfayı tazeleyin."
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -6123,6 +6119,24 @@ msgstr "Uygulama devre dışı bırakıldı"
 msgid "Gujarati"
 msgstr ""
 
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "Dinamik DNS Servisi"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "Mevcut değil"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pagekite"
+
 #~ msgid "Create new repository"
 #~ msgstr "Yeni depo oluştur"
 
diff --git a/plinth/locale/uk/LC_MESSAGES/django.po b/plinth/locale/uk/LC_MESSAGES/django.po
index 5daa5ede2..ac466cf56 100644
--- a/plinth/locale/uk/LC_MESSAGES/django.po
+++ b/plinth/locale/uk/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-01-04 17:06+0000\n"
 "Last-Translator: prolinux ukraine <prolinux@ukr.net>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/freedombox/"
@@ -54,15 +54,15 @@ msgstr "Неможливо підключитись до {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "Влючити застосунок"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "Оберіть ім’я домену, яке буде використовуватись з цим застосунком"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
@@ -70,15 +70,15 @@ msgstr ""
 "Попередження! Застосунок може працювати не правильно, якщо  пізніше буде "
 "змінено ім’я домену."
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "Мова"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "Мова, яка використана для надання даного веб-інтерфейсу"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "Використовувати мовні налаштування браузера"
 
@@ -567,7 +567,7 @@ msgstr "Увімкнути DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr ""
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -598,15 +598,17 @@ msgid ""
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Налаштувати"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "Доменне ім’я"
 
@@ -682,49 +684,49 @@ msgstr ""
 msgid "Learn more..."
 msgstr ""
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "Загальні налаштування"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Помилка параметру hostname: {exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error setting webserver home page: {exception}"
 msgstr "Помилка параметру hostname: {exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr ""
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, fuzzy, python-brace-format
 #| msgid "Error setting hostname: {exception}"
 msgid "Error changing advanced mode: {exception}"
 msgstr "Помилка параметру hostname: {exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr ""
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr ""
 
@@ -961,7 +963,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -982,11 +984,11 @@ msgstr ""
 msgid "User registrations disabled"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -994,7 +996,7 @@ msgid ""
 "prevent others from finding services which are provided by this {box_name}."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1005,10 +1007,11 @@ msgid ""
 "IP address."
 msgstr ""
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
-msgid "Dynamic DNS Service"
-msgstr ""
+#: plinth/modules/dynamicdns/__init__.py:78
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "Доменне ім’я"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1293,7 +1296,7 @@ msgstr ""
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr ""
 
@@ -1336,13 +1339,11 @@ msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr ""
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr ""
@@ -1840,15 +1841,15 @@ msgstr ""
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 msgid "Let's Encrypt"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 msgid "Certificates"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1858,7 +1859,7 @@ msgid ""
 "Encrypt, a certificate authority (CA)."
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2201,23 +2202,23 @@ msgid "Address"
 msgstr ""
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr ""
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr ""
 
@@ -2296,7 +2297,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr ""
 
@@ -2311,6 +2312,7 @@ msgstr ""
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr ""
 
@@ -2398,11 +2400,11 @@ msgstr ""
 msgid "Cancelled key publishing."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr ""
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr ""
 
@@ -2435,23 +2437,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr ""
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2460,8 +2450,12 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
 msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
@@ -3109,15 +3103,15 @@ msgstr ""
 msgid "Setup failed."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 msgid "PageKite"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 msgid "Public Visibility"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3126,33 +3120,33 @@ msgid ""
 "following situations:"
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 msgid ""
 "Your ISP does not provide you a static IP address and your IP address "
 "changes every time you connect to Internet."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr ""
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3161,6 +3155,10 @@ msgid ""
 "future it might be possible to use your buddy's {box_name} for this."
 msgstr ""
 
+#: plinth/modules/pagekite/__init__.py:96
+msgid "PageKite Domain"
+msgstr ""
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr ""
@@ -3403,10 +3401,6 @@ msgid ""
 "SshOverPageKite/\">instructions</a>"
 msgstr ""
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr ""
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr ""
@@ -4515,35 +4509,35 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr ""
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr ""
@@ -4657,22 +4651,22 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr ""
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr ""
@@ -4768,11 +4762,11 @@ msgstr ""
 #: plinth/modules/upgrades/templates/upgrades.html:57
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
diff --git a/plinth/locale/zh_Hans/LC_MESSAGES/django.po b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
index 7af731563..b496c4cf3 100644
--- a/plinth/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Plinth\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-29 18:38-0400\n"
+"POT-Creation-Date: 2019-08-12 19:14-0400\n"
 "PO-Revision-Date: 2019-08-11 14:23+0000\n"
 "Last-Translator: ZeroAurora <zeroaurora@qq.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -53,29 +53,29 @@ msgstr "不能连接到主机 {host}:{port}"
 msgid "FreedomBox"
 msgstr "FreedomBox"
 
-#: plinth/forms.py:39
+#: plinth/forms.py:38
 msgid "Enable application"
 msgstr "启用应用程序"
 
-#: plinth/forms.py:52
+#: plinth/forms.py:54
 msgid "Select a domain name to be used with this application"
 msgstr "选择要与此应用程序一起使用的域名"
 
-#: plinth/forms.py:54
+#: plinth/forms.py:56
 msgid ""
 "Warning! The application may not work properly if domain name is changed "
 "later."
 msgstr "警告！如果以后更改了域名, 应用程序可能无法正常工作。"
 
-#: plinth/forms.py:62
+#: plinth/forms.py:64
 msgid "Language"
 msgstr "语言"
 
-#: plinth/forms.py:63
+#: plinth/forms.py:65
 msgid "Language to use for presenting this web interface"
 msgstr "此 web 管理界面的语言"
 
-#: plinth/forms.py:70
+#: plinth/forms.py:72
 msgid "Use the language preference set in the browser"
 msgstr "使用浏览器中设置的语言首选项"
 
@@ -330,8 +330,8 @@ msgid ""
 "To restore a backup on a new %(box_name)s you need the ssh credentials and, "
 "if chosen, the encryption passphrase."
 msgstr ""
-"这个存储库的凭证存储在您的 %(box_name)s。<br />要在新的 %(box_name)s 中恢复备份，你需要这个 ssh "
-"凭证，如果当时选择了加密，则也需要密码。"
+"这个存储库的凭证存储在您的 %(box_name)s。<br />要在新的 %(box_name)s 中恢复备"
+"份，你需要这个 ssh 凭证，如果当时选择了加密，则也需要密码。"
 
 #: plinth/modules/backups/templates/backups_repository_add.html:43
 msgid "Create Location"
@@ -398,7 +398,9 @@ msgstr "注意："
 msgid ""
 "You have %(max_filesize)s available to restore a backup. Exceeding this "
 "limit can leave your %(box_name)s unusable."
-msgstr "您有 %(max_filesize)s 的可用空间来恢复备份。超出此大小将会使您的 %(box_name)s 不可用。"
+msgstr ""
+"您有 %(max_filesize)s 的可用空间来恢复备份。超出此大小将会使您的 "
+"%(box_name)s 不可用。"
 
 #: plinth/modules/backups/templates/backups_upload.html:54
 msgid "Upload file"
@@ -413,7 +415,9 @@ msgid ""
 "Run the following command on the SSH host machine. The output should match "
 "one of the provided options. You can also use dsa, ecdsa, ed25519 etc. "
 "instead of rsa, by choosing the corresponding file."
-msgstr "请在 SSH 主机上运行下面的命令。输出应该和提供的选项之一相符。您也可以选择相对应的文件来使用 dsa、ecdsa、ed25519 等。"
+msgstr ""
+"请在 SSH 主机上运行下面的命令。输出应该和提供的选项之一相符。您也可以选择相对"
+"应的文件来使用 dsa、ecdsa、ed25519 等。"
 
 #: plinth/modules/backups/templates/verify_ssh_hostkey.html:59
 msgid "Verify Host"
@@ -515,7 +519,9 @@ msgstr "域名服务器"
 msgid ""
 "BIND enables you to publish your Domain Name System (DNS) information on the "
 "Internet, and to resolve DNS queries for your user devices on your network."
-msgstr "BIND 使您能够在网络上发布您的域名系统（DNS）信息，并解决您网络上用户设备的 DNS 查询。"
+msgstr ""
+"BIND 使您能够在网络上发布您的域名系统（DNS）信息，并解决您网络上用户设备的 "
+"DNS 查询。"
 
 #: plinth/modules/bind/__init__.py:49
 #, python-brace-format
@@ -524,7 +530,8 @@ msgid ""
 "machines on local network. It is also incompatible with sharing Internet "
 "connection from {box_name}."
 msgstr ""
-"目前，在 {box_name} 上，BIND 只用于解决本地网络其它机器的 DNS 查询。它也不适用于从 {box_name} 分享来的互联网连接。"
+"目前，在 {box_name} 上，BIND 只用于解决本地网络其它机器的 DNS 查询。它也不适"
+"用于从 {box_name} 分享来的互联网连接。"
 
 #: plinth/modules/bind/forms.py:37
 msgid "Forwarders"
@@ -543,7 +550,7 @@ msgstr "启用 DNSSEC"
 msgid "Enable Domain Name System Security Extensions"
 msgstr "启用域名系统安全扩展（DNSSEC）"
 
-#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:172
+#: plinth/modules/bind/views.py:59 plinth/modules/dynamicdns/views.py:169
 #: plinth/modules/openvpn/views.py:146 plinth/modules/shadowsocks/views.py:79
 #: plinth/modules/transmission/views.py:74
 msgid "Configuration updated"
@@ -565,8 +572,9 @@ msgid ""
 "advanced functions that are not usually required. A web based terminal for "
 "console operations is also available."
 msgstr ""
-"Cockpit 是一个服务器管理器，它使得在浏览器内管理 GNU/Linux 服务器很容易。在一个 {box_name} "
-"上，许多通常不会需要的高级功能也可被控制。您也可以使用基于网页的终端来进行控制台操作。"
+"Cockpit 是一个服务器管理器，它使得在浏览器内管理 GNU/Linux 服务器很容易。在一"
+"个 {box_name} 上，许多通常不会需要的高级功能也可被控制。您也可以使用基于网页"
+"的终端来进行控制台操作。"
 
 #: plinth/modules/cockpit/__init__.py:54
 #, python-brace-format
@@ -575,18 +583,21 @@ msgid ""
 "_cockpit/</a> path on the web server. It can be accessed by <a href="
 "\"{users_url}\">any user</a> on {box_name} belonging to the admin group."
 msgstr ""
-"启用以后，Cockpit 将可从网页服务器的 <a href=\"/_cockpit/\">/_cockpit/</a> 路径访问。它将能被该 "
-"{box_name} 上任何属于 admin 组的<a href=\"{users_url}\">用户</a>访问。"
+"启用以后，Cockpit 将可从网页服务器的 <a href=\"/_cockpit/\">/_cockpit/</a> 路"
+"径访问。它将能被该 {box_name} 上任何属于 admin 组的<a href=\"{users_url}\">用"
+"户</a>访问。"
 
-#: plinth/modules/config/__init__.py:61 plinth/modules/dynamicdns/views.py:45
+#: plinth/modules/config/__init__.py:60 plinth/modules/dynamicdns/views.py:45
 #: plinth/modules/i2p/views.py:31 plinth/modules/ikiwiki/views.py:35
+#: plinth/modules/names/templates/names.html:44
+#: plinth/modules/names/templates/names.html:58
 #: plinth/modules/pagekite/views.py:36 plinth/modules/snapshot/views.py:40
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "配置"
 
-#: plinth/modules/config/__init__.py:168 plinth/modules/config/forms.py:77
-#: plinth/modules/config/views.py:171 plinth/modules/dynamicdns/forms.py:111
+#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:77
+#: plinth/modules/dynamicdns/forms.py:111
 msgid "Domain Name"
 msgstr "域名"
 
@@ -651,9 +662,10 @@ msgid ""
 "is set to something other than {box_name} Service (Plinth), your users must "
 "explicitly type /plinth or /freedombox to reach {box_name} Service (Plinth)."
 msgstr ""
-"选择别人访问您的 {box_name} 时需要看到的默认页面。一个典型用法是，您可以选择您的博客或者 Wiki 来作为别人访问域名时的首页。请注意，"
-"一旦首页设置到了 {box_name} 服务（Plinth）之外的其它地方，您的用户必须明确输入 /plinth 或 /freedombox 来访问 "
-"{box_name} 服务（Plinth）。"
+"选择别人访问您的 {box_name} 时需要看到的默认页面。一个典型用法是，您可以选择"
+"您的博客或者 Wiki 来作为别人访问域名时的首页。请注意，一旦首页设置到了 "
+"{box_name} 服务（Plinth）之外的其它地方，您的用户必须明确输入 /plinth 或 /"
+"freedombox 来访问 {box_name} 服务（Plinth）。"
 
 #: plinth/modules/config/forms.py:107
 msgid "Show advanced apps and features"
@@ -672,47 +684,47 @@ msgstr "展示需要更多专业知识的应用和特点。"
 msgid "Learn more..."
 msgstr "了解更多……"
 
-#: plinth/modules/config/views.py:55
+#: plinth/modules/config/views.py:54
 msgid "General Configuration"
 msgstr "常规配置"
 
-#: plinth/modules/config/views.py:79
+#: plinth/modules/config/views.py:78
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "设置主机名错误：{exception}"
 
-#: plinth/modules/config/views.py:82
+#: plinth/modules/config/views.py:81
 msgid "Hostname set"
 msgstr "主机名设置"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:89
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "设置域名错误：{exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:92
 msgid "Domain name set"
 msgstr "域名集"
 
-#: plinth/modules/config/views.py:101
+#: plinth/modules/config/views.py:100
 #, python-brace-format
 msgid "Error setting webserver home page: {exception}"
 msgstr "设置主机名错误：{exception}"
 
-#: plinth/modules/config/views.py:104
+#: plinth/modules/config/views.py:103
 msgid "Webserver home page set"
 msgstr "网页服务器主页已设置"
 
-#: plinth/modules/config/views.py:112
+#: plinth/modules/config/views.py:111
 #, python-brace-format
 msgid "Error changing advanced mode: {exception}"
 msgstr "更改为高级模式时错误：{exception}"
 
-#: plinth/modules/config/views.py:117
+#: plinth/modules/config/views.py:116
 msgid "Showing advanced apps and features"
 msgstr "展现先进的应用和特征"
 
-#: plinth/modules/config/views.py:120
+#: plinth/modules/config/views.py:119
 msgid "Hiding advanced apps and features"
 msgstr "隐藏先进的应用和特征"
 
@@ -729,7 +741,9 @@ msgid ""
 "Coquelicot is a “one-click” file sharing web application with a focus on "
 "protecting users’ privacy. It is best used for quickly sharing a single "
 "file. "
-msgstr "Coquelicot 是一个“即点即用”的文件分享应用，注重保护用户隐私。适宜快速分享单个文件。 "
+msgstr ""
+"Coquelicot 是一个“即点即用”的文件分享应用，注重保护用户隐私。适宜快速分享单个"
+"文件。 "
 
 #: plinth/modules/coquelicot/__init__.py:48
 msgid ""
@@ -952,7 +966,7 @@ msgstr ""
 #: plinth/modules/snapshot/templates/snapshot.html:30
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:51
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:58
-#: plinth/modules/tor/templates/tor.html:96
+#: plinth/modules/tor/templates/tor.html:94
 #: plinth/modules/upgrades/templates/upgrades_configure.html:32
 #: plinth/templates/app.html:89
 msgid "Update setup"
@@ -977,11 +991,11 @@ msgstr "应用程序已启用"
 msgid "User registrations disabled"
 msgstr "应用程序已禁用"
 
-#: plinth/modules/dynamicdns/__init__.py:41
+#: plinth/modules/dynamicdns/__init__.py:40
 msgid "Dynamic DNS Client"
 msgstr "动态 DNS 客户端"
 
-#: plinth/modules/dynamicdns/__init__.py:45
+#: plinth/modules/dynamicdns/__init__.py:44
 #, python-brace-format
 msgid ""
 "If your Internet provider changes your IP address periodically (i.e. every "
@@ -991,7 +1005,7 @@ msgstr ""
 "如果您的互联网提供商定期（例如每24小时）更改您的IP地址，其他人可能很难在互联"
 "网上找到您。这会阻止其他人找到由此 {box_name} 提供的服务。"
 
-#: plinth/modules/dynamicdns/__init__.py:49
+#: plinth/modules/dynamicdns/__init__.py:48
 msgid ""
 "The solution is to assign a DNS name to your IP address and update the DNS "
 "name every time your IP is changed by your Internet provider. Dynamic DNS "
@@ -1007,12 +1021,11 @@ msgstr ""
 "将您的 DNS 名称分配给新的 IP，如果互联网上的某人要求您的 DNS 名称，他们将收到"
 "一个带有您当前 IP 地址的响应。"
 
-#: plinth/modules/dynamicdns/__init__.py:89
-#: plinth/modules/dynamicdns/views.py:169
+#: plinth/modules/dynamicdns/__init__.py:78
 #, fuzzy
-#| msgid "Dynamic DNS Client"
-msgid "Dynamic DNS Service"
-msgstr "动态 DNS 客户端"
+#| msgid "Domain Name"
+msgid "Dynamic Domain Name"
+msgstr "域名"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1334,7 +1347,7 @@ msgstr "启动 web 客户端"
 #: plinth/modules/openvpn/templates/openvpn.html:123
 #: plinth/modules/snapshot/templates/snapshot.html:27
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:43
-#: plinth/modules/tor/templates/tor.html:88 plinth/templates/app.html:81
+#: plinth/modules/tor/templates/tor.html:86 plinth/templates/app.html:81
 msgid "Configuration"
 msgstr "配置"
 
@@ -1382,13 +1395,11 @@ msgstr "服务/端口"
 
 #: plinth/modules/firewall/templates/firewall.html:63
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:89
-#: plinth/modules/names/templates/names.html:47
 msgid "Enabled"
 msgstr "启用"
 
 #: plinth/modules/firewall/templates/firewall.html:66
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
-#: plinth/modules/names/templates/names.html:49
 #: plinth/modules/networks/forms.py:69 plinth/templates/cards.html:49
 msgid "Disabled"
 msgstr "已禁用"
@@ -1971,19 +1982,19 @@ msgstr "JSXC 是一个 XMPP 网页客户端，主要用于连接本地 XMPP 服
 msgid "JavaScript license information"
 msgstr ""
 
-#: plinth/modules/letsencrypt/__init__.py:47
+#: plinth/modules/letsencrypt/__init__.py:46
 #, fuzzy
 #| msgid "Certificates (Let's Encrypt)"
 msgid "Let's Encrypt"
 msgstr "证书（Let's Encrypt）"
 
-#: plinth/modules/letsencrypt/__init__.py:49
+#: plinth/modules/letsencrypt/__init__.py:48
 #, fuzzy
 #| msgid "Certificate Status"
 msgid "Certificates"
 msgstr "证书状态"
 
-#: plinth/modules/letsencrypt/__init__.py:53
+#: plinth/modules/letsencrypt/__init__.py:52
 #, python-brace-format
 msgid ""
 "A digital certificate allows users of a web service to verify the identity "
@@ -1996,7 +2007,7 @@ msgstr ""
 "动获取和设置每个可用域名的数字证书。它通过向 Let's Encrypt 证明自己是一个域名"
 "的所有者。Let's Encrypt 是一个证书颁发机构（CA）。"
 
-#: plinth/modules/letsencrypt/__init__.py:59
+#: plinth/modules/letsencrypt/__init__.py:58
 msgid ""
 "Let's Encrypt is a free, automated, and open certificate authority, run for "
 "the public's benefit by the Internet Security Research Group (ISRG).  Please "
@@ -2415,23 +2426,23 @@ msgid "Address"
 msgstr "地址"
 
 #: plinth/modules/minetest/templates/minetest.html:33
-#: plinth/modules/tor/templates/tor.html:114
+#: plinth/modules/tor/templates/tor.html:112
 msgid "Port"
 msgstr "端口"
 
-#: plinth/modules/minetest/views.py:72
+#: plinth/modules/minetest/views.py:70
 msgid "Maximum players configuration updated"
 msgstr "最大玩家配置已更新"
 
-#: plinth/modules/minetest/views.py:79
+#: plinth/modules/minetest/views.py:77
 msgid "Creative mode configuration updated"
 msgstr "创意模式配置已更新"
 
-#: plinth/modules/minetest/views.py:85
+#: plinth/modules/minetest/views.py:83
 msgid "PVP configuration updated"
 msgstr "玩家对战（PVP）配置已更新"
 
-#: plinth/modules/minetest/views.py:91
+#: plinth/modules/minetest/views.py:89
 msgid "Damage configuration updated"
 msgstr "伤害配置已更新"
 
@@ -2529,7 +2540,7 @@ msgstr "正在发布密钥到密钥服务器..."
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:75
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:55
-#: plinth/modules/tor/templates/tor.html:113
+#: plinth/modules/tor/templates/tor.html:111
 msgid "Service"
 msgstr "服务"
 
@@ -2544,6 +2555,7 @@ msgstr "OpenPGP 指纹"
 
 #: plinth/modules/monkeysphere/templates/monkeysphere.html:86
 #: plinth/modules/monkeysphere/templates/monkeysphere_details.html:58
+#: plinth/modules/names/components.py:39
 msgid "Secure Shell"
 msgstr "安全 Shell"
 
@@ -2633,11 +2645,11 @@ msgstr "已导入密钥。"
 msgid "Cancelled key publishing."
 msgstr "已取消的密钥发布。"
 
-#: plinth/modules/monkeysphere/views.py:149
+#: plinth/modules/monkeysphere/views.py:146
 msgid "Published key to keyserver."
 msgstr "已发布到密钥服务器的密钥。"
 
-#: plinth/modules/monkeysphere/views.py:151
+#: plinth/modules/monkeysphere/views.py:148
 msgid "Error occurred while publishing key."
 msgstr "发布密钥时出现错误。"
 
@@ -2678,23 +2690,11 @@ msgstr ""
 msgid "Mumblefly"
 msgstr ""
 
-#: plinth/modules/names/__init__.py:33
-msgid "HTTP"
-msgstr "HTTP"
-
-#: plinth/modules/names/__init__.py:34
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: plinth/modules/names/__init__.py:35
-msgid "SSH"
-msgstr "SSH"
-
-#: plinth/modules/names/__init__.py:42
+#: plinth/modules/names/__init__.py:37
 msgid "Name Services"
 msgstr "名称服务"
 
-#: plinth/modules/names/__init__.py:53
+#: plinth/modules/names/__init__.py:45
 #, python-brace-format
 msgid ""
 "Name Services provides an overview of the ways {box_name} can be reached "
@@ -2703,9 +2703,13 @@ msgid ""
 "enabled or disabled for incoming connections through the given name."
 msgstr ""
 
-#: plinth/modules/names/views.py:50
-msgid "Not Available"
-msgstr "不可用"
+#: plinth/modules/names/components.py:27
+msgid "All"
+msgstr ""
+
+#: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
+msgid "All web apps"
+msgstr ""
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3393,19 +3397,19 @@ msgstr "安装已完成。"
 msgid "Setup failed."
 msgstr "安装失败。"
 
-#: plinth/modules/pagekite/__init__.py:46
+#: plinth/modules/pagekite/__init__.py:47
 #, fuzzy
 #| msgid "Pagekite"
 msgid "PageKite"
 msgstr "Pagekite"
 
-#: plinth/modules/pagekite/__init__.py:48
+#: plinth/modules/pagekite/__init__.py:49
 #, fuzzy
 #| msgid "Public Visibility (PageKite)"
 msgid "Public Visibility"
 msgstr "公开可见性（PageKite）"
 
-#: plinth/modules/pagekite/__init__.py:52
+#: plinth/modules/pagekite/__init__.py:53
 #, python-brace-format
 msgid ""
 "PageKite is a system for exposing {box_name} services when you don't have a "
@@ -3416,23 +3420,23 @@ msgstr ""
 "PageKite 是一种在您没有直接连接到互联网时暴露 {box_name} 服务的系统。 如果您"
 "的 {box_name} 服务无法从互联网访问，您只需要设置 PageKite。这包括以下情况："
 
-#: plinth/modules/pagekite/__init__.py:58
+#: plinth/modules/pagekite/__init__.py:59
 #, python-brace-format
 msgid "{box_name} is behind a restricted firewall."
 msgstr "{box_name} 位于受限的防火墙的后面。"
 
-#: plinth/modules/pagekite/__init__.py:61
+#: plinth/modules/pagekite/__init__.py:62
 #, python-brace-format
 msgid "{box_name} is connected to a (wireless) router which you don't control."
 msgstr "{box_name} 已连接到非你控制的（无线）路由器。"
 
-#: plinth/modules/pagekite/__init__.py:63
+#: plinth/modules/pagekite/__init__.py:64
 msgid ""
 "Your ISP does not provide you an external IP address and instead provides "
 "Internet connection through NAT."
 msgstr "您的 ISP 没有提供外部的 IP 地址而是通过提供 NAT 连接互联网。"
 
-#: plinth/modules/pagekite/__init__.py:65
+#: plinth/modules/pagekite/__init__.py:66
 #, fuzzy
 #| msgid ""
 #| "Your ISP does not provide you a static IP address and your IP address "
@@ -3443,11 +3447,11 @@ msgid ""
 msgstr ""
 "您的 ISP 不提供你一个静态的 IP 地址且你连接到互联网的 IP 地址每次会更改。"
 
-#: plinth/modules/pagekite/__init__.py:67
+#: plinth/modules/pagekite/__init__.py:68
 msgid "Your ISP limits incoming connections."
 msgstr "您的 ISP 限制传入的连接。"
 
-#: plinth/modules/pagekite/__init__.py:69
+#: plinth/modules/pagekite/__init__.py:70
 #, python-brace-format
 msgid ""
 "PageKite works around NAT, firewalls and IP-address limitations by using a "
@@ -3459,6 +3463,12 @@ msgstr ""
 "使用任何 pagekite 服务提供商，例如<a href=\"https://pagekite.net\">pagekite."
 "net</a>。将来，您甚至可以使用好友的 {box_name}。"
 
+#: plinth/modules/pagekite/__init__.py:96
+#, fuzzy
+#| msgid "PageKite Account"
+msgid "PageKite Domain"
+msgstr "PageKite 帐户"
+
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
 msgstr "启用 PageKite"
@@ -3709,10 +3719,6 @@ msgstr ""
 "请参见 SSH 客户端安装 <a href=\"https://pagekite.net/wiki/Howto/"
 "SshOverPageKite/\"> 说明</a>"
 
-#: plinth/modules/pagekite/utils.py:288
-msgid "Pagekite"
-msgstr "Pagekite"
-
 #: plinth/modules/pagekite/views.py:40
 msgid "Standard Services"
 msgstr "标准服务"
@@ -5007,35 +5013,35 @@ msgstr ""
 "</a>。"
 
 #: plinth/modules/tor/__init__.py:80
-msgid "Tor Socks Proxy"
-msgstr ""
-
-#: plinth/modules/tor/__init__.py:84
-msgid "Tor Bridge Relay"
-msgstr "Tor 网桥中继"
-
-#: plinth/modules/tor/__init__.py:122 plinth/modules/tor/__init__.py:150
 msgid "Tor Hidden Service"
 msgstr "隐藏的 Tor 服务"
 
-#: plinth/modules/tor/__init__.py:170
+#: plinth/modules/tor/__init__.py:84
+msgid "Tor Socks Proxy"
+msgstr ""
+
+#: plinth/modules/tor/__init__.py:88
+msgid "Tor Bridge Relay"
+msgstr "Tor 网桥中继"
+
+#: plinth/modules/tor/__init__.py:165
 msgid "Tor relay port available"
 msgstr "Tor 中继端口可用"
 
-#: plinth/modules/tor/__init__.py:180
+#: plinth/modules/tor/__init__.py:175
 msgid "Obfs3 transport registered"
 msgstr "已注册 Obfs3 传输"
 
-#: plinth/modules/tor/__init__.py:188
+#: plinth/modules/tor/__init__.py:183
 msgid "Obfs4 transport registered"
 msgstr "已注册 Obfs4 传输"
 
-#: plinth/modules/tor/__init__.py:227
+#: plinth/modules/tor/__init__.py:222
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind} via Tor"
 msgstr "在 tcp{kind} 上通过 Tor 访问 {url}"
 
-#: plinth/modules/tor/__init__.py:238
+#: plinth/modules/tor/__init__.py:233
 #, python-brace-format
 msgid "Confirm Tor usage at {url} on tcp{kind}"
 msgstr "确认使用 Tor 通过 tcp{kind} 访问 {url}"
@@ -5157,11 +5163,11 @@ msgstr "隐藏的服务"
 msgid "Ports"
 msgstr "端口"
 
-#: plinth/modules/tor/templates/tor.html:100
+#: plinth/modules/tor/templates/tor.html:98
 msgid "Relay"
 msgstr "网桥"
 
-#: plinth/modules/tor/templates/tor.html:102
+#: plinth/modules/tor/templates/tor.html:100
 #, python-format
 msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
@@ -5170,11 +5176,11 @@ msgstr ""
 "如果你的 %(box_name)s 是在路由器或防火墙后面，你必须确保以下端口打开，必要时"
 "打开端口转发。"
 
-#: plinth/modules/tor/templates/tor.html:130
+#: plinth/modules/tor/templates/tor.html:128
 msgid "SOCKS"
 msgstr "SOCKS"
 
-#: plinth/modules/tor/templates/tor.html:133
+#: plinth/modules/tor/templates/tor.html:131
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
 msgstr "Tor SOCKS 端口是你 %(box_name)s 上的 TCP 端口 9050 。"
@@ -5299,14 +5305,14 @@ msgstr ""
 #| "temporarily unavailable and show an error.  Refresh the page to continue."
 msgid ""
 "<strong>This may take a long time to complete</strong>. During an update, "
-"you can not install apps. Also, this web interface may be temporarily "
+"you cannot install apps. Also, this web interface may be temporarily "
 "unavailable and show an error. In that case, refresh the page to continue."
 msgstr ""
 "根据要安装的程序包数量，这可能需要很长的时间才能完成。升级进行时，你将无法安"
 "装其它软件包。升级期间，此 web 界面可能暂时不可用并显示错误消息。刷新页面后，"
 "可以继续。"
 
-#: plinth/modules/upgrades/templates/upgrades.html:69
+#: plinth/modules/upgrades/templates/upgrades.html:71
 msgid "Toggle recent update logs"
 msgstr ""
 
@@ -5906,6 +5912,26 @@ msgstr "应用程序已禁用"
 msgid "Gujarati"
 msgstr "古吉拉特语"
 
+#, fuzzy
+#~| msgid "Dynamic DNS Client"
+#~ msgid "Dynamic DNS Service"
+#~ msgstr "动态 DNS 客户端"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Not Available"
+#~ msgstr "不可用"
+
+#~ msgid "Pagekite"
+#~ msgstr "Pagekite"
+
 #~ msgid "Create new repository"
 #~ msgstr "创建新存储库"