From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 23 Nov 2007 20:08:51 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=e2e70918476ad6fb373d29fde2ed70259be94a34;hp=10d8edcaa0572ec395661ad18fd84f60e1a7b510

Merge commit 'origin/master'
---

diff --git a/TODO b/TODO
index 6e1279d..ef30293 100644
--- a/TODO
+++ b/TODO
@@ -66,7 +66,6 @@ Cron:
 - refactorize 100syncarchive* so that there is not so much copied code
 
 Missing pieces from old code:
- - gettext support in templates
  - search_packages result parser?
    reportbug in sarge is completly broken in this regard anyway AFAICT
    reportbug in etch works as long as there is the exact hit but
diff --git a/po/debtags.ja.po b/po/debtags.ja.po
index 1247088..d1bf547 100644
--- a/po/debtags.ja.po
+++ b/po/debtags.ja.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: packages.debian.org trunk\n"
 "Report-Msgid-Bugs-To: debian-www@lists.debian.org\n"
 "POT-Creation-Date: 2007-10-21 18:33+0200\n"
-"PO-Revision-Date: 2007-11-21 14:53+0900\n"
+"PO-Revision-Date: 2007-11-22 19:19+0900\n"
 "Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <debian-www@debian.or.jp>\n"
 "MIME-Version: 1.0\n"
@@ -17,17 +17,17 @@ msgstr ""
 #. Tag: suite::gnustep, long desc
 #: files/debtags/vocabulary
 msgid "  GNUStep Desktop and WindowMaker"
-msgstr ""
+msgstr "  GNUstep デスクトップや WindowMaker"
 
 #. Tag: suite::gpe, long desc
 #: files/debtags/vocabulary
 msgid "  GPE Palmtop Environment"
-msgstr ""
+msgstr "  GPE Palmtop Environment"
 
 #. Tag: suite::gforge, long desc
 #: files/debtags/vocabulary
 msgid " A collaborative development platform."
-msgstr ""
+msgstr " 共同開発プラットフォーム。"
 
 #. Tag: scope::utility, long desc
 #: files/debtags/vocabulary
@@ -99,7 +99,7 @@ msgstr ""
 #. Tag: admin::automation, long desc
 #: files/debtags/vocabulary
 msgid " Automating the execution of software in the system."
-msgstr ""
+msgstr " システムに含まれているソフトウェアの実行の自動化。"
 
 #. Tag: works-with-format::bib, long desc
 #: files/debtags/vocabulary
@@ -176,7 +176,7 @@ msgstr ""
 #. Tag: admin::filesystem, long desc
 #: files/debtags/vocabulary
 msgid " Creation, maintenance, and use of filesystems"
-msgstr ""
+msgstr " ファイルシステムの作成・保守・使用"
 
 #. Tag: security::cryptography, long desc
 #: files/debtags/vocabulary
@@ -245,7 +245,7 @@ msgstr ""
 #. Tag: suite::eclipse, long desc
 #: files/debtags/vocabulary
 msgid " Eclipse tool platform and plugins."
-msgstr ""
+msgstr " Eclipse ツールプラットフォームおよびそのプラグイン。"
 
 #. Tag: protocol::ethernet, long desc
 #: files/debtags/vocabulary
@@ -314,6 +314,7 @@ msgstr ""
 #: files/debtags/vocabulary
 msgid " Gnu's Not Unix. The package is part of the official GNU project"
 msgstr ""
+" Gnu's Not Unix。公式に GNU プロジェクトの一部となっているパッケージです。"
 
 #. Facet: biology, long desc
 #: files/debtags/vocabulary
@@ -472,12 +473,12 @@ msgstr ""
 #. Tag: suite::xfce, long desc
 #: files/debtags/vocabulary
 msgid " Lightweight desktop environment for X11."
-msgstr ""
+msgstr " X11 用の軽量デスクトップ環境。"
 
 #. Tag: admin::login, long desc
 #: files/debtags/vocabulary
 msgid " Logging into the system"
-msgstr ""
+msgstr " システムへのログイン"
 
 #. Tag: game::mud, long desc
 #: files/debtags/vocabulary
@@ -487,7 +488,7 @@ msgstr ""
 #. Tag: suite::mozilla, long desc
 #: files/debtags/vocabulary
 msgid " Mozilla Browser and extensions"
-msgstr ""
+msgstr " Mozilla ウェブブラウザおよびその拡張"
 
 #. Tag: protocol::nfs, long desc
 #: files/debtags/vocabulary
@@ -623,6 +624,8 @@ msgid ""
 " This tag will be split into admin::recovery\n"
 " and security::forensics."
 msgstr ""
+" 喪失・損傷したデータの復旧。このタグは admin::recovery と security::"
+"forensics に分割予定です。"
 
 #. Tag: protocol::radius, long desc
 #: files/debtags/vocabulary
@@ -987,12 +990,12 @@ msgstr ""
 #. Tag: suite::netscape, long desc
 #: files/debtags/vocabulary
 msgid " The pre-6.0 versions of netscape browser"
-msgstr ""
+msgstr " バージョン 6.0 より前の Netscape ウェブブラウザ"
 
 #. Tag: suite::zope, long desc
 #: files/debtags/vocabulary
 msgid " The zope (web) publishing platform."
-msgstr ""
+msgstr " Zope (ウェブ) パブリッシングプラットフォーム。"
 
 #. Facet: works-with, long desc
 #: files/debtags/vocabulary
@@ -1010,6 +1013,8 @@ msgid ""
 " This is not hardware emulation, but rather those facilities that allow to\n"
 " create many isolated compartments inside the same system."
 msgstr ""
