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.po24
1 files changed, 12 insertions, 12 deletions
diff --git a/po/ja/welcome.po b/po/ja/welcome.po
index 21102d68c..3aac36176 100644
--- a/po/ja/welcome.po
+++ b/po/ja/welcome.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-16 09:12+0000\n"
+"POT-Creation-Date: 2012-09-18 17:24+0000\n"
"PO-Revision-Date: 2011-01-14 00:14+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -772,10 +772,10 @@ msgid ""
"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), 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 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\"/>.)"
msgstr ""
"<xref linkend=\"d-i-intro\"/> に従って実際のインストールを実行してください。"
"ここでは言語選択、周辺機器のドライバモジュールの設定、(CD からインストールし"
@@ -894,12 +894,12 @@ msgstr ""
#| "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 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 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."
msgstr ""
"<emphasis>フリー</emphasis>ソフトウェアとは著作権を持っていないという意味では"
"ありません。また、このソフトウェアを含む CD が無償で配布されなければならない"
@@ -926,7 +926,7 @@ msgid ""
"packages available that do not meet our criteria for being free. These "
"packages are not part of the official distribution, however, and are only "
"available from the <userinput>contrib</userinput> or <userinput>non-free</"
-"userinput> areas of &debian; mirrors or on third-party CD-ROMs; see the "
+"userinput> areas of &debian; mirrors or on third-party CD/DVD-ROMs; see the "
"<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>The Debian "
"FTP archives</quote>, for more information about the layout and contents of "
"the archives."