Subject: [PATCH 1/2] Update Japanese translation (d-w@jp:21830)

CVS version numbers

japanese/events/material.wml: 1.10 -> 1.11 
japanese/international/Catalan/index.wml: 1.1 -> 1.2 
japanese/po/doc.ja.po: 1.26 -> 1.27 
japanese/po/organization.ja.po: 1.41 -> 1.42 
japanese/po/others.ja.po: 1.33 -> 1.34 
japanese/vote/2014/index.wml: INITIAL -> 1.1 
japanese/vote/2014/vote_001.wml: 1.1 -> 1.2 
japanese/vote/2014/vote_002.wml: 1.1 -> 1.2

3 files changed, 245 insertions, 359 deletions

diff --git a/japanese/po/doc.ja.po b/japanese/po/doc.ja.po
index 3964176478a..02d8cd92d86 100644
--- a/japanese/po/doc.ja.po
+++ b/japanese/po/doc.ja.po
@@ -10,6 +10,123 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "著者名:"
+
+#: ../../english/doc/books.def:41
+msgid "email:"
+msgstr "電子メール:"
+
+#: ../../english/doc/books.def:45
+msgid "Available at:"
+msgstr "入手先:"
+
+#: ../../english/doc/books.def:48
+msgid "CD Included:"
+msgstr "収録される CD:"
+
+#: ../../english/doc/books.def:51
+msgid "Publisher:"
+msgstr "出版社:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "著者名:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "編集者名:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "メンテナ:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "状態:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "入手:"
+
+#: ../../english/doc/manuals.defs:92
+msgid "Latest version:"
+msgstr "最新バージョン:"
+
+#: ../../english/doc/manuals.defs:108
+msgid "(version <get-var version />)"
+msgstr "(バージョン <get-var version />)"
+
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:34
+msgid "plain text"
+msgstr "プレーンテキスト"
+
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"http://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+"最新の <get-var srctype /> ソースは <a href=\"http://www.debian.org/doc/"
+"cvs\">Subversion</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+msgid "Web interface: "
+msgstr "ウェブインターフェイス: "
+
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
+msgstr "VCS インターフェイス: "
+
+#: ../../english/doc/manuals.defs:162
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"http://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"最新の <get-var srctype /> ソースは <a href=\"http://packages.debian.org/"
+"cvs\">Cvs</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../english/doc/manuals.defs:170
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"http://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"最新の <get-var srctype /> ソースは <a href=\"http://packages.debian.org/"
+"subversion\">Subversion</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../english/doc/manuals.defs:178
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"http://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"最新の <get-var srctype /> ソースは <a href=\"http://packages.debian.org/"
+"git\">Git</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../english/doc/manuals.defs:188
+msgid ""
+"CVS sources working copy: set <code>CVSROOT</code>\n"
+"  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+"  and check out the <kbd>boot-floppies/documentation</kbd> module."
+msgstr ""
+"作業中の CVS ソースを得るには: <code>CVSROOT</code> 変数を\n"
+"<kbd>:ext:<var>ユーザID</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
+"に設定し、<kbd>boot-floppies/documentation</kbd> モジュールを checkout してく"
+"ださい。"
+
+#: ../../english/doc/manuals.defs:193
+msgid "CVS via web"
+msgstr "ウェブ経由で CVS を見る"
+
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+msgid "Debian package"
+msgstr "Debian パッケージ"
+
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+msgid "Debian package (archived)"
+msgstr "Debian パッケージ (アーカイブ)"
+
 #: ../../english/doc/books.data:30
 msgid ""
 "Written by two Debian developers, this free book\n"
@@ -74,12 +191,12 @@ msgstr ""
 "  独自のパッケージ管理システムにも触れています。"
 
 #: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:229 ../../english/doc/books.data:274
+#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
 msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
 msgstr "公式 Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386) 版"
 
 #: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:232 ../../english/doc/books.data:277