+" このタグはハードウェアエミュレーションではなく、むしろ隔離された区画を同一の"
+"システム内に多数作成できるようにする機能を指します。"
 
 #. Tag: special::invalid-tag, long desc
 #: files/debtags/vocabulary
@@ -1219,10 +1224,11 @@ msgstr ""
 msgid "Accessibility Support"
 msgstr "アクセシビリティサポート"
 
+# TRANSLATION-FIXME: Is this correct? How different is this from "User Management"?
 #. Tag: admin::accounting, short desc
 #: files/debtags/vocabulary
 msgid "Accounting"
-msgstr ""
+msgstr "アカウント"
 
 #. Tag: game::arcade, short desc
 #: files/debtags/vocabulary
@@ -1247,7 +1253,7 @@ msgstr ""
 #. Tag: culture::afrikaans, short desc
 #: files/debtags/vocabulary
 msgid "Afrikaans"
-msgstr ""
+msgstr "アフリカーンス語"
 
 #. Tag: use::analysing, short desc
 #: files/debtags/vocabulary
@@ -1262,7 +1268,7 @@ msgstr ""
 #. Tag: suite::apache, short desc
 #: files/debtags/vocabulary
 msgid "Apache"
-msgstr ""
+msgstr "Apache"
 
 #. Tag: x11::applet, short desc
 #: files/debtags/vocabulary
@@ -1294,7 +1300,7 @@ msgstr "アプリケーションスイート"
 #. Tag: culture::arabic, short desc
 #: files/debtags/vocabulary
 msgid "Arabic"
-msgstr ""
+msgstr "アラビア語"
 
 #. Tag: junior::arcade, short desc
 #: files/debtags/vocabulary
@@ -1319,7 +1325,7 @@ msgstr ""
 #. Tag: uitoolkit::athena, short desc
 #: files/debtags/vocabulary
 msgid "Athena Widgets"
-msgstr ""
+msgstr "Athena ウィジェット"
 
 #. Tag: works-with::audio, short desc
 #: files/debtags/vocabulary
@@ -1334,7 +1340,7 @@ msgstr ""
 #. Tag: admin::automation, short desc
 #: files/debtags/vocabulary
 msgid "Automation and scheduling"
-msgstr ""
+msgstr "自動化やスケジューリング"
 
 #. Tag: field::aviation, short desc
 #: files/debtags/vocabulary
@@ -1344,22 +1350,22 @@ msgstr ""
 #. Tag: admin::backup, short desc
 #: files/debtags/vocabulary
 msgid "Backup and Restoration"
-msgstr ""
+msgstr "バックアップおよびバックアップからの復旧"
 
 #. Tag: culture::basque, short desc
 #: files/debtags/vocabulary
 msgid "Basque"
-msgstr ""
+msgstr "バスク語"
 
 #. Tag: admin::benchmarking, short desc
 #: files/debtags/vocabulary
 msgid "Benchmarking"
-msgstr ""
+msgstr "ベンチマーク"
 
 #. Tag: culture::bengali, short desc
 #: files/debtags/vocabulary
 msgid "Bengali"
-msgstr ""
+msgstr "ベンガル語"
 
 #. Tag: works-with-format::bib, short desc
 #: files/debtags/vocabulary
@@ -1395,12 +1401,12 @@ msgstr ""
 #. Tag: culture::bosnian, short desc
 #: files/debtags/vocabulary
 msgid "Bosnian"
-msgstr ""
+msgstr "ボスニア語"
 
 #. Tag: culture::brazilian, short desc
 #: files/debtags/vocabulary
 msgid "Brazilian"
-msgstr ""
+msgstr "ブラジルポルトガル語"
 
 #. Tag: web::browser, short desc
 #: files/debtags/vocabulary
@@ -1430,7 +1436,7 @@ msgstr ""
 #. Tag: culture::bulgarian, short desc
 #: files/debtags/vocabulary
 msgid "Bulgarian"
-msgstr ""
+msgstr "ブルガリア語"
 
 #. Tag: bbs, short desc
 #: files/debtags/vocabulary
@@ -1495,7 +1501,7 @@ msgstr ""
 #. Tag: culture::catalan, short desc
 #: files/debtags/vocabulary
 msgid "Catalan"
-msgstr ""
+msgstr "カタルーニャ語"
 
 #. Tag: use::chatting, short desc
 #: files/debtags/vocabulary
@@ -1520,7 +1526,7 @@ msgstr ""
 #. Tag: culture::chinese, short desc
 #: files/debtags/vocabulary
 msgid "Chinese"
-msgstr ""
+msgstr "中国語"
 
 #. Tag: network::client, short desc
 #: files/debtags/vocabulary
@@ -1535,7 +1541,7 @@ msgstr ""
 #. Tag: admin::cluster, short desc
 #: files/debtags/vocabulary
 msgid "Clustering"
-msgstr ""
+msgstr "クラスタリング"
 
 #. Tag: devel::code-generator, short desc
 #: files/debtags/vocabulary
@@ -1570,7 +1576,7 @@ msgstr "圧縮"
 #. Tag: sound::compression, short desc
 #: files/debtags/vocabulary
 msgid "Compression"
-msgstr ""
+msgstr "圧縮"
 
 #. Tag: use::configuring, short desc
 #. Tag: network::configuration, short desc
@@ -1581,7 +1587,7 @@ msgstr "設定"
 #. Tag: admin::configuring, short desc
 #: files/debtags/vocabulary
 msgid "Configuration Tool"
-msgstr ""
+msgstr "設定ツール"
 
 #. Tag: interface::svga, short desc
 #: files/debtags/vocabulary
