Skip to content

Commit

Permalink
Merge branch 'main' into ri
Browse files Browse the repository at this point in the history
  • Loading branch information
PassionPenguin authored Aug 30, 2024
2 parents 58dff7b + b006e16 commit c91de5d
Show file tree
Hide file tree
Showing 9,707 changed files with 67,633 additions and 29,669 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ For guidelines relating to specific locales, we have locale-specific docs in sub
- [Japanese translation guide / 日本語翻訳ガイド](ja/README.md)
- [Korean translation guide / 한국 번역 지침](ko/README.md)

> **Note:** If you want to add a guide to document some specific guidelines for your locale and it does not already appear here, you are welcome to add one, or [talk to the locale teams](https://github.com/mdn/translated-content/blob/main/PEERS_GUIDELINES.md#review-teams) about it.
> [!NOTE]
> If you want to add a guide to document some specific guidelines for your locale and it does not already appear here, you are welcome to add one, or [talk to the locale teams](https://github.com/mdn/translated-content/blob/main/PEERS_GUIDELINES.md#review-teams) about it.
## Do not copy all front matter properties from English pages

Expand Down
41 changes: 21 additions & 20 deletions docs/zh-cn/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,27 @@

## 标题/表格

| 英文词汇 | 翻译 | 备注 | 引用来源 |
| ---------------------- | ------------ | ------------------ | --------------------------------------------------------------------------- |
| Accessibility concerns | 无障碍考虑 | | https://github.com/mdn/translated-content/issues/11456 |
| Active learning | 动手练习 | | https://github.com/mdn/translated-content/pull/12696#discussion_r1164859935 |
| Associated interfaces | 相关接口 | | |
| Associated roles | 相关角色 | | |
| Browser compatibility | 浏览器兼容性 | | |
| Conclusion | 总结 | | https://github.com/mdn/translated-content/pull/13329#discussion_r1199677894 |
| Examples | 示例 | | |
| Exceptions | 异常 | | |
| Formal Definition | 形式定义 | | https://zh.wikipedia.org/zh-cn/形式文法 |
| Formal syntax | 形式语法 | | https://zh.wikipedia.org/zh-cn/形式文法 |
| Objective | 目标 | 在学习区表格中使用 | |
| Parameters | 参数 | | |
| Prerequisites | 前提 | 在学习区表格中使用 | |
| See also | 参见 | | |
| Specifications | 规范 | | |
| Technical summary | 技术概要 | | https://github.com/mdn/translated-content/issues/11456 |
| Test your skills | 技能测试 | | |
| Usage notes | 使用说明 | | https://github.com/mdn/translated-content/pull/12600#discussion_r1161045585 |
| 英文词汇 | 翻译 | 备注 | 引用来源 |
| ---------------------- | ------------ | ------------------ | ---------------------------------------------------------------------------- |
| Accessibility concerns | 无障碍考虑 | | https://github.com/mdn/translated-content/issues/11456 |
| Active learning | 动手练习 | | https://github.com/mdn/translated-content/pull/12696#discussion_r1164859935 |
| Associated interfaces | 相关接口 | | |
| Associated roles | 相关角色 | | |
| Browser compatibility | 浏览器兼容性 | | |
| Conclusion | 总结 | | https://github.com/mdn/translated-content/pull/13329#discussion_r1199677894 |
| Examples | 示例 | | |
| Exceptions | 异常 | | |
| Formal Definition | 形式定义 | | https://zh.wikipedia.org/zh-cn/形式文法 |
| Formal syntax | 形式语法 | | https://zh.wikipedia.org/zh-cn/形式文法 |
| Objective | 目标 | 在学习区表格中使用 | |
| Parameters | 参数 | | |
| Prerequisites | 前提 | 在学习区表格中使用 | |
| See also | 参见 | | |
| Specifications | 规范 | | |
| Technical summary | 技术概要 | | https://github.com/mdn/translated-content/issues/11456 |
| Test your skills | 技能测试 | | |
| Usage context | 使用上下文 | | https://github.com/mdn/translated-content/pull/23257#issuecomment-2309852450 |
| Usage notes | 使用说明 | | https://github.com/mdn/translated-content/pull/12600#discussion_r1161045585 |

## 通用术语

Expand Down
15 changes: 10 additions & 5 deletions files/es/_redirects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,7 @@
/es/docs/Web/API/Media_Streams_API /es/docs/Web/API/Media_Capture_and_Streams_API
/es/docs/Web/API/Media_Streams_API/Taking_still_photos /es/docs/Web/API/Media_Capture_and_Streams_API/Taking_still_photos
/es/docs/Web/API/Navigator.getUserMedia /es/docs/Web/API/Navigator/getUserMedia
/es/docs/Web/API/Navigator/registerProtocolHandler/Web-based_protocol_handlers /es/docs/conflicting/Web/API/Navigator/registerProtocolHandler
/es/docs/Web/API/NavigatorConcurrentHardware /es/docs/Web/API/Navigator
/es/docs/Web/API/NavigatorConcurrentHardware/hardwareConcurrency /es/docs/Web/API/Navigator/hardwareConcurrency
/es/docs/Web/API/NavigatorGeolocation/geolocation /es/docs/Web/API/Navigator/geolocation
Expand Down Expand Up @@ -1763,7 +1764,7 @@
/es/docs/Web/API/console/log /es/docs/Web/API/console/log_static
/es/docs/Web/API/console/table /es/docs/Web/API/console/table_static
/es/docs/Web/API/console/time /es/docs/Web/API/console/time_static
/es/docs/Web/API/console/timeEnd /es/docs/Web/API/console/timeend_static
/es/docs/Web/API/console/timeEnd /es/docs/Web/API/console/timeEnd_static
/es/docs/Web/API/console/trace /es/docs/Web/API/console/trace_static
/es/docs/Web/API/console/warn /es/docs/Web/API/console/warn_static
/es/docs/Web/API/crypto_property /es/docs/Web/API/Window/crypto
Expand Down Expand Up @@ -1882,6 +1883,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_animations/Tips /es/docs/Web/API/Web_Animations_API/Tips
/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
Expand Down Expand Up @@ -2196,9 +2198,12 @@
/es/docs/Web/HTML/microformatos /es/docs/Web/HTML/microformats
/es/docs/Web/HTML/Índice /es/docs/Web/HTML
/es/docs/Web/HTTP/Access_control_CORS /es/docs/Web/HTTP/CORS
/es/docs/Web/HTTP/Basics_of_HTTP/Data_URIs /es/docs/Web/HTTP/Basics_of_HTTP/Data_URLs
/es/docs/Web/HTTP/Basics_of_HTTP/Datos_URIs /es/docs/Web/HTTP/Basics_of_HTTP/Data_URLs
/es/docs/Web/HTTP/Basics_of_HTTP/Identificación_recursos_en_la_Web /es/docs/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web
/es/docs/Web/HTTP/Basics_of_HTTP/Choosing_between_www_and_non-www_URLs /es/docs/Web/URI/Authority/Choosing_between_www_and_non-www_URLs
/es/docs/Web/HTTP/Basics_of_HTTP/Data_URIs /es/docs/Web/URI/Schemes/data
/es/docs/Web/HTTP/Basics_of_HTTP/Data_URLs /es/docs/Web/URI/Schemes/data
/es/docs/Web/HTTP/Basics_of_HTTP/Datos_URIs /es/docs/Web/URI/Schemes/data
/es/docs/Web/HTTP/Basics_of_HTTP/Identificación_recursos_en_la_Web /es/docs/orphaned/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web
/es/docs/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web /es/docs/orphaned/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web
/es/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Lista_completa_de_tipos_MIME /es/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
/es/docs/Web/HTTP/Gestion_de_la_conexion_en_HTTP_1.x /es/docs/Web/HTTP/Connection_management_in_HTTP_1.x
/es/docs/Web/HTTP/Peticiones_condicionales /es/docs/Web/HTTP/Conditional_requests
Expand Down Expand Up @@ -2996,7 +3001,7 @@
/es/docs/conflicting/web/api/file/name /es/docs/web/api/file/name
/es/docs/conflicting/web/javascript/reference/deprecated_and_obsolete_features /es/docs/web/javascript/reference/deprecated_and_obsolete_features
/es/docs/conflicting/web/javascript/reference/deprecated_and_obsolete_features_a91664716c4f7753074ac042780999e0 /es/docs/web/javascript/reference/deprecated_and_obsolete_features
/es/docs/controladores_protocolos_web /es/docs/Web/API/Navigator/registerProtocolHandler/Web-based_protocol_handlers
/es/docs/controladores_protocolos_web /es/docs/conflicting/Web/API/Navigator/registerProtocolHandler
/es/docs/en /en-US/
/es/docs/firefox_Web_Developer_(externo) https://addons.mozilla.org/firefox/60/
/es/docs/orphaned/MDN/Tools https://github.com/mdn/yari/tree/main/docs
Expand Down
48 changes: 24 additions & 24 deletions files/es/_wikihistory.json
Original file line number Diff line number Diff line change
Expand Up @@ -4744,10 +4744,6 @@
"modified": "2019-03-23T23:53:04.318Z",
"contributors": ["fscholz", "khalid32", "Nukeador", "HenryGR", "Mgjbot"]
},
"Web/API/Navigator/registerProtocolHandler/Web-based_protocol_handlers": {
"modified": "2019-03-23T22:06:43.969Z",
"contributors": ["chrisdavidmills", "AngelFQC"]
},
"Web/API/Navigator/vibrate": {
"modified": "2019-03-23T23:32:23.651Z",
"contributors": ["fscholz", "jsx", "mmednik"]
Expand Down Expand Up @@ -5340,6 +5336,10 @@
"modified": "2020-10-12T08:06:57.683Z",
"contributors": ["SphinxKnight", "MarioA19", "geryescalier", "karlalhdz"]
},
"Web/API/Web_Animations_API/Tips": {
"modified": "2020-08-16T13:05:40.057Z",
"contributors": ["CamilaAchury", "SphinxKnight", "AlbertoVargasMoreno"]
},
"Web/API/Web_Audio_API": {
"modified": "2019-03-23T23:31:19.634Z",
"contributors": ["estebanborai", "AngelFQC", "Pau_Ilargia", "maedca"]
Expand Down Expand Up @@ -5751,14 +5751,14 @@
"modified": "2019-03-23T22:20:30.589Z",
"contributors": ["AlePerez92"]
},
"Web/API/console/timeEnd_static": {
"modified": "2020-10-15T22:13:11.825Z",
"contributors": ["xlhector10"]
},
"Web/API/console/time_static": {
"modified": "2019-03-18T21:42:22.745Z",
"contributors": ["jotaoncode"]
},
"Web/API/console/timeend_static": {
"modified": "2020-10-15T22:13:11.825Z",
"contributors": ["xlhector10"]
},
"Web/API/console/trace_static": {
"modified": "2019-03-23T22:22:51.545Z",
"contributors": ["Axl-Nolasco"]
Expand Down Expand Up @@ -6535,10 +6535,6 @@
"modified": "2019-03-18T21:35:39.343Z",
"contributors": ["lajaso"]
},
"Web/CSS/CSS_animations/Tips": {
"modified": "2020-08-16T13:05:40.057Z",
"contributors": ["CamilaAchury", "SphinxKnight", "AlbertoVargasMoreno"]
},
"Web/CSS/CSS_animations/Using_CSS_animations": {
"modified": "2020-07-06T16:16:21.887Z",
"contributors": [
Expand Down Expand Up @@ -9428,22 +9424,10 @@
"cissoid"
]
},
"Web/HTTP/Basics_of_HTTP/Choosing_between_www_and_non-www_URLs": {
"modified": "2019-03-18T21:22:07.450Z",
"contributors": ["Adorta4", "carlosgocereceda"]
},
"Web/HTTP/Basics_of_HTTP/Data_URLs": {
"modified": "2019-03-23T22:24:54.977Z",
"contributors": ["Sergio_Gonzalez_Collado", "AzazelN28", "uclides"]
},
"Web/HTTP/Basics_of_HTTP/Evolution_of_HTTP": {
"modified": "2019-03-23T22:10:11.567Z",
"contributors": ["Sergio_Gonzalez_Collado", "ChrisMHM"]
},
"Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web": {
"modified": "2019-03-23T22:24:51.387Z",
"contributors": ["DaniNz", "Sergio_Gonzalez_Collado", "ChrisMHM", "uclides"]
},
"Web/HTTP/Basics_of_HTTP/MIME_types": {
"modified": "2019-11-18T08:03:54.325Z",
"contributors": [
Expand Down Expand Up @@ -13453,6 +13437,14 @@
"diegogaysaez"
]
},
"Web/URI/Authority/Choosing_between_www_and_non-www_URLs": {
"modified": "2019-03-18T21:22:07.450Z",
"contributors": ["Adorta4", "carlosgocereceda"]
},
"Web/URI/Schemes/data": {
"modified": "2019-03-23T22:24:54.977Z",
"contributors": ["Sergio_Gonzalez_Collado", "AzazelN28", "uclides"]
},
"Web/XML/Parsing_and_serializing_XML": {
"modified": "2019-03-23T22:10:22.365Z",
"contributors": ["FenixAlive"]
Expand Down Expand Up @@ -14046,6 +14038,10 @@
"modified": "2019-03-18T21:11:08.379Z",
"contributors": ["duduindo", "teoli", "semptrion", "CHORVAT", "inma_610"]
},
"conflicting/Web/API/Navigator/registerProtocolHandler": {
"modified": "2019-03-23T22:06:43.969Z",
"contributors": ["chrisdavidmills", "AngelFQC"]
},
"conflicting/Web/API/Node": {
"modified": "2019-03-23T22:08:57.260Z",
"contributors": ["tureey"]
Expand Down Expand Up @@ -15330,6 +15326,10 @@
"modified": "2019-03-23T22:46:15.359Z",
"contributors": ["juanbrujo", "raecillacastellana", "vltamara"]
},
"orphaned/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web": {
"modified": "2019-03-23T22:24:51.387Z",
"contributors": ["DaniNz", "Sergio_Gonzalez_Collado", "ChrisMHM", "uclides"]
},
"orphaned/Web/JavaScript/Reference/Errors/Undefined_prop": {
"modified": "2020-03-12T19:47:46.684Z",
"contributors": ["antixsuperstar"]
Expand Down
3 changes: 2 additions & 1 deletion files/es/conflicting/glossary/flexbox/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ Si usa `display: table-cell` en un elemento en su HTML, toma el estilo de una ce

Si luego declara `display: flex` en el elemento principal, estos cuadros anónimos no se crean y, por lo tanto, su elemento sigue siendo un elemento secundario directo y puede convertirse en un elemento flexible, perdiendo cualquiera de las funciones de visualización de la tabla.

> **Nota:** algunos valores de visualización normalmente desencadenan la creación de cuadros anónimos alrededor del cuadro original. Si dicha caja es un elemento flexible, primero se bloquea y, por lo tanto, no se creará una caja anónima. Por ejemplo, dos elementos flexibles contiguos con pantalla: table-cell se convertirán en dos pantallas separadas: elementos flexibles de bloque, en lugar de estar envueltos en una sola tabla anónima. "- [4. Elementos Flexibles](https://www.w3.org/TR/css-flexbox-1/#flex-items)
> [!NOTE]
> Algunos valores de visualización normalmente desencadenan la creación de cuadros anónimos alrededor del cuadro original. Si dicha caja es un elemento flexible, primero se bloquea y, por lo tanto, no se creará una caja anónima. Por ejemplo, dos elementos flexibles contiguos con pantalla: table-cell se convertirán en dos pantallas separadas: elementos flexibles de bloque, en lugar de estar envueltos en una sola tabla anónima. "- [4. Elementos Flexibles](https://www.w3.org/TR/css-flexbox-1/#flex-items)
{{EmbedGHLiveSample("css-examples/flexbox/browsers/table-cell.html", '100%', 550)}}

Expand Down
Loading

0 comments on commit c91de5d

Please sign in to comment.