Update language templates (all languages, 'make update-po')

author: Laura Arjona Reina <larjona@debian.org> 2020-12-17 10:54:56 +0100
committer: Laura Arjona Reina <larjona@debian.org> 2020-12-17 10:54:56 +0100
commit: bd724167ab81e48329e5095cd35524d912889451 (patch)
tree: 5e82ffac77ce9f221ed5948d8c45ed231eefaa59 /japanese/po
parent: f9f6a63839fd44f51e468a373a727341bd4eca6f (diff)
14 files changed, 893 insertions, 825 deletions
diff --git a/japanese/po/blends.ja.po b/japanese/po/blends.ja.po
index 000f3cbca88..927e48417d1 100644
--- a/japanese/po/blends.ja.po
+++ b/japanese/po/blends.ja.po
@@ -158,8 +158,8 @@ msgstr ""
 "DebianParl の目標は世界中の議員や政治家及び職員の需要をサポートするアプリケー"
 "ションを提供することです。"
 
-#~ msgid "Debian Accessibility"
-#~ msgstr "Debian Accessibility"
-
 #~ msgid "Debian Games"
 #~ msgstr "Debian ゲーム"
+
+#~ msgid "Debian Accessibility"
+#~ msgstr "Debian Accessibility"
diff --git a/japanese/po/bugs.ja.po b/japanese/po/bugs.ja.po
index 441b26539b4..419a9495fa2 100644
--- a/japanese/po/bugs.ja.po
+++ b/japanese/po/bugs.ja.po
@@ -156,149 +156,149 @@ msgstr "アーカイブされているもの"
 msgid "Archived and Unarchived"
 msgstr "アーカイブされているものとされていないものの両方"
 
-#~ msgid "security"
-#~ msgstr "セキュリティ (security)"
+#~ msgid "Flags:"
+#~ msgstr "設定:"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "含めないタグ:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
 
-#~ msgid "Include tag:"
-#~ msgstr "含めるタグ:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "マージしたバグを1度しか表示しない"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "状態や重要度の順に並べない"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "ヘッダ部分に目次を示さない"
 
-#~ msgid "wontfix"
-#~ msgstr "修正予定無 (wontfix)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "フッタ部分に統計を示さない"
 
-#~ msgid "upstream"
-#~ msgstr "上流 (upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
 
-#~ msgid "unreproducible"
-#~ msgstr "再現不可能 (unreproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
 
-#~ msgid "patch"
-#~ msgstr "パッチ (patch)"
+#~ msgid "Package version:"
+#~ msgstr "パッケージバージョン:"
 
-#~ msgid "moreinfo"
-#~ msgstr "追加情報 (moreinfo)"
+#~ msgid "Distribution:"
+#~ msgstr "ディストリビューション:"
 
-#~ msgid "l10n"
-#~ msgstr "地域化 (l10n)"
+#~ msgid "bugs"
+#~ msgstr "バグ"
 
-#~ msgid "help"
-#~ msgstr "助けを求む (help)"
+#~ msgid "open"
+#~ msgstr "オープン"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "上流で修正済 (fixed-upstream)"
+#~ msgid "forwarded"
+#~ msgstr "上流に転送済"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "experimental で修正済 (fixed-in-experimental)"
+#~ msgid "pending"
+#~ msgstr "留保"
 
-#~ msgid "d-i"
-#~ msgstr "インストーラ (d-i)"
+#~ msgid "fixed"
+#~ msgstr "修正済"
 
-#~ msgid "confirmed"
-#~ msgstr "確認済 (confirmed)"
+#~ msgid "Include status:"
+#~ msgstr "含める状態:"
 
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "含めない状態:"
 
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny では無視 (lenny-ignore)"
+#~ msgid "critical"
+#~ msgstr "致命的 (critical)"
 
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "重大 (grave)"
 
-#~ msgid "etch-ignore"
-#~ msgstr "etch では無視 (etch-ignore)"
+#~ msgid "serious"
+#~ msgstr "深刻 (serious)"
 
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "重要 (important)"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge では無視 (sarge-ignore)"
+#~ msgid "minor"
+#~ msgstr "軽度 (minor)"
 
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "要望 (wishlist)"
 
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "含める重要度:"
 
 #~ msgid "Exclude severity:"
 #~ msgstr "含めない重要度:"
 
-#~ msgid "Include severity:"
-#~ msgstr "含める重要度:"
+#~ msgid "potato"
+#~ msgstr "potato"
 
-#~ msgid "wishlist"
-#~ msgstr "要望 (wishlist)"
+#~ msgid "woody"
+#~ msgstr "woody"
 
-#~ msgid "minor"
-#~ msgstr "軽度 (minor)"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge では無視 (sarge-ignore)"
 
-#~ msgid "important"
-#~ msgstr "重要 (important)"
+#~ msgid "etch"
+#~ msgstr "etch"
 
-#~ msgid "serious"
-#~ msgstr "深刻 (serious)"
+#~ msgid "etch-ignore"
+#~ msgstr "etch では無視 (etch-ignore)"
 
-#~ msgid "grave"
-#~ msgstr "重大 (grave)"
+#~ msgid "lenny"
+#~ msgstr "lenny"
 
-#~ msgid "critical"
-#~ msgstr "致命的 (critical)"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny では無視 (lenny-ignore)"
 
-#~ msgid "Exclude status:"
-#~ msgstr "含めない状態:"
+#~ msgid "sid"
+#~ msgstr "sid"
 
-#~ msgid "Include status:"
-#~ msgstr "含める状態:"
+#~ msgid "confirmed"
+#~ msgstr "確認済 (confirmed)"
 
-#~ msgid "fixed"
-#~ msgstr "修正済"
+#~ msgid "d-i"
+#~ msgstr "インストーラ (d-i)"
 
-#~ msgid "pending"
-#~ msgstr "留保"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "experimental で修正済 (fixed-in-experimental)"
 
-#~ msgid "forwarded"
-#~ msgstr "上流に転送済"
+#~ msgid "fixed-upstream"
+#~ msgstr "上流で修正済 (fixed-upstream)"
 
-#~ msgid "open"
-#~ msgstr "オープン"
+#~ msgid "help"
+#~ msgstr "助けを求む (help)"
 
-#~ msgid "bugs"
-#~ msgstr "バグ"
+#~ msgid "l10n"
+#~ msgstr "地域化 (l10n)"
 
-#~ msgid "Distribution:"
-#~ msgstr "ディストリビューション:"
+#~ msgid "moreinfo"
+#~ msgstr "追加情報 (moreinfo)"
 
-#~ msgid "Package version:"
-#~ msgstr "パッケージバージョン:"
+#~ msgid "patch"
+#~ msgstr "パッチ (patch)"
 
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "再現不可能 (unreproducible)"
 
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "上流 (upstream)"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "フッタ部分に統計を示さない"
+#~ msgid "wontfix"
+#~ msgstr "修正予定無 (wontfix)"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "ヘッダ部分に目次を示さない"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "状態や重要度の順に並べない"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "display merged bugs only once"
-#~ msgstr "マージしたバグを1度しか表示しない"
+#~ msgid "Include tag:"
+#~ msgstr "含めるタグ:"
 
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude tag:"
+#~ msgstr "含めないタグ:"
 
-#~ msgid "Flags:"
-#~ msgstr "設定:"
+#~ msgid "security"
+#~ msgstr "セキュリティ (security)"
diff --git a/japanese/po/cdimage.ja.po b/japanese/po/cdimage.ja.po
index b0db8acf611..09c0bd951b8 100644
--- a/japanese/po/cdimage.ja.po
+++ b/japanese/po/cdimage.ja.po
@@ -77,45 +77,44 @@ msgid "<void id=\"dc_torrent\" />Download with Torrent"
 msgstr "<void id=\"dc_torrent\" />Torrent でダウンロード"
 
 #: ../../english/template/debian/cdimage.wml:49
-msgid "<void id=\"dc_relinfo\" />Image Release Info"
-msgstr "<void id=\"dc_relinfo\" />イメージのリリース情報"
-
-#: ../../english/template/debian/cdimage.wml:52
 msgid "Debian CD team"
 msgstr "Debian CD チーム"
 
-#: ../../english/template/debian/cdimage.wml:55
+#: ../../english/template/debian/cdimage.wml:52
 msgid "debian_on_cd"
 msgstr "Debian の CD"
 
-#: ../../english/template/debian/cdimage.wml:58
+#: ../../english/template/debian/cdimage.wml:55
 msgid "<void id=\"faq-bottom\" />faq"
 msgstr "<void id=\"faq-bottom\" />FAQ"
 
-#: ../../english/template/debian/cdimage.wml:61
+#: ../../english/template/debian/cdimage.wml:58
 msgid "jigdo"
 msgstr "jigdo"
 
