From f8ace3153adebc600b9fd6124168a16dae55551c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sat, 8 Apr 2017 11:30:21 +0200 Subject: [PATCH 1/2] new text proposal "appslist_retrieve_bad_format" Fix: https://dev.yunohost.org/issues/895 --- locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index b0dad75b4..f5ceac24a 100644 --- a/locales/en.json +++ b/locales/en.json @@ -32,7 +32,7 @@ "appslist_removed": "The application list {appslist:s} has been removed", "appslist_unknown": "Application list {appslist:s} unknown.", "appslist_retrieve_error": "Unable to retrieve the remote application list {appslist:s}: {error:s}", - "appslist_retrieve_bad_format": "Retrieved file for application list {appslist:s} is not a valid app list", + "appslist_retrieve_bad_format": "Retrieved file for application list {appslist:s} is not valid", "appslist_name_already_tracked": "There is already a registered application list with name {name:s}.", "appslist_url_already_tracked": "There is already a registered application list with url {url:s}.", "appslist_migrating": "Migrating application list {appslist:s} ...", From 804daf63bf4a536ee2070a1b01b69092b053c160 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sun, 9 Apr 2017 16:03:02 +0200 Subject: [PATCH 2/2] rewrite proposal for certmanager_http_check_timeout hairpinning is the answer to the problem, not the problem itself. We should probably rewrite the whole sentence, but to keep it simple, let's just add it is an issue related to hairpinning. --- locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index f5ceac24a..09a2422ca 100644 --- a/locales/en.json +++ b/locales/en.json @@ -274,7 +274,7 @@ "domain_cannot_remove_main": "Cannot remove main domain. Set a new main domain first", "certmanager_self_ca_conf_file_not_found": "Configuration file not found for self-signing authority (file: {file:s})", "certmanager_acme_not_configured_for_domain": "Certificate for domain {domain:s} does not appear to be correctly installed. Please run cert-install for this domain first.", - "certmanager_http_check_timeout": "Timed out when server tried to contact itself through HTTP using public IP address (domain {domain:s} with ip {ip:s}). You may be experiencing hairpinning or the firewall/router ahead of your server is misconfigured.", + "certmanager_http_check_timeout": "Timed out when server tried to contact itself through HTTP using public IP address (domain {domain:s} with ip {ip:s}). You may be experiencing hairpinning issue or the firewall/router ahead of your server is misconfigured.", "certmanager_couldnt_fetch_intermediate_cert": "Timed out when trying to fetch intermediate certificate from Let's Encrypt. Certificate installation/renewal aborted - please try again later.", "certmanager_unable_to_parse_self_CA_name": "Unable to parse name of self-signing authority (file: {file:s})" }