+#: ../../english/doc/books.data:227 ../../english/doc/books.data:272
 msgid ""
 "This book introduces the concepts and techniques of the Debian\n"
 "  operating system, explaining their usage and pitfalls, and\n"
@@ -220,24 +337,11 @@ msgstr ""
 msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
 msgstr "2 種類あります: DVD 付属無しと DVD 2 枚 (i386 収録) 付き"
 
-#: ../../english/doc/books.data:208
-msgid ""
-"An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-"mode=viewone&amp;titnr=254925022\">\n"
-"  publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-"29.95\n"
-"  euro (as of 2008)."
-msgstr ""
-"Lehmanns Fachbuchhandlung からは別のものが<a\n"
-"  href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
-"titnr=254925022\">\n"
-"  出版</a>されていて、29.95 &euro; です (2008 年現在)。"
-
-#: ../../english/doc/books.data:218
+#: ../../english/doc/books.data:213
 msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
 msgstr "Debian Squeeze 6.0.1a, Multi-Arch (i386 および amd64) DVD"
 
-#: ../../english/doc/books.data:221
+#: ../../english/doc/books.data:216
 msgid ""
 "This book teaches you how to install and configure the system and also how "
 "to use Debian in a professional environment.  It shows the full potential of "
@@ -250,14 +354,14 @@ msgstr ""
 "ン 6.0) のあらゆる潜在能力を示し、Debian およびその対応業務の範囲について理解"
 "しようとする全ユーザに実用的なマニュアルを提供します。"
 
-#: ../../english/doc/books.data:249
+#: ../../english/doc/books.data:244
 msgid ""
 "2 editions: One with no CD, the other with Official CD (i386, contrib and "
 "sources)"
 msgstr ""
 "2 種類あります: CD 付属無しと公式 CD (i386, contrib およびソース収録) 付き"
 
-#: ../../english/doc/books.data:252
+#: ../../english/doc/books.data:247
 msgid ""
 "The book covers all steps of planning and installing Debian GNU/Linux on\n"
 "  PC based hardware, including important applications like the X Window\n"
@@ -289,11 +393,11 @@ msgstr ""
 "  Windows ベースのクライアント用サーバ (SAMBA)\n"
 "  の設計・構築のような、ネットワーク構築とシステム管理の話題です。"
 
-#: ../../english/doc/books.data:295
+#: ../../english/doc/books.data:290
 msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
 msgstr "Debian GNU/Linux 3.1 Sarge インストーラ (シングルサイズ CD)"
 
-#: ../../english/doc/books.data:298
+#: ../../english/doc/books.data:293
 msgid ""
 "This book is dictionary style and covers various tips for beginners\n"
 "  and intermediate skill users; installation via various ways,\n"
@@ -304,13 +408,13 @@ msgstr ""
 "  トラブルシューティング、ためになるノウハウ等の、さまざまな Tips を紹介して"
 "います。"
 
-#: ../../english/doc/books.data:311
+#: ../../english/doc/books.data:306
 msgid ""
 "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
 "     CD)"
 msgstr "Debian GNU/Linux 3.1r0 i386, 著者エディション (DVD + CD)"
 
-#: ../../english/doc/books.data:315
+#: ../../english/doc/books.data:310
 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"
@@ -327,11 +431,11 @@ msgstr ""
 "  本書はデスクトップを飾る商用フォントパッケージも収録しています。\n"
 "  初心者から熟練ユーザまですべての Debian ユーザにとって便利な本でしょう。"
 
-#: ../../english/doc/books.data:330
+#: ../../english/doc/books.data:325
 msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
 msgstr "Debian GNU/Linux 2.2r0 i386, 著者エディション (CD 3 枚組)"
 
-#: ../../english/doc/books.data:333
+#: ../../english/doc/books.data:328
 msgid ""
 "This book covers general topics about Debian GNU/Linux:\n"
 "  installation, APT and dpkg, shell, X Window System, networking, system\n"
@@ -346,11 +450,11 @@ msgstr ""
 "  カスタム CD を用いることで、Debian GNU/Linux の日本語環境を非常に\n"
 "  簡単にインストール・使用することができます。"
 
