Merge branch 'main' into pt-br-learn-forms-your_first_form-fix-img-link

PEERS_GUIDELINES.md

@@ -56,10 +56,6 @@ The review teams for each locale are:
 - Spanish (`es`) content - the [yari-content-es](https://github.com/orgs/mdn/teams/yari-content-es) team, which consists of:
   - [JuanVqz](https://github.com/JuanVqz)
   - [Graywolf9](https://github.com/Graywolf9)
-  - [davbrito](https://github.com/davbrito)
-  - [Vallejoanderson](https://github.com/vallejoanderson)
-  - [marcelozarate](https://github.com/marcelozarate)
-  - [Jalkhov](https://github.com/Jalkhov)
 
 ---
 

docs/ru/README.md

@@ -1,6 +1,10 @@
 # Участие в переводе
 
-Для начала ознакомьтесь с [правилами внесения изменений в MDN](https://github.com/mdn/translated-content/blob/main/CONTRIBUTING.md), [информацией о переводе документов MDN](https://github.com/mdn/translated-content/blob/main/docs/README.md) и [руководствами по составлению документации](/ru/docs/MDN/Writing_guidelines).
+<!-- markdownlint-disable search-replace -->
+
+Для начала ознакомьтесь с [правилами внесения изменений в MDN](https://github.com/mdn/translated-content/blob/main/CONTRIBUTING.md), [информацией о переводе документов MDN](https://github.com/mdn/translated-content/blob/main/docs/README.md) и [руководствами по составлению документации](https://developer.mozilla.org/ru/docs/MDN/Writing_guidelines).
+
+<!-- markdownlint-enable search-replace -->
 
 ## Использование ссылок
 

files/es/_redirects.txt

@@ -2420,6 +2420,7 @@
 /es/docs/Web/JavaScript/Guide/Introducción	/es/docs/Web/JavaScript/Guide/Introduction
 /es/docs/Web/JavaScript/Guide/JavaScript_Overview	/es/docs/Web/JavaScript/Guide/Introduction
 /es/docs/Web/JavaScript/Guide/Módulos	/es/docs/Web/JavaScript/Guide/Modules
+/es/docs/Web/JavaScript/Guide/Numbers_and_dates	/es/docs/Web/JavaScript/Guide/Numbers_and_strings
 /es/docs/Web/JavaScript/Guide/Obsolete_Pages	/es/docs/Web/JavaScript/Guide
 /es/docs/Web/JavaScript/Guide/Obsolete_Pages/Guía_JavaScript_1.5	/es/docs/Web/JavaScript/Guide
 /es/docs/Web/JavaScript/Guide/Obsolete_Pages/Guía_JavaScript_1.5/Acerca_de_esta_guía	/es/docs/Web/JavaScript/Guide/Introduction
@@ -2508,6 +2509,7 @@
 /es/docs/Web/JavaScript/Guide/Regular_Expressions/Grupos_y_rangos	/es/docs/Web/JavaScript/Guide/Regular_expressions/Groups_and_backreferences
 /es/docs/Web/JavaScript/Guide/Regular_Expressions/Hoja_de_referencia	/es/docs/Web/JavaScript/Guide/Regular_expressions/Cheatsheet
 /es/docs/Web/JavaScript/Guide/Regular_expressions/Unicode_property_escapes	/es/docs/Web/JavaScript/Reference/Regular_expressions/Unicode_character_class_escape
+/es/docs/Web/JavaScript/Guide/Text_formatting	/es/docs/conflicting/Web/JavaScript/Guide/Numbers_and_strings
 /es/docs/Web/JavaScript/Guide/Trabajando_con_objectos	/es/docs/Web/JavaScript/Guide/Working_with_objects
 /es/docs/Web/JavaScript/Guide/Usar_promesas	/es/docs/Web/JavaScript/Guide/Using_promises
 /es/docs/Web/JavaScript/Guide/Valores,_variables_y_literales	/es/docs/Web/JavaScript/Guide/Grammar_and_types

files/es/_wikihistory.json

@@ -10119,7 +10119,7 @@
       "FDSoil"
     ]
   },
-  "Web/JavaScript/Guide/Numbers_and_dates": {
+  "Web/JavaScript/Guide/Numbers_and_strings": {
     "modified": "2020-09-14T23:27:03.154Z",
     "contributors": [
       "Nachec",
@@ -10176,17 +10176,6 @@
     "modified": "2020-09-15T21:48:26.513Z",
     "contributors": ["Nachec"]
   },
-  "Web/JavaScript/Guide/Text_formatting": {
-    "modified": "2020-09-15T10:00:50.941Z",
-    "contributors": [
-      "Nachec",
-      "surielmx",
-      "IsraelFloresDGA",
-      "diegarta",
-      "Enesimus",
-      "jalmeida"
-    ]
-  },
   "Web/JavaScript/Guide/Typed_arrays": {
     "modified": "2020-10-15T21:37:33.978Z",
     "contributors": ["Nachec", "LeoE"]
@@ -14331,6 +14320,17 @@
       "StripTM"
     ]
   },
+  "conflicting/Web/JavaScript/Guide/Numbers_and_strings": {
+    "modified": "2020-09-15T10:00:50.941Z",
+    "contributors": [
+      "Nachec",
+      "surielmx",
+      "IsraelFloresDGA",
+      "diegarta",
+      "Enesimus",
+      "jalmeida"
+    ]
+  },
   "conflicting/Web/JavaScript/Inheritance_and_the_prototype_chain": {
     "modified": "2020-08-17T15:38:30.288Z",
     "contributors": [

files/es/web/javascript/guide/text_formatting/index.md → files/es/conflicting/web/javascript/guide/numbers_and_strings/index.md

@@ -1,6 +1,7 @@
 ---
 title: Formato de texto
-slug: Web/JavaScript/Guide/Text_formatting
+slug: conflicting/Web/JavaScript/Guide/Numbers_and_strings
+original_slug: Web/JavaScript/Guide/Text_formatting
 ---
 
 {{jsSidebar("JavaScript Guide")}} {{PreviousNext("Web/JavaScript/Guide/Numbers_and_dates", "Web/JavaScript/Guide/Regular_Expressions")}}

files/es/mdn/community/contributing/translated_content/index.md

@@ -48,8 +48,8 @@ Hemos _congelado_ todo el contenido localizado (lo que significa que no aceptare
 
 ### Español (es)
 
-- Discusiones: [Matrix (`#mdn-l10n-es`)](https://chat.mozilla.org/#/room/#mdn-l10n-es:mozilla.org), [Telegram (`MDN l10n ES`)](https://t.me/+Dr6qKQCAepw4MjFj), [Discord (`#spanish`)](/discord)
-- Colaboradores actuales: [Graywolf9](https://github.com/Graywolf9), [JuanVqz](https://github.com/JuanVqz), [Jalkhov](https://github.com/Jalkhov), [marcelozarate](https://github.com/marcelozarate), [davbrito](https://github.com/davbrito), [Vallejoanderson](https://github.com/Vallejoanderson).
+- Discusiones: [Telegram (`MDN l10n ES`)](https://t.me/+Dr6qKQCAepw4MjFj), [Discord (`#spanish`)](/discord)
+- Colaboradores actuales: [Graywolf9](https://github.com/Graywolf9), [JuanVqz](https://github.com/JuanVqz)
 
 > [!NOTE]
 > Si quiere hablar sobre la posibilidad de _descongelar_ una localización, las [directrices sobre lo que se requiere se pueden encontrar aquí](https://github.com/mdn/translated-content/blob/main/PEERS_GUIDELINES.md#activating-a-locale)