@@ -1596,7 +1602,7 @@ msgstr "コンテンツ管理 (CMS)"
 #. Tag: culture::croatian, short desc
 #: files/debtags/vocabulary
 msgid "Croatian"
-msgstr ""
+msgstr "クロアチア語"
 
 #. Tag: security::cryptography, short desc
 #: files/debtags/vocabulary
@@ -1611,7 +1617,7 @@ msgstr "文化"
 #. Tag: culture::czech, short desc
 #: files/debtags/vocabulary
 msgid "Czech"
-msgstr ""
+msgstr "チェコ語"
 
 #. Tag: protocol::dhcp, short desc
 #: files/debtags/vocabulary
@@ -1636,7 +1642,7 @@ msgstr "デーモン"
 #. Tag: culture::danish, short desc
 #: files/debtags/vocabulary
 msgid "Danish"
-msgstr ""
+msgstr "デンマーク語"
 
 #. Tag: use::converting, short desc
 #: files/debtags/vocabulary
@@ -1661,7 +1667,7 @@ msgstr "データの可視化"
 #. Tag: admin::recovery, short desc
 #: files/debtags/vocabulary
 msgid "Data recovery"
-msgstr ""
+msgstr "データ復旧"
 
 #. Tag: works-with::db, short desc
 #: files/debtags/vocabulary
@@ -1672,7 +1678,7 @@ msgstr ""
 #. Tag: suite::debian, short desc
 #: files/debtags/vocabulary
 msgid "Debian"
-msgstr ""
+msgstr "Debian"
 
 #. Tag: devel::debugger, short desc
 #: files/debtags/vocabulary
@@ -1749,7 +1755,7 @@ msgstr "ダウンロード"
 #. Tag: culture::dutch, short desc
 #: files/debtags/vocabulary
 msgid "Dutch"
-msgstr ""
+msgstr "オランダ語"
 
 #. Tag: web::commerce, short desc
 #: files/debtags/vocabulary
@@ -1769,7 +1775,7 @@ msgstr ""
 #. Tag: suite::eclipse, short desc
 #: files/debtags/vocabulary
 msgid "Eclipse"
-msgstr ""
+msgstr "Eclipse"
 
 #. Tag: devel::lang:ecmascript, short desc
 #: files/debtags/vocabulary
@@ -1799,7 +1805,7 @@ msgstr ""
 #. Tag: suite::emacs, short desc
 #: files/debtags/vocabulary
 msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
 
 #. Tag: works-with::mail, short desc
 #: files/debtags/vocabulary
@@ -1824,12 +1830,12 @@ msgstr "娯楽"
 #. Tag: culture::esperanto, short desc
 #: files/debtags/vocabulary
 msgid "Esperanto"
-msgstr ""
+msgstr "エスペラント語"
 
 #. Tag: culture::estonian, short desc
 #: files/debtags/vocabulary
 msgid "Estonian"
-msgstr ""
+msgstr "エストニア語"
 
 #. Tag: protocol::ethernet, short desc
 #: files/debtags/vocabulary
@@ -1844,7 +1850,7 @@ msgstr ""
 #. Tag: uitoolkit::fltk, short desc
 #: files/debtags/vocabulary
 msgid "FLTK"
-msgstr ""
+msgstr "FLTK"
 
 #. Tag: protocol::ftp, short desc
 #. Tag: filetransfer::ftp, short desc
@@ -1855,12 +1861,12 @@ msgstr "FTP"
 #. Tag: culture::faroese, short desc
 #: files/debtags/vocabulary
 msgid "Faroese"
-msgstr ""
+msgstr "フェロー語"
 
 #. Tag: culture::farsi, short desc
 #: files/debtags/vocabulary
 msgid "Farsi"
-msgstr ""
+msgstr "ペルシア語"
 
 #. Tag: works-with::fax, short desc
 #: files/debtags/vocabulary
@@ -1880,7 +1886,7 @@ msgstr "分野"
 #. Tag: admin::file-distribution, short desc
 #: files/debtags/vocabulary
 msgid "File Distribution"
-msgstr ""
+msgstr "ファイル配布"
 
 #. Tag: security::integrity, short desc
 #: files/debtags/vocabulary
@@ -1905,7 +1911,7 @@ msgstr ""
 #. Tag: admin::filesystem, short desc
 #: files/debtags/vocabulary
 msgid "Filesystem Tool"
-msgstr ""
+msgstr "ファイルシステムツール"
 
 #. Tag: use::filtering, short desc
 #: files/debtags/vocabulary
@@ -1935,7 +1941,7 @@ msgstr ""
 #. Tag: culture::finnish, short desc
 #: files/debtags/vocabulary
 msgid "Finnish"
-msgstr ""
+msgstr "フィンランド語"
 
 #. Tag: security::firewall, short desc
 #. Tag: network::firewall, short desc
@@ -1974,10 +1980,11 @@ msgstr ""
 msgid "Forensics"
 msgstr ""
 
+# TRANSLATION-FIXME: Is this correct?
 #. Tag: admin::forensics, short desc
 #: files/debtags/vocabulary
 msgid "Forensics and Recovery"
-msgstr ""
+msgstr "フォレンジックと復旧"
 
 #. Tag: implemented-in::fortran, short desc
 #: files/debtags/vocabulary
@@ -2002,12 +2009,12 @@ msgstr "フレームバッファ"
 #. Tag: culture::french, short desc
 #: files/debtags/vocabulary
 msgid "French"
-msgstr ""
+msgstr "フランス語"
 
 #. Tag: suite::gforge, short desc
 #: files/debtags/vocabulary
 msgid "GForge"
