Merge branch 'main' into 20210818-Glossary/Type

7 files changed, 68 insertions, 16 deletions

diff --git a/files/zh-cn/web/api/htmlcanvaselement/getcontext/index.html b/files/zh-cn/web/api/htmlcanvaselement/getcontext/index.html
index 07c0e6820c..b33d9bf95c 100644
--- a/files/zh-cn/web/api/htmlcanvaselement/getcontext/index.html
+++ b/files/zh-cn/web/api/htmlcanvaselement/getcontext/index.html
@@ -78,7 +78,7 @@ var <em>ctx</em> = <em>canvas</em>.getContext(<em>contextType</em>, <em>contextA
    </ul>
   </li>
   <li>
-   <p><strong><code>premultipliedAlpha</code></strong>: 表明排版引擎讲假设绘制缓冲区包含预混合alpha通道的{{jsxref("boolean")}}值。</p>
+   <p><strong><code>premultipliedAlpha</code></strong>: 表明排版引擎将假设绘制缓冲区包含预混合alpha通道的{{jsxref("boolean")}}值。</p>
   </li>
   <li>
    <p><strong><code>preserveDrawingBuffer</code></strong>: 如果这个值为{{jsxref("true")}}缓冲区将不会被清除，会保存下来，直到被清除或被使用者覆盖。</p>
diff --git a/files/zh-cn/web/api/navigator/language/index.html b/files/zh-cn/web/api/navigator/language/index.html
new file mode 100644
index 0000000000..a4e3508ec7
--- /dev/null
+++ b/files/zh-cn/web/api/navigator/language/index.html
@@ -0,0 +1,50 @@
+---
+title: Navigator.language
+slug: Web/API/Navigator/language
+tags:
+  - API
+  - Language
+  - Navigator
+  - Property
+  - Read-only
+  - Reference
+browser-compat: api.Navigator.language
+translation_of: Web/API/Navigator/language
+---
+<div>{{APIRef("HTML DOM")}}</div>
+
+<p><strong><code>Navigator.language</code></strong> 为只读属性，返回一个表示用户偏好语言（通常是浏览器界面语言）的字符串。 </p>
+
+<h2 id="Syntax">语法</h2>
+
+<pre class="brush: js">const <em>lang</em> = navigator.language
+</pre>
+
+<h3 id="Value">值</h3>
+
+<p>一个 {{domxref("DOMString")}}。<em><code>lang</code></em>存储了一个在 <a class="external"
+  href="https://tools.ietf.org/rfc/bcp/bcp47.txt">BCP 47</a> 中定义的语言版本。一些有效的语言版本代码示例包括： “en”、“en-US”、“fr”、“fr-FR”、“es-ES” 等。</p>
+
+<p>请注意，在 iOS 10.2 之前的 Safari 中，返回的语言版本代码是小写的： “en-us”、“fr-fr” 等。</p>
+
+<h2 id="Example">示例</h2>
+
+<pre class="brush: js">if (/^en\b/.test(navigator.language)) {
+  doLangSelect(window.navigator.language);
+}
+</pre>
+
+<h2 id="Specifications">规格</h2>
+
+{{Specifications}}
+
+<h2 id="Browser_compatibility">浏览器兼容性</h2>
+
+<p>{{Compat}}</p>
+
+<h2 id="See_also">更多参见</h2>
+
+<ul>
+  <li>{{domxref("navigator.languages")}}</li>
+  <li>{{domxref("navigator")}}</li>
+</ul>
diff --git a/files/zh-cn/web/api/url/searchparams/index.html b/files/zh-cn/web/api/url/searchparams/index.html
index d4d775aed0..a3ac04aded 100644
--- a/files/zh-cn/web/api/url/searchparams/index.html
+++ b/files/zh-cn/web/api/url/searchparams/index.html
@@ -18,7 +18,7 @@ translation_of: Web/API/URL/searchParams
 
 <h2 id="语法">语法</h2>
 
-<pre class="syntaxbox notranslate">const <em>urlSearchParams</em> = <em>url</em>.searchParams</pre>
+<pre class="syntaxbox notranslate brush: js">const <em>urlSearchParams</em> = <em>url</em>.searchParams</pre>
 
 <h3 id="属性值">属性值</h3>
 
@@ -26,7 +26,7 @@ translation_of: Web/API/URL/searchParams
 
 <h2 id="例子">例子</h2>
 
-<p>如果你的 URL 是 <code>https://example.com/?name=Jonathan&amp;age=18</code> ，你可以这样解析 URL，然后得到 <code>name</code> 和 <code>age</code> 的值。</p>
+<p>如果你的 URL 是 <code>https://example.com/?name=Jonathan%20Smith&amp;age=18</code> ，你可以这样解析 URL，然后得到 <code>name</code> 和 <code>age</code> 的值。</p>
 
 <pre class="brush: js notranslate">let params = (new URL(document.location)).searchParams;
 let name = params.get('name'); // is the string "Jonathan Smith".
diff --git a/files/zh-cn/web/css/transform-function/rotate3d()/index.html b/files/zh-cn/web/css/transform-function/rotate3d()/index.html
index 9eea1570ba..f9e046f02b 100644
--- a/files/zh-cn/web/css/transform-function/rotate3d()/index.html
+++ b/files/zh-cn/web/css/transform-function/rotate3d()/index.html
@@ -38,18 +38,20 @@ translation_of: Web/CSS/transform-function/rotate3d()
 </dl>
 
 <table class="standard-table">
- <thead>
+ <tbody>
   <tr>
-   <th scope="col">笛卡尔坐标 on ℝ<sup>2</sup></th>
-   <th scope="col">齐次坐标 on ℝℙ<sup>2</sup></th>
-   <th scope="col">笛卡尔坐标 on ℝ<sup>3</sup></th>
-   <th scope="col">齐次坐标 on ℝℙ<sup>3</sup></th>
+   <th scope="col">在ℝ<sup>2</sup>上的笛卡尔坐标</th>
+   <td rowspan="2">这种变换应用于3D空间，不可用于平面空间</td>
+  </tr>
+  <tr>
+   <th scope="col">在ℝℙ<sup>2</sup>上的齐次坐标</th>
   </tr>
- </thead>
- <tbody>
   <tr>
-   <td colspan="2">这种变换应用于3D空间，不可用于平面空间</td>
+   <th scope="col">在ℝ<sup>3</sup>上的笛卡尔坐标</th>
    <td colspan="1"><a href="/@api/deki/files/5987/=transform-functions-rotate3d_cart.png"><img src="/@api/deki/files/5987/=transform-functions-rotate3d_cart.png?size=webview" style="height: 47px; width: 510px;"></a><math> <mfenced><mtable><mtr><mtd>1<mo>+</mo>(1<mo>-</mo>cos(<mi>a</mi>))(<msup><mi>x</mi><mn>2</mn></msup><mo>-</mo>1)</mtd><mtd><mi>z</mi><mo>·</mo>sin(<mi>a</mi>)+<mi>x</mi><mi>y</mi>(1<mo>-</mo>cos(<mi>a</mi>))</mtd><mtd><mo>-</mo><mi>y</mi><mo>·</mo>sin(<mi>a</mi>)<mo>+</mo><mi>x</mi><mi>z</mi><mo>·</mo>(1<mo>-</mo>cos(<mi>a</mi>))</mtd></mtr><mtr><mtd><mo>-</mo><mi>z</mi><mo>·</mo>sin(<mi>a</mi>)<mo>+</mo><mi>x</mi><mi>y</mi><mo>·</mo>(1<mo>-</mo>cos(<mi>a</mi>))</mtd><mtd>1+(1-cos(a))(y2-1)</mtd><mtd><mi>x</mi><mo>·</mo>sin(<mi>a</mi>)<mo>+</mo><mi>y</mi><mi>z</mi><mo>·</mo>(1<mo>-</mo>cos(<mi>a</mi>))</mtd><mtr><mtd>ysin(a) + xz(1-cos(a))</mtd><mtd>-xsin(a)+yz(1-cos(a))</mtd><mtd>1+(1-cos(a))(z2-1)</mtd><mtd>t</mtd></mtr><mtr><mtd>0</mtd><mtd>0</mtd><mtd>0</mtd><mtd>1</mtd></mtr> </mtr></mtable></mfenced></math></td>
+  </tr>
+  <tr>
+   <th scope="col">在ℝℙ<sup>3</sup>上的齐次坐标</th>
    <td colspan="1"><a href="/@api/deki/files/5986/=transform-functions-rotate3d_hom4.png"><img src="/@api/deki/files/5986/=transform-functions-rotate3d_hom4.png?size=webview" style="height: 61px; width: 522px;"></a></td>
   </tr>
  </tbody>
diff --git a/files/zh-cn/web/javascript/reference/global_objects/object/seal/index.html b/files/zh-cn/web/javascript/reference/global_objects/object/seal/index.html
index 7a18ee2e91..6fd23f3d1d 100644
--- a/files/zh-cn/web/javascript/reference/global_objects/object/seal/index.html
+++ b/files/zh-cn/web/javascript/reference/global_objects/object/seal/index.html
@@ -14,7 +14,7 @@ translation_of: Web/JavaScript/Reference/Global_Objects/Object/seal
 
 <div></div>
 
-<div>{{EmbedInteractiveExample("pages/js/object-prototype-seal.html")}}</div>
+<div>{{EmbedInteractiveExample("pages/js/object-seal.html")}}</div>
 
 
 
diff --git a/files/zh-cn/web/javascript/reference/global_objects/string/raw/index.html b/files/zh-cn/web/javascript/reference/global_objects/string/raw/index.html
index 8ff8794000..989a78f2c6 100644
--- a/files/zh-cn/web/javascript/reference/global_objects/string/raw/index.html
+++ b/files/zh-cn/web/javascript/reference/global_objects/string/raw/index.html
@@ -55,10 +55,10 @@ String.raw`templateString`
 <h3 id="使用_String.raw">使用 <code>String.raw()</code></h3>
 
 <pre class="brush: js">String.raw`Hi\n${2+3}!`;
-// 'Hi\n5!'，Hi 后面的字符不是换行符，\ 和 n 是两个不同的字符
+// 'Hi\\n5!'，Hi 后面的字符不是换行符，\ 和 n 是两个不同的字符
 
 String.raw `Hi\u000A!`;
-// "Hi\u000A!"，同上，这里得到的会是 \、u、0、0、0、A 6个字符，
+// "Hi\\u000A!"，同上，这里得到的会是 \、u、0、0、0、A 6个字符，
 // 任何类型的转义形式都会失效，保留原样输出，不信你试试.length
 
 let name = "Bob";
diff --git a/files/zh-cn/web/javascript/reference/template_literals/index.html b/files/zh-cn/web/javascript/reference/template_literals/index.html
index 33fb6ebe53..e16b62d850 100644
--- a/files/zh-cn/web/javascript/reference/template_literals/index.html
+++ b/files/zh-cn/web/javascript/reference/template_literals/index.html
@@ -171,13 +171,13 @@ tag`string text line 1 \n string text line 2`;
 <p>另外，使用{{jsxref("String.raw()")}} 方法创建原始字符串和使用默认模板函数和字符串连接创建是一样的。</p>
 
 <pre class="brush: js line-numbers  language-js"><code class="language-js"><span class="keyword token">var</span> str <span class="operator token">=</span> String<span class="punctuation token">.</span>raw<span class="template-string token"><span class="string token">`Hi\n</span><span class="interpolation token"><span class="interpolation-punctuation punctuation token">${</span><span class="number token">2</span><span class="operator token">+</span><span class="number token">3</span><span class="interpolation-punctuation punctuation token">}</span></span><span class="string token">!`</span></span><span class="punctuation token">;</span>
-<span class="comment token">// "Hi\n5!"</span>
+<span class="comment token">// "Hi\\n5!"</span>
 
 str<span class="punctuation token">.</span>length<span class="punctuation token">;</span>
 <span class="comment token">// 6</span>
 
 str<span class="punctuation token">.</span><span class="function token">split</span><span class="punctuation token">(</span><span class="string token">''</span><span class="punctuation token">)</span><span class="punctuation token">.</span><span class="function token">join</span><span class="punctuation token">(</span><span class="string token">','</span><span class="punctuation token">)</span><span class="punctuation token">;</span>
-<span class="comment token">// "H,i,\,n,5,!"</span></code>
+<span class="comment token">// "H,i,\\,n,5,!"</span></code>
 </pre>
 
 <h3 id="带标签的模版字面量及转义序列">带标签的模版字面量及转义序列</h3>