summaryrefslogtreecommitdiff
path: root/po/ja/welcome.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ja/welcome.po')
-rw-r--r--po/ja/welcome.po59
1 files changed, 41 insertions, 18 deletions
diff --git a/po/ja/welcome.po b/po/ja/welcome.po
index f4c9188ca..1f66d7108 100644
--- a/po/ja/welcome.po
+++ b/po/ja/welcome.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-23 07:43+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
"PO-Revision-Date: 2018-12-22 20:48+0900\n"
"Last-Translator: Hideki Yamane <henrich@debian.org>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -672,13 +672,19 @@ msgstr "&debian; の入手"
#. Tag: para
#: welcome.xml:424
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For information on how to download &debian-gnu; from the Internet or from "
+#| "whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
+#| "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
+#| "debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
+#| "official &debian; mirrors, so you can easily find the nearest one."
msgid ""
"For information on how to download &debian-gnu; from the Internet or from "
-"whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
-"debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-"debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
-"official &debian; mirrors, so you can easily find the nearest one."
+"whom official &debian; installation media can be purchased, see the <ulink "
+"url=\"&url-debian-distrib;\">distribution web page</ulink>. The <ulink url="
+"\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> contains a full "
+"set of official &debian; mirrors, so you can easily find the nearest one."
msgstr ""
"インターネットを通じて &debian-gnu; をダウンロードしたり &debian; の公式 CD "
"を購入したりするための情報については、<ulink url=\"&url-debian-distrib;\">入"
@@ -814,16 +820,25 @@ msgstr ""
#. Tag: para
#: welcome.xml:519
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
+#| ">. This involves choosing your language, configuring peripheral driver "
+#| "modules, configuring your network connection, so that remaining "
+#| "installation files can be obtained directly from a &debian; server (if "
+#| "you are not installing from a CD/DVD set), partitioning your hard drives "
+#| "and installation of a base system, then selection and installation of "
+#| "tasks. (Some background about setting up the partitions for your &debian; "
+#| "system is explained in <xref linkend=\"partitioning\"/>.)"
msgid ""
"Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
"This involves choosing your language, configuring peripheral driver modules, "
"configuring your network connection, so that remaining installation files "
"can be obtained directly from a &debian; server (if you are not installing "
-"from a CD/DVD set), partitioning your hard drives and installation of a base "
-"system, then selection and installation of tasks. (Some background about "
-"setting up the partitions for your &debian; system is explained in <xref "
-"linkend=\"partitioning\"/>.)"
+"from a set of CD/DVD installation images), partitioning your hard drives and "
+"installation of a base system, then selection and installation of tasks. "
+"(Some background about setting up the partitions for your &debian; system is "
+"explained in <xref linkend=\"partitioning\"/>.)"
msgstr ""
"<xref linkend=\"d-i-intro\"/> に従って実際のインストールを実行してください。"
"ここでは言語選択、周辺機器のドライバモジュールの設定、(CD/DVD セットからイン"
@@ -931,15 +946,23 @@ msgstr ""
#. Tag: para
#: welcome.xml:601
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Calling software <emphasis>free</emphasis> doesn't mean that the software "
+#| "isn't copyrighted, and it doesn't mean that CDs/DVDs containing that "
+#| "software must be distributed at no charge. Free software, in part, means "
+#| "that the licenses of individual programs do not require you to pay for "
+#| "the privilege of distributing or using those programs. Free software also "
+#| "means that not only may anyone extend, adapt, and modify the software, "
+#| "but that they may distribute the results of their work as well."
msgid ""
"Calling software <emphasis>free</emphasis> doesn't mean that the software "
-"isn't copyrighted, and it doesn't mean that CDs/DVDs containing that "
-"software must be distributed at no charge. Free software, in part, means "
-"that the licenses of individual programs do not require you to pay for the "
-"privilege of distributing or using those programs. Free software also means "
-"that not only may anyone extend, adapt, and modify the software, but that "
-"they may distribute the results of their work as well."
+"isn't copyrighted, and it doesn't mean that installation media containing "
+"that software must be distributed at no charge. Free software, in part, "
+"means that the licenses of individual programs do not require you to pay for "
+"the privilege of distributing or using those programs. Free software also "
+"means that not only may anyone extend, adapt, and modify the software, but "
+"that they may distribute the results of their work as well."
msgstr ""
"<emphasis>フリー</emphasis>ソフトウェアとは、著作権を持っていないという意味で"
"はありません。また、このソフトウェアを含む CD/DVD が、無償で配布されなければ"