-msgstr ""
+msgstr "GForge"
 
 #. Tag: works-with-format::gif, short desc
 #: files/debtags/vocabulary
@@ -2017,22 +2024,22 @@ msgstr ""
 #. Tag: suite::gkrellm, short desc
 #: files/debtags/vocabulary
 msgid "GKrellM Monitors"
-msgstr ""
+msgstr "GKrellM モニタ"
 
 #. Tag: uitoolkit::glut, short desc
 #: files/debtags/vocabulary
 msgid "GLUT"
-msgstr ""
+msgstr "GLUT"
 
 #. Tag: suite::gnome, short desc
 #: files/debtags/vocabulary
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
 #. Tag: suite::gnu, short desc
 #: files/debtags/vocabulary
 msgid "GNU"
-msgstr ""
+msgstr "GNU"
 
 #. Tag: devel::lang:octave, short desc
 #: files/debtags/vocabulary
@@ -2052,22 +2059,22 @@ msgstr "GNU R での開発"
 #. Tag: suite::gnustep, short desc
 #: files/debtags/vocabulary
 msgid "GNUStep"
-msgstr ""
+msgstr "GNUstep"
 
 #. Tag: uitoolkit::gnustep, short desc
 #: files/debtags/vocabulary
 msgid "GNUstep"
-msgstr ""
+msgstr "GNUstep"
 
 #. Tag: suite::gpe, short desc
 #: files/debtags/vocabulary
 msgid "GPE"
-msgstr ""
+msgstr "GPE"
 
 #. Tag: uitoolkit::gtk, short desc
 #: files/debtags/vocabulary
 msgid "GTK"
-msgstr ""
+msgstr "GTK"
 
 #. Tag: use::gameplaying, short desc
 #: files/debtags/vocabulary
@@ -2097,7 +2104,7 @@ msgstr ""
 #. Tag: culture::german, short desc
 #: files/debtags/vocabulary
 msgid "German"
-msgstr ""
+msgstr "ドイツ語"
 
 #. Tag: hardware::video, short desc
 #: files/debtags/vocabulary
@@ -2107,7 +2114,7 @@ msgstr ""
 #. Tag: culture::greek, short desc
 #: files/debtags/vocabulary
 msgid "Greek"
-msgstr ""
+msgstr "ギリシャ語"
 
 #. Tag: office::groupware, short desc
 #: files/debtags/vocabulary
@@ -2144,7 +2151,7 @@ msgstr "使用を可能にするハードウェア"
 #. Tag: admin::hardware, short desc
 #: files/debtags/vocabulary
 msgid "Hardware Support"
-msgstr ""
+msgstr "ハードウェアサポート"
 
 #. Tag: hardware::detection, short desc
 #: files/debtags/vocabulary
@@ -2164,7 +2171,7 @@ msgstr "Haskell での開発"
 #. Tag: culture::hebrew, short desc
 #: files/debtags/vocabulary
 msgid "Hebrew"
-msgstr ""
+msgstr "ヘブライ語"
 
 #. Tag: network::hiavailability, short desc
 #: files/debtags/vocabulary
@@ -2174,12 +2181,12 @@ msgstr "高可用性"
 #. Tag: culture::hindi, short desc
 #: files/debtags/vocabulary
 msgid "Hindi"
-msgstr ""
+msgstr "ヒンディー語"
 
 #. Tag: culture::hungarian, short desc
 #: files/debtags/vocabulary
 msgid "Hungarian"
-msgstr ""
+msgstr "ハンガリー語"
 
 #. Tag: devel::ide, short desc
 #: files/debtags/vocabulary
@@ -2234,7 +2241,7 @@ msgstr ""
 #. Tag: culture::icelandic, short desc
 #: files/debtags/vocabulary
 msgid "Icelandic"
-msgstr ""
+msgstr "アイスランド語"
 
 #. Tag: made-of::data:icons, short desc
 #: files/debtags/vocabulary
@@ -2301,20 +2308,21 @@ msgstr ""
 msgid "Invalid tag"
 msgstr ""
 
+# TRANSLATION-FIXME: Gaelic?
 #. Tag: culture::irish, short desc
 #: files/debtags/vocabulary
 msgid "Irish (Gaeilge)"
-msgstr ""
+msgstr "アイルランド語 (ゲール語)"
 
 #. Tag: admin::issuetracker, short desc
 #: files/debtags/vocabulary
 msgid "Issue tracker"
-msgstr ""
+msgstr "問題追跡システム"
 
 #. Tag: culture::italian, short desc
 #: files/debtags/vocabulary
 msgid "Italian"
-msgstr ""
+msgstr "イタリア語"
 
 #. Tag: works-with-format::jpg, short desc
 #: files/debtags/vocabulary
@@ -2329,7 +2337,7 @@ msgstr ""
 #. Tag: culture::japanese, short desc
 #: files/debtags/vocabulary
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
 #. Tag: implemented-in::java, short desc
 #: files/debtags/vocabulary
@@ -2359,7 +2367,7 @@ msgstr "子供向けアプリケーション"
 #. Tag: suite::kde, short desc
 #: files/debtags/vocabulary
 msgid "KDE"
-msgstr ""
+msgstr "KDE"
 
 #. Tag: protocol::kerberos, short desc
 #: files/debtags/vocabulary
@@ -2369,7 +2377,7 @@ msgstr ""
 #. Tag: admin::kernel, short desc
 #: files/debtags/vocabulary
 msgid "Kernel or Modules"
-msgstr ""
+msgstr "カーネルやモジュール"
 
 #. Tag: hardware::input:keyboard, short desc
 #: files/debtags/vocabulary
