Skip to content

Commit e1e252e

Browse files
author
github-actions
committed
Merge 3.14 into 3.11
1 parent afba399 commit e1e252e

File tree

4 files changed

+75
-10
lines changed

4 files changed

+75
-10
lines changed

c-api/init_config.po

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,19 @@ msgstr "Python 初期化設定 "
3232

3333
#: ../../c-api/init_config.rst:13
3434
msgid "PyInitConfig C API"
35-
msgstr ""
35+
msgstr "PyInitConfig C API"
3636

3737
#: ../../c-api/init_config.rst:17
3838
msgid "Python can be initialized with :c:func:`Py_InitializeFromInitConfig`."
39-
msgstr ""
39+
msgstr "Python は :c:func:`Py_InitializeFromInitConfig` で初期化できます。"
4040

4141
#: ../../c-api/init_config.rst:19 ../../c-api/init_config.rst:650
4242
msgid ""
4343
"The :c:func:`Py_RunMain` function can be used to write a customized Python "
4444
"program."
4545
msgstr ""
46+
":c:func:`Py_RunMain` 関数は、カスタマイズされた Python プログラムを書くために"
47+
"使用できます。"
4648

4749
#: ../../c-api/init_config.rst:22 ../../c-api/init_config.rst:653
4850
msgid ""
@@ -53,7 +55,7 @@ msgstr ""
5355

5456
#: ../../c-api/init_config.rst:25
5557
msgid ":pep:`741` \"Python Configuration C API\"."
56-
msgstr ""
58+
msgstr ":pep:`741` \"Python Configuration C API\"."
5759

5860
#: ../../c-api/init_config.rst:29 ../../c-api/init_config.rst:660
5961
msgid "Example"
@@ -64,6 +66,8 @@ msgid ""
6466
"Example of customized Python always running with the :ref:`Python "
6567
"Development Mode <devmode>` enabled; return ``-1`` on error:"
6668
msgstr ""
69+
"常に :ref:`Python 開発モード <devmode>` が有効化された状態で実行されるカスタ"
70+
"マイズされた Python の例。エラー時は ``-1`` を返します:"
6771

6872
#: ../../c-api/init_config.rst:34
6973
msgid ""
@@ -101,14 +105,48 @@ msgid ""
101105
" }\n"
102106
"}"
103107
msgstr ""
108+
"int init_python(void)\n"
109+
"{\n"
110+
" PyInitConfig *config = PyInitConfig_Create();\n"
111+
" if (config == NULL) {\n"
112+
" printf(\"PYTHON INIT ERROR: memory allocation failed\\n\");\n"
113+
" return -1;\n"
114+
" }\n"
115+
"\n"
116+
" // Python 開発モードを有効化\n"
117+
" if (PyInitConfig_SetInt(config, \"dev_mode\", 1) < 0) {\n"
118+
" goto error;\n"
119+
" }\n"
120+
"\n"
121+
" // Python を設定付きで初期化\n"
122+
" if (Py_InitializeFromInitConfig(config) < 0) {\n"
123+
" goto error;\n"
124+
" }\n"
125+
" PyInitConfig_Free(config);\n"
126+
" return 0;\n"
127+
"\n"
128+
"error:\n"
129+
" {\n"
130+
" // エラーメッセージを表示する。\n"
131+
" //\n"
132+
" // この稀な括弧スタイルは、変数宣言を指す goto ターゲットを\n"
133+
" // 作ることができないために使用されています。\n"
134+
"\n"
135+
" const char *err_msg;\n"
136+
" (void)PyInitConfig_GetError(config, &err_msg);\n"
137+
" printf(\"PYTHON INIT ERROR: %s\\n\", err_msg);\n"
138+
" PyInitConfig_Free(config);\n"
139+
" return -1;\n"
140+
" }\n"
141+
"}"
104142

105143
#: ../../c-api/init_config.rst:71
106144
msgid "Create Config"
107-
msgstr ""
145+
msgstr "設定の作成"
108146

109147
#: ../../c-api/init_config.rst:75
110148
msgid "Opaque structure to configure the Python initialization."
111-
msgstr ""
149+
msgstr "Python の初期化を構成するための不透明な構造体です。"
112150

113151
#: ../../c-api/init_config.rst:80
114152
msgid ""

c-api/intro.po

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,12 @@ msgstr ""
8484

8585
#: ../../c-api/intro.rst:34
8686
msgid "Language version compatibility"
87-
msgstr ""
87+
msgstr "言語バージョン互換性"
8888

8989
#: ../../c-api/intro.rst:36
9090
msgid "Python's C API is compatible with C11 and C++11 versions of C and C++."
9191
msgstr ""
92+
"Pythonの C API は C11 や C++11 バージョンの C と C++ に互換性があります。"
9293

9394
#: ../../c-api/intro.rst:38
9495
msgid ""
@@ -132,6 +133,8 @@ msgid ""
132133
"#define PY_SSIZE_T_CLEAN\n"
133134
"#include <Python.h>"
134135
msgstr ""
136+
"#define PY_SSIZE_T_CLEAN\n"
137+
"#include <Python.h>"
135138

136139
#: ../../c-api/intro.rst:64
137140
msgid ""
@@ -317,7 +320,7 @@ msgstr ""
317320

