From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Wed, 12 Dec 2007 01:13:31 +0000 (+0000)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=5c6714198673760cac701a1e9a90ca08597fccf3;hp=ddd34c51549fc32d808c026b504095ff052ad8f8

Merge commit 'origin/master' into debian-master
---

diff --git a/config.sh.sed.in b/config.sh.sed.in
index da5ccf3..f554b16 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -32,6 +32,8 @@ amd64_ftpsite=http://amd64.debian.net/debian
 debports_ftpsite=http://ftp.debian-ports.org/debian
 ddtp_ftpsite=http://ddtp.debian.net/debian
 
+wget_cmd="wget --no-verbose --tries=2 --timeout=60" 
+
 root=""
 
 # Architectures
diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 5cb5af4..a6b0e83 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -15,8 +15,8 @@ then
         echo "retrieve Release(.gpg) $dist"
 	test -d us/${dist} || mkdir -p us/${dist}
 	(cd us/${dist} &&
-	    wget -q -N ${ftpsite}/dists/${dist}/Release &&
-	    wget -q -N ${ftpsite}/dists/${dist}/Release.gpg )
+	    $wget_cmd -N ${ftpsite}/dists/${dist}/Release &&
+	    $wget_cmd -N ${ftpsite}/dists/${dist}/Release.gpg )
         
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
@@ -29,20 +29,20 @@ then
 	        echo retrieve Packages $dist/$part/$arch
 		test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
 		(cd us/${dist}/${part}/binary-${arch} &&
-		    wget -q -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+		    $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
 	    done
 	    #FIXME: no Contents files for p-u
 	    test ! "$dist" = "experimental" || continue
 	    echo retrieve Contents $dist/$arch
 	    (cd us/${dist} &&
-		wget -q -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
+		$wget_cmd -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
 	done
 	for part in ${parts}
 	do
 	    echo retrieve Sources $dist/$part
 	    test -d us/${dist}/${part}/source || mkdir -p us/${dist}/${part}/source
             (cd us/${dist}/${part}/source &&
-                wget -q -N ${ftpsite}/dists/${dist}/${part}/source/Sources.gz)
+                $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/source/Sources.gz)
 	done
     done
 else
@@ -90,8 +90,8 @@ do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}
     (cd security/${dist} &&
-	wget -q -N ${security_ftpsite}/dists/${dist}/updates/Release &&
-	wget -q -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg )
+	$wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release &&
+	$wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg )
         
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
@@ -101,7 +101,7 @@ do
 	echo retrieve Packages $dist/$part/security/$arch
 	test -d security/${dist}/${part}/binary-${arch} || mkdir -p security/${dist}/${part}/binary-${arch}
 	(cd  security/${dist}/${part}/binary-${arch} &&
-	    wget -q -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz)
+	    $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz)
       done
     done
     for part in ${parts}
@@ -109,6 +109,6 @@ do
         echo retrieve Sources $dist/$part/security
         test -d security/${dist}/${part}/source || mkdir -p security/${dist}/${part}/source
         (cd security/${dist}/${part}/source &&
-            wget -q -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz)
+            $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz)
     done
 done
