Merge branch 'main' into km/PM-14863/allow-unlock-on-list

bitwarden · Nov 29, 2024 · b28ee8d · b28ee8d
2 parents 0cb0a43 + 36750b3
commit b28ee8d
Show file tree

Hide file tree

Showing 127 changed files with 2,802 additions and 555 deletions.
diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json
@@ -2689,15 +2689,30 @@
   "notificationSentDevice": {
     "message": "'n Kennisgewing was na jou toestel gestuur."
   },
+  "aNotificationWasSentToYourDevice": {
+    "message": "A notification was sent to your device"
+  },
+  "makeSureYourAccountIsUnlockedAndTheFingerprintEtc": {
+    "message": "Make sure your account is unlocked and the fingerprint phrase matches on the other device"
+  },
+  "needAnotherOptionV1": {
+    "message": "Need another option?"
+  },
   "fingerprintMatchInfo": {
     "message": "Maak asseblief seker dat jou kluis oopgesluit is en die Vingerafdrukfrase met die ander toestel vergelyk."
   },
   "fingerprintPhraseHeader": {
     "message": "Vingerafdrukfrase"
   },
+  "youWillBeNotifiedOnceTheRequestIsApproved": {
+    "message": "You will be notified once the request is approved"
+  },
   "needAnotherOption": {
     "message": "Aan teken met toestel moet opgestel word in die instellings van die Bitwarden toep. Nodig 'n ander opsie?"
   },
+  "viewAllLogInOptions": {
+    "message": "View all log in options"
+  },
   "viewAllLoginOptions": {
     "message": "Beskou alle aantekenings opsies"
   },