Skip to content

Commit bdb14a6

Browse files
committed
language fix
1 parent 4aaa2d9 commit bdb14a6

File tree

1 file changed

+37
-43
lines changed

1 file changed

+37
-43
lines changed

library/string.po

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,13 @@ msgstr ""
88
"Project-Id-Version: Python 3.12\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2023-07-17 17:39+0800\n"
11-
<<<<<<< HEAD
12-
"PO-Revision-Date: 2023-12-17 15:49+0800\n"
13-
=======
14-
"PO-Revision-Date: 2023-11-25 16:46+0800\n"
15-
>>>>>>> b80266ffd4e34719236718b404e208d6152a36f0
16-
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
17-
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
18-
"tw)\n"
11+
"PO-Revision-Date: \n"
12+
"Last-Translator: \n"
13+
"Language-Team: \n"
1914
"Language: zh_TW\n"
2015
"MIME-Version: 1.0\n"
2116
"Content-Type: text/plain; charset=UTF-8\n"
2217
"Content-Transfer-Encoding: 8bit\n"
23-
"Plural-Forms: nplurals=1; plural=0;\n"
2418
"X-Generator: Poedit 3.4.1\n"
2519

2620
#: ../../library/string.rst:2
@@ -860,8 +854,9 @@ msgid ""
860854
"In most of the cases the syntax is similar to the old ``%``-formatting, with "
861855
"the addition of the ``{}`` and with ``:`` used instead of ``%``. For "
862856
"example, ``'%03.2f'`` can be translated to ``'{:03.2f}'``."
863-
msgstr "此語法在大多情況下與舊式的 ``%`` 格式類似,只是增加了 ``{}`` 和 ``:`` 來取代 ``%``。"
864-
"例如, ``'%03.2f'`` 可以改寫為 ``'{:03.2f}'`` 。"
857+
msgstr ""
858+
"此語法在大多情況下與舊式的 ``%`` 格式類似,只是增加了 ``{}`` 和 ``:`` 來取代 "
859+
"``%``。例如, ``'%03.2f'`` 可以改寫為 ``'{:03.2f}'`` 。"
865860

866861
#: ../../library/string.rst:604
867862
msgid ""
@@ -871,74 +866,86 @@ msgstr "新的語法還支援新的選項,將在以下的範例中說明。"
871866

872867
#: ../../library/string.rst:607
873868
msgid "Accessing arguments by position::"
874-
msgstr "按位置取得引數:\n"
869+
msgstr ""
870+
"按位置取得引數:\n"
875871
"\n"
876872
"::"
877873

878874
#: ../../library/string.rst:620
879875
msgid "Accessing arguments by name::"
880-
msgstr "按名稱取得引數:\n"
876+
msgstr ""
877+
"按名稱取得引數:\n"
881878
"\n"
882879
"::"
883880

884881
#: ../../library/string.rst:628
885882
msgid "Accessing arguments' attributes::"
886-
msgstr "取得引數的屬性:\n"
883+
msgstr ""
884+
"取得引數的屬性:\n"
887885
"\n"
888886
"::"
889887

890888
#: ../../library/string.rst:643
891889
msgid "Accessing arguments' items::"
892-
msgstr "取得引數的內容:\n"
890+
msgstr ""
891+
"取得引數的內容:\n"
893892
"\n"
894893
"::"
895894

896895
#: ../../library/string.rst:649
897896
msgid "Replacing ``%s`` and ``%r``::"
898-
msgstr "替換 ``%s`` 和 ``%r``:\n"
897+
msgstr ""
898+
"替換 ``%s`` 和 ``%r``:\n"
899899
"\n"
900900
"::"
901901

902902
#: ../../library/string.rst:654
903903
msgid "Aligning the text and specifying a width::"
904-
msgstr "對齊文字以及指定寬度:\n"
904+
msgstr ""
905+
"對齊文字以及指定寬度:\n"
905906
"\n"
906907
"::"
907908

908909
#: ../../library/string.rst:665
909910
msgid "Replacing ``%+f``, ``%-f``, and ``% f`` and specifying a sign::"
910-
msgstr "替換 ``%+f``,``%-f`` 和 ``% f`` 以及指定正負號:\n"
911+
msgstr ""
912+
"替換 ``%+f``,``%-f`` 和 ``% f`` 以及指定正負號:\n"
911913
"\n"
912914
"::"
913915

914916
#: ../../library/string.rst:674
915917
msgid ""
916918
"Replacing ``%x`` and ``%o`` and converting the value to different bases::"
917-
msgstr "替換 ``%x`` 或 ``%o`` 用來根據不同的進制轉換其值:\n"
919+
msgstr ""
920+
"替換 ``%x`` 或 ``%o`` 用來根據不同的進制轉換其值:\n"
918921
"\n"
919922
"::"
920923

