Skip to content

Commit d45ac7a

Browse files
sync with cpython 6184b800
1 parent 957270e commit d45ac7a

File tree

2 files changed

+60
-57
lines changed

2 files changed

+60
-57
lines changed

library/os.path.po

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.11\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2022-10-02 00:25+0000\n"
10+
"POT-Creation-Date: 2023-01-09 00:30+0000\n"
1111
"PO-Revision-Date: 2018-05-23 16:07+0000\n"
1212
"Last-Translator: Adrian Liaw <[email protected]>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -99,11 +99,11 @@ msgstr ""
9999
#: ../../library/os.path.rst:235 ../../library/os.path.rst:245
100100
#: ../../library/os.path.rst:255 ../../library/os.path.rst:265
101101
#: ../../library/os.path.rst:275 ../../library/os.path.rst:294
102-
#: ../../library/os.path.rst:324 ../../library/os.path.rst:344
103-
#: ../../library/os.path.rst:367 ../../library/os.path.rst:389
104-
#: ../../library/os.path.rst:407 ../../library/os.path.rst:420
105-
#: ../../library/os.path.rst:436 ../../library/os.path.rst:452
106-
#: ../../library/os.path.rst:477 ../../library/os.path.rst:508
102+
#: ../../library/os.path.rst:325 ../../library/os.path.rst:345
103+
#: ../../library/os.path.rst:368 ../../library/os.path.rst:390
104+
#: ../../library/os.path.rst:408 ../../library/os.path.rst:421
105+
#: ../../library/os.path.rst:437 ../../library/os.path.rst:453
106+
#: ../../library/os.path.rst:478 ../../library/os.path.rst:509
107107
msgid "Accepts a :term:`path-like object`."
108108
msgstr ""
109109

@@ -124,9 +124,9 @@ msgid ""
124124
"empty. Unlike :func:`commonprefix`, this returns a valid path."
125125
msgstr ""
126126

127-
#: ../../library/os.path.rst:89 ../../library/os.path.rst:388
128-
#: ../../library/os.path.rst:400 ../../library/os.path.rst:416
129-
#: ../../library/os.path.rst:432
127+
#: ../../library/os.path.rst:89 ../../library/os.path.rst:389
128+
#: ../../library/os.path.rst:401 ../../library/os.path.rst:417
129+
#: ../../library/os.path.rst:433
130130
msgid ":ref:`Availability <availability>`: Unix, Windows."
131131
msgstr ":ref:`適用 <availability>`:Unix、Windows。"
132132

@@ -300,36 +300,37 @@ msgstr ""
300300

301301
#: ../../library/os.path.rst:300
302302
msgid ""
303-
"Join one or more path components intelligently. The return value is the "
304-
"concatenation of *path* and any members of *\\*paths* with exactly one "
305-
"directory separator following each non-empty part except the last, meaning "
306-
"that the result will only end in a separator if the last part is empty. If "
307-
"a component is an absolute path, all previous components are thrown away and "
308-
"joining continues from the absolute path component."
303+
"Join one or more path segments intelligently. The return value is the "
304+
"concatenation of *path* and all members of *\\*paths*, with exactly one "
305+
"directory separator following each non-empty part except the last. That is, "
306+
"if the last part is empty, the result will end in a separator. If a segment "
307+
"is an absolute path (which on Windows requires both a drive and a root), "
308+
"then all previous segments are ignored and joining continues from the "
309+
"absolute path segment."
309310
msgstr ""
310311

