From 7485b413304402e5bc32274c11a23b0a4a9b52d2 Mon Sep 17 00:00:00 2001 From: Becca Lin Date: Mon, 6 Nov 2023 23:12:31 +0800 Subject: [PATCH 1/6] 1106_stdtypes_ & --- library/stdtypes.po | 65 +++++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 17 deletions(-) diff --git a/library/stdtypes.po b/library/stdtypes.po index bbf06b1866..0f9fc61756 100644 --- a/library/stdtypes.po +++ b/library/stdtypes.po @@ -114,18 +114,18 @@ msgstr "" #: ../../library/stdtypes.rst:78 msgid "Boolean Operations --- :keyword:`!and`, :keyword:`!or`, :keyword:`!not`" -msgstr "" +msgstr "Boolean（布林）運算 --- :keyword:`!and`, :keyword:`!or`, :keyword:`!not`" #: ../../library/stdtypes.rst:82 msgid "These are the Boolean operations, ordered by ascending priority:" -msgstr "" +msgstr "下方為Boolean運算，按優先順序排序：" #: ../../library/stdtypes.rst:85 ../../library/stdtypes.rst:143 #: ../../library/stdtypes.rst:275 ../../library/stdtypes.rst:363 #: ../../library/stdtypes.rst:413 ../../library/stdtypes.rst:961 #: ../../library/stdtypes.rst:1166 msgid "Operation" -msgstr "" +msgstr "運算" #: ../../library/stdtypes.rst:85 ../../library/stdtypes.rst:275 #: ../../library/stdtypes.rst:363 ../../library/stdtypes.rst:413 @@ -146,7 +146,7 @@ msgstr "``x or y``" #: ../../library/stdtypes.rst:87 msgid "if *x* is true, then *x*, else *y*" -msgstr "" +msgstr "假如 *x* 為真，則 *x*，否則 *y*" #: ../../library/stdtypes.rst:87 ../../library/stdtypes.rst:285 #: ../../library/stdtypes.rst:963 ../../library/stdtypes.rst:966 @@ -161,7 +161,7 @@ msgstr "``x and y``" #: ../../library/stdtypes.rst:90 msgid "if *x* is false, then *x*, else *y*" -msgstr "" +msgstr "假如 *x* 為假，則 *x*，否則 *y*" #: ../../library/stdtypes.rst:90 ../../library/stdtypes.rst:288 #: ../../library/stdtypes.rst:308 ../../library/stdtypes.rst:1205 @@ -176,7 +176,7 @@ msgstr "``not x``" #: ../../library/stdtypes.rst:93 msgid "if *x* is false, then ``True``, else ``False``" -msgstr "" +msgstr "假如 *x* 為假，則 ``True``，否則 ``False``" #: ../../library/stdtypes.rst:93 ../../library/stdtypes.rst:975 #: ../../library/stdtypes.rst:1208 ../../library/stdtypes.rst:2430 @@ -199,22 +199,28 @@ msgid "" "This is a short-circuit operator, so it only evaluates the second argument " "if the first one is false." msgstr "" +"這是一個短路運算子，所以他只有在第一個所以他只有在第一個變數為假時，" +"才會才會對第二個變數求值。" #: ../../library/stdtypes.rst:109 msgid "" "This is a short-circuit operator, so it only evaluates the second argument " "if the first one is true." msgstr "" +"這是一個短路運算子，所以他只有在第一個所以他只有在第一個變數為真時，" +"才會才會對第二個變數求值。" #: ../../library/stdtypes.rst:113 msgid "" "``not`` has a lower priority than non-Boolean operators, so ``not a == b`` " "is interpreted as ``not (a == b)``, and ``a == not b`` is a syntax error." msgstr "" +"``not`` 比非Boolean運算子有較低的優先權，因此 ``not a == b`` " +"可解讀為 ``not (a == b)``，而 ``a == not b`` 會導致語法錯誤。" #: ../../library/stdtypes.rst:120 msgid "Comparisons" -msgstr "" +msgstr "比較運算" #: ../../library/stdtypes.rst:134 msgid "" @@ -224,16 +230,21 @@ msgid "" "< y and y <= z``, except that *y* is evaluated only once (but in both cases " "*z* is not evaluated at all when ``x < y`` is found to be false)." msgstr "" +"在Python裡共有8種比較運算。他們的優先順序都相同" +"（皆優先於Boolean運算）。比較運算" +"可以任意的串連；例如， ``x < y <= z`` 等同於 " +"``x < y and y <= z``， 差異只在於前者的 *y* 只有被求值一次（但在這兩個例子" +"中，當 ``x < y`` 為假時， *z* 皆不會被求值）。" #: ../../library/stdtypes.rst:140 msgid "This table summarizes the comparison operations:" -msgstr "" +msgstr "這個表格統整所有比較運算：" #: ../../library/stdtypes.rst:143 ../../library/stdtypes.rst:2393 #: ../../library/stdtypes.rst:2416 ../../library/stdtypes.rst:3611 #: ../../library/stdtypes.rst:3634 msgid "Meaning" -msgstr "" +msgstr "含義" #: ../../library/stdtypes.rst:145 msgid "``<``" @@ -241,7 +252,7 @@ msgstr "``<``" #: ../../library/stdtypes.rst:145 msgid "strictly less than" -msgstr "" +msgstr "小於" #: ../../library/stdtypes.rst:147 msgid "``<=``" @@ -249,7 +260,7 @@ msgstr "``<=``" #: ../../library/stdtypes.rst:147 msgid "less than or equal" -msgstr "" +msgstr "小於等於" #: ../../library/stdtypes.rst:149 msgid "``>``" @@ -257,7 +268,7 @@ msgstr "``>``" #: ../../library/stdtypes.rst:149 msgid "strictly greater than" -msgstr "" +msgstr "大於" #: ../../library/stdtypes.rst:151 msgid "``>=``" @@ -265,7 +276,7 @@ msgstr "``>=``" #: ../../library/stdtypes.rst:151 msgid "greater than or equal" -msgstr "" +msgstr "大於等於" #: ../../library/stdtypes.rst:153 msgid "``==``" @@ -273,7 +284,7 @@ msgstr "``==``" #: ../../library/stdtypes.rst:153 msgid "equal" -msgstr "" +msgstr "等於" #: ../../library/stdtypes.rst:155 msgid "``!=``" @@ -281,7 +292,7 @@ msgstr "``!=``" #: ../../library/stdtypes.rst:155 msgid "not equal" -msgstr "" +msgstr "不等於" #: ../../library/stdtypes.rst:157 msgid "``is``" @@ -289,7 +300,7 @@ msgstr "``is``" #: ../../library/stdtypes.rst:157 msgid "object identity" -msgstr "" +msgstr "物件識別" #: ../../library/stdtypes.rst:159 msgid "``is not``" @@ -297,7 +308,7 @@ msgstr "``is not``" #: ../../library/stdtypes.rst:159 msgid "negated object identity" -msgstr "" +msgstr "否定的物件識別" #: ../../library/stdtypes.rst:166 msgid "" @@ -308,12 +319,20 @@ msgid "" "example, they raise a :exc:`TypeError` exception when one of the arguments " "is a complex number." msgstr "" +"除了不同的數字類型外，不同類型的物件不能進行相等比較。" +"運算子 ``==`` 總有定義，但在某些物件類型（例如，" +"class物件）時，運算子會等同於 :keyword:`is`。 其他運算子 ``<``、``<=``、" +"``>`` 及 ``>=`` 皆僅在有意義的有意義的部分進行定義；例如，" +"當其中一個引數為複數時，" +"將導致一個 :exc:`TypeError` 的例外。" #: ../../library/stdtypes.rst:180 msgid "" "Non-identical instances of a class normally compare as non-equal unless the " "class defines the :meth:`~object.__eq__` method." msgstr "" +"一個class的非相同實例通常會比較為不相等，除非" +"class定義 :meth:`~object.__eq__` method。" #: ../../library/stdtypes.rst:183 msgid "" @@ -324,6 +343,12 @@ msgid "" "meth:`~object.__eq__` are sufficient, if you want the conventional meanings " "of the comparison operators)." msgstr "" +"一個class的實例不可以與其他相同class的實例" +"或其他物件的類別進行排序，除非class定義足夠的" +"method，包含 :meth:`~object.__lt__`、:meth:`~object.__le__`、:meth:`~object.__gt__` " +"及 :meth:`~object.__ge__`（一般來說，使用:meth:`~object.__lt__` 及 " +"meth:`~object.__eq__` 就可以滿足" +"常規意義上的比較運算）。" #: ../../library/stdtypes.rst:190 msgid "" @@ -331,6 +356,9 @@ msgid "" "customized; also they can be applied to any two objects and never raise an " "exception." msgstr "" +" :keyword:`is` 與 :keyword:`is not` 的運算無法使用自定義" +"；這兩個運算也可以運用在任意兩個物件且不會導致" +"例外。" #: ../../library/stdtypes.rst:198 msgid "" @@ -338,6 +366,9 @@ msgid "" "keyword:`not in`, are supported by types that are :term:`iterable` or " "implement the :meth:`__contains__` method." msgstr "" +"此外，擁有相同的語法優先序的 :keyword:`in` 及 :keyword:`not in` 兩種運算" +"皆可支援 :term:`iterable` 的型別或" +"應用在 :meth:`__contains__` 的method中。" #: ../../library/stdtypes.rst:205 msgid "Numeric Types --- :class:`int`, :class:`float`, :class:`complex`" From b2eac5bee04d37ca7507c0e0f657c88e71cb5246 Mon Sep 17 00:00:00 2001 From: Becca Lin Date: Mon, 6 Nov 2023 23:43:00 +0800 Subject: [PATCH 2/6] 1106_stdtypes_3&4_v2 --- library/stdtypes.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/stdtypes.po b/library/stdtypes.po index 0f9fc61756..71256a9623 100644 --- a/library/stdtypes.po +++ b/library/stdtypes.po @@ -346,8 +346,8 @@ msgstr "" "一個class的實例不可以與其他相同class的實例" "或其他物件的類別進行排序，除非class定義足夠的" "method，包含 :meth:`~object.__lt__`、:meth:`~object.__le__`、:meth:`~object.__gt__` " -"及 :meth:`~object.__ge__`（一般來說，使用:meth:`~object.__lt__` 及 " -"meth:`~object.__eq__` 就可以滿足" +"及 :meth:`~object.__ge__`（一般來說，使用 :meth:`~object.__lt__` 及 " +":meth:`~object.__eq__` 就可以滿足" "常規意義上的比較運算）。" #: ../../library/stdtypes.rst:190 From 89139303f647d30d41d102048b97f97836f79bd2 Mon Sep 17 00:00:00 2001 From: Becca Lin Date: Mon, 6 Nov 2023 23:50:28 +0800 Subject: [PATCH 3/6] 1106_stdtypes_3&4_v3 --- library/stdtypes.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/stdtypes.po b/library/stdtypes.po index 71256a9623..2a8e64cce9 100644 --- a/library/stdtypes.po +++ b/library/stdtypes.po @@ -345,9 +345,9 @@ msgid "" msgstr "" "一個class的實例不可以與其他相同class的實例" "或其他物件的類別進行排序，除非class定義足夠的" -"method，包含 :meth:`~object.__lt__`、:meth:`~object.__le__`、:meth:`~object.__gt__` " -"及 :meth:`~object.__ge__`（一般來說，使用 :meth:`~object.__lt__` 及 " -":meth:`~object.__eq__` 就可以滿足" +"method，包含 :meth:`~object.__lt__`、:meth:`~object.__le__`、:meth:`~object." +"__gt__` 及 :meth:`~object.__ge__`（一般來說，使用 :meth:`~object.__lt__` 及 :" +"meth:`~object.__eq__` 就可以滿足" "常規意義上的比較運算）。" #: ../../library/stdtypes.rst:190 From 485922d7ecd4a68dd53768b9c1433ccb5d00580e Mon Sep 17 00:00:00 2001 From: Becca Lin Date: Mon, 6 Nov 2023 23:59:43 +0800 Subject: [PATCH 4/6] 1106_stdtypes_3&4_v4 --- library/stdtypes.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/stdtypes.po b/library/stdtypes.po index 2a8e64cce9..2a39bbe2d0 100644 --- a/library/stdtypes.po +++ b/library/stdtypes.po @@ -345,8 +345,8 @@ msgid "" msgstr "" "一個class的實例不可以與其他相同class的實例" "或其他物件的類別進行排序，除非class定義足夠的" -"method，包含 :meth:`~object.__lt__`、:meth:`~object.__le__`、:meth:`~object." -"__gt__` 及 :meth:`~object.__ge__`（一般來說，使用 :meth:`~object.__lt__` 及 :" +"method，包含 :meth:`~object.__lt__` 、 :meth:`~object.__le__` 、 :meth:`~object." +"__gt__` 及 :meth:`~object.__ge__` （一般來說，使用 :meth:`~object.__lt__` 及 :" "meth:`~object.__eq__` 就可以滿足" "常規意義上的比較運算）。" From 8a777056b3e62ed7257e33b7e14de3500f071e0d Mon Sep 17 00:00:00 2001 From: Becca Lin Date: Tue, 7 Nov 2023 01:04:40 +0800 Subject: [PATCH 5/6] 1107_stdtypes_3&4_v5 --- library/stdtypes.po | 52 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/library/stdtypes.po b/library/stdtypes.po index 2a39bbe2d0..a9039977f3 100644 --- a/library/stdtypes.po +++ b/library/stdtypes.po @@ -118,7 +118,7 @@ msgstr "Boolean（布林）運算 --- :keyword:`!and`, :keyword:`!or`, :keyword: #: ../../library/stdtypes.rst:82 msgid "These are the Boolean operations, ordered by ascending priority:" -msgstr "下方為Boolean運算，按優先順序排序：" +msgstr "下方為 Boolean 運算，按優先順序排序：" #: ../../library/stdtypes.rst:85 ../../library/stdtypes.rst:143 #: ../../library/stdtypes.rst:275 ../../library/stdtypes.rst:363 @@ -199,7 +199,7 @@ msgid "" "This is a short-circuit operator, so it only evaluates the second argument " "if the first one is false." msgstr "" -"這是一個短路運算子，所以他只有在第一個所以他只有在第一個變數為假時，" +"這是一個短路運算子，所以他只有在第一個變數為假時，" "才會才會對第二個變數求值。" #: ../../library/stdtypes.rst:109 @@ -207,7 +207,7 @@ msgid "" "This is a short-circuit operator, so it only evaluates the second argument " "if the first one is true." msgstr "" -"這是一個短路運算子，所以他只有在第一個所以他只有在第一個變數為真時，" +"這是一個短路運算子，所以他只有在第一個變數為真時，" "才會才會對第二個變數求值。" #: ../../library/stdtypes.rst:113 @@ -215,8 +215,8 @@ msgid "" "``not`` has a lower priority than non-Boolean operators, so ``not a == b`` " "is interpreted as ``not (a == b)``, and ``a == not b`` is a syntax error." msgstr "" -"``not`` 比非Boolean運算子有較低的優先權，因此 ``not a == b`` " -"可解讀為 ``not (a == b)``，而 ``a == not b`` 會導致語法錯誤。" +"``not`` 比非 Boolean 運算子有較低的優先權，因此 ``not a == b`` " +"可直譯為 ``not (a == b)``，而 ``a == not b`` 會導致語法錯誤。" #: ../../library/stdtypes.rst:120 msgid "Comparisons" @@ -230,11 +230,11 @@ msgid "" "< y and y <= z``, except that *y* is evaluated only once (but in both cases " "*z* is not evaluated at all when ``x < y`` is found to be false)." msgstr "" -"在Python裡共有8種比較運算。他們的優先順序都相同" -"（皆優先於Boolean運算）。比較運算" -"可以任意的串連；例如， ``x < y <= z`` 等同於 " -"``x < y and y <= z``， 差異只在於前者的 *y* 只有被求值一次（但在這兩個例子" -"中，當 ``x < y`` 為假時， *z* 皆不會被求值）。" +"在 Python 裡共有8種比較運算。他們的優先順序都相同" +"（皆優先於 Boolean 運算）。比較運算" +"可以任意的串連；例如，``x < y <= z`` 等同於 " +"``x < y and y <= z``，差異只在於前者的 *y* 只有被求值一次（但在這兩個例子" +"中，當 ``x < y`` 為假時，*z* 皆不會被求值）。" #: ../../library/stdtypes.rst:140 msgid "This table summarizes the comparison operations:" @@ -319,20 +319,20 @@ msgid "" "example, they raise a :exc:`TypeError` exception when one of the arguments " "is a complex number." msgstr "" -"除了不同的數字類型外，不同類型的物件不能進行相等比較。" -"運算子 ``==`` 總有定義，但在某些物件類型（例如，" -"class物件）時，運算子會等同於 :keyword:`is`。 其他運算子 ``<``、``<=``、" -"``>`` 及 ``>=`` 皆僅在有意義的有意義的部分進行定義；例如，" +"除了不同的數字型別外，不同型別的物件不能進行相等比較。" +"運算子 ``==`` 總有定義，但在某些物件類型（例如， " +"class 物件）時，運算子會等同於 :keyword:`is`。 其他運算子 ``<``、``<=``、" +"``>`` 及 ``>=`` 皆僅在有意義的部分有所定義；例如，" "當其中一個引數為複數時，" -"將導致一個 :exc:`TypeError` 的例外。" +"將引發一個 :exc:`TypeError` 的例外。" #: ../../library/stdtypes.rst:180 msgid "" "Non-identical instances of a class normally compare as non-equal unless the " "class defines the :meth:`~object.__eq__` method." msgstr "" -"一個class的非相同實例通常會比較為不相等，除非" -"class定義 :meth:`~object.__eq__` method。" +"一個 class 的非相同實例通常會比較為不相等，除非 " +"class 有定義 :meth:`~object.__eq__` method。" #: ../../library/stdtypes.rst:183 msgid "" @@ -343,12 +343,12 @@ msgid "" "meth:`~object.__eq__` are sufficient, if you want the conventional meanings " "of the comparison operators)." msgstr "" -"一個class的實例不可以與其他相同class的實例" -"或其他物件的類別進行排序，除非class定義足夠的" -"method，包含 :meth:`~object.__lt__` 、 :meth:`~object.__le__` 、 :meth:`~object." -"__gt__` 及 :meth:`~object.__ge__` （一般來說，使用 :meth:`~object.__lt__` 及 :" +"一個 class 的實例不可以與其他相同 class 的實例" +"或其他物件的類別進行排序，除非 class 定義足夠的" +" method ，包含 :meth:`~object.__lt__`、:meth:`~object.__le__`、:meth:`~object." +"__gt__` 及 :meth:`~object.__ge__`（一般來說，使用 :meth:`~object.__lt__` 及 :" "meth:`~object.__eq__` 就可以滿足" -"常規意義上的比較運算）。" +"常規意義上的比較運算子）。" #: ../../library/stdtypes.rst:190 msgid "" @@ -356,8 +356,8 @@ msgid "" "customized; also they can be applied to any two objects and never raise an " "exception." msgstr "" -" :keyword:`is` 與 :keyword:`is not` 的運算無法使用自定義" -"；這兩個運算也可以運用在任意兩個物件且不會導致" +"無法自定義 :keyword:`is` 與 :keyword:`is not` 運算子的行為" +"；這兩個運算子也可以運用在任意兩個物件且不會導致" "例外。" #: ../../library/stdtypes.rst:198 @@ -367,8 +367,8 @@ msgid "" "implement the :meth:`__contains__` method." msgstr "" "此外，擁有相同的語法優先序的 :keyword:`in` 及 :keyword:`not in` 兩種運算" -"皆可支援 :term:`iterable` 的型別或" -"應用在 :meth:`__contains__` 的method中。" +"皆被是 :term:`iterable` 或者" +"有實作 :meth:`__contains__` method 的型別所支援。" #: ../../library/stdtypes.rst:205 msgid "Numeric Types --- :class:`int`, :class:`float`, :class:`complex`" From 127d7cac8f879aa05c7a2cb9e42cec0b575762a7 Mon Sep 17 00:00:00 2001 From: Becca Lin Date: Tue, 7 Nov 2023 03:55:12 +0800 Subject: [PATCH 6/6] 1107_stdtypes_3&4_v6 --- library/stdtypes.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/stdtypes.po b/library/stdtypes.po index a9039977f3..a756d68e37 100644 --- a/library/stdtypes.po +++ b/library/stdtypes.po @@ -200,7 +200,7 @@ msgid "" "if the first one is false." msgstr "" "這是一個短路運算子，所以他只有在第一個變數為假時，" -"才會才會對第二個變數求值。" +"才會對第二個變數求值。" #: ../../library/stdtypes.rst:109 msgid "" @@ -208,7 +208,7 @@ msgid "" "if the first one is true." msgstr "" "這是一個短路運算子，所以他只有在第一個變數為真時，" -"才會才會對第二個變數求值。" +"才會對第二個變數求值。" #: ../../library/stdtypes.rst:113 msgid "" @@ -230,7 +230,7 @@ msgid "" "< y and y <= z``, except that *y* is evaluated only once (but in both cases " "*z* is not evaluated at all when ``x < y`` is found to be false)." msgstr "" -"在 Python 裡共有8種比較運算。他們的優先順序都相同" +"在 Python 裡共有 8 種比較運算。他們的優先順序都相同" "（皆優先於 Boolean 運算）。比較運算" "可以任意的串連；例如，``x < y <= z`` 等同於 " "``x < y and y <= z``，差異只在於前者的 *y* 只有被求值一次（但在這兩個例子" @@ -346,7 +346,7 @@ msgstr "" "一個 class 的實例不可以與其他相同 class 的實例" "或其他物件的類別進行排序，除非 class 定義足夠的" " method ，包含 :meth:`~object.__lt__`、:meth:`~object.__le__`、:meth:`~object." -"__gt__` 及 :meth:`~object.__ge__`（一般來說，使用 :meth:`~object.__lt__` 及 :" +"__gt__` 及 :meth:`~object.__ge__`\\ （一般來說，使用 :meth:`~object.__lt__` 及 :" "meth:`~object.__eq__` 就可以滿足" "常規意義上的比較運算子）。"