diff --git a/installer/resources/proxy/ahelper-conflict-header.ht b/installer/resources/proxy/ahelper-conflict-header.ht index 8e3ce610f..20a66e499 100644 --- a/installer/resources/proxy/ahelper-conflict-header.ht +++ b/installer/resources/proxy/ahelper-conflict-header.ht @@ -14,7 +14,7 @@ Proxy-Connection: close

_("Warning: Destination Key Conflict")

diff --git a/installer/resources/proxy/ahelper-new-header.ht b/installer/resources/proxy/ahelper-new-header.ht index bf970feb0..613e1041c 100644 --- a/installer/resources/proxy/ahelper-new-header.ht +++ b/installer/resources/proxy/ahelper-new-header.ht @@ -15,7 +15,7 @@ Proxy-Connection: close

_("Information: New Host Name with Address Helper")

diff --git a/installer/resources/proxy/ahelper-notfound-header.ht b/installer/resources/proxy/ahelper-notfound-header.ht index 0aeb454dc..733e0b600 100644 --- a/installer/resources/proxy/ahelper-notfound-header.ht +++ b/installer/resources/proxy/ahelper-notfound-header.ht @@ -13,7 +13,7 @@ Proxy-Connection: close

_("Warning: Bad Address Helper")

diff --git a/installer/resources/proxy/auth-header.ht b/installer/resources/proxy/auth-header.ht index 9cf4a940d..296ab6888 100644 --- a/installer/resources/proxy/auth-header.ht +++ b/installer/resources/proxy/auth-header.ht @@ -16,7 +16,7 @@ Proxy-Connection: close

_("I2P HTTP Proxy Authorization Required")

_("This proxy is configured to require a username and password for access.") -_("Please enter your username and password, or check your {0}router configuration{1} or {2}I2PTunnel configuration{3}.", "", "/a>", "", "") +_("Please enter your username and password, or check your {0}router configuration{1} or {2}I2PTunnel configuration{3}.", "", "/a>", "", "") _("To disable authorization, remove the configuration {0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy tunnel.", "", ""))

diff --git a/installer/resources/proxy/b32-auth-header.ht b/installer/resources/proxy/b32-auth-header.ht index c6f416d6f..d95ece44c 100644 --- a/installer/resources/proxy/b32-auth-header.ht +++ b/installer/resources/proxy/b32-auth-header.ht @@ -14,7 +14,7 @@ Proxy-Connection: close

_("Warning: Authorization Required")

diff --git a/installer/resources/proxy/b32-header.ht b/installer/resources/proxy/b32-header.ht index 62d6cb650..510ddc219 100644 --- a/installer/resources/proxy/b32-header.ht +++ b/installer/resources/proxy/b32-header.ht @@ -14,7 +14,7 @@ Proxy-Connection: close

_("Warning: Invalid Destination")

diff --git a/installer/resources/proxy/baduri-header.ht b/installer/resources/proxy/baduri-header.ht index daeb57749..0c936dc5b 100644 --- a/installer/resources/proxy/baduri-header.ht +++ b/installer/resources/proxy/baduri-header.ht @@ -13,7 +13,7 @@ Proxy-Connection: close

_("Warning: Invalid Request URI")

diff --git a/installer/resources/proxy/denied-header.ht b/installer/resources/proxy/denied-header.ht index c54ad93c1..007a74283 100644 --- a/installer/resources/proxy/denied-header.ht +++ b/installer/resources/proxy/denied-header.ht @@ -13,7 +13,7 @@ Proxy-Connection: close

_("Warning: Request Denied")

diff --git a/installer/resources/proxy/dnf-header.ht b/installer/resources/proxy/dnf-header.ht index 51f98d8f2..5ede16da4 100644 --- a/installer/resources/proxy/dnf-header.ht +++ b/installer/resources/proxy/dnf-header.ht @@ -14,7 +14,7 @@ Proxy-Connection: close

_("Website Unreachable")

diff --git a/installer/resources/proxy/dnfb-header.ht b/installer/resources/proxy/dnfb-header.ht index e18c3d5be..0da163c68 100644 --- a/installer/resources/proxy/dnfb-header.ht +++ b/installer/resources/proxy/dnfb-header.ht @@ -14,7 +14,7 @@ Proxy-Connection: close

_("Warning: Invalid Destination")

diff --git a/installer/resources/proxy/dnfh-header.ht b/installer/resources/proxy/dnfh-header.ht index 29a6c878e..9b9f29a0a 100644 --- a/installer/resources/proxy/dnfh-header.ht +++ b/installer/resources/proxy/dnfh-header.ht @@ -16,18 +16,18 @@ Proxy-Connection: close

_("Website Not Found in Addressbook")

_("The website was not found in your router's addressbook.") _("Check the link or find a Base 32 or Base 64 address.") -_("If you have the Base 64 address, {0}add it to your addressbook{1}.", "", "") +_("If you have the Base 64 address, {0}add it to your addressbook{1}.", "", "") _("Otherwise, find a Base 32 or address helper link, or use a jump service link below.")

