From 02cd89b60da516435a3ac01ace1fa9340f05a27f Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 13 Nov 2015 22:02:17 +0530 Subject: [PATCH] Internationalize strings in template files --- plinth/modules/apps/templates/apps.html | 24 ++- plinth/modules/avahi/templates/avahi.html | 51 +++--- plinth/modules/config/templates/config.html | 5 +- .../modules/datetime/templates/datetime.html | 43 ++++-- plinth/modules/deluge/templates/deluge.html | 51 +++--- .../diagnostics/templates/diagnostics.html | 83 +++++----- .../templates/diagnostics_button.html | 5 +- .../templates/diagnostics_module.html | 16 +- .../templates/diagnostics_results.html | 34 ++-- .../dynamicdns/templates/dynamicdns.html | 69 ++++++--- .../templates/dynamicdns_configure.html | 15 +- .../templates/dynamicdns_status.html | 40 +++-- .../modules/firewall/templates/firewall.html | 139 ++++++++++------- .../templates/firstboot_state0.html | 15 +- .../templates/firstboot_state1.html | 22 ++- .../templates/firstboot_state10.html | 28 ++-- plinth/modules/help/templates/help_about.html | 77 +++++---- plinth/modules/help/templates/help_index.html | 44 ++++-- .../modules/help/templates/help_manual.html | 3 +- plinth/modules/ikiwiki/templates/ikiwiki.html | 14 +- .../ikiwiki/templates/ikiwiki_create.html | 12 +- .../ikiwiki/templates/ikiwiki_delete.html | 20 ++- .../ikiwiki/templates/ikiwiki_manage.html | 18 ++- plinth/modules/mumble/templates/mumble.html | 55 ++++--- .../networks/templates/connection_show.html | 139 ++++++++++------- .../networks/templates/connections_add.html | 5 +- .../templates/connections_create.html | 5 +- .../templates/connections_delete.html | 7 +- .../templates/connections_diagram.html | 41 +++-- .../networks/templates/connections_edit.html | 5 +- .../networks/templates/connections_list.html | 12 +- .../templates/connections_type_select.html | 5 +- .../modules/networks/templates/wifi_scan.html | 27 ++-- plinth/modules/openvpn/templates/openvpn.html | 97 +++++++----- .../modules/owncloud/templates/owncloud.html | 38 +++-- .../templates/pagekite_configure.html | 8 +- .../templates/pagekite_custom_services.html | 29 ++-- .../templates/pagekite_introduction.html | 75 ++++++--- .../templates/pagekite_standard_services.html | 25 ++- plinth/modules/privoxy/templates/privoxy.html | 65 ++++---- .../restore/templates/restore_index.html | 36 +++-- .../roundcube/templates/roundcube.html | 63 +++++--- plinth/modules/shaarli/templates/shaarli.html | 30 ++-- plinth/modules/system/templates/system.html | 21 ++- plinth/modules/tor/templates/tor.html | 146 ++++++++++-------- .../transmission/templates/transmission.html | 53 ++++--- .../modules/upgrades/templates/upgrades.html | 23 ++- .../templates/upgrades_configure.html | 5 +- .../upgrades/templates/upgrades_run.html | 51 +++--- .../templates/users_change_password.html | 11 +- .../modules/users/templates/users_create.html | 5 +- .../modules/users/templates/users_delete.html | 13 +- .../modules/users/templates/users_list.html | 6 +- .../modules/users/templates/users_update.html | 21 ++- plinth/modules/xmpp/templates/xmpp.html | 74 +++++---- plinth/templates/404.html | 24 ++- plinth/templates/500.html | 16 +- plinth/templates/base.html | 36 +++-- plinth/templates/login.html | 4 +- plinth/templates/menu.html | 2 + plinth/templates/messages.html | 2 + plinth/templates/package_install.html | 34 ++-- plinth/templates/submenu.html | 2 + plinth/templates/subsubmenu.html | 2 + 64 files changed, 1331 insertions(+), 815 deletions(-) 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 %} -

Services and Applications

+

{% trans "Services and Applications" %}

-

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

+

{% trans "Service Discovery" %}

-

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 %} +

-

Status

+

{% trans "Status" %}

-

- {% 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 %} +

-

Configuration

+

{% trans "Configuration" %}