diff --git a/cron.d/100syncarchive_amd64 b/cron.d/100syncarchive_amd64
index 417e8c6..535604f 100755
--- a/cron.d/100syncarchive_amd64
+++ b/cron.d/100syncarchive_amd64
@@ -14,18 +14,18 @@ for dist in sarge
   echo "retrieve Release(.gpg) $dist"
   test -d amd64/${dist} || mkdir -p amd64/${dist}
   (cd amd64/${dist} &&
-      wget -q -N ${amd64_ftpsite}/dists/${dist}/Release &&
-      wget -q -N ${amd64_ftpsite}/dists/${dist}/Release.gpg )
+      $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Release &&
+      $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Release.gpg )
 
   for part in ${parts} main/debian-installer
     do
     echo retrieve Packages $dist/$part/$arch
     test -d amd64/${dist}/${part}/binary-${arch} || mkdir -p amd64/${dist}/${part}/binary-${arch}
     (cd amd64/${dist}/${part}/binary-${arch} &&
-	wget -q -N ${amd64_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+	$wget_cmd -N ${amd64_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
   done
   echo retrieve Contents $dist/$arch
   (cd amd64/${dist} &&
-      wget -q -N ${amd64_ftpsite}/dists/${dist}/Contents-${arch}.gz)
+      $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Contents-${arch}.gz)
 done
 
diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports
index be82d5f..069b1e4 100755
--- a/cron.d/100syncarchive_backports
+++ b/cron.d/100syncarchive_backports
@@ -12,8 +12,8 @@ do
   echo "retrieve Release(.gpg) $dist-backports"
   test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports
   (cd backports/${dist}-backports &&
-	    wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Release &&
-	    wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Release.gpg )
+	    $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Release &&
+	    $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Release.gpg )
 
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
@@ -23,17 +23,17 @@ do
 	echo retrieve Packages $dist-backports/$part/$arch
 	test -d backports/${dist}-backports/${part}/binary-${arch} || mkdir -p backports/${dist}-backports/${part}/binary-${arch}
 	(cd backports/${dist}-backports/${part}/binary-${arch} &&
-	    wget -q -N ${backports_ftpsite}/dists/${dist}-backports/${part}/binary-${arch}/Packages.gz)
+	    $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/${part}/binary-${arch}/Packages.gz)
       done
       echo retrieve Contents $dist-backports/$arch
       (cd backports/${dist}-backports &&
-	  wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Contents-${arch}.gz)
+	  $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Contents-${arch}.gz)
     done
     for part in ${parts}
     do
         echo retrieve Sources $dist-backports/$part
         test -d backports/${dist}-backports/${part}/source || mkdir -p backports/${dist}-backports/${part}/source
         (cd backports/${dist}-backports/${part}/source &&
-            wget -q -N ${backports_ftpsite}/dists/${dist}-backports/${part}/source/Sources.gz)
+            $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/${part}/source/Sources.gz)
     done
 done
diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index 897d1dd..05b967f 100755
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -14,8 +14,8 @@ for dist in sid experimental
   echo "retrieve Release(.gpg) $dist"
   test -d debports/${dist} || mkdir -p debports/${dist}
   (cd debports/${dist} &&
-	    wget -q -N ${debports_ftpsite}/dists/${dist}/Release &&
-	    wget -q -N ${debports_ftpsite}/dists/${dist}/Release.gpg )
+	    $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Release &&
+	    $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Release.gpg )
 
   for arch in $architectures
     do
@@ -24,10 +24,10 @@ for dist in sid experimental
       echo retrieve Packages $dist/$part/$arch
       test -d debports/${dist}/${part}/binary-${arch} || mkdir -p debports/${dist}/${part}/binary-${arch}
       (cd debports/${dist}/${part}/binary-${arch} &&
-	  wget -q -N ${debports_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+	  $wget_cmd -N ${debports_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
     done
     echo retrieve Contents $dist/$arch
     (cd debports/${dist} &&
-	wget -q -N ${debports_ftpsite}/dists/${dist}/Contents-${arch}.gz)
+	$wget_cmd -N ${debports_ftpsite}/dists/${dist}/Contents-${arch}.gz)
   done
 done
diff --git a/cron.d/100syncarchive_installer b/cron.d/100syncarchive_installer
index 396b249..6e07052 100755
--- a/cron.d/100syncarchive_installer
+++ b/cron.d/100syncarchive_installer
@@ -25,7 +25,7 @@ then
 	        echo retrieve Packages $dist/$part/$arch
 		test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
 		(cd us/${dist}/${part}/binary-${arch} &&
-		    wget -q -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+		    $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
 	    done
 	done
     done
diff --git a/cron.d/100syncarchive_m68k b/cron.d/100syncarchive_m68k
index f8aa4f5..f0d0aac 100755
--- a/cron.d/100syncarchive_m68k
+++ b/cron.d/100syncarchive_m68k
@@ -16,8 +16,8 @@ then
         echo "retrieve Release(.gpg) $dist"
 	test -d us/${dist}-${arch} || mkdir -p us/${dist}-${arch}
 	(cd us/${dist} &&
-	    wget -q -N ${ftpsite}/dists/${dist}-${arch}/Release &&
-	    wget -q -N ${ftpsite}/dists/${dist}-${arch}/Release.gpg )
+	    $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/Release &&
+	    $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/Release.gpg )
         
 #	foo=\$arch_${dist//-/_}
 #	for arch in `eval echo $foo`
@@ -27,20 +27,20 @@ then
 	        echo retrieve Packages $dist-${arch}/$part/$arch
 		test -d us/${dist}-${arch}/${part}/binary-${arch} || mkdir -p us/${dist}-${arch}/${part}/binary-${arch}
 		(cd us/${dist}-${arch}/${part}/binary-${arch} &&
-		    wget -q -N ${ftpsite}/dists/${dist}-${arch}/${part}/binary-${arch}/Packages.gz)
+		    $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/${part}/binary-${arch}/Packages.gz)
 	    done
 	    #FIXME: no Contents files for p-u
 	    test ! "$dist" = "experimental" || continue
 	    echo retrieve Contents $dist/$arch
 	    (cd us/${dist}-${arch} &&
-		wget -q -N ${ftpsite}/dists/${dist}-${arch}/Contents-${arch}.gz)
+		$wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/Contents-${arch}.gz)
 #	done
 	for part in ${parts}
 	do
 	    echo retrieve Sources $dist-${arch}/$part
 	    test -d us/${dist}-${arch}/${part}/source || mkdir -p us/${dist}-${arch}/${part}/source
             (cd us/${dist}-${arch}/${part}/source &&
-                wget -q -N ${ftpsite}/dists/${dist}-${arch}/${part}/source/Sources.gz)
+                $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/${part}/source/Sources.gz)
 	done
     done
 else