-#: ../../english/template/debian/cdimage.wml:64
+#: ../../english/template/debian/cdimage.wml:61
 msgid "http_ftp"
 msgstr "http/ftp"
 
-#: ../../english/template/debian/cdimage.wml:67
+#: ../../english/template/debian/cdimage.wml:64
 msgid "buy"
 msgstr "購入"
 
-#: ../../english/template/debian/cdimage.wml:70
+#: ../../english/template/debian/cdimage.wml:67
 msgid "net_install"
 msgstr "ネットインストール"
 
-#: ../../english/template/debian/cdimage.wml:73
+#: ../../english/template/debian/cdimage.wml:70
 msgid "<void id=\"misc-bottom\" />misc"
 msgstr "<void id=\"misc-bottom\" />その他"
 
-#: ../../english/template/debian/cdimage.wml:76
+#: ../../english/template/debian/cdimage.wml:73
 msgid ""
 "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
 "a> for CDs/DVDs:"
 msgstr ""
 "英語での CD/DVD 用<a href=\"/MailingLists/disclaimer\">公開メーリングリスト</"
 "a>:"
+
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />イメージのリリース情報"
diff --git a/japanese/po/countries.ja.po b/japanese/po/countries.ja.po
index c9f2190d01c..822fa922869 100644
--- a/japanese/po/countries.ja.po
+++ b/japanese/po/countries.ja.po
@@ -224,210 +224,214 @@ msgid "Kyrgyzstan"
 msgstr "カザフスタン"
 
 #: ../../english/template/debian/countries.wml:270
+msgid "Cambodia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:273
 msgid "Korea"
 msgstr "韓国"
 
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
 msgid "Kuwait"
 msgstr "クウェート"
 
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
 msgid "Kazakhstan"
 msgstr "カザフスタン"
 
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
 msgid "Sri Lanka"
 msgstr "スリランカ"
 
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
 msgid "Lithuania"
 msgstr "リトアニア"
 
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
 msgid "Luxembourg"
 msgstr "ルクセンブルグ"
 
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
 msgid "Latvia"
 msgstr "ラトビア"
 
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
 msgid "Morocco"
 msgstr "モロッコ"
 
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
 msgid "Moldova"
 msgstr "モルドバ共和国"
 
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
 msgid "Montenegro"
 msgstr "モンテネグロ"
 
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
 msgid "Madagascar"
 msgstr "マダガスカル"
 
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
 msgid "Macedonia, Republic of"
 msgstr "マケドニア共和国"
 
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
 msgid "Mongolia"
 msgstr "モンゴル"
 
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
 msgid "Malta"
 msgstr "マルタ"
 
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
 msgid "Mexico"
 msgstr "メキシコ"
 
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
 msgid "Malaysia"
 msgstr "マレーシア"
 
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
 msgid "New Caledonia"
 msgstr "ニューカレドニア"
 
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
 msgid "Nicaragua"
 msgstr "ニカラグア"
 
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
 msgid "Netherlands"
 msgstr "オランダ"
 
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
 msgid "Norway"
 msgstr "ノルウェー"
 
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
 msgid "New Zealand"
 msgstr "ニュージーランド"
 
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
 msgid "Panama"
 msgstr "パナマ"
 
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
 msgid "Peru"
 msgstr "ペルー"
 
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
 msgid "French Polynesia"
 msgstr "フランス領ポリネシア"
 
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
 msgid "Philippines"
 msgstr "フィリピン"
 
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
 msgid "Pakistan"
 msgstr "パキスタン"
 
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
 msgid "Poland"
 msgstr "ポーランド"
 
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
 msgid "Portugal"
 msgstr "ポルトガル"
 
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
 msgid "Réunion"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
 msgid "Romania"
 msgstr "ルーマニア"
 
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
 msgid "Serbia"
 msgstr "セルビア"
 
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
 msgid "Russia"
 msgstr "ロシア"
 
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
 msgid "Saudi Arabia"
 msgstr "サウジアラビア"
 
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
 msgid "Sweden"
 msgstr "スウェーデン"
 
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
 msgid "Singapore"
 msgstr "シンガポール"
 
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
 msgid "Slovenia"
 msgstr "スロベニア"
 
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
 msgid "Slovakia"
 msgstr "スロバキア"
 
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
 msgid "El Salvador"
 msgstr "エルサルバドル"
 
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
 msgid "Thailand"
 msgstr "タイ"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Tajikistan"
 msgstr "タジキスタン"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Tunisia"
 msgstr "チュニジア"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Turkey"
 msgstr "トルコ"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 msgid "Taiwan"
 msgstr "台湾"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "Ukraine"
 msgstr "ウクライナ"
 
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
 msgid "United States"
 msgstr "アメリカ合衆国"
 
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
 msgid "Uruguay"
 msgstr "ウルグアイ"
 
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
 msgid "Uzbekistan"
 msgstr "ウズベキスタン"
 
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
 msgid "Venezuela"
 msgstr "ベネズエラ"
 
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
 msgid "Vietnam"
 msgstr "ベトナム"
 
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
 msgid "Vanuatu"
 msgstr "バヌアツ"
 
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
 msgid "South Africa"
 msgstr "南アフリカ"
 
-#: ../../english/template/debian/countries.wml:423
+#: ../../english/template/debian/countries.wml:426
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
diff --git a/japanese/po/doc.ja.po b/japanese/po/doc.ja.po
index 34991c7ce33..5b5123b5897 100644
--- a/japanese/po/doc.ja.po
+++ b/japanese/po/doc.ja.po
@@ -69,12 +69,20 @@ msgstr ""
 "  新しい事項についても見落とすことなく触れています。"
 
 #: ../../english/doc/books.data:86
+#, fuzzy
+#| 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"
+#| "  current unstable distribution). It is comprehensive with basic support\n"
+#| "  for the user who installs and maintains the system themselves (whether\n"
+#| "  in the home, office, club, or school)."
 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"
-"  current unstable distribution). It is comprehensive with basic support\n"
+"The aim of this freely available book is to get you up to\n"
+"  speed with Debian. It is comprehensive with basic support\n"
 "  for the user who installs and maintains the system themselves (whether\n"
-"  in the home, office, club, or school)."
+"  in the home, office, club, or school). Some Debian specific information "
+"are very old.\n"
+"  "
 msgstr ""
 "  この、自由に利用できる最新の書籍の目的は、(現在の安定版 (stable) リリース"
 "と、\n"
@@ -242,119 +250,227 @@ msgstr "HTML"
 msgid "PDF"
 msgstr "PDF"
 
-#~ 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://packages.debian.org/cvs\">Cvs</a> repository."
+#~ msgstr ""
+#~ "最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
+#~ "cvs\">Cvs</a> リポジトリ経由で利用できるようになっています。"
 
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Knoppix 収録のライブ CD"
+#~ 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 ""
-#~ "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."
+#~ "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 ""
-#~ "  初心者や上級ユーザにとって、この本は Debian をデスクトップ、\n"
-#~ "  イントラネット・インターネットのサーバ、\n"
-#~ "  開発用途に利用する際の総合的な情報源となっています。\n"
-#~ "  Debian プロジェクトの背景に関する情報や、広範囲に及ぶ Debian\n"
-#~ "  独自のパッケージ管理システムにも触れています。"
+#~ "作業中の 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 "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "公式 Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386) 版"
+#~ msgid "CVS via web"
+#~ msgstr "ウェブ経由で CVS を見る"
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 ARM アーキテクチャ版"
 
 #~ 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."
+#~ "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 ""
-#~ " この本は、Debian オペレーティングシステムの概念と技術を、\n"
-#~ "  利用方法や陥りがちな場面を挙げながら紹介し、\n"
-#~ "  各アプローチの背景にある考え方を説明しています。リファレンス本に留まら"
-#~ "ず、\n"
-#~ "  プロジェクトやオペレーティングシステムの洗練されたエレガントな仕組み"
-#~ "や、\n"
-#~ "  またときには過去 10 年間にわたって Debian システムの一部として展開されて"
-#~ "きた、\n"
-#~ "  一見直感的ではないソリューションに関する識見を読者に与えることを目的とし"
-#~ "ています。\n"
-#~ "  UNIX/Linux に詳しい管理者を対象としてはいますが、この本は標準的な "
-#~ "Linux\n"
-#~ "  のリファレンスとしても優れた情報源として Debian\n"
-#~ "  のボトムアップな考え方を通じて、自力で Linux を経験するために役立ちま"
-#~ "す。"
+#~ "  本書は 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 ""
-#~ "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."
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
 #~ msgstr ""
