Skip to content

Commit

Permalink
Merge branch 'main' into km/pm-10413/ssh-keygen-web-client
Browse files Browse the repository at this point in the history
  • Loading branch information
quexten committed Jan 7, 2025
2 parents 3314387 + 1075d7a commit 15dd184
Show file tree
Hide file tree
Showing 187 changed files with 7,191 additions and 9,481 deletions.
15 changes: 15 additions & 0 deletions apps/browser/src/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2324,6 +2324,9 @@
"message": "Domains",
"description": "A category title describing the concept of web domains"
},
"blockedDomains": {
"message": "Blocked domains"
},
"excludedDomains": {
"message": "Excluded domains"
},
Expand All @@ -2333,6 +2336,15 @@
"excludedDomainsDescAlt": {
"message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
},
"blockedDomainsDesc": {
"message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
},
"autofillBlockedNotice": {
"message": "Autofill is blocked for this website. Review or change this in settings."
},
"autofillBlockedTooltip": {
"message": "Autofill is blocked on this website. Review in settings."
},
"websiteItemLabel": {
"message": "Website $number$ (URI)",
"placeholders": {
Expand All @@ -2351,6 +2363,9 @@
}
}
},
"blockedDomainsSavedSuccess": {
"message": "Blocked domain changes saved"
},
"excludedDomainsSavedSuccess": {
"message": "Excluded domain changes saved"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/fi/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2105,7 +2105,7 @@
"message": "Aikakatkaisutoiminnon vahvistus"
},
"autoFillAndSave": {
"message": "Täytä automaattisesti ja tallenna"
"message": "Automaattitäytä ja tallenna"
},
"fillAndSave": {
"message": "Täytä ja tallenna"
Expand Down Expand Up @@ -3482,7 +3482,7 @@
"description": "Aria label for the totp code displayed in the inline menu for autofill"
},
"totpSecondsSpanAria": {
"message": "Time remaining before current TOTP expires",
"message": "Aika jäljellä, ennen kuin nykyinen TOTP vanhenee",
"description": "Aria label for the totp seconds displayed in the inline menu for autofill"
},
"fillCredentialsFor": {
Expand Down Expand Up @@ -4810,7 +4810,7 @@
"message": "Määritä kaksivaiheinen kirjautuminen"
},
"newDeviceVerificationNoticeContentPage1": {
"message": "Bitwarden will send a code to your account email to verify logins from new devices starting in February 2025."
"message": "Bitwarden lähettää tilisi sähköpostiosoitteeseen koodin, jolla voit vahvistaa kirjautumiset uusista laitteista helmikuusta 2025 alkaen."
},
"newDeviceVerificationNoticeContentPage2": {
"message": "You can set up two-step login as an alternative way to protect your account or change your email to one you can access."
Expand Down
Loading

0 comments on commit 15dd184

Please sign in to comment.