Skip to content

Commit ea4dbf0

Browse files
cocoatomococoatomo
authored
Merge branch '3.7' into 3.7
2 parents 06c4ecb + 04e71d2 commit ea4dbf0

File tree

5 files changed

+3616
-3573
lines changed

5 files changed

+3616
-3573
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# issue および pull request について
2+
3+
ドキュメントの未訳の部分や誤訳を見付けて、issue や pull request を作ろうとしてくれた人達へ感謝いたします。
4+
5+
これまでの経緯により、issue は [python-doc-ja レポジトリの issues](https://github.com/python-doc-ja/python-doc-ja/issues)
6+
に集約することにしています。
7+
このレポジトリではなく、python-doc-ja レポジトリで issue の作成をお願いします。
8+
9+
このレポジトリは Transifex にある翻訳データから生成された .po ファイルを保存するためのものです。
10+
そのため pull request をマージしても、そのままでは Transifex には反映されません。
11+
(反映されているとしたら、それは管理者により手作業で Transifex に入力されているのです。)
12+
13+
現時点では pull request 自体を受け付けず、作成された pull request はマージせずに閉じることとしますので、悪しからず。
14+
(将来的に pull request を受け付けるようになる可能性はあります。)

‎faq/design.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.7\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-06-30 05:56+0900\n"
11+
"POT-Creation-Date: 2018-07-07 02:13+0900\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: Osamu NAKAMURA, 2017\n"
1414
"Language-Team: Japanese (https://www.transifex.com/python-doc/teams/5390/ja/)\n"
@@ -515,8 +515,8 @@ msgstr ""
515515

516516
#: ../../faq/design.rst:351
517517
msgid ""
518-
"Answer 2: Fortunately, there is `Stackless Python <https://bitbucket.org"
519-
"/stackless-dev/stackless/wiki/Home>`_, which has a completely redesigned "
518+
"Answer 2: Fortunately, there is `Stackless Python <https://github.com"
519+
"/stackless-dev/stackless/wiki>`_, which has a completely redesigned "
520520
"interpreter loop that avoids the C stack."
521521
msgstr ""
522522

‎library/pdb.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.7\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-06-30 05:56+0900\n"
11+
"POT-Creation-Date: 2018-07-07 02:13+0900\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: cocoatomo, 2017\n"
1414
"Language-Team: Japanese (https://www.transifex.com/python-doc/teams/5390/ja/)\n"
@@ -490,11 +490,11 @@ msgstr ""
490490
msgid ""
491491
"Specifying any command resuming execution (currently :pdbcmd:`continue`, "
492492
":pdbcmd:`step`, :pdbcmd:`next`, :pdbcmd:`return`, :pdbcmd:`jump`, "
493-
":pdbcmd:`quit` and their abbreviations) terminates the command "
494-
":pdbcmd:`list` (as if that command was immediately followed by end). This is"
495-
" because any time you resume execution (even with a simple next or step), "
496-
"you may encounter another breakpoint—which could have its own command list, "
497-
"leading to ambiguities about which list to execute."
493+
":pdbcmd:`quit` and their abbreviations) terminates the command list (as if "
494+
"that command was immediately followed by end). This is because any time you "
495+
"resume execution (even with a simple next or step), you may encounter "
496+
"another breakpoint—which could have its own command list, leading to "
497+
"ambiguities about which list to execute."
498498
msgstr ""
499499

500500
#: ../../library/pdb.rst:353

‎whatsnew/3.7.po

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ msgid ""
263263
"Since this change breaks compatibility, the new behavior needs to be enabled"
264264
" on a per-module basis in Python 3.7 using a :mod:`__future__` import::"
265265
msgstr ""
266-
"この変更は(旧バージョンと)互換性をなくしてしまうため、本機能は :mod:`__future__` import:: を使用したPython 3.7の旧モジュールベースで実行される必要があります。"
266+
"この変更は後方互換性を壊してしまうので、新しい振る舞いは Python 3.7 では :mod:`__future__` "
267+
"インポートを使いモジュールごとに有効化する必要があります::"
267268

268269
#: ../../whatsnew/3.7.rst:174
269270
msgid "It will become the default in Python 4.0."
@@ -1717,7 +1718,7 @@ msgstr ""
17171718

17181719
#: ../../whatsnew/3.7.rst:1179
17191720
msgid "py_compile"
1720-
msgstr ""
1721+
msgstr "py_compile"
17211722

17221723
#: ../../whatsnew/3.7.rst:1181
17231724
msgid ""
@@ -2205,7 +2206,7 @@ msgstr ""
22052206

22062207
#: ../../whatsnew/3.7.rst:1526
22072208
msgid "uuid"
2208-
msgstr ""
2209+
msgstr "uuid"
22092210

22102211
#: ../../whatsnew/3.7.rst:1528
22112212
msgid ""
@@ -2302,7 +2303,7 @@ msgstr ""
23022303

23032304
#: ../../whatsnew/3.7.rst:1582
23042305
msgid "xmlrpc.server"
2305-
msgstr ""
2306+
msgstr "xmlrpc.server"
23062307

23072308
#: ../../whatsnew/3.7.rst:1584
23082309
msgid ""
@@ -2349,7 +2350,7 @@ msgstr ""
23492350

23502351
#: ../../whatsnew/3.7.rst:1615
23512352
msgid "C API Changes"
2352-
msgstr ""
2353+
msgstr "C API の変更"
23532354

23542355
#: ../../whatsnew/3.7.rst:1617
23552356
msgid ""

0 commit comments

Comments
 (0)