All languages - update language templates (updated English pot files, then update all the languages)

Commands used: cd ./english/po/; make pot; cd ../../; for i in albanian/po/ arabic/po/ armenian/po/ bulgarian/po/ catalan/po/ chinese/po/ croatian/po/ czech/po/ danish/po/ dutch/po/ esperanto/po/ finnish/po/ french/po/ galician/po/ german/po/ greek/po/ hebrew/po/ hungarian/po/ indonesian/po/ italian/po/ japanese/po/ korean/po/ lithuanian/po/ norwegian/po/ persian/po/ polish/po/ portuguese/po/ romanian/po/ russian/po/ slovak/po/ slovene/po/ spanish/po/ swedish/po/ tamil/po/ turkish/po/ ukrainian/po/ vietnamese/po/ ; do (cd $i; make update-po ; ) ; done
author: Laura Arjona Reina <larjona@debian.org> 2020-09-25 22:57:35 +0200
committer: Laura Arjona Reina <larjona@debian.org> 2020-09-25 22:57:35 +0200
commit: 5a043c97e946fcb7fbc38e36a10af9e3a376cdf3 (patch)
tree: 557622bab9a5a34f33780ca2077b4d8a95b80db4 /japanese/po
parent: 758c0e6b2b0f0e2298ffec12b4f3826713f0df63 (diff)
15 files changed, 1367 insertions, 1307 deletions
diff --git a/japanese/po/blends.ja.po b/japanese/po/blends.ja.po
index 46b4effaacd..000f3cbca88 100644
--- a/japanese/po/blends.ja.po
+++ b/japanese/po/blends.ja.po
@@ -96,6 +96,20 @@ msgstr ""
 "Debian Science の目標は研究者や科学者が Debian を使ったときにより良い経験を与"
 "えることです。"
 
+#: ../../english/blends/released.data:89
+msgid ""
+"The goal of FreedomBox is to develop, design and promote personal servers "
+"running free software for private, personal communications. Applications "
+"include blogs, wikis, websites, social networks, email, web proxy and a Tor "
+"relay on a device that can replace a wireless router so that data stays with "
+"the users."
+msgstr ""
+"FreedomBox の目標は私的、個人的な通信向けのフリーソフトウェアを利用した個人向"
+"けのサーバを開発、設計、推進することです。対象アプリケーションにはブログや "
+"wiki、ウェブサイト、ソーシャルネットワーク、電子メール、ウェブプロキシがあ"
+"り、デバイス上の Tor リレーを無線ルータの代わりにできるためデータはユーザの下"
+"に残ります。"
+
 #: ../../english/blends/unreleased.data:15
 msgid ""
 "The goal of Debian Accessibility is to develop Debian into an operating "
@@ -129,20 +143,6 @@ msgstr ""
 
 #: ../../english/blends/unreleased.data:38
 msgid ""
-"The goal of FreedomBox is to develop, design and promote personal servers "
-"running free software for private, personal communications. Applications "
-"include blogs, wikis, websites, social networks, email, web proxy and a Tor "
-"relay on a device that can replace a wireless router so that data stays with "
-"the users."
-msgstr ""
-"FreedomBox の目標は私的、個人的な通信向けのフリーソフトウェアを利用した個人向"
-"けのサーバを開発、設計、推進することです。対象アプリケーションにはブログや "
-"wiki、ウェブサイト、ソーシャルネットワーク、電子メール、ウェブプロキシがあ"
-"り、デバイス上の Tor リレーを無線ルータの代わりにできるためデータはユーザの下"
-"に残ります。"
-
-#: ../../english/blends/unreleased.data:46
-msgid ""
 "The goal of Debian Hamradio is to support the needs of radio amateurs in "
 "Debian by providing logging, data mode and packet mode applications and more."
 msgstr ""
@@ -150,7 +150,7 @@ msgstr ""
 "ションその他を提供することで Debian におけるアマチュア無線での需要をサポート"
 "することです。"
 
-#: ../../english/blends/unreleased.data:55
+#: ../../english/blends/unreleased.data:47
 msgid ""
 "The goal of DebianParl is to provide applications to support the needs of "
 "parliamentarians, politicians and their staffers all around the world."
@@ -158,8 +158,8 @@ msgstr ""
 "DebianParl の目標は世界中の議員や政治家及び職員の需要をサポートするアプリケー"
 "ションを提供することです。"
 
-#~ msgid "Debian Games"
-#~ msgstr "Debian ゲーム"
-
 #~ msgid "Debian Accessibility"
 #~ msgstr "Debian Accessibility"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian ゲーム"
diff --git a/japanese/po/bugs.ja.po b/japanese/po/bugs.ja.po
index 419a9495fa2..441b26539b4 100644
--- a/japanese/po/bugs.ja.po
+++ b/japanese/po/bugs.ja.po
@@ -156,149 +156,149 @@ msgstr "アーカイブされているもの"
 msgid "Archived and Unarchived"
 msgstr "アーカイブされているものとされていないものの両方"
 
-#~ msgid "Flags:"
-#~ msgstr "設定:"
+#~ msgid "security"
+#~ msgstr "セキュリティ (security)"
 
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude tag:"
+#~ msgstr "含めないタグ:"
 
-#~ msgid "display merged bugs only once"
-#~ msgstr "マージしたバグを1度しか表示しない"
+#~ msgid "Include tag:"
+#~ msgstr "含めるタグ:"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "状態や重要度の順に並べない"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "ヘッダ部分に目次を示さない"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "フッタ部分に統計を示さない"
+#~ msgid "wontfix"
+#~ msgstr "修正予定無 (wontfix)"
 
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "上流 (upstream)"
 
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "再現不可能 (unreproducible)"
 
-#~ msgid "Package version:"
-#~ msgstr "パッケージバージョン:"
+#~ msgid "patch"
+#~ msgstr "パッチ (patch)"
 
-#~ msgid "Distribution:"
-#~ msgstr "ディストリビューション:"
+#~ msgid "moreinfo"
+#~ msgstr "追加情報 (moreinfo)"
 
-#~ msgid "bugs"
-#~ msgstr "バグ"
+#~ msgid "l10n"
+#~ msgstr "地域化 (l10n)"
 
-#~ msgid "open"
-#~ msgstr "オープン"
+#~ msgid "help"
+#~ msgstr "助けを求む (help)"
 
-#~ msgid "forwarded"
-#~ msgstr "上流に転送済"
+#~ msgid "fixed-upstream"
+#~ msgstr "上流で修正済 (fixed-upstream)"
 
-#~ msgid "pending"
-#~ msgstr "留保"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "experimental で修正済 (fixed-in-experimental)"
 
-#~ msgid "fixed"
-#~ msgstr "修正済"
+#~ msgid "d-i"
+#~ msgstr "インストーラ (d-i)"
 
-#~ msgid "Include status:"
-#~ msgstr "含める状態:"
+#~ msgid "confirmed"
+#~ msgstr "確認済 (confirmed)"
 
-#~ msgid "Exclude status:"
-#~ msgstr "含めない状態:"
+#~ msgid "sid"
+#~ msgstr "sid"
 
-#~ msgid "critical"
-#~ msgstr "致命的 (critical)"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny では無視 (lenny-ignore)"
 
-#~ msgid "grave"
-#~ msgstr "重大 (grave)"
+#~ msgid "lenny"
+#~ msgstr "lenny"
 
-#~ msgid "serious"
-#~ msgstr "深刻 (serious)"
+#~ msgid "etch-ignore"
+#~ msgstr "etch では無視 (etch-ignore)"
 
-#~ msgid "important"
-#~ msgstr "重要 (important)"
+#~ msgid "etch"
+#~ msgstr "etch"
 
-#~ msgid "minor"
-#~ msgstr "軽度 (minor)"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge では無視 (sarge-ignore)"
 
-#~ msgid "wishlist"
-#~ msgstr "要望 (wishlist)"
+#~ msgid "woody"
+#~ msgstr "woody"
 
-#~ msgid "Include severity:"
-#~ msgstr "含める重要度:"
+#~ msgid "potato"
+#~ msgstr "potato"
 
 #~ msgid "Exclude severity:"
 #~ msgstr "含めない重要度:"
 
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "含める重要度:"
 
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "要望 (wishlist)"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge では無視 (sarge-ignore)"
+#~ msgid "minor"
+#~ msgstr "軽度 (minor)"
 
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "重要 (important)"
 
-#~ msgid "etch-ignore"
-#~ msgstr "etch では無視 (etch-ignore)"
+#~ msgid "serious"
+#~ msgstr "深刻 (serious)"
 
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "重大 (grave)"
 
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny では無視 (lenny-ignore)"
+#~ msgid "critical"
+#~ msgstr "致命的 (critical)"
 
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "含めない状態:"
 
-#~ msgid "confirmed"
-#~ msgstr "確認済 (confirmed)"
+#~ msgid "Include status:"
+#~ msgstr "含める状態:"
 
-#~ msgid "d-i"
-#~ msgstr "インストーラ (d-i)"
+#~ msgid "fixed"
+#~ msgstr "修正済"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "experimental で修正済 (fixed-in-experimental)"
+#~ msgid "pending"
+#~ msgstr "留保"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "上流で修正済 (fixed-upstream)"
+#~ msgid "forwarded"
+#~ msgstr "上流に転送済"
 
-#~ msgid "help"
-#~ msgstr "助けを求む (help)"
+#~ msgid "open"
+#~ msgstr "オープン"
 
-#~ msgid "l10n"
-#~ msgstr "地域化 (l10n)"
+#~ msgid "bugs"
+#~ msgstr "バグ"
 
-#~ msgid "moreinfo"
-#~ msgstr "追加情報 (moreinfo)"
+#~ msgid "Distribution:"
+#~ msgstr "ディストリビューション:"
 
-#~ msgid "patch"
-#~ msgstr "パッチ (patch)"
+#~ msgid "Package version:"
+#~ msgstr "パッケージバージョン:"
 
-#~ msgid "unreproducible"
-#~ msgstr "再現不可能 (unreproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
 
-#~ msgid "upstream"
-#~ msgstr "上流 (upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
 
-#~ msgid "wontfix"
-#~ msgstr "修正予定無 (wontfix)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "フッタ部分に統計を示さない"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "ヘッダ部分に目次を示さない"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "状態や重要度の順に並べない"
 
-#~ msgid "Include tag:"
-#~ msgstr "含めるタグ:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "マージしたバグを1度しか表示しない"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "含めないタグ:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
 
-#~ msgid "security"
-#~ msgstr "セキュリティ (security)"
+#~ msgid "Flags:"
+#~ msgstr "設定:"
diff --git a/japanese/po/cdimage.ja.po b/japanese/po/cdimage.ja.po
index db87e53a280..b0db8acf611 100644
--- a/japanese/po/cdimage.ja.po
+++ b/japanese/po/cdimage.ja.po
@@ -9,6 +9,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
+msgid "      Key fingerprint"
+msgstr "                 指紋"
+
+#: ../../english/devel/debian-installer/images.data:87
+msgid "ISO images"
+msgstr "ISO イメージ"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo ファイル"
+
 #. note: only change the sep(arator) if it's not good for your charset
 #: ../../english/template/debian/cdimage.wml:10
 msgid "&middot;"
@@ -105,17 +119,3 @@ msgid ""
 msgstr ""
 "英語での CD/DVD 用<a href=\"/MailingLists/disclaimer\">公開メーリングリスト</"
 "a>:"
-
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
-#: ../../english/CD/CD-keys.data:13
-msgid "      Key fingerprint"
-msgstr "                 指紋"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO イメージ"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo ファイル"
diff --git a/japanese/po/consultants.ja.po b/japanese/po/consultants.ja.po
index 32ea78532e9..c668ce9e8e2 100644
--- a/japanese/po/consultants.ja.po
+++ b/japanese/po/consultants.ja.po
@@ -9,14 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "コンサルタント一覧"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "<a href=\"./\">Debian コンサルタントのページ</a>に戻る。"
-
 #: ../../english/consultants/consultant.defs:6
 msgid "Name:"
 msgstr "氏名"
@@ -72,3 +64,11 @@ msgid ""
 msgstr ""
 "世界中の <total_country> の国の <total_consultant> の Debian コンサルタントが"
 "掲載されています。"
+
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "コンサルタント一覧"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "<a href=\"./\">Debian コンサルタントのページ</a>に戻る。"
diff --git a/japanese/po/distrib.ja.po b/japanese/po/distrib.ja.po
index 219160f80a3..1d031e39690 100644
--- a/japanese/po/distrib.ja.po
+++ b/japanese/po/distrib.ja.po
@@ -10,67 +10,97 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/distrib/search_packages-form.inc:8
 #: ../../english/distrib/search_contents-form.inc:9
+#: ../../english/distrib/search_packages-form.inc:8
 msgid "Keyword"
 msgstr "キーワード"
 
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "検索対象"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "パッケージ名のみ"
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "結果表示方法"
 
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "パッケージ説明文"
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "キーワードを末尾に持つパス"
 
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "ソースパッケージ名"
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "キーワードに似た名前のファイルを含むパッケージ"
 
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "完全にマッチするもののみを表示"
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "キーワードを含む名前のファイルを含むパッケージ"
 
-#: ../../english/distrib/search_packages-form.inc:25
 #: ../../english/distrib/search_contents-form.inc:25
+#: ../../english/distrib/search_packages-form.inc:25
 msgid "Distribution"
 msgstr "ディストリビューション"
 
-#: ../../english/distrib/search_packages-form.inc:27
 #: ../../english/distrib/search_contents-form.inc:27
+#: ../../english/distrib/search_packages-form.inc:27
 msgid "experimental"
 msgstr "experimental"
 
-#: ../../english/distrib/search_packages-form.inc:28
 #: ../../english/distrib/search_contents-form.inc:28
