Skip to content

Commit

Permalink
Merge branch 'main' into tools/PM-10938/1pux-ssh-key-import
Browse files Browse the repository at this point in the history
  • Loading branch information
quexten authored Dec 20, 2024
2 parents f328fe3 + 2e6031e commit 36ee468
Show file tree
Hide file tree
Showing 226 changed files with 8,191 additions and 2,598 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,7 @@ jobs:

crowdin-push:
name: Crowdin Push
if: github.ref == 'refs/heads/main'
if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/main'
needs:
- linux
- windows
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,31 @@ jobs:
run: |
npm ci
npm run lint
rust:
name: Run Rust lint on ${{ matrix.os }}
runs-on: ${{ matrix.os || 'ubuntu-latest' }}

strategy:
matrix:
os:
- ubuntu-latest
- macos-latest
- windows-latest

steps:
- name: Checkout repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Check Rust version
run: rustup --version

- name: Run cargo fmt
working-directory: ./apps/desktop/desktop_native
run: cargo fmt --check

- name: Run Clippy
working-directory: ./apps/desktop/desktop_native
run: cargo clippy --all-features --tests
env:
RUSTFLAGS: "-D warnings"
10 changes: 5 additions & 5 deletions apps/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"build:watch:firefox": "npm run build:firefox -- --watch",
"build:watch:opera": "npm run build:opera -- --watch",
"build:watch:safari": "npm run build:safari -- --watch",
"build:prod:chrome": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=4096\" npm run build:chrome",
"build:prod:edge": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=4096\" npm run build:edge",
"build:prod:firefox": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=4096\" npm run build:firefox",
"build:prod:opera": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=4096\" npm run build:opera",
"build:prod:safari": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=4096\" npm run build:safari",
"build:prod:chrome": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=8192\" npm run build:chrome",
"build:prod:edge": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=8192\" npm run build:edge",
"build:prod:firefox": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=8192\" npm run build:firefox",
"build:prod:opera": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=8192\" npm run build:opera",
"build:prod:safari": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=8192\" npm run build:safari",
"dist:chrome": "npm run build:prod:chrome && mkdir -p dist && ./scripts/compress.ps1 dist-chrome.zip",
"dist:edge": "npm run build:prod:edge && mkdir -p dist && ./scripts/compress.ps1 dist-edge.zip",
"dist:firefox": "npm run build:prod:firefox && mkdir -p dist && ./scripts/compress.ps1 dist-firefox.zip",
Expand Down
42 changes: 39 additions & 3 deletions apps/browser/src/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,6 @@
"rateExtension": {
"message": "قيِّم هذه الإضافة"
},
"rateExtensionDesc": {
"message": "يرجى النظر في مساعدتنا بكتابة تعليق إيجابي!"
},
"browserNotSupportClipboard": {
"message": "متصفح الويب الخاص بك لا يدعم خاصية النسخ السهل. يرجى استخدام النسخ اليدوي."
},
Expand Down Expand Up @@ -4679,6 +4676,9 @@
"showNumberOfAutofillSuggestions": {
"message": "Show number of login autofill suggestions on extension icon"
},
"showQuickCopyActions": {
"message": "Show quick copy actions on Vault"
},
"systemDefault": {
"message": "System default"
},
Expand Down Expand Up @@ -4910,6 +4910,42 @@
"beta": {
"message": "Beta"
},
"importantNotice": {
"message": "Important notice"
},
"setupTwoStepLogin": {
"message": "Set up two-step login"
},
"newDeviceVerificationNoticeContentPage1": {
"message": "Bitwarden will send a code to your account email to verify logins from new devices starting in February 2025."
},
"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."
},
"remindMeLater": {
"message": "Remind me later"
},
"newDeviceVerificationNoticePageOneFormContent": {
"message": "Do you have reliable access to your email, $EMAIL$?",
"placeholders": {
"email": {
"content": "$1",
"example": "[email protected]"
}
}
},
"newDeviceVerificationNoticePageOneEmailAccessNo": {
"message": "No, I do not"
},
"newDeviceVerificationNoticePageOneEmailAccessYes": {
"message": "Yes, I can reliably access my email"
},
"turnOnTwoStepLogin": {
"message": "Turn on two-step login"
},
"changeAcctEmail": {
"message": "Change account email"
},
"extensionWidth": {
"message": "Extension width"
},
Expand Down
50 changes: 43 additions & 7 deletions apps/browser/src/_locales/az/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@
"message": "Kimliyi avto-doldur"
},
"fillVerificationCode": {
"message": "Fill verification code"
"message": "Doğrulama kodunu doldur"
},
"fillVerificationCodeAria": {
"message": "Fill Verification Code",
"message": "Doğrulama Kodunu Doldur",
"description": "Aria label for the heading displayed the inline menu for totp code autofill"
},
"generatePasswordCopied": {
Expand Down Expand Up @@ -648,9 +648,6 @@
"rateExtension": {
"message": "Uzantını qiymətləndir"
},
"rateExtensionDesc": {
"message": "Gözəl bir rəy ilə bizə dəstək ola bilərsiniz!"
},
"browserNotSupportClipboard": {
"message": "Veb brauzeriniz lövhəyə kopyalamağı dəstəkləmir. Əvəzində əllə kopyalayın."
},
Expand Down Expand Up @@ -3588,11 +3585,11 @@
"description": "Screen reader text (aria-label) for unlock account button in overlay"
},
"totpCodeAria": {
"message": "Time-based One-Time Password Verification Code",
"message": "Vaxt əsaslı Təkistifadəlik Parol Doğrulama Kodu",
"description": "Aria label for the totp code displayed in the inline menu for autofill"
},
"totpSecondsSpanAria": {
"message": "Time remaining before current TOTP expires",
"message": "Hazırkı TOTP-nin bitməsinə qalan vaxt",
"description": "Aria label for the totp seconds displayed in the inline menu for autofill"
},
"fillCredentialsFor": {
Expand Down Expand Up @@ -4679,6 +4676,9 @@
"showNumberOfAutofillSuggestions": {
"message": "Uzantı ikonunda giriş üçün avto-doldurma təklif sayını göstər"
},
"showQuickCopyActions": {
"message": "Show quick copy actions on Vault"
},
"systemDefault": {
"message": "İlkin sistem"
},
Expand Down Expand Up @@ -4910,6 +4910,42 @@
"beta": {
"message": "Beta"
},
"importantNotice": {
"message": "Vacib bildiriş"
},
"setupTwoStepLogin": {
"message": "İki addımlı girişi qur"
},
"newDeviceVerificationNoticeContentPage1": {
"message": "Bitwarden, 2025-ci ilin Fevral ayından etibarən yeni cihazlardan gələn girişləri doğrulamaq üçün hesabınızın e-poçtuna bir kod göndərəcək."
},
"newDeviceVerificationNoticeContentPage2": {
"message": "Hesabınızı qorumaq üçün alternativ bir yol kimi iki addımlı girişi qura və ya e-poçtunuzu müraciət edə biləcəyiniz e-poçtla dəyişdirə bilərsiniz."
},
"remindMeLater": {
"message": "Daha sonra xatırlat"
},
"newDeviceVerificationNoticePageOneFormContent": {
"message": "$EMAIL$ e-poçtunuza güvənli şəkildə müraciət edə bilirsiniz?",
"placeholders": {
"email": {
"content": "$1",
"example": "[email protected]"
}
}
},
"newDeviceVerificationNoticePageOneEmailAccessNo": {
"message": "Xeyr, edə bilmirəm"
},
"newDeviceVerificationNoticePageOneEmailAccessYes": {
"message": "Bəli, e-poçtuma güvənli şəkildə müraciət edə bilirəm"
},
"turnOnTwoStepLogin": {
"message": "İki addımlı girişi işə sal"
},
"changeAcctEmail": {
"message": "Hesabın e-poçtunu dəyişdir"
},
"extensionWidth": {
"message": "Uzantı eni"
},
Expand Down
42 changes: 39 additions & 3 deletions apps/browser/src/_locales/be/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,6 @@
"rateExtension": {
"message": "Ацаніць пашырэнне"
},
"rateExtensionDesc": {
"message": "Падумайце пра тое, каб дапамагчы нам добрым водгукам!"
},
"browserNotSupportClipboard": {
"message": "Ваш вэб-браўзер не падтрымлівае капіяванне даных у буфер абмену. Скапіюйце іх уручную."
},
Expand Down Expand Up @@ -4679,6 +4676,9 @@
"showNumberOfAutofillSuggestions": {
"message": "Show number of login autofill suggestions on extension icon"
},
"showQuickCopyActions": {
"message": "Show quick copy actions on Vault"
},
"systemDefault": {
"message": "System default"
},
Expand Down Expand Up @@ -4910,6 +4910,42 @@
"beta": {
"message": "Beta"
},
"importantNotice": {
"message": "Important notice"
},
"setupTwoStepLogin": {
"message": "Set up two-step login"
},
"newDeviceVerificationNoticeContentPage1": {
"message": "Bitwarden will send a code to your account email to verify logins from new devices starting in February 2025."
},
"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."
},
"remindMeLater": {
"message": "Remind me later"
},
"newDeviceVerificationNoticePageOneFormContent": {
"message": "Do you have reliable access to your email, $EMAIL$?",
"placeholders": {
"email": {
"content": "$1",
"example": "[email protected]"
}
}
},
"newDeviceVerificationNoticePageOneEmailAccessNo": {
"message": "No, I do not"
},
"newDeviceVerificationNoticePageOneEmailAccessYes": {
"message": "Yes, I can reliably access my email"
},
"turnOnTwoStepLogin": {
"message": "Turn on two-step login"
},
"changeAcctEmail": {
"message": "Change account email"
},
"extensionWidth": {
"message": "Extension width"
},
Expand Down
42 changes: 39 additions & 3 deletions apps/browser/src/_locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,6 @@
"rateExtension": {
"message": "Оценяване на разширението"
},
"rateExtensionDesc": {
"message": "Молим да ни помогнете, като оставите положителен отзив!"
},
"browserNotSupportClipboard": {
"message": "Браузърът не поддържа копиране в буфера, затова копирайте на ръка."
},
Expand Down Expand Up @@ -4679,6 +4676,9 @@
"showNumberOfAutofillSuggestions": {
"message": "Показване на броя предложения за автоматично попълване на данни за вписване върху иконката на добавката"
},
"showQuickCopyActions": {
"message": "Показване на действията за бързо копиране в трезора"
},
"systemDefault": {
"message": "По подразбиране за системата"
},
Expand Down Expand Up @@ -4910,6 +4910,42 @@
"beta": {
"message": "Бета"
},
"importantNotice": {
"message": "Важно съобщение"
},
"setupTwoStepLogin": {
"message": "Настройте двустепенно удостоверяване"
},
"newDeviceVerificationNoticeContentPage1": {
"message": "Битуорден ще изпрати код до е-пощата Ви, за потвърждаване на вписването от нови устройства. Това ще започне от февруари 2025."
},
"newDeviceVerificationNoticeContentPage2": {
"message": "Можете да настроите двустепенно удостоверяване, като различен метод на защита, или ако е необходимо да промените е-пощата си с такава, до която имате достъп."
},
"remindMeLater": {
"message": "Напомнете ми по-късно"
},
"newDeviceVerificationNoticePageOneFormContent": {
"message": "Имате ли сигурен достъп до е-пощата си – $EMAIL$?",
"placeholders": {
"email": {
"content": "$1",
"example": "[email protected]"
}
}
},
"newDeviceVerificationNoticePageOneEmailAccessNo": {
"message": "Не, нямам"
},
"newDeviceVerificationNoticePageOneEmailAccessYes": {
"message": "Да, имам достъп до е-пощата си"
},
"turnOnTwoStepLogin": {
"message": "Включване на двустепенното удостоверяване"
},
"changeAcctEmail": {
"message": "Промяна на е-пощата"
},
"extensionWidth": {
"message": "Ширина на разширението"
},
Expand Down
42 changes: 39 additions & 3 deletions apps/browser/src/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,6 @@
"rateExtension": {
"message": "এক্সটেনশনটি মূল্যায়ন করুন"
},
"rateExtensionDesc": {
"message": "দয়া করে একটি ভাল পর্যালোচনার মাধ্যমে সাহায্য করতে আমাদের বিবেচনা করুন!"
},
"browserNotSupportClipboard": {
"message": "আপনার ওয়েব ব্রাউজার সহজে ক্লিপবোর্ড অনুলিপি সমর্থন করে না। পরিবর্তে এটি নিজেই অনুলিপি করুন।"
},
Expand Down Expand Up @@ -4679,6 +4676,9 @@
"showNumberOfAutofillSuggestions": {
"message": "Show number of login autofill suggestions on extension icon"
},
"showQuickCopyActions": {
"message": "Show quick copy actions on Vault"
},
"systemDefault": {
"message": "System default"
},
Expand Down Expand Up @@ -4910,6 +4910,42 @@
"beta": {
"message": "Beta"
},
"importantNotice": {
"message": "Important notice"
},
"setupTwoStepLogin": {
"message": "Set up two-step login"
},
"newDeviceVerificationNoticeContentPage1": {
"message": "Bitwarden will send a code to your account email to verify logins from new devices starting in February 2025."
},
"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."
},
"remindMeLater": {
"message": "Remind me later"
},
"newDeviceVerificationNoticePageOneFormContent": {
"message": "Do you have reliable access to your email, $EMAIL$?",
"placeholders": {
"email": {
"content": "$1",
"example": "[email protected]"
}
}
},
"newDeviceVerificationNoticePageOneEmailAccessNo": {
"message": "No, I do not"
},
"newDeviceVerificationNoticePageOneEmailAccessYes": {
"message": "Yes, I can reliably access my email"
},
"turnOnTwoStepLogin": {
"message": "Turn on two-step login"
},
"changeAcctEmail": {
"message": "Change account email"
},
"extensionWidth": {
"message": "Extension width"
},
Expand Down
Loading

0 comments on commit 36ee468

Please sign in to comment.