Skip to content

Commit 36df673

Browse files
SiriusKoanSiriusKoan
committed
fix conflict
2 parents 9317d96 + 435c9db commit 36df673

File tree

3 files changed

+34
-24
lines changed

3 files changed

+34
-24
lines changed

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ the PSF for inclusion in the documentation.
115115
.. _GitHub Flow: https://guides.github.com/introduction/flow/
116116

117117
首先，`新增一個 issue <https://github.com/python/python-docs-zh-tw/issues>`_\
118-
，如：「翻譯 tutorial/introduction.po」，讓大家知道你正在翻譯這個檔案。
118+
，如：「翻譯 tutorial/introduction.po」，讓大家知道你正在翻譯這個檔案。可以使用 `make todo` 列出尚待翻譯的檔案。
119119

120120
接著在 terminal 裡按照以下步驟：
121121

‎faq/design.po

+13-12
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,32 @@ msgstr ""
2525
msgid "Design and History FAQ"
2626
msgstr "設計和歷史常見問答集"
2727

28+
2829
#: ../../faq/design.rst:6
2930
msgid "Contents"
3031
msgstr "目錄"
3132

3233
#: ../../faq/design.rst:11
3334
msgid "Why does Python use indentation for grouping of statements?"
34-
msgstr "為何 Python 使用縮排來把陳述式 (statement) 分組？"
35+
msgstr "為什麼 Python 使用縮排將陳述式進行分組？"
3536

3637
#: ../../faq/design.rst:13
3738
msgid ""
3839
"Guido van Rossum believes that using indentation for grouping is extremely "
3940
"elegant and contributes a lot to the clarity of the average Python program. "
4041
"Most people learn to love this feature after a while."
4142
msgstr ""
42-
"吉多·范羅蘇姆相信用縮排來分組是極度優雅，且對於一般 Python 程式是乾淨俐落的。"
43-
"大多數人很快也愛上了這項特色。"
43+
"Guido van Rossum 相信使用縮排來分組超級優雅，並且對提高一般 Python 程式的清晰度有許多貢獻。"
44+
"許多人在學習一段時間之後就愛上了這個功能。"
4445

4546
#: ../../faq/design.rst:17
4647
msgid ""
4748
"Since there are no begin/end brackets there cannot be a disagreement between "
4849
"grouping perceived by the parser and the human reader. Occasionally C "
4950
"programmers will encounter a fragment of code like this::"
5051
msgstr ""
51-
"因為這裡沒有用 begin/end 包夾區塊，所以語法剖析器解析的分組和人理解的分組不會"
52-
"有所歧異。偶爾 C 語言的程式人員會遇上像這樣的一段程式碼：\n"
52+
"因為沒有開始/結束括號，因此剖析器和人類讀者感知到的分組就不存在分歧。"
53+
"偶爾 C 語言的程式設計師會遇到這樣的程式碼片段：\n"
5354
"\n"
5455
"::"
5556

@@ -64,6 +65,7 @@ msgstr ""
6465
"即使是資深的 C 語言開發者有時也會盯著他許久，思考為何即便 ``x > y``\\ ，但 "
6566
"``y`` 還是減少了。"
6667

68+
6769
#: ../../faq/design.rst:31
6870
msgid ""
6971
"Because there are no begin/end brackets, Python is much less prone to coding-"
@@ -94,7 +96,7 @@ msgstr ""
9496

9597
#: ../../faq/design.rst:48
9698
msgid "Why am I getting strange results with simple arithmetic operations?"
97-
msgstr "為何我會從簡單的算術運算中得到奇怪的結果？"
99+
msgstr "為什麼我會從簡單的數學運算得到奇怪的結果？"
98100

99101
#: ../../faq/design.rst:50
100102
msgid "See the next question."
@@ -106,8 +108,7 @@ msgstr "為何浮點數運算如此不精確？"
106108

107109
#: ../../faq/design.rst:56
108110
msgid "Users are often surprised by results like this::"
109-
msgstr ""
110-
"使用者常常對這種結果感到驚訝：\n"
111+
msgstr "使用者時常對這樣的結果感到驚訝：\n"
111112
"\n"
112113
"::"
113114