+#: ../../english/distrib/search_packages-form.inc:28
 msgid "unstable"
 msgstr "不安定版 (unstable)"
 
-#: ../../english/distrib/search_packages-form.inc:29
 #: ../../english/distrib/search_contents-form.inc:29
+#: ../../english/distrib/search_packages-form.inc:29
 msgid "testing"
 msgstr "テスト版 (testing)"
 
-#: ../../english/distrib/search_packages-form.inc:30
 #: ../../english/distrib/search_contents-form.inc:30
+#: ../../english/distrib/search_packages-form.inc:30
 msgid "stable"
 msgstr "安定版 (stable)"
 
-#: ../../english/distrib/search_packages-form.inc:31
 #: ../../english/distrib/search_contents-form.inc:31
+#: ../../english/distrib/search_packages-form.inc:31
 msgid "oldstable"
 msgstr "旧安定版 (oldstable)"
 
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "アーキテクチャ"
+
+#: ../../english/distrib/search_contents-form.inc:38
 #: ../../english/distrib/search_packages-form.inc:32
 #: ../../english/distrib/search_packages-form.inc:39
-#: ../../english/distrib/search_contents-form.inc:38
 msgid "any"
 msgstr "すべて"
 
+#: ../../english/distrib/search_contents-form.inc:48
+#: ../../english/distrib/search_packages-form.inc:43
+msgid "Search"
+msgstr "検索"
+
+#: ../../english/distrib/search_contents-form.inc:49
+#: ../../english/distrib/search_packages-form.inc:44
+msgid "Reset"
+msgstr "リセット"
+
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "検索対象"
+
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "パッケージ名のみ"
+
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "パッケージ説明文"
+
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "ソースパッケージ名"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "完全にマッチするもののみを表示"
+
 #: ../../english/distrib/search_packages-form.inc:34
 msgid "Section"
 msgstr "セクション"
@@ -87,36 +117,6 @@ msgstr "contrib"
 msgid "non-free"
 msgstr "non-free"
 
-#: ../../english/distrib/search_packages-form.inc:43
-#: ../../english/distrib/search_contents-form.inc:48
-msgid "Search"
-msgstr "検索"
-
-#: ../../english/distrib/search_packages-form.inc:44
-#: ../../english/distrib/search_contents-form.inc:49
-msgid "Reset"
-msgstr "リセット"
-
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "結果表示方法"
-
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "キーワードを末尾に持つパス"
-
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "キーワードに似た名前のファイルを含むパッケージ"
-
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "キーワードを含む名前のファイルを含むパッケージ"
-
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "アーキテクチャ"
-
 #: ../../english/releases/arches.data:8
 msgid "Alpha"
 msgstr "Alpha"
