Merge branch 'main' into dedup-heading-enable

mdn · Feb 11, 2024 · f1c41e9 · f1c41e9
2 parents d16d461 + 6dd0a33
commit f1c41e9
Show file tree

Hide file tree

Showing 1,575 changed files with 19,359 additions and 7,507 deletions.
diff --git a/.github/workflows/markdown-lint-fix.yml b/.github/workflows/markdown-lint-fix.yml
@@ -67,25 +67,31 @@ jobs:
 
       - name: Create PR with only fixable issues
         if: success()
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "${{ matrix.lang }}: auto-fix Markdownlint issues"
           branch: markdownlint-auto-cleanup-${{ matrix.lang }}
           title: "Markdownlint auto-cleanup for ${{ matrix.lang }}"
           author: mdn-bot <[email protected]>
+          committer: mdn-bot <[email protected]>
           body: |
             All issues auto-fixed
+          labels: |
+            automated pr
           token: ${{ secrets.AUTOMERGE_TOKEN }}
 
       - name: Create PR with notice on unfixed issues
         if: failure()
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "${{ matrix.lang }}: auto-fix Markdownlint issues"
           branch: markdownlint-auto-cleanup-${{ matrix.lang }}
           title: "Markdownlint auto-cleanup for ${{ matrix.lang }}"
           author: mdn-bot <[email protected]>
+          committer: mdn-bot <[email protected]>
           body: |
             Auto-fix was run, but additional issues found.
             Please review the run log: https://github.com/mdn/translated-content/actions/runs/${{ github.run_id }}
+          labels: |
+            automated pr
           token: ${{ secrets.AUTOMERGE_TOKEN }}
diff --git a/.github/workflows/pr-check_redirects.yml b/.github/workflows/pr-check_redirects.yml
@@ -17,7 +17,7 @@ jobs:
       # This is a "required" workflow so path filtering can not be used:
       # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
       # We have to rely on a custom filtering mechanism to run the checks only if required files are modified.
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         name: See if any file needs checking
         id: filter
         with:

diff --git a/.github/workflows/pr-review-companion.yml b/.github/workflows/pr-review-companion.yml
@@ -34,7 +34,7 @@ jobs:
 
       # See https://www.peterbe.com/plog/install-python-poetry-github-actions-faster
       - name: Load cached ~/.local
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local
           # the trailing number is used to increase for getting
@@ -49,7 +49,7 @@ jobs:
 
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: yari/deployer/.venv
           # the trailing number is used to increase for getting

diff --git a/.github/workflows/sync-translated-content.yml b/.github/workflows/sync-translated-content.yml
@@ -60,11 +60,14 @@ jobs:
         run: yarn content sync-translated-content ${{ matrix.lang }}
 
       - name: Create PR with sync for ${{ matrix.lang }}
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "${{ matrix.lang }}: sync translated content"
           branch: content-sync-${{ matrix.lang }}
           title: "[${{ matrix.lang }}] sync translated content"
           author: mdn-bot <[email protected]>
+          committer: mdn-bot <[email protected]>
           body: Yari generated sync
+          labels: |
+            automated pr
           token: ${{ secrets.AUTOMERGE_TOKEN }}
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged
diff --git a/docs/ko/guides/glossary-guide.md b/docs/ko/guides/glossary-guide.md
@@ -189,7 +189,7 @@
 | Scope                   | 범위            |               |                                                                                          |
 | Settled                 | 처리            |               |                                                                                          |
 | Sparse array            | 희소 배열       |               |                                                                                          |
