Skip to content

Commit 3076a9a

Browse files
authored
Initial state - resolving merge conflicts
2 parents 89e49b6 + 4967910 commit 3076a9a

332 files changed

Lines changed: 6371 additions & 963 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.en.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ f'''[![build](https://github.com/python/python-docs-pl/actions/workflows/update-
1717
]]] -->
1818
[![build](https://github.com/python/python-docs-pl/actions/workflows/update-and-build.yml/badge.svg)](https://github.com/python/python-docs-pl/actions/workflows/update-and-build.yml)
1919
[![core 100.00%](https://img.shields.io/badge/core-100.00%25-0.svg)](https://translations.python.org/#pl)
20+
<<<<<<< HEAD
2021
[![Total Translation of Documentation](https://img.shields.io/badge/total_words-5.81%25-0.svg)](https://translations.python.org/#pl)
2122
[![Total Translation of Documentation](https://img.shields.io/badge/total_strings-12.65%25-0.svg)](https://translations.python.org/#pl)
2223
[![lint errors count](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=lint%20errors)](https://github.com/python/python-docs-pl/actions/workflows/lint.yml)
24+
=======
25+
[![Total Translation of Documentation](https://img.shields.io/badge/total_words-5.71%25-0.svg)](https://translations.python.org/#pl)
26+
[![Total Translation of Documentation](https://img.shields.io/badge/total_strings-12.49%25-0.svg)](https://translations.python.org/#pl)
27+
[![lint errors count](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=lint%20errors)](https://github.com/python/python-docs-pl/actions/workflows/update-lint-and-build.yml)
28+
>>>>>>> origin/3.15
2329
2430
<!-- [[[end]]] -->
2531

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ f'''[![build](https://github.com/python/python-docs-pl/actions/workflows/update-
1717
]]] -->
1818
[![build](https://github.com/python/python-docs-pl/actions/workflows/update-and-build.yml/badge.svg)](https://github.com/python/python-docs-pl/actions/workflows/update-lint-and-build.yml)
1919
[![podstawowe artykuły 100.00%](https://img.shields.io/badge/podstawowe_artykuły-100.00%25-0.svg)](https://translations.python.org/#pl)
20+
<<<<<<< HEAD
2021
[![postęp tłumaczenia całości dokumentacji](https://img.shields.io/badge/całość_słów-5.81%25-0.svg)](https://translations.python.org/#pl)
2122
[![postęp tłumaczenia całości dokumentacji](https://img.shields.io/badge/całość_napisów-12.65%25-0.svg)](https://translations.python.org/#pl)
2223
[![liczba błędów lintowania](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=b%C5%82%C4%99dy%20lintowania)](https://github.com/python/python-docs-pl/actions/workflows/lint.yml)
24+
=======
25+
[![postęp tłumaczenia całości dokumentacji](https://img.shields.io/badge/całość_słów-5.71%25-0.svg)](https://translations.python.org/#pl)
26+
[![postęp tłumaczenia całości dokumentacji](https://img.shields.io/badge/całość_napisów-12.49%25-0.svg)](https://translations.python.org/#pl)
27+
[![liczba błędów lintowania](https://shields.io/badge/dynamic/xml?url=https%3A%2F%2Ftranslations.python.org%2Fbuild-details.html&query=%2F%2Ftr%5Btd%5B%40data-label%3D%27language%27%20and%20contains%28.%2C%20%27%28pl%29%27%29%5D%5D%20%20%20%2F%2Ftd%5B%40data-label%3D%27lint%27%5D%2Fa%2Ftext()&label=b%C5%82%C4%99dy%20lintowania)](https://github.com/python/python-docs-pl/actions/workflows/update-lint-and-build.yml)
28+
>>>>>>> origin/3.15
2329
2430
<!-- [[[end]]] -->
2531

c-api/abstract.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: Python 3.15\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2026-06-02 00:16+0000\n"
14+
"POT-Creation-Date: 2026-06-21 15:47+0000\n"
1515
"PO-Revision-Date: 2025-09-16 00:00+0000\n"
1616
"Last-Translator: python-doc bot, 2025\n"
1717
"Language-Team: Polish (https://app.transifex.com/python-doc/teams/5390/pl/)\n"

c-api/allocation.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: Python 3.15\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2026-06-02 00:16+0000\n"
14+
"POT-Creation-Date: 2026-06-21 15:47+0000\n"
1515
"PO-Revision-Date: 2025-09-16 00:00+0000\n"
1616
"Last-Translator: python-doc bot, 2025\n"
1717
"Language-Team: Polish (https://app.transifex.com/python-doc/teams/5390/pl/)\n"

c-api/apiabiversion.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: Python 3.15\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2026-06-02 00:16+0000\n"
14+
"POT-Creation-Date: 2026-06-21 15:47+0000\n"
1515
"PO-Revision-Date: 2025-09-16 00:00+0000\n"
1616
"Last-Translator: python-doc bot, 2025\n"
1717
"Language-Team: Polish (https://app.transifex.com/python-doc/teams/5390/pl/)\n"

c-api/arg.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: Python 3.15\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2026-06-02 00:16+0000\n"
14+
"POT-Creation-Date: 2026-06-21 15:47+0000\n"
1515
"PO-Revision-Date: 2025-09-16 00:00+0000\n"
1616
"Last-Translator: python-doc bot, 2025\n"
1717
"Language-Team: Polish (https://app.transifex.com/python-doc/teams/5390/pl/)\n"

c-api/bool.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: Python 3.15\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2026-06-02 00:16+0000\n"
14+
"POT-Creation-Date: 2026-06-21 15:47+0000\n"
1515
"PO-Revision-Date: 2025-09-16 00:00+0000\n"
1616
"Last-Translator: python-doc bot, 2025\n"
1717
"Language-Team: Polish (https://app.transifex.com/python-doc/teams/5390/pl/)\n"

c-api/buffer.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: Python 3.15\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2026-06-02 00:16+0000\n"
14+
"POT-Creation-Date: 2026-06-21 15:47+0000\n"
1515
"PO-Revision-Date: 2025-09-16 00:00+0000\n"
1616
"Last-Translator: python-doc bot, 2025\n"
1717
"Language-Team: Polish (https://app.transifex.com/python-doc/teams/5390/pl/)\n"

c-api/bytearray.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: Python 3.15\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2026-06-02 00:16+0000\n"
14+
"POT-Creation-Date: 2026-06-21 15:47+0000\n"
1515
"PO-Revision-Date: 2025-09-16 00:00+0000\n"
1616
"Last-Translator: python-doc bot, 2025\n"
1717
"Language-Team: Polish (https://app.transifex.com/python-doc/teams/5390/pl/)\n"

c-api/bytes.po

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: Python 3.15\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2026-06-02 00:16+0000\n"
14+
"POT-Creation-Date: 2026-06-19 16:29+0000\n"
1515
"PO-Revision-Date: 2025-09-16 00:00+0000\n"
1616
"Last-Translator: python-doc bot, 2025\n"
1717
"Language-Team: Polish (https://app.transifex.com/python-doc/teams/5390/pl/)\n"
@@ -471,15 +471,21 @@ msgstr ""
471471
msgid "Get the writer size."
472472
msgstr ""
473473

474+
msgid ""
475+
"The function does not invalidate pointers returned by :c:func:"
476+
"`PyBytesWriter_GetData`."
477+
msgstr ""
478+
474479
msgid "The function cannot fail."
475480
msgstr ""
476481

477482
msgid "Get the writer data: start of the internal buffer."
478483
msgstr ""
479484

480485
msgid ""
481-
"The pointer is valid until :c:func:`PyBytesWriter_Finish` or :c:func:"
482-
"`PyBytesWriter_Discard` is called on *writer*."
486+
"The pointer remains valid until a :c:type:`PyBytesWriter` function other "
487+
"than :c:func:`PyBytesWriter_GetData` or :c:func:`PyBytesWriter_GetSize` is "
488+
"called on *writer*."
483489
msgstr ""
484490

485491
msgid "Low-level API"

0 commit comments

Comments
 (0)