311-
#: ../../library/os.path.rst:307
312+
#: ../../library/os.path.rst:308
312313
msgid ""
313-
"On Windows, the drive letter is not reset when an absolute path component (e."
314-
"g., ``r'\\foo'``) is encountered. If a component contains a drive letter, "
315-
"all previous components are thrown away and the drive letter is reset. Note "
316-
"that since there is a current directory for each drive, ``os.path.join(\"c:"
317-
"\", \"foo\")`` represents a path relative to the current directory on drive :"
318-
"file:`C:` (:file:`c:foo`), not :file:`c:\\\\foo`."
314+
"On Windows, the drive is not reset when a rooted path segment (e.g., "
315+
"``r'\\foo'``) is encountered. If a segment is on a different drive or is an "
316+
"absolute path, all previous segments are ignored and the drive is reset. "
317+
"Note that since there is a current directory for each drive, ``os.path."
318+
"join(\"c:\", \"foo\")`` represents a path relative to the current directory "
319+
"on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\\\foo`."
319320
msgstr ""
320321

321-
#: ../../library/os.path.rst:314
322+
#: ../../library/os.path.rst:315
322323
msgid "Accepts a :term:`path-like object` for *path* and *paths*."
323324
msgstr ""
324325

325-
#: ../../library/os.path.rst:320
326+
#: ../../library/os.path.rst:321
326327
msgid ""
327328
"Normalize the case of a pathname. On Windows, convert all characters in the "
328329
"pathname to lowercase, and also convert forward slashes to backward slashes. "
329330
"On other operating systems, return the path unchanged."
330331
msgstr ""
331332

332-
#: ../../library/os.path.rst:330
333+
#: ../../library/os.path.rst:331
333334
msgid ""
334335
"Normalize a pathname by collapsing redundant separators and up-level "
335336
"references so that ``A//B``, ``A/B/``, ``A/./B`` and ``A/foo/../B`` all "
@@ -338,7 +339,7 @@ msgid ""
338339
"backward slashes. To normalize case, use :func:`normcase`."
339340
msgstr ""
340341

341-
#: ../../library/os.path.rst:337
342+
#: ../../library/os.path.rst:338
342343
msgid ""
343344
"On POSIX systems, in accordance with `IEEE Std 1003.1 2013 Edition; 4.13 "
344345
"Pathname Resolution <https://pubs.opengroup.org/onlinepubs/9699919799/"
@@ -348,43 +349,43 @@ msgid ""
348349
"leading characters shall be treated as a single character."
349350
msgstr ""
350351

351-
#: ../../library/os.path.rst:350
352+
#: ../../library/os.path.rst:351
352353
msgid ""
353354
"Return the canonical path of the specified filename, eliminating any "
354355
"symbolic links encountered in the path (if they are supported by the "
355356
"operating system)."
356357
msgstr ""
357358

358-
#: ../../library/os.path.rst:354
359+
#: ../../library/os.path.rst:355
359360
msgid ""
360361
"If a path doesn't exist or a symlink loop is encountered, and *strict* is "
361362
"``True``, :exc:`OSError` is raised. If *strict* is ``False``, the path is "
362363
"resolved as far as possible and any remainder is appended without checking "
363364
"whether it exists."
364365
msgstr ""
365366

366-
#: ../../library/os.path.rst:360
367+
#: ../../library/os.path.rst:361
367368
msgid ""
368369
"This function emulates the operating system's procedure for making a path "
369370
"canonical, which differs slightly between Windows and UNIX with respect to "
370371
"how links and subsequent path components interact."
371372
msgstr ""
372373

373-
#: ../../library/os.path.rst:364
374+
#: ../../library/os.path.rst:365
374375
msgid ""
375376
"Operating system APIs make paths canonical as needed, so it's not normally "
376377
"necessary to call this function."
377378
msgstr ""
378379

379-
#: ../../library/os.path.rst:370
380+
#: ../../library/os.path.rst:371
380381
msgid "Symbolic links and junctions are now resolved on Windows."
381382
msgstr ""
382383

383-
#: ../../library/os.path.rst:373
384+
#: ../../library/os.path.rst:374
384385
msgid "The *strict* parameter was added."
385386
msgstr "新增 *strict* 參數。"
386387

