Merge branch 'master' into ubuntu-master

Conflicts:

	config.sh.sed.in

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 75264a006cf859d93b34d0bab59efc7abcc5687c..d8b750c18d784604f2d37d461b16e50c543ede97 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -30,6 +30,7 @@ use DB_File;
 use URI::Escape;
 use Benchmark ':hireswallclock';
 use I18N::AcceptLanguage;
+use Date::Parse;
 
 use Deb::Versions;
 use Packages::Config qw( $DBDIR $ROOT $TEMPLATEDIR $CACHEDIR
@@ -91,6 +92,21 @@ sub do_dispatch {
     my $homedir = dirname($ENV{SCRIPT_FILENAME}).'/../';
     &Packages::Config::init( $homedir );
     &Packages::DB::init();
+    my $last_modified = $Packages::DB::db_read_time;
+    my $now = time;
+    my $expires = $last_modified + (12*3600);
+    $expires = $now + 3600 if $expires < $now;
+    # allow some fudge, since the db mod time is not the end of
+    # the cron job
+    $last_modified = $now if $now - $last_modified < 3600;
+
+    if ($input->http('If-Modified-Since') and
+       (my $modtime = str2time($input->http('If-Modified-Since'), 'UTC'))) {
+       if ($modtime <= $last_modified) {
+           print $input->header(-status => 304);
+           exit;
+       }
+    }
 
     my %PO_LANGUAGES = map { $_ => 1 } @LANGUAGES;
     my %DDTP_LANGUAGES = map { $_ => 1 } @DDTP_LANGUAGES;
@@ -331,7 +347,14 @@ sub do_dispatch {
     $page_content{params} = \%params;
 
     unless (@Packages::CGI::fatal_errors) {
-       print $input->header(-charset => $charset, -type => get_mime($opts{format}) );
+       print $input->header(-charset => $charset,
+                            -type => get_mime($opts{format}),
+                            -vary => 'negotiate,accept-language',
+                            -last_modified => strftime("%a, %d %b %Y %T %z",
+                                                       localtime($last_modified)),
+                            -expires => strftime("%a, %d %b %Y %T %z",
+                                                 localtime($expires)),
+                            );
        #use Data::Dumper;
        #print '<pre>'.Dumper(\%ENV, \%page_content, get_all_messages()).'</pre>';
        print $template->page( $what_to_do, { %page_content, %{ get_all_messages() } } );

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index e1c5b6d3667ef650ace6d0ead1b2231684128259..5aba6b3b0dc69588320b50a6e0210db114cede79 100644 (file)
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use CGI qw( :cgi );
+use POSIX qw( strftime );
 use Exporter;
 
 use Deb::Versions;
@@ -60,7 +61,9 @@ sub send_file {
            $headers{'-content-encoding'} = $encoding{$opts->{format}} if exists $encoding{$opts->{format}};
            my ($size,$mtime) = (stat("$wwwdir/$path"))[7,9];
            $headers{'-content-length'} = $size;
-           $headers{'-last-modified'} = gmtime($mtime);
+           $headers{'-vary'} = 'negotiate,accept-language';
+           $headers{'-last-modified'} = strftime("%a, %d %b %Y %T %z", localtime($mtime));
+           $headers{'-expires'} = strftime("%a, %d %b %Y %T %z", localtime($mtime+(12*3600)));
            print header( %headers );
 
            binmode INDEX;

diff --git a/po/debtags.de.po b/po/debtags.de.po
index 295f6a9c8276da4f05de0b0daf395d70928d2800..926c16377d3da612ff7fca2edb40495eb6341ac6 100644 (file)
--- a/po/debtags.de.po
+++ b/po/debtags.de.po
@@ -508,8 +508,7 @@ msgstr ""
 " IP-Adresse (eine 4 Byte-Zahl, typischerweise in gepunkteter Notation der "
 "Form\n"
 " 192.25.206.10 angegeben). Internet-IP-Adressen werden von der »Internet\n"
-" Corporation for Assigned Names and Numbers« (ICANN) vergeben. "
-"Normalerweise\n"
+" Corporation for Assigned Names and Numbers« (ICANN) vergeben. Normalerweise\n"
 " wird auf Computer im Internet nicht über ihre IP-Adresse sondern über "
 "ihren\n"
 " Domainnamen zugegriffen.\n"
@@ -709,8 +708,7 @@ msgstr " Optische Zeichenerkennung"
 #: files/debtags/vocabulary
 msgid ""
 " Packages related to the European Molecular Biology Open Software Suite."
-msgstr ""
-" Pakete mit Bezug zur »European Molecular Biology Open Software Suite«."
+msgstr " Pakete mit Bezug zur »European Molecular Biology Open Software Suite«."
 
 #. Tag: special::obsolete, long desc
 #: files/debtags/vocabulary
@@ -927,7 +925,8 @@ msgstr ""
 " die verschlüsselte Anmeldung und der verschlüsselte Shell-Zugriff auf\n"
 " entfernten Rechnern.\n"
 " .\n"
-" SSH-Authentifizierung kann über Passwörter oder dem bevorzugten Mechanismus\n"
+" SSH-Authentifizierung kann über Passwörter oder dem bevorzugten "
+"Mechanismus\n"
 " der asymmetrische Kryptographie mit öffentlichen/privaten Schlüsseln\n"
 " erfolgen.\n"
 " .\n"
@@ -954,7 +953,8 @@ msgstr ""
 " verwandt.\n"
 " .\n"
 " Andernfalls unsichere Protokolle wie FTP, HTTP, IMAP oder SMTP können über\n"
-" SSL/TLS übertragen werden, um die übertragenen Daten abzusichern. In diesem\n"
+" SSL/TLS übertragen werden, um die übertragenen Daten abzusichern. In "
+"diesem\n"
 " Fall wird an den Protokollnamen ein »S« angehängt, wie in HTTPS, FTPS usw.\n"
 " .\n"
 " Link: http://de.wikipedia.org/wiki/Secure_Sockets_Layer"
@@ -1063,7 +1063,8 @@ msgstr ""
 " zwischen verschiedenen Computern in einem Netz. Die Nachrichten werden in\n"
 " XML-kodiert und normalerweise über HTTP versandt.\n"
 " .\n"
-" SOAP wird für APIs von Webdiensten verwandt, beispielsweise vom Google-API,\n"
+" SOAP wird für APIs von Webdiensten verwandt, beispielsweise vom Google-"
+"API,\n"
 " um Googles Suchmaschine aus Client-Anwendungen heraus zu verwenden.\n"
 " .\n"
 " Link: http://de.wikipedia.org/wiki/SOAP\n"
@@ -1101,7 +1102,8 @@ msgstr ""
 msgid ""
 " Software that works with sequences of aminoacids: peptides and proteins."
 msgstr ""
-" Software, die mit einer Sequenz von Aminosäuren arbeitet: Peptiden und Proteinen."
+" Software, die mit einer Sequenz von Aminosäuren arbeitet: Peptiden und "
+"Proteinen."
 
 #. Tag: biology::nuceleic-acids, long desc
 #: files/debtags/vocabulary
@@ -1332,7 +1334,8 @@ msgid ""
 " This is not hardware emulation, but rather those facilities that allow to\n"
 " create many isolated compartments inside the same system."
 msgstr ""
-" Dies ist keine Hardware-Emulation, sondern eher eine Anlage, die das Erstellen\n"
+" Dies ist keine Hardware-Emulation, sondern eher eine Anlage, die das "
+"Erstellen\n"
 " vieler isolierter Abteilungen innerhalb des gleichen Systems erlaubt."
 
 #. Tag: special::invalid-tag, long desc
@@ -1415,10 +1418,12 @@ msgid ""
 " Link: http://en.wikipedia.org/wiki/Transmission_Control_Protocol\n"
 " Link: http://www.ietf.org/rfc/rfc793.txt"
 msgstr ""
-" Transport Control Protocol, ein Kern-Protokoll der Internet-Protokoll-Suite,\n"
+" Transport Control Protocol, ein Kern-Protokoll der Internet-Protokoll-"
+"Suite,\n"
 " das für Datentransport verwandt wird.\n"
 " .\n"
-" TCP wird als Transportprotokoll für viele Dienste im Internet verwandt, wie\n"
+" TCP wird als Transportprotokoll für viele Dienste im Internet verwandt, "
+"wie\n"
 " FTP, HTTP, SMTP, POP3, IMAP, NNTP usw.\n"
 " .\n"
 " Link: http://de.wikipedia.org/wiki/Transmission_Control_Protocol\n"
@@ -2781,6 +2786,11 @@ msgstr "LPR"
 msgid "Laptop"
 msgstr "Laptop"
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr "Lettisch"
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"

diff --git a/po/debtags.fi.po b/po/debtags.fi.po
index d3dee23e6b02e76e67a50551896d3bdde6e45c12..c1da6f376f075bfbe5c0c881a41b315a9113a9b9 100644 (file)
--- a/po/debtags.fi.po
+++ b/po/debtags.fi.po
@@ -2444,6 +2444,11 @@ msgstr ""
 msgid "Laptop"
 msgstr ""
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr ""
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"

diff --git a/po/debtags.fr.po b/po/debtags.fr.po
index a75f5b42993d37202313ce13a965012f2417e00e..2abd3e044ea18b273b6d9097729ee767bc925263 100644 (file)
--- a/po/debtags.fr.po
+++ b/po/debtags.fr.po
@@ -2437,6 +2437,11 @@ msgstr ""
 msgid "Laptop"
 msgstr ""
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr ""
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"

diff --git a/po/debtags.hu.po b/po/debtags.hu.po
index a75f5b42993d37202313ce13a965012f2417e00e..2abd3e044ea18b273b6d9097729ee767bc925263 100644 (file)
--- a/po/debtags.hu.po
+++ b/po/debtags.hu.po
@@ -2437,6 +2437,11 @@ msgstr ""
 msgid "Laptop"
 msgstr ""
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr ""
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"

diff --git a/po/debtags.ja.po b/po/debtags.ja.po
index 957d0890d7117e19269b4e58328bea81b03f4785..058f1aca67f2b99e071b26e8e42e252da50815dd 100644 (file)
--- 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-11 19:54+0900\n"
+"PO-Revision-Date: 2008-08-19 19:04+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"
@@ -319,7 +319,7 @@ msgstr " Nethack や Angband などに類似したゲーム。"
 #. Tag: hardware::gps, long desc
 #: files/debtags/vocabulary
 msgid " Global Positioning System"
-msgstr ""
+msgstr "全地球測位システム"
 
 #. Tag: suite::gnu, long desc
 #: files/debtags/vocabulary
@@ -1285,8 +1285,6 @@ msgstr "!タグがまだついていないパッケージ!"
 
 #. Tag: junior::games-gl, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "3D games"
 msgid "3D Games"
 msgstr "3D ゲーム"
 
@@ -1308,7 +1306,7 @@ msgstr "APM 電源管理"
 #. Tag: protocol::atm, short desc
 #: files/debtags/vocabulary
 msgid "ATM"
-msgstr ""
+msgstr "ATM"
 
 #. Facet: accessibility, short desc
 #: files/debtags/vocabulary
@@ -1395,8 +1393,6 @@ msgstr "アラビア語"
 
 #. Tag: junior::arcade, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Arcade games"
 msgid "Arcade Games"
 msgstr "アーケードゲーム"
 
@@ -1433,8 +1429,6 @@ msgstr "認証"
 
 #. Tag: admin::automation, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Automation and scheduling"
 msgid "Automation and Scheduling"
 msgstr "自動化やスケジューリング"
 
@@ -1482,7 +1476,7 @@ msgstr "生物学"
 #. Tag: protocol::bittorrent, short desc
 #: files/debtags/vocabulary
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #. Tag: web::blog, short desc
 #: files/debtags/vocabulary
@@ -1537,7 +1531,7 @@ msgstr "ブルガリア語"
 #. Tag: bbs, short desc
 #: files/debtags/vocabulary
 msgid "Bulletin Board Systems"
-msgstr ""
+msgstr "電子掲示板"
 
 #. Tag: implemented-in::c, short desc
 #: files/debtags/vocabulary
@@ -1582,12 +1576,12 @@ msgstr "CGI"
 #. Tag: protocol::corba, short desc
 #: files/debtags/vocabulary
 msgid "CORBA"
-msgstr ""
+msgstr "CORBA"
 
 #. Tag: numerical, short desc
 #: files/debtags/vocabulary
 msgid "Calculation and Numerical Computation"
-msgstr ""
+msgstr "演算や数値計算"
 
 #. Tag: game::card, short desc
 #: files/debtags/vocabulary
@@ -1718,12 +1712,12 @@ msgstr "チェコ語"
 #. Tag: protocol::dhcp, short desc
 #: files/debtags/vocabulary
 msgid "DHCP"
-msgstr ""
+msgstr "DHCP"
 
 #. Tag: protocol::dns, short desc
 #: files/debtags/vocabulary
 msgid "DNS"
-msgstr ""
+msgstr "DNS"
 
 #. Tag: hardware::storage:dvd, short desc
 #: files/debtags/vocabulary
@@ -1748,7 +1742,7 @@ msgstr "データの変換"
 #. Tag: data-exchange, short desc
 #: files/debtags/vocabulary
 msgid "Data Exchange"
-msgstr ""
+msgstr "データ交換"
 
 #. Tag: use::organizing, short desc
 #: files/debtags/vocabulary
@@ -1757,8 +1751,6 @@ msgstr "データの編成"
 
 #. Tag: admin::recovery, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Data recovery"
 msgid "Data Recovery"
 msgstr "データ復旧"
 
@@ -1796,7 +1788,7 @@ msgstr "デモ"
 #. Tag: desktop, short desc
 #: files/debtags/vocabulary
 msgid "Desktop Environment"
-msgstr ""
+msgstr "デスクトップ環境"
 
 #. Tag: works-with::dtp, short desc
 #: files/debtags/vocabulary
@@ -1842,8 +1834,6 @@ msgstr "ドキュメント"
 #. Tag: made-of::data:info, short desc
 #. Tag: works-with-format::info, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Documentation in Info format"
 msgid "Documentation in Info Format"
 msgstr "Info 形式のドキュメント"
 
@@ -1945,7 +1935,7 @@ msgstr "エストニア語"
 #. Tag: protocol::ethernet, short desc
 #: files/debtags/vocabulary
 msgid "Ethernet"
-msgstr ""
+msgstr "イーサネット"
 
 #. Tag: devel::examples, short desc
 #: files/debtags/vocabulary
@@ -1981,7 +1971,7 @@ msgstr "FAX"
 #. Tag: protocol::fidonet, short desc
 #: files/debtags/vocabulary
 msgid "FidoNet"
-msgstr ""
+msgstr "FidoNet"
 
 #. Facet: field, short desc
 #: files/debtags/vocabulary
@@ -1995,10 +1985,8 @@ msgstr "ファイル配布"
 
 #. Tag: file-formats, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "File Transfer"
 msgid "File Formats"
-msgstr "ファイル転送"
+msgstr "ファイル形式"
 
 #. Tag: security::integrity, short desc
 #: files/debtags/vocabulary
@@ -2043,7 +2031,7 @@ msgstr "金融"
 #. Tag: protocol::finger, short desc
 #: files/debtags/vocabulary
 msgid "Finger"
-msgstr ""
+msgstr "Finger"
 
 #. Tag: culture::finnish, short desc
 #: files/debtags/vocabulary
@@ -2058,15 +2046,11 @@ msgstr "ファイアーウォール"
 
 #. Tag: game::fps, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "First person shooter"
 msgid "First Person Shooter"
 msgstr "ファーストパーソンシューティングゲーム"
 
 #. Tag: hardware::storage:floppy, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Floppy disk"
 msgid "Floppy Disk"
 msgstr "フロッピーディスク"
 
@@ -2084,7 +2068,7 @@ msgstr "フォント"
 #. Tag: foreignos, short desc
 #: files/debtags/vocabulary
 msgid "Foreign OS and Hardware"
-msgstr ""
+msgstr "他の OS やハードウェア"
 
 #. Tag: security::forensics, short desc
 #: files/debtags/vocabulary
@@ -2180,10 +2164,8 @@ msgstr "GPE"
 
 #. Tag: hardware::gps, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "GPE"
 msgid "GPS"
-msgstr "GPE"
+msgstr "GPS"
 
 #. Tag: uitoolkit::gtk, short desc
 #: files/debtags/vocabulary
@@ -2193,7 +2175,7 @@ msgstr "GTK"
 #. Tag: protocol::gadu-gadu, short desc
 #: files/debtags/vocabulary
 msgid "Gadu-Gadu"
-msgstr ""
+msgstr "Gadu-Gadu"
 
 #. Tag: use::gameplaying, short desc
 #: files/debtags/vocabulary
@@ -2259,8 +2241,6 @@ msgstr "アマチュア無線"
 
 #. Tag: hardware::detection, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Hardware detection"
 msgid "Hardware Detection"
 msgstr "ハードウェア検出"
 
@@ -2317,7 +2297,7 @@ msgstr "IDE"
 #. Tag: protocol::imap, short desc
 #: files/debtags/vocabulary
 msgid "IMAP"
-msgstr ""
+msgstr "IMAP"
 
 #. Tag: mail::imap, short desc
 #: files/debtags/vocabulary
@@ -2327,27 +2307,27 @@ msgstr "IMAP プロトコル"
 #. Tag: protocol::ip, short desc
 #: files/debtags/vocabulary
 msgid "IP"
-msgstr ""
+msgstr "IP"
 
 #. Tag: net, short desc
 #: files/debtags/vocabulary
 msgid "IP Networking"
-msgstr ""
+msgstr "IP ネットワーク"
 
 #. Tag: protocols, short desc
 #: files/debtags/vocabulary
 msgid "IP protocol support"
-msgstr ""
+msgstr "IP プロトコルサポート"
 
 #. Tag: protocol::ipv6, short desc
 #: files/debtags/vocabulary
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #. Tag: protocol::irc, short desc
 #: files/debtags/vocabulary
 msgid "IRC"
-msgstr ""
+msgstr "IRC"
 
 #. Tag: filetransfer::dcc, short desc
 #: files/debtags/vocabulary
@@ -2372,7 +2352,7 @@ msgstr "アイコン"
 #. Tag: protocol::ident, short desc
 #: files/debtags/vocabulary
 msgid "Ident"
-msgstr ""
+msgstr "Ident"
 
 #. Tag: works-with::image, short desc
 #: files/debtags/vocabulary
@@ -2381,8 +2361,6 @@ msgstr "画像"
 
 #. Tag: hardware::scanner, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Image-scanning hardware"
 msgid "Image-scanning Hardware"
 msgstr "画像読み取り用ハードウェア (イメージスキャナ)"
 
@@ -2439,8 +2417,6 @@ msgstr "アイルランド語 (ゲール語)"
 
 #. Tag: admin::issuetracker, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Issue tracker"
 msgid "Issue Tracker"
 msgstr "問題追跡システム"
 
@@ -2457,7 +2433,7 @@ msgstr "Joint Photographic Experts Group (JPEG)"
 #. Tag: protocol::jabber, short desc
 #: files/debtags/vocabulary
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #. Tag: culture::japanese, short desc
 #: files/debtags/vocabulary
@@ -2497,12 +2473,10 @@ msgstr "KDE"
 #. Tag: protocol::kerberos, short desc
 #: files/debtags/vocabulary
 msgid "Kerberos"
-msgstr ""
+msgstr "Kerberos"
 
 #. Tag: role::kernel, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Kernel and modules"
 msgid "Kernel and Modules"
 msgstr "カーネルやモジュール"
 
@@ -2524,7 +2498,7 @@ msgstr "韓国語"
 #. Tag: protocol::ldap, short desc
 #: files/debtags/vocabulary
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #. Tag: works-with-format::ldif, short desc
 #: files/debtags/vocabulary
@@ -2534,13 +2508,18 @@ msgstr "LDIF"
 #. Tag: protocol::lpr, short desc
 #: files/debtags/vocabulary
 msgid "LPR"
-msgstr ""
+msgstr "LPR"
 
 #. Tag: hardware::laptop, short desc
 #: files/debtags/vocabulary
 msgid "Laptop"
 msgstr "ラップトップ"
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr "ラトビア語"
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"
@@ -2650,7 +2629,7 @@ msgstr "MS RIFF 音声"
 #. Tag: protocol::msn-messenger, short desc
 #: files/debtags/vocabulary
 msgid "MSN Messenger"
-msgstr ""
+msgstr "MSN Messenger"
 
 #. Tag: devel::machinecode, short desc
 #: files/debtags/vocabulary
@@ -2674,8 +2653,6 @@ msgstr "メール転送エージェント (Mail Transport Agent, MTA)"
 
 #. Tag: mail::user-agent, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Mail user agent"
 msgid "Mail User Agent"
 msgstr "メールユーザエージェント (Mail User Agent, MUA)"
 
@@ -2691,8 +2668,6 @@ msgstr "マニュアルページ"
 
 #. Tag: made-of::data:man, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Manuals in nroff format"
 msgid "Manuals in Nroff Format"
 msgstr "nroff 形式のマニュアル"
 
@@ -2738,8 +2713,6 @@ msgstr "モデム"
 
 #. Tag: field::biology:molecular, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Molecular biology"
 msgid "Molecular Biology"
 msgstr "分子生物学"
 
@@ -2782,17 +2755,17 @@ msgstr "楽譜"
 #. Tag: protocol::db:mysql, short desc
 #: files/debtags/vocabulary
 msgid "MySQL"
-msgstr ""
+msgstr "MySQL"
 
 #. Tag: protocol::nfs, short desc
 #: files/debtags/vocabulary
 msgid "NFS"
-msgstr ""
+msgstr "NFS"
 
 #. Tag: protocol::nntp, short desc
 #: files/debtags/vocabulary
 msgid "NNTP"
-msgstr ""
+msgstr "NNTP"
 
 #. Tag: special::ipv6-nosupport, short desc
 #: files/debtags/vocabulary
@@ -2848,15 +2821,13 @@ msgstr "ネットワークプロトコル"
 
 #. Tag: works-with::network-traffic, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Network traffic"
 msgid "Network Traffic"
 msgstr "ネットワークトラフィック"
 
 #. Tag: netcomm, short desc
 #: files/debtags/vocabulary
 msgid "Network and Communication"
-msgstr ""
+msgstr "ネットワークや通信"
 
 #. Facet: network, short desc
 #: files/debtags/vocabulary
@@ -3020,8 +2991,6 @@ msgstr "通知"
 
 #. Tag: biology::nuceleic-acids, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Nucleic acids"
 msgid "Nucleic Acids"
 msgstr "核酸"
 
@@ -3043,7 +3012,7 @@ msgstr "Open Document Format (ODF)"
 #. Tag: protocol::oscar, short desc
 #: files/debtags/vocabulary
 msgid "OSCAR (AIM/ICQ)"
-msgstr ""
+msgstr "OSCAR (AIM/ICQ)"
 
 #. Tag: implemented-in::objc, short desc
 #: files/debtags/vocabulary
@@ -3062,10 +3031,8 @@ msgstr "廃止されたパッケージ"
 
 #. Tag: office, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Wiki Software"
 msgid "Office Software"
-msgstr "Wiki ソフトウェア"
+msgstr "オフィス用ソフトウェア"
 
 #. Facet: office, short desc
 #: files/debtags/vocabulary
@@ -3116,7 +3083,7 @@ msgstr "Portable Network Graphics (PNG)"
 #. Tag: protocol::pop3, short desc
 #: files/debtags/vocabulary
 msgid "POP3"
-msgstr ""
+msgstr "POP3"
 
 #. Tag: mail::pop, short desc
 #: files/debtags/vocabulary
@@ -3130,8 +3097,6 @@ msgstr "パッケージ管理"
 
 #. Tag: works-with::software:package, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Packaged software"
 msgid "Packaged Software"
 msgstr "パッケージ化されたソフトウェア"
 
@@ -3182,8 +3147,6 @@ msgstr "Pike での開発"
 
 #. Tag: works-with-format::plaintext, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Plain text"
 msgid "Plain Text"
 msgstr "プレーンテキスト"
 
@@ -3231,7 +3194,7 @@ msgstr "PostScript"
 #. Tag: protocol::db:psql, short desc
 #: files/debtags/vocabulary
 msgid "PostgreSQL"
-msgstr ""
+msgstr "PostgreSQL"
 
 #. Tag: admin::power-management, short desc
 #. Tag: hardware::power, short desc
@@ -3276,8 +3239,6 @@ msgstr "プログラム"
 
 #. Tag: office::project-management, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Project management"
 msgid "Project Management"
 msgstr "プロジェクト管理"
 
@@ -3324,12 +3285,12 @@ msgstr "Python での開発"
 #. Tag: uitoolkit::qt, short desc
 #: files/debtags/vocabulary
 msgid "Qt"
-msgstr ""
+msgstr "Qt"
 
 #. Tag: protocol::radius, short desc
 #: files/debtags/vocabulary
 msgid "RADIUS"
-msgstr ""
+msgstr "RADIUS"
 
 #. Tag: devel::rpc, short desc
 #: files/debtags/vocabulary
@@ -3373,8 +3334,6 @@ msgstr "リビジョン管理"
 
 #. Tag: game::rpg:rogue, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Rogue-Like RPG"
 msgid "Rogue-like RPG"
 msgstr "Rogue 風 RPG"
 
@@ -3416,8 +3375,6 @@ msgstr "Ruby での開発"
 
 #. Tag: works-with::software:running, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Running programs"
 msgid "Running Programs"
 msgstr "プログラムの実行"
 
@@ -3451,7 +3408,7 @@ msgstr "Standard Generalized Markup Language (SGML)"
 #. Tag: protocol::smb, short desc
 #: files/debtags/vocabulary
 msgid "SMB"
-msgstr ""
+msgstr "SMB"
 
 #. Tag: filetransfer::smb, short desc
 #: files/debtags/vocabulary
@@ -3461,7 +3418,7 @@ msgstr "SMB や CIFS"
 #. Tag: protocol::smtp, short desc
 #: files/debtags/vocabulary
 msgid "SMTP"
-msgstr ""
+msgstr "SMTP"
 
 #. Tag: mail::smtp, short desc
 #: files/debtags/vocabulary
@@ -3471,12 +3428,12 @@ msgstr "SMTP プロトコル"
 #. Tag: protocol::snmp, short desc
 #: files/debtags/vocabulary
 msgid "SNMP"
-msgstr ""
+msgstr "SNMP"
 
 #. Tag: protocol::soap, short desc
 #: files/debtags/vocabulary
 msgid "SOAP"
-msgstr ""
+msgstr "SOAP"
 
 #. Tag: devel::lang:sql, short desc
 #: files/debtags/vocabulary
@@ -3486,12 +3443,12 @@ msgstr "SQL"
 #. Tag: protocol::ssh, short desc
 #: files/debtags/vocabulary
 msgid "SSH"
-msgstr ""
+msgstr "SSH"
 
 #. Tag: protocol::ssl, short desc
 #: files/debtags/vocabulary
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. Tag: made-of::data:svg, short desc
 #. Tag: works-with-format::svg, short desc
@@ -3528,7 +3485,7 @@ msgstr "Scheme での開発"
 #. Tag: science, short desc
 #: files/debtags/vocabulary
 msgid "Science"
-msgstr ""
+msgstr "科学"
 
 #. Facet: scope, short desc
 #: files/debtags/vocabulary
@@ -3557,8 +3514,6 @@ msgstr "スクリプトの記述"
 
 #. Tag: web::search-engine, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Search engine"
 msgid "Search Engine"
 msgstr "検索エンジン"
 
@@ -3652,8 +3607,6 @@ msgstr "音声合成"
 
 #. Tag: game::sport, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Sport games"
 msgid "Sport Games"
 msgstr "スポーツゲーム"
 
@@ -3690,8 +3643,6 @@ msgstr "戦略ゲーム"
 
 #. Tag: field::biology:structural, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Structural biology"
 msgid "Structural Biology"
 msgstr "構造生物学"
 
@@ -3727,8 +3678,6 @@ msgstr "システムの起動"
 
 #. Tag: admin::install, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "System installation"
 msgid "System Installation"
 msgstr "システムのインストール"
 
@@ -3740,19 +3689,17 @@ msgstr "システムログ"
 #. Tag: system, short desc
 #: files/debtags/vocabulary
 msgid "System Software and Maintainance"
-msgstr ""
+msgstr "システムソフトウェアやシステム保守"
 
 #. Tag: protocol::tcp, short desc
 #: files/debtags/vocabulary
 msgid "TCP"
-msgstr ""
+msgstr "TCP"
 
 #. Tag: protocol::tftp, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "FTP"
 msgid "TFTP"
-msgstr "FTP"
+msgstr "TFTP"
 
 #. Tag: works-with-format::tiff, short desc
 #: files/debtags/vocabulary
@@ -3872,7 +3819,7 @@ msgstr "時間・時計"
 #. Tag: uitoolkit::tk, short desc
 #: files/debtags/vocabulary
 msgid "Tk"
-msgstr ""
+msgstr "Tk"
 
 #. Tag: game::toys, short desc
 #: files/debtags/vocabulary
@@ -3903,7 +3850,7 @@ msgstr "タイピング練習"
 #. Tag: protocol::udp, short desc
 #: files/debtags/vocabulary
 msgid "UDP"
-msgstr ""
+msgstr "UDP"
 
 #. Tag: hardware::power:ups, short desc
 #: files/debtags/vocabulary
@@ -3948,10 +3895,8 @@ msgstr "ウズベク語"
 
 #. Tag: vi, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Source Editor"
 msgid "VI Editor"
-msgstr "ソースエディタ"
+msgstr "vi エディタ"
 
 #. Tag: network::vpn, short desc
 #: files/debtags/vocabulary
@@ -3975,10 +3920,8 @@ msgstr "ベクタ画像"
 
 #. Tag: works-with::vcs, short desc
 #: files/debtags/vocabulary
-#, fuzzy
-#| msgid "Revision Control"
 msgid "Version control system"
-msgstr "ã\83ªã\83\93ã\82¸ã\83§ã\83³ç®¡ç\90\86"
+msgstr "ã\83\90ã\83¼ã\82¸ã\83§ã\83³ç®¡ç\90\86ã\82·ã\82¹ã\83\86ã\83 "
 
 #. Tag: works-with::video, short desc
 #: files/debtags/vocabulary
@@ -3993,7 +3936,7 @@ msgstr "仮想化"
 #. Tag: protocol::voip, short desc
 #: files/debtags/vocabulary
 msgid "VoIP"
-msgstr ""
+msgstr "VoIP"
 
 #. Tag: devel::web, short desc
 #: files/debtags/vocabulary
@@ -4003,7 +3946,7 @@ msgstr "ウェブ"
 #. Tag: protocol::webdav, short desc
 #: files/debtags/vocabulary
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
 #. Tag: suite::webmin, short desc
 #: files/debtags/vocabulary
@@ -4066,7 +4009,7 @@ msgstr "XML"
 #. Tag: protocol::xmlrpc, short desc
 #: files/debtags/vocabulary
 msgid "XML-RPC"
-msgstr ""
+msgstr "XML-RPC"
 
 #. Tag: suite::xmms, short desc
 #: files/debtags/vocabulary
@@ -4086,7 +4029,7 @@ msgstr "XSL Transformations (XSLT)"
 #. Tag: protocol::yahoo-messenger, short desc
 #: files/debtags/vocabulary
 msgid "Yahoo! Messenger"
-msgstr ""
+msgstr "Yahoo! Messenger"
 
 #. Tag: works-with-format::zip, short desc
 #: files/debtags/vocabulary
@@ -4101,7 +4044,7 @@ msgstr "Zope"
 #. Tag: educational, short desc
 #: files/debtags/vocabulary
 msgid "[Edu] Educational Software"
-msgstr ""
+msgstr "[Edu] 教育用ソフトウェア"
 
 #. Tag: implemented-in::shell, short desc
 #: files/debtags/vocabulary
@@ -4118,27 +4061,27 @@ msgstr "wxWidgets"
 msgid "xDSL Modem"
 msgstr "xDSL モデム"
 
-#~ msgid "Audrio"
-#~ msgstr "音声"
-
-#~ msgid "ZOPE"
-#~ msgstr "Zope"
+#~ msgid "QT"
+#~ msgstr "QT"
 
-# TRANSLATION-FIXME: Why "Windowing"?
-#~ msgid "X Windowing System"
-#~ msgstr "X ウィンドウシステム"
+#~ msgid "Source code"
+#~ msgstr "ソースコード"
 
-#~ msgid "SAMBA"
-#~ msgstr "Samba"
+#~ msgid "TK"
+#~ msgstr "TK"
 
 #~ msgid "GNUStep"
 #~ msgstr "GNUstep"
 
-#~ msgid "TK"
-#~ msgstr "TK"
+#~ msgid "SAMBA"
+#~ msgstr "Samba"
 
-#~ msgid "Source code"
-#~ msgstr "ソースコード"
+# TRANSLATION-FIXME: Why "Windowing"?
+#~ msgid "X Windowing System"
+#~ msgstr "X ウィンドウシステム"
 
-#~ msgid "QT"
-#~ msgstr "QT"
+#~ msgid "ZOPE"
+#~ msgstr "Zope"
+
+#~ msgid "Audrio"
+#~ msgstr "音声"

diff --git a/po/debtags.nl.po b/po/debtags.nl.po
index 45e9333ba1b34e227259fa2ac6a0705c411b5b3f..a09d2b8e77a695800976931f3ae9f455c223a947 100644 (file)
--- a/po/debtags.nl.po
+++ b/po/debtags.nl.po
@@ -2449,6 +2449,11 @@ msgstr "LPR"
 msgid "Laptop"
 msgstr "Laptop"
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr ""
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"
@@ -3993,8 +3998,8 @@ msgstr "wxWidgets"
 msgid "xDSL Modem"
 msgstr "xDSL Modem"
 
-#~ msgid "TK"
-#~ msgstr "TK"
-
 #~ msgid "QT"
 #~ msgstr "QT"
+
+#~ msgid "TK"
+#~ msgstr "TK"

diff --git a/po/debtags.pot b/po/debtags.pot
index 41d3dd3dff713e69e056175591cf6c0462626eda..d6c9404920e958a2a8bb69624ed778a9d16b1184 100644 (file)
--- a/po/debtags.pot
+++ b/po/debtags.pot
@@ -536,6 +536,11 @@ msgstr ""
 msgid "Korean"
 msgstr ""
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr ""
+
 #. Tag: culture::mongolian, short desc
 #: files/debtags/vocabulary
 msgid "Mongolian"

diff --git a/po/debtags.ru.po b/po/debtags.ru.po
index 25287a725f0e4b5ecf8ca6ef42284a452a357f7a..eb84b31392c397f6ae496c2c757a8d58a1ffdeb6 100644 (file)
--- a/po/debtags.ru.po
+++ b/po/debtags.ru.po
@@ -2975,6 +2975,13 @@ msgstr "LPR"
 msgid "Laptop"
 msgstr "Ноутбук"
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+#, fuzzy
+#| msgid "Croatian"
+msgid "Latvian"
+msgstr "Хорватская"
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"
@@ -4553,11 +4560,11 @@ msgstr "wxWidgets"
 msgid "xDSL Modem"
 msgstr "xDSL модем"
 
-#~ msgid "TK"
-#~ msgstr "TK"
+#~ msgid "Source code"
+#~ msgstr "Исходный код"
 
 #~ msgid "QT"
 #~ msgstr "QT"
 
-#~ msgid "Source code"
-#~ msgstr "Исходный код"
+#~ msgid "TK"
+#~ msgstr "TK"

diff --git a/po/debtags.sv.po b/po/debtags.sv.po
index ca91c45b88023d2d6065447d35a9777a6202a009..c648f2662a77eb2eaa774c000751fb87984fd018 100644 (file)
--- a/po/debtags.sv.po
+++ b/po/debtags.sv.po
@@ -2477,6 +2477,11 @@ msgstr ""
 msgid "Laptop"
 msgstr ""
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr "lettiska"
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"
@@ -4030,122 +4035,119 @@ msgstr ""
 msgid "xDSL Modem"
 msgstr ""
 
-#~ msgid "Armenian"
-#~ msgstr "armeniska"
+#~ msgid "Gallegan"
+#~ msgstr "galiciska"
 
-#~ msgid "English"
-#~ msgstr "engelska"
+#~ msgid "Zulu"
+#~ msgstr "zulu"
 
-#~ msgid "Portuguese (Brazilian)"
-#~ msgstr "portugisiska (Brasilien)"
+#~ msgid "Yiddish"
+#~ msgstr "jiddisch"
 
-#~ msgid "Chinese (China)"
-#~ msgstr "kinesiska (Kina)"
+#~ msgid "Xhosa"
+#~ msgstr "xhosa"
 
-#~ msgid "Chinese (Hong Kong)"
-#~ msgstr "kinesiska (Hongkong)"
+#~ msgid "Vietnamese"
+#~ msgstr "vietnamesiska"
 
-#~ msgid "Chinese (Taiwan)"
-#~ msgstr "kinesiska (Taiwan)"
+#~ msgid "Twi"
+#~ msgstr "twi"
 
-#~ msgid "Chinese (Traditional)"
-#~ msgstr "kinesiska (traditionell)"
+#~ msgid "Tonga"
+#~ msgstr "tonga"
 
-#~ msgid "Chinese (Simplified)"
-#~ msgstr "kinesiska (förenklad)"
+#~ msgid "Slovenian"
+#~ msgstr "slovenska"
 
-#~ msgid "Indonesian"
-#~ msgstr "indonesiska"
+#~ msgid "Persian"
+#~ msgstr "persiska"
 
-#~ msgid "Lithuanian"
-#~ msgstr "litauiska"
+#~ msgid "Occitan (post 1500)"
+#~ msgstr "occitanska (efter 1500)"
 
-#~ msgid "Slovene"
-#~ msgstr "slovenska"
+#~ msgid "Maori"
+#~ msgstr "maori"
 
-#~ msgid "Albanian"
-#~ msgstr "albaniska"
+#~ msgid "Manx"
+#~ msgstr "manx"
 
-#~ msgid "Amharic"
-#~ msgstr "amhariska"
+#~ msgid "Maltese"
+#~ msgstr "maltesiska"
 
-#~ msgid "Azerbaijani"
-#~ msgstr "azerbajdzjanska"
+#~ msgid "Malayalam"
+#~ msgstr "malayalam"
 
-#~ msgid "Belarusian"
-#~ msgstr "vitryska"
+#~ msgid "Malay"
+#~ msgstr "malajiska"
 
-#~ msgid "Breton"
-#~ msgstr "bretonska"
+#~ msgid "Macedonian"
+#~ msgstr "makedoniska"
 
-#~ msgid "Cornish"
-#~ msgstr "corniska"
+#~ msgid "Kurdish"
+#~ msgstr "kurdiska"
 
-#~ msgid "Gaelic (Scots)"
-#~ msgstr "skotska"
+#~ msgid "Kannada"
+#~ msgstr "kanaresiska"
 
-#~ msgid "Galician"
-#~ msgstr "galiciska"
+#~ msgid "Kalaallisut"
+#~ msgstr "grönländska"
 
 #~ msgid "Irish"
 #~ msgstr "irländska"
 
-#~ msgid "Kalaallisut"
-#~ msgstr "grönländska"
-
-#~ msgid "Kannada"
-#~ msgstr "kanaresiska"
+#~ msgid "Galician"
+#~ msgstr "galiciska"
 
-#~ msgid "Kurdish"
-#~ msgstr "kurdiska"
+#~ msgid "Gaelic (Scots)"
+#~ msgstr "skotska"
 
-#~ msgid "Latvian"
-#~ msgstr "lettiska"
+#~ msgid "Cornish"
+#~ msgstr "corniska"
 
-#~ msgid "Macedonian"
-#~ msgstr "makedoniska"
+#~ msgid "Breton"
+#~ msgstr "bretonska"
 
-#~ msgid "Malay"
-#~ msgstr "malajiska"
+#~ msgid "Belarusian"
+#~ msgstr "vitryska"
 
-#~ msgid "Malayalam"
-#~ msgstr "malayalam"
+#~ msgid "Azerbaijani"
+#~ msgstr "azerbajdzjanska"
 
-#~ msgid "Maltese"
-#~ msgstr "maltesiska"
+#~ msgid "Amharic"
+#~ msgstr "amhariska"
 
-#~ msgid "Manx"
-#~ msgstr "manx"
+#~ msgid "Albanian"
+#~ msgstr "albaniska"
 
-#~ msgid "Maori"
-#~ msgstr "maori"
+#~ msgid "Slovene"
+#~ msgstr "slovenska"
 
-#~ msgid "Occitan (post 1500)"
-#~ msgstr "occitanska (efter 1500)"
+#~ msgid "Lithuanian"
+#~ msgstr "litauiska"
 
-#~ msgid "Persian"
-#~ msgstr "persiska"
+#~ msgid "Indonesian"
+#~ msgstr "indonesiska"
 
-#~ msgid "Slovenian"
-#~ msgstr "slovenska"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "kinesiska (förenklad)"
 
-#~ msgid "Tonga"
-#~ msgstr "tonga"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "kinesiska (traditionell)"
 
-#~ msgid "Twi"
-#~ msgstr "twi"
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "kinesiska (Taiwan)"
 
-#~ msgid "Vietnamese"
-#~ msgstr "vietnamesiska"
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "kinesiska (Hongkong)"
 
-#~ msgid "Xhosa"
-#~ msgstr "xhosa"
+#~ msgid "Chinese (China)"
+#~ msgstr "kinesiska (Kina)"
 
-#~ msgid "Yiddish"
-#~ msgstr "jiddisch"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "portugisiska (Brasilien)"
 
-#~ msgid "Zulu"
-#~ msgstr "zulu"
+#~ msgid "English"
+#~ msgstr "engelska"
 
-#~ msgid "Gallegan"
-#~ msgstr "galiciska"
+#~ msgid "Armenian"
+#~ msgstr "armeniska"

diff --git a/po/debtags.uk.po b/po/debtags.uk.po
index a75f5b42993d37202313ce13a965012f2417e00e..2abd3e044ea18b273b6d9097729ee767bc925263 100644 (file)
--- a/po/debtags.uk.po
+++ b/po/debtags.uk.po
@@ -2437,6 +2437,11 @@ msgstr ""
 msgid "Laptop"
 msgstr ""
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr ""
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"

diff --git a/po/debtags.zh-cn.po b/po/debtags.zh-cn.po
index a75f5b42993d37202313ce13a965012f2417e00e..2abd3e044ea18b273b6d9097729ee767bc925263 100644 (file)
--- a/po/debtags.zh-cn.po
+++ b/po/debtags.zh-cn.po
@@ -2437,6 +2437,11 @@ msgstr ""
 msgid "Laptop"
 msgstr ""
 
+#. Tag: culture::latvian, short desc
+#: files/debtags/vocabulary
+msgid "Latvian"
+msgstr ""
+
 #. Tag: use::learning, short desc
 #: files/debtags/vocabulary
 msgid "Learning"

diff --git a/po/templates.ja.po b/po/templates.ja.po
index 7179b9daadc652542f1c36082ee746a1572eb317..f21755877420882b64027afd50689c18302eedc6 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: 2008-02-17 13:25+0900\n"
+"PO-Revision-Date: 2008-08-19 18: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"
@@ -310,12 +310,12 @@ msgstr "ファイル一覧"
 
 # See webwml/japanese/po/templates.ja.po in the web site CVS repository.
 #: templates/html/foot.tmpl:11
-#, fuzzy
-#| msgid "How to set <a href=\"%s\">the default document language</a>"
 msgid ""
 "This page is also available in the following languages (How to set <a href="
 "\"%s\">the default document language</a>):"
-msgstr "<a href=\"%s\">デフォルトの言語を設定するには</a>"
+msgstr ""
+"このページは以下の言語でもご覧になれます (<a href=\"%s\">デフォルトの言語を設"
+"定するには</a>):"
 
 # See webwml/japanese/po/templates.ja.po in the web site CVS repository.
 #: templates/html/foot.tmpl:28
@@ -341,10 +341,8 @@ msgid "Learn more about this site"
 msgstr "このサイトについてさらに詳しく知るには"
 
 #: templates/html/foot.tmpl:40
-#, fuzzy
-#| msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgid "Hosting provided by <a href=\"%s\">%s</a>."
-msgstr "<a href=\"%s\">%s</a> ソースパッケージをダウンロード:"
+msgstr "ホスティングサービス提供者: <a href=\"%s\">%s</a>"
 
 #: templates/html/head.tmpl:47
 msgid "Search"
@@ -797,10 +795,8 @@ msgid "An overview over the maintainer's packages and uploads"
 msgstr "メンテナのパッケージやアップロードの概要"
 
 #: templates/html/show.tmpl:123
-#, fuzzy
-#| msgid "QA Page"
 msgid "QA&nbsp;Page"
-msgstr "QA ページ"
+msgstr "QA&nbsp;ページ"
 
 #: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"

diff --git a/static/packages.css.sed.in b/static/packages.css.sed.in
index f60f4a46261acef24a778ce7cd89f11c3a894e8b..dc2ef7d9793d941648bd4c5bbe171367b2e4b743 100644 (file)
--- a/static/packages.css.sed.in
+++ b/static/packages.css.sed.in
@@ -61,6 +61,15 @@ h1 {
             color: #5B4832;
 }
 
+#impressum {
+    text-align: left;
+    float: left;
+}
+
+#sponsorfooter {
+       text-align: right;
+}
+
 /*
 
   DESCRIPTIONS

diff --git a/templates/html/search_contents.tmpl b/templates/html/search_contents.tmpl
index 64547ba3c0fa4469a8310ac42ff1a8c65c8213fc..3388fe3a2cf5a69f67fac699f49493106a854bd0 100644 (file)
--- a/templates/html/search_contents.tmpl
+++ b/templates/html/search_contents.tmpl
@@ -73,9 +73,9 @@
    arch_wording = ( architectures_enc == 'any' ? g("all architectures") : g("architecture(s) <em>%s</em>", architectures_enc) );
    wording = g("paths that end with");
    IF mode == 'filename';
-       wording = g("files named");
-   ELSIF mode == 'exactfilename';
        wording = g("filenames that contain");
+   ELSIF mode == 'exactfilename';
+       wording = g("files named");
    END %]
 [%# @translators: I'm really sorry :/ %]
 <p>[% g('You have searched for %s <em>%s</em> in suite <em>%s</em>, %s, and %s.',