-#: ../../english/doc/books.data:349
+#: ../../english/doc/books.data:344
 msgid "1 unofficial Woody, 3 Potato rev0"
 msgstr "非公式な Woody 1 枚と Potato rev0 が 3 枚"
 
-#: ../../english/doc/books.data:352
+#: ../../english/doc/books.data:347
 msgid ""
 "This book gives a brief guide to installation of Debian\n"
 "  GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
@@ -368,11 +472,11 @@ msgstr ""
 "  また、メンテナのためのガイドも扱い、\n"
 "  韓国にいる人々に公式な Debian メンテナになるように刺激を与えています。"
 
-#: ../../english/doc/books.data:366
+#: ../../english/doc/books.data:361
 msgid "Three official potato r3 CDs and an unofficial woody CD"
 msgstr "公式 potato r3 CD と非公式 woody CD"
 
-#: ../../english/doc/books.data:369
+#: ../../english/doc/books.data:364
 msgid ""
 "This book introduces readers to Debian GNU/Linux with many\n"
 "  hands-on tutorials and tips. Written in Korean, this book covers\n"
@@ -391,11 +495,11 @@ msgstr ""
 "  韓国語環境を Debian にセットアップするためのヒントも少々提供しています。\n"
 "  初心者にも適しています。"
 
-#: ../../english/doc/books.data:391
+#: ../../english/doc/books.data:386
 msgid "Debian GNU/Linux 3.1r0 CD1"
 msgstr "Debian GNU/Linux 3.1r0 CD1"
 
-#: ../../english/doc/books.data:394
+#: ../../english/doc/books.data:389
 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"
@@ -407,7 +511,7 @@ msgstr ""
 "  などのネットワークサービスの設定を手助けします。また、GNU/Linux\n"
 "  や Debian の強力なパッケージ管理システムを使い始めるのを支援します。"
 
-#: ../../english/doc/books.data:410
+#: ../../english/doc/books.data:405
 msgid ""
 "This book is divided into four parts: Basic concepts, Management of\n"
 "  GNU/Linux, Administration of the system and Advanced operations. Each "
@@ -436,7 +540,7 @@ msgstr ""
 "  GNU/Linux を詳細に学習する学生その他の人を対象としています。\n"
 "  この本は Debian Sarge を対象としています。"
 
-#: ../../english/doc/books.data:433
+#: ../../english/doc/books.data:428
 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 "
@@ -451,91 +555,6 @@ msgstr ""
 "Debian GNU/Linux オペレーティングシステムを使って特定の目的を実現するための手"
 "ほどきとなるでしょう。"
 
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "著者名:"
-
-#: ../../english/doc/books.def:41
-msgid "email:"
-msgstr "電子メール:"
-
-#: ../../english/doc/books.def:45
-msgid "Available at:"
-msgstr "入手先:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "収録される CD:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "出版社:"
-
-#: ../../english/doc/manuals.defs:26
-msgid "Authors:"
-msgstr "著者名:"
-
-#: ../../english/doc/manuals.defs:33
-msgid "Editors:"
-msgstr "編集者名:"
-
-#: ../../english/doc/manuals.defs:40
-msgid "Maintainer:"
-msgstr "メンテナ:"
-
-#: ../../english/doc/manuals.defs:47
-msgid "Status:"
-msgstr "状態:"
-
-#: ../../english/doc/manuals.defs:54
-msgid "Availability:"
-msgstr "入手:"
-
-#: ../../english/doc/manuals.defs:86
-msgid "Latest version:"
-msgstr "最新バージョン:"
-
-#: ../../english/doc/manuals.defs:102
-msgid "(version <get-var version />)"
-msgstr "(バージョン <get-var version />)"
-
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
-msgid "plain text"
-msgstr "プレーンテキスト"
-
-#. The ddp_pkg_loc variable contains 
-#. <a href="http://anonscm.debian.org/viewvc/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
-#: ../../english/doc/manuals.defs:152
-msgid ""
-"Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-"ddp_pkg_loc />."
-msgstr ""
-"<get-var ddp_pkg_loc /> の SGML ソースをダウンロードするには <a href=\"cvs"
-"\">SVN</a> を使ってください。"
-
-#: ../../english/doc/manuals.defs:158
-msgid ""
-"CVS sources working copy: set <code>CVSROOT</code>\n"
-"  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-"  and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr ""
-"作業中の CVS ソースを得るには: <code>CVSROOT</code> 変数を\n"
-"<kbd>:ext:<var>ユーザID</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
-"に設定し、<kbd>boot-floppies/documentation</kbd> モジュールを checkout してく"
-"ださい。"
-
-#: ../../english/doc/manuals.defs:163
-msgid "CVS via web"
-msgstr "ウェブ経由で CVS を見る"
-
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
-msgid "Debian package"
-msgstr "Debian パッケージ"
-
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
-msgid "Debian package (archived)"
-msgstr "Debian パッケージ (アーカイブ)"
-
 #: ../../english/releases/arches.data:32
 msgid "HTML"
 msgstr "HTML"
