From 4e57392259b6f4f3cbefb3f87317aea5ad9dc9c6 Mon Sep 17 00:00:00 2001
From: Alex Gibson <alexgibson@users.noreply.github.com>
Date: Tue, 15 Aug 2023 19:03:10 +0100
Subject: [PATCH] Update sys requirements for Mozilla VPN on Linux (Fixes
 #13442) (#13551)

---
 bedrock/products/templates/products/vpn/download.html | 4 ++--
 bedrock/products/templates/products/vpn/landing.html  | 8 +-------
 l10n/en/products/vpn/landing.ftl                      | 8 ++------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/bedrock/products/templates/products/vpn/download.html b/bedrock/products/templates/products/vpn/download.html
index 5827faadf17..f196700eebd 100644
--- a/bedrock/products/templates/products/vpn/download.html
+++ b/bedrock/products/templates/products/vpn/download.html
@@ -106,7 +106,7 @@ <h2>{{ ftl('vpn-download-for-mac-long', fallback='vpn-download-for-mac') }}</h2>
           <div class="platform-body">
             <h2>{{ ftl('vpn-download-for-linux-long', fallback='vpn-download-for-linux') }}</h2>
             <p class="current-platform-lede">{{ ftl('vpn-download-based-on-your') }}</p>
-            <p>{{ ftl('vpn-download-for-linux-requirements', version='18.04') }}</p>
+            <p>{{ ftl('vpn-download-for-linux-requirements', version='20.04') }}</p>
             <a class="mzp-c-button" href="{{ linux_download_url }}" data-cta-type="button" data-cta-text="VPN Download (Linux)" class="platform-download-link">
             {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }}
             </a>
@@ -178,7 +178,7 @@ <h2>{{ ftl('vpn-download-for-mac') }}</h2>
           </div>
           <div class="platform-body">
             <h2>{{ ftl('vpn-download-for-linux') }}</h2>
-            <p>{{ ftl('vpn-download-for-linux-requirements', version='18.04') }}</p>
+            <p>{{ ftl('vpn-download-for-linux-requirements', version='20.04') }}</p>
           </div>
           <a href="{{ linux_download_url }}" data-cta-type="button" data-cta-text="VPN Download (Linux)" class="platform-download-link">
             <span class="visually-hidden">{{ ftl('vpn-download-for-linux-long') }}</span>
diff --git a/bedrock/products/templates/products/vpn/landing.html b/bedrock/products/templates/products/vpn/landing.html
index 8290e075ffd..b7c6fb4539d 100644
--- a/bedrock/products/templates/products/vpn/landing.html
+++ b/bedrock/products/templates/products/vpn/landing.html
@@ -351,13 +351,7 @@ <h3>{{ ftl('vpn-landing-faq-compatibility-question-heading') }}</h3>
           {% endif %}
         </li>
         <li>
-          {% if ftl_has_messages('vpn-landing-faq-compatibility-question-desc-linux-v3') %}
-            {{ ftl('vpn-landing-faq-compatibility-question-desc-linux-v3', url=url('products.vpn.platforms.linux')) }}
-          {% elif ftl_has_messages('vpn-landing-faq-compatibility-question-desc-linux-v2') %}
-            {{ ftl('vpn-landing-faq-compatibility-question-desc-linux-v2', url=url('products.vpn.platforms.linux')) }}
-          {% else %}
-            {{ ftl('vpn-landing-faq-compatibility-question-desc-linux') }}
-          {% endif %}
+          {{ ftl('vpn-landing-faq-compatibility-question-desc-linux-v4', fallback='vpn-landing-faq-compatibility-question-desc-linux-v3', url=url('products.vpn.platforms.linux')) }}
         </li>
       </ul>
     </details>
diff --git a/l10n/en/products/vpn/landing.ftl b/l10n/en/products/vpn/landing.ftl
index 47f550d7135..0b459aa9897 100644
--- a/l10n/en/products/vpn/landing.ftl
+++ b/l10n/en/products/vpn/landing.ftl
@@ -146,15 +146,11 @@ vpn-landing-faq-compatibility-question-desc-ios-v3 = <a href="{ $url }">{ -brand
 
 # Variables:
 #   $url (url) - link to https://www.mozilla.org/products/vpn/desktop/linux/
-vpn-landing-faq-compatibility-question-desc-linux-v3 = <a href="{ $url }">{ -brand-name-linux }</a> ({ -brand-name-ubuntu } 18.04 and up)
+vpn-landing-faq-compatibility-question-desc-linux-v4 = <a href="{ $url }">{ -brand-name-linux }</a> ({ -brand-name-ubuntu } 20.04 and up)
 
 # Outdated string
-# Variables:
 #   $url (url) - link to https://www.mozilla.org/products/vpn/desktop/linux/
-vpn-landing-faq-compatibility-question-desc-linux-v2 = <a href="{ $url }">{ -brand-name-linux }</a> ({ -brand-name-ubuntu }-only)
-
-# Outdated string
-vpn-landing-faq-compatibility-question-desc-linux = { -brand-name-linux } ({ -brand-name-ubuntu }-only)
+vpn-landing-faq-compatibility-question-desc-linux-v3 = <a href="{ $url }">{ -brand-name-linux }</a> ({ -brand-name-ubuntu } 18.04 and up)
 
 vpn-landing-faq-refund-question-heading = What is { -brand-name-mozilla-vpn }’s refund policy?