diff --git a/plinth/modules/apps/templates/apps.html b/plinth/modules/apps/templates/apps.html index cc93557fe..a421386f2 100644 --- a/plinth/modules/apps/templates/apps.html +++ b/plinth/modules/apps/templates/apps.html @@ -18,16 +18,26 @@ # {% endcomment %} +{% load i18n %} + {% block content %} -
You can install and run various services and applications on your -{{ cfg.box_name }}.
++ {% blocktrans trimmed %} + You can install and run various services and applications on + your {{ cfg.box_name }}. + {% endblocktrans %} +
-This box can be your photo sharing site, your instant -messaging site, your social networking site, your news site. Remember -web portals? We can be one of those too. Many of the services you -use on the web could soon be on site and under your control!
++ {% blocktrans trimmed %} + This box can be your photo sharing site, your instant messaging + site, your social networking site, your news site. Remember web + portals? We can be one of those too. Many of the services you + use on the web could soon be on site and under your control! + {% endblocktrans %} +
{% endblock %} diff --git a/plinth/modules/avahi/templates/avahi.html b/plinth/modules/avahi/templates/avahi.html index df40e955f..80d55550a 100644 --- a/plinth/modules/avahi/templates/avahi.html +++ b/plinth/modules/avahi/templates/avahi.html @@ -19,36 +19,45 @@ {% endcomment %} {% load bootstrap %} +{% load i18n %} {% block content %} -Service discovery allows other machines on the network to discover - your FreedomBox and services running on it. It also allows - FreedomBox to discover other machines and services running on your - local network. Service discovery is not essential and works only on - internal networks. It may be disabled to improve security - especially when connecting to a hostile local network.
++ {% blocktrans trimmed %} + Service discovery allows other machines on the network to + discover your FreedomBox and services running on it. It also + allows FreedomBox to discover other machines and services + running on your local network. Service discovery is not + essential and works only on internal networks. It may be + disabled to improve security especially when connecting to a + hostile local network. + {% endblocktrans %} +
-- {% if status.is_running %} - Service discovery server is running - {% else %} - Service discovery server is not running - {% endif %} -
++ {% if status.is_running %} + + {% trans "Service discovery server is running" %} + {% else %} + + {% trans "Service discovery server is not running" %} + {% endif %} +
-Network time server is a program that maintians the system time in synchronization with servers on the Internet.
++ {% blocktrans trimmed %} + Network time server is a program that maintians the system time + in synchronization with servers on the Internet. + {% endblocktrans %} +
-- {% if status.is_running %} - Network time server is running - {% else %} - Network time server is not running - {% endif %} -
-{% include "diagnostics_button.html" with module="datetime" %} ++ {% if status.is_running %} + + {% trans "Network time server is running" %} + {% else %} + + {% trans "Network time server is not running" %} + {% endif %} +
+ {% include "diagnostics_button.html" with module="datetime" %} -Deluge is a BitTorrent client that features a Web UI.
+{% trans "Deluge is a BitTorrent client that features a Web UI." %}
-When enabled, the Deluge web client will be available from - /deluge path on the web server. The default - password is 'deluge', but you should log in and change it immediately after - enabling this service.
++ {% blocktrans trimmed %} + When enabled, the Deluge web client will be available from + /deluge path on the web server. The + default password is 'deluge', but you should log in and change + it immediately after enabling this service. + {% endblocktrans %} +
-- {% if status.is_running %} - deluge-web is running - {% else %} - deluge-web is not running - {% endif %} -
-{% include "diagnostics_button.html" with module="deluge" %} ++ {% if status.is_running %} + + {% trans "deluge-web is running" %} + {% else %} + + {% trans "deluge-web is not running" %} + {% endif %} +
-The system diagnostic test will run a number of checks on your -system to confirm that applications and services are working as expected.
++ {% blocktrans trimmed %} + The system diagnostic test will run a number of checks on your + system to confirm that applications and services are working as + expected. + {% endblocktrans %} +
-{% if not is_running %} - -{% else %} -Diagnotics test is currently running
-{% trans "Diagnotics test is currently running" %}
+- {% endif %} - {% endfor %} {% endif %} -{% endif %} + + {% if results %} +
+ {% endif %} + {% endfor %} + {% endif %} + {% endif %} {% endblock %} diff --git a/plinth/modules/diagnostics/templates/diagnostics_button.html b/plinth/modules/diagnostics/templates/diagnostics_button.html index 048d679b6..6126a8743 100644 --- a/plinth/modules/diagnostics/templates/diagnostics_button.html +++ b/plinth/modules/diagnostics/templates/diagnostics_button.html @@ -17,9 +17,12 @@ # {% endcomment %} +{% load i18n %} + diff --git a/plinth/modules/diagnostics/templates/diagnostics_module.html b/plinth/modules/diagnostics/templates/diagnostics_module.html index aa17bff1b..537af4b71 100644 --- a/plinth/modules/diagnostics/templates/diagnostics_module.html +++ b/plinth/modules/diagnostics/templates/diagnostics_module.html @@ -18,16 +18,18 @@ # {% endcomment %} +{% load i18n %} + {% block content %} -
This module does not support diagnostics
-{% endif %} + {% if results %} + {% include "diagnostics_results.html" with results=results %} + {% else %} +{% trans "This module does not support diagnostics" %}
+ {% endif %} {% endblock %} diff --git a/plinth/modules/diagnostics/templates/diagnostics_results.html b/plinth/modules/diagnostics/templates/diagnostics_results.html index 195a28c98..9de5dafee 100644 --- a/plinth/modules/diagnostics/templates/diagnostics_results.html +++ b/plinth/modules/diagnostics/templates/diagnostics_results.html @@ -17,31 +17,33 @@ # {% endcomment %} +{% load i18n %} +| Test | -Result | +{% trans "Test" %} | +{% trans "Result" %} |
|---|---|---|---|
| {{ test }} | -- {% if result == 'passed' %} - {{ result }} - {% elif result == 'failed' %} - {{ result }} - {% elif result == 'error' %} - {{ result }} - {% else %} - {{ result }} - {% endif %} - | -||
| {{ test }} | ++ {% if result == 'passed' %} + {{ result }} + {% elif result == 'failed' %} + {{ result }} + {% elif result == 'error' %} + {{ result }} + {% else %} + {{ result }} + {% endif %} + | +
If your internet provider changes your IP address periodic (i.e. every 24h) - 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 FreedomBox (like your ownCloud). - - 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 - allows you to push your current public IP address to an - gnudip - server. Afterwards 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. - - If you are looking for a free dynamic DNS account, you may find a free - GnuDIP service at gnudip.datasystems24.net or you may find free update - URL based services on - - freedns.afraid.org - - If your freedombox is connected behind some NAT router, don't forget - to add portforwarding (i.e. forward some standard ports like 80 and 443) - to your freedombox device. -
+ ++ {% blocktrans trimmed %} + If your internet provider changes your IP address periodic + (i.e. every 24h) 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 FreedomBox (like your ownCloud). + {% endblocktrans %} +
+ ++ {% blocktrans trimmed %} + 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 allows you to push your current + public IP address to an + gnudip + server. Afterwards 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. + {% endblocktrans %} +
+ ++ {% blocktrans trimmed %} + If you are looking for a free dynamic DNS account, you may find + a free GnuDIP service at gnudip.datasystems24.net or you may find + free update URL based services on + + freedns.afraid.org + {% endblocktrans %} +
+ ++ {% blocktrans trimmed %} + If your freedombox is connected behind some NAT router, don't forget + to add portforwarding (i.e. forward some standard ports like 80 and 443) + to your freedombox device. + {% endblocktrans %} +
{% endblock %} diff --git a/plinth/modules/dynamicdns/templates/dynamicdns_configure.html b/plinth/modules/dynamicdns/templates/dynamicdns_configure.html index 38489dee5..3267c6294 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns_configure.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns_configure.html @@ -19,22 +19,25 @@ {% endcomment %} {% load bootstrap %} +{% load i18n %} {% block content %} {% endblock %} diff --git a/plinth/modules/dynamicdns/templates/dynamicdns_status.html b/plinth/modules/dynamicdns/templates/dynamicdns_status.html index dad90326a..dc11a96b9 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns_status.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns_status.html @@ -18,25 +18,35 @@ # {% endcomment %} +{% load i18n %} + {% block content %} + +-
{{ last_update }}
+ {% endblock %} diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html index cd0e7cdf3..14c21f4f9 100644 --- a/plinth/modules/firewall/templates/firewall.html +++ b/plinth/modules/firewall/templates/firewall.html @@ -18,77 +18,96 @@ # {% endcomment %} +{% load i18n %} + {% block content %} -Firewall is a network security system that controls the incoming -and outgoing network traffic on your {{ cfg.box_name }}. Keeping a -firewall enabled and properly configured reduces risk of security -threat from the Internet.
++ {% blocktrans trimmed %} + Firewall is a network security system that controls the incoming + and outgoing network traffic on your {{ cfg.box_name }}. Keeping + a firewall enabled and properly configured reduces risk of + security threat from the Internet. + {% endblocktrans %} +
-The following is the current status:
+{% trans "The following is the current status:" %}
-{% if firewall_status = 'not_running' %} + {% if firewall_status = 'not_running' %} -Firewall daemon is not running. Please run it. Firewall comes -enabled by default on {{ cfg.box_name }}. On any Debian based system -(such as {{ cfg.box_name }}) you may run it using the command 'service -firewalld start' or in case of a system with systemd 'systemctl start -firewalld'
++ {% blocktrans trimmed %} + Firewall daemon is not running. Please run it. Firewall comes + enabled by default on {{ cfg.box_name }}. On any Debian based + system (such as {{ cfg.box_name }}) you may run it using the + command 'service firewalld start' or in case of a system with + systemd 'systemctl start firewalld' + {% endblocktrans %} +
-{% else %} + {% else %} -| Service/Port | -Status | - +
|---|
| {% trans "Service/Port" %} | +{% trans "Status" %} | + - - {% for service in services %} -
|---|---|
| {{ service.name }} | -- {% if service.is_enabled %} - Enabled - {% else %} - Disabled - {% endif %} - | -
| {{ service.name }} | ++ {% if service.is_enabled %} + + {% trans "Enabled" %} + {% else %} + + {% trans "Disabled" %} + {% endif %} + | +
| {{ port }} | -- {% if port in internal_enabled_services and port in external_enabled_services %} - Permitted - {% elif port in internal_enabled_services %} - Permitted (internal only) - {% elif port in external_enabled_services %} - Permitted (external only) - {% else %} - Blocked - {% endif %} - | -
| {{ port }} | ++ {% if port in internal_enabled_services and port in external_enabled_services %} + + {% trans "Permitted" %} + {% elif port in internal_enabled_services %} + + {% trans "Permitted (internal only)" %} + {% elif port in external_enabled_services %} + + {% trans "Permitted (external only)" %} + {% else %} + + {% trans "Blocked" %} + {% endif %} + | +
+ + {% blocktrans trimmed %} + The operation of the firewall is automatic. When you enable + a service it is automatically permitted in the firewall and + you disable a service is automatically disabled in the firewall. + {% endblocktrans %} + +
- - -The operation of the firewall is automatic. When you enable a -service it is automatically permitted in the firewall and you disable -a service is automatically disabled in the firewall.
- -{% endif %} + {% endif %} {% endblock %} diff --git a/plinth/modules/first_boot/templates/firstboot_state0.html b/plinth/modules/first_boot/templates/firstboot_state0.html index 44a11ba48..f011c5211 100644 --- a/plinth/modules/first_boot/templates/firstboot_state0.html +++ b/plinth/modules/first_boot/templates/firstboot_state0.html @@ -18,8 +18,9 @@ # {% endcomment %} -{% load static %} {% load bootstrap %} +{% load i18n %} +{% load static %} {% block page_head %} {% endblock %} -{% load bootstrap %} {% block content %} +This connection is not active.
+{% trans "This connection is not active." %}
{% endif %} -Delete connection permanently?
+{% trans "Delete connection permanently?" %}
{% endblock %} diff --git a/plinth/modules/networks/templates/connections_diagram.html b/plinth/modules/networks/templates/connections_diagram.html index 7a385c05e..a80ace507 100644 --- a/plinth/modules/networks/templates/connections_diagram.html +++ b/plinth/modules/networks/templates/connections_diagram.html @@ -18,6 +18,7 @@ {% endcomment %} {% load static %} +{% load i18n %}