diff --git a/japanese/po/organization.ja.po b/japanese/po/organization.ja.po
index 124040687c1..0fe56240e7e 100644
--- a/japanese/po/organization.ja.po
+++ b/japanese/po/organization.ja.po
@@ -43,13 +43,13 @@ msgid "manager"
 msgstr "マネージャー"
 
 #: ../../english/intro/organization.data:32
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:32
 msgid "Stable Release Manager"
 msgstr "安定版リリース管理者"
 
+#: ../../english/intro/organization.data:32
+msgid "SRM"
+msgstr "SRM"
+
 #: ../../english/intro/organization.data:34
 msgid "wizard"
 msgstr "ウィザード"
@@ -247,51 +247,43 @@ msgstr "新規メンバー受付"
 msgid "Debian Account Managers"
 msgstr "Debian アカウント管理者"
 
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:339
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "公開鍵管理者 (PGP および GPG)"
 
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:342
 msgid "Debian Maintainer (DM) Keyring Maintainers"
 msgstr "Debian メンテナ (DM) 公開鍵管理者"
 
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:346
 msgid "Security Team"
 msgstr "セキュリティチーム"
 
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "テスト版 (testing) セキュリティチーム"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "セキュリティ監査プロジェクト"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:361
 msgid "Web Pages"
 msgstr "ウェブページ"
 
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:369
 msgid "Consultants Page"
 msgstr "コンサルタントページ"
 
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:374
 msgid "CD Vendors Page"
 msgstr "CD ベンダページ"
 
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:377
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:381
 msgid "Policy"
 msgstr "ポリシー"
 
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:386
 msgid "System Administration"
 msgstr "システム管理"
 
-#: ../../english/intro/organization.data:401
+#: ../../english/intro/organization.data:387
 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."
@@ -300,7 +292,7 @@ msgstr ""
 "ストールの依頼など、Debianマシンのいずれかに何か問題のある際に用いる連絡先で"
 "す。"
 
-#: ../../english/intro/organization.data:408
+#: ../../english/intro/organization.data:395
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"http://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -310,77 +302,74 @@ msgstr ""
 "\">Debian マシン</a>のページを参照してください。そこにはマシンごとの管理情報"
 "があります。"
 
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:396
 msgid "LDAP Developer Directory Administrator"
 msgstr "LDAP 開発者ディレクトリ管理者"
 
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:397
 msgid "Mirrors"
 msgstr "ミラー"
 
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:402
 msgid "DNS Maintainer"
 msgstr "DNS 管理"
 
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:403
 msgid "Package Tracking System"
 msgstr "パッケージ追跡システム"
 
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:405
 msgid "Hardware Donations Coordination"
 msgstr "ハードウェア寄付コーディネーション"
 
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:411
 msgid "Auditor"
 msgstr "監事"
 