diff --git a/japanese/po/doc.ja.po b/japanese/po/doc.ja.po
index 570da7d0844..34991c7ce33 100644
--- a/japanese/po/doc.ja.po
+++ b/japanese/po/doc.ja.po
@@ -10,124 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "著者名:"
-
-#: ../../english/doc/books.def:41
-#, fuzzy
-msgid "Debian Release:"
-msgstr "Debian パッケージ"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "電子メール:"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "入手先:"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "収録される CD:"
-
-#: ../../english/doc/books.def:54
-msgid "Publisher:"
-msgstr "出版社:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "著者名:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "編集者名:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "メンテナ:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "状態:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "入手:"
-
-#: ../../english/doc/manuals.defs:97
-msgid "Latest version:"
-msgstr "最新バージョン:"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(バージョン <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "プレーンテキスト"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/git"
-"\">Git</a> リポジトリ経由で利用できるようになっています。"
-
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
-#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
-#: ../../english/doc/manuals.defs:195
-msgid "Web interface: "
-msgstr "ウェブインターフェイス: "
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
-#: ../../english/doc/manuals.defs:196
-msgid "VCS interface: "
-msgstr "VCS インターフェイス: "
-
-#: ../../english/doc/manuals.defs:177
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/cvs\">Cvs</a> repository."
-msgstr ""
-"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/cvs"
-"\">Cvs</a> リポジトリ経由で利用できるようになっています。"
-
-#: ../../english/doc/manuals.defs:185
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/subversion\">Subversion</a> repository."
-msgstr ""
-"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
-"subversion\">Subversion</a> リポジトリ経由で利用できるようになっています。"
-
-#: ../../english/doc/manuals.defs:203
-msgid ""
-"CVS sources working copy: set <code>CVSROOT</code>\n"
-"  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-"  and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr ""
-"作業中の CVS ソースを得るには: <code>CVSROOT</code> 変数を\n"
-"<kbd>:ext:<var>ユーザID</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
-"に設定し、<kbd>boot-floppies/documentation</kbd> モジュールを checkout してく"
-"ださい。"
-
-#: ../../english/doc/manuals.defs:208
-msgid "CVS via web"
-msgstr "ウェブ経由で CVS を見る"
-
-#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
-msgid "Debian package"
-msgstr "Debian パッケージ"
-
-#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
-msgid "Debian package (archived)"
-msgstr "Debian パッケージ (アーカイブ)"
-
-#: ../../english/doc/books.data:32
+#: ../../english/doc/books.data:35
 #, fuzzy
 msgid ""
 "\n"
@@ -157,8 +40,8 @@ msgstr ""
 "  ネットワークマネージャ等を利用してホームネットワークを管理します。\n"
 "  この本による利益の1割が Debian プロジェクトに寄付されます。"
 
-#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
+#: ../../english/doc/books.data:64 ../../english/doc/books.data:174
+#: ../../english/doc/books.data:229
 #, fuzzy
 msgid ""
 "Written by two Debian developers, this free book\n"
@@ -185,7 +68,7 @@ msgstr ""
 "た\n"
 "  新しい事項についても見落とすことなく触れています。"
 
-#: ../../english/doc/books.data:83
+#: ../../english/doc/books.data:86
 msgid ""
 "The aim of this freely available, up-to-date, book is to get you up to\n"
 "  speed with Debian (including both the current stable release and the\n"
@@ -200,7 +83,7 @@ msgstr ""
 "  自らシステムをインストールしてメンテナンスするユーザのための、\n"
 "  基本的なサポートを網羅しています。"
 
-#: ../../english/doc/books.data:105
+#: ../../english/doc/books.data:108
 msgid ""
 "The first French book about Debian is already in its fifth edition. It\n"
 "  covers all aspects of the administration of Debian from the installation\n"
@@ -220,7 +103,7 @@ msgstr ""
 "  Debian を使って信頼性のあるネットワークを構築したい管理者など、\n"
 "  多くの人々にとって興味深いものとなっています。"
 
-#: ../../english/doc/books.data:125
+#: ../../english/doc/books.data:128
 #, fuzzy
 msgid ""
 "The book covers topics ranging from concepts of package\n"
@@ -238,7 +121,7 @@ msgstr ""
 "フォーマット: e-book (オンライン、HTML、PDF、ePub、Mobi)\n"
 "書籍化の予定もあります。\n"
 
-#: ../../english/doc/books.data:146
+#: ../../english/doc/books.data:149
 #, fuzzy
 msgid ""
 "This book teaches you how to install and configure the system and also how "
@@ -251,7 +134,7 @@ msgstr ""
 "ン 6.0) のあらゆる潜在能力を示し、Debian およびその対応業務の範囲について理解"
 "しようとする全ユーザに実用的なマニュアルを提供します。"
 
-#: ../../english/doc/books.data:200
+#: ../../english/doc/books.data:203
 msgid ""
 "Written by two penetration researcher - Annihilator, Firstblood.\n"
 "  This book teaches you how to build and configure Debian 8.x server system\n"
@@ -267,6 +150,90 @@ msgid ""
 "  intrusion detection system."
 msgstr ""
 
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "著者名:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Debian パッケージ"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "電子メール:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "入手先:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "収録される CD:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "出版社:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "著者名:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "編集者名:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "メンテナ:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "状態:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "入手:"
+
+#: ../../english/doc/manuals.defs:85
+msgid "Latest version:"
+msgstr "最新バージョン:"
+
+#: ../../english/doc/manuals.defs:101
+msgid "(version <get-var version />)"
+msgstr "(バージョン <get-var version />)"
+
+#: ../../english/doc/manuals.defs:131 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "プレーンテキスト"
+
+#: ../../english/doc/manuals.defs:147 ../../english/doc/manuals.defs:157
+#: ../../english/doc/manuals.defs:165
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/git"
+"\">Git</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../english/doc/manuals.defs:149 ../../english/doc/manuals.defs:159
+#: ../../english/doc/manuals.defs:167
+msgid "Web interface: "
+msgstr "ウェブインターフェイス: "
+
+#: ../../english/doc/manuals.defs:150 ../../english/doc/manuals.defs:160
+#: ../../english/doc/manuals.defs:168
+msgid "VCS interface: "
+msgstr "VCS インターフェイス: "
+
+#: ../../english/doc/manuals.defs:175 ../../english/doc/manuals.defs:179
+msgid "Debian package"
+msgstr "Debian パッケージ"
+
+#: ../../english/doc/manuals.defs:184 ../../english/doc/manuals.defs:188
+msgid "Debian package (archived)"
+msgstr "Debian パッケージ (アーカイブ)"
+
 #: ../../english/releases/arches.data:36
 msgid "HTML"
 msgstr "HTML"
@@ -275,200 +242,119 @@ msgstr "HTML"
 msgid "PDF"
 msgstr "PDF"
 
-#~ msgid "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 ARM アーキテクチャ版"
-
-#~ msgid ""
-#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
-#~ "  It covers some devices specifically for quick set-up (LART, Assabet, "
-#~ "Psion5).\n"
-#~ "  It also gives generic information, tools and techniques. The GNU\n"
-#~ "  toolchain is covered in native and cross-compiler form, as are "
-#~ "bootloaders,\n"
-#~ "  kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-#~ "also\n"
-#~ "  includes extensive tutorial information on GNU/Linux basics for "
-#~ "developers\n"
-#~ "  coming from other platforms.\n"
-#~ "  It is not specific to Debian, but the Aleph\n"
-#~ "  ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-#~ "you\n"
-#~ "  will be working from this distribution and preferably have a Debian "
-#~ "based\n"
-#~ "  host machine too."
-#~ msgstr ""
-#~ "  本書は ARM プロセッサ用 GNU/Linux の開発者のための本です。\n"
-#~ "  いくつかのデバイス (LART, Assabet, Psion5) を、\n"
-#~ "  すばやく設定する方法が記述されています。\n"
-#~ "  さらに、一般的な情報、ツール、テクニックも扱います。\n"
-#~ "  GNU toolchain をネイティブ/クロスコンパイラとして使う方法を、\n"
-#~ "  ブートローダ、カーネルパッチ、RAM ディスク、ARM の癖、ARM のリソース\n"
-#~ "  などにわたってカバーします。\n"
-#~ "  また、他のプラットフォームから移ってきた開発者のために、\n"
-#~ "  GNU/Linux の基本に関する膨大なチュートリアル情報も含まれています。\n"
-#~ "  Debian ではありませんが、Aleph ARMLinux ディストリビューションは\n"
-#~ "  ほぼ Debian-ARM をベースにしています。\n"
-#~ "  また読者はこのディストリビューションから初めて、\n"
-#~ "  Debian ベースのホストマシンを構築できるようになっています。"
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "インストーラと選り抜きのパッケージを収録した Sarge CD"
 
-#~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-#~ msgstr ""
-#~ "最新の <get-var srctype /> ソースは <a href=\"https://www.debian.org/doc/"
-#~ "cvs\">Subversion</a> リポジトリ経由で利用できるようになっています。"
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Knoppix 収録のライブ CD"
 
 #~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ "  comprehensive source of information on using Debian for desktops,\n"
+#~ "  intranet and internet servers, and development.  It also contains\n"
+#~ "  background information on the project and extensive coverage of\n"
+#~ "  Debian's unique package management system."
 #~ msgstr ""
-#~ "これはフリーソフトウェアだけを使った基礎的、あるいは複雑な IT 基盤の作り方"
-#~ "について学ぶのに適した本です。検討された幅広い手順が示され、技術的基盤の実"
-#~ "装について最善の実践となるよう調整されています。この読みやすく総合的なガイ"
-#~ "ドはDebian GNU/Linux オペレーティングシステムを使って特定の目的を実現する"
-#~ "ための手ほどきとなるでしょう。"
+#~ "  初心者や上級ユーザにとって、この本は Debian をデスクトップ、\n"
+#~ "  イントラネット・インターネットのサーバ、\n"
+#~ "  開発用途に利用する際の総合的な情報源となっています。\n"
+#~ "  Debian プロジェクトの背景に関する情報や、広範囲に及ぶ Debian\n"
+#~ "  独自のパッケージ管理システムにも触れています。"
 
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ "  GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ "  explains in depth the features of the operating system. The first\n"
-#~ "  chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ "  the reader to understand how the system uses basic resources such as\n"
-#~ "  the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ "  Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ "  for their needs. Many figures throughout the book show aspects about\n"
-#~ "  the performance of the system. This book caters for college students\n"
-#~ "  and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ "  Debian Sarge."
-#~ msgstr ""
-#~ "この本は 4 章に分かれています。基本概念、GNU/Linux の運用、\n"
-#~ "  システム管理と高度な操作です。\n"
-#~ "  各章ではオペレーティングシステムの機能について徹底的に説明しています。\n"
-#~ "  最初の章では GNU/Linux の構造について説明しています。\n"
-#~ "  システムがプロセッサやメモリといった基本的なリソースをどうやって使うのか"
-#~ "を\n"
-#~ "  読者が理解する助けになります。\n"
-#~ "  Ext2, Ext3, あるいは ReiserFS といったファイルシステムの詳細な分析によ"
-#~ "り、\n"
-#~ "  ユーザがその必要性に応じて正しい選択をすることが可能になるでしょう。\n"
-#~ "  多くの図表が本全体を通してシステムの性能について全体像を示します。\n"
-#~ "  GNU/Linux を詳細に学習する学生その他の人を対象としています。\n"
-#~ "  この本は Debian Sarge を対象としています。"
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "公式 Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386) 版"
 
 #~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ "  to install Debian GNU/Linux and set up network services like web,\n"
-#~ "  database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ "  using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ "  operating system, explaining their usage and pitfalls, and\n"
+#~ "  illustrating the thinking behind each of the approaches. The goal is\n"
+#~ "  not to be a reference book, but to give the reader enough insight\n"
+#~ "  into the workings of the project and operating system to learn and\n"
+#~ "  embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ "  non-intuitive solutions that have evolved as part of the Debian\n"
+#~ "  system over the past decade. While targeted at the well-versed\n"
+#~ "  UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ "  resource alongside a standard Linux reference to bootstrap one's\n"
+#~ "  Linux experience in Debian's bottom-up philosophy."
 #~ msgstr ""
-#~ "ペルシャ語初の Debian GNU/Linux 本です。この書籍は、Debian GNU/Linux\n"
-#~ "  のインストールや、ウェブ・データベース・ファイアウォール・メール・ftp\n"
-#~ "  などのネットワークサービスの設定を手助けします。また、GNU/Linux\n"
-#~ "  や Debian の強力なパッケージ管理システムを使い始めるのを支援します。"
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ " この本は、Debian オペレーティングシステムの概念と技術を、\n"
+#~ "  利用方法や陥りがちな場面を挙げながら紹介し、\n"
+#~ "  各アプローチの背景にある考え方を説明しています。リファレンス本に留まら"
+#~ "ず、\n"
+#~ "  プロジェクトやオペレーティングシステムの洗練されたエレガントな仕組み"
+#~ "や、\n"
+#~ "  またときには過去 10 年間にわたって Debian システムの一部として展開されて"
+#~ "きた、\n"
+#~ "  一見直感的ではないソリューションに関する識見を読者に与えることを目的とし"
+#~ "ています。\n"
+#~ "  UNIX/Linux に詳しい管理者を対象としてはいますが、この本は標準的な "
+#~ "Linux\n"
+#~ "  のリファレンスとしても優れた情報源として Debian\n"
+#~ "  のボトムアップな考え方を通じて、自力で Linux を経験するために役立ちま"
+#~ "す。"
 
 #~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ "  hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ "  comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ "  package installation, setting up X, connecting to Internet, network\n"
-#~ "  maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ "  Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ "  in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ "  working with text, images, and sound to productivity and networking\n"
+#~ "  issues. Like the software the book describes, the book is copylefted\n"
+#~ "  and its source data is available."
 #~ msgstr ""
-#~ "本書は読者に Debian GNU/Linux を紹介し、\n"
-#~ "  実践的なチュートリアルやヒントを満載しています。\n"
-#~ "  韓国語で書かれており、Debian GNU/Linux システム\n"
-#~ "  のあらゆる部分を扱っています。\n"
-#~ "  初めてのセットアップ、パッケージのインストール、\n"
-#~ "  X のセットアップ、インターネット接続、ネットワーク保守、などです。\n"
-#~ "  さらに本書では、\n"
-#~ "  韓国語環境を Debian にセットアップするためのヒントも少々提供していま"
-#~ "す。\n"
-#~ "  初心者にも適しています。"
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "公式 potato r3 CD と非公式 woody CD"
+#~ "Debian GNU/Linux システムの手頃なリファレンスガイドで、\n"
+#~ "  1,500以上の「レシピ」を紹介し、\n"
+#~ "  日々の生活で Debian をどの様に使うかを紹介します。\n"
+#~ "  テキストでの作業、画像やサウンドの作成、\n"
+#~ "  ネットワークに関する問題などです。\n"
+#~ "  この本の対象になっているソフトウェアと同じく、\n"
+#~ "  この本もコピーレフトになっていて、\n"
+#~ "  データソースが入手できます。"
 
 #~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ "  GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ "  maintenance of system and networking,\n"
-#~ "  X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ "  This book also includes a guide for maintainers, which stimulates\n"
-#~ "  people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ "  installation and configuration of Debian GNU/Linux.\n"
+#~ "  Windows users will gain a gentle introduction to this exciting\n"
+#~ "  computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
 #~ msgstr ""
-#~ "この本は、Debian GNU/Linux のインストールの簡潔なガイド、\n"
-#~ "  Unix や Linux コマンドの基礎、Debian GNU/Linux のシステムや\n"
-#~ "  ネットワークに関する基本的な設定やメンテナンス、\n"
-#~ "  X Window System のセットアップ、マルチメディアの使用について\n"
-#~ "  韓国語で述べています。\n"
-#~ "  また、メンテナのためのガイドも扱い、\n"
-#~ "  韓国にいる人々に公式な Debian メンテナになるように刺激を与えています。"
+#~ "  Learning Debian GNU/Linux は、\n"
+#~ "  Debian GNU/Linux のインストールと設定を通して、\n"
+#~ "  Linux を初めて使うユーザをガイドします。\n"
+#~ "  Windows ユーザは、\n"
+#~ "  Bill McCarty のこの Learning Debian GNU/Linux によって、\n"
+#~ "  エキサイティングなコンピューティングワールドへの\n"
+#~ "  親切な手引きを得ることができるでしょう。"
 
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "非公式な Woody 1 枚と Potato rev0 が 3 枚"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
 
 #~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ "  installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ "  administration, kernel setup, sharing with Windows, building servers\n"
-#~ "  and so on.\n"
-#~ "  You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ "  environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ "  include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ "  publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ "  support included."
 #~ msgstr ""
-#~ "この本は、Debian GNU/Linux に関する一般的な話題を扱っています。\n"
-#~ "  インストール、APT と DPKG、シェル、X Window System、ネットワーク、\n"
-#~ "  システム管理、カーネル設定、Windows との共有、サーバ構築、などです。\n"
-#~ "  カスタム CD を用いることで、Debian GNU/Linux の日本語環境を非常に\n"
-#~ "  簡単にインストール・使用することができます。"
+#~ "230 ページ以上の本と 3 枚の CD-ROM が含まれています。\n"
+#~ "  Debian Linux、ネットワーキング、プログラミングツール、GUI、\n"
+#~ "  デスクトップパブリシング、ビジネス、おもしろい物、マルチメディア\n"
+#~ "  などを扱っています。30 日間のフリーな電子メールサポートが含まれていま"
+#~ "す。"
 
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian GNU/Linux 2.2r0 i386, 著者エディション (CD 3 枚組)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "Debian Squeeze i386/amd64 DVD 版"
 
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ "  supported as a standard bible of Debian in Japan.\n"
-#~ "  This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ "  as installation, desktop environments, system administration, and\n"
-#~ "  server configuration. Furthermore, this book also includes commercial\n"
-#~ "  font package that decorates your desktop. This book might be useful\n"
-#~ "  for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "本書は、Debian のスタンダードバイブルとして支持を受けているシリーズの、\n"
-#~ "  Sarge 対応最新刊です。本書では、Debian GNU/Linux 3.1 Sarge\n"
-#~ "  を使う上でのすべての面——インストール、デスクトップ環境、システム管理、\n"
-#~ "  サーバ設定など——をカバーしています。さらに、\n"
-#~ "  本書はデスクトップを飾る商用フォントパッケージも収録しています。\n"
-#~ "  初心者から熟練ユーザまですべての Debian ユーザにとって便利な本でしょう。"
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 種類あります: DVD 付属無しと DVD 2 枚 (i386 収録) 付き"
 
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ "     CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, 著者エディション (DVD + CD)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze 6.0.1a, Multi-Arch (i386 および amd64) DVD"
 
 #~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ "  and intermediate skill users; installation via various ways,\n"
-#~ "  desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
 #~ msgstr ""
-#~ "本書は、辞書形式で、初級者から中級者までを対象に、\n"
-#~ "  いろいろなインストール方法、デスクトップのカスタマイズ、\n"
-#~ "  トラブルシューティング、ためになるノウハウ等の、さまざまな Tips を紹介し"
-#~ "ています。"
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge インストーラ (シングルサイズ CD)"
+#~ "2 種類あります: CD 付属無しと公式 CD (i386, contrib およびソース収録) 付き"
 
 #~ msgid ""
 #~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -504,116 +390,224 @@ msgstr "PDF"
 #~ "  Windows ベースのクライアント用サーバ (SAMBA)\n"
 #~ "  の設計・構築のような、ネットワーク構築とシステム管理の話題です。"
 
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge インストーラ (シングルサイズ CD)"
+
 #~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ "  and intermediate skill users; installation via various ways,\n"
+#~ "  desktop customize, troubleshooting, profitable knowhow and so on."
 #~ msgstr ""
-#~ "2 種類あります: CD 付属無しと公式 CD (i386, contrib およびソース収録) 付き"
+#~ "本書は、辞書形式で、初級者から中級者までを対象に、\n"
+#~ "  いろいろなインストール方法、デスクトップのカスタマイズ、\n"
+#~ "  トラブルシューティング、ためになるノウハウ等の、さまざまな Tips を紹介し"
+#~ "ています。"
 
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze 6.0.1a, Multi-Arch (i386 および amd64) DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ "     CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, 著者エディション (DVD + CD)"
 
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 種類あります: DVD 付属無しと DVD 2 枚 (i386 収録) 付き"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ "  supported as a standard bible of Debian in Japan.\n"
+#~ "  This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ "  as installation, desktop environments, system administration, and\n"
+#~ "  server configuration. Furthermore, this book also includes commercial\n"
+#~ "  font package that decorates your desktop. This book might be useful\n"
+#~ "  for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "本書は、Debian のスタンダードバイブルとして支持を受けているシリーズの、\n"
+#~ "  Sarge 対応最新刊です。本書では、Debian GNU/Linux 3.1 Sarge\n"
+#~ "  を使う上でのすべての面——インストール、デスクトップ環境、システム管理、\n"
+#~ "  サーバ設定など——をカバーしています。さらに、\n"
+#~ "  本書はデスクトップを飾る商用フォントパッケージも収録しています。\n"
+#~ "  初心者から熟練ユーザまですべての Debian ユーザにとって便利な本でしょう。"
 
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "Debian Squeeze i386/amd64 DVD 版"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian GNU/Linux 2.2r0 i386, 著者エディション (CD 3 枚組)"
 
 #~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ "  include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ "  publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ "  support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ "  installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ "  administration, kernel setup, sharing with Windows, building servers\n"
+#~ "  and so on.\n"
+#~ "  You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ "  environment very easily with the customized CDs."
 #~ msgstr ""
-#~ "230 ページ以上の本と 3 枚の CD-ROM が含まれています。\n"
-#~ "  Debian Linux、ネットワーキング、プログラミングツール、GUI、\n"
-#~ "  デスクトップパブリシング、ビジネス、おもしろい物、マルチメディア\n"
-#~ "  などを扱っています。30 日間のフリーな電子メールサポートが含まれていま"
-#~ "す。"
+#~ "この本は、Debian GNU/Linux に関する一般的な話題を扱っています。\n"
+#~ "  インストール、APT と DPKG、シェル、X Window System、ネットワーク、\n"
+#~ "  システム管理、カーネル設定、Windows との共有、サーバ構築、などです。\n"
+#~ "  カスタム CD を用いることで、Debian GNU/Linux の日本語環境を非常に\n"
+#~ "  簡単にインストール・使用することができます。"
 
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "非公式な Woody 1 枚と Potato rev0 が 3 枚"
 
 #~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ "  installation and configuration of Debian GNU/Linux.\n"
-#~ "  Windows users will gain a gentle introduction to this exciting\n"
-#~ "  computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ "  GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ "  maintenance of system and networking,\n"
+#~ "  X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ "  This book also includes a guide for maintainers, which stimulates\n"
+#~ "  people in Korea to become official Debian maintainers."
 #~ msgstr ""
-#~ "  Learning Debian GNU/Linux は、\n"
-#~ "  Debian GNU/Linux のインストールと設定を通して、\n"
-#~ "  Linux を初めて使うユーザをガイドします。\n"
-#~ "  Windows ユーザは、\n"
-#~ "  Bill McCarty のこの Learning Debian GNU/Linux によって、\n"
-#~ "  エキサイティングなコンピューティングワールドへの\n"
-#~ "  親切な手引きを得ることができるでしょう。"
+#~ "この本は、Debian GNU/Linux のインストールの簡潔なガイド、\n"
+#~ "  Unix や Linux コマンドの基礎、Debian GNU/Linux のシステムや\n"
+#~ "  ネットワークに関する基本的な設定やメンテナンス、\n"
+#~ "  X Window System のセットアップ、マルチメディアの使用について\n"
+#~ "  韓国語で述べています。\n"
+#~ "  また、メンテナのためのガイドも扱い、\n"
+#~ "  韓国にいる人々に公式な Debian メンテナになるように刺激を与えています。"
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "公式 potato r3 CD と非公式 woody CD"
 
 #~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ "  in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ "  working with text, images, and sound to productivity and networking\n"
-#~ "  issues. Like the software the book describes, the book is copylefted\n"
-#~ "  and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ "  hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ "  comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ "  package installation, setting up X, connecting to Internet, network\n"
+#~ "  maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ "  Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
 #~ msgstr ""
-#~ "Debian GNU/Linux システムの手頃なリファレンスガイドで、\n"
-#~ "  1,500以上の「レシピ」を紹介し、\n"
-#~ "  日々の生活で Debian をどの様に使うかを紹介します。\n"
-#~ "  テキストでの作業、画像やサウンドの作成、\n"
-#~ "  ネットワークに関する問題などです。\n"
-#~ "  この本の対象になっているソフトウェアと同じく、\n"
-#~ "  この本もコピーレフトになっていて、\n"
-#~ "  データソースが入手できます。"
+#~ "本書は読者に Debian GNU/Linux を紹介し、\n"
+#~ "  実践的なチュートリアルやヒントを満載しています。\n"
+#~ "  韓国語で書かれており、Debian GNU/Linux システム\n"
+#~ "  のあらゆる部分を扱っています。\n"
+#~ "  初めてのセットアップ、パッケージのインストール、\n"
+#~ "  X のセットアップ、インターネット接続、ネットワーク保守、などです。\n"
+#~ "  さらに本書では、\n"
+#~ "  韓国語環境を Debian にセットアップするためのヒントも少々提供していま"
+#~ "す。\n"
+#~ "  初心者にも適しています。"
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
 
 #~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ "  operating system, explaining their usage and pitfalls, and\n"
-#~ "  illustrating the thinking behind each of the approaches. The goal is\n"
-#~ "  not to be a reference book, but to give the reader enough insight\n"
-#~ "  into the workings of the project and operating system to learn and\n"
-#~ "  embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ "  non-intuitive solutions that have evolved as part of the Debian\n"
-#~ "  system over the past decade. While targeted at the well-versed\n"
-#~ "  UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ "  resource alongside a standard Linux reference to bootstrap one's\n"
-#~ "  Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ "  to install Debian GNU/Linux and set up network services like web,\n"
+#~ "  database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ "  using GNU/Linux and Debian's powerful package management system."
 #~ msgstr ""
-#~ " この本は、Debian オペレーティングシステムの概念と技術を、\n"
-#~ "  利用方法や陥りがちな場面を挙げながら紹介し、\n"
-#~ "  各アプローチの背景にある考え方を説明しています。リファレンス本に留まら"
-#~ "ず、\n"
-#~ "  プロジェクトやオペレーティングシステムの洗練されたエレガントな仕組み"
-#~ "や、\n"
-#~ "  またときには過去 10 年間にわたって Debian システムの一部として展開されて"
-#~ "きた、\n"
-#~ "  一見直感的ではないソリューションに関する識見を読者に与えることを目的とし"
-#~ "ています。\n"
-#~ "  UNIX/Linux に詳しい管理者を対象としてはいますが、この本は標準的な "
-#~ "Linux\n"
-#~ "  のリファレンスとしても優れた情報源として Debian\n"
-#~ "  のボトムアップな考え方を通じて、自力で Linux を経験するために役立ちま"
-#~ "す。"
+#~ "ペルシャ語初の Debian GNU/Linux 本です。この書籍は、Debian GNU/Linux\n"
+#~ "  のインストールや、ウェブ・データベース・ファイアウォール・メール・ftp\n"
+#~ "  などのネットワークサービスの設定を手助けします。また、GNU/Linux\n"
+#~ "  や Debian の強力なパッケージ管理システムを使い始めるのを支援します。"
 
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "公式 Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386) 版"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ "  GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ "  explains in depth the features of the operating system. The first\n"
+#~ "  chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ "  the reader to understand how the system uses basic resources such as\n"
+#~ "  the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ "  Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ "  for their needs. Many figures throughout the book show aspects about\n"
+#~ "  the performance of the system. This book caters for college students\n"
+#~ "  and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ "  Debian Sarge."
+#~ msgstr ""
+#~ "この本は 4 章に分かれています。基本概念、GNU/Linux の運用、\n"
+#~ "  システム管理と高度な操作です。\n"
+#~ "  各章ではオペレーティングシステムの機能について徹底的に説明しています。\n"
+#~ "  最初の章では GNU/Linux の構造について説明しています。\n"
+#~ "  システムがプロセッサやメモリといった基本的なリソースをどうやって使うのか"
+#~ "を\n"
+#~ "  読者が理解する助けになります。\n"
+#~ "  Ext2, Ext3, あるいは ReiserFS といったファイルシステムの詳細な分析によ"
+#~ "り、\n"
+#~ "  ユーザがその必要性に応じて正しい選択をすることが可能になるでしょう。\n"
+#~ "  多くの図表が本全体を通してシステムの性能について全体像を示します。\n"
+#~ "  GNU/Linux を詳細に学習する学生その他の人を対象としています。\n"
+#~ "  この本は Debian Sarge を対象としています。"
 
 #~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ "  comprehensive source of information on using Debian for desktops,\n"
-#~ "  intranet and internet servers, and development.  It also contains\n"
-#~ "  background information on the project and extensive coverage of\n"
-#~ "  Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
 #~ msgstr ""
-#~ "  初心者や上級ユーザにとって、この本は Debian をデスクトップ、\n"
-#~ "  イントラネット・インターネットのサーバ、\n"
-#~ "  開発用途に利用する際の総合的な情報源となっています。\n"
-#~ "  Debian プロジェクトの背景に関する情報や、広範囲に及ぶ Debian\n"
-#~ "  独自のパッケージ管理システムにも触れています。"
+#~ "これはフリーソフトウェアだけを使った基礎的、あるいは複雑な IT 基盤の作り方"
+#~ "について学ぶのに適した本です。検討された幅広い手順が示され、技術的基盤の実"
+#~ "装について最善の実践となるよう調整されています。この読みやすく総合的なガイ"
+#~ "ドはDebian GNU/Linux オペレーティングシステムを使って特定の目的を実現する"
+#~ "ための手ほどきとなるでしょう。"
 
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Knoppix 収録のライブ CD"
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "最新の <get-var srctype /> ソースは <a href=\"https://www.debian.org/doc/"
+#~ "cvs\">Subversion</a> リポジトリ経由で利用できるようになっています。"
 
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "インストーラと選り抜きのパッケージを収録した Sarge CD"
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ "  It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ "  It also gives generic information, tools and techniques. The GNU\n"
+#~ "  toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ "  kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ "  includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ "  coming from other platforms.\n"
+#~ "  It is not specific to Debian, but the Aleph\n"
+#~ "  ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ "  will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ "  host machine too."
+#~ msgstr ""
+#~ "  本書は ARM プロセッサ用 GNU/Linux の開発者のための本です。\n"
+#~ "  いくつかのデバイス (LART, Assabet, Psion5) を、\n"
+#~ "  すばやく設定する方法が記述されています。\n"
+#~ "  さらに、一般的な情報、ツール、テクニックも扱います。\n"
+#~ "  GNU toolchain をネイティブ/クロスコンパイラとして使う方法を、\n"
+#~ "  ブートローダ、カーネルパッチ、RAM ディスク、ARM の癖、ARM のリソース\n"
+#~ "  などにわたってカバーします。\n"
+#~ "  また、他のプラットフォームから移ってきた開発者のために、\n"
+#~ "  GNU/Linux の基本に関する膨大なチュートリアル情報も含まれています。\n"
+#~ "  Debian ではありませんが、Aleph ARMLinux ディストリビューションは\n"
+#~ "  ほぼ Debian-ARM をベースにしています。\n"
+#~ "  また読者はこのディストリビューションから初めて、\n"
+#~ "  Debian ベースのホストマシンを構築できるようになっています。"
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 ARM アーキテクチャ版"
+
+#~ msgid "CVS via web"
+#~ msgstr "ウェブ経由で CVS を見る"
+
+#~ msgid ""
+#~ "CVS sources working copy: set <code>CVSROOT</code>\n"
+#~ "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+#~ "  and check out the <kbd>boot-floppies/documentation</kbd> module."
+#~ msgstr ""
+#~ "作業中の CVS ソースを得るには: <code>CVSROOT</code> 変数を\n"
+#~ "<kbd>:ext:<var>ユーザID</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
+#~ "に設定し、<kbd>boot-floppies/documentation</kbd> モジュールを checkout し"
+#~ "てください。"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://packages.debian.org/subversion\">Subversion</a> repository."
+#~ msgstr ""
+#~ "最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
+#~ "subversion\">Subversion</a> リポジトリ経由で利用できるようになっています。"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://packages.debian.org/cvs\">Cvs</a> repository."
+#~ msgstr ""
+#~ "最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
+#~ "cvs\">Cvs</a> リポジトリ経由で利用できるようになっています。"
diff --git a/japanese/po/mailinglists.ja.po b/japanese/po/mailinglists.ja.po
index 26e04f7923d..cbba9dad9e1 100644
--- a/japanese/po/mailinglists.ja.po
+++ b/japanese/po/mailinglists.ja.po
@@ -126,8 +126,8 @@ msgstr "誰でも可能"
 msgid "closed"
 msgstr "クローズド"
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "脱退したいメーリングリストを選んでください:"
-
 #~ msgid "Please select which lists you want to subscribe to:"
 #~ msgstr "購読したいメーリングリストを選んでください:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "脱退したいメーリングリストを選んでください:"
diff --git a/japanese/po/newsevents.ja.po b/japanese/po/newsevents.ja.po
index 01f931550fe..01546afaa6a 100644
--- a/japanese/po/newsevents.ja.po
+++ b/japanese/po/newsevents.ja.po
@@ -10,6 +10,66 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debian ニュース"
+
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Debian 最新ニュース"
+
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "<get-var page /> ページ"
+
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Debian コミュニティのニューズレター"
+
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "題名"
+
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "著者:"
+
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "言語:"
+
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "日付:"
+
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "イベント:"
+
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "スライド:"
+
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "ソース"
+
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
+
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
+
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
+
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "要約"
+
 #: ../../english/template/debian/events_common.wml:8
 msgid "Upcoming Attractions"
 msgstr "近日開催されるイベント"
@@ -68,128 +128,6 @@ msgstr ""
 msgid "<get-var url /> (dead link)"
 msgstr "<get-var url /> (リンク切れ)"
 
-#: ../../english/template/debian/projectnews/footer.wml:6
-msgid ""
-"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
-msgstr ""
-"このニューズレターを電子メールで受け取りたい方は、debian-newsメーリングリスト"
-"を<a href=\"https://lists.debian.org/debian-news/\">購読</a>してください。"
-
-#: ../../english/template/debian/projectnews/footer.wml:10
-#: ../../english/template/debian/weeklynews/footer.wml:10
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr "<a href=\"../../\">バックナンバー</a>もご利用いただけます。"
-
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Debian プロジェクトニュースは <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a> が編集しています。"
-
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-msgid ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Debian プロジェクトニュースは <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a> が編集しています。"
-
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-msgid ""
-"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />今週号の Debian プロジェクトニュースは <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> が編集しました。"
-
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-msgid ""
-"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />今週号の Debian プロジェクトニュースは <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> が編集しました。"
-
-#. One translator only
-#. One translator only
-#: ../../english/template/debian/projectnews/footer.wml:35
-#: ../../english/template/debian/weeklynews/footer.wml:35
-msgid "<void id=\"singular\" />It was translated by %s."
-msgstr "<void id=\"singular\" />%s が翻訳しました。"
-
-#. Two ore more translators
-#. Two ore more translators
-#: ../../english/template/debian/projectnews/footer.wml:40
-#: ../../english/template/debian/weeklynews/footer.wml:40
-msgid "<void id=\"plural\" />It was translated by %s."
-msgstr "<void id=\"singular\" />%s が翻訳しました。"
-
-#. One female translator only
-#. One female translator only
-#: ../../english/template/debian/projectnews/footer.wml:45
-#: ../../english/template/debian/weeklynews/footer.wml:45
-msgid "<void id=\"singularfemale\" />It was translated by %s."
-msgstr "<void id=\"singular\" />%s が翻訳しました。"
-
-#. Two ore more female translators
-#. Two ore more female translators
-#: ../../english/template/debian/projectnews/footer.wml:50
-#: ../../english/template/debian/weeklynews/footer.wml:50
-msgid "<void id=\"pluralfemale\" />It was translated by %s."
-msgstr "<void id=\"singular\" />%s が翻訳しました。"
-
-#: ../../english/template/debian/weeklynews/footer.wml:6
-msgid ""
-"To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
-"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-msgstr ""
-"このニューズレターを毎週電子メールで受け取りたい方は、debian-newsメーリングリ"
-"ストを<a href=\"https://lists.debian.org/debian-news/\">購読</a>してくださ"
-"い。"
-
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:15
-msgid ""
-"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Debian ウィークリーニュースは <a href=\"mailto:"
-"dwn@debian.org\">%s</a> が編集しています。"
-
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:20
-msgid ""
-"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Debian ウィークリーニュースは <a href=\"mailto:"
-"dwn@debian.org\">%s</a> が編集しています。"
-
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:25
-msgid ""
-"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />今週号の Debian ウィークリーニュースは <a href="
-"\"mailto:dwn@debian.org\">%s</a> が編集しました。"
-
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:30
-msgid ""
-"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />今週号の Debian ウィークリーニュースは <a href="
-"\"mailto:dwn@debian.org\">%s</a> が編集しました。"
-
 #: ../../english/template/debian/projectnews/boilerplates.wml:35
 msgid ""
 "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -438,86 +376,148 @@ msgstr ""
 "<a href=\"<get-var url-devel-news />\">開発ニュース寄せ集め</a>の第 <get-var "
 "issue-devel-news /> 号が発行され、以下の話題が取り上げられました。"
 
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "<get-var page /> ページ"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "題名"
+#: ../../english/template/debian/projectnews/footer.wml:6
+msgid ""
+"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+"このニューズレターを電子メールで受け取りたい方は、debian-newsメーリングリスト"
+"を<a href=\"https://lists.debian.org/debian-news/\">購読</a>してください。"
 
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "著者:"
+#: ../../english/template/debian/projectnews/footer.wml:10
+#: ../../english/template/debian/weeklynews/footer.wml:10
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "<a href=\"../../\">バックナンバー</a>もご利用いただけます。"
 
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "言語:"
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Debian プロジェクトニュースは <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a> が編集しています。"
 
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "日付:"
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Debian プロジェクトニュースは <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">%s</a> が編集しています。"
 
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "イベント:"
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />今週号の Debian プロジェクトニュースは <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a> が編集しました。"
 
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "スライド:"
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />今週号の Debian プロジェクトニュースは <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a> が編集しました。"
 
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "ソース"
+#. One translator only
+#. One translator only
+#: ../../english/template/debian/projectnews/footer.wml:35
+#: ../../english/template/debian/weeklynews/footer.wml:35
+msgid "<void id=\"singular\" />It was translated by %s."
+msgstr "<void id=\"singular\" />%s が翻訳しました。"
 
-#: ../../english/events/talks.defs:32
-msgid "PDF"
-msgstr "PDF"
+#. Two ore more translators
+#. Two ore more translators
+#: ../../english/template/debian/projectnews/footer.wml:40
+#: ../../english/template/debian/weeklynews/footer.wml:40
+msgid "<void id=\"plural\" />It was translated by %s."
+msgstr "<void id=\"singular\" />%s が翻訳しました。"
 
-#: ../../english/events/talks.defs:35
-msgid "HTML"
-msgstr "HTML"
+#. One female translator only
+#. One female translator only
+#: ../../english/template/debian/projectnews/footer.wml:45
+#: ../../english/template/debian/weeklynews/footer.wml:45
+msgid "<void id=\"singularfemale\" />It was translated by %s."
+msgstr "<void id=\"singular\" />%s が翻訳しました。"
 
-#: ../../english/events/talks.defs:38
-msgid "MagicPoint"
-msgstr "MagicPoint"
+#. Two ore more female translators
+#. Two ore more female translators
+#: ../../english/template/debian/projectnews/footer.wml:50
+#: ../../english/template/debian/weeklynews/footer.wml:50
+msgid "<void id=\"pluralfemale\" />It was translated by %s."
+msgstr "<void id=\"singular\" />%s が翻訳しました。"
 
-#: ../../english/events/talks.defs:41
-msgid "Abstract"
-msgstr "要約"
+#: ../../english/template/debian/weeklynews/footer.wml:6
+msgid ""
+"To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
+"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+"このニューズレターを毎週電子メールで受け取りたい方は、debian-newsメーリングリ"
+"ストを<a href=\"https://lists.debian.org/debian-news/\">購読</a>してくださ"
+"い。"
 
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debian ニュース"
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:15
+msgid ""
+"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Debian ウィークリーニュースは <a href=\"mailto:"
+"dwn@debian.org\">%s</a> が編集しています。"
 
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Debian 最新ニュース"
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:20
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Debian ウィークリーニュースは <a href=\"mailto:"
+"dwn@debian.org\">%s</a> が編集しています。"
 
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "Debian コミュニティのニューズレター"
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
+msgid ""
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />今週号の Debian ウィークリーニュースは <a href="
+"\"mailto:dwn@debian.org\">%s</a> が編集しました。"
 
-#~ msgid "Name:"
-#~ msgstr "氏名"
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:30
+msgid ""
+"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />今週号の Debian ウィークリーニュースは <a href="
+"\"mailto:dwn@debian.org\">%s</a> が編集しました。"
 
-#~ msgid "Email:"
-#~ msgstr "電子メール"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">Debian 講演者ページ</a>に戻る。"
 
-#~ msgid "Previous Talks:"
-#~ msgstr "以前の講演:"
+#~ msgid "List of Speakers"
+#~ msgstr "講演者一覧"
 
-#~ msgid "Languages:"
-#~ msgstr "言語:"
+#~ msgid "Topics:"
+#~ msgstr "話題:"
 
 #~ msgid "Location:"
 #~ msgstr "場所:"
 
-#~ msgid "Topics:"
-#~ msgstr "話題:"
+#~ msgid "Languages:"
+#~ msgstr "言語:"
 
-#~ msgid "List of Speakers"
-#~ msgstr "講演者一覧"
+#~ msgid "Previous Talks:"
+#~ msgstr "以前の講演:"
 
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "<a href=\"./\">Debian 講演者ページ</a>に戻る。"
+#~ msgid "Email:"
+#~ msgstr "電子メール"
+
+#~ msgid "Name:"
+#~ msgstr "氏名"
diff --git a/japanese/po/organization.ja.po b/japanese/po/organization.ja.po
index ede5c77fb65..3bff51ff7c1 100644
--- a/japanese/po/organization.ja.po
+++ b/japanese/po/organization.ja.po
@@ -19,320 +19,365 @@ msgid "appointment mail"
 msgstr "指名のメール"
 
 #. One male delegate
+#. Pronoun tags with delegate combinations
 #: ../../english/intro/organization.data:18
+#: ../../english/intro/organization.data:22
 msgid "<void id=\"male\"/>delegate"
 msgstr "委任"
 
 #. One female delegate
 #: ../../english/intro/organization.data:20
+#: ../../english/intro/organization.data:23
 msgid "<void id=\"female\"/>delegate"
 msgstr "委任"
 
-#: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:22
 #: ../../english/intro/organization.data:25
+#, fuzzy
+#| msgid "<void id=\"female\"/>delegate"
+msgid "<void id=\"he_him\"/>he/him"
+msgstr "委任"
+
+#: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:26
+#, fuzzy
+#| msgid "<void id=\"female\"/>delegate"
+msgid "<void id=\"she_her\"/>she/her"
+msgstr "委任"
+
+#: ../../english/intro/organization.data:24
+#, fuzzy
+#| msgid "<void id=\"female\"/>delegate"
+msgid "<void id=\"gender_neutral\"/>delegate"
+msgstr "委任"
+
+#: ../../english/intro/organization.data:24
+#: ../../english/intro/organization.data:27
+#, fuzzy
+#| msgid "<void id=\"female\"/>delegate"
+msgid "<void id=\"they_them\"/>they/them"
+msgstr "委任"
+
+#: ../../english/intro/organization.data:30
+#: ../../english/intro/organization.data:32
 msgid "current"
 msgstr "現職"
 
-#: ../../english/intro/organization.data:27
-#: ../../english/intro/organization.data:29
+#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:36
 msgid "member"
 msgstr "構成員"
 
-#: ../../english/intro/organization.data:32
+#: ../../english/intro/organization.data:39
 msgid "manager"
 msgstr "マネージャー"
 
-#: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
-msgstr "安定版リリース管理者"
-
-#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:41
 msgid "SRM"
 msgstr "SRM"
 
-#: ../../english/intro/organization.data:36
+#: ../../english/intro/organization.data:41
+msgid "Stable Release Manager"
+msgstr "安定版リリース管理者"
+
+#: ../../english/intro/organization.data:43
 msgid "wizard"
 msgstr "ウィザード"
 
 #. we only use the chair tag once, for techctte, I wonder why it's here.
-#: ../../english/intro/organization.data:38
+#: ../../english/intro/organization.data:45
 #, fuzzy
 msgid "chair"
 msgstr "委員長"
 
-#: ../../english/intro/organization.data:41
+#: ../../english/intro/organization.data:48
 msgid "assistant"
 msgstr "補佐"
 
-#: ../../english/intro/organization.data:43
+#: ../../english/intro/organization.data:50
 msgid "secretary"
 msgstr "書記"
 
-#: ../../english/intro/organization.data:45
+#: ../../english/intro/organization.data:52
 msgid "representative"
 msgstr ""
 
-#: ../../english/intro/organization.data:47
+#: ../../english/intro/organization.data:54
 msgid "role"
 msgstr ""
 
-#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:62
+msgid ""
+"In the following list, <q>current</q> is used for positions that are\n"
+"transitional (elected or appointed with a certain expiration date)."
+msgstr ""
+
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:82
 msgid "Officers"
 msgstr "執行部"
 
-#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:108
 msgid "Distribution"
 msgstr "ディストリビューション"
 
-#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:239
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:238
+#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:242
 msgid "Data Protection team"
 msgstr ""
 
-#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:246
 msgid "Publicity team"
 msgstr "広報チーム"
 
-#: ../../english/intro/organization.data:70
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:319
 msgid "Membership in other organizations"
 msgstr ""
 
-#: ../../english/intro/organization.data:71
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:78
+#: ../../english/intro/organization.data:347
 msgid "Support and Infrastructure"
 msgstr "サポートと設備"
 
-#: ../../english/intro/organization.data:78
+#: ../../english/intro/organization.data:85
 msgid "Leader"
 msgstr "リーダー"
 
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
 msgid "Technical Committee"
 msgstr "技術委員会"
 
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
 msgid "Secretary"
 msgstr "書記"
 
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
 msgid "Development Projects"
 msgstr "開発プロジェクト"
 
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:112
 msgid "FTP Archives"
 msgstr "FTP アーカイブ"
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:114
 msgid "FTP Masters"
 msgstr "FTP マスター"
 
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
 msgid "FTP Assistants"
 msgstr "FTP アシスタント"
 
-#: ../../english/intro/organization.data:116
+#: ../../english/intro/organization.data:126
 msgid "FTP Wizards"
 msgstr "FTP ウィザード"
 
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:130
 msgid "Backports"
 msgstr "Backports"
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:132
 msgid "Backports Team"
 msgstr "Backports チーム"
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:136
 msgid "Release Management"
 msgstr "リリース管理"
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:138
 msgid "Release Team"
 msgstr "リリースチーム"
 
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:147
 msgid "Quality Assurance"
 msgstr "品質保証"
 
-#: ../../english/intro/organization.data:142
+#: ../../english/intro/organization.data:148
 msgid "Installation System Team"
 msgstr "インストールシステムチーム"
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:149
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:150
 msgid "Release Notes"
 msgstr "リリースノート"
 
-#: ../../english/intro/organization.data:146
-msgid "CD Images"
+#: ../../english/intro/organization.data:152
+#, fuzzy
+#| msgid "CD Images"
+msgid "CD/DVD/USB Images"
 msgstr "CD イメージ"
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:154
 msgid "Production"
 msgstr "製品"
 
-#: ../../english/intro/organization.data:156
+#: ../../english/intro/organization.data:161
 msgid "Testing"
 msgstr "テスト"
 
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:163
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:162
+#: ../../english/intro/organization.data:167
 msgid "Autobuilding infrastructure"
 msgstr "オートビルドインフラ"
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:169
 msgid "Wanna-build team"
 msgstr "ビルド要求チーム"
 
-#: ../../english/intro/organization.data:171
+#: ../../english/intro/organization.data:176
 msgid "Buildd administration"
 msgstr "ビルドデーモン管理"
 
-#: ../../english/intro/organization.data:189
+#: ../../english/intro/organization.data:193
 msgid "Documentation"
 msgstr "ドキュメンテーション"
 
-#: ../../english/intro/organization.data:194
+#: ../../english/intro/organization.data:198
 msgid "Work-Needing and Prospective Packages list"
 msgstr "作業の必要なパッケージ一覧"
 
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:200
 msgid "Ports"
 msgstr "移植"
 
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:230
 msgid "Special Configurations"
 msgstr "特殊な設定"
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:232
 msgid "Laptops"
 msgstr "ラップトップ"
 
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:233
 msgid "Firewalls"
 msgstr "ファイアウォール"
 
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:234
 msgid "Embedded systems"
 msgstr "組み込みシステム"
 
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:249
 msgid "Press Contact"
 msgstr "広報窓口"
 
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:251
 msgid "Web Pages"
 msgstr "ウェブページ"
 
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:263
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:268
 msgid "Outreach"
 msgstr "教育"
 
-#: ../../english/intro/organization.data:269
+#: ../../english/intro/organization.data:273
 msgid "Debian Women Project"
 msgstr "Debian Women プロジェクト"
 
-#: ../../english/intro/organization.data:277
-msgid "Anti-harassment"
-msgstr "嫌がらせ反対"
+#: ../../english/intro/organization.data:281
+msgid "Community"
+msgstr ""
 
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:290
+msgid ""
+"To send a private message to all the members of the Community Team, use the "
+"GPG key <a href=\"community-team-pubkey.txt"
+"\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
+msgstr ""
+
+#: ../../english/intro/organization.data:292
 msgid "Events"
 msgstr "イベント"
 
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:299
 #, fuzzy
 msgid "DebConf Committee"
 msgstr "技術委員会"
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:306
 msgid "Partner Program"
 msgstr "パートナープログラム"
 
-#: ../../english/intro/organization.data:301
+#: ../../english/intro/organization.data:310
 msgid "Hardware Donations Coordination"
 msgstr "ハードウェア寄付コーディネーション"
 
-#: ../../english/intro/organization.data:317
+#: ../../english/intro/organization.data:325
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:319
+#: ../../english/intro/organization.data:327
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:329
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:323
+#: ../../english/intro/organization.data:331
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:325
+#: ../../english/intro/organization.data:333
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:334
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:337
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:332
+#: ../../english/intro/organization.data:340
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:343
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:342
+#: ../../english/intro/organization.data:350
 msgid "User support"
 msgstr "ユーザサポート"
 
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:417
 msgid "Bug Tracking System"
 msgstr "バグ追跡システム (BTS)"
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:422
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "メーリングリスト管理とメーリングリストアーカイブ"
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:431
 msgid "New Members Front Desk"
 msgstr "新規メンバー受付"
 
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:437
 msgid "Debian Account Managers"
 msgstr "Debian アカウント管理者"
 
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:441
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -340,31 +385,31 @@ msgstr ""
 "(全) DAM に私信のメールを送る際には 57731224A9762EA155AB2A530CA8D15BB24D96F2 "
 "の GPG 鍵を使ってください。"
 
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:442
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "公開鍵管理者 (PGP および GPG)"
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:446
 msgid "Security Team"
 msgstr "セキュリティチーム"
 
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:457
 msgid "Consultants Page"
 msgstr "コンサルタントページ"
 
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:462
 msgid "CD Vendors Page"
 msgstr "CD ベンダページ"
 
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:465
 msgid "Policy"
 msgstr "ポリシー"
 
-#: ../../english/intro/organization.data:459
+#: ../../english/intro/organization.data:468
 msgid "System Administration"
 msgstr "システム管理"
 
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:469
 msgid ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need a package installed."
@@ -373,7 +418,7 @@ msgstr ""
 "ストールの依頼など、Debianマシンのいずれかに何か問題のある際に用いる連絡先で"
 "す。"
 
-#: ../../english/intro/organization.data:469
+#: ../../english/intro/organization.data:479
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -383,79 +428,82 @@ msgstr ""
 "\">Debian マシン</a>のページを参照してください。そこにはマシンごとの管理情報"
 "があります。"
 
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:480
 msgid "LDAP Developer Directory Administrator"
 msgstr "LDAP 開発者ディレクトリ管理者"
 
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:481
 msgid "Mirrors"
 msgstr "ミラー"
 
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:488
 msgid "DNS Maintainer"
 msgstr "DNS 管理"
 
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:489
 msgid "Package Tracking System"
 msgstr "パッケージ追跡システム"
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:491
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:488
+#: ../../english/intro/organization.data:498
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr "<a name=\"trademark\" href=\"m4_HOME/trademark\">商標</a>利用申請"
 
-#: ../../english/intro/organization.data:491
+#: ../../english/intro/organization.data:502
 #, fuzzy
 msgid "Salsa administrators"
 msgstr "Alioth 管理者"
 
-#~ msgid "Debian Pure Blends"
-#~ msgstr "Debian Pure Blends"
+#~ msgid "Alioth administrators"
+#~ msgstr "Alioth 管理者"
 
-#~ msgid "Individual Packages"
-#~ msgstr "個々のパッケージ"
+#~ msgid "DebConf chairs"
+#~ msgstr "DebConf 役員"
 
-#~ msgid "Debian for children from 1 to 99"
-#~ msgstr "1歳から99歳までのこどものための Debian"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian メンテナ (DM) 公開鍵管理者"
 
-#~ msgid "Debian for medical practice and research"
-#~ msgstr "臨床医学と医学研究のための Debian"
+#~ msgid "Publicity"
+#~ msgstr "広報"
 
-#~ msgid "Debian for education"
+#~ msgid "Auditor"
+#~ msgstr "監事"
+
+#~ msgid "Live System Team"
+#~ msgstr "ライブシステムチーム"
+
+#, fuzzy
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
 #~ msgstr "教育のための Debian"
 
-#~ msgid "Debian in legal offices"
-#~ msgstr "法律事務所のための Debian"
+#~ msgid "Debian for science and related research"
+#~ msgstr "科学研究のための Debian"
 
 #~ msgid "Debian for people with disabilities"
 #~ msgstr "障害者のための Debian"
 
-#~ msgid "Debian for science and related research"
-#~ msgstr "科学研究のための Debian"
+#~ msgid "Debian in legal offices"
+#~ msgstr "法律事務所のための Debian"
 
-#, fuzzy
-#~| msgid "Debian for education"
-#~ msgid "Debian for astronomy"
+#~ msgid "Debian for education"
 #~ msgstr "教育のための Debian"
 
-#~ msgid "Live System Team"
-#~ msgstr "ライブシステムチーム"
-
-#~ msgid "Auditor"
-#~ msgstr "監事"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "臨床医学と医学研究のための Debian"
 
-#~ msgid "Publicity"
-#~ msgstr "広報"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "1歳から99歳までのこどものための Debian"
 
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian メンテナ (DM) 公開鍵管理者"
+#~ msgid "Individual Packages"
+#~ msgstr "個々のパッケージ"
 
-#~ msgid "DebConf chairs"
-#~ msgstr "DebConf 役員"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
 
-#~ msgid "Alioth administrators"
-#~ msgstr "Alioth 管理者"
+#~ msgid "Anti-harassment"
+#~ msgstr "嫌がらせ反対"
diff --git a/japanese/po/others.ja.po b/japanese/po/others.ja.po
index 5518f4362d5..a8f37e4812d 100644
--- a/japanese/po/others.ja.po
+++ b/japanese/po/others.ja.po
@@ -57,6 +57,42 @@ msgstr "<void id=\"d-i\" />不明"
 msgid "Unavailable"
 msgstr "利用不可"
 
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "新規メンバーのコーナー"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "手順 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "手順 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "手順 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "手順 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "手順 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "手順 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "手順 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "応募者のチェックリスト"
+
 #: ../../english/devel/website/tc.data:11
 msgid ""
 "See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -69,7 +105,7 @@ msgstr ""
 #: ../../english/devel/website/tc.data:14
 #: ../../english/devel/website/tc.data:15
 #: ../../english/devel/website/tc.data:16
-#: ../../english/events/merchandise.def:151
+#: ../../english/events/merchandise.def:145
 msgid "More information"
 msgstr "詳細な情報"
 
@@ -93,34 +129,6 @@ msgstr "FAX:"
 msgid "Address"
 msgstr "住所"
 
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "「Debian」つき"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "「Debian」なし"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "EPS"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Debian を使っています]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Debian GNU/Linux を使っています]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Debian 使用]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (小さなボタン)"
-
 #: ../../english/events/merchandise.def:13
 msgid "Products"
 msgstr "製品"