-| Temporal Dead Zone, TDZ | 시간상 사각지대 |               | [참고 링크](https://github.com/mdn/translated-content/pull/2626/files)                   |
+| Temporal Dead Zone, TDZ | 일시적 사각지대 |               | [참고 링크](https://github.com/mdn/translated-content/pull/2626/files)                   |
 | TypedArray              | 형식화 배열     |               |                                                                                          |
 
 ## HTTP

diff --git a/docs/ko/guides/translation-guide.md b/docs/ko/guides/translation-guide.md
@@ -47,7 +47,7 @@
 >
 > 목표를 달성하기 위한 모든 필수 정보가 들어있는 교육 과정을 준비했습니다.
 >
-> [**시작하기**](/en-US/docs/Learn/Front-end_web_developer)
+> [**시작하기**](/ko/docs/Learn/Front-end_web_developer)
 ```
 
 ### 카드 번역

diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
@@ -1215,6 +1215,7 @@
 /es/docs/Learn/Using_Github_pages	/es/docs/Learn/Common_questions/Tools_and_setup/Using_GitHub_pages
 /es/docs/MDN/About	/es/docs/MDN/Writing_guidelines
 /es/docs/MDN/Comenzando	/es/docs/MDN/Community/Contributing/Getting_started
+/es/docs/MDN/Contribute	/es/docs/MDN/Community/Contributing
 /es/docs/MDN/Contribute/Content	/es/docs/conflicting/MDN/Writing_guidelines
 /es/docs/MDN/Contribute/Content/Content_blocks	/es/docs/MDN/Writing_guidelines/Howto/Markdown_in_MDN
 /es/docs/MDN/Contribute/Feedback	/es/docs/MDN/Community
@@ -1229,7 +1230,8 @@
 /es/docs/MDN/Contribute/Howto/Tag	/es/docs/MDN/Writing_guidelines/Howto
 /es/docs/MDN/Contribute/Howto/Write_a_new_entry_in_the_Glossary	/es/docs/MDN/Writing_guidelines/Howto/Write_a_new_entry_in_the_glossary
 /es/docs/MDN/Contribute/Markdown_in_MDN	/es/docs/MDN/Writing_guidelines/Howto/Markdown_in_MDN
-/es/docs/MDN/Contribute/Procesos	/es/docs/MDN/Contribute/Processes
+/es/docs/MDN/Contribute/Procesos	/es/docs/conflicting/MDN/Community/Contributing
+/es/docs/MDN/Contribute/Processes	/es/docs/conflicting/MDN/Community/Contributing
 /es/docs/MDN/Contribute/Structures	/es/docs/MDN/Writing_guidelines/Page_structures
 /es/docs/MDN/Contribute/Structures/Ejemplos_ejecutables	/es/docs/MDN/Writing_guidelines/Page_structures/Live_samples
 /es/docs/MDN/Contribute/Structures/Macros	/es/docs/MDN/Writing_guidelines/Page_structures/Macros/Commonly_used_macros
@@ -1258,6 +1260,7 @@
 /es/docs/MDN/Tools/Introduction_to_KumaScript	https://github.com/mdn/yari/tree/main/docs/kumascript
 /es/docs/MDN/Tools/KumaScript	https://github.com/mdn/yari/tree/main/docs/kumascript
 /es/docs/MDN/Writing_guidelines/Howto/Tag	/es/docs/MDN/Writing_guidelines/Howto
+/es/docs/MDN/Writing_guidelines/Page_structures/Quicklinks	/es/docs/MDN/Writing_guidelines/Page_structures/Sidebars
 /es/docs/MDN/Yari	/es/docs/MDN/Community/Contributing/Our_repositories
 /es/docs/MDN_en_diez	/es/docs/MDN/At_ten
 /es/docs/Manipular_video_por_medio_de_canvas	/es/docs/Web/API/Canvas_API/Manipulating_video_using_canvas
@@ -1864,6 +1867,7 @@
 /es/docs/Web/CSS/CSS_Positioning/entendiendo_z_index/ejemplo_3_del_contexto_de_apilamiento	/es/docs/Web/CSS/CSS_positioned_layout/Understanding_z-index/Stacking_context_example_3
 /es/docs/Web/CSS/CSS_Properties_Reference	/es/docs/orphaned/Web/CSS/CSS_Properties_Reference
 /es/docs/Web/CSS/CSS_Reglas_Condicionales	/es/docs/Web/CSS/CSS_conditional_rules
+/es/docs/Web/CSS/CSS_container_queries	/es/docs/Web/CSS/CSS_containment/Container_queries
 /es/docs/Web/CSS/CSS_flexible_box_layout/Backwards_compatibility_of_flexbox	/es/docs/conflicting/Glossary/Flexbox
 /es/docs/Web/CSS/Child_selectors	/es/docs/Web/CSS/Child_combinator
 /es/docs/Web/CSS/Columnas_CSS	/es/docs/Web/CSS/CSS_multicol_layout
@@ -1962,6 +1966,7 @@
 /es/docs/Web/Guide/API/Vibration	/es/docs/Web/API/Vibration_API
 /es/docs/Web/Guide/API/WebRTC/Peer-to-peer_communications_with_WebRTC	/es/docs/conflicting/Web/API/WebRTC_API
 /es/docs/Web/Guide/CSS	/es/docs/Learn/CSS
+/es/docs/Web/Guide/CSS/Block_formatting_context	/es/docs/Web/CSS/CSS_display/Block_formatting_context
 /es/docs/Web/Guide/Graphics	/es/docs/conflicting/Learn/HTML/Multimedia_and_embedding/Images_in_HTML
 /es/docs/Web/Guide/HTML	/es/docs/Learn/HTML
 /es/docs/Web/Guide/HTML/Canvas_tutorial	/es/docs/Web/API/Canvas_API/Tutorial

diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
@@ -2639,6 +2639,18 @@
       "DracotMolver"
     ]
   },
+  "MDN/Community/Contributing": {
+    "modified": "2019-03-22T01:52:35.495Z",
+    "contributors": [
+      "Beatriz_Ortega_Valdes",
+      "wbamberg",
+      "Rrxxxx",
+      "Ibrahim1997",
+      "LeoHirsch",
+      "MauricioGil",
+      "Mars"
+    ]
+  },
   "MDN/Community/Contributing/Getting_started": {
     "modified": "2020-12-02T19:26:24.923Z",
     "contributors": [
@@ -2662,22 +2674,6 @@
       "cototion"
     ]
   },
-  "MDN/Contribute": {
-    "modified": "2019-03-22T01:52:35.495Z",
-    "contributors": [
-      "Beatriz_Ortega_Valdes",
-      "wbamberg",
-      "Rrxxxx",
-      "Ibrahim1997",
-      "LeoHirsch",
-      "MauricioGil",
-      "Mars"
-    ]
-  },
-  "MDN/Contribute/Processes": {
-    "modified": "2019-01-17T02:12:44.469Z",
-    "contributors": ["wbamberg", "astrapotro"]
-  },
   "MDN/Writing_guidelines": {
     "modified": "2020-05-03T01:47:58.469Z",
     "contributors": [
@@ -6641,6 +6637,10 @@
     "modified": "2020-10-21T02:39:25.867Z",
     "contributors": ["SphinxKnight", "RoqueAlonso"]
   },
+  "Web/CSS/CSS_display/Block_formatting_context": {
+    "modified": "2019-03-23T22:32:27.340Z",
+    "contributors": ["Enesimus", "javichito"]
+  },
   "Web/CSS/CSS_flexible_box_layout": {
     "modified": "2019-03-23T22:43:42.897Z",
     "contributors": ["danpaltor", "tipoqueno", "pepe2016", "fscholz"]
@@ -8489,10 +8489,6 @@
       "Sheppy"
     ]
   },
-  "Web/Guide/CSS/Block_formatting_context": {
-    "modified": "2019-03-23T22:32:27.340Z",
-    "contributors": ["Enesimus", "javichito"]
-  },
   "Web/HTML": {
     "modified": "2020-12-10T12:38:08.697Z",
     "contributors": [
@@ -13970,6 +13966,10 @@
       "Michelangeur"
     ]
   },
+  "conflicting/MDN/Community/Contributing": {
+    "modified": "2019-01-17T02:12:44.469Z",
+    "contributors": ["wbamberg", "astrapotro"]
+  },
   "conflicting/MDN/Contribute": {
     "modified": "2019-01-16T18:56:52.965Z",
     "contributors": ["wbamberg", "0zxo", "astrapotro", "MauricioGil", "Sheppy"]

diff --git a/files/es/mdn/contribute/processes/index.md → ...cting/mdn/community/contributing/index.md b/files/es/mdn/contribute/processes/index.md → ...cting/mdn/community/contributing/index.md
@@ -1,6 +1,7 @@
 ---
 title: Procesos de documentación
-slug: MDN/Contribute/Processes
+slug: conflicting/MDN/Community/Contributing
+original_slug: MDN/Contribute/Processes
 ---
 
 {{MDNSidebar}}

diff --git a/files/es/learn/css/first_steps/getting_started/index.md b/files/es/learn/css/first_steps/getting_started/index.md
@@ -274,7 +274,7 @@ Dará formato a cualquier elemento con la clase `special`, dentro de un elemento
 
 En el HTML original que proporcionamos, el único elemento al que esto aplica estilo es `<span class="special">`.
 
-No te preocupes si ahora mismo te parece complicado: irás acostumbrarte a medida que escribas más CSS.
+No te preocupes si ahora mismo te parece complicado: irás acostumbrándote a medida que escribas más CSS.
 
 ## Para terminar
 

diff --git a/files/es/mdn/contribute/index.md → files/es/mdn/community/contributing/index.md b/files/es/mdn/contribute/index.md → files/es/mdn/community/contributing/index.md
@@ -1,6 +1,7 @@
 ---
 title: Contribuir a MDN
-slug: MDN/Contribute
+slug: MDN/Community/Contributing
+original_slug: MDN/Contribute
 ---
 
 {{MDNSidebar}}