diff --git a/cron.d/100syncarchive_maintainers b/cron.d/100syncarchive_maintainers
index adb5f7f..9055606 100755
--- a/cron.d/100syncarchive_maintainers
+++ b/cron.d/100syncarchive_maintainers
@@ -16,6 +16,6 @@ then
 else
     if [ ! -L Maintainers ]
     then
-	wget -q -O Maintainers ftp://ftp.debian.org/debian/indices/Maintainers
+	$wget_cmd -O Maintainers $ftpsite/indices/Maintainers
     fi
 fi
diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile
index ab2bf5e..a01d19f 100755
--- a/cron.d/100syncarchive_volatile
+++ b/cron.d/100syncarchive_volatile
@@ -12,8 +12,8 @@ do
   echo "retrieve Release(.gpg) $dist-volatile"
   test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile
   (cd volatile/${dist}-volatile &&
-      wget -q -N ${volatile_ftpsite}/dists/${dist}/volatile/Release &&
-      wget -q -N ${volatile_ftpsite}/dists/${dist}/volatile/Release.gpg )
+      $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/Release &&
+      $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/Release.gpg )
 
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
@@ -23,11 +23,11 @@ do
 	echo retrieve Packages $dist-volatile/$part/$arch
 	test -d volatile/${dist}-volatile/${part}/binary-${arch} || mkdir -p volatile/${dist}-volatile/${part}/binary-${arch}
 	(cd  volatile/${dist}-volatile/${part}/binary-${arch} &&
-	    wget -q -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/binary-${arch}/Packages.gz)
+	    $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/binary-${arch}/Packages.gz)
       done
       echo retrieve Contents $dist-volatile/$arch
       (cd volatile/${dist}-volatile &&
-	  wget -q -N ${volatile_ftpsite}/dists/${dist}/volatile/Contents-${arch}.gz)
+	  $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/Contents-${arch}.gz)
 
     done
     for part in ${parts}
@@ -35,6 +35,6 @@ do
         echo retrieve Sources $dist-volatile/$part
         test -d volatile/${dist}-volatile/${part}/source || mkdir -p volatile/${dist}-volatile/${part}/source
         (cd volatile/${dist}-volatile/$part/source &&
-            wget -q -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/source/Sources.gz)
+            $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/source/Sources.gz)
     done
 done
diff --git a/cron.d/110debtags b/cron.d/110debtags
index 7d361fc..a2be695 100755
--- a/cron.d/110debtags
+++ b/cron.d/110debtags
@@ -7,7 +7,7 @@ debtagsdir="$filesdir/debtags"
 test -d ${debtagsdir} || mkdir -p ${debtagsdir}
 cd ${debtagsdir}
 
-wget -q -N http://debtags.alioth.debian.org/tags/vocabulary.gz &&
+$wget_cmd -N http://debtags.alioth.debian.org/tags/vocabulary.gz &&
 	gunzip -f vocabulary.gz
 
 cd "$topdir"
