Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into pm-12345
Browse files Browse the repository at this point in the history
  • Loading branch information
jprusik committed Oct 8, 2024
2 parents 03a1090 + ce87167 commit 2c80ccd
Show file tree
Hide file tree
Showing 465 changed files with 10,158 additions and 3,293 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/build-browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,6 @@ jobs:
run: npm run dist:chrome:beta
working-directory: browser-source/apps/browser

- name: Gulp
run: gulp ci
working-directory: browser-source/apps/browser

- name: Upload Opera artifact
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
Expand Down Expand Up @@ -235,14 +231,6 @@ jobs:
path: browser-source.zip
if-no-files-found: error

- name: Upload coverage artifact
if: false
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: coverage-${{ env._BUILD_NUMBER }}.zip
path: browser-source/apps/browser/coverage/coverage-${{ env._BUILD_NUMBER }}.zip
if-no-files-found: error

build-safari:
name: Build Safari
runs-on: macos-13
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/locales-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Locales lint for Crowdin

on:
pull_request:
branches-ignore:
- 'l10n_master'
- 'cf-pages'
paths:
- '**/messages.json'

jobs:
lint:
name: Lint
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Checkout base branch repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
ref: ${{ github.event.pull_request.base.sha }}
path: base
- name: Install dependencies
run: npm ci
- name: Compare
run: |
npm run test:locales
if [ $? -eq 0 ]; then
echo "Lint check successful."
else
echo "Lint check failed."
exit 1
fi
3 changes: 2 additions & 1 deletion apps/browser/config/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"devFlags": {},
"flags": {
"showPasswordless": true,
"accountSwitching": false
"accountSwitching": false,
"sdk": true
}
}
14 changes: 0 additions & 14 deletions apps/browser/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const betaBuild = process.env.BETA_BUILD === "1";
const paths = {
build: "./build/",
dist: "./dist/",
coverage: "./coverage/",
node_modules: "./node_modules/",
popupDir: "./src/popup/",
cssDir: "./src/popup/css/",
Expand Down Expand Up @@ -276,17 +275,6 @@ function stdOutProc(proc) {
proc.stderr.on("data", (data) => console.error(data.toString()));
}

async function ciCoverage(cb) {
const { default: zip } = await import("gulp-zip");
const { default: filter } = await import("gulp-filter");

return gulp
.src(paths.coverage + "**/*")
.pipe(filter(["**", "!coverage/coverage*.zip"]))
.pipe(zip(`coverage${buildString()}.zip`))
.pipe(gulp.dest(paths.coverage));
}

function applyBetaLabels(manifest) {
manifest.name = "Bitwarden Password Manager BETA";
manifest.short_name = "Bitwarden BETA";
Expand Down Expand Up @@ -320,5 +308,3 @@ exports["dist:safari:mas"] = distSafariMas;
exports["dist:safari:masdev"] = distSafariMasDev;
exports["dist:safari:dmg"] = distSafariDmg;
exports.dist = gulp.parallel(distFirefox, distChrome, distOpera, distEdge);
exports["ci:coverage"] = ciCoverage;
exports.ci = ciCoverage;
3 changes: 1 addition & 2 deletions apps/browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bitwarden/browser",
"version": "2024.10.0",
"version": "2024.10.1",
"scripts": {
"build": "cross-env MANIFEST_VERSION=3 webpack",
"build:mv2": "webpack",
Expand All @@ -26,7 +26,6 @@
"dist:safari:masdev": "npm run build:prod && gulp dist:safari:masdev",
"dist:safari:dmg": "npm run build:prod && gulp dist:safari:dmg",
"test": "jest",
"test:coverage": "jest --coverage --coverageDirectory=coverage",
"test:watch": "jest --watch",
"test:watch:all": "jest --watchAll"
}
Expand Down
17 changes: 16 additions & 1 deletion apps/browser/src/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,15 @@
"yourVaultIsLocked": {
"message": "خزنتك مقفلة. قم بتأكيد هويتك للمتابعة."
},
"yourVaultIsLockedV2": {
"message": "Your vault is locked"
},
"yourAccountIsLocked": {
"message": "Your account is locked"
},
"or": {
"message": "or"
},
"unlock": {
"message": "إلغاء القفل"
},
Expand Down Expand Up @@ -1936,6 +1945,9 @@
"unlockWithBiometrics": {
"message": "فتح باستخدام القياسات الحيوية"
},
"unlockWithMasterPassword": {
"message": "Unlock with master password"
},
"awaitDesktop": {
"message": "في انتظار التأكيد من سطح المكتب"
},
Expand Down Expand Up @@ -2509,7 +2521,7 @@
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendFilePopoutDialogDesc": {
"message": "To create a file Send, you need to pop out te extension to a new window.",
"message": "To create a file Send, you need to pop out the extension to a new window.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendLinuxChromiumFileWarning": {
Expand Down Expand Up @@ -3623,6 +3635,9 @@
"typePasskey": {
"message": "Passkey"
},
"accessing": {
"message": "Accessing"
},
"passkeyNotCopied": {
"message": "لن يتم نسخ Passkey"
},
Expand Down
23 changes: 19 additions & 4 deletions apps/browser/src/_locales/az/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,15 @@
"yourVaultIsLocked": {
"message": "Anbarınız kilidlənib. Davam etmək üçün kimliyinizi doğrulayın."
},
"yourVaultIsLockedV2": {
"message": "Anbarınız kilidlənib"
},
"yourAccountIsLocked": {
"message": "Hesabınız kilidlənib"
},
"or": {
"message": "və ya"
},
"unlock": {
"message": "Kilidi aç"
},
Expand Down Expand Up @@ -1936,6 +1945,9 @@
"unlockWithBiometrics": {
"message": "Kilidi biometriklə açın"
},
"unlockWithMasterPassword": {
"message": "Ana parolla kilidi aç"
},
"awaitDesktop": {
"message": "Masaüstündən təsdiq gözlənilir"
},
Expand Down Expand Up @@ -2505,11 +2517,11 @@
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendFilePopoutDialogText": {
"message": "Pop out extension?",
"message": "Uzantı yeni pəncərədə açılsın?",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendFilePopoutDialogDesc": {
"message": "To create a file Send, you need to pop out te extension to a new window.",
"message": "Bir fayl \"Send\"i yaratmaq üçün uzantını yeni bir pəncərədə açmalısınız.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendLinuxChromiumFileWarning": {
Expand All @@ -2522,7 +2534,7 @@
"message": "Safari istifadə edərək bir fayl seçmək üçün bu bannerə klikləyərək yeni bir pəncərədə açın."
},
"popOut": {
"message": "Pop out"
"message": "Pəncərədə aç"
},
"sendFileCalloutHeader": {
"message": "Başlamazdan əvvəl"
Expand Down Expand Up @@ -3623,6 +3635,9 @@
"typePasskey": {
"message": "Keçid açarı"
},
"accessing": {
"message": "Müraciət edilir"
},
"passkeyNotCopied": {
"message": "Keçid açarı kopyalanmır"
},
Expand Down Expand Up @@ -4498,6 +4513,6 @@
"message": "Bu elementə düzəliş etmə icazəniz yoxdur"
},
"authenticating": {
"message": "Authenticating"
"message": "Kimlik doğrulama"
}
}
17 changes: 16 additions & 1 deletion apps/browser/src/_locales/be/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,15 @@
"yourVaultIsLocked": {
"message": "Ваша сховішча заблакіравана. Каб працягнуць, пацвердзіце сваю асобу."
},
"yourVaultIsLockedV2": {
"message": "Your vault is locked"
},
"yourAccountIsLocked": {
"message": "Your account is locked"
},
"or": {
"message": "or"
},
"unlock": {
"message": "Разблакіраваць"
},
Expand Down Expand Up @@ -1936,6 +1945,9 @@
"unlockWithBiometrics": {
"message": "Разблакіраваць з дапамогай біяметрыі"
},
"unlockWithMasterPassword": {
"message": "Unlock with master password"
},
"awaitDesktop": {
"message": "Чаканне пацвярджэння з камп'ютара"
},
Expand Down Expand Up @@ -2509,7 +2521,7 @@
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendFilePopoutDialogDesc": {
"message": "To create a file Send, you need to pop out te extension to a new window.",
"message": "To create a file Send, you need to pop out the extension to a new window.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendLinuxChromiumFileWarning": {
Expand Down Expand Up @@ -3623,6 +3635,9 @@
"typePasskey": {
"message": "Passkey"
},
"accessing": {
"message": "Accessing"
},
"passkeyNotCopied": {
"message": "Passkey will not be copied"
},
Expand Down
15 changes: 15 additions & 0 deletions apps/browser/src/_locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,15 @@
"yourVaultIsLocked": {
"message": "Трезорът е заключен — въведете главната си парола, за да продължите."
},
"yourVaultIsLockedV2": {
"message": "Трезорът Ви е заключен"
},
"yourAccountIsLocked": {
"message": "Регистрацията Ви е заключена"
},
"or": {
"message": "или"
},
"unlock": {
"message": "Отключване"
},
Expand Down Expand Up @@ -1936,6 +1945,9 @@
"unlockWithBiometrics": {
"message": "Отключване с биометрични данни"
},
"unlockWithMasterPassword": {
"message": "Отключване с главната парола"
},
"awaitDesktop": {
"message": "Чака се потвърждение от самостоятелното приложение"
},
Expand Down Expand Up @@ -3623,6 +3635,9 @@
"typePasskey": {
"message": "Секретен ключ"
},
"accessing": {
"message": "Използване на"
},
"passkeyNotCopied": {
"message": "Секретният ключ няма да бъде копиран"
},
Expand Down
17 changes: 16 additions & 1 deletion apps/browser/src/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,15 @@
"yourVaultIsLocked": {
"message": "আপনার ভল্ট লক করা আছে। চালিয়ে যেতে আপনার মূল পাসওয়ার্ডটি যাচাই করান।"
},
"yourVaultIsLockedV2": {
"message": "Your vault is locked"
},
"yourAccountIsLocked": {
"message": "Your account is locked"
},
"or": {
"message": "or"
},
"unlock": {
"message": "আনলক"
},
Expand Down Expand Up @@ -1936,6 +1945,9 @@
"unlockWithBiometrics": {
"message": "বায়োমেট্রিক্স দিয়ে আনলক করুন"
},
"unlockWithMasterPassword": {
"message": "Unlock with master password"
},
"awaitDesktop": {
"message": "ডেস্কটপ থেকে নিশ্চিতকরণের অপেক্ষায়"
},
Expand Down Expand Up @@ -2509,7 +2521,7 @@
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendFilePopoutDialogDesc": {
"message": "To create a file Send, you need to pop out te extension to a new window.",
"message": "To create a file Send, you need to pop out the extension to a new window.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendLinuxChromiumFileWarning": {
Expand Down Expand Up @@ -3623,6 +3635,9 @@
"typePasskey": {
"message": "Passkey"
},
"accessing": {
"message": "Accessing"
},
"passkeyNotCopied": {
"message": "Passkey will not be copied"
},
Expand Down
Loading

0 comments on commit 2c80ccd

Please sign in to comment.