From 15a46cb3f040c624d98a1450c5baaa001fce2222 Mon Sep 17 00:00:00 2001
From: Thomas Belin <thomasbelin4@gmail.com>
Date: Wed, 17 Jan 2024 13:36:19 +0100
Subject: [PATCH 1/5] test: improve api of useAppSoftLock hook (#16537)

---
 .../components/AppContainer/AppContainer.tsx  |  17 +--
 src/script/components/AppLoader/AppLoader.tsx |   4 +-
 src/script/hooks/useAppSoftLock.test.ts       |  98 ++++++++++++
 src/script/hooks/useAppSoftLock.ts            |  38 ++---
 src/script/page/AppMain.tsx                   | 141 +++++++++---------
 5 files changed, 187 insertions(+), 111 deletions(-)
 create mode 100644 src/script/hooks/useAppSoftLock.test.ts

diff --git a/src/script/components/AppContainer/AppContainer.tsx b/src/script/components/AppContainer/AppContainer.tsx
index 8ac37de7507..cf688d00351 100644
--- a/src/script/components/AppContainer/AppContainer.tsx
+++ b/src/script/components/AppContainer/AppContainer.tsx
@@ -77,10 +77,7 @@ export const AppContainer: FC<AppProps> = ({config, clientType}) => {
 
   const {repository: repositories} = app;
 
-  const {isFreshMLSSelfClient, softLockLoaded = false} = useAppSoftLock(
-    repositories.calling,
-    repositories.notification,
-  );
+  const {softLockEnabled} = useAppSoftLock(repositories.calling, repositories.notification);
 
   if (hasOtherInstance) {
     app.redirectToLogin(SIGN_OUT_REASON.MULTIPLE_TABS);
@@ -90,15 +87,9 @@ export const AppContainer: FC<AppProps> = ({config, clientType}) => {
   return (
     <>
       <AppLoader init={onProgress => app.initApp(clientType, onProgress)}>
-        {selfUser => (
-          <AppMain
-            app={app}
-            selfUser={selfUser}
-            mainView={mainView}
-            softLockLoaded={softLockLoaded}
-            isFreshMLSSelfClient={isFreshMLSSelfClient}
-          />
-        )}
+        {selfUser => {
+          return <AppMain app={app} selfUser={selfUser} mainView={mainView} locked={softLockEnabled} />;
+        }}
       </AppLoader>
       <StyledApp themeId={THEME_ID.DEFAULT} css={{backgroundColor: 'unset', height: '100%'}}>
         <PrimaryModalComponent />
diff --git a/src/script/components/AppLoader/AppLoader.tsx b/src/script/components/AppLoader/AppLoader.tsx
index 8a99f84420a..fce8f22e445 100644
--- a/src/script/components/AppLoader/AppLoader.tsx
+++ b/src/script/components/AppLoader/AppLoader.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {FC, ReactElement, useEffect, useRef, useState} from 'react';
+import {FC, ReactNode, useEffect, useRef, useState} from 'react';
 
 import {LoadingBar} from 'Components/LoadingBar/LoadingBar';
 
@@ -27,7 +27,7 @@ import {User} from '../../entity/User';
 
 interface AppLoaderProps {
   init: (onProgress: (progress: number, message?: string) => void) => Promise<User | undefined>;
-  children: (selfUser: User) => ReactElement;
+  children: (selfUser: User) => ReactNode;
 }
 
 interface LoadingProgress {
diff --git a/src/script/hooks/useAppSoftLock.test.ts b/src/script/hooks/useAppSoftLock.test.ts
new file mode 100644
index 00000000000..67c18e0ad7d
--- /dev/null
+++ b/src/script/hooks/useAppSoftLock.test.ts
@@ -0,0 +1,98 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {renderHook} from '@testing-library/react';
+
+import {useAppSoftLock} from './useAppSoftLock';
+
+import {CallingRepository} from '../calling/CallingRepository';
+import {isE2EIEnabled, E2EIHandler} from '../E2EIdentity';
+import {NotificationRepository} from '../notification/NotificationRepository';
+
+const isE2EIEnabledMock = isE2EIEnabled as jest.MockedFn<typeof isE2EIEnabled>;
+const E2EIHandlerMock = E2EIHandler as jest.Mocked<typeof E2EIHandler>;
+
+jest.mock('../E2EIdentity', () => ({
+  isE2EIEnabled: jest.fn(),
+  E2EIHandler: {
+    getInstance: jest.fn(),
+  },
+}));
+
+describe('useAppSoftLock', () => {
+  const callingRepository = {setSoftLock: jest.fn()} as unknown as CallingRepository;
+  const notificationRepository = {setSoftLock: jest.fn()} as unknown as NotificationRepository;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should not do anything if e2ei is not enabled', () => {
+    const {result} = renderHook(() => useAppSoftLock(callingRepository, notificationRepository));
+    expect(result.current).toEqual({softLockEnabled: false});
+    expect(callingRepository.setSoftLock).not.toHaveBeenCalledWith(true);
+    expect(notificationRepository.setSoftLock).not.toHaveBeenCalledWith(true);
+  });
+
+  it('should set soft lock to true if the user has used up the entire grace period', async () => {
+    isE2EIEnabledMock.mockReturnValue(true);
+    E2EIHandlerMock.getInstance.mockReturnValue({
+      on: jest.fn((eventName, callback) => callback({enrollmentConfig: {timer: {isSnoozeTimeAvailable: () => false}}})),
+      off: jest.fn(),
+    } as any);
+
+    const {result} = renderHook(() => useAppSoftLock(callingRepository, notificationRepository));
+
+    expect(result.current.softLockEnabled).toBe(true);
+    expect(callingRepository.setSoftLock).toHaveBeenCalledWith(true);
+    expect(notificationRepository.setSoftLock).toHaveBeenCalledWith(true);
+  });
+
+  it('should set softLock if the device is a fresh new device', async () => {
+    isE2EIEnabledMock.mockReturnValue(true);
+    E2EIHandlerMock.getInstance.mockReturnValue({
+      on: jest.fn((eventName, callback) =>
+        callback({enrollmentConfig: {timer: {isSnoozeTimeAvailable: () => true}, isFreshMLSSelfClient: true}}),
+      ),
+      off: jest.fn(),
+    } as any);
+
+    const {result} = renderHook(() => useAppSoftLock(callingRepository, notificationRepository));
+
+    expect(result.current.softLockEnabled).toBe(true);
+    expect(callingRepository.setSoftLock).toHaveBeenCalledWith(true);
+    expect(notificationRepository.setSoftLock).toHaveBeenCalledWith(true);
+  });
+
+  it('should not set softLock if the device is an old device and the grace period is not expireds', async () => {
+    isE2EIEnabledMock.mockReturnValue(true);
+    E2EIHandlerMock.getInstance.mockReturnValue({
+      on: jest.fn((eventName, callback) =>
+        callback({enrollmentConfig: {timer: {isSnoozeTimeAvailable: () => true}, isFreshMLSSelfClient: false}}),
+      ),
+      off: jest.fn(),
+    } as any);
+
+    const {result} = renderHook(() => useAppSoftLock(callingRepository, notificationRepository));
+
+    expect(result.current.softLockEnabled).toBe(false);
+    expect(callingRepository.setSoftLock).not.toHaveBeenCalledWith(true);
+    expect(notificationRepository.setSoftLock).not.toHaveBeenCalledWith(true);
+  });
+});
diff --git a/src/script/hooks/useAppSoftLock.ts b/src/script/hooks/useAppSoftLock.ts
index 6274a50bf86..51ee49e77d7 100644
--- a/src/script/hooks/useAppSoftLock.ts
+++ b/src/script/hooks/useAppSoftLock.ts
@@ -17,7 +17,7 @@
  *
  */
 
-import {useEffect, useState} from 'react';
+import {useCallback, useEffect, useState} from 'react';
 
 import {CallingRepository} from '../calling/CallingRepository';
 import {E2EIHandler, EnrollmentConfig, isE2EIEnabled, WireIdentity} from '../E2EIdentity';
@@ -25,28 +25,20 @@ import {shouldEnableSoftLock} from '../E2EIdentity/DelayTimer/delay';
 import {NotificationRepository} from '../notification/NotificationRepository';
 
 export function useAppSoftLock(callingRepository: CallingRepository, notificationRepository: NotificationRepository) {
-  const [freshMLSSelfClient, setFreshMLSSelfClient] = useState(false);
-  const [softLockLoaded, setSoftLockLoaded] = useState(false);
-
   const e2eiEnabled = isE2EIEnabled();
 
-  const setAppSoftLock = (isLocked: boolean) => {
-    setFreshMLSSelfClient(isLocked);
-    setSoftLockLoaded(true);
-    callingRepository.setSoftLock(isLocked);
-    notificationRepository.setSoftLock(isLocked);
-  };
-
-  const handleSoftLockActivation = ({
-    enrollmentConfig,
-    identity,
-  }: {
-    enrollmentConfig: EnrollmentConfig;
-    identity: WireIdentity;
-  }) => {
-    const isSoftLockEnabled = shouldEnableSoftLock(enrollmentConfig, identity);
-    setAppSoftLock(isSoftLockEnabled);
-  };
+  const [softLockEnabled, setSoftLockEnabled] = useState(false);
+
+  const handleSoftLockActivation = useCallback(
+    ({enrollmentConfig, identity}: {enrollmentConfig: EnrollmentConfig; identity?: WireIdentity}) => {
+      const isSoftLockEnabled = shouldEnableSoftLock(enrollmentConfig, identity);
+
+      setSoftLockEnabled(isSoftLockEnabled);
+      callingRepository.setSoftLock(isSoftLockEnabled);
+      notificationRepository.setSoftLock(isSoftLockEnabled);
+    },
+    [callingRepository, notificationRepository],
+  );
 
   useEffect(() => {
     if (!e2eiEnabled) {
@@ -57,7 +49,7 @@ export function useAppSoftLock(callingRepository: CallingRepository, notificatio
     return () => {
       E2EIHandler.getInstance().off('identityUpdated', handleSoftLockActivation);
     };
-  }, [e2eiEnabled]);
+  }, [e2eiEnabled, handleSoftLockActivation]);
 
-  return {isFreshMLSSelfClient: freshMLSSelfClient, softLockLoaded: e2eiEnabled ? softLockLoaded : true};
+  return {softLockEnabled};
 }
diff --git a/src/script/page/AppMain.tsx b/src/script/page/AppMain.tsx
index 74329e9f446..9e7ad5ed13a 100644
--- a/src/script/page/AppMain.tsx
+++ b/src/script/page/AppMain.tsx
@@ -69,8 +69,8 @@ interface AppMainProps {
   selfUser: User;
   mainView: MainViewModel;
   conversationState?: ConversationState;
-  isFreshMLSSelfClient: boolean;
-  softLockLoaded: boolean;
+  /** will block the user from being able to interact with the application (no notifications and no messages will be shown) */
+  locked: boolean;
 }
 
 export const AppMain: FC<AppMainProps> = ({
@@ -78,8 +78,7 @@ export const AppMain: FC<AppMainProps> = ({
   mainView,
   selfUser,
   conversationState = container.resolve(ConversationState),
-  isFreshMLSSelfClient,
-  softLockLoaded = false,
+  locked,
 }) => {
   const apiContext = app.getAPIContext();
 
@@ -212,10 +211,10 @@ export const AppMain: FC<AppMainProps> = ({
   }, []);
 
   useLayoutEffect(() => {
-    if (!isFreshMLSSelfClient) {
+    if (!locked) {
       initializeApp();
     }
-  }, [isFreshMLSSelfClient]);
+  }, [locked]);
 
   return (
     <StyledApp
@@ -225,77 +224,73 @@ export const AppMain: FC<AppMainProps> = ({
       data-uie-name="status-webapp"
       data-uie-value="is-loaded"
     >
-      {softLockLoaded && (
-        <>
-          {!isFreshMLSSelfClient && <WindowTitleUpdater />}
-          <RootProvider value={mainView}>
-            <ErrorBoundary FallbackComponent={ErrorFallback}>
-              {!isFreshMLSSelfClient && (
-                <div id="app" className="app">
-                  {(!smBreakpoint || isLeftSidebarVisible) && (
-                    <LeftSidebar
-                      listViewModel={mainView.list}
-                      selfUser={selfUser}
-                      isActivatedAccount={isActivatedAccount}
-                    />
-                  )}
-
-                  {(!smBreakpoint || !isLeftSidebarVisible) && (
-                    <MainContent
-                      selfUser={selfUser}
-                      isRightSidebarOpen={!!currentState}
-                      openRightSidebar={toggleRightSidebar}
-                      reloadApp={app.refresh}
-                    />
-                  )}
-
-                  {currentState && (
-                    <RightSidebar
-                      lastViewedMessageDetailsEntity={lastViewedMessageDetailsEntity}
-                      currentEntity={currentEntity}
-                      repositories={repositories}
-                      actionsViewModel={mainView.actions}
-                      isFederated={mainView.isFederated}
-                      teamState={teamState}
-                      selfUser={selfUser}
-                      userState={userState}
-                    />
-                  )}
-                </div>
+      {!locked && <WindowTitleUpdater />}
+      <RootProvider value={mainView}>
+        <ErrorBoundary FallbackComponent={ErrorFallback}>
+          {!locked && (
+            <div id="app" className="app">
+              {(!smBreakpoint || isLeftSidebarVisible) && (
+                <LeftSidebar
+                  listViewModel={mainView.list}
+                  selfUser={selfUser}
+                  isActivatedAccount={isActivatedAccount}
+                />
               )}
 
-              <AppLock clientRepository={repositories.client} />
-              <WarningsContainer onRefresh={app.refresh} />
-
-              {!isFreshMLSSelfClient && (
-                <>
-                  <FeatureConfigChangeNotifier selfUserId={selfUser.id} teamState={teamState} />
-                  <FeatureConfigChangeHandler teamState={teamState} />
-                  <CallingContainer
-                    multitasking={mainView.multitasking}
-                    callingRepository={repositories.calling}
-                    mediaRepository={repositories.media}
-                  />
-
-                  <LegalHoldModal
-                    selfUser={selfUser}
-                    conversationRepository={repositories.conversation}
-                    searchRepository={repositories.search}
-                    teamRepository={repositories.team}
-                    clientRepository={repositories.client}
-                    messageRepository={repositories.message}
-                    cryptographyRepository={repositories.cryptography}
-                  />
-                </>
+              {(!smBreakpoint || !isLeftSidebarVisible) && (
+                <MainContent
+                  selfUser={selfUser}
+                  isRightSidebarOpen={!!currentState}
+                  openRightSidebar={toggleRightSidebar}
+                  reloadApp={app.refresh}
+                />
               )}
 
-              {/*The order of these elements matter to show proper modals stack upon each other*/}
-              <UserModal selfUser={selfUser} userRepository={repositories.user} />
-              <GroupCreationModal userState={userState} teamState={teamState} />
-            </ErrorBoundary>
-          </RootProvider>
-        </>
-      )}
+              {currentState && (
+                <RightSidebar
+                  lastViewedMessageDetailsEntity={lastViewedMessageDetailsEntity}
+                  currentEntity={currentEntity}
+                  repositories={repositories}
+                  actionsViewModel={mainView.actions}
+                  isFederated={mainView.isFederated}
+                  teamState={teamState}
+                  selfUser={selfUser}
+                  userState={userState}
+                />
+              )}
+            </div>
+          )}
+
+          <AppLock clientRepository={repositories.client} />
+          <WarningsContainer onRefresh={app.refresh} />
+
+          {!locked && (
+            <>
+              <FeatureConfigChangeNotifier selfUserId={selfUser.id} teamState={teamState} />
+              <FeatureConfigChangeHandler teamState={teamState} />
+              <CallingContainer
+                multitasking={mainView.multitasking}
+                callingRepository={repositories.calling}
+                mediaRepository={repositories.media}
+              />
+
+              <LegalHoldModal
+                selfUser={selfUser}
+                conversationRepository={repositories.conversation}
+                searchRepository={repositories.search}
+                teamRepository={repositories.team}
+                clientRepository={repositories.client}
+                messageRepository={repositories.message}
+                cryptographyRepository={repositories.cryptography}
+              />
+            </>
+          )}
+
+          {/*The order of these elements matter to show proper modals stack upon each other*/}
+          <UserModal selfUser={selfUser} userRepository={repositories.user} />
+          <GroupCreationModal userState={userState} teamState={teamState} />
+        </ErrorBoundary>
+      </RootProvider>
     </StyledApp>
   );
 };

From 6ca3d2d5fca8770b47a4e1a95664ea5ec678faa7 Mon Sep 17 00:00:00 2001
From: Otto the Bot <webapp+otto@wire.com>
Date: Wed, 17 Jan 2024 14:10:10 +0100
Subject: [PATCH 2/5] chore: Update translations (#16535)

---
 src/i18n/ar-SA.json | 13 ++++++++++---
 src/i18n/bn-BD.json | 13 ++++++++++---
 src/i18n/ca-ES.json | 13 ++++++++++---
 src/i18n/cs-CZ.json | 13 ++++++++++---
 src/i18n/da-DK.json | 13 ++++++++++---
 src/i18n/de-DE.json | 15 +++++++++++----
 src/i18n/el-GR.json | 13 ++++++++++---
 src/i18n/en-US.json | 12 ++++++------
 src/i18n/es-ES.json | 13 ++++++++++---
 src/i18n/et-EE.json | 13 ++++++++++---
 src/i18n/fa-IR.json | 13 ++++++++++---
 src/i18n/fi-FI.json | 13 ++++++++++---
 src/i18n/fr-FR.json | 13 ++++++++++---
 src/i18n/ga-IE.json | 13 ++++++++++---
 src/i18n/he-IL.json | 13 ++++++++++---
 src/i18n/hi-IN.json | 13 ++++++++++---
 src/i18n/hr-HR.json | 13 ++++++++++---
 src/i18n/hu-HU.json | 13 ++++++++++---
 src/i18n/id-ID.json | 13 ++++++++++---
 src/i18n/is-IS.json | 13 ++++++++++---
 src/i18n/it-IT.json | 13 ++++++++++---
 src/i18n/ja-JP.json | 13 ++++++++++---
 src/i18n/lt-LT.json | 13 ++++++++++---
 src/i18n/lv-LV.json | 13 ++++++++++---
 src/i18n/ms-MY.json | 13 ++++++++++---
 src/i18n/nl-NL.json | 13 ++++++++++---
 src/i18n/no-NO.json | 13 ++++++++++---
 src/i18n/pl-PL.json | 13 ++++++++++---
 src/i18n/pt-BR.json | 13 ++++++++++---
 src/i18n/pt-PT.json | 13 ++++++++++---
 src/i18n/ro-RO.json | 13 ++++++++++---
 src/i18n/ru-RU.json | 13 ++++++++++---
 src/i18n/si-LK.json | 13 ++++++++++---
 src/i18n/sk-SK.json | 13 ++++++++++---
 src/i18n/sl-SI.json | 13 ++++++++++---
 src/i18n/sr-SP.json | 13 ++++++++++---
 src/i18n/sv-SE.json | 13 ++++++++++---
 src/i18n/th-TH.json | 13 ++++++++++---
 src/i18n/tr-TR.json | 13 ++++++++++---
 src/i18n/uk-UA.json | 13 ++++++++++---
 src/i18n/uz-UZ.json | 13 ++++++++++---
 src/i18n/vi-VN.json | 13 ++++++++++---
 src/i18n/zh-CN.json | 13 ++++++++++---
 src/i18n/zh-HK.json | 13 ++++++++++---
 src/i18n/zh-TW.json | 13 ++++++++++---
 45 files changed, 447 insertions(+), 139 deletions(-)

diff --git a/src/i18n/ar-SA.json b/src/i18n/ar-SA.json
index 58e49ffec8d..0b4ff13a30e 100644
--- a/src/i18n/ar-SA.json
+++ b/src/i18n/ar-SA.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/bn-BD.json b/src/i18n/bn-BD.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/bn-BD.json
+++ b/src/i18n/bn-BD.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/ca-ES.json b/src/i18n/ca-ES.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/ca-ES.json
+++ b/src/i18n/ca-ES.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/cs-CZ.json b/src/i18n/cs-CZ.json
index 8a0a4389691..6264915187f 100644
--- a/src/i18n/cs-CZ.json
+++ b/src/i18n/cs-CZ.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/da-DK.json b/src/i18n/da-DK.json
index abc0df3f621..b53e24709be 100644
--- a/src/i18n/da-DK.json
+++ b/src/i18n/da-DK.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json
index a19c02566ce..08e24b5a498 100644
--- a/src/i18n/de-DE.json
+++ b/src/i18n/de-DE.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Nicht verfügbar",
   "E2EI.not_activated": "Nicht aktiviert",
   "E2EI.not_downloaded": "Nicht heruntergeladen",
+  "E2EI.revoked": "Widerrufen",
   "E2EI.serialNumber": "Seriennummer: ",
   "E2EI.showCertificateDetails": "Zertifikatsdetails anzeigen",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "Ich akzeptiere die <privacypolicy>Datenschutzerklärung</privacypolicy> und <terms>Nutzungsbedingungen</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Fenster 'Zertifikat herunterladen' schließen",
-  "acme.done.headline": "Zertifikat heruntergeladen",
-  "acme.done.paragraph": "Das Zertifikat ist nun aktiv und Ihr Gerät ist verifiziert. Mehr Details zu diesem Zertifikat finden Sie in Ihren Wire-Einstellungen unter Geräte.",
+  "acme.done.button.secondary": "Zertifikatsdetails",
+  "acme.done.headline": "Zertifikat ausgestellt",
+  "acme.done.paragraph": "Das Zertifikat ist jetzt aktiv und Ihr Gerät überprüft. Weitere Details zu diesem Zertifikat finden Sie in Ihren [bold]Wire Einstellungen[/bold] unter [bold]Geräte.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Erfahren Sie mehr über Ende-zu-Ende-Identität </a>",
   "acme.error.button.close": "Fenster 'Es ist ein Fehler aufgetreten' schließen",
   "acme.error.button.primary": "Wiederholen",
   "acme.error.button.secondary": "Abbrechen",
   "acme.error.headline": "Ein Fehler ist aufgetreten",
   "acme.error.paragraph": "Das Zertifikat konnte nicht ausgestellt werden. [br] Sie können jetzt erneut versuchen, das Zertifikat zu erhalten, oder Sie bekommen später eine Erinnerung.",
   "acme.inProgress.button.close": "Fenster 'Zertifikat erhalten' schließen",
-  "acme.inProgress.headline": "Zertifikat erhalten",
+  "acme.inProgress.headline": "Zertifikat wird abgerufen...",
   "acme.inProgress.paragraph.alt": "Herunterladen…",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "Sie können das Zertifikat in Ihren [bold]Wire Einstellungen[/bold] in der/den nächsten {{delayTime}} erhalten. Öffnen Sie [bold]Geräte[/bold] und wählen Sie [bold]Zertifikat erhalten[/bold] für Ihr aktuelles Gerät. <br/> <br/> Um Wire ohne Unterbrechung nutzen zu können, rufen Sie es rechtzeitig ab – es dauert nicht lange. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Erfahren Sie mehr über Ende-zu-Ende-Identität </a>",
   "acme.renewCertificate.button.close": "Fenster 'Ende-zu-Ende-Identitätszertifikat aktualisieren' schließen",
   "acme.renewCertificate.button.primary": "Zertifikat aktualisieren",
   "acme.renewCertificate.button.secondary": "Später erinnern",
   "acme.renewCertificate.headline.alt": "Ende-zu-Ende-Identitätszertifikat aktualisieren",
   "acme.renewCertificate.paragraph": "Das Ende-zu-Ende-Identitätszertifikat für dieses Gerät läuft bald ab. Um Ihre Kommunikation auf dem höchsten Sicherheitsniveau zu halten, aktualisieren Sie Ihr Zertifikat jetzt. <br/> <br/> Geben Sie im nächsten Schritt die Anmeldedaten Ihres Identity-Providers ein, um das Zertifikat automatisch zu aktualisieren. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Erfahren Sie mehr über Ende-zu-Ende-Identität </a>",
+  "acme.renewal.done.headline": "Zertifikat aktualisiert",
+  "acme.renewal.done.paragraph": "Das Zertifikat wurde aktualisiert und Ihr Gerät überprüft. Weitere Details zum Zertifikat finden Sie in Ihren [bold]Wire Einstellungen[/bold] unter [bold]Geräte.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Erfahren Sie mehr über Ende-zu-Ende-Identität </a>",
+  "acme.renewal.inProgress.headline": "Zertifikat wird aktualisiert...",
   "acme.settingsChanged.button.close": "Fenster 'Ende-zu-Ende-Identitätszertifikat' schließen",
   "acme.settingsChanged.button.primary": "Zertifikat erhalten",
   "acme.settingsChanged.button.secondary": "Später erinnern",
@@ -596,7 +603,7 @@
   "customEnvRedirect.credentialsInfo": "Geben Sie Ihre Zugangsdaten nur dann an, wenn Sie sicher sind, dass dies das Login Ihrer Organisation ist.",
   "customEnvRedirect.redirectHeadline": "Weiterleitung...",
   "customEnvRedirect.redirectTo": "Sie werden zu Ihrem speziellen Unternehmensservice weitergeleitet.",
-  "downloadLatestMLS": "Download the latest MLS Wire version",
+  "downloadLatestMLS": "Laden Sie die neueste MLS-Wire-Version herunter",
   "enumerationAnd": " und ",
   "ephemeralRemaining": "verbleibend",
   "ephemeralUnitsDay": "Tag",
diff --git a/src/i18n/el-GR.json b/src/i18n/el-GR.json
index fbac00fa2b0..2fa36e0f567 100644
--- a/src/i18n/el-GR.json
+++ b/src/i18n/el-GR.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
index a67dc1463e5..af5104d4f68 100644
--- a/src/i18n/en-US.json
+++ b/src/i18n/en-US.json
@@ -61,12 +61,12 @@
   "E2EI.deviceVerified": "Device verified (End-to-end identity)",
   "E2EI.downloadCertificate": "Download",
   "E2EI.expired": "Expired",
-  "E2EI.revoked": "Revoked",
   "E2EI.expires_soon": "Valid (expires soon)",
   "E2EI.getCertificate": "Get Certificate",
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -163,9 +163,7 @@
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
   "acme.done.button.secondary": "Certificate details",
   "acme.done.headline": "Certificate issued",
-  "acme.renewal.done.headline": "Certificate updated",
   "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
-  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
@@ -173,22 +171,24 @@
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
   "acme.inProgress.headline": "Getting Certificate...",
-  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
   "acme.settingsChanged.headline.alt": "End-to-end identity certificate",
   "acme.settingsChanged.headline.main": "Team settings changed",
   "acme.settingsChanged.paragraph": "As of today, your team uses end-to-end identity to make Wire’s usage more secure and practicable. The device verification takes place automatically using a certificate and replaces the previous manual process. This way, you communicate with the highest security standard. <br/> <br/> Enter your identity provider’s credentials in the next step to automatically get a verification certificate for this device. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">Learn more about end-to-end identity</a>",
-  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
-  "acme.remindLater.button.primary": "Ok",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
diff --git a/src/i18n/es-ES.json b/src/i18n/es-ES.json
index 10aa3eb5b46..832570f80a8 100644
--- a/src/i18n/es-ES.json
+++ b/src/i18n/es-ES.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/et-EE.json b/src/i18n/et-EE.json
index ee7f93cbadb..a1c63eafc6b 100644
--- a/src/i18n/et-EE.json
+++ b/src/i18n/et-EE.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/fa-IR.json b/src/i18n/fa-IR.json
index 5bfee851c79..a2ee969d090 100644
--- a/src/i18n/fa-IR.json
+++ b/src/i18n/fa-IR.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/fi-FI.json b/src/i18n/fi-FI.json
index a9e962152f5..1d6f66a9046 100644
--- a/src/i18n/fi-FI.json
+++ b/src/i18n/fi-FI.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/fr-FR.json b/src/i18n/fr-FR.json
index fd82cfe3e58..34e46875ff6 100644
--- a/src/i18n/fr-FR.json
+++ b/src/i18n/fr-FR.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "J'accepte les <privacypolicy>la politique de confidentialité</privacypolicy> et <terms>conditions d'utilisation</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/ga-IE.json b/src/i18n/ga-IE.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/ga-IE.json
+++ b/src/i18n/ga-IE.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/he-IL.json b/src/i18n/he-IL.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/he-IL.json
+++ b/src/i18n/he-IL.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/hi-IN.json b/src/i18n/hi-IN.json
index c9cea45d813..e0ee55b4e2c 100644
--- a/src/i18n/hi-IN.json
+++ b/src/i18n/hi-IN.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/hr-HR.json b/src/i18n/hr-HR.json
index cbd1ce5d1a3..936033ddd4c 100644
--- a/src/i18n/hr-HR.json
+++ b/src/i18n/hr-HR.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/hu-HU.json b/src/i18n/hu-HU.json
index 41f71819b49..a12e32084c9 100644
--- a/src/i18n/hu-HU.json
+++ b/src/i18n/hu-HU.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/id-ID.json b/src/i18n/id-ID.json
index cd15320a82f..6dcc1a05e5b 100644
--- a/src/i18n/id-ID.json
+++ b/src/i18n/id-ID.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/is-IS.json b/src/i18n/is-IS.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/is-IS.json
+++ b/src/i18n/is-IS.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/it-IT.json b/src/i18n/it-IT.json
index 27d9367f1cb..3796e3b3499 100644
--- a/src/i18n/it-IT.json
+++ b/src/i18n/it-IT.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/ja-JP.json b/src/i18n/ja-JP.json
index 0eaba3652e2..98aed618b0f 100644
--- a/src/i18n/ja-JP.json
+++ b/src/i18n/ja-JP.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/lt-LT.json b/src/i18n/lt-LT.json
index 9db146cb5d1..39fb5f1725b 100644
--- a/src/i18n/lt-LT.json
+++ b/src/i18n/lt-LT.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/lv-LV.json b/src/i18n/lv-LV.json
index 04c65506637..417bbc747c3 100644
--- a/src/i18n/lv-LV.json
+++ b/src/i18n/lv-LV.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/ms-MY.json b/src/i18n/ms-MY.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/ms-MY.json
+++ b/src/i18n/ms-MY.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/nl-NL.json b/src/i18n/nl-NL.json
index 54ca4033459..34f5fa444ff 100644
--- a/src/i18n/nl-NL.json
+++ b/src/i18n/nl-NL.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/no-NO.json b/src/i18n/no-NO.json
index 4e66f23ea45..a5e9e2c157a 100644
--- a/src/i18n/no-NO.json
+++ b/src/i18n/no-NO.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/pl-PL.json b/src/i18n/pl-PL.json
index 60f0285f7e2..64dd8724d31 100644
--- a/src/i18n/pl-PL.json
+++ b/src/i18n/pl-PL.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/pt-BR.json b/src/i18n/pt-BR.json
index 61cb747c667..bd3b44d7ff5 100644
--- a/src/i18n/pt-BR.json
+++ b/src/i18n/pt-BR.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "Eu aceito a <privacypolicy>política de privacidade</privacypolicy> e os <terms>termos e condições</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/pt-PT.json b/src/i18n/pt-PT.json
index 1cd4c83bfeb..05bcd4c8e9a 100644
--- a/src/i18n/pt-PT.json
+++ b/src/i18n/pt-PT.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/ro-RO.json b/src/i18n/ro-RO.json
index 02d59263b1f..4c9e3cf1849 100644
--- a/src/i18n/ro-RO.json
+++ b/src/i18n/ro-RO.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/ru-RU.json b/src/i18n/ru-RU.json
index 4b99cac9860..ff57960b222 100644
--- a/src/i18n/ru-RU.json
+++ b/src/i18n/ru-RU.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Недоступно",
   "E2EI.not_activated": "Не активирован",
   "E2EI.not_downloaded": "Не скачан",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Серийный номер: ",
   "E2EI.showCertificateDetails": "Показать сведения о сертификате",
   "E2EI.status": "Статус:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "Я принимаю <privacypolicy>политику конфиденциальности</privacypolicy> и <terms>условия и положения</terms>",
   "acme.done.button": "OK",
   "acme.done.button.close": "Закрыть окно 'Сертификат загружен'",
-  "acme.done.headline": "Сертификат загружен",
-  "acme.done.paragraph": "Теперь сертификат активен, и ваше устройство верифицировано. Более подробную информацию об этом сертификате можно найти в Настройках Wire в разделе Устройства.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Закрыть окно 'Что-то пошло не так'",
   "acme.error.button.primary": "Повторить",
   "acme.error.button.secondary": "Отмена",
   "acme.error.headline": "Что-то пошло не так",
   "acme.error.paragraph": "Сертификат выпустить не удалось. [br] Вы можете повторить попытку получения сертификата сейчас или получить напоминание позже.",
   "acme.inProgress.button.close": "Закрыть окно 'Получение сертификата'",
-  "acme.inProgress.headline": "Получить сертификат",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Загрузка...",
   "acme.inProgress.paragraph.main": "Пожалуйста, перейдите в браузер и войдите в сервис сертификации. [br] Если сайт не открывается, вы также можете перейти на него вручную по следующей ссылке: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Закрыть окно 'Обновление сертификата сквозной идентификации'",
   "acme.renewCertificate.button.primary": "Обновить сертификат",
   "acme.renewCertificate.button.secondary": "Напомнить позже",
   "acme.renewCertificate.headline.alt": "Обновление сертификата сквозной идентификации",
   "acme.renewCertificate.paragraph": "Срок действия сертификата сквозной идентификации для этого устройства истекает в ближайшее время. Чтобы поддерживать связь на самом высоком уровне безопасности, обновите сертификат прямо сейчас. <br/> <br/>На следующем шаге введите учетные данные поставщика идентификационных данных, чтобы автоматически обновить сертификат. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">Узнать больше о сквозной идентификации </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Закрыть окно 'Сертификат сквозной идентификации'",
   "acme.settingsChanged.button.primary": "Получить сертификат",
   "acme.settingsChanged.button.secondary": "Напомнить позже",
diff --git a/src/i18n/si-LK.json b/src/i18n/si-LK.json
index d07a0615f58..83ab70b23cc 100644
--- a/src/i18n/si-LK.json
+++ b/src/i18n/si-LK.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "නොතිබේ",
   "E2EI.not_activated": "සක්‍රිය කර නැත",
   "E2EI.not_downloaded": "බාගත වී ඇත",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "අනුක්‍රමික අංකය: ",
   "E2EI.showCertificateDetails": "සහතිකයේ විස්තර පෙන්වන්න",
   "E2EI.status": "තත්‍වය:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "මම <privacypolicy>රහස්‍යතා ප්‍රතිපත්තිය</privacypolicy>, <terms>නියම සහ කොන්දේසි</terms> පිළිගනිමි",
   "acme.done.button": "හරි",
   "acme.done.button.close": "'සහතිකය බාගැනිණි' කවුළුව වසන්න",
-  "acme.done.headline": "සහතිකය බාගැනිණි",
-  "acme.done.paragraph": "සහතිකය දැන් සක්‍රිය අතර ඔබගේ උපාංගය සත්‍යාපිතයි. උපාංග යටතේ ඔබගේ වයර් සැකසුම් තුළ මෙම සහතිකය පිළිබඳ වැඩි විස්තර සොයා ගැනීමට හැකිය.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "'යමක් වැරදී ඇත' කවුළුව වසන්න",
   "acme.error.button.primary": "නැවත",
   "acme.error.button.secondary": "අවලංගු",
   "acme.error.headline": "යමක් වැරදී ඇත",
   "acme.error.paragraph": "සහතිකය නිකුත් කිරීමට නොහැකි විය. [br] ඔබට සහතිකය ගැනීමට දැන් නැවත තැත් කිරීමට හැකිය හෝ පසුව සිහිකැඳවීමක් ලැබෙනු ඇත.",
   "acme.inProgress.button.close": "'සහතිකය ගැනෙමින්' කවුළුව වසන්න",
-  "acme.inProgress.headline": "සහතිකය ගැනෙමින්",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "බාගැනෙමින්…",
   "acme.inProgress.paragraph.main": "කරුණාකර ඔබගේ අතිරික්සුවට ගොස් සහතික සේවාවට පිවිසෙන්න. [br] අඩවිය විවෘත නොවේ නම්, ඔබට මෙම ඒ.ස.නි. අනුගමනය කිරීමට හැකිය: [br] [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "'අන්ත අනන්‍යතා සහතිකය යාවත්කාල' කවුළුව වසන්න",
   "acme.renewCertificate.button.primary": "සහතිකය යාවත්කාලය",
   "acme.renewCertificate.button.secondary": "පසුව මතක් කරන්න",
   "acme.renewCertificate.headline.alt": "අන්ත අනන්‍යතා සහතිකය යාවත්කාලය",
   "acme.renewCertificate.paragraph": "මෙම උපාංගයේ අන්ත අනන්‍යතා සහතිකය ළඟදීම කල් ඉකුත් වනු ඇත. ආරක්‍ෂිතව සන්නිවේදනයට, දැන්ම ඔබගේ සහතිකය යාවත්කාල කරන්න.<br/> <br/> සහතිකය ස්වයංක්‍රීයව යාවත්කාල කිරීමට ඊළඟ පියවරේ දී ඔබගේ අනන්‍යතා ප්‍රතිපාදකයාගේ අක්තපත්‍ර ඇතුල් කරන්න. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">අන්ත අනන්‍යතාවය පිළිබඳව තව දැනගන්න</a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "'අන්ත අනන්‍යතා සහතිකය' කවුළුව වසන්න",
   "acme.settingsChanged.button.primary": "සහතිකය ගන්න",
   "acme.settingsChanged.button.secondary": "පසුව මතක් කරන්න",
diff --git a/src/i18n/sk-SK.json b/src/i18n/sk-SK.json
index eaf292554d6..4ab5db85b37 100644
--- a/src/i18n/sk-SK.json
+++ b/src/i18n/sk-SK.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/sl-SI.json b/src/i18n/sl-SI.json
index 45771cb5e8f..4fea9809b36 100644
--- a/src/i18n/sl-SI.json
+++ b/src/i18n/sl-SI.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/sr-SP.json b/src/i18n/sr-SP.json
index 709834c92f0..14f017a7609 100644
--- a/src/i18n/sr-SP.json
+++ b/src/i18n/sr-SP.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/sv-SE.json b/src/i18n/sv-SE.json
index bf8af0c4aae..4cce4496cbb 100644
--- a/src/i18n/sv-SE.json
+++ b/src/i18n/sv-SE.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/th-TH.json b/src/i18n/th-TH.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/th-TH.json
+++ b/src/i18n/th-TH.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/tr-TR.json b/src/i18n/tr-TR.json
index 07302156026..df548808979 100644
--- a/src/i18n/tr-TR.json
+++ b/src/i18n/tr-TR.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/uk-UA.json b/src/i18n/uk-UA.json
index 0db9a67df6b..5fdc26ac0ed 100644
--- a/src/i18n/uk-UA.json
+++ b/src/i18n/uk-UA.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/uz-UZ.json b/src/i18n/uz-UZ.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/uz-UZ.json
+++ b/src/i18n/uz-UZ.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/vi-VN.json b/src/i18n/vi-VN.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/vi-VN.json
+++ b/src/i18n/vi-VN.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/zh-CN.json b/src/i18n/zh-CN.json
index 8dc33678737..7abf6a23271 100644
--- a/src/i18n/zh-CN.json
+++ b/src/i18n/zh-CN.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/zh-HK.json b/src/i18n/zh-HK.json
index 2ebd5eabc5c..af5104d4f68 100644
--- a/src/i18n/zh-HK.json
+++ b/src/i18n/zh-HK.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
diff --git a/src/i18n/zh-TW.json b/src/i18n/zh-TW.json
index 283eb6b5144..8c9a6961bbe 100644
--- a/src/i18n/zh-TW.json
+++ b/src/i18n/zh-TW.json
@@ -66,6 +66,7 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
   "E2EI.status": "Status:",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",

From c2047970c97c86b17056b695b5ed80326c3f4302 Mon Sep 17 00:00:00 2001
From: Virgile <78490891+V-Gira@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:38:21 +0100
Subject: [PATCH 3/5] runfix: address keyboard navigation issues in call ui
 (WPB-6075) (#16538)

---
 .../calling/FullscreenVideoCall.tsx           | 47 ++++++-------------
 src/script/components/calling/Pagination.tsx  |  3 ++
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/script/components/calling/FullscreenVideoCall.tsx b/src/script/components/calling/FullscreenVideoCall.tsx
index 1d88260cbf4..d9bcdd270ad 100644
--- a/src/script/components/calling/FullscreenVideoCall.tsx
+++ b/src/script/components/calling/FullscreenVideoCall.tsx
@@ -31,7 +31,7 @@ import {ConversationClassifiedBar} from 'Components/input/ClassifiedBar';
 import {isMediaDevice} from 'src/script/guards/MediaDevice';
 import {MediaDeviceType} from 'src/script/media/MediaDeviceType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
-import {isEnterKey, KEY} from 'Util/KeyboardUtil';
+import {handleKeyDown, isEscapeKey} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 import {preventFocusOutside} from 'Util/util';
 
@@ -206,7 +206,6 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
     setSelectedAudioOptions([microphone, speaker]);
     switchMicrophoneInput(microphone.id);
     switchSpeakerOutput(speaker.id);
-    setAudioOptionsOpen(false);
   };
 
   const videoOptions = [
@@ -239,7 +238,6 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
     const camera = videoOptions[0].options.find(item => item.value === selectedOption) ?? selectedVideoOptions[0];
     setSelectedVideoOptions([camera]);
     switchCameraInput(camera.id);
-    setVideoOptionsOpen(false);
   };
 
   const unreadMessagesCount = useAppState(state => state.unreadMessagesCount);
@@ -249,17 +247,6 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
 
   const totalPages = callPages.length;
 
-  const isSpaceOrEnterKey = (event: React.KeyboardEvent<HTMLButtonElement>) =>
-    [KEY.ENTER, KEY.SPACE].includes(event.key);
-
-  const handleToggleCameraKeydown = (event: React.KeyboardEvent<HTMLButtonElement>) => {
-    if (isSpaceOrEnterKey(event)) {
-      toggleCamera(call);
-    }
-
-    return true;
-  };
-
   // To be changed when design chooses a breakpoint, the conditional can be integrated to the ui-kit directly
   const horizontalSmBreakpoint = useMatchMedia('max-width: 680px');
   const horizontalXsBreakpoint = useMatchMedia('max-width: 500px');
@@ -267,9 +254,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
 
   useEffect(() => {
     const onKeyDown = (event: KeyboardEvent): void => {
-      if (!isEnterKey(event)) {
-        event.preventDefault();
-      }
+      event.preventDefault();
       preventFocusOutside(event, 'video-calling');
     };
     document.addEventListener('keydown', onKeyDown);
@@ -361,6 +346,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
               <button
                 data-uie-name="pagination-next"
                 onClick={() => changePage(currentPage + 1, call)}
+                onKeyDown={event => handleKeyDown(event, () => changePage(currentPage + 1, call))}
                 type="button"
                 className="button-reset-default"
                 css={{
@@ -378,6 +364,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                 data-uie-name="pagination-previous"
                 type="button"
                 onClick={() => changePage(currentPage - 1, call)}
+                onKeyDown={event => handleKeyDown(event, () => changePage(currentPage - 1, call))}
                 className="button-reset-default"
                 css={{
                   ...paginationButtonStyles,
@@ -411,6 +398,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                   className="video-controls__button"
                   css={videoControlInActiveStyles}
                   onClick={minimize}
+                  onKeyDown={event => handleKeyDown(event, () => minimize())}
                   type="button"
                   aria-labelledby="minimize-label"
                   data-uie-name="do-call-controls-video-minimize"
@@ -437,6 +425,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                   className="video-controls__button"
                   data-uie-value={!isMuted ? 'inactive' : 'active'}
                   onClick={() => toggleMute(call, !isMuted)}
+                  onKeyDown={event => handleKeyDown(event, () => toggleMute(call, !isMuted))}
                   css={!isMuted ? videoControlActiveStyles : videoControlInActiveStyles}
                   type="button"
                   aria-labelledby="mute-label"
@@ -455,13 +444,8 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                   <button
                     className="device-toggle-button"
                     css={audioOptionsOpen ? videoControlActiveStyles : videoControlInActiveStyles}
-                    onClick={event => {
-                      const target = event.target as Element;
-                      // We want to ensure to only toggling the menu open or closed when clicking the icon, not the select menu
-                      if (!target.closest('#select-microphone')) {
-                        setAudioOptionsOpen(prev => !prev);
-                      }
-                    }}
+                    onClick={() => setAudioOptionsOpen(prev => !prev)}
+                    onKeyDown={event => handleKeyDown(event, () => setAudioOptionsOpen(prev => !prev))}
                     onBlur={event => {
                       if (!event.currentTarget.contains(event.relatedTarget)) {
                         setAudioOptionsOpen(false);
@@ -487,6 +471,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                               String(selectedOption?.value).includes('input'),
                             );
                           }}
+                          onKeyDown={event => isEscapeKey(event) && setAudioOptionsOpen(false)}
                           menuPlacement="top"
                           menuIsOpen
                           wrapperCSS={{marginBottom: 0}}
@@ -506,7 +491,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                     className="video-controls__button"
                     data-uie-value={selfSharesCamera ? 'active' : 'inactive'}
                     onClick={() => toggleCamera(call)}
-                    onKeyDown={handleToggleCameraKeydown}
+                    onKeyDown={event => handleKeyDown(event, () => toggleCamera(call))}
                     role="switch"
                     aria-checked={selfSharesCamera}
                     tabIndex={TabIndex.FOCUSABLE}
@@ -529,13 +514,8 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                     <button
                       className="device-toggle-button"
                       css={videoOptionsOpen ? videoControlActiveStyles : videoControlInActiveStyles}
-                      onClick={event => {
-                        const target = event.target as Element;
-                        // We want to ensure to only toggling the menu open or closed when clicking the icon, not the select menu
-                        if (!target.closest('#select-camera')) {
-                          setVideoOptionsOpen(prev => !prev);
-                        }
-                      }}
+                      onClick={() => setVideoOptionsOpen(prev => !prev)}
+                      onKeyDown={event => handleKeyDown(event, () => setVideoOptionsOpen(prev => !prev))}
                       onBlur={event => {
                         if (!event.currentTarget.contains(event.relatedTarget)) {
                           setVideoOptionsOpen(false);
@@ -549,6 +529,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                             autoFocus
                             value={selectedVideoOptions}
                             onChange={selectedOption => updateVideoOptions(String(selectedOption?.value))}
+                            onKeyDown={event => isEscapeKey(event) && setVideoOptionsOpen(false)}
                             id="select-camera"
                             dataUieName="select-camera"
                             controlShouldRenderValue={false}
@@ -582,6 +563,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                         : videoControlInActiveStyles
                   }
                   onClick={() => toggleScreenshare(call)}
+                  onKeyDown={event => handleKeyDown(event, () => toggleScreenshare(call))}
                   type="button"
                   aria-labelledby="screen-share-label"
                   data-uie-value={selfSharesScreen ? 'active' : 'inactive'}
@@ -603,6 +585,7 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
                 <button
                   className="video-controls__button video-controls__button--red"
                   onClick={() => leave(call)}
+                  onKeyDown={event => handleKeyDown(event, () => leave(call))}
                   type="button"
                   aria-labelledby="leave-label"
                   data-uie-name="do-call-controls-video-call-cancel"
diff --git a/src/script/components/calling/Pagination.tsx b/src/script/components/calling/Pagination.tsx
index 284a8df11a1..fb5e81dd0da 100644
--- a/src/script/components/calling/Pagination.tsx
+++ b/src/script/components/calling/Pagination.tsx
@@ -21,6 +21,8 @@ import React from 'react';
 
 import {CSSObject} from '@emotion/react';
 
+import {handleKeyDown} from 'Util/KeyboardUtil';
+
 export interface PaginationProps {
   currentPage: number;
   onChangePage: (newPage: number) => void;
@@ -64,6 +66,7 @@ const Pagination: React.FC<PaginationProps> = ({totalPages, currentPage, onChang
             data-uie-status={isCurrentPage ? 'active' : 'inactive'}
             key={page}
             onClick={() => onChangePage(page)}
+            onKeyDown={event => handleKeyDown(event, () => onChangePage(page))}
             type="button"
             className="button-reset-default"
             css={{

From ce1997e25f02bfb633b55c9a5341a2e25061389c Mon Sep 17 00:00:00 2001
From: Thomas Belin <thomasbelin4@gmail.com>
Date: Wed, 17 Jan 2024 15:49:42 +0100
Subject: [PATCH 4/5] runfix: Make sure we instantiate the app only once
 (#16540)

---
 src/script/E2EIdentity/E2EIdentityEnrollment.ts     | 8 ++------
 src/script/components/AppContainer/AppContainer.tsx | 5 +++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/script/E2EIdentity/E2EIdentityEnrollment.ts b/src/script/E2EIdentity/E2EIdentityEnrollment.ts
index 1ec429edde3..ad891cad728 100644
--- a/src/script/E2EIdentity/E2EIdentityEnrollment.ts
+++ b/src/script/E2EIdentity/E2EIdentityEnrollment.ts
@@ -65,7 +65,7 @@ interface E2EIHandlerParams {
 }
 
 type Events = {
-  identityUpdated: {enrollmentConfig: EnrollmentConfig; identity: WireIdentity};
+  identityUpdated: {enrollmentConfig: EnrollmentConfig; identity?: WireIdentity};
 };
 
 export type EnrollmentConfig = {
@@ -343,10 +343,6 @@ export class E2EIHandler extends TypedEventEmitter<Events> {
     if (this.currentStep !== E2EIHandlerStep.SUCCESS) {
       return;
     }
-    const identity = await getActiveWireIdentity();
-    if (!identity) {
-      return;
-    }
 
     const {modalOptions, modalType} = getModalOptions({
       type: ModalType.SUCCESS,
@@ -355,7 +351,7 @@ export class E2EIHandler extends TypedEventEmitter<Events> {
       extraParams: {
         isRenewal: isCertificateRenewal,
       },
-      primaryActionFn: () => this.emit('identityUpdated', {enrollmentConfig: this.config!, identity}),
+      primaryActionFn: () => this.emit('identityUpdated', {enrollmentConfig: this.config!}),
       secondaryActionFn: () => {
         amplify.publish(WebAppEvents.PREFERENCES.MANAGE_DEVICES);
       },
diff --git a/src/script/components/AppContainer/AppContainer.tsx b/src/script/components/AppContainer/AppContainer.tsx
index cf688d00351..011795b365f 100644
--- a/src/script/components/AppContainer/AppContainer.tsx
+++ b/src/script/components/AppContainer/AppContainer.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {FC, useEffect} from 'react';
+import {FC, useEffect, useMemo} from 'react';
 
 import {ClientType} from '@wireapp/api-client/lib/client/';
 import {container} from 'tsyringe';
@@ -49,7 +49,8 @@ interface AppProps {
 
 export const AppContainer: FC<AppProps> = ({config, clientType}) => {
   setAppLocale();
-  const app = new App(container.resolve(Core), container.resolve(APIClient), config);
+  const app = useMemo(() => new App(container.resolve(Core), container.resolve(APIClient), config), []);
+
   // Publishing application on the global scope for debug and testing purposes.
   window.wire.app = app;
   const mainView = new MainViewModel(app.repository);

From 5a73f25993d0d0d6fccfee544651e623e3d2d9f0 Mon Sep 17 00:00:00 2001
From: Otto the Bot <webapp+otto@wire.com>
Date: Wed, 17 Jan 2024 16:41:52 +0100
Subject: [PATCH 5/5] chore: Update translations (#16539)

---
 src/i18n/de-DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json
index 08e24b5a498..9a4041445ec 100644
--- a/src/i18n/de-DE.json
+++ b/src/i18n/de-DE.json
@@ -1354,7 +1354,7 @@
   "searchTrySearchFederation": "Finden Sie Personen in Wire anhand ihrer Namen oder\n@Benutzernamen\n\nFinden Sie Personen einer anderen Domain\nmit @Benutzername@Domainname",
   "searchTrySearchLearnMore": "Mehr erfahren",
   "selfNotSupportMLSMsgPart1": "Sie können nicht mehr mit [bold]{{selfUserName}}[/bold] kommunizieren, da Ihr Gerät das entsprechende Protokoll nicht unterstützt.",
-  "selfNotSupportMLSMsgPart2": "to call, and send messages and files again.",
+  "selfNotSupportMLSMsgPart2": ", um wieder zu telefonieren und Nachrichten und Dateien zu senden.",
   "selfProfileImageAlt": "Ihr Profilbild",
   "servicesOptionsTitle": "Dienste",
   "servicesRoomToggleInfo": "Öffnen Sie diese Unterhaltung für Dienste.",