-#~ "Debian GNU/Linux システムの手頃なリファレンスガイドで、\n"
-#~ "  1,500以上の「レシピ」を紹介し、\n"
-#~ "  日々の生活で Debian をどの様に使うかを紹介します。\n"
-#~ "  テキストでの作業、画像やサウンドの作成、\n"
-#~ "  ネットワークに関する問題などです。\n"
-#~ "  この本の対象になっているソフトウェアと同じく、\n"
-#~ "  この本もコピーレフトになっていて、\n"
-#~ "  データソースが入手できます。"
+#~ "最新の <get-var srctype /> ソースは <a href=\"https://www.debian.org/doc/"
+#~ "cvs\">Subversion</a> リポジトリ経由で利用できるようになっています。"
 
 #~ 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 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 ""
-#~ "  Learning Debian GNU/Linux は、\n"
-#~ "  Debian GNU/Linux のインストールと設定を通して、\n"
-#~ "  Linux を初めて使うユーザをガイドします。\n"
-#~ "  Windows ユーザは、\n"
-#~ "  Bill McCarty のこの Learning Debian GNU/Linux によって、\n"
-#~ "  エキサイティングなコンピューティングワールドへの\n"
-#~ "  親切な手引きを得ることができるでしょう。"
+#~ "これはフリーソフトウェアだけを使った基礎的、あるいは複雑な IT 基盤の作り方"
+#~ "について学ぶのに適した本です。検討された幅広い手順が示され、技術的基盤の実"
+#~ "装について最善の実践となるよう調整されています。この読みやすく総合的なガイ"
+#~ "ドはDebian GNU/Linux オペレーティングシステムを使って特定の目的を実現する"
+#~ "ための手ほどきとなるでしょう。"
 
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ 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 ""
-#~ "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."
+#~ "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 ""
-#~ "230 ページ以上の本と 3 枚の CD-ROM が含まれています。\n"
-#~ "  Debian Linux、ネットワーキング、プログラミングツール、GUI、\n"
-#~ "  デスクトップパブリシング、ビジネス、おもしろい物、マルチメディア\n"
-#~ "  などを扱っています。30 日間のフリーな電子メールサポートが含まれていま"
-#~ "す。"
+#~ "ペルシャ語初の Debian GNU/Linux 本です。この書籍は、Debian GNU/Linux\n"
+#~ "  のインストールや、ウェブ・データベース・ファイアウォール・メール・ftp\n"
+#~ "  などのネットワークサービスの設定を手助けします。また、GNU/Linux\n"
+#~ "  や Debian の強力なパッケージ管理システムを使い始めるのを支援します。"
 
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "Debian Squeeze i386/amd64 DVD 版"
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
 
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 種類あります: DVD 付属無しと DVD 2 枚 (i386 収録) 付き"
+#~ 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."
+#~ msgstr ""
+#~ "本書は読者に Debian GNU/Linux を紹介し、\n"
+#~ "  実践的なチュートリアルやヒントを満載しています。\n"
+#~ "  韓国語で書かれており、Debian GNU/Linux システム\n"
+#~ "  のあらゆる部分を扱っています。\n"
+#~ "  初めてのセットアップ、パッケージのインストール、\n"
+#~ "  X のセットアップ、インターネット接続、ネットワーク保守、などです。\n"
+#~ "  さらに本書では、\n"
+#~ "  韓国語環境を Debian にセットアップするためのヒントも少々提供していま"
+#~ "す。\n"
+#~ "  初心者にも適しています。"
 
-#~ 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 "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "公式 potato r3 CD と非公式 woody CD"
 
 #~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "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 ""
-#~ "2 種類あります: CD 付属無しと公式 CD (i386, contrib およびソース収録) 付き"
+#~ "この本は、Debian GNU/Linux のインストールの簡潔なガイド、\n"
+#~ "  Unix や Linux コマンドの基礎、Debian GNU/Linux のシステムや\n"
+#~ "  ネットワークに関する基本的な設定やメンテナンス、\n"
+#~ "  X Window System のセットアップ、マルチメディアの使用について\n"
+#~ "  韓国語で述べています。\n"
+#~ "  また、メンテナのためのガイドも扱い、\n"
+#~ "  韓国にいる人々に公式な Debian メンテナになるように刺激を与えています。"
+
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "非公式な Woody 1 枚と Potato rev0 が 3 枚"
+
+#~ 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."
+#~ msgstr ""
+#~ "この本は、Debian GNU/Linux に関する一般的な話題を扱っています。\n"
+#~ "  インストール、APT と DPKG、シェル、X Window System、ネットワーク、\n"
+#~ "  システム管理、カーネル設定、Windows との共有、サーバ構築、などです。\n"
+#~ "  カスタム CD を用いることで、Debian GNU/Linux の日本語環境を非常に\n"
+#~ "  簡単にインストール・使用することができます。"
+
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian GNU/Linux 2.2r0 i386, 著者エディション (CD 3 枚組)"
+
+#~ 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 ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ "     CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, 著者エディション (DVD + CD)"
+
+#~ 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."
+#~ msgstr ""
+#~ "本書は、辞書形式で、初級者から中級者までを対象に、\n"
+#~ "  いろいろなインストール方法、デスクトップのカスタマイズ、\n"
+#~ "  トラブルシューティング、ためになるノウハウ等の、さまざまな Tips を紹介し"
+#~ "ています。"
+
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge インストーラ (シングルサイズ CD)"
 
 #~ msgid ""
 #~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -390,224 +506,116 @@ 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 ""
-#~ "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 ""
-#~ "本書は、辞書形式で、初級者から中級者までを対象に、\n"
-#~ "  いろいろなインストール方法、デスクトップのカスタマイズ、\n"
-#~ "  トラブルシューティング、ためになるノウハウ等の、さまざまな Tips を紹介し"
-#~ "ています。"
-
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ "     CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, 著者エディション (DVD + CD)"
-
-#~ 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 "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian GNU/Linux 2.2r0 i386, 著者エディション (CD 3 枚組)"
-
-#~ 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."
-#~ msgstr ""
-#~ "この本は、Debian GNU/Linux に関する一般的な話題を扱っています。\n"
-#~ "  インストール、APT と DPKG、シェル、X Window System、ネットワーク、\n"
-#~ "  システム管理、カーネル設定、Windows との共有、サーバ構築、などです。\n"
-#~ "  カスタム CD を用いることで、Debian GNU/Linux の日本語環境を非常に\n"
-#~ "  簡単にインストール・使用することができます。"
-
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "非公式な Woody 1 枚と Potato rev0 が 3 枚"
-
 #~ 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."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
 #~ msgstr ""
-#~ "この本は、Debian GNU/Linux のインストールの簡潔なガイド、\n"
-#~ "  Unix や Linux コマンドの基礎、Debian GNU/Linux のシステムや\n"
-#~ "  ネットワークに関する基本的な設定やメンテナンス、\n"
-#~ "  X Window System のセットアップ、マルチメディアの使用について\n"
-#~ "  韓国語で述べています。\n"
-#~ "  また、メンテナのためのガイドも扱い、\n"
-#~ "  韓国にいる人々に公式な Debian メンテナになるように刺激を与えています。"
+#~ "2 種類あります: CD 付属無しと公式 CD (i386, contrib およびソース収録) 付き"
 
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "公式 potato r3 CD と非公式 woody 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 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"
-#~ "  実践的なチュートリアルやヒントを満載しています。\n"
-#~ "  韓国語で書かれており、Debian GNU/Linux システム\n"
-#~ "  のあらゆる部分を扱っています。\n"
-#~ "  初めてのセットアップ、パッケージのインストール、\n"
-#~ "  X のセットアップ、インターネット接続、ネットワーク保守、などです。\n"
-#~ "  さらに本書では、\n"
-#~ "  韓国語環境を Debian にセットアップするためのヒントも少々提供していま"
-#~ "す。\n"
-#~ "  初心者にも適しています。"
+#~ 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 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "Debian Squeeze i386/amd64 DVD 版"
 
 #~ 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."
+#~ "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 本です。この書籍は、Debian GNU/Linux\n"
-#~ "  のインストールや、ウェブ・データベース・ファイアウォール・メール・ftp\n"
-#~ "  などのネットワークサービスの設定を手助けします。また、GNU/Linux\n"
-#~ "  や Debian の強力なパッケージ管理システムを使い始めるのを支援します。"
+#~ "230 ページ以上の本と 3 枚の CD-ROM が含まれています。\n"
+#~ "  Debian Linux、ネットワーキング、プログラミングツール、GUI、\n"
+#~ "  デスクトップパブリシング、ビジネス、おもしろい物、マルチメディア\n"
+#~ "  などを扱っています。30 日間のフリーな電子メールサポートが含まれていま"
+#~ "す。"
 
-#~ 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 "Debian 2.1"
+#~ msgstr "Debian 2.1"
 
 #~ 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."