-
- {% csrf_token %} + + {% csrf_token %} - {{ form|bootstrap }} + {{ form|bootstrap }} - -
+ + {% endblock %} diff --git a/plinth/modules/config/templates/config.html b/plinth/modules/config/templates/config.html index 5dd2acf1f..996f16704 100644 --- a/plinth/modules/config/templates/config.html +++ b/plinth/modules/config/templates/config.html @@ -19,6 +19,7 @@ {% endcomment %} {% load bootstrap %} +{% load i18n %} {% block content %} @@ -27,8 +28,8 @@ {{ form|bootstrap }} - - + {% endblock %} diff --git a/plinth/modules/datetime/templates/datetime.html b/plinth/modules/datetime/templates/datetime.html index e14d8cf16..bce9499f2 100644 --- a/plinth/modules/datetime/templates/datetime.html +++ b/plinth/modules/datetime/templates/datetime.html @@ -19,32 +19,41 @@ {% endcomment %} {% load bootstrap %} +{% load i18n %} {% block content %} -

Date & Time

+

{% trans "Date & Time" %}

-

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 %} +

-

Status

+

{% trans "Status" %}

-

- {% 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" %} -

Configuration

+

{% trans "Configuration" %}

-
- {% csrf_token %} + + {% csrf_token %} - {{ form|bootstrap }} + {{ form|bootstrap }} - -
+ + {% endblock %} diff --git a/plinth/modules/deluge/templates/deluge.html b/plinth/modules/deluge/templates/deluge.html index 20f839f87..51b54c8ef 100644 --- a/plinth/modules/deluge/templates/deluge.html +++ b/plinth/modules/deluge/templates/deluge.html @@ -19,37 +19,46 @@ {% endcomment %} {% load bootstrap %} +{% load i18n %} {% block content %} -

BitTorrent Web Client (Deluge)

+

{% trans "BitTorrent Web Client (Deluge)" %}

-

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 %} +

-

Status

+

{% trans "Status" %}

-

- {% 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 %} +

-

Configuration

+ {% include "diagnostics_button.html" with module="deluge" %} -
- {% csrf_token %} +

{% trans "Configuration" %}

- {{ form|bootstrap }} + + {% csrf_token %} - -
+ {{ form|bootstrap }} + + + {% endblock %} diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html index afb63254c..2b369732e 100644 --- a/plinth/modules/diagnostics/templates/diagnostics.html +++ b/plinth/modules/diagnostics/templates/diagnostics.html @@ -18,6 +18,7 @@ # {% endcomment %} +{% load i18n %} {% block page_head %} @@ -30,49 +31,55 @@ {% block content %} -

{{ title }}

+

{{ title }}

-

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 %} -
- {% csrf_token %} + {% if not is_running %} + + {% csrf_token %} - -
-{% else %} -

Diagnotics test is currently running

-
-
- {{ results.progress_percentage }}% -
-
- -{% endif %} - -{% if results %} -

Results

- {% if results.error %} -
- × - {{ results.error }} -
+ + {% else %} - {% for module, module_results in results.results.items %} -

Module: {{ module }}

+

{% trans "Diagnotics test is currently running" %}

+
+
+ {{ results.progress_percentage }}% +
+
- {% if module_results %} - {% include "diagnostics_results.html" with results=module_results %} - {% else %} -

- {% endif %} - {% endfor %} {% endif %} -{% endif %} + + {% if results %} +

{% trans "Results" %}

+ {% if results.error %} +
+ × + {{ results.error }} +
+ {% else %} + {% for module, module_results in results.results.items %} +

{% blocktrans %}Module: {{ module }}{% endblocktrans %}

+ + {% if module_results %} + {% include "diagnostics_results.html" with results=module_results %} + {% else %} +

+ {% 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 %} +
{% csrf_token %} - +
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 %} -

Diagnostic Results

+

{% trans "Diagnostic Results" %}

-

Module: {{ module_name }}

+

{% blocktrans %}Module: {{ module_name }}{% endblocktrans %}

-{% if results %} - {% include "diagnostics_results.html" with results=results %} -{% else %} -

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 %} +
- - + + {% for test, result in results %} - - - - + + + + {% endfor %}
TestResult{% 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 %} +
diff --git a/plinth/modules/dynamicdns/templates/dynamicdns.html b/plinth/modules/dynamicdns/templates/dynamicdns.html index 3b3bac840..963827974 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns.html @@ -18,29 +18,50 @@ # {% endcomment %} +{% load i18n %} + {% block content %} -

DynamicDNS client

-

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. -

+ +

{% trans "DynamicDNS client" %}

+ +

+ {% 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 %}
{% csrf_token %} + {{ form|bootstrap }} - - +
{% 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 %} + +

{% trans "NAT type" %}

+

-

