From 767e3c4757f2444489a5ce86750a0f925a2d98ba Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sat, 12 Mar 2016 16:11:55 -0500 Subject: [PATCH] dynamicdns: Make corrections to source strings. --- plinth/modules/dynamicdns/__init__.py | 18 ++++++------- plinth/modules/dynamicdns/dynamicdns.py | 26 +++++++++---------- .../dynamicdns/templates/dynamicdns.html | 8 +++--- .../templates/dynamicdns_status.html | 12 ++++----- plinth/modules/networks/networks.py | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/plinth/modules/dynamicdns/__init__.py b/plinth/modules/dynamicdns/__init__.py index c47942f6e..2c6308614 100644 --- a/plinth/modules/dynamicdns/__init__.py +++ b/plinth/modules/dynamicdns/__init__.py @@ -32,20 +32,20 @@ title = _('Dynamic DNS Client') description = [ format_lazy( - _('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 {box_name}, such as ownCloud.'), + _('If your internet provider changes your IP address periodically ' + '(i.e. every 24h), it may be hard for others to find you on the ' + 'internet. This will prevent others from finding services which are ' + 'provided by this {box_name}.'), box_name=_(cfg.box_name)), _('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 ' + 'internet provider. Dynamic DNS allows you to push your current ' + 'public IP address to a ' ' ' - '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.') + 'GnuDIP server. Afterwards, the server will assign your DNS name ' + 'to the new IP, and if someone from the Internet asks for your DNS ' + 'name, they will get a response with your current IP address.') ] diff --git a/plinth/modules/dynamicdns/dynamicdns.py b/plinth/modules/dynamicdns/dynamicdns.py index b15e49b59..620d0711a 100644 --- a/plinth/modules/dynamicdns/dynamicdns.py +++ b/plinth/modules/dynamicdns/dynamicdns.py @@ -65,7 +65,7 @@ class ConfigureForm(forms.Form): 'see the update URL templates of the example providers.') help_services = \ ugettext_lazy('Please choose an update protocol according to your ' - 'provider. If your provider does not support the GnudIP ' + 'provider. If your provider does not support the GnuDIP ' 'protocol or your provider is not listed you may use the ' 'update URL of your provider.') help_server = \ @@ -73,7 +73,7 @@ class ConfigureForm(forms.Form): '"https://example.com/") but only the hostname of the ' 'GnuDIP server (like "example.com").') help_domain = format_lazy( - ugettext_lazy('The public domain name you want use to reach your ' + ugettext_lazy('The public domain name you want to use to reach your ' '{box_name}.'), box_name=ugettext_lazy(cfg.box_name)) help_disable_ssl = \ ugettext_lazy('Use this option if your provider uses self signed ' @@ -83,18 +83,18 @@ class ConfigureForm(forms.Form): 'will be used for HTTP basic authentication.') help_secret = \ ugettext_lazy('Leave this field empty if you want to keep your ' - 'previous configured password.') + 'current password.') help_ip_url = format_lazy( ugettext_lazy('Optional Value. If your {box_name} is not connected ' 'directly to the Internet (i.e. connected to a NAT ' - 'router) this URL is used to figure out the real ' - 'Internet IP. The URL should simply return the IP where ' + 'router) this URL is used to determine the real ' + 'IP address. The URL should simply return the IP where ' 'the client comes from (example: ' 'http://myip.datasystems24.de).'), box_name=ugettext_lazy(cfg.box_name)) help_user = \ - ugettext_lazy('You should have been requested to select a username ' - 'when you created the account.') + ugettext_lazy('The username that was used when the account was ' + 'created.') """ToDo: sync this list with the html template file""" provider_choices = ( @@ -107,12 +107,12 @@ class ConfigureForm(forms.Form): enabled = forms.BooleanField(label=ugettext_lazy('Enable Dynamic DNS'), required=False) - service_type = forms.ChoiceField(label=ugettext_lazy('Service type'), + service_type = forms.ChoiceField(label=ugettext_lazy('Service Type'), help_text=help_services, choices=provider_choices) dynamicdns_server = TrimmedCharField( - label=ugettext_lazy('GnudIP Server Address'), + label=ugettext_lazy('GnuDIP Server Address'), required=False, help_text=help_server, validators=[ @@ -150,7 +150,7 @@ class ConfigureForm(forms.Form): required=False) dynamicdns_ipurl = TrimmedCharField( - label=ugettext_lazy('IP check URL'), + label=ugettext_lazy('IP Check URL'), required=False, help_text=help_ip_url, validators=[ @@ -176,7 +176,7 @@ class ConfigureForm(forms.Form): # Check if gnudip server or update URL is filled if not dynamicdns_update_url and not dynamicdns_server: raise forms.ValidationError( - _('Please provide update URL or a GnuDIP Server')) + _('Please provide update URL or a GnuDIP server')) if dynamicdns_server and not dynamicdns_user: raise forms.ValidationError(_('Please provide GnuDIP username')) @@ -223,10 +223,10 @@ def statuspage(request): logger.info('Not behind a NAT') if nat_unchecked: - logger.info('Did not check if we are behind a NAT') + logger.info('Did not check if behind a NAT') return TemplateResponse(request, 'dynamicdns_status.html', - {'title': _('Status of Dynamic DNS'), + {'title': _('Dynamic DNS Status'), 'no_nat': no_nat, 'nat_unchecked': nat_unchecked, 'timer': timer, diff --git a/plinth/modules/dynamicdns/templates/dynamicdns.html b/plinth/modules/dynamicdns/templates/dynamicdns.html index 1b3d1bfa7..2e2455394 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns.html @@ -26,7 +26,7 @@ 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 + free update URL based services at freedns.afraid.org. {% endblocktrans %} @@ -34,9 +34,9 @@

{% blocktrans trimmed %} - If your {{ box_name }} is connected behind some NAT router, don't forget - to add port forwarding (i.e. forward some standard ports like 80 and - 443). + If your {{ box_name }} is connected behind a NAT router, don't forget + to add port forwarding for standard ports, including TCP port 80 (HTTP) + and TCP port 443 (HTTPS). {% endblocktrans %}

{% endblock %} diff --git a/plinth/modules/dynamicdns/templates/dynamicdns_status.html b/plinth/modules/dynamicdns/templates/dynamicdns_status.html index 74ad2d0b1..c0db9296e 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns_status.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns_status.html @@ -27,18 +27,18 @@

{% 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. + NAT type was not detected yet. If you do not provide an "IP Check + URL", we will not detect a NAT type. {% endblocktrans %} {% else %} {% if no_nat %} - {% trans "Direct connection to the Internet." %} + {% 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 (the "IP check URL" entry is - needed for this - otherwise IP changes will not be - detected). In case the WAN IP changes, it may take up to + the "IP Check URL" for changes (the "IP Check URL" entry is + needed for this, otherwise IP changes will not be + detected). In case the WAN IP changes, it may take up to {{ timer }} minutes until your DNS entry is updated. {% endblocktrans %} {% endif %} diff --git a/plinth/modules/networks/networks.py b/plinth/modules/networks/networks.py index 522b08aa1..6f354253d 100644 --- a/plinth/modules/networks/networks.py +++ b/plinth/modules/networks/networks.py @@ -87,7 +87,7 @@ def show(request, uuid): device, connection_status['wireless']['ssid']) return TemplateResponse(request, 'connection_show.html', - {'title': _('Show Connection information'), + {'title': _('Show Connection Information'), 'subsubmenu': subsubmenu, 'connection': connection_status, 'active_connection': active_connection_status,