+#~ "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 ""
-#~ "これはフリーソフトウェアだけを使った基礎的、あるいは複雑な IT 基盤の作り方"
-#~ "について学ぶのに適した本です。検討された幅広い手順が示され、技術的基盤の実"
-#~ "装について最善の実践となるよう調整されています。この読みやすく総合的なガイ"
-#~ "ドはDebian GNU/Linux オペレーティングシステムを使って特定の目的を実現する"
-#~ "ための手ほどきとなるでしょう。"
+#~ "  Learning Debian GNU/Linux は、\n"
+#~ "  Debian GNU/Linux のインストールと設定を通して、\n"
+#~ "  Linux を初めて使うユーザをガイドします。\n"
+#~ "  Windows ユーザは、\n"
+#~ "  Bill McCarty のこの Learning Debian GNU/Linux によって、\n"
+#~ "  エキサイティングなコンピューティングワールドへの\n"
+#~ "  親切な手引きを得ることができるでしょう。"
 
 #~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ "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 ""
-#~ "最新の <get-var srctype /> ソースは <a href=\"https://www.debian.org/doc/"
-#~ "cvs\">Subversion</a> リポジトリ経由で利用できるようになっています。"
+#~ "Debian GNU/Linux システムの手頃なリファレンスガイドで、\n"
+#~ "  1,500以上の「レシピ」を紹介し、\n"
+#~ "  日々の生活で Debian をどの様に使うかを紹介します。\n"
+#~ "  テキストでの作業、画像やサウンドの作成、\n"
+#~ "  ネットワークに関する問題などです。\n"
+#~ "  この本の対象になっているソフトウェアと同じく、\n"
+#~ "  この本もコピーレフトになっていて、\n"
+#~ "  データソースが入手できます。"
 
 #~ 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."
+#~ "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 ""
-#~ "  本書は 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 アーキテクチャ版"
+#~ " この本は、Debian オペレーティングシステムの概念と技術を、\n"
+#~ "  利用方法や陥りがちな場面を挙げながら紹介し、\n"
+#~ "  各アプローチの背景にある考え方を説明しています。リファレンス本に留まら"
+#~ "ず、\n"
+#~ "  プロジェクトやオペレーティングシステムの洗練されたエレガントな仕組み"
+#~ "や、\n"
+#~ "  またときには過去 10 年間にわたって Debian システムの一部として展開されて"
+#~ "きた、\n"
+#~ "  一見直感的ではないソリューションに関する識見を読者に与えることを目的とし"
+#~ "ています。\n"
+#~ "  UNIX/Linux に詳しい管理者を対象としてはいますが、この本は標準的な "
+#~ "Linux\n"
+#~ "  のリファレンスとしても優れた情報源として Debian\n"
+#~ "  のボトムアップな考え方を通じて、自力で Linux を経験するために役立ちま"
+#~ "す。"
 
-#~ msgid "CVS via web"
-#~ msgstr "ウェブ経由で CVS を見る"
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "公式 Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386) 版"
 
 #~ 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."
+#~ "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 ""
-#~ "作業中の CVS ソースを得るには: <code>CVSROOT</code> 変数を\n"
-#~ "<kbd>:ext:<var>ユーザID</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
-#~ "に設定し、<kbd>boot-floppies/documentation</kbd> モジュールを checkout し"
-#~ "てください。"
+#~ "  初心者や上級ユーザにとって、この本は Debian をデスクトップ、\n"
+#~ "  イントラネット・インターネットのサーバ、\n"
+#~ "  開発用途に利用する際の総合的な情報源となっています。\n"
+#~ "  Debian プロジェクトの背景に関する情報や、広範囲に及ぶ Debian\n"
+#~ "  独自のパッケージ管理システムにも触れています。"
 
-#~ 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 "Live CD with Knoppix"
+#~ msgstr "Knoppix 収録のライブ CD"
 
-#~ 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> リポジトリ経由で利用できるようになっています。"
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "インストーラと選り抜きのパッケージを収録した Sarge CD"
diff --git a/japanese/po/homepage.ja.po b/japanese/po/homepage.ja.po
new file mode 100644
index 00000000000..b7e505d6932
--- /dev/null
+++ b/japanese/po/homepage.ja.po
@@ -0,0 +1,44 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../english/index.def:8
+msgid "The Universal Operating System"
+msgstr ""
+
+#: ../../english/index.def:12
+msgid "DC19 Group Photo"
+msgstr ""
+
+#: ../../english/index.def:15
+msgid "DebConf19 Group Photo"
+msgstr ""
+
+#: ../../english/index.def:19
+msgid "Mini DebConf Hamburg 2018"
+msgstr ""
+
+#: ../../english/index.def:22
+msgid "Group photo of the MiniDebConf in Hamburg 2018"
+msgstr ""
+
+#: ../../english/index.def:26
+msgid "Screenshot Calamares Installer"
+msgstr ""
+
+#: ../../english/index.def:29
+msgid "Screenshot from the Calamares installer"
+msgstr ""
+
+#: ../../english/index.def:33 ../../english/index.def:36
+msgid "Debian is like a Swiss Knife"
+msgstr ""
+
+#: ../../english/index.def:40
+msgid "People have fun"
+msgstr ""
+
+#: ../../english/index.def:43
+msgid "Debian people at Debconf18 in Hsinchu really having fun"
+msgstr ""
diff --git a/japanese/po/mailinglists.ja.po b/japanese/po/mailinglists.ja.po
index cbba9dad9e1..26e04f7923d 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 subscribe to:"
-#~ msgstr "購読したいメーリングリストを選んでください:"
-
 #~ msgid "Please select which lists you want to unsubscribe from:"
 #~ msgstr "脱退したいメーリングリストを選んでください:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "購読したいメーリングリストを選んでください:"
diff --git a/japanese/po/newsevents.ja.po b/japanese/po/newsevents.ja.po
index 01546afaa6a..67dc8890628 100644
--- a/japanese/po/newsevents.ja.po
+++ b/japanese/po/newsevents.ja.po
@@ -136,8 +136,24 @@ msgstr ""
 "今年 <get-var issue /> 号目の DPN、Debian コミュニティの会報、にようこそ。こ"
 "の号で取り上げられている話題は:"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:56
-#: ../../english/template/debian/projectnews/boilerplates.wml:77
+#: ../../english/template/debian/projectnews/boilerplates.wml:43
+#, fuzzy
+#| msgid ""
+#| "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
+#| "the Debian community. Topics covered in this issue include:"
+msgid ""
+"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
+"the Debian community."
+msgstr ""
+"今年 <get-var issue /> 号目の DPN、Debian コミュニティの会報、にようこそ。こ"
+"の号で取り上げられている話題は:"
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:49
+msgid "Other topics covered in this issue include:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:69
+#: ../../english/template/debian/projectnews/boilerplates.wml:90
 msgid ""
 "According to the <a href=\"https://udd.debian.org/bugs.cgi\">Bugs Search "
 "interface of the Ultimate Debian Database</a>, the upcoming release, Debian  "
@@ -152,7 +168,7 @@ msgstr ""
 "簡単に修正できるか修正作業が始まっているバグを除けば、リリースまでにおよそ "
 "<get-var tobefixed /> 個のリリースクリティカルバグの修正が必要です。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:57
+#: ../../english/template/debian/projectnews/boilerplates.wml:70
 msgid ""
 "There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
 "\">hints on how to interpret</a> these numbers."
@@ -160,7 +176,7 @@ msgstr ""
 "これらの数字を<a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">解釈す"
 "る方法のヒント</a>を参照できます。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:78
+#: ../../english/template/debian/projectnews/boilerplates.wml:91
 msgid ""
 "There are also <a href=\"<get-var url />\">more detailed statistics</a> as "
 "well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints "
@@ -170,7 +186,7 @@ msgstr ""
 "\"https://wiki.debian.org/ProjectNews/RC-Stats\">解釈する方法のヒント</a>を参"
 "照できます。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:102
+#: ../../english/template/debian/projectnews/boilerplates.wml:115
 msgid ""
 "<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned"
 "\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/"
@@ -184,7 +200,7 @@ msgstr ""
 "中です</a>。完全なリストは<a href=\"m4_DEVEL/wnpp/help_requested\">支援が必要"
 "なパッケージ</a>をご覧ください。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:114
+#: ../../english/template/debian/projectnews/boilerplates.wml:127
 msgid ""
 "Please help us create this newsletter. We still need more volunteer writers "
 "to watch the Debian community and report about what is going on. Please see "
@@ -200,7 +216,7 @@ msgstr ""
 "ルを <a href=\"mailto:debian-publicity@lists.debian.org\">debian-"
 "publicity@lists.debian.org</a> でお待ちしています。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:175
+#: ../../english/template/debian/projectnews/boilerplates.wml:188
 msgid ""
 "Please note that these are a selection of the more important security "
 "advisories of the last weeks. If you need to be kept up to date about "