@@ -2379,7 +2387,7 @@ msgstr ""
 #. Tag: culture::korean, short desc
 #: files/debtags/vocabulary
 msgid "Korean"
-msgstr ""
+msgstr "韓国語"
 
 #. Tag: protocol::ldap, short desc
 #: files/debtags/vocabulary
@@ -2409,7 +2417,7 @@ msgstr "学習"
 #. Tag: uitoolkit::motif, short desc
 #: files/debtags/vocabulary
 msgid "Lesstif/Motif"
-msgstr ""
+msgstr "Lesstif/Motif"
 
 #. Tag: devel::library, short desc
 #: files/debtags/vocabulary
@@ -2454,7 +2462,7 @@ msgstr ""
 #. Tag: admin::logging, short desc
 #: files/debtags/vocabulary
 msgid "Logging"
-msgstr ""
+msgstr "ログ"
 
 #. Tag: admin::login, short desc
 #. Tag: use::login, short desc
@@ -2480,12 +2488,12 @@ msgstr "Lua での開発"
 #. Tag: sound::sequencer, short desc
 #: files/debtags/vocabulary
 msgid "MIDI Sequencing"
-msgstr ""
+msgstr "MIDI シーケンサ"
 
 #. Tag: sound::midi, short desc
 #: files/debtags/vocabulary
 msgid "MIDI Software"
-msgstr ""
+msgstr "MIDI ソフトウェア"
 
 #. Tag: implemented-in::ml, short desc
 #: files/debtags/vocabulary
@@ -2580,7 +2588,7 @@ msgstr "メタパッケージ"
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
-msgstr ""
+msgstr "ミキシング"
 
 #. Tag: devel::modelling, short desc
 #: files/debtags/vocabulary
@@ -2600,7 +2608,7 @@ msgstr ""
 #. Tag: culture::mongolian, short desc
 #: files/debtags/vocabulary
 msgid "Mongolian"
-msgstr ""
+msgstr "モンゴル語"
 
 #. Tag: admin::monitoring, short desc
 #. Tag: use::monitor, short desc
@@ -2616,7 +2624,7 @@ msgstr ""
 #. Tag: suite::mozilla, short desc
 #: files/debtags/vocabulary
 msgid "Mozilla"
-msgstr ""
+msgstr "Mozilla"
 
 #. Tag: game::mud, short desc
 #: files/debtags/vocabulary
@@ -2656,7 +2664,7 @@ msgstr ""
 #. Tag: uitoolkit::ncurses, short desc
 #: files/debtags/vocabulary
 msgid "Ncurses TUI"
-msgstr ""
+msgstr "Ncurses TUI"
 
 #. Tag: accessibility::TODO, short desc
 #. Tag: admin::TODO, short desc
@@ -2693,7 +2701,7 @@ msgstr ""
 #. Tag: suite::netscape, short desc
 #: files/debtags/vocabulary
 msgid "Netscape Navigator"
-msgstr ""
+msgstr "Netscape Navigator"
 
 #. Facet: protocol, short desc
 #: files/debtags/vocabulary
@@ -2723,17 +2731,17 @@ msgstr ""
 #. Tag: culture::norwegian, short desc
 #: files/debtags/vocabulary
 msgid "Norwegian"
-msgstr ""
+msgstr "ノルウェー語"
 
 #. Tag: culture::bokmaal, short desc
 #: files/debtags/vocabulary
 msgid "Norwegian Bokmaal"
-msgstr ""
+msgstr "ノルウェー語 (ブークモール)"
 
 #. Tag: culture::nynorsk, short desc
 #: files/debtags/vocabulary
 msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "ノルウェー語 (ニーノシュク)"
 
 #. Tag: special::not-yet-tagged::a, short desc
 #: files/debtags/vocabulary
@@ -2933,12 +2941,12 @@ msgstr ""
 #. Tag: suite::opie, short desc
 #: files/debtags/vocabulary
 msgid "Open Palmtop (OPIE)"
-msgstr ""
+msgstr "Open Palmtop (OPIE)"
 
 #. Tag: suite::openoffice, short desc
 #: files/debtags/vocabulary
 msgid "OpenOffice.org"
-msgstr ""
+msgstr "OpenOffice.org"
 
 #. Tag: made-of::data:pdf, short desc
 #. Tag: works-with-format::pdf, short desc
@@ -2974,7 +2982,7 @@ msgstr "POP3 プロトコル"
 #. Tag: admin::package-management, short desc
 #: files/debtags/vocabulary
 msgid "Package Management"
-msgstr ""
+msgstr "パッケージ管理"
 
 #. Tag: works-with::software:package, short desc
 #: files/debtags/vocabulary
@@ -3039,7 +3047,7 @@ msgstr ""
 #. Tag: sound::player, short desc
 #: files/debtags/vocabulary
 msgid "Playback"
-msgstr ""
+msgstr "再生"
 
 #. Tag: use::playing, short desc
 #: files/debtags/vocabulary
@@ -3054,7 +3062,7 @@ msgstr ""
 #. Tag: culture::polish, short desc
 #: files/debtags/vocabulary
 msgid "Polish"
-msgstr ""
+msgstr "ポーランド語"
 
 #. Tag: web::portal, short desc
 #: files/debtags/vocabulary
@@ -3064,7 +3072,7 @@ msgstr "ポータルサイト"
 #. Tag: culture::portuguese, short desc
 #: files/debtags/vocabulary
 msgid "Portuguese"
-msgstr ""
+msgstr "ポルトガル語"
 
 #. Tag: protocol::db:psql, short desc
 #: files/debtags/vocabulary