318321
#: ../../c-api/intro.rst:166
319322
msgid "static inline Py_ALWAYS_INLINE int random(void) { return 4; }"
320-
msgstr ""
323+
msgstr "static inline Py_ALWAYS_INLINE int random(void) { return 4; }"
321324

322325
#: ../../c-api/intro.rst:172
323326
msgid ""
@@ -333,6 +336,8 @@ msgid ""
333336
"Use this for deprecated declarations. The macro must be placed before the "
334337
"symbol name."
335338
msgstr ""
339+
"非推奨な宣言に使用してください。このマクロはシンボル名の前に置かれなければな"
340+
"りません。"
336341

337342
#: ../../c-api/intro.rst:180 ../../c-api/intro.rst:266
338343
#: ../../c-api/intro.rst:284
@@ -341,7 +346,7 @@ msgstr "以下はプログラム例です::"
341346

342347
#: ../../c-api/intro.rst:182
343348
msgid "Py_DEPRECATED(3.8) PyAPI_FUNC(int) Py_OldFunction(void);"
344-
msgstr ""
349+
msgstr "Py_DEPRECATED(3.8) PyAPI_FUNC(int) Py_OldFunction(void);"
345350

346351
#: ../../c-api/intro.rst:184
347352
msgid "MSVC support was added."
@@ -352,6 +357,8 @@ msgid ""
352357
"Like ``getenv(s)``, but returns ``NULL`` if :option:`-E` was passed on the "
353358
"command line (see :c:member:`PyConfig.use_environment`)."
354359
msgstr ""
360+
"``getenv(s)`` に似ていますが、コマンドラインで :option:`-E` が渡された場合は "
361+
"(:c:member:`PyConfig.use_environment` を参照) ``NULL`` を返します。"
355362

356363
#: ../../c-api/intro.rst:194
357364
msgid "Return the maximum value between ``x`` and ``y``."
@@ -378,7 +385,7 @@ msgstr "使い方::"
378385

379386
#: ../../c-api/intro.rst:218
380387
msgid "Py_NO_INLINE static int random(void) { return 4; }"
381-
msgstr ""
388+
msgstr "Py_NO_INLINE static int random(void) { return 4; }"
382389

383390
#: ../../c-api/intro.rst:224
384391
msgid ""
@@ -422,6 +429,8 @@ msgid ""
422429
"Use this for unused arguments in a function definition to silence compiler "
423430
"warnings. Example: ``int func(int a, int Py_UNUSED(b)) { return a; }``."
424431
msgstr ""
432+
"コンパイラ警告を抑えるために関数定義の使用されない引数に使用してください。例"
433+
"えば: ``int func(int a, int Py_UNUSED(b)) { return a; }`` 。"
425434

426435
#: ../../c-api/intro.rst:260
427436
msgid ""
@@ -445,6 +454,13 @@ msgid ""
445454
" // ...\n"
446455
"}"
447456
msgstr ""
457+
"PyDoc_STRVAR(pop_doc, \"Remove and return the rightmost element.\");\n"
458+
"\n"
459+
"static PyMethodDef deque_methods[] = {\n"
460+
" // ...\n"
461+
" {\"pop\", (PyCFunction)deque_pop, METH_NOARGS, pop_doc},\n"
462+
" // ...\n"
463+
"}"
448464

449465
#: ../../c-api/intro.rst:278
450466
msgid ""
@@ -466,6 +482,11 @@ msgid ""
466482
" {NULL, NULL}\n"
467483
"};"
468484
msgstr ""
485+
"static PyMethodDef pysqlite_row_methods[] = {\n"
486+
" {\"keys\", (PyCFunction)pysqlite_row_keys, METH_NOARGS,\n"
487+
" PyDoc_STR(\"Returns the keys of the row.\")},\n"
488+
" {NULL, NULL}\n"
489+
"};"
469490

470491
#: ../../c-api/intro.rst:296
471492
msgid "Objects, Types and Reference Counts"
@@ -710,6 +731,10 @@ msgid ""
710731
"tuple = Py_BuildValue(\"(iis)\", 1, 2, \"three\");\n"
711732
"list = Py_BuildValue(\"[iis]\", 1, 2, \"three\");"
712733
msgstr ""
734+
"PyObject *tuple, *list;\n"
735+
"\n"
736+
"tuple = Py_BuildValue(\"(iis)\", 1, 2, \"three\");\n"
737+
"list = Py_BuildValue(\"[iis]\", 1, 2, \"three\");"
713738

714739
#: ../../c-api/intro.rst:456
715740
msgid ""

extending/extending.po

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ msgid ""
131131
"#define PY_SSIZE_T_CLEAN\n"
132132
"#include <Python.h>"
133133
msgstr ""
134+
"#define PY_SSIZE_T_CLEAN\n"
135+
"#include <Python.h>"
134136

135137
#: ../../extending/extending.rst:63
136138
msgid ""

whatsnew/3.8.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3393,7 +3393,7 @@ msgstr ""
33933393

33943394
#: ../../whatsnew/3.8.rst:2109
33953395
msgid "Py_DEPRECATED(3.8) PyAPI_FUNC(int) Py_OldFunction(void);"
3396-
msgstr ""
3396+
msgstr "Py_DEPRECATED(3.8) PyAPI_FUNC(int) Py_OldFunction(void);"
33973397

33983398
#: ../../whatsnew/3.8.rst:2113
33993399
msgid "(Contributed by Zackery Spytz in :issue:`33407`.)"

0 commit comments

Comments
 (0)