387-
#: ../../library/os.path.rst:379
388+
#: ../../library/os.path.rst:380
388389
msgid ""
389390
"Return a relative filepath to *path* either from the current directory or "
390391
"from an optional *start* directory. This is a path computation: the "
@@ -393,41 +394,41 @@ msgid ""
393394
"are on different drives."
394395
msgstr ""
395396

396-
#: ../../library/os.path.rst:385
397+
#: ../../library/os.path.rst:386
397398
msgid "*start* defaults to :attr:`os.curdir`."
398399
msgstr ""
399400

400-
#: ../../library/os.path.rst:395
401+
#: ../../library/os.path.rst:396
401402
msgid ""
402403
"Return ``True`` if both pathname arguments refer to the same file or "
403404
"directory. This is determined by the device number and i-node number and "
404405
"raises an exception if an :func:`os.stat` call on either pathname fails."
405406
msgstr ""
406407

407-
#: ../../library/os.path.rst:401 ../../library/os.path.rst:417
408-
#: ../../library/os.path.rst:433
408+
#: ../../library/os.path.rst:402 ../../library/os.path.rst:418
409+
#: ../../library/os.path.rst:434
409410
msgid "Added Windows support."
410411
msgstr "新增對 Windows 的支援。"
411412

412-
#: ../../library/os.path.rst:404
413+
#: ../../library/os.path.rst:405
413414
msgid "Windows now uses the same implementation as all other platforms."
414415
msgstr ""
415416

416-
#: ../../library/os.path.rst:413
417+
#: ../../library/os.path.rst:414
417418
msgid ""
418419
"Return ``True`` if the file descriptors *fp1* and *fp2* refer to the same "
419420
"file."
420421
msgstr ""
421422

422-
#: ../../library/os.path.rst:426
423+
#: ../../library/os.path.rst:427
423424
msgid ""
424425
"Return ``True`` if the stat tuples *stat1* and *stat2* refer to the same "
425426
"file. These structures may have been returned by :func:`os.fstat`, :func:`os."
426427
"lstat`, or :func:`os.stat`. This function implements the underlying "
427428
"comparison used by :func:`samefile` and :func:`sameopenfile`."
428429
msgstr ""
429430

430-
#: ../../library/os.path.rst:442
431+
#: ../../library/os.path.rst:443
431432
msgid ""
432433
"Split the pathname *path* into a pair, ``(head, tail)`` where *tail* is the "
433434
"last pathname component and *head* is everything leading up to that. The "
@@ -440,55 +441,55 @@ msgid ""
440441
"and :func:`basename`."
441442
msgstr ""
442443

443-
#: ../../library/os.path.rst:458
444+
#: ../../library/os.path.rst:459
444445
msgid ""
445446
"Split the pathname *path* into a pair ``(drive, tail)`` where *drive* is "
446447
"either a mount point or the empty string. On systems which do not use drive "
447448
"specifications, *drive* will always be the empty string. In all cases, "
448449
"``drive + tail`` will be the same as *path*."
449450
msgstr ""
450451

451-
#: ../../library/os.path.rst:463
452+
#: ../../library/os.path.rst:464
452453
msgid ""
453454
"On Windows, splits a pathname into drive/UNC sharepoint and relative path."
454455
msgstr ""
455456

456-
#: ../../library/os.path.rst:465
457+
#: ../../library/os.path.rst:466
457458
msgid ""
458459
"If the path contains a drive letter, drive will contain everything up to and "
459460
"including the colon::"
460461
msgstr ""
461462

462-
#: ../../library/os.path.rst:471
463+
#: ../../library/os.path.rst:472
463464
msgid ""
464465
"If the path contains a UNC path, drive will contain the host name and share, "
465466
"up to but not including the fourth separator::"
466467
msgstr ""
467468

468-
#: ../../library/os.path.rst:483
469+
#: ../../library/os.path.rst:484
469470
msgid ""
470471
"Split the pathname *path* into a pair ``(root, ext)`` such that ``root + "
471472
"ext == path``, and the extension, *ext*, is empty or begins with a period "
472473
"and contains at most one period."
473474
msgstr ""
474475