@@ -205,26 +213,89 @@ msgstr ""
 msgid "Available languages:"
 msgstr ""
 
-#: ../../english/events/merchandise.def:110
+#: ../../english/events/merchandise.def:107
 msgid "International delivery:"
 msgstr ""
 
-#: ../../english/events/merchandise.def:121
+#: ../../english/events/merchandise.def:118
 msgid "within Europe"
 msgstr ""
 
-#: ../../english/events/merchandise.def:125
+#: ../../english/events/merchandise.def:122
 msgid "Original country:"
 msgstr ""
 
-#: ../../english/events/merchandise.def:193
+#: ../../english/events/merchandise.def:187
 msgid "Donates money to Debian"
 msgstr ""
 
-#: ../../english/events/merchandise.def:198
+#: ../../english/events/merchandise.def:192
 msgid "Money is used to organize local free software events"
 msgstr ""
 
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "「Debian」つき"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "「Debian」なし"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "EPS"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Debian を使っています]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Debian GNU/Linux を使っています]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Debian 使用]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (小さなボタン)"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "同上"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Debian を使い始めてどれくらいになりますか?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Debian 開発者ですか?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Debian のどの分野に関わっていますか?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Debian での作業に興味を持ったきっかけは何ですか?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr "Debian にもっと関わることに関心のある女性に何か一言あれば"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "技術系のグループで他の女性と共同作業をしていますか? あればどこですか?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "他に何か一言あれば"
+
 #: ../../english/y2k/l10n.data:6
 msgid "OK"
 msgstr "対応"