-#: ../../english/intro/organization.data:427
+#: ../../english/intro/organization.data:414
 msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr "<a href=\"m4_HOME/trademark\">商標</a>利用申請"
 
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:415
 msgid "current Debian Project Leader"
 msgstr "現在の Debian プロジェクトリーダ"
 
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:417
 msgid "Alioth administrators"
 msgstr "Alioth 管理者"
 
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:423
 msgid "Debian Women Project"
 msgstr "Debian Women プロジェクト"
 
-#: ../../english/intro/organization.data:443
+#: ../../english/intro/organization.data:430
 msgid "DebConf chairs"
 msgstr "DebConf 役員"
 
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:434
 msgid "Anti-harassment"
 msgstr "嫌がらせ反対"
 
-#: ../../english/intro/organization.data:458
+#: ../../english/intro/organization.data:445
 msgid "Debian for children from 1 to 99"
 msgstr "1歳から99歳までのこどものための Debian"
 
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:448
 msgid "Debian for medical practice and research"
 msgstr "臨床医学と医学研究のための Debian"
 
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:451
 msgid "Debian for education"
 msgstr "教育のための Debian"
 
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:456
 msgid "Debian in legal offices"
 msgstr "法律事務所のための Debian"
 
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:460
 msgid "Debian for people with disabilities"
 msgstr "障害者のための Debian"
 
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:464
 msgid "Debian for science and related research"
 msgstr "科学研究のための Debian"
-
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Summer of Code 2013 管理者"
diff --git a/japanese/po/others.ja.po b/japanese/po/others.ja.po
index 4459591b4d4..31fa0e6b39c 100644
--- a/japanese/po/others.ja.po
+++ b/japanese/po/others.ja.po
@@ -57,42 +57,6 @@ msgstr "<void id=\"d-i\" />不明"
 msgid "Unavailable"
 msgstr "利用不可"
 
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "新規メンバーのコーナー"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "手順 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "手順 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "手順 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "手順 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "手順 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "手順 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "手順 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "応募者のチェックリスト"
-
 #: ../../english/devel/website/tc.data:11
 msgid ""
 "See <a href=\"m4_HOME/intl/french/\">http://www.debian.org/intl/french/</a> "
@@ -156,30 +120,6 @@ msgstr "[Debian 使用]"
 msgid "[Debian] (mini button)"
 msgstr "[Debian] (小さなボタン)"
 
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "同上"
-
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "必要なハードウェア:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "必要としている人/グループ:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "アーキテクチャ:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "スペック:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "場所:"
-
 #: ../../english/misc/merchandise.def:8
 msgid "Products"
 msgstr "製品"
@@ -240,36 +180,13 @@ msgstr "傘"
 msgid "pillowcases"
 msgstr "枕カバー"
 
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Debian を使い始めてどれくらいになりますか?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Debian 開発者ですか?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Debian のどの分野に関わっていますか?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Debian での作業に興味を持ったきっかけは何ですか?"
+#: ../../english/misc/merchandise.def:59
+msgid "keychains"
+msgstr "キーチェーン"
 
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr "Debian にもっと関わることに関心のある女性に何か一言あれば"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "技術系のグループで他の女性と共同作業をしていますか? あればどこですか?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "他に何か一言あれば"
+#: ../../english/misc/merchandise.def:63
+msgid "Swiss army knives"
+msgstr "十徳ナイフ"
 
 #: ../../english/y2k/l10n.data:6
 msgid "OK"
@@ -315,132 +232,93 @@ msgstr "バージョン"
 msgid "URL"
 msgstr "URL"
 
