diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json
index 9808172f..695fcb68 100644
--- a/.devcontainer/devcontainer-lock.json
+++ b/.devcontainer/devcontainer-lock.json
@@ -1,9 +1,9 @@
 {
   "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {
-      "version": "2.17.0",
-      "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:25b9f05705ffba7dbe503230ac76081419306f8c8bc88e0ce78c4ecd99a0c78c",
-      "integrity": "sha256:25b9f05705ffba7dbe503230ac76081419306f8c8bc88e0ce78c4ecd99a0c78c"
+    "ghcr.io/devcontainers/features/docker-in-docker:4": {
+      "version": "4.0.0",
+      "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:4fa87399214366e320d489991769c4f3f461e1ffe461f54eea78a41b34945bb5",
+      "integrity": "sha256:4fa87399214366e320d489991769c4f3f461e1ffe461f54eea78a41b34945bb5"
     },
     "ghcr.io/devcontainers/features/github-cli:1": {
       "version": "1.1.0",
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9ca16aa1..c886b6b8 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,7 +8,6 @@
       "profile": "default"
     },
     "ghcr.io/devcontainers/features/docker-in-docker:4": {
-      "installDockerComposeSwitch": false,
       "moby": false
     },
     "ghcr.io/devcontainers/features/github-cli:1": {}
diff --git a/.gitattributes b/.gitattributes
index 9534a751..ff313eec 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -35,6 +35,7 @@ LICENSE         text
 .gitignore      export-ignore
 
 *.gitattributes linguist-language=gitattributes
-package-lock.json linguist-generated=true linguist-language=JSON
+pnpm-lock.yaml linguist-generated=true linguist-language=YAML
 packaging/tauri/Cargo.lock text linguist-generated=true linguist-language=TOML
-locales/*.json merge=union
+packages/i18n/strings/*.json merge=union
+.devcontainer/devcontainer-lock.json text eol=lf linguist-generated=true linguist-language=JSON
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 95dde315..ae6ce39b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "editor.formatOnSave": true, 
+  "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "always",
     "source.organizeImports": "never"
@@ -48,5 +48,5 @@
   "vue.inlayHints.vBindShorthand": true,
   "vue.inlayHints.optionsWrapper": true,
   "vue.inlayHints.destructuredProps": true,
-  "js/ts.tsserver.experimental.enableProjectDiagnostics": true,
+  "js/ts.tsserver.experimental.enableProjectDiagnostics": true
 }