@@ -269,88 +340,17 @@ msgstr "バージョン"
 msgid "URL"
 msgstr "URL"
 
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "新規メンバーのコーナー"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "手順 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "手順 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "手順 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "手順 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "手順 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "手順 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "手順 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "応募者のチェックリスト"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "同上"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Debian を使い始めてどれくらいになりますか?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Debian 開発者ですか?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Debian のどの分野に関わっていますか?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Debian での作業に興味を持ったきっかけは何ですか?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr "Debian にもっと関わることに関心のある女性に何か一言あれば"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "技術系のグループで他の女性と共同作業をしていますか? あればどこですか?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "他に何か一言あれば"
-
-#~ msgid "Where:"
-#~ msgstr "場所:"
+#~ msgid "Wanted:"
+#~ msgstr "必要なハードウェア:"
 
-#~ msgid "Specifications:"
-#~ msgstr "スペック:"
+#~ msgid "Who:"
+#~ msgstr "必要としている人/グループ:"
 
 #~ msgid "Architecture:"
 #~ msgstr "アーキテクチャ:"
 
-#~ msgid "Who:"
-#~ msgstr "必要としている人/グループ:"
+#~ msgid "Specifications:"
+#~ msgstr "スペック:"
 
-#~ msgid "Wanted:"
-#~ msgstr "必要なハードウェア:"
+#~ msgid "Where:"
+#~ msgstr "場所:"
diff --git a/japanese/po/partners.ja.po b/japanese/po/partners.ja.po
index 644cd23a422..e0a331a2a69 100644
--- a/japanese/po/partners.ja.po
+++ b/japanese/po/partners.ja.po
@@ -38,13 +38,31 @@ msgid ""
 "servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:42