-#~ msgid "Unsubscribe"
-#~ msgstr "脱退"
-
-#~ msgid "Company:"
-#~ msgstr "企業名"
-
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
-#~ msgstr ""
-#~ "e-mail を使って脱退する方法については、<a href=\"./#subunsub\">メーリング"
-#~ "リスト</a>のページを参照してください。メーリングリストの購読については、"
-#~ "<a href=\"subscribe\">購読ウェブフォーム</a>が利用可能です。"
-
-#~ msgid "p<get-var page />"
-#~ msgstr "<get-var page /> ページ"
-
-#~ msgid "Previous Talks:"
-#~ msgstr "以前の講演:"
-
-#~ msgid "Languages:"
-#~ msgstr "言語:"
-
-#~ msgid "Location:"
-#~ msgstr "場所:"
-
-#~ msgid "Topics:"
-#~ msgstr "話題:"
-
-#~ msgid "closed"
-#~ msgstr "クローズド"
-
-#~ msgid "open"
-#~ msgstr "誰でも可能"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "脱退したいメーリングリストを選んでください:"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "新規メンバーのコーナー"
 
-#~ msgid "Name:"
-#~ msgstr "氏名"
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "手順 1"
 
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "メーリングリストからの脱退"
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "手順 2"
 
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr ""
-#~ "<a href=\"./#ads\">Debian メーリングリスト広告ポリシー</a>を守ってくださ"
-#~ "い。"
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "手順 3"
 
-#~ msgid "Clear"
-#~ msgstr "消去"
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "手順 4"
 
-#~ msgid "Subscribe"
-#~ msgstr "購読"
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "手順 5"
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "あなたの E-Mail アドレス:"
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "手順 6"
 
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "ダイジェスト版につき書き込みできません"
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "手順 7"
 
-#~ msgid "Subscription:"
-#~ msgstr "購読:"
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "応募者のチェックリスト"
 
-#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
-#~ msgstr ""
-#~ "このメーリングリストは、Debian 開発者によって署名されたメッセージのみ投稿"
-#~ "可能です。"
+#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
+msgid "Wanted:"
+msgstr "必要なハードウェア:"
 
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "投稿は購読者のみが可能です。"
+#: ../../english/misc/hardware.def:22
+msgid "Who:"
+msgstr "必要としている人/グループ:"
 
-#~ msgid "Moderated:"
-#~ msgstr "モデレーション:"
+#: ../../english/misc/hardware.def:26
+msgid "Architecture:"
+msgstr "アーキテクチャ:"
 
-#~ msgid "No description given"
-#~ msgstr "説明はありません"
+#: ../../english/misc/hardware.def:30
+msgid "Specifications:"
+msgstr "スペック:"
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "購読したいメーリングリストを選んでください:"
+#: ../../english/misc/hardware.def:35
+msgid "Where:"
+msgstr "場所:"
 
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "Debian のメーリングリストの大半は公開討論の場だということに注意してくださ"
-#~ "い。投稿されたあらゆるメールはメーリングリストの公開アーカイブで公開され、"
-#~ "検索エンジンによってインデックス化されます。Debian のメーリングリストを購"
-#~ "読するメールアドレスには、公開されても問題のないもののみを使用すべきです。"
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "同上"
 
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
-#~ msgstr ""
-#~ "e-mail を使って購読する方法については、<a href=\"./#subunsub\">メーリング"
-#~ "リスト</a>のページを参照してください。メーリングリストからの脱退について"
-#~ "は、<a href=\"unsubscribe\">脱退ウェブフォーム</a>が利用可能です。"
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Debian を使い始めてどれくらいになりますか?"
 
-#~ msgid "Mailing List Subscription"
-#~ msgstr "メーリングリストの購読"
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Debian 開発者ですか?"
 
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "世界中の <total_country> の国の <total_consultant> の Debian コンサルタン"
-#~ "トが掲載されています。"
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Debian のどの分野に関わっていますか?"
 
-#~ msgid "Willing to Relocate"
-#~ msgstr "引越し予定"
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Debian での作業に興味を持ったきっかけは何ですか?"
 
-#~ msgid "Rates:"
-#~ msgstr "料金"
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr "Debian にもっと関わることに関心のある女性に何か一言あれば"
 
-#~ msgid "Email:"
-#~ msgstr "電子メール"
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "技術系のグループで他の女性と共同作業をしていますか? あればどこですか?"
 
-#~ msgid "or"
-#~ msgstr "または"
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "他に何か一言あれば"