@@ -218,7 +234,7 @@ msgstr ""
 "\"<get-var url-stable-announce />\">stable-updates セクションのメーリングリス"
 "ト</a>) を購読してください。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:176
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
 msgid ""
 "Please note that these are a selection of the more important security "
 "advisories of the last weeks. If you need to be kept up to date about "
@@ -239,47 +255,47 @@ msgstr ""
 "\"<get-var url-volatile-announce />\">volatile セクションのメーリングリスト</"
 "a>) を購読してください。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:185
+#: ../../english/template/debian/projectnews/boilerplates.wml:198
 msgid ""
 "Debian's Stable Release Team released an update announcement for the "
 "package: "
 msgstr ""
 "Debian 安定版リリースチームは以下のパッケージにアップデートを公開しました: "
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:187
 #: ../../english/template/debian/projectnews/boilerplates.wml:200
 #: ../../english/template/debian/projectnews/boilerplates.wml:213
-#: ../../english/template/debian/projectnews/boilerplates.wml:344
-#: ../../english/template/debian/projectnews/boilerplates.wml:358
+#: ../../english/template/debian/projectnews/boilerplates.wml:226
+#: ../../english/template/debian/projectnews/boilerplates.wml:357
+#: ../../english/template/debian/projectnews/boilerplates.wml:371
 msgid ", "
 msgstr "、"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:188
 #: ../../english/template/debian/projectnews/boilerplates.wml:201
 #: ../../english/template/debian/projectnews/boilerplates.wml:214
-#: ../../english/template/debian/projectnews/boilerplates.wml:345
-#: ../../english/template/debian/projectnews/boilerplates.wml:359
+#: ../../english/template/debian/projectnews/boilerplates.wml:227
+#: ../../english/template/debian/projectnews/boilerplates.wml:358
+#: ../../english/template/debian/projectnews/boilerplates.wml:372
 msgid " and "
 msgstr "、"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:189
 #: ../../english/template/debian/projectnews/boilerplates.wml:202
 #: ../../english/template/debian/projectnews/boilerplates.wml:215
+#: ../../english/template/debian/projectnews/boilerplates.wml:228
 msgid ". "
 msgstr "。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:189
 #: ../../english/template/debian/projectnews/boilerplates.wml:202
 #: ../../english/template/debian/projectnews/boilerplates.wml:215
+#: ../../english/template/debian/projectnews/boilerplates.wml:228
 msgid "Please read them carefully and take the proper measures."
 msgstr "勧告の内容をよく読んで、適切な対策を講じてください。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:198
+#: ../../english/template/debian/projectnews/boilerplates.wml:211
 msgid "Debian's Backports Team released advisories for these packages: "
 msgstr ""
 "Debian Backports チームは以下のパッケージにセキュリティ勧告を公開しました: "
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:211
+#: ../../english/template/debian/projectnews/boilerplates.wml:224
 msgid ""
 "Debian's Security Team recently released advisories for these packages "
 "(among others): "
@@ -287,7 +303,7 @@ msgstr ""
 "Debian セキュリティチームは最近、以下のパッケージ (抜粋) にセキュリティ勧告を"
 "公開しました: "
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:240
+#: ../../english/template/debian/projectnews/boilerplates.wml:253
 msgid ""
 "<get-var num-newpkg /> packages were added to the unstable Debian archive "
 "recently."
@@ -295,15 +311,15 @@ msgstr ""
 "最近、<get-var num-newpkg /> のパッケージが不安定版の Debian アーカイブに追加"
 "されました。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:242
+#: ../../english/template/debian/projectnews/boilerplates.wml:255
 msgid " <a href=\"<get-var url-newpkg />\">Among many others</a> are:"
 msgstr "<a href=\"<get-var url-newpkg />\">新規パッケージ</a>からの抜粋:"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:269
+#: ../../english/template/debian/projectnews/boilerplates.wml:282
 msgid "There are several upcoming Debian-related events:"
 msgstr "今後、いくつかの Debian 関連のイベントが予定されています。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:275
+#: ../../english/template/debian/projectnews/boilerplates.wml:288
 msgid ""
 "You can find more information about Debian-related events and talks on the "
 "<a href=\"<get-var events-section />\">events section</a> of the Debian web "
@@ -319,7 +335,7 @@ msgstr ""
 "ダ</a>、<a href=\"<get-var events-ml-ha />\">ラテンアメリカ</a>、<a href="
 "\"<get-var events-ml-na />\">北アメリカ</a>) を購読してください。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:300
+#: ../../english/template/debian/projectnews/boilerplates.wml:313
 msgid ""
 "Do you want to organise a Debian booth or a Debian install party? Are you "
 "aware of other upcoming Debian-related events? Have you delivered a Debian "
@@ -333,7 +349,7 @@ msgstr ""
 "か? そのような場合は、<a href=\"<get-var events-team />\">Debian イベントチー"
 "ム</a>宛に電子メールを送信してください。"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:322
+#: ../../english/template/debian/projectnews/boilerplates.wml:335
 msgid ""
 "<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />"
 "\">accepted</a> as Debian Developers"
@@ -341,7 +357,7 @@ msgstr ""
 "<get-var dd-num /> 名の応募者が Debian 開発者として<a href=\"<get-var dd-"
 "url />\">受理</a>され"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:329
+#: ../../english/template/debian/projectnews/boilerplates.wml:342
 msgid ""
 "<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />"
 "\">accepted</a> as Debian Maintainers"
@@ -349,7 +365,7 @@ msgstr ""
 "<get-var dm-num /> 名が Debian メンテナとして<a href=\"<get-var dm-url />\">"
 "受理</a>され"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:336
+#: ../../english/template/debian/projectnews/boilerplates.wml:349
 msgid ""
 "<get-var uploader-num /> people have <a href=\"<get-var uploader-url />"
 "\">started to maintain packages</a>"
@@ -357,7 +373,7 @@ msgstr ""
 "<get-var uploader-num /> 名が<a href=\"<get-var uploader-url />\">パッケージ"
 "のメンテナンス</a>を開始し"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:381
+#: ../../english/template/debian/projectnews/boilerplates.wml:394
 msgid ""
 "<get-var eval-newcontributors-text-list /> since the previous issue of the "
 "Debian Project News. Please welcome <get-var eval-newcontributors-name-list /"
@@ -367,7 +383,7 @@ msgstr ""
 "text-list />ました。<get-var eval-newcontributors-name-list />を歓迎しましょ"
 "う!"
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:394
+#: ../../english/template/debian/projectnews/boilerplates.wml:407
 msgid ""
 "The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-"
 "news />\">miscellaneous news for developers</a> has been released and covers "
@@ -498,26 +514,26 @@ msgstr ""
 "<void id=\"singular\" />今週号の Debian ウィークリーニュースは <a href="
 "\"mailto:dwn@debian.org\">%s</a> が編集しました。"
 
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "<a href=\"./\">Debian 講演者ページ</a>に戻る。"
-
-#~ msgid "List of Speakers"
-#~ msgstr "講演者一覧"
+#~ msgid "Name:"
+#~ msgstr "氏名"
 
-#~ msgid "Topics:"
-#~ msgstr "話題:"
+#~ msgid "Email:"
+#~ msgstr "電子メール"
 
-#~ msgid "Location:"
-#~ msgstr "場所:"
+#~ msgid "Previous Talks:"
+#~ msgstr "以前の講演:"
 
 #~ msgid "Languages:"
 #~ msgstr "言語:"
 
-#~ msgid "Previous Talks:"
-#~ msgstr "以前の講演:"
+#~ msgid "Location:"
+#~ msgstr "場所:"
 
-#~ msgid "Email:"
-#~ msgstr "電子メール"
+#~ msgid "Topics:"
+#~ msgstr "話題:"
 
-#~ msgid "Name:"
-#~ msgstr "氏名"
+#~ msgid "List of Speakers"
+#~ msgstr "講演者一覧"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">Debian 講演者ページ</a>に戻る。"
diff --git a/japanese/po/organization.ja.po b/japanese/po/organization.ja.po
index 3bff51ff7c1..cb3ec4141b9 100644
--- a/japanese/po/organization.ja.po
+++ b/japanese/po/organization.ja.po
@@ -123,27 +123,27 @@ msgid "Distribution"
 msgstr "ディストリビューション"
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:209
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:212
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:217
 msgid "Publicity team"
 msgstr "広報チーム"
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:319
+#: ../../english/intro/organization.data:290
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:318
 msgid "Support and Infrastructure"
 msgstr "サポートと設備"
 
@@ -249,135 +249,111 @@ msgstr "ドキュメンテーション"
 msgid "Work-Needing and Prospective Packages list"
 msgstr "作業の必要なパッケージ一覧"
 