+#: ../../english/partners/partners.def:40
+msgid ""
+"<a href=\"https://amperecomputing.com\">Ampere®</a> provides hardware for "
+"arm64/armhf/armel build daemons and other Debian services (current Ampere "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page)."
+msgstr ""
+
+#: ../../english/partners/partners.def:43
+msgid ""
+"Ampere is designing the future of hyperscale cloud and edge computing with "
+"the world’s first cloud native processor. Built for the cloud with a modern "
+"64-bit Arm server-based architecture, Ampere gives customers the freedom to "
+"accelerate the delivery of all cloud computing applications. With industry-"
+"leading cloud performance, power efficiency and scalability, Ampere "
+"processors are tailored for the continued growth of cloud and edge computing."
+msgstr ""
+
+#: ../../english/partners/partners.def:51
 msgid ""
 "<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
 "by providing hosting services and sponsorship for the Debian Conference."
 msgstr ""
 
-#: ../../english/partners/partners.def:46
+#: ../../english/partners/partners.def:55
 msgid ""
 "They are a leading Internet Service Provider (ISP) in the United Kingdom and "
 "provide scalable, powerful and affordable hosting with lots of <q>geek "
@@ -54,7 +72,7 @@ msgid ""
 "are also well known for their expert and friendly support."
 msgstr ""
 
-#: ../../english/partners/partners.def:54
+#: ../../english/partners/partners.def:63
 msgid ""
 "<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
 "supporting the Debian project as a hosting partner for several years. In "
@@ -63,7 +81,7 @@ msgid ""
 "at conova."
 msgstr ""
 
-#: ../../english/partners/partners.def:57
+#: ../../english/partners/partners.def:66
 msgid ""
 "conova operates one of the most modern data centers in all of Europe in "
 "Salzburg, Austria. Their services: customized solutions for housing, "
@@ -72,7 +90,7 @@ msgid ""
 "highest level of supply and security on their 2,000 m² of technical area."
 msgstr ""
 
-#: ../../english/partners/partners.def:64
+#: ../../english/partners/partners.def:73
 msgid ""
 "<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
 "consulting and services company and since 1999 been offering comprehensive "
@@ -81,7 +99,7 @@ msgid ""
 "q> is always available, 365 days a year, around the clock. "
 msgstr ""
 
-#: ../../english/partners/partners.def:67
+#: ../../english/partners/partners.def:76
 msgid ""
 "From the very beginning credativ has actively supported the Debian project "
 "and will continue to do so in the future. Furthermore many of our "
@@ -90,7 +108,7 @@ msgid ""
 "href=\"https://www.credativ.com/\">https://www.credativ.com/</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:82
 msgid ""
 "<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
 "hardware and hosting services from their colocation sites via high-speed "
@@ -98,7 +116,7 @@ msgid ""
 "an IBM x360 server. "
 msgstr ""
 
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:86
 msgid ""
 "Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
 "on IT infrastructures, software development and hosting services. DG-i "
@@ -110,7 +128,7 @@ msgid ""
 "infrastructure in their Munich and Dusseldorf data centers."
 msgstr ""
 
-#: ../../english/partners/partners.def:83
+#: ../../english/partners/partners.def:92
 msgid ""
 "<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
 "infrastructure from power issues, and employs a Debian Developer to work on "
@@ -118,7 +136,7 @@ msgid ""
 "networkupstools.org/\">Network UPS Tools</a> and related packages."
 msgstr ""
 
-#: ../../english/partners/partners.def:86
+#: ../../english/partners/partners.def:95
 msgid ""
 "Eaton is a global technology leader in electrical components and systems for "
 "power quality, distribution and control; hydraulics components, systems and "
@@ -129,14 +147,14 @@ msgid ""
 "more than 150 countries, with 2008 sales of $15.4 billion."
 msgstr ""
 
-#: ../../english/partners/partners.def:93
+#: ../../english/partners/partners.def:102
 msgid ""
 "<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
 "delivery network (CDN) services and is helping us deliver packages to users "
 "through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:96
+#: ../../english/partners/partners.def:105
 msgid ""
 "Fastly’s edge cloud platform provides advanced application delivery and "
 "cloud security for the world’s most popular online destinations. Fastly "
@@ -144,14 +162,14 @@ msgid ""
 "month, more than 10 percent of all internet requests."
 msgstr ""
 
-#: ../../english/partners/partners.def:103
+#: ../../english/partners/partners.def:112
 msgid ""
 "Since 2002, Genesi has provided the hardware it designs and develops to the "
 "Debian community. Genesi also employs Debian developers to support their "
 "platforms."
 msgstr ""
 
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:115
 msgid ""
 "Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
 "based computers are designed to bring low cost, energy efficient computing "
@@ -160,20 +178,20 @@ msgid ""
 "powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
 msgstr ""
 
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:122
 msgid ""
 "<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
 "continuous integration infrastructure within Google Cloud Platform."
 msgstr ""
 
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:125
 msgid ""
 "Google is one of the largest technology companies in the world, providing a "
 "wide range of Internet-related services and products as online advertising "
 "technologies, search, cloud computing, software, and hardware."
 msgstr ""
 
-#: ../../english/partners/partners.def:123
+#: ../../english/partners/partners.def:132
 msgid ""
 "<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
 "(HPE)</a> provides hardware for port development, Debian mirrors, and other "
@@ -181,14 +199,14 @@ msgid ""
 "\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
-#: ../../english/partners/partners.def:126
+#: ../../english/partners/partners.def:135
 msgid ""
 "HPE is one of the largest computer companies in the world, providing a wide "
 "range of products and services, such as servers, storage, networking, "
 "consulting and support, software, and financial services."
 msgstr ""
 
-#: ../../english/partners/partners.def:134
+#: ../../english/partners/partners.def:143
 msgid ""
 "<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
 "partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -199,7 +217,7 @@ msgid ""
 "50%, enough to accommodate anticipated growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:137