@@ -3081,7 +3089,7 @@ msgstr "PostScript"
 #. Tag: hardware::power, short desc
 #: files/debtags/vocabulary
 msgid "Power Management"
-msgstr ""
+msgstr "電源管理"
 
 #. Tag: office::presentation, short desc
 #: files/debtags/vocabulary
@@ -3141,7 +3149,7 @@ msgstr "プロキシ"
 #. Tag: culture::punjabi, short desc
 #: files/debtags/vocabulary
 msgid "Punjabi"
-msgstr ""
+msgstr "パンジャブ語"
 
 #. Facet: use, short desc
 #: files/debtags/vocabulary
@@ -3166,7 +3174,7 @@ msgstr "Python での開発"
 #. Tag: uitoolkit::qt, short desc
 #: files/debtags/vocabulary
 msgid "QT"
-msgstr ""
+msgstr "QT"
 
 #. Tag: protocol::radius, short desc
 #: files/debtags/vocabulary
@@ -3196,7 +3204,7 @@ msgstr ""
 #. Tag: sound::recorder, short desc
 #: files/debtags/vocabulary
 msgid "Recording"
-msgstr ""
+msgstr "録音"
 
 #. Tag: field::religion, short desc
 #: files/debtags/vocabulary
@@ -3231,7 +3239,7 @@ msgstr ""
 #. Tag: culture::romanian, short desc
 #: files/debtags/vocabulary
 msgid "Romanian"
-msgstr ""
+msgstr "ルーマニア語"
 
 #. Tag: use::routing, short desc
 #. Tag: network::routing, short desc
@@ -3242,7 +3250,7 @@ msgstr "ルーティング"
 #. Tag: suite::roxen, short desc
 #: files/debtags/vocabulary
 msgid "Roxen"
-msgstr ""
+msgstr "Roxen"
 
 #. Tag: implemented-in::ruby, short desc
 #: files/debtags/vocabulary
@@ -3267,17 +3275,17 @@ msgstr ""
 #. Tag: culture::russian, short desc
 #: files/debtags/vocabulary
 msgid "Russian"
-msgstr ""
+msgstr "ロシア語"
 
 #. Tag: suite::samba, short desc
 #: files/debtags/vocabulary
 msgid "SAMBA"
-msgstr ""
+msgstr "Samba"
 
 #. Tag: uitoolkit::sdl, short desc
 #: files/debtags/vocabulary
 msgid "SDL"
-msgstr ""
+msgstr "SDL"
 
 #. Tag: protocol::sftp, short desc
 #. Tag: filetransfer::sftp, short desc
@@ -3416,7 +3424,7 @@ msgstr "セキュリティ"
 #. Tag: culture::serbian, short desc
 #: files/debtags/vocabulary
 msgid "Serbian"
-msgstr ""
+msgstr "セルビア語"
 
 #. Tag: web::server, short desc
 #. Tag: network::server, short desc
@@ -3447,7 +3455,7 @@ msgstr ""
 #. Tag: culture::slovak, short desc
 #: files/debtags/vocabulary
 msgid "Slovak"
-msgstr ""
+msgstr "スロバキア語"
 
 #. Facet: devel, short desc
 #: files/debtags/vocabulary
@@ -3477,7 +3485,7 @@ msgstr ""
 #. Tag: culture::spanish, short desc
 #: files/debtags/vocabulary
 msgid "Spanish"
-msgstr ""
+msgstr "スペイン語"
 
 #. Tag: accessibility::speech-recognition, short desc
 #: files/debtags/vocabulary
@@ -3488,7 +3496,7 @@ msgstr ""
 #. Tag: sound::speech, short desc
 #: files/debtags/vocabulary
 msgid "Speech Synthesis"
-msgstr ""
+msgstr "音声合成"
 
 #. Tag: game::sport, short desc
 #: files/debtags/vocabulary
@@ -3544,7 +3552,7 @@ msgstr "サポート形式"
 #. Tag: culture::swedish, short desc
 #: files/debtags/vocabulary
 msgid "Swedish"
-msgstr ""
+msgstr "スウェーデン語"
 
 #. Tag: use::synchronizing, short desc
 #: files/debtags/vocabulary
@@ -3559,7 +3567,7 @@ msgstr "システム管理"
 #. Tag: admin::boot, short desc
 #: files/debtags/vocabulary
 msgid "System Boot"
-msgstr ""
+msgstr "システムの起動"
 
 #. Tag: works-with::logfile, short desc
 #: files/debtags/vocabulary
@@ -3569,7 +3577,7 @@ msgstr ""
 #. Tag: admin::install, short desc
 #: files/debtags/vocabulary
 msgid "System installation"
-msgstr ""
+msgstr "システムのインストール"
 
 #. Tag: system, short desc
 #: files/debtags/vocabulary
@@ -3594,22 +3602,22 @@ msgstr ""
 #. Tag: uitoolkit::tk, short desc
 #: files/debtags/vocabulary
 msgid "TK"
-msgstr ""
+msgstr "TK"
 
 #. Tag: culture::taiwanese, short desc
 #: files/debtags/vocabulary
 msgid "Taiwanese"
-msgstr ""
+msgstr "台湾語"
 
 #. Tag: culture::tajik, short desc
 #: files/debtags/vocabulary
 msgid "Tajik"
-msgstr ""
+msgstr "タジク語"
 
 #. Tag: culture::tamil, short desc
 #: files/debtags/vocabulary
 msgid "Tamil"
-msgstr ""
+msgstr "タミル語"
 
 #. Tag: works-with-format::tar, short desc
 #: files/debtags/vocabulary