-#: ../../english/intro/organization.data:200
-msgid "Ports"
-msgstr "移植"
-
-#: ../../english/intro/organization.data:230
-msgid "Special Configurations"
-msgstr "特殊な設定"
-
-#: ../../english/intro/organization.data:232
-msgid "Laptops"
-msgstr "ラップトップ"
-
-#: ../../english/intro/organization.data:233
-msgid "Firewalls"
-msgstr "ファイアウォール"
-
-#: ../../english/intro/organization.data:234
-msgid "Embedded systems"
-msgstr "組み込みシステム"
-
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:220
 msgid "Press Contact"
 msgstr "広報窓口"
 
-#: ../../english/intro/organization.data:251
+#: ../../english/intro/organization.data:222
 msgid "Web Pages"
 msgstr "ウェブページ"
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:234
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:268
+#: ../../english/intro/organization.data:239
 msgid "Outreach"
 msgstr "教育"
 
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:244
 msgid "Debian Women Project"
 msgstr "Debian Women プロジェクト"
 
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:252
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:261
 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
+#: ../../english/intro/organization.data:263
 msgid "Events"
 msgstr "イベント"
 
-#: ../../english/intro/organization.data:299
+#: ../../english/intro/organization.data:270
 #, fuzzy
 msgid "DebConf Committee"
 msgstr "技術委員会"
 
-#: ../../english/intro/organization.data:306
+#: ../../english/intro/organization.data:277
 msgid "Partner Program"
 msgstr "パートナープログラム"
 
-#: ../../english/intro/organization.data:310
+#: ../../english/intro/organization.data:281
 msgid "Hardware Donations Coordination"
 msgstr "ハードウェア寄付コーディネーション"
 
-#: ../../english/intro/organization.data:325
+#: ../../english/intro/organization.data:296
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:327
+#: ../../english/intro/organization.data:298
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:300
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:331
+#: ../../english/intro/organization.data:302
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:333
+#: ../../english/intro/organization.data:304
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:305
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:337
+#: ../../english/intro/organization.data:308
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:311
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:314
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:350
-msgid "User support"
-msgstr "ユーザサポート"
-
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:321
 msgid "Bug Tracking System"
 msgstr "バグ追跡システム (BTS)"
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:326
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "メーリングリスト管理とメーリングリストアーカイブ"
 
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:335
 msgid "New Members Front Desk"
 msgstr "新規メンバー受付"
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:341
 msgid "Debian Account Managers"
 msgstr "Debian アカウント管理者"
 
-#: ../../english/intro/organization.data:441
+#: ../../english/intro/organization.data:345
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -385,31 +361,31 @@ msgstr ""
 "(全) DAM に私信のメールを送る際には 57731224A9762EA155AB2A530CA8D15BB24D96F2 "
 "の GPG 鍵を使ってください。"
 
-#: ../../english/intro/organization.data:442
+#: ../../english/intro/organization.data:346
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "公開鍵管理者 (PGP および GPG)"
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:350
 msgid "Security Team"
 msgstr "セキュリティチーム"
 
-#: ../../english/intro/organization.data:457
+#: ../../english/intro/organization.data:361
 msgid "Consultants Page"
 msgstr "コンサルタントページ"
 
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:366
 msgid "CD Vendors Page"
 msgstr "CD ベンダページ"
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:369
 msgid "Policy"
 msgstr "ポリシー"
 
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:372
 msgid "System Administration"
 msgstr "システム管理"
 
-#: ../../english/intro/organization.data:469
+#: ../../english/intro/organization.data:373
 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."
@@ -418,7 +394,7 @@ msgstr ""
 "ストールの依頼など、Debianマシンのいずれかに何か問題のある際に用いる連絡先で"
 "す。"
 
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:383
 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 "
@@ -428,82 +404,100 @@ msgstr ""
 "\">Debian マシン</a>のページを参照してください。そこにはマシンごとの管理情報"
 "があります。"
 
-#: ../../english/intro/organization.data:480
+#: ../../english/intro/organization.data:384
 msgid "LDAP Developer Directory Administrator"
 msgstr "LDAP 開発者ディレクトリ管理者"
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:385
 msgid "Mirrors"
 msgstr "ミラー"
 
-#: ../../english/intro/organization.data:488
+#: ../../english/intro/organization.data:392
 msgid "DNS Maintainer"
 msgstr "DNS 管理"
 
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:393
 msgid "Package Tracking System"
 msgstr "パッケージ追跡システム"
 
-#: ../../english/intro/organization.data:491
+#: ../../english/intro/organization.data:395
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:498
+#: ../../english/intro/organization.data:402
 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:502
+#: ../../english/intro/organization.data:406
 #, fuzzy
 msgid "Salsa administrators"
 msgstr "Alioth 管理者"
 
-#~ msgid "Alioth administrators"
-#~ msgstr "Alioth 管理者"
+#~ msgid "Anti-harassment"
+#~ msgstr "嫌がらせ反対"
 
-#~ msgid "DebConf chairs"
-#~ msgstr "DebConf 役員"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
 
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian メンテナ (DM) 公開鍵管理者"
+#~ msgid "Individual Packages"
+#~ msgstr "個々のパッケージ"
 
-#~ msgid "Publicity"
-#~ msgstr "広報"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "1歳から99歳までのこどものための Debian"
 
-#~ msgid "Auditor"
-#~ msgstr "監事"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "臨床医学と医学研究のための Debian"
 
-#~ msgid "Live System Team"
-#~ msgstr "ライブシステムチーム"
+#~ msgid "Debian for education"
+#~ msgstr "教育のための Debian"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "法律事務所のための Debian"
+
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "障害者のための Debian"
+
+#~ msgid "Debian for science and related research"
+#~ msgstr "科学研究のための Debian"
 
 #, fuzzy
 #~| msgid "Debian for education"
 #~ msgid "Debian for astronomy"
 #~ msgstr "教育のための Debian"
 
-#~ msgid "Debian for science and related research"
-#~ msgstr "科学研究のための Debian"
+#~ msgid "Live System Team"
+#~ msgstr "ライブシステムチーム"
 
-#~ msgid "Debian for people with disabilities"
-#~ msgstr "障害者のための Debian"
+#~ msgid "Auditor"
+#~ msgstr "監事"
 
-#~ msgid "Debian in legal offices"
-#~ msgstr "法律事務所のための Debian"
+#~ msgid "Publicity"
+#~ msgstr "広報"
 
-#~ msgid "Debian for education"
-#~ msgstr "教育のための Debian"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian メンテナ (DM) 公開鍵管理者"
 
-#~ msgid "Debian for medical practice and research"
-#~ msgstr "臨床医学と医学研究のための Debian"
+#~ msgid "DebConf chairs"
+#~ msgstr "DebConf 役員"
 
-#~ msgid "Debian for children from 1 to 99"
-#~ msgstr "1歳から99歳までのこどものための Debian"
+#~ msgid "Alioth administrators"
+#~ msgstr "Alioth 管理者"
 
-#~ msgid "Individual Packages"
-#~ msgstr "個々のパッケージ"
+#~ msgid "User support"
+#~ msgstr "ユーザサポート"
 
-#~ msgid "Debian Pure Blends"
-#~ msgstr "Debian Pure Blends"
+#~ msgid "Embedded systems"
+#~ msgstr "組み込みシステム"
 
-#~ msgid "Anti-harassment"
-#~ msgstr "嫌がらせ反対"
+#~ msgid "Firewalls"
+#~ msgstr "ファイアウォール"
+
+#~ msgid "Laptops"
+#~ msgstr "ラップトップ"
+
+#~ msgid "Special Configurations"
+#~ msgstr "特殊な設定"
+
+#~ msgid "Ports"
+#~ msgstr "移植"
diff --git a/japanese/po/others.ja.po b/japanese/po/others.ja.po
index a8f37e4812d..cfaa72cfa17 100644
--- a/japanese/po/others.ja.po
+++ b/japanese/po/others.ja.po
@@ -9,14 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/banners/index.tags:7
-msgid "Download"
-msgstr "ダウンロード"
-
-#: ../../english/banners/index.tags:11
-msgid "Old banner ads"
-msgstr "古いバナー"
-
 #: ../../english/devel/debian-installer/ports-status.defs:10
 msgid "Working"
 msgstr "作業中"
@@ -296,61 +288,56 @@ msgstr "技術系のグループで他の女性と共同作業をしています
 msgid "A bit more about you..."
 msgstr "他に何か一言あれば"
 
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
-msgstr "対応"
+#~ msgid "Where:"
+#~ msgstr "場所:"
+
+#~ msgid "Specifications:"
+#~ msgstr "スペック:"
+
+#~ msgid "Architecture:"
+#~ msgstr "アーキテクチャ:"
 
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
-msgstr "未対応"
+#~ msgid "Who:"
+#~ msgstr "必要としている人/グループ:"
 
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
-msgstr "対応?"
+#~ msgid "Wanted:"
+#~ msgstr "必要なハードウェア:"
 
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
-msgstr "未対応?"
+#~ msgid "URL"
+#~ msgstr "URL"
 