+#: ../../english/partners/partners.def:146
 msgid ""
 "LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
 "customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -207,7 +225,7 @@ msgid ""
 "\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:152
 msgid ""
 "<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
 "lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +234,7 @@ msgid ""
 "Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:155
 msgid ""
 "Loongson processors are a series of MIPS-compatible processors. They have "
 "been widely used in many areas, such as desktop, server, embedded "
@@ -224,7 +242,7 @@ msgid ""
 "<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:152
+#: ../../english/partners/partners.def:161
 msgid ""
 "<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
 "provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -232,7 +250,7 @@ msgid ""
 "network for experimental and debconf.org machines."
 msgstr ""
 
-#: ../../english/partners/partners.def:156
+#: ../../english/partners/partners.def:165
 msgid ""
 "man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
 "region connecting educational and research organisations to a high speed "
@@ -242,27 +260,27 @@ msgid ""
 "both universities."
 msgstr ""
 
-#: ../../english/partners/partners.def:164
+#: ../../english/partners/partners.def:173
 msgid ""
 "<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
 "a> provides hosting and administration services to the Debian project."
 msgstr ""
 
-#: ../../english/partners/partners.def:168
+#: ../../english/partners/partners.def:177
 msgid ""
 "The Open Source Lab is a focal point for open source development at Oregon "
 "State University and beyond. The OSL provides development, hosting and "
 "assorted other services to the Open Source community."
 msgstr ""
 
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:184
 msgid ""
 "nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
 "\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
 "disperse locations and support DNSSEC."
 msgstr ""
 
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:188
 msgid ""
 "ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
 "been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -270,14 +288,14 @@ msgid ""
 "department and has been successfully in use for the .at zone."
 msgstr ""
 
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:194
 msgid ""
 "<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
 "both the creation and testing of the new debian-installer and the "
 "localization of Debian."
 msgstr ""
 
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:197
 msgid ""
 "Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
 "universities. An easy 3-question installation results in a preconfigured "
@@ -286,7 +304,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:195
+#: ../../english/partners/partners.def:204
 msgid ""
 "<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
 "utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -296,35 +314,35 @@ msgid ""
 "\">Planet Debian</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:198
+#: ../../english/partners/partners.def:207
 msgid ""
 "StackPath is a platform of secure edge services that enables developers to "
 "protect, accelerate, and innovate cloud properties ranging from websites to "
 "media delivery and IoT services."
 msgstr ""
 
-#: ../../english/partners/partners.def:204
+#: ../../english/partners/partners.def:213
 msgid ""
 "<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
 "supporting the Debian community by donating hardware, rackspace and "
 "bandwidth for the Debian server hosting alioth, arch and svn."
 msgstr ""
 
-#: ../../english/partners/partners.def:207
+#: ../../english/partners/partners.def:216
 msgid ""
 "Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
 "Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
 "are highly motivated Debian users and some of them also Debian maintainers."
 msgstr ""
 
-#: ../../english/partners/partners.def:210
+#: ../../english/partners/partners.def:219
 msgid ""
 "Telegraaf Media Group runs some of the most popular Dutch websites (http://"
 "www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
 "the two biggest newspapers in The Netherlands."
 msgstr ""
 
-#: ../../english/partners/partners.def:216
+#: ../../english/partners/partners.def:225
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
 "high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -334,7 +352,7 @@ msgid ""
 "thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:219
+#: ../../english/partners/partners.def:228
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
 "online shop for server systems and high-quality hosting. They offer rack-"
@@ -344,7 +362,7 @@ msgid ""
 "course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:225
+#: ../../english/partners/partners.def:234
 msgid ""
 "<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
 "to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -353,7 +371,7 @@ msgid ""
 "for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:228
+#: ../../english/partners/partners.def:237
 msgid ""
 "trustsec offers customer support, consulting and training for Debian on the "
 "Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -361,7 +379,7 @@ msgid ""
 "\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:236
+#: ../../english/partners/partners.def:245
 msgid ""
 "The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
 "provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -371,7 +389,7 @@ msgid ""
 "increasing the amount of snapshot storage provided."
 msgstr ""
 
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:248
 msgid ""
 "The Wellcome Sanger Institute is one of the world's leading genome centres. "
 "Through its ability to conduct research at scale, it is able to engage in "
@@ -382,14 +400,14 @@ msgid ""
 "treatments for human disease."
 msgstr ""
 
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:258
 msgid ""
 "<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
 "Novare) provides several machines to Debian, as well as hosting and server "
 "administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:261
 msgid ""
 "Brainfood is a technology solutions company whose goal is to work to produce "
 "an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -398,7 +416,7 @@ msgid ""
 "\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:268
 msgid ""
 "<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
 "port development, Debian mirrors, and other Debian services (current HP "
@@ -408,7 +426,7 @@ msgid ""
 "com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:262
+#: ../../english/partners/partners.def:271
 msgid ""
 "Hewlett-Packard is one of the largest computer companies in the world, "
 "providing a wide range of products and services, such as servers, PCs, "
@@ -416,7 +434,7 @@ msgid ""
 "solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:269
+#: ../../english/partners/partners.def:278
 msgid ""
 "<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
 "Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -424,7 +442,7 @@ msgid ""
 "current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:273
+#: ../../english/partners/partners.def:282
 msgid ""
 "Linux Central sells all the latest releases of Linux products such as "
 "commercial software, books, hardware, and versions of major Linux "
@@ -434,14 +452,14 @@ msgid ""
 "contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:280
+#: ../../english/partners/partners.def:289
 msgid ""
 "<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
 "Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
 "are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:296
 msgid ""
 "San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
 "a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -452,7 +470,7 @@ msgid ""
 "copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:294
+#: ../../english/partners/partners.def:303
 msgid ""
 "<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
 "Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -460,7 +478,7 @@ msgid ""
 "donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:297
+#: ../../english/partners/partners.def:306
 msgid ""
 "Open Source Press specialises on books around Linux and Open Source "
 "Software, written by authors with considerable experience in the fields, and "
@@ -468,7 +486,7 @@ msgid ""
 "Source Press publications are renowned for their quality and depth."
 msgstr ""
 
-#: ../../english/partners/partners.def:305
+#: ../../english/partners/partners.def:314
 msgid ""
 "<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
 "Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -476,13 +494,13 @@ msgid ""
 "virtual servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:308
+#: ../../english/partners/partners.def:317
 msgid ""
 "It hosts a Debian development machine, <a href=\"https://db.debian.org/"
 "machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:316
+#: ../../english/partners/partners.def:325
 msgid ""
 "<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
 "machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -490,7 +508,7 @@ msgid ""
 "ARM port."
 msgstr ""
 
-#: ../../english/partners/partners.def:319
+#: ../../english/partners/partners.def:328
 msgid ""
 "Simtec is a leading provider of ARM based computing products. We have a "
 "range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/japanese/po/ports.ja.po b/japanese/po/ports.ja.po
index b34b2e3a43f..c065eafbc7b 100644
--- a/japanese/po/ports.ja.po
+++ b/japanese/po/ports.ja.po
@@ -9,6 +9,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Alpha 用 Debian"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "PA-RISC 用 Debian"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd の CD"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "IA-64 用 Debian"
+
 #: ../../english/ports/menu.defs:11
 msgid "Contact"
 msgstr "連絡"
@@ -73,22 +89,6 @@ msgstr "供給"
 msgid "Systems"
 msgstr "システム"
 
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Alpha 用 Debian"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "PA-RISC 用 Debian"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd の CD"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "IA-64 用 Debian"
-
 #: ../../english/ports/netbsd/menu.inc:6
 msgid "Debian GNU/NetBSD for i386"
 msgstr "i386 用 Debian GNU/NetBSD"
@@ -113,135 +113,135 @@ msgstr "PowerPC 用 Debian"
 msgid "Debian for Sparc"
 msgstr "Sparc 用 Debian"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "ラップトップ用 Debian"
-
-#~ msgid "Vendor/Name"
-#~ msgstr "ベンダ/名称"
-
-#~ msgid "Date announced"
-#~ msgstr "アナウンス日"
-
-#~ msgid "Clock"
-#~ msgstr "クロック"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Motorola 680x0 用 Debian"
 
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Debian for AMD64"
+#~ msgstr "AMD64 用 Debian"
 
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Debian for ARM"
+#~ msgstr "ARM 用 Debian"
 
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Beowulf 用 Debian"
 
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Main"
+#~ msgstr "メイン"
 
-#~ msgid "Specials"
-#~ msgstr "特記事項"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "FPU なし (R2010)、外部キャッシュ"
+#~ msgid "Debian for MIPS"
+#~ msgstr "MIPS 用 Debian"
 
-#~ msgid "No FPU (R3010)"
-#~ msgstr "FPU なし (R3010)"
+#~ msgid "Debian for S/390"
+#~ msgstr "S/390 用 Debian"
 
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "仮想インデックス L1 キャッシュ、L2 キャッシュコントローラ"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Sparc64 用 Debian"
 
-#~ msgid "External L1 cache"
-#~ msgstr "外部 L1 キャッシュ"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16、LCD コントローラ、コンパクトフラッシュ、UART、パラレル、RTC、キー"
+#~ "ボード、USB、タッチパッド、オーディオ"
 
-#~ msgid "Multiple chip CPU"
-#~ msgstr "複数チップ CPU"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr ""
+#~ "Mips 16、コンパクトフラッシュ、UART、パラレル、RTC、オーディオ、PCIC"
 
 #~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
 #~ msgstr ""
-#~ "Mips16 isa 拡張、FPU なし、512k フラッシュ、16k ram、DMAC、UART、タイ"
-#~ "マー、I2C、ウォッチドッグ"
+#~ "Mips 16、RTC、キーボード、タッチパッド、オーディオ、コンパクトフラッシュ、"
+#~ "UART、パラレル"
 
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー、I2C、LCD コントローラ"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
 
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2 キャッシュオンダイ"
 
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、PCIC、UART、タイマー"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU、64 ビット外部バス、外部 L2 キャッシュ"
 
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "FPU なし、SDRAMC、ROMC、タイマー、PCMCIA、LCD コントローラ、IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU、64 ビット外部バス"
 
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、LCD コントローラ、IrDA"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU、32 ビット外部バス"
 
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、IrDA"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "10/100 イーサネット x2、UART x4、IrDA、AC'97、I2C、デジタル I/O x38"
 
 #~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
 #~ msgstr "FPU なし、SDRAMC、ROMC、DMAC、PCIC、UART、タイマー"
 
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "10/100 イーサネット x2、UART x4、IrDA、AC'97、I2C、デジタル I/O x38"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、IrDA"
 
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU、32 ビット外部バス"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、LCD コントローラ、IrDA"
 
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU、64 ビット外部バス"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "FPU なし、SDRAMC、ROMC、タイマー、PCMCIA、LCD コントローラ、IrDA"
 
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU、64 ビット外部バス、外部 L2 キャッシュ"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、PCIC、UART、タイマー"
 
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 キャッシュオンダイ"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー"
 
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー、I2C、LCD コントローラ"
 
 #~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
 #~ msgstr ""
-#~ "Mips 16、RTC、キーボード、タッチパッド、オーディオ、コンパクトフラッシュ、"
-#~ "UART、パラレル"
+#~ "Mips16 isa 拡張、FPU なし、512k フラッシュ、16k ram、DMAC、UART、タイ"
+#~ "マー、I2C、ウォッチドッグ"
 
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr ""
-#~ "Mips 16、コンパクトフラッシュ、UART、パラレル、RTC、オーディオ、PCIC"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "複数チップ CPU"
 
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16、LCD コントローラ、コンパクトフラッシュ、UART、パラレル、RTC、キー"
-#~ "ボード、USB、タッチパッド、オーディオ"
+#~ msgid "External L1 cache"
+#~ msgstr "外部 L1 キャッシュ"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Sparc64 用 Debian"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "仮想インデックス L1 キャッシュ、L2 キャッシュコントローラ"
 
-#~ msgid "Debian for S/390"
-#~ msgstr "S/390 用 Debian"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "FPU なし (R3010)"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "MIPS 用 Debian"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "FPU なし (R2010)、外部キャッシュ"
 
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Specials"
+#~ msgstr "特記事項"
 
-#~ msgid "Main"
-#~ msgstr "メイン"
+#~ msgid "ISA"
+#~ msgstr "ISA"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Beowulf 用 Debian"
+#~ msgid "TLB"
+#~ msgstr "TLB"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "ARM 用 Debian"
+#~ msgid "DCache"
+#~ msgstr "DCache"
 
-#~ msgid "Debian for AMD64"
-#~ msgstr "AMD64 用 Debian"
+#~ msgid "ICache"
+#~ msgstr "ICache"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Motorola 680x0 用 Debian"
+#~ msgid "Clock"
+#~ msgstr "クロック"
+
+#~ msgid "Date announced"
+#~ msgstr "アナウンス日"
+
+#~ msgid "Vendor/Name"
+#~ msgstr "ベンダ/名称"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "ラップトップ用 Debian"
diff --git a/japanese/po/security.ja.po b/japanese/po/security.ja.po
index 1141565f45a..41a0ab8467e 100644
--- a/japanese/po/security.ja.po
+++ b/japanese/po/security.ja.po
@@ -9,6 +9,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debian セキュリティ"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debian セキュリティ勧告"
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "質問"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"記録として残されている<a href=\\\"undated/\\\">日付不詳</a>のセキュリティ勧告"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre の CVE 辞書"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus の Bugtraq データベース"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT の勧告"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT の脆弱性通達"
+
 #: ../../english/template/debian/security.wml:11
 msgid "Source:"
 msgstr "ソース:"
@@ -35,31 +70,31 @@ msgstr ""
 "一覧にあるファイルの MD5 チェックサムは<a href=\"<get-var url />\">勧告の原"
 "文 (改訂版) </a>にあります。"
 
