Revert "Merge branch 'main' into feature/language-localisation"

This reverts commit 1209459, reversing changes made to ce264df.
ivpn · Jun 13, 2024 · b8860aa · b8860aa
1 parent 10cf495
commit b8860aa
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 49 deletions.
diff --git a/nginx.conf b/nginx.conf
@@ -55,7 +55,6 @@ server {
 
     # Error 404 page
     error_page 404 /404.html;
-    error_page 404 /404.html;
     location = /404.html {
         root /var/www/static;
        internal;
@@ -284,9 +283,6 @@ server {
     rewrite ^/knowledgebase/android/what-permissions-does-your-app-require-and-why([^/])$ /knowledgebase/android/what-permissions-does-your-app-require-and-why/ permanent;
     rewrite ^/aboutus$ /team/ permanent;
     rewrite ^/why-ivpn$ /team/ permanent;
-    rewrite ^/knowledgebase/android/what-permissions-does-your-app-require-and-why([^/])$ /knowledgebase/android/what-permissions-does-your-app-require-and-why/ permanent;
-    rewrite ^/aboutus$ /team/ permanent;
-    rewrite ^/why-ivpn$ /team/ permanent;
     rewrite ^/ddwrt$ /setup/router/ddwrt/ permanent;
     rewrite ^/emails/ars-technica-wireguard$ https://arstechnica.com/gadgets/2018/12/testing-wireguard-with-an-early-adopter-vpn-service/ permanent;
     rewrite ^/releases$ / permanent;
@@ -299,7 +295,6 @@ server {
     rewrite ^/setup/android-changelog.html$ /apps-android/ permanent;
     rewrite ^/setup/mac-changelog.html$ /apps-macos/ permanent;
     rewrite ^/facts$ /team/ permanent;
-    rewrite ^/facts$ /team/ permanent;
     rewrite ^/press$ /contactus/ permanent;
     rewrite ^/what-is-a-tunnel$ /what-is-a-vpn/ permanent;
     rewrite ^/server-locations$ /status/ permanent;

diff --git a/src/config/_default/menus/menus.en.toml b/src/config/_default/menus/menus.en.toml
@@ -1,19 +1,19 @@
 [[main]]
     identifier = "team"
     name = "Team"
-    url = "/team/"
+    url = "/en/team/"
     weight = 10
 
   [[main]]
     identifier = "ethics"
     name = "Ethics"
-    url = "/ethics/"
+    url = "/en/ethics/"
     weight = 20
 
   [[main]]
     identifier = "privacy"
     name = "Privacy"
-    url = "/privacy/"
+    url = "/en/privacy/"
     weight = 30
 
   [[main]]
@@ -25,7 +25,7 @@
   [[main]]
     identifier = "prices"
     name = "Pricing"
-    url = "/pricing/"
+    url = "/en/pricing/"
     weight = 45
 
 
@@ -62,7 +62,7 @@
   [[footercolone]]
     identifier = "wireguard"
     name = "WireGuard® VPN"
-    url = "/wireguard/"
+    url = "/en/wireguard/"
     weight = 10
 
   [[footercolone]]
@@ -128,19 +128,19 @@
   [[footercolthree]]
     identifier = "tos"
     name = "Terms of Service"
-    url = "/tos/"
+    url = "/en/tos/"
     weight = 30
 
   [[footercolthree]]
     identifier = "privacy-policy"
     name = "Privacy Policy"
-    url = "/privacy/"
+    url = "/en/privacy/"
     weight = 50
 
   [[footercolthree]]
     identifier = "refund-policy"
     name = "Refund Policy"
-    url = "/refunds/"
+    url = "/en/refunds/"
     weight = 60
 
   [[footercolfour]]

diff --git a/src/config/_default/menus/menus.es.toml b/src/config/_default/menus/menus.es.toml
@@ -62,7 +62,7 @@
   [[footercolone]]
     identifier = "wireguard"
     name = "WireGuard® VPN"
-    url = "/wireguard/"
+    url = "/es/wireguard/"
     weight = 10
 
   [[footercolone]]
@@ -97,7 +97,7 @@
 
   [[footercoltwo]]
     identifier = "transparency-report"
-    name = "Transparency Report"
+    name = "Informe de transparencia"
     url = "/es/transparency-report/"
     weight = 30
 

diff --git a/src/content/en/pages/apps-linux.md b/src/content/en/pages/apps-linux.md
@@ -3,7 +3,10 @@ title: IVPN for Linux - Open-source VPN app for Linux
 description: IVPN for Linux offers you comprehensive privacy leak protection with the IVPN firewall, automatic connection on insecure Wi-Fi and Multi-hop.
 h1: IVPN for Linux
 subtitle: Supports 64-bit Linux 3.10+
-url: /apps-linux/
+url: /en/apps-linux/
+aliases: ['/apps-linux/']
+params:
+  translated: true
 platform: linux
 layout: apps-single
 imageLight: /images-static/uploads/apps/[email protected]
@@ -219,19 +222,19 @@ IVPN client can be installed on [Fedora Silverblue](/knowledgebase/linux/fedora-
 
 ### .DEB
 
-[Base package](https://repo.ivpn.net/stable/pool/ivpn_3.14.14_amd64.deb)  
-SHA256: 123cc46bd12baede70fbf3e8db013ee248fe1faa9090af9ff3c6a8dcc60cc27d  
+[Base package](https://repo.ivpn.net/stable/pool/ivpn_3.14.2_amd64.deb)  
+SHA256: 12d1005eeb92c5b35bf83b9df51317ec4ac08efc6fbb7ab01e962250f23b891d  
 
-[UI package](https://repo.ivpn.net/stable/pool/ivpn-ui_3.14.14_amd64.deb)  
-SHA256: 9cc74190cc567d4f6d813311c9fcba51695280c9776754150a251032f36ee941  
+[UI package](https://repo.ivpn.net/stable/pool/ivpn-ui_3.14.2_amd64.deb)  
+SHA256: f64cd84b4e0ce252f0c066977d180b953c55f2b485cf7a5437b1e4c7af1959f7  
 
 ### .RPM
 
-[Base package](https://repo.ivpn.net/stable/pool/ivpn-3.14.14-1.x86_64.rpm)  
-SHA256: e65c72e34f75dcac0e4113584fb0687c2852fa5bdea03bde287a0344147297e1  
+[Base package](https://repo.ivpn.net/stable/pool/ivpn-3.14.2-1.x86_64.rpm)  
+SHA256: 45dba6b5a281646bde6b6651661092024aafc0165268e3245fb515dabb866996  
 
-[UI package](https://repo.ivpn.net/stable/pool/ivpn-ui-3.14.14-1.x86_64.rpm)  
-SHA256: cadddb72584b75e5ca6d2df8de5424e3e3bad9547b02a675ff6e14713311f15c  
+[UI package](https://repo.ivpn.net/stable/pool/ivpn-ui-3.14.2-1.x86_64.rpm)  
+SHA256: 0b3602497cf599060e44b0912923f3a5bc2f9325c8d34856bc7ef2eb019bb6ee  
 
 ## Install from Source Code {#source}
 

diff --git a/src/content/en/pages/apps-macos.md b/src/content/en/pages/apps-macos.md
@@ -3,7 +3,10 @@ title: IVPN for macOS - Open-source VPN app for your Mac
 description: IVPN for macOS offers you comprehensive privacy leak protection with the IVPN firewall, automatic connection on insecure Wi-Fi and Multi-hop.
 h1: IVPN for macOS
 subtitle: Supports macOS 10.14+
-url: /apps-macos/
+url: /en/apps-macos/
+aliases: ['/apps-macos/']
+params:
+  translated: true
 platform: macos
 layout: apps
 image: apps/macos-app

diff --git a/src/content/en/pages/apps-windows.md b/src/content/en/pages/apps-windows.md
@@ -3,7 +3,10 @@ title: IVPN for Windows - Open-source VPN app for your Windows PC
 description: IVPN for Windows offers you comprehensive privacy leak protection with the IVPN firewall, automatic connection on insecure Wi-Fi and Multi-hop.
 h1: IVPN for Windows
 subtitle: Supports Windows 10 / 11 (64-bit)
-url: /apps-windows/
+url: /en/apps-windows/
+aliases: ['/apps-windows/']
+params:
+  translated: true
 platform: windows
 layout: apps
 image: apps/windows-app-3.3.7

diff --git a/src/content/en/pages/ethics.md b/src/content/en/pages/ethics.md
@@ -1,7 +1,10 @@
 ---
 title: Ethical guidelines for privacy protection | IVPN
 description: Learn about the privacy-first ethical direction we follow. We explain how we approach transparency and how/what we communicate to new customers.
-url: /ethics/
+url: /en/ethics/
+aliases: ['/ethics/']
+params:
+  translated: true
 sections:
   - type: text_one_narrow_column
     content: >-

diff --git a/src/content/en/pages/home.md b/src/content/en/pages/home.md
@@ -2,6 +2,8 @@
 title: VPN for Privacy & Security | IVPN | Resist Online Surveillance
 description: Audited, open-source VPN service with WireGuard, killswitch and tracker blocker. No logs, no false promises. Anonymous signup with 30 day money back guarantee.
 url: /en/
+params:
+  translated: true
 isMenuCta: false
 hasSeperator: false
 sections:

diff --git a/src/content/en/pages/pricing.md b/src/content/en/pages/pricing.md
@@ -1,6 +1,9 @@
 ---
 title: IVPN Pricing - VPN subscription with anonymous registration
 description: Generate an IVPN Standard or Pro account - no email address required. We accept credit cards, Paypal, Bitcoin or cash payments. 30-day money-back guarantee.
-url: /pricing/
+url: /en/pricing/
+aliases: ['/pricing/']
+params:
+  translated: true
 layout: application
 ---
diff --git a/src/content/en/pages/refunds.md b/src/content/en/pages/refunds.md
@@ -1,6 +1,9 @@
 ---
 title: IVPN Refund Policy and Process
-url: /refunds/
+url: /en/refunds/
+aliases: ['/refunds/']
+params:
+  translated: true
 ---
 # Refunds
 

diff --git a/src/content/en/pages/team.md b/src/content/en/pages/team.md
@@ -1,6 +1,9 @@
 ---
 title: IVPN Team
-url: /team/
+url: /en/team/
+aliases: ['/team/']
+params:
+  translated: true
 sections:
   - type: heading_text_cta_one_column
     content: >-

diff --git a/src/content/en/pages/terms-of-service.md b/src/content/en/pages/terms-of-service.md
@@ -1,6 +1,9 @@
 ---
 title: IVPN Terms of Service
-url: /tos/
+url: /en/tos/
+aliases: ['/tos/']
+params:
+  translated: true
 layout:
 canonical:
 ---

diff --git a/src/content/en/pages/wireguard-vpn.md b/src/content/en/pages/wireguard-vpn.md
@@ -1,7 +1,10 @@
 ---
 title: WireGuard VPN protocol for privacy - start using with IVPN
 description: WireGuard is a revolutionary VPN protocol that promises better security and faster speeds compared to existing solutions. IVPN offers WireGuard in our Windows, macOS, Linux, Android and iOS apps. Get set up and running with WireGuard VPN in two minutes.
-url: /wireguard/
+url: /en/wireguard/
+aliases: ['/wireguard/']
+params:
+  translated: true
 ---
 # WireGuard<sup>®</sup> VPN
 

diff --git a/src/static/resources/canary.txt b/src/static/resources/canary.txt
@@ -13,35 +13,35 @@ The current message is here:
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-As of 2024-06-03 no warrants have ever been served to IVPN or IVPN employees. No searches or seizures of any kind have ever been performed on IVPN assets. IVPN has no direct or indirect knowledge of any backdoors, or potential backdoors in our servers or network and IVPN has not received any requests to implement a backdoor. IVPN has never disclosed any user communications to any third party.
+As of 2024-05-03 no warrants have ever been served to IVPN or IVPN employees. No searches or seizures of any kind have ever been performed on IVPN assets. IVPN has no direct or indirect knowledge of any backdoors, or potential backdoors in our servers or network and IVPN has not received any requests to implement a backdoor. IVPN has never disclosed any user communications to any third party.
 
 Source: mempool.space (https://mempool.space/blocks)
 
-height: 846299
-hash: 0000000000000000000262902444fcde8fdbda228c560cb6b724d93a4516a2da
+height: 841873
+hash: 00000000000000000000e6eecf0ecd283943c8a16e64c21cebac6ba7332ff43f
 
 
 Source: FT (https://www.ft.com/news-feed)
 
-FirstFT: Russia-China gas pipeline deal hits snag
-Also in today’s newsletter, Labour unveils ex-military candidates and ‘green shoots’ in European dealmaking
+FirstFT: Labour wins Blackpool South in blow to Rishi Sunak and Tories
+Also in today’s newsletter, South African regulator on Anglo American bid and Big Read on Russia’s frozen assets
 
-Upskilling
-Technology, demography and shifts in demand are disrupting the world of work. Thousands of jobs are expected to change in coming years, requiring new skills training for staff of all ages. This report looks at how companies and employees are adapting
+US High School Economics class: AI could kill off most call centres, says Tata Consultancy Services head
+Macroeconomics
 
-Are we getting inflation right? With Neel Kashkari
-Soumaya Keynes talks to the president of the Minneapolis Fed
+US High School Economics class: Music and sports fans told: brace for a summer of ticket scams
+Personal finance
 
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEEXxDK46RlUWr/x/EkisFrnrZHumkFAmZdTg0ACgkQisFrnrZH
-umn4WwgApot22FQ4oWKGcSA/xdxO18nVIYai+Zo0TNuN622+6ZmTdRZ6rr/bNmc5
-3rE3uTjxXrMAG45ChPqVtAyJH0TMIV0+WD6erAFB+KivPTFfvWxhafSKW55ROPCm
-jKSkgjCu9qWzO6PE+0wN/0DmczJyV0Qa4v9upyK76abymgfmr6cZxWypF9j2Oo7b
-o1EWFZ3WRbWux/chjKsTiQpnIif5tmWEKRGWcst1Tesa9JVT52hpWwbytyt8/nz8
-V5Zirqilyc2bY0UQT/yz1jiFwHkt5fp6wfU+gWSifDshCWlqUclcStWoKN/Z256E
-Nt5zfhe/vFRwUh7lg4xdl7Z8hMpexA==
-=DNsb
+iQEzBAEBCAAdFiEEXxDK46RlUWr/x/EkisFrnrZHumkFAmY0b44ACgkQisFrnrZH
+umk/4QgAumb1ihk+IZpfJm+1VJTvUn55PIcXpcT4GvPTZa81PAduy3oOV4zng4k7
+OIoHuQW88pMpQ+uHoieRbf5EHCz7SgBgW6xs2zQn/cxwnWoCNlvzhzpxfQcGqqfT
+aPXTtTka7Q5mnOZ7d/jc6nWhe3a5ObGDO4JJYJ1jcsYNJrZC7NG4zNmB7JAQ9iqJ
+34luEsbuJRDsEw6vEE3D373BYTpxZecJYk15egGcOIgqxthhtww236XY1lueikyM
+t4znBzkCe/f9uQPziBqUkjDDYztkKvmP7RPf/fhO0fEcBOBSZUF338MU/Vj9Uo4o
+FS6uMpVHsKZITG1227wwUC5t4pV0bQ==
+=InC8
 -----END PGP SIGNATURE-----