-_("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscriptions{3} to your addressbook.", "", "", "", "") +_("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscriptions{3} to your addressbook.", "", "", "", "")


diff --git a/installer/resources/proxy/dnfp-header.ht b/installer/resources/proxy/dnfp-header.ht index 46bb0f6c8..213fce5d8 100644 --- a/installer/resources/proxy/dnfp-header.ht +++ b/installer/resources/proxy/dnfp-header.ht @@ -15,15 +15,15 @@ Proxy-Connection: close

_("Outproxy Not Found")

_("The HTTP Outproxy was not found.") _("It is offline, there is network congestion, or your router is not yet well-integrated with peers.") -_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") - -_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "", "") +_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") + +_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "", "")


_("Could not find the following destination:")

diff --git a/installer/resources/proxy/enc-header.ht b/installer/resources/proxy/enc-header.ht index b7bdea45f..882ea9427 100644 --- a/installer/resources/proxy/enc-header.ht +++ b/installer/resources/proxy/enc-header.ht @@ -13,7 +13,7 @@ Proxy-Connection: close

_("Website Unreachable")

diff --git a/installer/resources/proxy/encp-header.ht b/installer/resources/proxy/encp-header.ht index e3fe50217..d50cd7857 100644 --- a/installer/resources/proxy/encp-header.ht +++ b/installer/resources/proxy/encp-header.ht @@ -14,14 +14,14 @@ Proxy-Connection: close

_("Outproxy Unreachable")

_("The HTTP outproxy was not reachable, because it uses encryption options that are not supported by your I2P or Java version.") -_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") - -_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "", "") +_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") + +_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "", "")


_("Could not connect to the following destination:")

diff --git a/installer/resources/proxy/localhost-header.ht b/installer/resources/proxy/localhost-header.ht index ff3e0603b..9fccbaefb 100644 --- a/installer/resources/proxy/localhost-header.ht +++ b/installer/resources/proxy/localhost-header.ht @@ -15,7 +15,7 @@ Proxy-Connection: close Let's not infinite loop here.... ------------------------------>
diff --git a/installer/resources/proxy/nols-header.ht b/installer/resources/proxy/nols-header.ht index 4a31eeeea..561a24cd7 100644 --- a/installer/resources/proxy/nols-header.ht +++ b/installer/resources/proxy/nols-header.ht @@ -14,7 +14,7 @@ Proxy-Connection: close

_("Website Unreachable")

diff --git a/installer/resources/proxy/nolsp-header.ht b/installer/resources/proxy/nolsp-header.ht index 31ed0f62f..11580fb32 100644 --- a/installer/resources/proxy/nolsp-header.ht +++ b/installer/resources/proxy/nolsp-header.ht @@ -14,15 +14,15 @@ Proxy-Connection: close

_("Outproxy Not Found")

_("The HTTP outproxy was not reachable, because its lease set was not found.") _("The outproxy is probably down, but there could also be network congestion.") -_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") - -_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "", "") +_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") + +_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "", "")


_("Could not find the following destination:")

diff --git a/installer/resources/proxy/noproxy-header.ht b/installer/resources/proxy/noproxy-header.ht index c95891c37..c68b28ffe 100644 --- a/installer/resources/proxy/noproxy-header.ht +++ b/installer/resources/proxy/noproxy-header.ht @@ -13,7 +13,7 @@ Proxy-Connection: close

_("Warning: No Outproxy Configured")

diff --git a/installer/resources/proxy/protocol-header.ht b/installer/resources/proxy/protocol-header.ht index c48639258..c685b4006 100644 --- a/installer/resources/proxy/protocol-header.ht +++ b/installer/resources/proxy/protocol-header.ht @@ -13,7 +13,7 @@ Proxy-Connection: close

_("Warning: Non-HTTP Protocol")

diff --git a/installer/resources/proxy/reset-header.ht b/installer/resources/proxy/reset-header.ht index 0e0ec284b..4ed521179 100644 --- a/installer/resources/proxy/reset-header.ht +++ b/installer/resources/proxy/reset-header.ht @@ -14,7 +14,7 @@ Proxy-Connection: close

_("Connection Reset")

diff --git a/installer/resources/proxy/resetp-header.ht b/installer/resources/proxy/resetp-header.ht index 17e90af8d..fc6ca7186 100644 --- a/installer/resources/proxy/resetp-header.ht +++ b/installer/resources/proxy/resetp-header.ht @@ -1,4 +1,4 @@ -HTTP/1.1 403 Connection Reset + TTP/1.1 403 Connection Reset Content-Type: text/html; charset=UTF-8 Cache-Control: no-cache Connection: close @@ -6,7 +6,7 @@ Proxy-Connection: close -_("Connection Reset") +_("Connection Reset") @@ -14,17 +14,17 @@ Proxy-Connection: close

_("Connection Reset")

_("The connection to the proxy was reset.") _("The proxy could be temporarily unavailable, too busy, or it has blocked your access.") -_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") - -_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "", "") +_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") + +_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "", "")

-
-

_("Could not find the following destination:") +


+

_("Could not find the following destination:")