-#: ../../english/template/debian/security.wml:42
+#: ../../english/template/debian/security.wml:44
 msgid "Debian Security Advisory"
 msgstr "Debian セキュリティ勧告"
 
-#: ../../english/template/debian/security.wml:47
+#: ../../english/template/debian/security.wml:49
 msgid "Date Reported"
 msgstr "報告日時"
 
-#: ../../english/template/debian/security.wml:50
+#: ../../english/template/debian/security.wml:52
 msgid "Affected Packages"
 msgstr "影響を受けるパッケージ"
 
-#: ../../english/template/debian/security.wml:72
+#: ../../english/template/debian/security.wml:74
 msgid "Vulnerable"
 msgstr "危険性"
 
-#: ../../english/template/debian/security.wml:75
+#: ../../english/template/debian/security.wml:77
 msgid "Security database references"
 msgstr "参考セキュリティデータベース"
 
-#: ../../english/template/debian/security.wml:78
+#: ../../english/template/debian/security.wml:80
 msgid "More information"
 msgstr "詳細"
 
-#: ../../english/template/debian/security.wml:84
+#: ../../english/template/debian/security.wml:86
 msgid "Fixed in"
 msgstr "修正"
 
@@ -90,38 +125,3 @@ msgstr "CERT の脆弱性リスト、勧告および付加情報:"
 #: ../../english/template/debian/securityreferences.wml:88
 msgid "No other external database security references currently available."
 msgstr "現時点では、その他の外部参考セキュリティデータベースはありません。"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "質問"
-
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian セキュリティ"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debian セキュリティ勧告"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre の CVE 辞書"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus の Bugtraq データベース"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT の勧告"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT の脆弱性通達"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"記録として残されている<a href=\\\"undated/\\\">日付不詳</a>のセキュリティ勧告"
diff --git a/japanese/po/stats.ja.po b/japanese/po/stats.ja.po
index e5ddf0ccc34..4e8c3a6695f 100644
--- a/japanese/po/stats.ja.po
+++ b/japanese/po/stats.ja.po
@@ -9,71 +9,87 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../stattrans.pl:278 ../../stattrans.pl:494
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Debian ウェブサイト翻訳状況"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "翻訳するページ数 %d"
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "翻訳するバイト数 %d"
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "翻訳する文の数 %d"
+
+#: ../../stattrans.pl:282 ../../stattrans.pl:498
 msgid "Wrong translation version"
 msgstr "翻訳のバージョン番号が変です"
 
-#: ../../stattrans.pl:280
+#: ../../stattrans.pl:284
 msgid "This translation is too out of date"
 msgstr "翻訳が古すぎです"
 
-#: ../../stattrans.pl:282
+#: ../../stattrans.pl:286
 msgid "The original is newer than this translation"
 msgstr "原版がこの翻訳より新しくなっています"
 
-#: ../../stattrans.pl:286 ../../stattrans.pl:494
+#: ../../stattrans.pl:290 ../../stattrans.pl:498
 msgid "The original no longer exists"
 msgstr "原版がなくなっています"
 
-#: ../../stattrans.pl:470
-msgid "hits"
-msgstr "ヒット"
-
-#: ../../stattrans.pl:470
+#: ../../stattrans.pl:474
 msgid "hit count N/A"
 msgstr "ヒットカウント無し"
 
-#: ../../stattrans.pl:488 ../../stattrans.pl:489
+#: ../../stattrans.pl:474
+msgid "hits"
+msgstr "ヒット"
+
+#: ../../stattrans.pl:492 ../../stattrans.pl:493
 msgid "Click to fetch diffstat data"
 msgstr "クリックすると diffstat データを取得します"
 
-#: ../../stattrans.pl:599 ../../stattrans.pl:739
+#: ../../stattrans.pl:603 ../../stattrans.pl:743
 msgid "Created with <transstatslink>"
 msgstr ""
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:608
 msgid "Translation summary for"
 msgstr "翻訳状況:"
 
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:611 ../../stattrans.pl:767 ../../stattrans.pl:813
+#: ../../stattrans.pl:856
+msgid "Not translated"
+msgstr "未翻訳"
+
+#: ../../stattrans.pl:611 ../../stattrans.pl:766 ../../stattrans.pl:812
+msgid "Outdated"
+msgstr "未更新"
+
+#: ../../stattrans.pl:611
 msgid "Translated"
 msgstr "翻訳済"
 
-#: ../../stattrans.pl:607 ../../stattrans.pl:687 ../../stattrans.pl:761
-#: ../../stattrans.pl:807 ../../stattrans.pl:850
+#: ../../stattrans.pl:611 ../../stattrans.pl:691 ../../stattrans.pl:765
+#: ../../stattrans.pl:811 ../../stattrans.pl:854
 msgid "Up to date"
 msgstr "最新"
 
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "未更新"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "未翻訳"
-
-#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:612 ../../stattrans.pl:613 ../../stattrans.pl:614
+#: ../../stattrans.pl:615
 msgid "files"
 msgstr "ファイル"
 
-#: ../../stattrans.pl:614 ../../stattrans.pl:615 ../../stattrans.pl:616
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:618 ../../stattrans.pl:619 ../../stattrans.pl:620
+#: ../../stattrans.pl:621
 msgid "bytes"
 msgstr "バイト"
 
-#: ../../stattrans.pl:624
+#: ../../stattrans.pl:628
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
@@ -81,167 +97,151 @@ msgstr ""
 "注: このページのリストは人気順に並んでいます。ページ名にマウスカーソルを持っ"
 "て行くとヒット数を確認できます。"
 
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:634
 msgid "Outdated translations"
 msgstr "古くなっている翻訳"
 
-#: ../../stattrans.pl:632 ../../stattrans.pl:686
+#: ../../stattrans.pl:636 ../../stattrans.pl:690
 msgid "File"
 msgstr "ファイル"
 
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:638
 msgid "Diff"
 msgstr "差分"
 
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:640
 msgid "Comment"
 msgstr "状態"
 
-#: ../../stattrans.pl:637
+#: ../../stattrans.pl:641
 msgid "Diffstat"
 msgstr "Diffstat"
 
-#: ../../stattrans.pl:638
+#: ../../stattrans.pl:642
 msgid "Git command line"
 msgstr ""
 
-#: ../../stattrans.pl:640
+#: ../../stattrans.pl:644
 msgid "Log"
 msgstr "ログ"
 
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:645
 msgid "Translation"
 msgstr "翻訳版"
 
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:646
 msgid "Maintainer"
 msgstr "担当者"
 
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:648
 msgid "Status"
 msgstr "状態"
 
-#: ../../stattrans.pl:645
+#: ../../stattrans.pl:649
 msgid "Translator"
 msgstr "翻訳者"
 
-#: ../../stattrans.pl:646
+#: ../../stattrans.pl:650
 msgid "Date"
 msgstr "日時"
 
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:657
 msgid "General pages not translated"
 msgstr "未翻訳の一般ページ"
 
-#: ../../stattrans.pl:654
+#: ../../stattrans.pl:658
 msgid "Untranslated general pages"
 msgstr "未翻訳の一般ページ"
 
-#: ../../stattrans.pl:659
+#: ../../stattrans.pl:663
 msgid "News items not translated"
 msgstr "未翻訳のニュース項目"
 
-#: ../../stattrans.pl:660
+#: ../../stattrans.pl:664
 msgid "Untranslated news items"
 msgstr "未翻訳のニュース項目"
 
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:669
 msgid "Consultant/user pages not translated"
 msgstr "未翻訳のコンサルタント/ユーザページ"
 
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:670
 msgid "Untranslated consultant/user pages"
 msgstr "未翻訳のコンサルタント/ユーザページ"
 
-#: ../../stattrans.pl:671
+#: ../../stattrans.pl:675
 msgid "International pages not translated"
 msgstr "未翻訳の国際化ページ"
 
-#: ../../stattrans.pl:672
+#: ../../stattrans.pl:676
 msgid "Untranslated international pages"
 msgstr "未翻訳の国際化ページ"
 
-#: ../../stattrans.pl:677
+#: ../../stattrans.pl:681
 msgid "Translated pages (up-to-date)"
 msgstr "翻訳済ページ (最新)"
 
-#: ../../stattrans.pl:684 ../../stattrans.pl:834
+#: ../../stattrans.pl:688 ../../stattrans.pl:838
 msgid "Translated templates (PO files)"
 msgstr "翻訳済テンプレート (PO ファイル)"
 
-#: ../../stattrans.pl:685 ../../stattrans.pl:837
+#: ../../stattrans.pl:689 ../../stattrans.pl:841
 msgid "PO Translation Statistics"
 msgstr "PO 翻訳状況"
 
-#: ../../stattrans.pl:688 ../../stattrans.pl:851
+#: ../../stattrans.pl:692 ../../stattrans.pl:855
 msgid "Fuzzy"
 msgstr "Fuzzy"
 
-#: ../../stattrans.pl:689
+#: ../../stattrans.pl:693
 msgid "Untranslated"
 msgstr "未翻訳"
 
-#: ../../stattrans.pl:690
+#: ../../stattrans.pl:694
 msgid "Total"
 msgstr "合計"
 
-#: ../../stattrans.pl:707
+#: ../../stattrans.pl:711
 msgid "Total:"
 msgstr "合計:"
 
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:745
 msgid "Translated web pages"
 msgstr "翻訳済ページ"
 
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:748
 msgid "Translation Statistics by Page Count"
 msgstr "ページ単位で集計した翻訳状況"
 
-#: ../../stattrans.pl:759 ../../stattrans.pl:805 ../../stattrans.pl:849
+#: ../../stattrans.pl:763 ../../stattrans.pl:809 ../../stattrans.pl:853
 msgid "Language"
 msgstr "言語"
 
-#: ../../stattrans.pl:760 ../../stattrans.pl:806
+#: ../../stattrans.pl:764 ../../stattrans.pl:810
 msgid "Translations"
 msgstr "翻訳版"
 
-#: ../../stattrans.pl:787
+#: ../../stattrans.pl:791
 msgid "Translated web pages (by size)"
 msgstr "翻訳済ページ (サイズ)"
 
-#: ../../stattrans.pl:790
+#: ../../stattrans.pl:794
 msgid "Translation Statistics by Page Size"
 msgstr "ページサイズから見た翻訳状況"
 
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Debian ウェブサイト翻訳状況"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "翻訳するページ数 %d"
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "翻訳するバイト数 %d"
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "翻訳する文の数 %d"
-
-#~ msgid "Created with"
-#~ msgstr "Created with"
+#~ msgid "Unified diff"
+#~ msgstr "差分(統合)"
 
-#~ msgid "Origin"
-#~ msgstr "原版"
+#~ msgid "Colored diff"
+#~ msgstr "差分(色分け)"
 
 #, fuzzy
 #~| msgid "Colored diff"
 #~ msgid "Commit diff"
 #~ msgstr "差分(色分け)"
 
-#~ msgid "Colored diff"
-#~ msgstr "差分(色分け)"
+#~ msgid "Origin"
+#~ msgstr "原版"
 
-#~ msgid "Unified diff"
-#~ msgstr "差分(統合)"
+#~ msgid "Created with"
+#~ msgstr "Created with"
diff --git a/japanese/po/templates.ja.po b/japanese/po/templates.ja.po
index b6d488ec1a1..3c00b80c47a 100644
--- a/japanese/po/templates.ja.po
+++ b/japanese/po/templates.ja.po
@@ -10,6 +10,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debian ウェブサイト"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Debian ウェブサイトを検索する。"
+
 #: ../../english/template/debian/basic.wml:19
 #: ../../english/template/debian/navbar.wml:11
 msgid "Debian"
@@ -198,7 +206,7 @@ msgstr "リリース 2.2 において"
 #. you can add some information of your own translation mailing list
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
-#: ../../english/template/debian/footer.wml:106
+#: ../../english/template/debian/footer.wml:91
 #, fuzzy
 msgid ""
 "To report a problem with the web site, please e-mail our publicly archived "
@@ -213,29 +221,29 @@ msgstr ""
 "ご覧ください。ウェブサイトのソースコードも<a href=\"m4_HOME/devel/website/"
 "using_cvs\">あります</a>。"
 
-#: ../../english/template/debian/footer.wml:109
+#: ../../english/template/debian/footer.wml:94
 msgid "Last Modified"
 msgstr "最終更新"
 
-#: ../../english/template/debian/footer.wml:112
+#: ../../english/template/debian/footer.wml:97
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:115
+#: ../../english/template/debian/footer.wml:100
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../../english/template/debian/footer.wml:118
+#: ../../english/template/debian/footer.wml:103
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> と多くの人々;"
 
-#: ../../english/template/debian/footer.wml:121
+#: ../../english/template/debian/footer.wml:106
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 "<a href=\"m4_HOME/license\" rel=\"copyright\">ライセンス条項</a>をご覧くださ"
 "い。"
 
-#: ../../english/template/debian/footer.wml:124
+#: ../../english/template/debian/footer.wml:109
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -534,13 +542,5 @@ msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr ""
 "<a href=\"./\">「Debian を使用しているのはどんな人たち?」のページ</a>に戻る。"
 
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debian ウェブサイト"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Debian ウェブサイトを検索する。"
-
 #~ msgid "Visit the site sponsor"
 #~ msgstr "このサイトのスポンサー"
author	Laura Arjona Reina <larjona@debian.org>	2020-09-25 22:57:35 +0200
committer	Laura Arjona Reina <larjona@debian.org>	2020-09-25 22:57:35 +0200
commit	5a043c97e946fcb7fbc38e36a10af9e3a376cdf3 (patch)
tree	557622bab9a5a34f33780ca2077b4d8a95b80db4 /japanese/po
parent	758c0e6b2b0f0e2298ffec12b4f3826713f0df63 (diff)