921924
#: ../../library/string.rst:683
922925
msgid "Using the comma as a thousands separator::"
923-
msgstr "使用逗號作為千位分隔符:\n"
926+
msgstr ""
927+
"使用逗號作為千位分隔符:\n"
924928
"\n"
925929
"::"
926930

927931
#: ../../library/string.rst:688
928932
msgid "Expressing a percentage::"
929-
msgstr "表示為百分比:\n"
933+
msgstr ""
934+
"表示為百分比:\n"
930935
"\n"
931936
"::"
932937

933938
#: ../../library/string.rst:695
934939
msgid "Using type-specific formatting::"
935-
msgstr "作為特定類型格式:\n"
940+
msgstr ""
941+
"作為特定類型格式:\n"
936942
"\n"
937943
"::"
938944

939945
#: ../../library/string.rst:702
940946
msgid "Nesting arguments and more complex examples::"
941-
msgstr "巢狀引數及更多複雜範例:\n"
947+
msgstr ""
948+
"巢狀引數及更多複雜範例:\n"
942949
"\n"
943950
"::"
944951

@@ -1011,15 +1018,9 @@ msgid ""
10111018
"keywords are the placeholders. When both *mapping* and *kwds* are given and "
10121019
"there are duplicates, the placeholders from *kwds* take precedence."
10131020
msgstr ""
1014-
<<<<<<< HEAD
1015-
"進行模板替換,並回傳一個新的字串。 *mapping* 是任何有金鑰並符合模板裡佔位符號"
1016-
"的字典型物件。另外,如果關鍵字就是佔位符號時,您也可以改提供關鍵字引數。當 "
1017-
"*mapping* 跟 *kwds* 同時給定並存在重複時,*kwds* 在佔位符號裡會被優先使用。"
1018-
=======
1019-
"進行樣本替換,並回傳一個新的字串。 *mapping* 是任何有金鑰並符合樣本裡佔位符號"
1020-
"的字典型物件。同時,如果關鍵字就是佔位符號時,您也可以改使用關鍵字引數。當 "
1021-
"*mapping* 跟 *kwds* 同時存在並且重疊時,*kwds* 會被優先使用。"
1022-
>>>>>>> b80266ffd4e34719236718b404e208d6152a36f0
1021+
"進行模板替換,並回傳一個新的字串。 *mapping* 是任何含有金鑰並符合模板裡佔位符"
1022+
"號的字典型物件。另外,如果關鍵字就是佔位符號時,您也可以改提供關鍵字引數。當 "
1023+
"*mapping* 跟 *kwds* 同時給定並重複時,*kwds* 裡的佔位符號裡會被優先使用。"
10231024

10241025
#: ../../library/string.rst:786
10251026
msgid ""
@@ -1029,17 +1030,10 @@ msgid ""
10291030
"unlike with :meth:`substitute`, any other appearances of the ``$`` will "
10301031
"simply return ``$`` instead of raising :exc:`ValueError`."
10311032
msgstr ""
1032-
<<<<<<< HEAD
1033-
"類似於 :meth:`substitute`,但如果 *mapping* 與 *kwds* 中缺少佔位符號的話,原"
1034-
"始的佔位符號會完整地出現在生成的字串裡,而不會引發 :exc:`KeyError`異常。此"
1035-
"外,與 :meth:`substitute` 不同的是,任何包含 ``$`` 的字句會直接回傳 ``$`` 而"
1036-
"非引發 :exc:`ValueError`。"
1037-
=======
1038-
"與 :meth:`substitute` 類似,但如果佔位符號沒有填入任何 *mapping* 與 *kwds* 的"
1039-
"時候,原始的佔位符號會出現在密集的結果字串裡,而不是顯示例外 `KeyError`。同"
1040-
"時,與 :meth:`substitute` 不同的是,任何包含 ``$`` 的字句會直接回傳 ``$`` 而"
1041-
"非顯示 :exc:`ValueError`。"
1042-
>>>>>>> b80266ffd4e34719236718b404e208d6152a36f0
1033+
"“與 :meth:`substitute` 類似,但如果 *mapping* 與 *kwds* 裡面沒有佔位符號的時"
1034+
"候,原始的佔位符號會完整的出現在字串結果裡,而不是引發 :exc: `KeyError` 異"
1035+
"常。同時,與 :meth:`substitute` 不同的是,任何包含 ``$`` 的字句會直接回傳 "
1036+
"``$`` 而非引發 :exc:`ValueError`。"
10431037

10441038
#: ../../library/string.rst:792
10451039
msgid ""

0 commit comments

Comments
 (0)