diff --git a/cron.d/120synctrans b/cron.d/120synctrans
index 0816c03..07511f8 100755
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@ -22,7 +22,7 @@ then
 	    locale=$(echo $lang|perl -p -e 's/^([a-z]{2})-([a-z]{2})$/"$1_".uc($2)/e')
 	    echo "retrieve translated Descs $dist/$part/$lang ($locale)"
             (cd us/${dist}/${part}/i18n &&
-                wget -q -N ${ddtp_ftpsite}/dists/${dist}/${part}/i18n/Translation-$locale.gz)
+                $wget_cmd -N ${ddtp_ftpsite}/dists/${dist}/${part}/i18n/Translation-$locale.gz)
 	  done
 	done
     done
diff --git a/cron.d/600index_pages b/cron.d/600index_pages
deleted file mode 100755
index 5829d0b..0000000
--- a/cron.d/600index_pages
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-. `dirname $0`/../config.sh
-
-cd "$topdir"
-
-date
-./bin/create_index_pages
-date
diff --git a/cron.d/900index_pages b/cron.d/900index_pages
new file mode 100755
index 0000000..5829d0b
--- /dev/null
+++ b/cron.d/900index_pages
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+. `dirname $0`/../config.sh
+
+cd "$topdir"
+
+date
+./bin/create_index_pages
+date
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 3113683..e6a9d52 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -273,9 +273,8 @@ sub do_dispatch {
     Packages::CGI::init_url( $input, \%params, \%opts );
 
     my $charset = "UTF-8";
-    my $cat = Packages::I18N::Locale->get_handle( $opts{lang} )
-	|| Packages::I18N::Locale->get_handle( 'en' );
-    die "get_handle failed for $opts{lang}" unless $cat;
+    my $cat = Packages::I18N::Locale->get_handle( $opts{lang}, "en" )
+	or die "get_handle failed for $opts{lang}";
     $opts{cat} = $cat;
 
     $opts{h_suites} = { map { $_ => 1 } @suites };
diff --git a/po/debtags.ja.po b/po/debtags.ja.po
index c9460ba..8aedbba 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-12-02 22:28+0900\n"
+"PO-Revision-Date: 2007-12-11 19:54+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"
@@ -16,8 +16,6 @@ msgstr ""
 
 #. Tag: suite::gnustep, long desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "  GNUStep Desktop and WindowMaker"
 msgid "  GNUstep Desktop and WindowMaker"
 msgstr "  GNUstep デスクトップや WindowMaker"
 
@@ -564,6 +562,7 @@ msgstr ""
 msgid ""
 " Packages that contain only operating system kernels and kernel modules."
 msgstr ""
+" オペレーティングシステムのカーネルやカーネルモジュールのみを含むパッケージ。"
 
 #. Tag: role::metapackage, long desc
 #: files/debtags/vocabulary
@@ -573,7 +572,7 @@ msgstr " 他のいくつかのパッケージをまとめてインストール
 #. Tag: role::dummy, long desc
 #: files/debtags/vocabulary
 msgid " Packages used for upgrades and transitions."
-msgstr ""
+msgstr " アップグレードや移行のために使用されるパッケージ。"
 
 #. Tag: devel::code-generator, long desc
 #: files/debtags/vocabulary
@@ -987,8 +986,6 @@ msgstr ""
 
 #. Tag: suite::zope, long desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid " The zope (web) publishing platform."
 msgid " The Zope (web) publishing platform."
 msgstr " Zope (ウェブ) パブリッシングプラットフォーム。"
 
@@ -1186,7 +1183,6 @@ msgid ""
 " Link: http://www.ietf.org/rfc/rfc768.txt"
 msgstr ""
 
-# FIXME: Should be "Virtual Reality Modeling Language"
 #. Tag: works-with-format::vrml, long desc
 #: files/debtags/vocabulary
 msgid " Virtual Reality Markup Language"
@@ -1803,11 +1799,8 @@ msgstr "辞書"
 msgid "Digital Camera"
 msgstr "デジタルカメラ"
 
-# FIXME: Should be "DocBook"
 #. Tag: works-with-format::docbook, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Docbook"
 msgid "DocBook"
 msgstr "DocBook"
 
@@ -1831,7 +1824,7 @@ msgstr "ダウンロード"
 #. Tag: role::dummy, short desc
 #: files/debtags/vocabulary
 msgid "Dummy Package"
-msgstr ""
+msgstr "ダミーパッケージ"
 
 #. Tag: culture::dutch, short desc
 #: files/debtags/vocabulary
@@ -2206,8 +2199,6 @@ msgstr "グループウェア"
 #. Tag: made-of::data:html, short desc
 #. Tag: works-with-format::html, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "HTML Hypertext Markup Language"
 msgid "HTML, Hypertext Markup Language"
 msgstr "HyperText Markup Language (HTML)"
 
@@ -2408,13 +2399,10 @@ msgstr "問題追跡システム"
 msgid "Italian"
 msgstr "イタリア語"
 
-# FIXME: Should be "Joint Photographic Experts Group"
 #. Tag: works-with-format::jpg, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "JPEG, Joint Picture Expert Group"
 msgid "JPEG, Joint Photographic Experts Group"
-msgstr "Joint Picture Expert Group (JPEG)"
+msgstr "Joint Photographic Experts Group (JPEG)"
 
 #. Tag: protocol::jabber, short desc
 #: files/debtags/vocabulary
@@ -2463,8 +2451,6 @@ msgstr ""
 
 #. Tag: role::kernel, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Kernel or Modules"
 msgid "Kernel and modules"
 msgstr "カーネルやモジュール"
 
@@ -3168,12 +3154,9 @@ msgstr "ポータルサイト"
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-# FIXME: Should be "PostScript"
 #. Tag: made-of::data:postscript, short desc
 #. Tag: works-with-format::postscript, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Postscript"
 msgid "PostScript"
 msgstr "PostScript"
 
@@ -3450,7 +3433,7 @@ msgstr "ShockWave Flash (SWF)"
 #. Tag: suite::samba, short desc
 #: files/debtags/vocabulary
 msgid "Samba"
-msgstr ""
+msgstr "Samba"
 
 #. Tag: use::scanning, short desc
 #. Tag: network::scanner, short desc
@@ -3721,11 +3704,8 @@ msgstr "Tar アーカイブ"
 msgid "Tcl Development"
 msgstr "Tcl での開発"
 
-# FIXME: "Tcl, Tool Command Language"?
 #. Tag: implemented-in::tcl, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "TCL Tool Command Language"
 msgid "Tcl, Tool Command Language"
 msgstr "Tool Command Language (Tcl)"
 
@@ -3746,10 +3726,8 @@ msgstr "TeX や LaTeX、DVI"
 
 #. Tag: protocol::telnet, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Text"
 msgid "Telnet"
-msgstr "テキスト"
+msgstr "Telnet"
 
 #. Tag: x11::terminal, short desc
 #: files/debtags/vocabulary
@@ -3900,8 +3878,6 @@ msgstr "VRML 3D モデル"
 
 #. Tag: made-of::data:vrml, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "VRML Virtual Reality Markup Language"
 msgid "VRML, Virtual Reality Markup Language"
 msgstr "Virtual Reality Markup Language (VRML)"
 
@@ -4025,10 +4001,8 @@ msgstr "Zip アーカイブ"
 
 #. Tag: suite::zope, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Scope"
 msgid "Zope"
-msgstr "対象範囲"
+msgstr "Zope"
 
 #. Tag: educational, short desc
 #: files/debtags/vocabulary
@@ -4063,7 +4037,5 @@ msgstr "xDSL モデム"
 #~ msgid "ZOPE"
 #~ msgstr "Zope"
 
-#, fuzzy
-#~| msgid "Audio"
 #~ msgid "Audrio"
 #~ msgstr "音声"
diff --git a/po/templates.ja.po b/po/templates.ja.po
index 475af84..ced9ae2 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-21 18:18+0900\n"
+"PO-Revision-Date: 2007-12-11 19:40+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"
@@ -812,11 +812,11 @@ msgstr "QA ページ"
 
 #: templates/html/show.tmpl:121
 msgid "Archive of the Maintainer Mailinglist"
-msgstr ""
+msgstr "メンテナメーリングリストのアーカイブ"
 
 #: templates/html/show.tmpl:121
 msgid "Mail Archive"
-msgstr ""
+msgstr "メールアーカイブ"
 
 #: templates/html/show.tmpl:129
 msgid "External Resources:"