@@ -308,7 +309,7 @@ msgstr ""
308309

309310
#: ../../faq/design.rst:171
310311
msgid "As Guido said:"
311-
msgstr "如吉多所說："
312+
msgstr "如 Guido 所說："
312313

313314
#: ../../faq/design.rst:173
314315
msgid ""
@@ -564,8 +565,8 @@ msgid ""
564565
"is an up-and-coming compiler of Python into C++ code, aiming to support the "
565566
"full Python language."
566567
msgstr ""
567-
"`Cython <http://cython.org/>`_ 可以編譯一個調整過有選擇性註解的 Python 版"
568-
"本。 `Nuitka <http://www.nuitka.net/>`_ 是一個有潛力編譯器，可以把 Python 編"
568+
"`Cython <https://cython.org/>`_ 可以編譯一個調整過有選擇性註解的 Python 版"
569+
"本。 `Nuitka <https://www.nuitka.net/>`_ 是一個有潛力編譯器，可以把 Python 編"
569570
"譯成 C++，他的目標是支援完整的 Python 語言。"
570571

571572
#: ../../faq/design.rst:331
@@ -596,7 +597,7 @@ msgid ""
596597
"porting problems if your Python code depends on the behavior of the "
597598
"reference counting implementation."
598599
msgstr ""
599-
"然而，在其他實作（像是 `Jython <http://www.jython.org>`_ 或 `PyPy <http://"
600+
"然而，在其他實作（像是 `Jython <https://www.jython.org>`_ 或 `PyPy <https://"
600601
"www.pypy.org>`_）中，會使用像是成熟的垃圾收集器等不同機制。如果你的 Python 程"
601602
"式碼的表現取決於參照計次 (reference counting) 的實作，這個相異處會導致一些微"
602603
"小的移植問題。"

‎library/bisect.po

+20-11
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgstr ""
99
"Project-Id-Version: Python 3.10\n"
1010
"Report-Msgid-Bugs-To: \n"
1111
"POT-Creation-Date: 2022-05-21 17:35+0000\n"
12-
"PO-Revision-Date: 2017-09-22 18:26+0000\n"
12+
"PO-Revision-Date: 2022-08-27 16:41+0800\n"
1313
"Last-Translator: Liang-Bo Wang <me@liang2.tw>\n"
1414
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
1515
"tw)\n"
@@ -18,6 +18,7 @@ msgstr ""
1818
"Content-Type: text/plain; charset=UTF-8\n"
1919
"Content-Transfer-Encoding: 8bit\n"
2020
"Plural-Forms: nplurals=1; plural=0;\n"
21+
"X-Generator: Poedit 3.1.1\n"
2122

2223
#: ../../library/bisect.rst:2
2324
msgid ":mod:`bisect` --- Array bisection algorithm"
@@ -45,7 +46,7 @@ msgstr ""
4546

4647
#: ../../library/bisect.rst:21
4748
msgid "The following functions are provided:"
48-
msgstr "此模組提供下面的函式"
49+
msgstr "此模組提供下面的函式："
4950

5051
#: ../../library/bisect.rst:26
5152
msgid ""
@@ -56,10 +57,10 @@ msgid ""
5657
"existing entries. The return value is suitable for use as the first "
5758
"parameter to ``list.insert()`` assuming that *a* is already sorted."
5859
msgstr ""
59-
"在 *a* 當中找到一個位置，讓 *x* 插入後 *a* 仍然是排序好的。參數 *lo* 和 "
60-
"*hi* 用來指定 list 中應該被考慮的子區間，預設是考慮整個 list 。如果 *a* 裡面"
61-
"已經有 *x* 出現，插入的位置會在所有 *x* 的前面（左邊）。回傳值可以被當作 "
62-
"``list.insert()`` 的第一個參數，但列表 *a* 必須先排序過。"
60+
"在 *a* 當中找到一個位置，讓 *x* 插入後 *a* 仍然是排序好的。參數 *lo* 和 *hi* "
61+
"用來指定 list 中應該被考慮的子區間，預設是考慮整個 list 。如果 *a* 裡面已經"
62+
"有 *x* 出現，插入的位置會在所有 *x* 的前面（左邊）。回傳值可以被當作 ``list."
63+
"insert()`` 的第一個參數，但列表 *a* 必須先排序過。"
6364