475-
#: ../../library/os.path.rst:487
476+
#: ../../library/os.path.rst:488
476477
msgid "If the path contains no extension, *ext* will be ``''``::"
477478
msgstr ""
478479

479-
#: ../../library/os.path.rst:492
480+
#: ../../library/os.path.rst:493
480481
msgid ""
481482
"If the path contains an extension, then *ext* will be set to this extension, "
482483
"including the leading period. Note that previous periods will be ignored::"
483484
msgstr ""
484485

485-
#: ../../library/os.path.rst:500
486+
#: ../../library/os.path.rst:501
486487
msgid ""
487488
"Leading periods of the last component of the path are considered to be part "
488489
"of the root::"
489490
msgstr ""
490491

491-
#: ../../library/os.path.rst:514
492+
#: ../../library/os.path.rst:515
492493
msgid ""
493494
"``True`` if arbitrary Unicode strings can be used as file names (within "
494495
"limitations imposed by the file system)."

library/unittest.po

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgid ""
1010
msgstr ""
1111
"Project-Id-Version: Python 3.11\n"
1212
"Report-Msgid-Bugs-To: \n"
13-
"POT-Creation-Date: 2022-10-15 20:43+0000\n"
13+
"POT-Creation-Date: 2023-01-09 00:30+0000\n"
1414
"PO-Revision-Date: 2022-10-16 06:03+0800\n"
1515
"Last-Translator: Adrian Liaw <[email protected]>\n"
1616
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -465,8 +465,9 @@ msgid ""
465465
"unittest discover``. If you want to pass arguments to test discovery the "
466466
"``discover`` sub-command must be used explicitly."
467467
msgstr ""
468-
"``python -m unittest`` 作為捷徑,其功能相當於 ``python -m unittest discover``"
469-
"\\ 。假如你想傳遞引數至探索測試的話,一定要明確地加入 ``discover`` 子指令。"
468+
"``python -m unittest`` 作為捷徑,其功能相當於 ``python -m unittest "
469+
"discover``\\ 。假如你想傳遞引數至探索測試的話,一定要明確地加入 ``discover`` "
470+
"子指令。"
470471

471472
#: ../../library/unittest.rst:285
472473
msgid "The ``discover`` sub-command has the following options:"
@@ -1982,8 +1983,9 @@ msgstr ""
19821983

19831984
#: ../../library/unittest.rst:1651
19841985
msgid ""
1985-
"After running the test, ``events`` would contain ``[\"setUp\", \"asyncSetUp"
1986-
"\", \"test_response\", \"asyncTearDown\", \"tearDown\", \"cleanup\"]``."
1986+
"After running the test, ``events`` would contain ``[\"setUp\", "
1987+
"\"asyncSetUp\", \"test_response\", \"asyncTearDown\", \"tearDown\", "
1988+
"\"cleanup\"]``."
19871989
msgstr ""
19881990

19891991
#: ../../library/unittest.rst:1656
@@ -2485,15 +2487,15 @@ msgstr ""
24852487
#: ../../library/unittest.rst:1985
24862488
msgid ""
24872489
"List of Unix shell-style wildcard test name patterns that test methods have "
2488-
"to match to be included in test suites (see ``-v`` option)."
2490+
"to match to be included in test suites (see ``-k`` option)."
24892491
msgstr ""
24902492

24912493
#: ../../library/unittest.rst:1988
24922494
msgid ""
24932495
"If this attribute is not ``None`` (the default), all test methods to be "
24942496
"included in test suites must match one of the patterns in this list. Note "
24952497
"that matches are always performed using :meth:`fnmatch.fnmatchcase`, so "
2496-
"unlike patterns passed to the ``-v`` option, simple substring patterns will "
2498+
"unlike patterns passed to the ``-k`` option, simple substring patterns will "
24972499
"have to be converted using ``*`` wildcards."
24982500
msgstr ""
24992501

0 commit comments

Comments
 (0)