Merge branch 'update-direct-only-text-des-1310'

mullvad · Oct 14, 2024 · 12ccbe3 · 12ccbe3
2 parents 8f5955b + 901bd28
commit 12ccbe3
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 39 deletions.
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
@@ -1956,10 +1956,6 @@ msgctxt "vpn-settings-view"
 msgid "Malware"
 msgstr ""
 
-msgctxt "vpn-settings-view"
-msgid "Manually choose which %(daita)s-enabled server to use."
-msgstr ""
-
 msgctxt "vpn-settings-view"
 msgid "Server IP override"
 msgstr ""
@@ -2063,6 +2059,10 @@ msgctxt "wireguard-settings-view"
 msgid "%(daita)s (%(daitaFull)s) hides patterns in your encrypted VPN traffic."
 msgstr ""
 
+msgctxt "wireguard-settings-view"
+msgid "%(daita)s does this by carefully adding network noise and making all network packets the same size."
+msgstr ""
+
 #. Available placeholders:
 #. %(wireguard)s - Will be replaced with the string "WireGuard"
 msgctxt "wireguard-settings-view"
@@ -2078,19 +2078,19 @@ msgid "By enabling “%(directOnly)s” you will have to manually select a serve
 msgstr ""
 
 msgctxt "wireguard-settings-view"
-msgid "Cancel"
+msgid "By using sophisticated AI it’s possible to analyze the traffic of data packets going in and out of your device (even if the traffic is encrypted)."
 msgstr ""
 
 msgctxt "wireguard-settings-view"
-msgid "If anyone is monitoring your connection, this makes it significantly harder for them to identify what websites you are visiting."
+msgid "Cancel"
 msgstr ""
 
 msgctxt "wireguard-settings-view"
-msgid "IP version"
+msgid "If an observer monitors these data packets, %(daita)s makes it significantly harder for them to identify which websites you are visiting or with whom you are communicating."
 msgstr ""
 
 msgctxt "wireguard-settings-view"
-msgid "It does this by carefully adding network noise and making all network packets the same size."
+msgid "IP version"
 msgstr ""
 
 msgctxt "wireguard-settings-view"
@@ -2115,7 +2115,7 @@ msgid "Not all our servers are %(daita)s-enabled. In order to use the internet,
 msgstr ""
 
 msgctxt "wireguard-settings-view"
-msgid "Not all our servers are %(daita)s-enabled. We use multihop automatically to use %(daita)s with any server."
+msgid "Not all our servers are %(daita)s-enabled. Therefore, we use multihop automatically to enable %(daita)s with any server."
 msgstr ""
 
 msgctxt "wireguard-settings-view"

diff --git a/gui/src/renderer/components/DaitaSettings.tsx b/gui/src/renderer/components/DaitaSettings.tsx
@@ -34,16 +34,13 @@ const StyledContent = styled.div({
 
 const StyledHeaderSubTitle = styled(HeaderSubTitle)({
   display: 'inline-block',
+  fontWeight: 400,
 
   '&&:not(:last-child)': {
     paddingBottom: '18px',
   },
 });
 
-const EnableFooter = styled(Cell.CellFooter)({
-  paddingBottom: '16px',
-});
-
 export const StyledIllustration = styled.img({
   width: '100%',
   padding: '8px 0 8px',
@@ -82,25 +79,37 @@ export default function DaitaSettings() {
                       <StyledHeaderSubTitle>
                         {messages.pgettext(
                           'wireguard-settings-view',
-                          'If anyone is monitoring your connection, this makes it significantly harder for them to identify what websites you are visiting.',
+                          'By using sophisticated AI it’s possible to analyze the traffic of data packets going in and out of your device (even if the traffic is encrypted).',
+                        )}
+                      </StyledHeaderSubTitle>
+                      <StyledHeaderSubTitle>
+                        {sprintf(
+                          messages.pgettext(
+                            'wireguard-settings-view',
+                            'If an observer monitors these data packets, %(daita)s makes it significantly harder for them to identify which websites you are visiting or with whom you are communicating.',
+                          ),
+                          { daita: strings.daita },
                         )}
                       </StyledHeaderSubTitle>
                     </React.Fragment>,
                     <React.Fragment key="with-daita">
                       <StyledIllustration src="../../assets/images/daita-on-illustration.svg" />
                       <StyledHeaderSubTitle>
-                        {messages.pgettext(
-                          'wireguard-settings-view',
-                          'It does this by carefully adding network noise and making all network packets the same size.',
+                        {sprintf(
+                          messages.pgettext(
+                            'wireguard-settings-view',
+                            '%(daita)s does this by carefully adding network noise and making all network packets the same size.',
+                          ),
+                          { daita: strings.daita },
                         )}
                       </StyledHeaderSubTitle>
                       <StyledHeaderSubTitle>
                         {sprintf(
                           messages.pgettext(
                             'wireguard-settings-view',
-                            'Not all our servers are %(daita)s-enabled. We use multihop automatically to use %(daita)s with any server.',
+                            'Not all our servers are %(daita)s-enabled. Therefore, we use multihop automatically to enable %(daita)s with any server.',
                           ),
-                          { daita: strings.daita, daitaFull: strings.daitaFull },
+                          { daita: strings.daita },
                         )}
                       </StyledHeaderSubTitle>
                       <StyledHeaderSubTitle>
@@ -171,13 +180,6 @@ function DaitaToggle() {
             <Cell.Switch isOn={daita && !unavailable} onChange={setDaita} />
           </AriaInput>
         </Cell.Container>
-        {unavailable ? (
-          <EnableFooter>
-            <AriaDescription>
-              <Cell.CellFooterText>{featureUnavailableMessage()}</Cell.CellFooterText>
-            </AriaDescription>
-          </EnableFooter>
-        ) : null}
       </AriaInputGroup>
       <AriaInputGroup>
         <Cell.Container disabled={!daita || unavailable}>
@@ -191,19 +193,13 @@ function DaitaToggle() {
             <Cell.Switch isOn={directOnly && !unavailable} onChange={setDirectOnly} />
           </AriaInput>
         </Cell.Container>
-        <Cell.CellFooter>
-          <AriaDescription>
-            <Cell.CellFooterText>
-              {sprintf(
-                messages.pgettext(
-                  'vpn-settings-view',
-                  'Manually choose which %(daita)s-enabled server to use.',
-                ),
-                { daita: strings.daita },
-              )}
-            </Cell.CellFooterText>
-          </AriaDescription>
-        </Cell.CellFooter>
+        {unavailable ? (
+          <Cell.CellFooter>
+            <AriaDescription>
+              <Cell.CellFooterText>{featureUnavailableMessage()}</Cell.CellFooterText>
+            </AriaDescription>
+          </Cell.CellFooter>
+        ) : null}
       </AriaInputGroup>
       <ModalAlert
         isOpen={confirmationDialogVisible}