Merge commit 'alioth/master' into debian-master

diff --git a/po/debtags.ja.po b/po/debtags.ja.po
index c6c289b96ed8b07ebe23cd518127ca4dbf217404..5f460215cb6e8a9855dc3d44905ce56eedaf9211 100644 (file)
--- a/po/debtags.ja.po
+++ b/po/debtags.ja.po
@@ -1,5 +1,16 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 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-10-22 15:16+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

diff --git a/po/pdo.ja.po b/po/pdo.ja.po
index be04a2d3c9d5cf0796c9ab35048772c176e22b7b..610444f877b808369ecce21cef57c3cc1eea478a 100644 (file)
--- a/po/pdo.ja.po
+++ b/po/pdo.ja.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: packages.debian.org trunk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-21 21:31+0200\n"
-"PO-Revision-Date: 2007-10-22 00:13+0900\n"
+"PO-Revision-Date: 2007-10-22 14:48+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"
@@ -101,15 +101,15 @@ msgid "couldn't read index file %s: %s"
 msgstr "索引ファイル %s を読み込めませんでした: %s"
 
 #: lib/Packages/DoNewPkg.pm:25
-#, fuzzy, perl-format
+#, perl-format
 #| msgid "more than one suite specified for show (%s)"
 msgid "more than one suite specified for newpkg (%s)"
-msgstr "show に複数のスイートが指定されています (%s)"
+msgstr "newpkg に複数のスイートが指定されています (%s)"
 
 #: lib/Packages/DoNewPkg.pm:42
 #, perl-format
 msgid "no newpkg information found for suite %s"
-msgstr ""
+msgstr "newpkg に %s スイートの情報が見つかりません"
 
 #: lib/Packages/DoSearch.pm:25 lib/Packages/DoSearchContents.pm:23
 msgid "keyword not valid or missing"

diff --git a/po/templates.ja.po b/po/templates.ja.po
index 2c0240b02d925aeadaf50e1951c14f86e2228099..e18e0dcd1aa3ad2c241f9e7f83e7a38536b54bac 100644 (file)
--- 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-10-21 18:52+0900\n"
+"PO-Revision-Date: 2007-10-22 14:45+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"
@@ -223,14 +223,11 @@ msgstr ""
 "可能です。"
 
 #: templates/html/download.tmpl:77
-#, fuzzy
 #| msgid ""
 #| "Debian security updates are currently officially distributed only via "
 #| "<tt>security.debian.org</tt>."
 msgid "%s security updates are officially distributed only via <tt>%s</tt>."
-msgstr ""
-"Debian セキュリティアップデートは、現在のところ公式には <tt>security.debian."
-"org</tt> のみで配布されています。"
+msgstr "%s セキュリティアップデートは、<tt>%s</tt> のみで公式に配布されています。"
 
 #: templates/html/download.tmpl:84
 msgid ""
@@ -238,7 +235,7 @@ msgid ""
 "\"%s\">complete mirror list</a>."
 msgstr ""
 "上記のサイトのいずれでも不十分な速度しか出ない場合は、<a href=\"%s\">ミラーの"
-"完全な一覧を</a>をご覧ください。"
+"完全な一覧</a>をご覧ください。"
 
 #: templates/html/download.tmpl:92
 msgid ""

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 222159341b46da13e40d61bd5df96781e9125bf6..1b280cf5f059e5b6174c6b235bc7f69354e61f81 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -198,7 +198,7 @@
 
 [% FOREACH p IN providers %]
   [% IF loop.first %]<div id="pdeps"><h2>[% g('Packages providing %s', pkg) %]</h2><dl>[% END %]
-    <dt>[% IF p.available %]<a href="[% make_url(name,'','source','') %]">[% p.name %]</a>[% ELSE; p.name; END %]</dt>
+    <dt>[% IF p.available %]<a href="[% make_url(p.name,'','source','') %]">[% p.name %]</a>[% ELSE; p.name; END %]</dt>
     <dd>[% IF p.trans_desc.$lang; p.trans_desc.$lang | html; ELSE; p.desc | html; END %]</dd>
   [% '</dl></div>' IF loop.last %]
 [% END %]
@@ -207,7 +207,7 @@
 
 [% FOREACH b IN binaries %]
   [% IF loop.first %]<div id="pbinaries">[% g('The following binary packages are built from this source package:') %]<dl>[% END %]
-    <dt>[% IF b.available %]<a href="[% make_url(name,'','source','') %]">[% b.name %]</a>[% ELSE; b.name; END %]</dt>
+    <dt>[% IF b.available %]<a href="[% make_url(b.name,'','source','') %]">[% b.name %]</a>[% ELSE; b.name; END %]</dt>
     <dd>[% IF b.trans_desc.$lang; b.trans_desc.$lang | html; ELSE; b.desc | html; END %]</dd>
   [% '</dl></div>' IF loop.last %]
 [% END %]