NAT type

- {% if nat_unchecked %} - NAT type not detected yet, if you do not provide a "IP check URL" we will - not detect a NAT type. - {% else %} - {% if no_nat %} - Direct connection to the internet. + {% if nat_unchecked %} + {% blocktrans trimmed %} + NAT type not detected yet, if you do not provide a "IP check + URL" we will not detect a NAT type. + {% endblocktrans %} {% else %} - Behind NAT, this means that dynamic DNS service will poll the - "IP check URL" for changes (we need the "IP check URL" for this reason - - otherwise we will not detect IP changes). - It may take up to {{ timer }} minutes until we update your DNS entry in - case of WAN IP change. + {% if no_nat %} + {% trans "Direct connection to the internet." %} + {% else %} + {% blocktrans trimmed %} + Behind NAT, this means that dynamic DNS service will poll + the "IP check URL" for changes (we need the "IP check URL" + for this reason - otherwise we will not detect IP changes). + It may take up to {{ timer }} minutes until we update your + DNS entry in case of WAN IP change. + {% endblocktrans %} + {% endif %} {% endif %} - {% endif %} -

Last update

- {{ last_update }}

+

{% trans "Last update" %}

+ +

{{ 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 %} -

{{ title }}

+

{{ title }}

-

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/PortStatus
+ + + + - - {% for service in services %} - - - - + + {% for service in services %} + + + + - {% for port in service.ports %} - - - - - {% endfor %} + {% for port in service.ports %} + + + + + {% endfor %} + {% endfor %} + +
{% trans "Service/Port" %}{% trans "Status" %}
{{ 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 %} +
+
+
- {% endfor %} +

+ + {% 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 %} +
Edit + title="{% trans "Edit connection" %}">{% trans "Edit" %} {% if active_connection %}
{% csrf_token %} - +
{% else %}
{% csrf_token %} - +
{% endif %} Delete + title="{% trans "Delete connection" %}">{% trans "Delete" %}
-

Connection

+

{% trans "Connection" %}

{% if connection.primary %}
- Primary connection + {% trans "Primary connection" %}
- yes + {% trans "yes" %}
{% endif %}
- Name + {% trans "Name" %}
{{ connection.id }}
{% if device %} -

Device

+

{% trans "Device" %}

- State + {% trans "State" %} {{ device.state }}
{% if device.state_reason != 'none' %}
- State reason + {% trans "State reason" %} {{ device.state_reason }}
{% endif %}
- Type + {% trans "Type" %} {{ device.type }}
- MAC address + {% trans "MAC address" %} {{ device.hw_address }}
- Interface + {% trans "Interface" %} {{ device.interface_name }}
- Description + {% trans "Description" %} {{ device.description }}
{% endif %} -

Physical Link

+

{% trans "Physical Link" %}

{% if device.ethernet %}
- Link state + {% trans "Link state" %}
{% if device.ethernet.carrier %} - cable is connected + + {% trans "cable is connected" %} {% else %} - please check cable + + {% trans "please check cable" %} {% endif %}
- Speed - {{ device.ethernet.speed }} Mbit/s + {% trans "Speed" %} + + {% blocktrans %}{{ device.ethernet.speed }} Mbit/s{% endblocktrans %} +
{% endif %} {% if connection.type == "802-11-wireless" %}
- SSID + {% trans "SSID" %} {{ connection.wireless.ssid }}
{% if device %}
- Speed - {{ device.wireless.bitrate }} Mbit/s + {% trans "Speed" %} + + {% blocktrans %}{{ device.wireless.bitrate }} Mbit/s{% endblocktrans %} +
- Mode + {% trans "Mode" %} {{ device.wireless.mode }}
{% endif %} {% if access_point.channel %}
- Signal strength + {% trans "Signal strength" %}
{{ access_point.strength }}% @@ -154,7 +166,7 @@ {% endif %} {% if access_point.channel %}
- Channel + {% trans "Channel" %} {{ access_point.channel }}
{% endif %} @@ -162,19 +174,19 @@
{% if active_connection %} -

IPv4

+

{% trans "IPv4" %}

{% if connection.ipv4.method %}
- Method + {% trans "Method" %} {{ connection.ipv4.method }}
{% endif %} {% for address in device.ip4.addresses %}
- IP address + {% trans "IP address" %} {{ address.address }}/{{ address.prefix }} @@ -183,76 +195,76 @@ {% if device.ip4.gateway %}
- Gateway + {% trans "Gateway" %} {{ device.ip4.gateway }}
{% endif %} {% for server in device.ip4.nameservers %}
- DNS server + {% trans "DNS server" %} {{ server }}
{% endfor %} {% if active_connection.ip4.default %}
- Default - yes + {% trans "Default" %} + {% trans "yes" %}
{% endif %}
-

IPv6

+

{% trans "IPv6" %}

{% if connection.ipv6.method %}
- Method + {% trans "Method" %} {{ connection.ipv6.method }}
{% endif %} {% for address in device.ip6.addresses %}
- IP address + {% trans "IP address" %} {{ address.address }}/{{ address.prefix }}
{% endfor %} {% if device.ip6.gateway %}
- Gateway + {% trans "Gateway" %} {{ device.ip6.gateway }}
{% endif %} {% for server in device.ip6.nameservers %}
- DNS server + {% trans "DNS server" %} {{ server }}
{% endfor %} {% if active_connection.ip6.default %}
- Default - yes + {% trans "Default" %} + {% trans "yes" %}
{% endif %}
{% else %} -

Status

+

{% trans "Status" %}

-

This connection is not active.

+

{% trans "This connection is not active." %}

{% endif %} -

Security

+

{% trans "Security" %}

{% if connection.zone == "internal" %}
- Firewall zone + {% trans "Firewall zone" %}
{{ connection.zone }}
@@ -261,15 +273,18 @@
- This interface should be connected to local network/machine. If you - connect this interface to a public network, services meant to - be available only internally will become available externally. - This is a security risk. + {% blocktrans trimmed %} + This interface should be connected to local + network/machine. If you connect this interface to a + public network, services meant to be available only + internally will become available externally. This is a + security risk. + {% endblocktrans %}
{% elif connection.zone == "external" %}
- Firewall zone + {% trans "Firewall zone" %}
{{ connection.zone }}
@@ -278,14 +293,17 @@
- This interface should receive your Internet connection. If - you connect it your a local network/machine, many services - meant to available only internally will not be available. + {% blocktrans trimmed %} + This interface should receive your Internet connection. + If you connect it your a local network/machine, many + services meant to available only internally will not be + available. + {% endblocktrans %}
{% else %}
- Firewall zone + {% trans "Firewall zone" %}
{{ connection.zone }}
@@ -294,10 +312,13 @@
- This interface is not maintained by FreedomBox. Its security - status is unknown to FreedomBox. Many FreedomBox services may - not be available on this interface. It is recommended that - you deactivate/delete this connection and re-configure it. + {% blocktrans trimmed %} + This interface is not maintained by FreedomBox. Its + security status is unknown to FreedomBox. Many FreedomBox + services may not be available on this interface. It is + recommended that you deactivate/delete this connection and + re-configure it. + {% endblocktrans %}
{% endif %}
diff --git a/plinth/modules/networks/templates/connections_add.html b/plinth/modules/networks/templates/connections_add.html index 153dc2ba0..5b7ee03b0 100644 --- a/plinth/modules/networks/templates/connections_add.html +++ b/plinth/modules/networks/templates/connections_add.html @@ -19,6 +19,7 @@ {% endcomment %} {% load bootstrap %} +{% load i18n %} {% block content %} @@ -29,8 +30,8 @@ {{ form|bootstrap }} - - +
diff --git a/plinth/modules/networks/templates/connections_create.html b/plinth/modules/networks/templates/connections_create.html index b3a753389..319374502 100644 --- a/plinth/modules/networks/templates/connections_create.html +++ b/plinth/modules/networks/templates/connections_create.html @@ -19,6 +19,7 @@ {% endcomment %} {% load bootstrap %} +{% load i18n %} {% block content %} @@ -29,8 +30,8 @@ {{ form|bootstrap }} - - +
diff --git a/plinth/modules/networks/templates/connections_delete.html b/plinth/modules/networks/templates/connections_delete.html index 1ebd2221f..ef97b39f1 100644 --- a/plinth/modules/networks/templates/connections_delete.html +++ b/plinth/modules/networks/templates/connections_delete.html @@ -19,12 +19,13 @@ {% endcomment %} {% load bootstrap %} +{% load i18n %} {% block content %} -

Delete Connection {{ name }}

+

{% blocktrans %}Delete Connection {{ name }}{% endblocktrans %}

-

Delete connection permanently?

+

{% trans "Delete connection permanently?" %}

{% csrf_token %} @@ -33,7 +34,7 @@ value="Delete {{ name }}"/> Cancel + class="btn btn-md btn-primary">{% trans "Cancel" %}
{% 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 %}