@@ -3674,12 +3682,12 @@ msgstr "テキストベースの対話"
 #. Tag: culture::thai, short desc
 #: files/debtags/vocabulary
 msgid "Thai"
-msgstr ""
+msgstr "タイ語"
 
 #. Tag: suite::gimp, short desc
 #: files/debtags/vocabulary
 msgid "The GIMP"
-msgstr ""
+msgstr "The GIMP"
 
 #. Tag: x11::theme, short desc
 #: files/debtags/vocabulary
@@ -3710,7 +3718,7 @@ msgstr "通信"
 #. Tag: culture::turkish, short desc
 #: files/debtags/vocabulary
 msgid "Turkish"
-msgstr ""
+msgstr "トルコ語"
 
 #. Tag: use::typesetting, short desc
 #: files/debtags/vocabulary
@@ -3740,7 +3748,7 @@ msgstr ""
 #. Tag: culture::ukrainian, short desc
 #: files/debtags/vocabulary
 msgid "Ukrainian"
-msgstr ""
+msgstr "ウクライナ語"
 
 #. Tag: works-with::unicode, short desc
 #: files/debtags/vocabulary
@@ -3756,7 +3764,7 @@ msgstr "ユーザインタフェース"
 #. Tag: admin::user-management, short desc
 #: files/debtags/vocabulary
 msgid "User Management"
-msgstr ""
+msgstr "ユーザ管理"
 
 #. Tag: scope::utility, short desc
 #: files/debtags/vocabulary
@@ -3766,7 +3774,7 @@ msgstr "ユーティリティ"
 #. Tag: culture::uzbek, short desc
 #: files/debtags/vocabulary
 msgid "Uzbek"
-msgstr ""
+msgstr "ウズベク語"
 
 #. Tag: vi, short desc
 #: files/debtags/vocabulary
@@ -3801,7 +3809,7 @@ msgstr ""
 #. Tag: admin::virtualization, short desc
 #: files/debtags/vocabulary
 msgid "Virtualization"
-msgstr ""
+msgstr "仮想化"
 
 #. Tag: protocol::voip, short desc
 #: files/debtags/vocabulary
@@ -3821,12 +3829,12 @@ msgstr ""
 #. Tag: suite::webmin, short desc
 #: files/debtags/vocabulary
 msgid "Webmin"
-msgstr ""
+msgstr "Webmin"
 
 #. Tag: culture::welsh, short desc
 #: files/debtags/vocabulary
 msgid "Welsh"
-msgstr ""
+msgstr "ウェールズ語"
 
 #. Tag: web::wiki, short desc
 #: files/debtags/vocabulary
@@ -3868,12 +3876,12 @@ msgstr "X ウィンドウシステム"
 #. Tag: uitoolkit::xlib, short desc
 #: files/debtags/vocabulary
 msgid "X library"
-msgstr ""
+msgstr "X ライブラリ"
 
 #. Tag: suite::xfce, short desc
 #: files/debtags/vocabulary
 msgid "XFce"
-msgstr ""
+msgstr "XFce"
 
 #. Tag: made-of::data:xml, short desc
 #. Tag: works-with-format::xml, short desc
@@ -3889,12 +3897,12 @@ msgstr ""
 #. Tag: suite::xmms, short desc
 #: files/debtags/vocabulary
 msgid "XMMS"
-msgstr ""
+msgstr "XMMS"
 
 #. Tag: suite::xmms2, short desc
 #: files/debtags/vocabulary
 msgid "XMMS 2"
-msgstr ""
+msgstr "XMMS 2"
 
 #. Tag: works-with-format::xml:xslt, short desc
 #: files/debtags/vocabulary
@@ -3909,7 +3917,7 @@ msgstr ""
 #. Tag: suite::zope, short desc
 #: files/debtags/vocabulary
 msgid "ZOPE"
-msgstr ""
+msgstr "Zope"
 
 #. Tag: works-with-format::zip, short desc
 #: files/debtags/vocabulary
@@ -3929,7 +3937,7 @@ msgstr ""
 #. Tag: uitoolkit::wxwidgets, short desc
 #: files/debtags/vocabulary
 msgid "wxWidgets"
-msgstr ""
+msgstr "wxWidgets"
 
 #. Tag: hardware::modem:dsl, short desc
 #: files/debtags/vocabulary
diff --git a/po/langs.ja.po b/po/langs.ja.po
index 57a949a..14309dc 100644
--- a/po/langs.ja.po
+++ b/po/langs.ja.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: packages.debian.org trunk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-19 23:43+0200\n"
-"PO-Revision-Date: 2007-10-20 04:30+0900\n"
+"PO-Revision-Date: 2007-11-22 01:36+0900\n"
 "Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <debian-www@debian.or.jp>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr "イタリア語"
 
 #: lib/Packages/I18N/LanguageNames.pm:26
 msgid "Japanese"
-msgstr "&#26085;&#26412;&#35486;"
+msgstr "日本語"
 
 #: lib/Packages/I18N/LanguageNames.pm:27
 msgid "Korean"
diff --git a/po/templates.ja.po b/po/templates.ja.po
index 695838d..23ac99e 100644
--- a/po/templates.ja.po
+++ b/po/templates.ja.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: packages.debian.org trunk\n"
 "Report-Msgid-Bugs-To: debian-www@lists.debian.org\n"
 "POT-Creation-Date: 2007-10-14 03:22+0200\n"