-#: ../../english/y2k/l10n.data:18
-msgid "??"
-msgstr "??"
+#~ msgid "Version"
+#~ msgstr "バージョン"
 
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
-msgstr "不明"
+#~ msgid "Status"
+#~ msgstr "状況"
 
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
-msgstr "すべて"
+#~ msgid "Package"
+#~ msgstr "パッケージ"
 
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
-msgstr "パッケージ"
+#~ msgid "ALL"
+#~ msgstr "すべて"
 
-#: ../../english/y2k/l10n.data:30
-msgid "Status"
-msgstr "状況"
+#~ msgid "Unknown"
+#~ msgstr "不明"
 
-#: ../../english/y2k/l10n.data:33
-msgid "Version"
-msgstr "バージョン"
+#~ msgid "??"
+#~ msgstr "??"
 
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
-msgstr "URL"
+#~ msgid "BAD?"
+#~ msgstr "未対応?"
 
-#~ msgid "Wanted:"
-#~ msgstr "必要なハードウェア:"
+#~ msgid "OK?"
+#~ msgstr "対応?"
 
-#~ msgid "Who:"
-#~ msgstr "必要としている人/グループ:"
+#~ msgid "BAD"
+#~ msgstr "未対応"
 
-#~ msgid "Architecture:"
-#~ msgstr "アーキテクチャ:"
+#~ msgid "OK"
+#~ msgstr "対応"
 
-#~ msgid "Specifications:"
-#~ msgstr "スペック:"
+#~ msgid "Old banner ads"
+#~ msgstr "古いバナー"
 
-#~ msgid "Where:"
-#~ msgstr "場所:"
+#~ msgid "Download"
+#~ msgstr "ダウンロード"
diff --git a/japanese/po/partners.ja.po b/japanese/po/partners.ja.po
index e0a331a2a69..552cb833d2a 100644
--- a/japanese/po/partners.ja.po
+++ b/japanese/po/partners.ja.po
@@ -108,15 +108,13 @@ msgid ""
 "href=\"https://www.credativ.com/\">https://www.credativ.com/</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:82
+#: ../../english/partners/partners.def:83
 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 "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"hosting services from their colocation sites via high-speed connection."
 msgstr ""
 
-#: ../../english/partners/partners.def:86
+#: ../../english/partners/partners.def:87
 msgid ""
 "Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
 "on IT infrastructures, software development and hosting services. DG-i "
@@ -128,7 +126,7 @@ msgid ""
 "infrastructure in their Munich and Dusseldorf data centers."
 msgstr ""
 
-#: ../../english/partners/partners.def:92
+#: ../../english/partners/partners.def:93
 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 "
@@ -136,7 +134,7 @@ msgid ""
 "networkupstools.org/\">Network UPS Tools</a> and related packages."
 msgstr ""
 
-#: ../../english/partners/partners.def:95
+#: ../../english/partners/partners.def:96
 msgid ""
 "Eaton is a global technology leader in electrical components and systems for "
 "power quality, distribution and control; hydraulics components, systems and "
@@ -147,14 +145,15 @@ msgid ""
 "more than 150 countries, with 2008 sales of $15.4 billion."
 msgstr ""
 
-#: ../../english/partners/partners.def:102
+#: ../../english/partners/partners.def:103
 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>."
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a> and <a href="
+"\"http://security.debian.org\">security.debian.org</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:105
+#: ../../english/partners/partners.def:106
 msgid ""
 "Fastly’s edge cloud platform provides advanced application delivery and "
 "cloud security for the world’s most popular online destinations. Fastly "
@@ -162,14 +161,14 @@ msgid ""
 "month, more than 10 percent of all internet requests."
 msgstr ""
 
-#: ../../english/partners/partners.def:112
+#: ../../english/partners/partners.def:113
 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:115
+#: ../../english/partners/partners.def:116
 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 "
@@ -178,13 +177,13 @@ msgid ""
 "powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
 msgstr ""
 
-#: ../../english/partners/partners.def:122
+#: ../../english/partners/partners.def:123
 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:125
+#: ../../english/partners/partners.def:126
 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 "
@@ -193,31 +192,49 @@ msgstr ""
 
 #: ../../english/partners/partners.def:132
 msgid ""
+"<a href=\"https://www.hetzner.com\">Hetzner</a> provides the Debian project "
+"with hosting services."
+msgstr ""
+
+#: ../../english/partners/partners.def:135
+msgid ""
+"Hetzner Online is a professional web hosting provider and experienced data "
+"center operator. Since 1997 the company has provided private and business "
+"clients with high-performance hosting products as well as the necessary "
+"infrastructure for the efficient operation of websites. A combination of "
+"stable technology, attractive pricing and flexible support and services has "
+"enabled Hetzner Online to continuously strengthen its market position both "
+"nationally and internationally. The company owns several data centers in "
+"Germany and Finland."
+msgstr ""
+
+#: ../../english/partners/partners.def:142
+msgid ""
 "<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
 "(HPE)</a> provides hardware for port development, Debian mirrors, and other "
 "Debian services (current HPE hardware donations are listed in the <a href="
 "\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:145
 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:143
+#: ../../english/partners/partners.def:153
 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."
 "debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 300 Terabytes "
+"(TB) of capacity. In 2020 they renewed their support by provisioning new "
+"dedicated servers with bigger disk drives, enough to accommodate anticipated "
+"growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
 msgid ""
 "LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
 "customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -225,7 +242,7 @@ msgid ""
 "\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:152
+#: ../../english/partners/partners.def:162
 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 "
@@ -234,7 +251,7 @@ msgid ""
 "Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:155
+#: ../../english/partners/partners.def:165
 msgid ""
 "Loongson processors are a series of MIPS-compatible processors. They have "
 "been widely used in many areas, such as desktop, server, embedded "
@@ -242,15 +259,14 @@ msgid ""
 "<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:161
+#: ../../english/partners/partners.def:172
 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 "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"by hosting several debian.org and debian.net servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:176
 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 "
@@ -260,27 +276,27 @@ msgid ""
 "both universities."
 msgstr ""
 
-#: ../../english/partners/partners.def:173
+#: ../../english/partners/partners.def:183
 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:177
+#: ../../english/partners/partners.def:187
 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:184
+#: ../../english/partners/partners.def:194
 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:188
+#: ../../english/partners/partners.def:198
 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 "
@@ -288,14 +304,14 @@ msgid ""
 "department and has been successfully in use for the .at zone."
 msgstr ""
 
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
 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:197
+#: ../../english/partners/partners.def:207
 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 "
@@ -304,7 +320,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:204
+#: ../../english/partners/partners.def:214
 msgid ""
 "<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
 "utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -314,35 +330,14 @@ msgid ""
 "\">Planet Debian</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:207
+#: ../../english/partners/partners.def:217
 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: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: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: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:225
+#: ../../english/partners/partners.def:223
 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 "
@@ -352,7 +347,7 @@ msgid ""
 "thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:228
+#: ../../english/partners/partners.def:226
 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-"
@@ -362,7 +357,7 @@ msgid ""
 "course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:234
+#: ../../english/partners/partners.def:232
 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. "
@@ -371,7 +366,7 @@ msgid ""
 "for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:237
+#: ../../english/partners/partners.def:235
 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 "
@@ -379,7 +374,7 @@ msgid ""
 "\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:245
+#: ../../english/partners/partners.def:243
 msgid ""
 "The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
 "provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -389,7 +384,7 @@ msgid ""
 "increasing the amount of snapshot storage provided."
 msgstr ""
 
-#: ../../english/partners/partners.def:248
+#: ../../english/partners/partners.def:246
 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 "
@@ -400,14 +395,14 @@ msgid ""
 "treatments for human disease."
 msgstr ""
 
-#: ../../english/partners/partners.def:258
+#: ../../english/partners/partners.def:256
 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:261
+#: ../../english/partners/partners.def:259
 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, "
@@ -416,7 +411,7 @@ msgid ""
 "\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:268
+#: ../../english/partners/partners.def:266
 msgid ""
 "<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
 "port development, Debian mirrors, and other Debian services (current HP "
@@ -426,7 +421,7 @@ msgid ""
 "com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:271
+#: ../../english/partners/partners.def:269
 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, "
@@ -434,7 +429,7 @@ msgid ""
 "solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:278
+#: ../../english/partners/partners.def:276
 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 "
@@ -442,7 +437,7 @@ msgid ""
 "current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:282