6465
#: ../../library/bisect.rst:33
6566
msgid ""
@@ -76,12 +77,15 @@ msgid ""
7677
"extract a comparison key from each element in the array. To support "
7778
"searching complex records, the key function is not applied to the *x* value."
7879
msgstr ""
80+
"*key* 可指定一個單一參數的 :term:`key function`。函式將套用此 function 在陣列"
81+
"所有元素以得到比較值來計算順位。注意此 function 只會套用在陣列中的元素，不會"
82+
"套用在 *x*。"
7983

8084
#: ../../library/bisect.rst:41 ../../library/bisect.rst:62
8185
msgid ""
8286
"If *key* is ``None``, the elements are compared directly with no intervening "
8387
"function call."
84-
msgstr ""
88+
msgstr "若 *key* 為 ``None``，則排序順位將直接以陣列中元素值決定。"
8589

8690
#: ../../library/bisect.rst:44 ../../library/bisect.rst:65
8791
#: ../../library/bisect.rst:83 ../../library/bisect.rst:103
@@ -107,26 +111,29 @@ msgstr ""
107111

108112
#: ../../library/bisect.rst:71
109113
msgid "Insert *x* in *a* in sorted order."
110-
msgstr ""
114+
msgstr "將元素 *x* 插入 list *a*，並維持順序。"
111115

112116
#: ../../library/bisect.rst:73
113117
msgid ""
114118
"This function first runs :func:`bisect_left` to locate an insertion point. "
115119
"Next, it runs the :meth:`insert` method on *a* to insert *x* at the "
116120
"appropriate position to maintain sort order."
117121
msgstr ""
122+
"此函式先使用 :func:`bisect_left` 搜索插入位置，接著用 :meth:`insert` 將 *x* "
123+
"插入，以能維持添加元素後的順序。"
118124

119125
#: ../../library/bisect.rst:77 ../../library/bisect.rst:97
120126
msgid ""
121127
"To support inserting records in a table, the *key* function (if any) is "
122128
"applied to *x* for the search step but not for the insertion step."
123-
msgstr ""
129+
msgstr "此函式只有在搜索時會使用 *key* 函式，插入時不會。"
124130

125131
#: ../../library/bisect.rst:80 ../../library/bisect.rst:100
126132
msgid ""
127133
"Keep in mind that the ``O(log n)`` search is dominated by the slow O(n) "
128134
"insertion step."
129135
msgstr ""
136+
"注意雖然搜索是 ``O(log n)``，但插入是 O(n)，因此此函式整體時間複雜度是 O(n)。"
130137

131138
#: ../../library/bisect.rst:90
132139
msgid ""
@@ -142,10 +149,12 @@ msgid ""
142149
"Next, it runs the :meth:`insert` method on *a* to insert *x* at the "
143150
"appropriate position to maintain sort order."
144151
msgstr ""
152+
"此函式先使用 :func:`bisect_right` 搜索插入位置，接著用 :meth:`insert` 將 *x* "
153+
"插入，以能維持添加元素後的順序。"
145154

146155
#: ../../library/bisect.rst:108
147156
msgid "Performance Notes"
148-
msgstr ""
157+
msgstr "效能考量"
149158

150159
#: ../../library/bisect.rst:110
151160
msgid ""
@@ -194,7 +203,7 @@ msgstr ""
194203

195204
#: ../../library/bisect.rst:141
196205
msgid "Searching Sorted Lists"
197-
msgstr ""
206+
msgstr "搜尋一個已排序的 list"
198207

199208
#: ../../library/bisect.rst:143
200209
msgid ""

0 commit comments

Comments
 (0)