-"PO-Revision-Date: 2007-11-19 23:58+0900\n"
+"PO-Revision-Date: 2007-11-21 18:18+0900\n"
 "Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <debian-www@debian.or.jp>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr "%s ウェブマスター"
 
 #: templates/config.tmpl:48
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
-msgstr "%1$s は %3$s の<a href=\"%2$s\">登録商標</a>です。"
+msgstr "%1 は %3 の<a href=\"%2\">登録商標</a>です。"
 
 #: templates/config.tmpl:53
 msgid ""
@@ -157,7 +157,7 @@ msgstr "ダウンロード"
 
 #: templates/html/download.tmpl:17
 msgid "Download Page for <kbd>%s</kbd> on %s machines"
-msgstr "%2$s マシン用 <kbd>%1$s</kbd> のダウンロードページ"
+msgstr "%2 マシン用 <kbd>%1</kbd> のダウンロードページ"
 
 #: templates/html/download.tmpl:19
 msgid "Download Page for <kbd>%s</kbd>"
@@ -302,8 +302,8 @@ msgstr "パッケージのファイル一覧: %s/%s/%s"
 msgid ""
 "Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>"
 msgstr ""
-"<em>%2$s</em> の <em>%3$s</em> アーキテクチャ用 <em>%1$s</em> パッケージの"
-"ファイル一覧"
+"<em>%2</em> の <em>%3</em> アーキテクチャ用 <em>%1</em> パッケージのファイル"
+"一覧"
 
 #: templates/html/filelist.tmpl:8
 msgid "Filelist"
@@ -403,7 +403,7 @@ msgstr "\"%s\" の %s %s に含まれるソースパッケージ"
 msgid "Source Packages in \"%s\""
 msgstr "\"%s\" に含まれるソースパッケージ"
 
-# TRANSLATION-FIXME: "%3$s Section", "%3$s Subsection", and "Priority %s" would be the best.
+# TRANSLATION-FIXME: "%3 Section", "%3 Subsection", and "Priority %s" would be the best.
 #: templates/html/index.tmpl:6
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "\"%s\" の%s %s に含まれるソフトウェアパッケージ"
@@ -435,16 +435,16 @@ msgid ""
 "The following packages were added to suite <em>%s</em> (section %s) in the %"
 "s archive during the last 7 days."
 msgstr ""
-"以下のパッケージは、%3$s アーカイブの <em>%1$s</em> スイート (%2$s セクショ"
-"ン) に最近 7 日間に追加されたものです。"
+"以下のパッケージは、%3 アーカイブの <em>%1</em> スイート (%2 セクション) に最"
+"近 7 日間に追加されたものです。"
 
 #: templates/html/newpkg.tmpl:14
 msgid ""
 "The following packages were added to suite <em>%s</em> in the %s archive "
 "during the last 7 days."
 msgstr ""
-"以下のパッケージは、%2$s アーカイブの <em>%1$s</em> スイートに最近 7 日間に追"
-"加されたものです。"
+"以下のパッケージは、%2 アーカイブの <em>%1</em> スイートに最近 7 日間に追加さ"
+"れたものです。"
 
 #: templates/html/newpkg.tmpl:18
 msgid " You can also display this list <a href=\"%s\">sorted by name</a>."
@@ -552,7 +552,7 @@ msgstr "ソースパッケージ"
 #: templates/html/search.tmpl:56
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
-msgstr "<em>%2$s</em> を名前に含む%1$sを、%3$s、%4$s、%5$sで検索しました。"
+msgstr "<em>%2</em> を名前に含む%1を、%3、%4、%5で検索しました。"
 
 #: templates/html/search.tmpl:59
 msgid " (including subword matching)"
@@ -681,8 +681,7 @@ msgstr "を名前に含むファイル"
 #. @translators: I'm really sorry :/ 
 #: templates/html/search_contents.tmpl:81
 msgid "You have searched for %s <em>%s</em> in suite <em>%s</em>, %s, and %s."
-msgstr ""
-"<em>%2$s</em> %1$sを、<em>%3$s</em> スイート、%4$s、%5$sで検索しました。"
+msgstr "<em>%2</em> %1を、<em>%3</em> スイート、%4、%5で検索しました。"
 
 #: templates/html/search_contents.tmpl:85
 msgid "Found <strong>%u results</strong>."
@@ -729,11 +728,11 @@ msgstr "セクション:"
 
 #: templates/html/show.tmpl:21
 msgid "Details of source package %s in %s"
-msgstr "%2$s の %1$s ソースパッケージに関する詳細"
+msgstr "%2 の %1 ソースパッケージに関する詳細"
 
 #: templates/html/show.tmpl:22
 msgid "Details of package %s in %s"
-msgstr "%2$s の %1$s パッケージに関する詳細"
+msgstr "%2 の %1 パッケージに関する詳細"
 
 #: templates/html/show.tmpl:45
 msgid "Source package building this package"
@@ -1012,16 +1011,16 @@ msgid ""
 "The following packages were added to suite %s (section %s) in the %s archive "
 "during the last 7 days."
 msgstr ""
-"以下のパッケージは、%3$s アーカイブの %1$s スイート (%2$s セクション) に最近 "
-"7 日間に追加されたものです。"
+"以下のパッケージは、%3 アーカイブの %1 スイート (%2 セクション) に最近 7 日間"
+"に追加されたものです。"
 
 #: templates/rss/newpkg.tmpl:23
 msgid ""
 "The following packages were added to suite %s in the %s archive during the "
 "last 7 days."
 msgstr ""
-"以下のパッケージは、%2$s アーカイブの %1$s スイートに最近 7 日間に追加された"
-"ものです。"
+"以下のパッケージは、%2 アーカイブの %1 スイートに最近 7 日間に追加されたもの"
+"です。"
 
 #: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
 msgid "Copyright ©"