+#: ../../english/partners/partners.def:280
 msgid ""
 "Linux Central sells all the latest releases of Linux products such as "
 "commercial software, books, hardware, and versions of major Linux "
@@ -452,14 +447,14 @@ msgid ""
 "contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:289
+#: ../../english/partners/partners.def:287
 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:296
+#: ../../english/partners/partners.def:294
 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 "
@@ -470,7 +465,7 @@ msgid ""
 "copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:303
+#: ../../english/partners/partners.def:301
 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 "
@@ -478,7 +473,7 @@ msgid ""
 "donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:304
 msgid ""
 "Open Source Press specialises on books around Linux and Open Source "
 "Software, written by authors with considerable experience in the fields, and "
@@ -486,7 +481,7 @@ msgid ""
 "Source Press publications are renowned for their quality and depth."
 msgstr ""
 
-#: ../../english/partners/partners.def:314
+#: ../../english/partners/partners.def:312
 msgid ""
 "<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
 "Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -494,13 +489,13 @@ msgid ""
 "virtual servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:317
+#: ../../english/partners/partners.def:315
 msgid ""
 "It hosts a Debian development machine, <a href=\"https://db.debian.org/"
 "machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:325
+#: ../../english/partners/partners.def:323
 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 "
@@ -508,7 +503,7 @@ msgid ""
 "ARM port."
 msgstr ""
 
-#: ../../english/partners/partners.def:328
+#: ../../english/partners/partners.def:326
 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> "
@@ -518,3 +513,24 @@ msgid ""
 "fully custom designs. All of our products ship with open source tools and "
 "operating systems."
 msgstr ""
+
+#: ../../english/partners/partners.def:334
+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:337
+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:340
+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 ""
diff --git a/japanese/po/ports.ja.po b/japanese/po/ports.ja.po
index c065eafbc7b..67f2fc68ea0 100644
--- a/japanese/po/ports.ja.po
+++ b/japanese/po/ports.ja.po
@@ -113,135 +113,135 @@ msgstr "PowerPC 用 Debian"
 msgid "Debian for Sparc"
 msgstr "Sparc 用 Debian"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Motorola 680x0 用 Debian"
+#~ msgid "Debian for Laptops"
+#~ msgstr "ラップトップ用 Debian"
 
-#~ msgid "Debian for AMD64"
-#~ msgstr "AMD64 用 Debian"
+#~ msgid "Vendor/Name"
+#~ msgstr "ベンダ/名称"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "ARM 用 Debian"
+#~ msgid "Date announced"
+#~ msgstr "アナウンス日"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Beowulf 用 Debian"
+#~ msgid "Clock"
+#~ msgstr "クロック"
 
-#~ msgid "Main"
-#~ msgstr "メイン"
+#~ msgid "ICache"
+#~ msgstr "ICache"
 
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "DCache"
+#~ msgstr "DCache"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "MIPS 用 Debian"
+#~ msgid "TLB"
+#~ msgstr "TLB"
 
-#~ msgid "Debian for S/390"
-#~ msgstr "S/390 用 Debian"
+#~ msgid "ISA"
+#~ msgstr "ISA"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Sparc64 用 Debian"
+#~ msgid "Specials"
+#~ msgstr "特記事項"
 
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16、LCD コントローラ、コンパクトフラッシュ、UART、パラレル、RTC、キー"
-#~ "ボード、USB、タッチパッド、オーディオ"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "FPU なし (R2010)、外部キャッシュ"
 
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr ""
-#~ "Mips 16、コンパクトフラッシュ、UART、パラレル、RTC、オーディオ、PCIC"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "FPU なし (R3010)"
+
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "仮想インデックス L1 キャッシュ、L2 キャッシュコントローラ"
+
+#~ msgid "External L1 cache"
+#~ msgstr "外部 L1 キャッシュ"
+
+#~ msgid "Multiple chip CPU"
+#~ msgstr "複数チップ CPU"
 
 #~ 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"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー、I2C、LCD コントローラ"
 
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 キャッシュオンダイ"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー"
 
-#~ 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 "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, 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 "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 "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
 #~ msgstr "FPU なし、SDRAMC、ROMC、DMAC、PCIC、UART、タイマー"
 
-#~ 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, 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, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "FPU なし、SDRAMC、ROMC、タイマー、PCMCIA、LCD コントローラ、IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU、64 ビット外部バス"
 
-#~ 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, 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, UART, Timer, I2C, LCD Controller"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー、I2C、LCD コントローラ"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
 
 #~ 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、ウォッチドッグ"
-
-#~ msgid "Multiple chip CPU"
-#~ msgstr "複数チップ CPU"
-
-#~ msgid "External L1 cache"
-#~ msgstr "外部 L1 キャッシュ"
-
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "仮想インデックス L1 キャッシュ、L2 キャッシュコントローラ"
+#~ "Mips 16、RTC、キーボード、タッチパッド、オーディオ、コンパクトフラッシュ、"
+#~ "UART、パラレル"
 
-#~ msgid "No FPU (R3010)"
-#~ msgstr "FPU なし (R3010)"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr ""
+#~ "Mips 16、コンパクトフラッシュ、UART、パラレル、RTC、オーディオ、PCIC"
 
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "FPU なし (R2010)、外部キャッシュ"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16、LCD コントローラ、コンパクトフラッシュ、UART、パラレル、RTC、キー"
+#~ "ボード、USB、タッチパッド、オーディオ"
 
-#~ msgid "Specials"
-#~ msgstr "特記事項"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Sparc64 用 Debian"
 
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Debian for S/390"
+#~ msgstr "S/390 用 Debian"
 
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Debian for MIPS"
+#~ msgstr "MIPS 用 Debian"
 
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Main"
+#~ msgstr "メイン"
 
-#~ msgid "Clock"
-#~ msgstr "クロック"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Beowulf 用 Debian"
 
-#~ msgid "Date announced"
-#~ msgstr "アナウンス日"
+#~ msgid "Debian for ARM"
+#~ msgstr "ARM 用 Debian"
 
-#~ msgid "Vendor/Name"
-#~ msgstr "ベンダ/名称"
+#~ msgid "Debian for AMD64"
+#~ msgstr "AMD64 用 Debian"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "ラップトップ用 Debian"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Motorola 680x0 用 Debian"
diff --git a/japanese/po/stats.ja.po b/japanese/po/stats.ja.po
index 4e8c3a6695f..da6496ae6cc 100644
--- a/japanese/po/stats.ja.po
+++ b/japanese/po/stats.ja.po
@@ -229,19 +229,19 @@ msgstr "翻訳済ページ (サイズ)"
 msgid "Translation Statistics by Page Size"
 msgstr "ページサイズから見た翻訳状況"
 
-#~ msgid "Unified diff"
-#~ msgstr "差分(統合)"
+#~ msgid "Created with"
+#~ msgstr "Created with"
 
-#~ msgid "Colored diff"
-#~ msgstr "差分(色分け)"
+#~ msgid "Origin"
+#~ msgstr "原版"
 
 #, fuzzy
 #~| msgid "Colored diff"
 #~ msgid "Commit diff"
 #~ msgstr "差分(色分け)"
 
-#~ msgid "Origin"
-#~ msgstr "原版"
+#~ msgid "Colored diff"
+#~ msgstr "差分(色分け)"
 
-#~ msgid "Created with"
-#~ msgstr "Created with"
+#~ msgid "Unified diff"
+#~ msgstr "差分(統合)"
diff --git a/japanese/po/templates.ja.po b/japanese/po/templates.ja.po
index 3c00b80c47a..8b99a2b3ca5 100644
--- a/japanese/po/templates.ja.po
+++ b/japanese/po/templates.ja.po
@@ -23,7 +23,7 @@ msgstr "Debian ウェブサイトを検索する。"
 msgid "Debian"
 msgstr "Debian"
 
-#: ../../english/template/debian/basic.wml:46
+#: ../../english/template/debian/basic.wml:48
 msgid "Debian website search"
 msgstr "Debian ウェブサイト検索"
 
@@ -492,7 +492,7 @@ msgstr "過去のイベント"
 msgid "(new revision)"
 msgstr "(新しいリビジョン)"
 
-#: ../../english/template/debian/recent_list.wml:303
+#: ../../english/template/debian/recent_list.wml:329
 msgid "Report"
 msgstr "レポート"
author	Laura Arjona Reina <larjona@debian.org>	2020-12-17 10:54:56 +0100
committer	Laura Arjona Reina <larjona@debian.org>	2020-12-17 10:54:56 +0100
commit	bd724167ab81e48329e5095cd35524d912889451 (patch)
tree	5e82ffac77ce9f221ed5948d8c45ed231eefaa59 /japanese/po
parent	f9f6a63839fd44f51e468a373a727341bd4eca6f (diff)