From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 28 Mar 2006 17:24:48 +0000 (+0200)
Subject: * merged from main
X-Git-Tag: 0.7.24ubuntu1~263
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/4f00fb2f265f5230c7d138b52854c0886092c0ab

* merged from main
---

4f00fb2f265f5230c7d138b52854c0886092c0ab
diff --cc configure.in
index 6cd00f9de,8d4b99904..ad22d01c0
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2ubuntu1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2ubuntu2")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index fc1545230,64c743a7f..89d418572
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,7 +1,13 @@@
 -apt (0.6.43.3) unstable; urgency=low
++apt (0.6.43.2ubuntu2) dapper; urgency=low
+ 
 -  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
 -    * ca.po: Completed to 512t. Closes: #351592
++  * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Mar 2006 19:16:23 +0200
++
 +apt (0.6.43.2ubuntu1) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
 +  * ca.po: Completed to 512t. Closes: #351592
      * eu.po: Completed to 512t. Closes: #350483
      * ja.po: Completed to 512t. Closes: #349806
      * pl.po: Completed to 512t. Closes: #349514
diff --cc doc/ja/apt-ftparchive.ja.1.xml
index 000000000,82bd9c023..be6bbd767
mode 000000,100644..100644
--- a/doc/ja/apt-ftparchive.ja.1.xml
+++ b/doc/ja/apt-ftparchive.ja.1.xml
@@@ -1,0 -1,1019 +1,1020 @@@
+ <?xml version="1.0" encoding="utf-8" standalone="no"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+ 
+ <!ENTITY % aptent SYSTEM "apt.ent.ja">
+ %aptent;
+ 
+ ]>
+ 
+ <refentry>
+ 
+  <refentryinfo>
+    &apt-author.jgunthorpe;
+    &apt-author.team;
+    &apt-email;
+    &apt-product;
+    <!-- The last update date -->
+    <date>29 February 2004</date>
+  </refentryinfo>
+  
+  <refmeta>
+    <refentrytitle>apt-ftparchive</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+  
+  <!-- Man page title -->
+  <refnamediv>
+     <refname>apt-ftparchive</refname>
+ <!--
+     <refpurpose>Utility to generate index files</refpurpose>
+ -->
+     <refpurpose>インデックスファイル生成ユーティリティ</refpurpose>
+  </refnamediv>
+ 
+  <!-- Arguments -->
+  <refsynopsisdiv>
+    <cmdsynopsis>
+       <command>apt-ftparchive</command>
+       <arg><option>-hvdsq</option></arg>
+       <arg><option>--md5</option></arg>
+       <arg><option>--delink</option></arg>
+       <arg><option>--readonly</option></arg>
+       <arg><option>--contents</option></arg>
+       <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+       <arg><option>-c=<replaceable>file</replaceable></option></arg>      
+       <group choice="req">
+          <arg>packages<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
+          <arg>sources<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
+          <arg>contents <arg choice="plain"><replaceable>path</replaceable></arg></arg>
+          <arg>release <arg choice="plain"><replaceable>path</replaceable></arg></arg>
+          <arg>generate <arg choice="plain"><replaceable>config-file</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>section</replaceable></arg></arg>
+          <arg>clean <arg choice="plain"><replaceable>config-file</replaceable></arg></arg>
+       </group>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  
+ <!--
+  <refsect1><title>Description</title>
+ -->
+  <refsect1><title>説明</title>
+ <!--
+    <para><command>apt-ftparchive</command> is the command line tool that generates the index 
+    files that APT uses to access a distribution source. The index files should 
+    be generated on the origin site based on the content of that site.</para>
+ -->
+    <para><command>apt-ftparchive</command> は、
+    APT が取得元にアクセスするのに必要な、
+    インデックスファイルを生成するコマンドラインツールです。
+    インデックスファイルは、元のサイトの内容に基づき生成されるべきです。</para>
+ 
+ <!--
+    <para><command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; program,
+    incorporating its entire functionality via the <literal>packages</literal> command.
+    It also contains a contents file generator, <literal>contents</literal>, and an 
+    elaborate means to 'script' the generation process for a complete 
+    archive.</para>
+ -->
+    <para><command>apt-ftparchive</command> は、
+    &dpkg-scanpackages; プログラムのスーパーセットで、
+    <literal>packages</literal> コマンド経由で機能全体を取り込んでいます。
+    また、contents ファイルジェネレータ <literal>contents</literal> と
+    完全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。</para>
+ 
+ <!--
+    <para>Internally <command>apt-ftparchive</command> can make use of binary databases to 
+    cache the contents of a .deb file and it does not rely on any external 
+    programs aside from &gzip;. When doing a full generate it automatically 
+    performs file-change checks and builds the desired compressed output files.</para>
+ -->
+    <para>本質的に <command>apt-ftparchive</command> は、
+    .deb ファイルの内容をキャッシュするのにバイナリデータベースを使用できます。
+    また、&gzip; 以外のいかなる外部プログラムにも依存しません。
 -   すべて生成する際、</para>
++   すべて生成する際には、
++   ファイル変更点の検出と希望した圧縮出力ファイルの作成を自動的に実行します。</para>
+    
+ <!--
+    <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given one of the
+    commands below must be present.</para>
+ -->
+    <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+    以下に挙げるコマンドが必要です。</para>
+    
+    <variablelist>
+      <varlistentry><term>packages</term>
+      <listitem><para>
+ <!--
+      The packages command generates a package file from a directory tree. It
+      takes the given directory and recursively searches it for .deb files, 
+      emitting a package record to stdout for each. This command is 
+      approximately equivalent to &dpkg-scanpackages;.</para>
+ -->
+      packages コマンドは、
+      ディレクトリツリーからパッケージファイルを生成します。
+      与えられたディレクトリから再帰検索し、.deb ファイルを取得します。
+      またパッケージレコードを標準出力にそれぞれ出力します。
+      このコマンドは、&dpkg-scanpackages; とほぼ同じです。</para>
+ 
+ <!--
+      <para>The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem>
+ -->
+      <para><option>--db</option> オプションで、
+      キャッシュ DB を指定できます。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>sources</term>
+      <listitem><para>
+ <!--
+      The <literal>sources</literal> command generates a source index file from a directory tree. 
+      It takes the given directory and recursively searches it for .dsc files,
+      emitting a source record to stdout for each. This command is approximately
+      equivalent to &dpkg-scansources;.</para>
+ -->
+      <literal>sources</literal> コマンドは、
+      ディレクトリツリーからソースインデックスファイルを生成します。
+      与えられたディレクトリから再帰検索し、.dsc ファイルを取得します。
+      またソースレコードを標準出力にそれぞれ出力します。
+      このコマンドは、&dpkg-scansources; とほぼ同じです。</para>
+      <para>
+ <!--
+      If an override file is specified then a source override file will be 
+      looked for with an extension of .src. The -\-source-override option can be 
+      used to change the source override file that will be used.</para></listitem>
+ -->
 -     override ファイルを指定した場合、.
++     override ファイルを指定した場合、
+      src 拡張子がついたソースオーバーライドファイルを探します。
+      使用するソースオーバーライドファイルを変更するのには、
+      --source-override オプションを使用します。</para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term>contents</term>
+      <listitem><para>
+ <!--
+      The <literal>contents</literal> command generates a contents file from a directory tree. It
+      takes the given directory and recursively searches it for .deb files, 
+      and reads the file list from each file. It then sorts and writes to stdout
+      the list of files matched to packages. Directories are not written to 
+      the output. If multiple packages own the same file then each package is
+      separated by a comma in the output.</para>
+ -->
+      <literal>contents</literal> コマンドは、
+      ディレクトリツリーからコンテンツファイルを生成します。
+      与えられたディレクトリから再帰検索し、.deb ファイルを取得します。
+      またファイルごとにファイル一覧を読み取ります。
+      その後、パッケージに対応するファイル一覧を標準出力にソートして出力します。
+      ディレクトリは出力に含まれません。
+      複数のパッケージが同じファイルを持つ場合、
+      パッケージ名をカンマ区切りで出力します。</para>
+      <para>
+ <!--
+      The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem>
+ -->
+      <option>--db</option> オプションで、
+      キャッシュ DB を指定できます。</para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term>release</term>
+      <listitem><para>
+ <!--
+      The <literal>release</literal> command generates a Release file from a
+      directory tree. It recursively searches the given directory for
+      Packages, Packages.gz, Packages.bz2, Sources, Sources.gz,
+      Sources.bz2, Release and md5sum.txt files.  It then writes to
+      stdout a Release file containing an MD5 digest and SHA1 digest
+      for each file.</para>
+ -->
+      <literal>release</literal> コマンドは、
+      ディレクトリツリーから Release ファイルを生成します。
+      与えられたディレクトリから、Packages, Packages.gz, Packages.bz2, Sources, 
+      Sources.gz, Sources.bz2, Release, md5sum.txt 
+      といったファイルを再帰検索します。
+      その後、ファイルごとの MD5 ダイジェストと SHA1 ダイジェストを含んだ
+      Release ファイルを、標準出力に書き出します。</para>
+      <para>
+ <!--
+      Values for the additional metadata fields in the Release file are
+      taken from the corresponding variables under
+      <literal>APT::FTPArchive::Release</literal>,
+      e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The supported fields
+      are: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>,
+      <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>,
+      <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal>.</para></listitem>
+ -->
+      Release ファイルの追加メタデータフィールドの値は、
+      <literal>APT::FTPArchive::Release</literal> 以下の相当する値 
+      (例: <literal>APT::FTPArchive::Release::Origin</literal>) をとります。
+      サポートするフィールドは、
+      <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>,
+      <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>,
+      <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal> です。</para></listitem>
+ 
+      </varlistentry>
+ 
+      <varlistentry><term>generate</term>
+      <listitem><para>
+ <!--
+      The <literal>generate</literal> command is designed to be runnable from a cron script and
+      builds indexes according to the given config file. The config language
+      provides a flexible means of specifying which index files are built from 
+      which directories, as well as providing a simple means of maintaining the
+      required settings.</para></listitem>
+ -->
+      <literal>generate</literal> コマンドは、
+      cron スクリプトから実行できるよう設計されており、
+      与えられた設定ファイルに従ってインデックスを生成します。
+      設定言語は、必要な設定を維持する簡単な方法を提供すると共に、
+      インデックスファイルをどのディレクトリから作成するかを指定する、
+      柔軟な方法を提供します。</para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term>clean</term>
+      <listitem><para>
+ <!--
+      The <literal>clean</literal> command tidies the databases used by the given 
+      configuration file by removing any records that are no longer necessary.</para></listitem>
+ -->
+      <literal>clean</literal> コマンドは、
+      設定ファイルで与えられたデータベースを、
+      もう必要ないレコードを削除して整理します。</para></listitem>
+      </varlistentry>     
+    </variablelist>  
+  </refsect1>
+ 
+ <!--
+  <refsect1><title>The Generate Configuration</title>
+ -->
+  <refsect1><title>generate 設定</title>
+    <para>
+ <!--
+    The <literal>generate</literal> command uses a configuration file to describe the 
+    archives that are going to be generated. It follows the typical ISC 
+    configuration format as seen in ISC tools like bind 8 and dhcpd. 
+    &apt-conf; contains a description of the syntax. Note that the generate 
+    configuration is parsed in sectional manner, but &apt-conf; is parsed in a
+    tree manner. This only effects how the scope tag is handled.</para>
+ -->
+    <literal>generate</literal> コマンドは、
+    生成するアーカイブに関する記述をした設定ファイルを使用します。
+    設定ファイルは、bind 8 や dhcpd といった ISC ツールに見られるような、
+    ISC 設定フォーマットに従います。
+    &apt-conf; に、文法の説明があります。
+    generate 設定はセクション法で解析しますが、
+    &apt-conf; はツリー法で解析するのに注意してください。
+    これはスコープタグの扱い方に違いがあるだけです。</para>
+ 
+    <para>
+ <!--
+    The generate configuration has 4 separate sections, each described below.</para>
+ -->
+    generate 設定には 4 個の独立したセクションがあります。
+    以下それぞれ説明します。</para>
+ 
+ <!--
+    <refsect2><title>Dir Section</title>
+ -->
+    <refsect2><title>Dir セクション</title>
+      <para>
+ <!--
+      The <literal>Dir</literal> section defines the standard directories needed to 
+      locate the files required during the generation process. These 
+      directories are prepended to certain relative paths defined in later 
+      sections to produce a complete an absolute path.</para>
+ -->
+      <literal>Dir</literal> セクションは、
+      生成プロセスで必要なファイルを配置するための、
+      標準ディレクトリを定義します。
+      このディレクトリは、完全な絶対パスを生成するため、
+      後のセクションで定義される相対パスの前に結合します。</para>
+      <variablelist>     
+       <varlistentry><term>ArchiveDir</term>
+       <listitem><para>
+ <!--
+       Specifies the root of the FTP archive, in a standard
+       Debian configuration this is the directory that contains the 
+       <filename>ls-LR</filename> and dist nodes.</para></listitem>
+ -->
+       FTP アーカイブのルートを指定します。
+       標準的な Debian 設定では、このディレクトリには 
+       <filename>ls-LR</filename> と dist ノードがあります。</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry><term>OverrideDir</term>
+       <listitem><para>
+ <!--
+       Specifies the location of the override files.</para></listitem>
+ -->
+       オーバーライドファイルの場所を指定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>CacheDir</term>
+       <listitem><para>
+ <!--
+       Specifies the location of the cache files</para></listitem>
+ -->
+       キャッシュファイルの場所を指定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>FileListDir</term>
+       <listitem><para>
+ <!--
+       Specifies the location of the file list files, 
+       if the <literal>FileList</literal> setting is used below.</para></listitem>
+ -->
+       <literal>FileList</literal> 設定が以下で使用されている場合、
+       ファイルリストファイルの場所を指定します。</para></listitem>
+       </varlistentry>
+      </variablelist>
+    </refsect2>
+    
+ <!--
+    <refsect2><title>Default Section</title>
+ -->
+    <refsect2><title>Default セクション</title>
+      <para>
+ <!--
+      The <literal>Default</literal> section specifies default values, and settings 
+      that control the operation of the generator. Other sections may override 
+      these defaults with a per-section setting.</para>
+ -->
+      <literal>Default</literal> セクションではデフォルト値を指定します。
+      また、生成器の動作を制御する設定も行います。
+      他のセクションでは、ここにあるデフォルト値を、
+      セクションごとの設定で上書きします。</para>
+      <variablelist>     
+       <varlistentry><term>Packages::Compress</term>
+       <listitem><para>
+ <!--
+       Sets the default compression schemes to use 
+       for the Package index files. It is a string that contains a space 
+       separated list of at least one of: '.' (no compression), 'gzip' and 
+       'bzip2'. The default for all compression schemes is '. gzip'.</para></listitem>
+ -->
+       Package インデックスファイルのデフォルトの圧縮方法を設定します。
+       少なくともひとつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、
+       空白区切りの文字列です。
+       圧縮方法のデフォルトはすべて '. gzip' です。</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry><term>Packages::Extensions</term>
+       <listitem><para>
+ <!--
+       Sets the default list of file extensions that are package files.
+       This defaults to '.deb'.</para></listitem>
+ -->
+       パッケージファイル拡張子のデフォルト値を列挙します。
+       このデフォルト値は '.deb' です。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Sources::Compress</term>
+       <listitem><para>
+ <!--
+       This is similar to <literal>Packages::Compress</literal> 
+       except that it controls the compression for the Sources files.</para></listitem>
+ -->
+       <literal>Packages::Compress</literal> と同様に、
+       Sources ファイルの圧縮方法を指定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Sources::Extensions</term>
+       <listitem><para>
+ <!--
+       Sets the default list of file extensions that are source files.
+       This defaults to '.dsc'.</para></listitem>
+ -->
+       ソースファイル拡張子のデフォルト値を列挙します。
+       このデフォルト値は '.dsc' です。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Contents::Compress</term>
+       <listitem><para>
+ <!--
+       This is similar to <literal>Packages::Compress</literal> 
+       except that it controls the compression for the Contents files.</para></listitem>
+ -->
+       <literal>Packages::Compress</literal> と同様に、
+       Contents ファイルの圧縮方法を指定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>DeLinkLimit</term>
+       <listitem><para>
+ <!--
+       Specifies the number of kilobytes to delink (and 
+       replace with hard links) per run. This is used in conjunction with the 
+       per-section <literal>External-Links</literal> setting.</para></listitem>
+ -->
+       実行するごとに delink (及びハードリンクの置き換え) する量を、
+       キロバイト単位で指定します。セクションごとの 
+       <literal>External-Links</literal> 設定と合わせて使います。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>FileMode</term>
+       <listitem><para>
+ <!--
+       Specifies the mode of all created index files. It 
+       defaults to 0644. All index files are set to this mode with no regard 
+       to the umask.</para></listitem>
+ -->
+       作成したインデックスファイルのモードを指定します。
+       デフォルトは 0644 です。全インデックスファイルは、
+       umask を無視してこのモードを使用します。</para></listitem>
+       </varlistentry>
+      </variablelist>
+    </refsect2>
+    
+ <!--
+    <refsect2><title>TreeDefault Section</title>
+ -->
+    <refsect2><title>TreeDefault セクション</title>
+      <para>
+ <!--
+      Sets defaults specific to <literal>Tree</literal> sections. All of these
+      variables are substitution variables and have the strings $(DIST), 
+      $(SECTION) and $(ARCH) replaced with their respective values.</para>
+ -->
+      特定の <literal>Tree</literal> セクションのデフォルトを設定します。
+      これらの変数はすべて置換変数であり、
+      文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値に展開します。</para>
+ 
+      <variablelist>     
+       <varlistentry><term>MaxContentsChange</term>
+       <listitem><para>
+ <!--
+       Sets  the number of kilobytes of contents 
+       files that are generated each day. The contents files are round-robined
+       so that over several days they will all be rebuilt.</para></listitem>
+ -->
+       日毎に生成する contents ファイルをキロバイト単位で設定します。
+       contents ファイルをラウンドロビンし、数日経つとすべて再生成します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>ContentsAge</term>
+       <listitem><para>
+ <!--
+       Controls the number of days a contents file is allowed
+       to be checked without changing. If this limit is passed the mtime of the 
+       contents file is updated. This case can occur if the package file is 
+       changed in such a way that does not result in a new contents file 
+       [override edit for instance]. A hold off is allowed in hopes that new 
+       .debs will be installed, requiring a new file anyhow. The default is 10, 
+       the units are in days.</para></listitem>
+ -->
+       変更がない contents ファイルをチェックする日数を指定します。
+       この制限を越えた contents ファイルの mtime を、更新します。
+       パッケージファイルが変更されても、
+       [例えば上書き編集で] contents ファイルが更新されないような場合、
+       こういったことが発生します。
+       新しい .deb ファイルをインストールしたい場合、保留を解除でき、
+       少なくとも新しいファイルが必要です。
+       デフォルトは 10 で、単位は日です。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Directory</term>
+       <listitem><para>
+ <!--
+       Sets the top of the .deb directory tree. Defaults to
+       <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename></para></listitem>
+ -->
+       .deb ディレクトリツリーの先頭を設定します。デフォルトは
+       <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename> です。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>SrcDirectory</term>
+       <listitem><para>
+ <!--
+       Sets the top of the source package directory tree. Defaults to
+       <filename>$(DIST)/$(SECTION)/source/</filename></para></listitem>
+ -->
+       ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは
+       <filename>$(DIST)/$(SECTION)/source/</filename> です。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Packages</term>
+       <listitem><para>
+ <!--
+       Sets the output Packages file. Defaults to 
+       <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename></para></listitem>
+ -->
+       Packages ファイルの出力先を設定します。デフォルトは
+       <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename> です。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Sources</term>
+       <listitem><para>
+ <!--
+       Sets the output Packages file. Defaults to 
+       <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
+ -->
+       Packages ファイルの出力先を設定します。デフォルトは
+       <filename>$(DIST)/$(SECTION)/source/Sources</filename> です。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>InternalPrefix</term>
+       <listitem><para>
+ <!--
+       Sets the path prefix that causes a symlink to be
+       considered an internal link instead of an external link. Defaults to
+       <filename>$(DIST)/$(SECTION)/</filename></para></listitem>
+ -->
+       外部リンクではなく、内部リンクと見なす判断材料となる、
+       パスのプレフィックスを設定します。デフォルトは、
+       <filename>$(DIST)/$(SECTION)/</filename> です。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Contents</term>
+       <listitem><para>
+ <!--
+       Sets the output Contents file. Defaults to
+       <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple 
+       Packages files to map onto a single Contents file (such as the default) 
+       then <command>apt-ftparchive</command> will integrate those package files 
+       together automatically.</para></listitem>
+ -->
+       Contents ファイルの出力先を設定します。デフォルトは、
+       <filename>$(DIST)/Contents-$(ARCH)</filename> です。
+       複数の Packages ファイルを ひとつの Contents ファイルにまとめられる設定 
+       (デフォルト) の場合、<command>apt-ftparchive</command> 
+       は自動でパッケージファイルをまとめます。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Contents::Header</term>
+       <listitem><para>
+ <!--
+       Sets header file to prepend to the contents output.</para></listitem>
+ -->
+       contents の出力に付けるヘッダファイルを設定します。</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry><term>BinCacheDB</term>
+       <listitem><para>
+ <!--
+       Sets the binary cache database to use for this 
+       section. Multiple sections can share the same database.</para></listitem>
+ -->
+       このセクションで使用するバイナリキャッシュデータベースを設定します。
+       複数のセクションで同じデータベースを共有できます。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>FileList</term>
+       <listitem><para>
+ <!--
+       Specifies that instead of walking the directory tree, 
+       <command>apt-ftparchive</command> should read the list of files from the given 
+       file. Relative files names are prefixed with the archive directory.</para></listitem>
+ -->
+       ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command> 
+       が読み込むファイル一覧ファイルを指定します。
+       相対ファイル名は、アーカイブディレクトリが先頭につきます。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>SourceFileList</term>
+       <listitem><para>
+ <!--
+       Specifies that instead of walking the directory tree, 
+       <command>apt-ftparchive</command> should read the list of files from the given 
+       file. Relative files names are prefixed with the archive directory. 
+       This is used when processing source indexs.</para></listitem>
+ -->
+       ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command>
+       が読み込むファイル一覧ファイルを指定します。
+       相対ファイル名は、アーカイブディレクトリが先頭につきます。
+       ソースインデックスを処理する際に使用します。</para></listitem>
+       </varlistentry>
+      </variablelist>     
+    </refsect2>
+    
+ <!--
+    <refsect2><title>Tree Section</title>
+ -->
+    <refsect2><title>Tree セクション</title>
+      <para>
+ <!--
+      The <literal>Tree</literal> section defines a standard Debian file tree which 
+      consists of a base directory, then multiple sections in that base 
+      directory and finally multiple Architectures in each section. The exact 
+      pathing used is defined by the <literal>Directory</literal> substitution variable.</para> 
+ -->
+      <literal>Tree</literal> セクションでは、
+      ベースディレクトリからの標準 Debian ファイルツリー、
+      ベースディレクトリの複数のセクション、
+      最終的にはセクションごとの複数のアーキテクチャを定義します。
+      使用する正確なパスは、<literal>Directory</literal> 変数で定義されます。</para> 
+      <para>
+ <!--
+      The <literal>Tree</literal> section takes a scope tag which sets the 
+      <literal>$(DIST)</literal> variable and defines the root of the tree 
+      (the path is prefixed by <literal>ArchiveDir</literal>).
+      Typically this is a setting such as <filename>dists/woody</filename>.</para>
+ -->
+      <literal>Tree</literal> セクションは、
+      <literal>$(DIST)</literal> 変数で設定されているスコープタグをとり、
+      ツリーのルート (<literal>ArchiveDir</literal>が先頭につくパス) 
+      を定義します。
+      通常、この設定は <filename>dists/woody</filename> のようになります。</para>
+      <para>
+ <!--
+      All of the settings defined in the <literal>TreeDefault</literal> section can be
+      use in a <literal>Tree</literal> section as well as three new variables.</para>
+ -->
+      <literal>TreeDefault</literal> セクションで定義される設定はすべて、
+      3 個の新しい変数と同様に、
+      <literal>Tree</literal> セクションで使用できます。</para>
+      <para>
+ <!--
+      When processing a <literal>Tree</literal> section <command>apt-ftparchive</command> 
+      performs an operation similar to:
+ -->
+      <literal>Tree</literal> セクションを処理する際、
+      <command>apt-ftparchive</command> は以下のような操作を行います。
+ <informalexample><programlisting>
+ for i in Sections do 
+    for j in Architectures do
+       Generate for DIST=scope SECTION=i ARCH=j
+ </programlisting></informalexample></para>
+ 
+      <variablelist>     
+       <varlistentry><term>Sections</term>
+       <listitem><para>
+ <!--
+       This is a space separated list of sections which appear 
+       under the distribution, typically this is something like 
+       <literal>main contrib non-free</literal></para></listitem>
+ -->
+       distribution 以下に現れるセクションを、空白区切りで指定したリストです。
+       通常、<literal>main contrib non-free</literal>のようになります。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Architectures</term>
+       <listitem><para>
+ <!--
+       This is a space separated list of all the 
+       architectures that appear under search section. The special architecture 
+       'source' is used to indicate that this tree has a source archive.</para></listitem>
+ -->
+       search セクション以下に現れるアーキテクチャを、
+       空白区切りで指定したリストです。
+       特殊アーキテクチャ 'source' は、
+       ソースアーカイブのツリーであることを示します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>BinOverride</term>
+       <listitem><para>
+ <!--
+       Sets the binary override file. The override file 
+       contains section, priority and maintainer address information.</para></listitem>
+ -->
+       バイナリオーバーライドファイルを設定します。
+       このオーバーライドファイルには、セクション、優先度、
+       メンテナのアドレスといった情報が含まれています。</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry><term>SrcOverride</term>
+       <listitem><para>
+ <!--
+       Sets the source override file. The override file 
+       contains section information.</para></listitem>
+ -->
+       ソースオーバーライドファイルを設定します。
+       このオーバーライドファイルには、
+       セクションの情報が含まれています。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>ExtraOverride</term>
+       <listitem><para>
+ <!--
+       Sets the binary extra override file.</para></listitem>
+ -->
+       バイナリ特別オーバーライドファイルを設定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>SrcExtraOverride</term>
+       <listitem><para>
+ <!--
+       Sets the source extra override file.</para></listitem> 
+ -->
+       ソース特別オーバーライドファイルを設定します。</para></listitem> 
+       </varlistentry>
+      </variablelist>
+    </refsect2>
+    
+ <!--
+    <refsect2><title>BinDirectory Section</title>
+ -->
+    <refsect2><title>BinDirectory セクション</title>
+      <para>
+ <!--
+      The <literal>bindirectory</literal> section defines a binary directory tree 
+      with no special structure. The scope tag specifies the location of 
+      the binary directory and the settings are similar to the <literal>Tree</literal> 
+      section with no substitution variables or
+      <literal>Section</literal><literal>Architecture</literal> settings.</para>
+ -->
+      <literal>bindirectory</literal> セクションでは、
+      特殊な構造を持たないバイナリディレクトリツリーを定義します。
+      スコープタグはバイナリディレクトリの場所を指定し、
+      設定は、変数展開のない <literal>Tree</literal> セクションや 
+      <literal>Section</literal><literal>Architecture</literal> 設定に似ています。</para>
+      <variablelist>
+       <varlistentry><term>Packages</term>
+       <listitem><para>
+ <!--
+       Sets the Packages file output.</para></listitem>
+ -->
+       Packages ファイルの出力先を設定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>SrcPackages</term>
+       <listitem><para>
+ <!--
+       Sets the Sources file output. At least one of
+       <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem>
+ -->
+       Sources ファイルの出力先を設定します。
+       少なくとも <literal>Packages</literal> や <literal>SrcPackages</literal>
+       は設定されていなければなりません。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>Contents</term>
+       <listitem><para>
+ <!--
+       Sets the Contents file output. (optional)</para></listitem>
+ -->
+       Contents ファイルの出力先を設定します。(オプション)</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>BinOverride</term>
+       <listitem><para>
+ <!--
+       Sets the binary override file.</para></listitem>
+ -->
+       バイナリオーバーライドファイルを設定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>SrcOverride</term>
+       <listitem><para>
+ <!--
+       Sets the source override file.</para></listitem>
+ -->
+       ソースオーバーライドファイルを設定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>ExtraOverride</term>
+       <listitem><para>
+ <!--
+       Sets the binary extra override file.</para></listitem>
+ -->
+       バイナリ特別オーバーライドファイルを設定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>SrcExtraOverride</term>
+       <listitem><para>
+ <!--
+       Sets the source extra override file.</para></listitem>
+ -->
+       ソース特別オーバーライドファイルを設定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>BinCacheDB</term>
+       <listitem><para>
+ <!--
+       Sets the cache DB.</para></listitem>
+ -->
+       キャッシュ DB を設定します。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>PathPrefix</term>
+       <listitem><para>
+ <!--
+       Appends a path to all the output paths.</para></listitem>
+ -->
+       全出力パスに付加するパス。</para></listitem>
+       </varlistentry>
+       
+       <varlistentry><term>FileList, SourceFileList</term>
+       <listitem><para>
+ <!--
+       Specifies the file list file.</para></listitem>
+ -->
+       ファイル一覧ファイルを指定します。</para></listitem>
+       </varlistentry>
+      </variablelist>
+    </refsect2>
+  </refsect1>
+ 
+ 
+ <!--
+  <refsect1><title>The Binary Override File</title>
+ -->
+  <refsect1><title>バイナリオーバーライドファイル</title>
+ <!--
+    <para>The binary override file is fully compatible with &dpkg-scanpackages;. It
+    contains 4 fields separated by spaces. The first field is the package name,
+    the second is the priority to force that package to, the third is the
+    the section to force that package to and the final field is the maintainer 
+    permutation field.</para>
+ -->
+    <para>バイナリオーバーライドファイルは、
+    &dpkg-scanpackages; と完全に互換性があります。
+    ここには、空白区切りでフィールドが 4 個あります。
+    先頭のフィールドはパッケージ名、
+    2 番目のフィールドはパッケージに強制する優先度、
+    3 番目のフィールドはパッケージに強制するセクション、
+    最後のフィールドはメンテナ順列フィールドです。</para>
+ <!--
+    <para>The general form of the maintainer field is:
+    <literallayout>old [// oldn]* => new</literallayout>
+    or simply,
+    <literallayout>new</literallayout>
+    The first form allows a double-slash separated list of old email addresses
+    to be specified. If any of those are found then new is substituted for the
+    maintainer field. The second form unconditionally substitutes the 
+    maintainer field.</para>
+ -->
+    <para>メンテナフィールドは一般的には、
+    <literallayout>old [// oldn]* => new</literallayout>
+    という形式か、単純に
+    <literallayout>new</literallayout>
+    となります。
 -   最初の形式は、// で区切られた古いemail アドレスのリストを許可します。
++   最初の形式は、// で区切られた古い email アドレスのリストを許可します。
+    この形式がある場合は、メンテナフィールドになるよう new に置換してください。
+    2 番目の形式は無条件にメンテナフィールドに置換します。</para>
+  </refsect1>
+ 
+  
+ <!--
+  <refsect1><title>The Source Override File</title>
+ -->
+  <refsect1><title>ソースオーバーライドファイル</title>
+    <para>
+ <!--
+    The source override file is fully compatible with &dpkg-scansources;. It
+    contains 2 fields separated by spaces. The first fields is the source 
+    package name, the second is the section to assign it.</para>
+ -->
+    ソースオーバーライドファイルは、
+    &dpkg-scansources; と完全に互換性があります。
+    ここには、空白区切りでフィールドが 2 個あります。
+    先頭のフィールドはソースパッケージ名、
+    2 番目のフィールドは割り当てるセクションです。</para>
+  </refsect1>   
+ 
+ <!--
+  <refsect1><title>The Extra Override File</title>
+ -->
+  <refsect1><title>特別オーバーライドファイル</title>
+    <para>
+ <!--
+    The extra override file allows any arbitrary tag to be added or replaced
+    in the output. It has 3 columns, the first is the package, the second is
+    the tag and the remainder of the line is the new value.</para>
+ -->
+    特別オーバーライドファイルは、
+    出力中に任意のタグを追加・置換できるようにします。
+    3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。</para>
+  </refsect1>   
+ 
+ <!--
+  <refsect1><title>options</title>
+ -->
+  <refsect1><title>オプション</title>
+    &apt-cmdblurb;
+    
+    <variablelist>
+      <varlistentry><term><option>--md5</option></term>
+      <listitem><para>
+ <!--
+      Generate MD5 sums. This defaults to on, when turned off the generated 
+      index files will not have MD5Sum fields where possible.
+      Configuration Item: <literal>APT::FTPArchive::MD5</literal></para></listitem>
+ -->
+      MD5 sum を生成します。デフォルトで on になっており、
+      off にすると生成したインデックスファイルに MD5Sum フィールドがありません。
+      設定項目 - <literal>APT::FTPArchive::MD5</literal></para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term><option>-d</option></term><term><option>--db</option></term>
+      <listitem><para>
+ <!--
+      Use a binary caching DB. This has no effect on the generate command.
+      Configuration Item: <literal>APT::FTPArchive::DB</literal>.</para></listitem>
+ -->
+      バイナリキャッシュ DB を使用します。
+      generate コマンドには影響しません。
+      設定項目 - <literal>APT::FTPArchive::DB</literal></para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+      <listitem><para>
+ <!--
+      Quiet; produces output suitable for logging, omitting progress indicators.
+      More q's will produce more quiet up to a maximum of 2. You can also use
+      <option>-q=#</option> to set the quiet level, overriding the configuration file. 
+      Configuration Item: <literal>quiet</literal>.</para></listitem>
+ -->
+      静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。
+      最大 2 つまで q を重ねることでより静粛にできます。
+      また、<option>-q=#</option> のように静粛レベルを指定して、
+      設定ファイルを上書きすることもできます。
+      設定項目 - <literal>quiet</literal></para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term><option>--delink</option></term>
+      <listitem><para>
+ <!--
+      Perform Delinking. If the <literal>External-Links</literal> setting is used then 
+      this option actually enables delinking of the files. It defaults to on and 
+      can be turned off with <option>-\-no-delink</option>.
+      Configuration Item: <literal>APT::FTPArchive::DeLinkAct</literal>.</para></listitem>
+ -->
+      Delink を実行します。
+      <literal>External-Links</literal> 設定を使用している場合、
+      このオプションはファイルの delink を有効にします。
+      デフォルトは on で、
+      off にするには <option>--no-delink</option> としてください。
+      設定項目 - <literal>APT::FTPArchive::DeLinkAct</literal></para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term><option>--contents</option></term>
+      <listitem><para>
+ <!--
+      Perform contents generation. When this option is set and package indexes
+      are being generated with a cache DB then the file listing will also be
+      extracted and stored in the DB for later use. When using the generate 
+      command this option also allows the creation of any Contents files. The 
+      default is on.
+      Configuration Item: <literal>APT::FTPArchive::Contents</literal>.</para></listitem>
+ -->
+      contents の生成を行います。このオプションを指定し、
+      パッケージインデックスをキャッシュ DB と共に生成する際、
+      ファイルリストを後で使用するように、抽出し DB に格納します。
+      generate コマンドを使用する際、
+      このオプションでいずれの Contents ファイルも作成できます。
+      デフォルトは on です。
+      設定項目 - <literal>APT::FTPArchive::Contents</literal></para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term><option>-s</option></term><term><option>--source-override</option></term>
+      <listitem><para>
+ <!--
+      Select the source override file to use with the <literal>sources</literal> command.
+      Configuration Item: <literal>APT::FTPArchive::SourceOverride</literal>.</para></listitem>
+ -->
+      <literal>sources</literal> コマンドで使用する、
+      ソースオーバーライドファイルを選択します。
+      設定項目 - <literal>APT::FTPArchive::SourceOverride</literal></para></listitem>
+      </varlistentry>
+ 
+      <varlistentry><term><option>--readonly</option></term>
+      <listitem><para>
+ <!--
+      Make the caching databases read only. 
+      Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem>
+ -->
+      キャッシュデータベースを読み取り専用にします。
+      設定項目 - <literal>APT::FTPArchive::ReadOnlyDB</literal></para></listitem>
+      </varlistentry>   
+    
+      &apt-commonoptions;
+      
+    </variablelist>
+  </refsect1>
+ 
+ <!--
+ <refsect1><title>Examples</title>
+ -->
+ <refsect1><title>サンプル</title>
+ 
+ <!--
+ <para>To create a compressed Packages file for a directory containing
+ binary packages (.deb):
+ -->
+ <para>バイナリパッケージ (.deb) があるディレクトリの 
+ Packages ファイルを生成するには、以下のようにします。
+ 
+ <programlisting>
+ <command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>
+ </programlisting></para>
+ 
+ </refsect1>
+ 
+ <!--
+  <refsect1><title>See Also</title>
+ -->
+  <refsect1><title>関連項目</title>
+    <para>&apt-conf;</para>
+  </refsect1>
+ 
+ <!--
+  <refsect1><title>Diagnostics</title>
+ -->
+  <refsect1><title>診断メッセージ</title>
+ <!--
+    <para><command>apt-ftparchive</command> returns zero on normal operation, decimal 100 on error.</para>
+ -->
+    <para><command>apt-ftparchive</command> は正常終了時に 0 を返します。
+    エラー時には十進の 100 を返します。</para>
+  </refsect1>
+ 
+  &manbugs;
+  &translator;
+  
+ </refentry>
diff --cc doc/ja/apt-secure.ja.8.xml
index 000000000,33a829076..5b9612a7f
mode 000000,100644..100644
--- a/doc/ja/apt-secure.ja.8.xml
+++ b/doc/ja/apt-secure.ja.8.xml
@@@ -1,0 -1,374 +1,374 @@@
+ <?xml version="1.0" encoding="utf-8" standalone="no"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+ 
+ <!ENTITY % aptent SYSTEM "apt.ent.ja">
+ %aptent;
+ 
+ ]>
+ 
+ <refentry>
+  &apt-docinfo;
+  
+  <refmeta>
+    <refentrytitle>apt-secure</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </refmeta>
+ 
+ <!-- NOTE: This manpage has been written based on the
+      Securing Debian Manual ("Debian Security
+      Infrastructure" chapter) and on documentation
+      available at the following sites:
+      http://wiki.debian.net/?apt06
+      http://www.syntaxpolice.org/apt-secure/
+      http://www.enyo.de/fw/software/apt-secure/
+ -->
+ <!-- TODO: write a more verbose example of how it works with 
+      a sample similar to 
+      http://www.debian-administration.org/articles/174
+      ?
+ --> 
+ 
+  
+  <!-- Man page title -->
+  <refnamediv>
+     <refname>apt-secure</refname>
+ <!--
+     <refpurpose>Archive authentication support for APT</refpurpose>
+ -->
+     <refpurpose>APT アーカイブ認証サポート</refpurpose>
+  </refnamediv>
+ 
+ <!--
+  <refsect1><title>Description</title>
+ -->
+  <refsect1><title>説明</title>
+    <para>
+ <!--
+    Starting with version 0.6, <command>apt</command> contains code
+    that does signature checking of the Release file for all
+    archives. This ensures that packages in the archive can't be
+    modified by people who have no access to the Release file signing
+    key.
+ -->
+    バージョン 0.6 より、<command>apt</command> 全アーカイブに対する 
+    Release ファイルの署名チェックコードが含まれています。
+    Release ファイル署名キーにアクセスできない人が、
+    アーカイブのパッケージの変更が確実にできないようにします。
+    </para>
+ 
+    <para>
+ <!--
+    If a package comes from a archive without a signature or with a
+    signature that apt does not have a key for that package is
+    considered untrusted and installing it will result in a big
+    warning. <command>apt-get</command> will currently only warn
+    for unsigned archives, future releases might force all sources
+    to be verified before downloading packages from them.
+ -->
+    パッケージに署名されなかったり、apt が知らないキーで署名されていた場合、
+    アーカイブから来たパッケージは、信頼されていないと見なし、
+    インストールの際に重要な警告が表示されます。
+    <command>apt-get</command> は、
+    現在未署名のパッケージに対して警告するだけですが、
+    将来のリリースでは、全ソースに対し、
+    パッケージダウンロード前に強制的に検証される可能性があります。
+    </para>
+ 
+    <para>
+ <!--
+    The package frontends &apt-get;, &aptitude; and &synaptic; support this new
+    authentication feature.
+ -->
+    &apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、
+    この新認証機能をサポートしています。
+    </para>
+ </refsect1>
+ 
+ <!--
+  <refsect1><title>Trusted archives</title> 
+ -->
+  <refsect1><title>信頼済アーカイブ</title> 
+ 
+    <para> 
+ <!--
+    The chain of trust from an apt archive to the end user is made up of
+    different steps. <command>apt-secure</command> is the last step in
+    this chain, trusting an archive does not mean that the packages
+    that you trust it do not contain malicious code but means that you
+    trust the archive maintainer. Its the archive maintainer
+    responsibility to ensure that the archive integrity is correct.
+ -->
+    apt アーカイブからエンドユーザまでの信頼の輪は、
 -   いくつかのステップでo区政されています。
++   いくつかのステップで構成されています。
+    <command>apt-secure</command> は、この輪の最後のステップで、
+    アーカイブを信頼することは、
+    パッケージに悪意のあるコードが含まれていないと信頼するわけではありませんが、
+    アーカイブメンテナを信頼すると言うことです。
+    これは、アーカイブの完全性を保証するのは、
+    アーカイブメンテナの責任だということです。
+    </para>
+ 
+ <!--
+    <para>apt-secure does not review signatures at a
+    package level. If you require tools to do this you should look at
+    <command>debsig-verify</command> and
+    <command>debsign</command> (provided in the debsig-verify and
+    devscripts packages respectively).</para>
+ -->
+    <para>apt-secure はパッケージレベルの署名検証は行いません。
+    そのようなツールが必要な場合は、
+    <command>debsig-verify</command> や <command>debsign</command> 
+    (debsig-verify パッケージと devscripts パッケージでそれぞれ提供されています)
+    を確認してください。</para>
+ 
+    <para>
+ <!--
+    The chain of trust in Debian starts when a maintainer uploads a new
+    package or a new version of a package to the Debian archive. This
+    upload in order to become effective needs to be signed by a key of
+    a maintainer within the Debian maintainer's keyring (available in
+    the debian-keyring package). Maintainer's keys are signed by
+    other maintainers following pre-established procedures to
+    ensure the identity of the key holder.
+ -->
+    Debian における信頼の輪は、
+    新しいパッケージやパッケージの新しいバージョンを、
+    メンテナが Debian アーカイブにアップロードすることで始まります。
+    これは、Debian メンテナキーリング (debian-keyring パッケージにあります) 
+    にあるメンテナのキーで署名しなければ、アップロードできないということです。
+    メンテナのキーは、キーの所有者のアイデンティティを確保するため、
+    以下のような事前に確立した手段で、他のメンテナに署名されています。
+    </para>
+ 
+    <para>
+ <!--
+    Once the uploaded package is verified and included in the archive,
+    the maintainer signature is stripped off, an MD5 sum of the package
+    is computed and put in the Packages file. The MD5 sum of all of the
+    packages files are then computed and put into the Release file. The
+    Release file is then signed by the archive key (which is created
+    once a year and distributed through the FTP server. This key is
+    also on the Debian keyring.
+ -->
+    アップロードされたパッケージごとに、検証してアーカイブに格納します。
+    パッケージは、メンテナの署名をはがされ、 MD5 sum を計算されて、
+    Packages ファイルに格納されます。
+    その後、全パッケージファイルの MD5 sum を計算してから、
+    Release ファイルに置きます。
+    Release ファイルは、アーカイブキーで署名されます。
+    アーカイブキーは年ごとに作成され、FTP サーバで配布されます。
+    このキーも Debian キーリングに含まれます。
+    </para>
+ 
+    <para>
+ <!--
+    Any end user can check the signature of the Release file, extract the MD5
+    sum of a package from it and compare it with the MD5 sum of the
+    package he downloaded. Prior to version 0.6 only the MD5 sum of the
+    downloaded Debian package was checked. Now both the MD5 sum and the
+    signature of the Release file are checked.
+ -->
+    エンドユーザは誰でも、Release ファイルの署名をチェックし、
+    パッケージの MD5 sum を抽出して、ダウンロードしたパッケージの MD5 sum 
+    と比較できます。
+    バージョン 0.6 以前では、ダウンロードした Debian パッケージの MD5 sum しか、
+    チェックしていませんでした。
+    現在では、MD5 sum と Release ファイルの署名の両方でチェックします。
+    </para>
+ 
+ <!--
+    <para>Notice that this is distinct from checking signatures on a
+    per package basis. It is designed to prevent two possible attacks:
+ -->
+    <para>以上は、パッケージごとの署名チェックとは違うことに注意してください。
 -   以下の用に考えられる 2 種類の攻撃を防ぐよう設計されています。
++   以下のように考えられる 2 種類の攻撃を防ぐよう設計されています。
+    </para>
+ 
+     <itemizedlist>
+ <!--
+        <listitem><para><literal>Network "man in the middle"
+        attacks</literal>. Without signature checking, a malicious
+        agent can introduce himself in the package download process and
+        provide malicious software either by controlling a network
+        element (router, switch, etc.) or by redirecting traffic to a
+        rogue server (through arp or DNS spoofing
+        attacks).</para></listitem>
+ -->
+        <listitem><para><literal>ネットワーク中間者攻撃</literal> 
+        署名をチェックしないと、
+        悪意あるエージェントがパッケージダウンロードプロセスに割り込んだり、
+        ネットワーク構成要素 (ルータ、スイッチなど) の制御や、
+        悪漢サーバへのネットワークトラフィックのリダイレクトなど 
+        (arp 経由や DNS スプーフィング攻撃) で、
+        悪意あるソフトウェアを掴まされたりします。</para></listitem>
+  
+ <!--
+        <listitem><para><literal>Mirror network compromise</literal>.
+         Without signature checking, a malicious agent can compromise a
+         mirror host and modify the files in it to propagate malicious
+         software to all users downloading packages from that
+         host.</para></listitem>
+ -->
+        <listitem><para><literal>ミラーネットワーク感染</literal>.
+         署名をチェックしないと、悪意あるエージェントがミラーホストに感染し、
+         このホストからダウンロードしたユーザすべてに、
+         悪意あるソフトウェアが伝播するようにファイルを変更できます。</para></listitem>
+     </itemizedlist>
+ 
+ <!--
+    <para>However, it does not defend against a compromise of the
+    Debian master server itself (which signs the packages) or against a
+    compromise of the key used to sign the Release files. In any case,
+    this mechanism can complement a per-package signature.</para>
+ -->
+    <para>しかしこれは、
+    (パッケージに署名する) Debian マスターサーバ自体の感染や、
+    Release ファイルに署名するのに使用したキーの感染を防げません。
+    いずれにせよ、この機構はパッケージごとの署名を補完することができます。</para>
+ </refsect1>
+ 
+ <!--
+  <refsect1><title>User configuration</title>
+ -->
+  <refsect1><title>ユーザの設定</title>
+    <para>
+ <!--
+    <command>apt-key</command> is the program that manages the list
+    of keys used by apt. It can be used to add or remove keys although
+    an installation of this release will automatically provide the
+    default Debian archive signing keys used in the Debian package
+    repositories.
+ -->
+    <command>apt-key</command> は、
+    apt が使用するキーリストを管理するプログラムです。
+    このリリースのインストールでは、Debian パッケージリポジトリで使用する、
 -   キーで署名する デフォルトの Debian アーカイブを提供しますが、
++   キーで署名するデフォルトの Debian アーカイブを提供しますが、
+    <command>apt-key</command> でキーの追加・削除が行えます。
+    </para>
+    <para>
+ <!--
+    In order to add a new key you need to first download it
+    (you should make sure you are using a trusted communication channel
+    when retrieving it), add it with <command>apt-key</command> and
+    then run <command>apt-get update</command> so that apt can download
+    and verify the <filename>Release.gpg</filename> files from the archives you
+    have configured.
+ -->
+    新しいキーを追加するためには、まずキーをダウンロードする必要があります。
+    (取得する際には、信頼できる通信チャネルを使用するよう、特に留意してください)
+    取得したキーを、<command>apt-key</command> で追加し、
+    <command>apt-get update</command> を実行してください。
+    以上により、apt は指定したアーカイブから、<filename>Release.gpg</filename> 
+    ファイルをダウンロード・検証できるようになります。
+    </para>
+ </refsect1>
+ 
+ <!--
+ <refsect1><title>Archive configuration</title>
+ -->
+ <refsect1><title>アーカイブの設定</title>
+    <para>
+ <!--
+    If you want to provide archive signatures in an archive under your
+    maintenance you have to:
+ -->
+    あなたがメンテナンスしているアーカイブで、アーカイブ署名を提供したい場合、
+    以下のようにしてください。
+    </para>
+ 
+      <itemizedlist>
+ <!--
+        <listitem><para><literal>Create a toplevel Release
+        file</literal>.  if it does not exist already. You can do this
+        by running <command>apt-ftparchive release</command> 
+        (provided inftp apt-utils).</para></listitem>
+ -->
+        <listitem><para><literal>上位 Release ファイルの作成</literal>
+        既にこれが存在しているのでなければ、
+        <command>apt-ftparchive release</command> (apt-utils で提供) 
+        を実行して作成してください。</para></listitem>
+    
+ <!--
+       <listitem><para><literal>Sign it</literal>. You can do this by running
+       <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
+ -->
+       <listitem><para><literal>署名</literal> 
+       <command>gpg -abs -o Release.gpg Release</command> を実行して、
+       署名してください。</para></listitem>
+ 
+ <!--
+       <listitem><para><literal>Publish the key fingerprint</literal>,
+       that way your users will know what key they need to import in
+       order to authenticate the files in the
+       archive.</para></listitem>
+ -->
+       <listitem><para><literal>キーの指紋を配布</literal>
+       これにより、アーカイブ内のファイル認証に、
+       どのキーをインポートする必要があるかを、
+       ユーザに知らせることになります。</para></listitem>
+ 
+     </itemizedlist>
+ 
+ <!--
+     <para>Whenever the contents of the archive changes (new packages
+     are added or removed) the archive maintainer has to follow the
+     first two steps previously outlined.</para>
+ -->
+     <para>アーカイブの内容に変化がある場合 (新しいパッケージの追加や削除)、
+     アーカイブメンテナは前述の最初の 1, 2 ステップに従わなければなりません。</para>
+ 
+ </refsect1>
+ 
+ <!--
+ <refsect1><title>See Also</title> 
+ -->
+ <refsect1><title>関連項目</title> 
+ <para> 
+ &apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+ &debsign; &debsig-verify;, &gpg;
+ </para>
+ 
+ <!--
+ <para>For more backgound information you might want to review the
+ <ulink
+ url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
+ Security Infrastructure</ulink> chapter of the Securing Debian Manual
+ (available also in the harden-doc package) and the
+ <ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
+ >Strong Distribution HOWTO</ulink> by V. Alex Brennen.  </para>
+ -->
+ <para>詳細な背景情報を検証するのなら、
+ the Securing Debian Manual (harden-doc パッケージにもあります) の
+ <ulink
+ url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
+ Security Infrastructure</ulink> 章と、
+ V. Alex Brennen による 
+ <ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
+ >Strong Distribution HOWTO</ulink> をご覧ください。</para>
+ 
+ </refsect1>
+ 
+  &manbugs;
+  &manauthor;
+ 
+ <!--
+ <refsect1><title>Manpage Authors</title> 
+ -->
+ <refsect1><title>マニュアルページ筆者</title> 
+ 
+ <!--
+ <para>This man-page is based on the work of Javier Fernández-Sanguino
+ Peña, Isaac Jones, Colin Walters, Florian Weimer and Michael Vogt.
+ -->
+ <para>このマニュアルページは Javier Fernández-Sanguino
+ Peña, Isaac Jones, Colin Walters, Florian Weimer, Michael Vogt 
+ の作業を元にしています。
+ </para>
+ 
+ </refsect1>
+  
+  &translator;
+ 
+ </refentry>
+ 
diff --cc po/ChangeLog
index 1f8a64952,0767deb75..e8501775e
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@@ -1,3 -1,15 +1,27 @@@
++2006-03-16  eric pareja  <xenos@upm.edu.ph>
++
++	* tl.po: Completed to 512t. Closes: #357215
++
++2006-03-13  Sorin Batariuc  <sorin@bonbon.net>
++
++	* ro.po: Completed to 512t. Closes: #355897
++
++2006-03-12  Miguel Figueiredo  <elmig@debianpt.org>
++
++	* pt.po: Completed to 512t. Closes: #355798
++
+ 2006-02-14  Carlos Z.F. Liu  <carlosliu@users.sourceforge.net>
+ 
+ 	* zh_CN.po: Completed to 512t. Closes: #353936
+ 
+ 2006-02-14  Samuele Giovanni Tonon <samu@debian.org>
+ 
+ 	* it.po: Completed to 512t. Closes: #352803
+ 
+ 2006-02-13  Andre Luis Lopes  <andrelop@debian.org>
+ 
+ 	* ca.po: Completed to 512t. Closes: #352419
+ 
  2006-02-06  Jordi Mallach  <jordi@debian.org>
  
  	* ca.po: Completed to 512t. Closes: #351592
diff --cc po/pt.po
index 98150e94d,98150e94d..e7874c290
--- a/po/pt.po
+++ b/po/pt.po
@@@ -1,14 -1,14 +1,13 @@@
  # Debian-PT translation for apt.
  # Copyright (C) 2004 Free Software Foundation, Inc.
--# Miguel Figueiredo <elmig@debianpt.org>, 2003.
--# 2005-03-07 - Miguel Figueiredo <elmig@debianpt.org> - Fxed 1 new fuzzy.
++# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006.
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2006-01-20 14:01+0100\n"
  "PO-Revision-Date: 2005-03-07 22:20+0000\n"
--"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
++"Last-Translator: Rui Az. <astronomy@mail.pt>\n"
  "Language-Team: Portuguese <traduz@debianpt.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
@@@ -102,7 -102,7 +101,7 @@@ msgstr "Ficheiros de Pacotes :
  #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
--"a cache está dessíncronizada, não pode x-referênciar um ficheiro de pacote"
++"A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
  
  #: cmdline/apt-cache.cc:1470
  #, c-format
@@@ -230,17 -230,17 +229,15 @@@ msgstr "
  #: cmdline/apt-cdrom.cc:78
  msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
  msgstr ""
++"Por favor forneça um nome para este Disco, tal como 'Debian 2.1r1 Disco 1'"
  
  #: cmdline/apt-cdrom.cc:93
--#, fuzzy
  msgid "Please insert a Disc in the drive and press enter"
--msgstr ""
--"Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e "
--"pressione enter\n"
++msgstr "Por favor insira um Disco no leitor e pressione enter"
  
  #: cmdline/apt-cdrom.cc:117
  msgid "Repeat this process for the rest of the CDs in your set."
--msgstr ""
++msgstr "Repita este processo para o resto dos CDs no seu conjunto."
  
  #: cmdline/apt-config.cc:41
  msgid "Arguments not in pairs"
@@@ -399,7 -399,7 +396,7 @@@ msgstr "
  "árvore de .dscs. A opção --source-override pode ser utilizada para \n"
  "especificar um ficheiro override de fontes\n"
  "\n"
--"Os comandos 'packages' e 'sources' devem ser executados na raíz da \n"
++"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n"
  "árvore. CaminhoBinário deve apontar para a base de procura recursiva \n"
  "e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n"
  "incluído aos campos filename caso esteja presente. Exemplo de uso do \n"
@@@ -704,14 -704,14 +701,12 @@@ msgid "%s (due to %s) 
  msgstr "%s (devido a %s) "
  
  #: cmdline/apt-get.cc:546
--#, fuzzy
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
--"AVISO: Os seguintes pacotes essenciais serão removidos\n"
--"Isso NÃO deve ser feito a menos que você saiba exactamente o que está a "
--"fazer!"
++"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
++"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
  
  #: cmdline/apt-get.cc:577
  #, c-format
@@@ -772,7 -772,7 +767,7 @@@ msgstr "AVISO: Os seguintes pacotes nã
  
  #: cmdline/apt-get.cc:693
  msgid "Authentication warning overridden.\n"
--msgstr ""
++msgstr "Aviso de autenticação ultrapassado.\n"
  
  #: cmdline/apt-get.cc:700
  msgid "Install these packages without verification [y/N]? "
@@@ -780,7 -780,7 +775,7 @@@ msgstr "Instalar estes pacotes sem veri
  
  #: cmdline/apt-get.cc:702
  msgid "Some packages could not be authenticated"
--msgstr "Alguns pacotes não poderam ser autenticados"
++msgstr "Alguns pacotes não puderam ser autenticados"
  
  #: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
  msgid "There are problems and -y was used without --force-yes"
@@@ -788,16 -788,16 +783,15 @@@ msgstr "Há problemas e -y foi usado se
  
  #: cmdline/apt-get.cc:755
  msgid "Internal error, InstallPackages was called with broken packages!"
--msgstr ""
++msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
  
  #: cmdline/apt-get.cc:764
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
  
  #: cmdline/apt-get.cc:775
--#, fuzzy
  msgid "Internal error, Ordering didn't finish"
--msgstr "Erro Interno ao adicionar um desvio"
++msgstr "Erro Interno, Ordering não terminou"
  
  #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
  msgid "Unable to lock the download directory"
@@@ -811,6 -811,6 +805,7 @@@ msgstr "A lista de fontes não pôde se
  #: cmdline/apt-get.cc:816
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
++"Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
  
  #: cmdline/apt-get.cc:821
  #, c-format
@@@ -826,7 -826,7 +821,7 @@@ msgstr "É necessário fazer o downloa
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
--"Depois descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
++"Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
  
  #: cmdline/apt-get.cc:832
  #, c-format
@@@ -834,9 -834,9 +829,9 @@@ msgid "After unpacking %sB disk space w
  msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
  
  #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
--#, fuzzy, c-format
++#, c-format
  msgid "Couldn't determine free space in %s"
--msgstr "Desculpe, você não tem espaço suficiente em %s"
++msgstr "Impossível de determinar espaço livre em %s"
  
  #: cmdline/apt-get.cc:849
  #, c-format
@@@ -852,13 -852,13 +847,13 @@@ msgid "Yes, do as I say!
  msgstr "Sim, faça como eu digo!"
  
  #: cmdline/apt-get.cc:868
--#, fuzzy, c-format
++#, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
  "To continue type in the phrase '%s'\n"
  " ?] "
  msgstr ""
--"Você está prestes a fazer algo potencialmente prejudicial\n"
++"Você está prestes a fazer algo potencialmente nocivo.\n"
  "Para continuar escreva a frase '%s'\n"
  " ?] "
  
@@@ -929,7 -929,7 +924,7 @@@ msgstr " [Instalado]
  
  #: cmdline/apt-get.cc:1086
  msgid "You should explicitly select one to install."
--msgstr "Você deve selecionar explicitamente um para instalar."
++msgstr "Você deve seleccionar explicitamente um para instalar."
  
  #: cmdline/apt-get.cc:1091
  #, c-format
@@@ -944,7 -944,7 +939,7 @@@ msgstr "
  
  #: cmdline/apt-get.cc:1110
  msgid "However the following packages replace it:"
--msgstr "No entanto, os seguintes pacotes substituem-o:"
++msgstr "No entanto, os seguintes pacotes substituem-no:"
  
  #: cmdline/apt-get.cc:1113
  #, c-format
@@@ -1029,7 -1029,7 +1024,7 @@@ msgid "
  msgstr ""
  "Alguns pacotes não puderam ser instalados. Isso pode significar que\n"
  "você solicitou uma situação impossível ou se você está a usar a\n"
--"distribuição instável, que alguns pacotes requesitados ainda não foram \n"
++"distribuição instável, que alguns pacotes requisitados ainda não foram \n"
  "criados ou foram tirados do Incoming."
  
  #: cmdline/apt-get.cc:1578
@@@ -1038,7 -1038,7 +1033,7 @@@ msgid "
  "the package is simply not installable and a bug report against\n"
  "that package should be filed."
  msgstr ""
--"Já que você requisitou uma única operação é extremamanete provável que o \n"
++"Já que você requisitou uma única operação é extremamente provável que o \n"
  "pacote esteja simplesmente não instalável e deve ser enviado um relatório "
  "de\n"
  "bug sobre esse pacote."
@@@ -1076,9 -1076,9 +1071,8 @@@ msgid "Done
  msgstr "Pronto"
  
  #: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
--#, fuzzy
  msgid "Internal error, problem resolver broke stuff"
--msgstr "Erro Interno, AllUpgrade quebrou as coisas"
++msgstr "Erro Interno, o solucionador de problemas estragou coisas"
  
  #: cmdline/apt-get.cc:1885
  msgid "Must specify at least one package to fetch source for"
@@@ -1091,10 -1091,10 +1085,9 @@@ msgid "Unable to find a source package 
  msgstr "Impossível encontrar um pacote de código fonte para %s"
  
  #: cmdline/apt-get.cc:1959
--#, fuzzy, c-format
++#, c-format
  msgid "Skipping already downloaded file '%s'\n"
--msgstr ""
--"Saltando a descompactação de pacote código fonte já descompactado em %s\n"
++msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n"
  
  #: cmdline/apt-get.cc:1983
  #, c-format
@@@ -1134,7 -1134,7 +1127,7 @@@ msgstr "O comando de descompactação '
  #: cmdline/apt-get.cc:2069
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
--msgstr ""
++msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
  
  #: cmdline/apt-get.cc:2086
  #, c-format
@@@ -1167,7 -1167,7 +1160,7 @@@ msgid "
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
--"a dependência de %s  por %s não pôde ser satisfeita porque o pacote %s não "
++"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
  "pôde ser encontrado"
  
  #: cmdline/apt-get.cc:2273
@@@ -1177,7 -1177,7 +1170,7 @@@ msgid "
  "package %s can satisfy version requirements"
  msgstr ""
  "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
--"disponível do pacote %s pode satisfazer os requesitos de versão"
++"disponível do pacote %s pode satisfazer os requisitos de versão"
  
  #: cmdline/apt-get.cc:2308
  #, c-format
@@@ -1424,7 -1424,7 +1417,7 @@@ msgstr "Arquivo é demasiado pequeno
  
  #: apt-inst/contrib/arfile.cc:135
  msgid "Failed to read the archive headers"
--msgstr "Falha ao ler os cabeçahos do arquivo"
++msgstr "Falha ao ler os cabeçalhos do arquivo"
  
  #: apt-inst/filelist.cc:384
  msgid "DropNode called on still linked node"
@@@ -1445,7 -1445,7 +1438,7 @@@ msgstr "Erro Interno em AddDiversion
  #: apt-inst/filelist.cc:481
  #, c-format
  msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
--msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s"
++msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
  
  #: apt-inst/filelist.cc:510
  #, c-format
@@@ -1458,7 -1458,7 +1451,7 @@@ msgid "Duplicate conf file %s/%s
  msgstr "Arquivo de configuração duplicado %s/%s"
  
  #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
--#, fuzzy, c-format
++#, c-format
  msgid "Failed to write file %s"
  msgstr "Falha ao escrever ficheiro %s"
  
@@@ -1494,7 -1494,7 +1487,7 @@@ msgstr "O caminho de desvio é muito lo
  #: apt-inst/extract.cc:243
  #, c-format
  msgid "The directory %s is being replaced by a non-directory"
--msgstr "O directório %s está sendo substituído por um não-diretório"
++msgstr "O directório %s está sendo substituído por um não-directório"
  
  #: apt-inst/extract.cc:283
  msgid "Failed to locate node in its hash bucket"
@@@ -1512,7 -1512,7 +1505,7 @@@ msgstr "Sobreescrita de pacote não coi
  #: apt-inst/extract.cc:434
  #, c-format
  msgid "File %s/%s overwrites the one in the package %s"
--msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s"
++msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s"
  
  #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
  #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
@@@ -1678,9 -1678,9 +1671,8 @@@ msgid "Unable to unmount the CD-ROM in 
  msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
  
  #: methods/cdrom.cc:169
--#, fuzzy
  msgid "Disk not found."
--msgstr "Arquivo não encontrado"
++msgstr "Disco não encontrado"
  
  #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
@@@ -1869,7 -1869,7 +1861,7 @@@ msgstr "Não posso iniciar a ligação 
  #: methods/connect.cc:93
  #, c-format
  msgid "Could not connect to %s:%s (%s), connection timed out"
--msgstr "Não foi possível ligarar em %s:%s (%s), a conexão expirou"
++msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
  
  #: methods/connect.cc:106
  #, c-format
@@@ -1905,41 -1905,41 +1897,43 @@@ msgstr "Impossível ligar a %s %s:
  
  #: methods/gpgv.cc:92
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
--msgstr ""
++msgstr "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
  
  #: methods/gpgv.cc:191
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
++"Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
++"digital da chave?!"
  
  #: methods/gpgv.cc:196
  msgid "At least one invalid signature was encountered."
--msgstr ""
++msgstr "Pelo menos uma assinatura inválida foi encontrada."
  
  #. FIXME String concatenation considered harmful.
  #: methods/gpgv.cc:201
--#, fuzzy
  msgid "Could not execute "
--msgstr "Não foi possível obter lock %s"
++msgstr "Impossível de executar "
  
  #: methods/gpgv.cc:202
  msgid " to verify signature (is gnupg installed?)"
--msgstr ""
++msgstr " para verificar assinatura (gnupg instalado?)"
  
  #: methods/gpgv.cc:206
  msgid "Unknown error executing gpgv"
--msgstr ""
++msgstr "Erro desconhecido ao executar gpgv"
  
  #: methods/gpgv.cc:237
--#, fuzzy
  msgid "The following signatures were invalid:\n"
--msgstr "Os seguintes pacotes extra serão instalados:"
++msgstr "As seguintes assinaturas estavam inválidas:\n"
  
  #: methods/gpgv.cc:244
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
++"As seguintes assinaturas não puderam ser verificadas porque a chave pública "
++"não está disponível:\n"
  
  #: methods/gzip.cc:57
  #, c-format
@@@ -2364,7 -2364,7 +2358,7 @@@ msgid "Malformed line %u in source lis
  msgstr "Linha malformada %u na lista de fontes %s (tipo)"
  
  #: apt-pkg/sourcelist.cc:244
--#, fuzzy, c-format
++#, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
  
@@@ -2418,12 -2418,12 +2412,12 @@@ msgstr "Falta directório de listas %sp
  #: apt-pkg/acquire.cc:66
  #, c-format
  msgid "Archive directory %spartial is missing."
--msgstr "Falta o diretório de repositório %spartial."
++msgstr "Falta o directório de repositório %spartial."
  
  #: apt-pkg/acquire.cc:821
  #, c-format
  msgid "Downloading file %li of %li (%s remaining)"
--msgstr ""
++msgstr "A efectuar download de ficheiro %li de %li (%s restantes)"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2436,12 -2436,12 +2430,10 @@@ msgid "Method %s did not start correctl
  msgstr "Método %s não iniciou corretamente"
  
  #: apt-pkg/acquire-worker.cc:377
--#, fuzzy, c-format
++#, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
--"Troca de mídia: Por favor insira o disco chamado\n"
--" '%s'\n"
--"na drive '%s' e pressione enter\n"
++"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
  
  #: apt-pkg/init.cc:120
  #, c-format
@@@ -2465,7 -2465,7 +2457,7 @@@ msgstr "Você deve colocar alguns URIs 
  #: apt-pkg/cachefile.cc:73
  msgid "The package lists or status file could not be parsed or opened."
  msgstr ""
--"As listas de pacotes ou o ficheiro de status não pôde ser analizado ou "
++"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
  "aberto."
  
  #: apt-pkg/cachefile.cc:77
@@@ -2580,7 -2580,7 +2572,7 @@@ msgstr "MD5Sum incorreto
  
  #: apt-pkg/acquire-item.cc:645
  msgid "There are no public key available for the following key IDs:\n"
--msgstr ""
++msgstr "Não existe qualquer chave pública disponível para as seguintes IDs de chave:\n"
  
  #: apt-pkg/acquire-item.cc:758
  #, c-format
@@@ -2589,7 -2589,7 +2581,7 @@@ msgid "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
  "Não foi possível localizar um arquivo para o pacote %s. Isto pode significar "
--"que você precisa consertar manualmente este pacote. (devido a arquitetura "
++"que você precisa consertar manualmente este pacote. (devido a arquitectura "
  "não especificada)."
  
  #: apt-pkg/acquire-item.cc:817
@@@ -2611,7 -2611,7 +2603,7 @@@ msgstr "
  
  #: apt-pkg/acquire-item.cc:940
  msgid "Size mismatch"
--msgstr "Tamanho incorreto"
++msgstr "Tamanho incorrecto"
  
  #: apt-pkg/vendorlist.cc:66
  #, c-format
@@@ -2715,54 -2715,54 +2707,54 @@@ msgstr "
  "coincidentes\n"
  
  #: apt-pkg/deb/dpkgpm.cc:358
--#, fuzzy, c-format
++#, c-format
  msgid "Preparing %s"
--msgstr "Abrindo %s"
++msgstr "A preparar %s"
  
  #: apt-pkg/deb/dpkgpm.cc:359
--#, fuzzy, c-format
++#, c-format
  msgid "Unpacking %s"
--msgstr "Abrindo %s"
++msgstr "A desempacotar %s"
  
  #: apt-pkg/deb/dpkgpm.cc:364
--#, fuzzy, c-format
++#, c-format
  msgid "Preparing to configure %s"
--msgstr "Abrindo ficheiro de configuração %s"
++msgstr "A preparar para configurar %s"
  
  #: apt-pkg/deb/dpkgpm.cc:365
--#, fuzzy, c-format
++#, c-format
  msgid "Configuring %s"
--msgstr "Ligando a %s"
++msgstr "A configurar %s"
  
  #: apt-pkg/deb/dpkgpm.cc:366
--#, fuzzy, c-format
++#, c-format
  msgid "Installed %s"
--msgstr "  Instalado: "
++msgstr "%s instalado"
  
  #: apt-pkg/deb/dpkgpm.cc:371
  #, c-format
  msgid "Preparing for removal of %s"
--msgstr ""
++msgstr "A preparar para remoção de %s"
  
  #: apt-pkg/deb/dpkgpm.cc:372
--#, fuzzy, c-format
++#, c-format
  msgid "Removing %s"
--msgstr "Abrindo %s"
++msgstr "A remover %s"
  
  #: apt-pkg/deb/dpkgpm.cc:373
--#, fuzzy, c-format
++#, c-format
  msgid "Removed %s"
--msgstr "Recomenda"
++msgstr "%s removido"
  
  #: apt-pkg/deb/dpkgpm.cc:378
  #, c-format
  msgid "Preparing for remove with config %s"
--msgstr ""
++msgstr "A preparar para remover com a configuração %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
  #, c-format
  msgid "Removed with config %s"
--msgstr ""
++msgstr "Removido com a configuração %s"
  
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
diff --cc po/ro.po
index 10bf9b0f3,10bf9b0f3..12b432d9c
--- a/po/ro.po
+++ b/po/ro.po
@@@ -1,19 -1,19 +1,19 @@@
  # translation of apt_ro.po to Romanian
  # This file is put in the public domain.
--# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005.
  #
++# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006.
  msgid ""
  msgstr ""
--"Project-Id-Version: apt_po_ro\n"
++"Project-Id-Version: apt_nou\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2006-01-20 14:01+0100\n"
--"PO-Revision-Date: 2005-08-25 17:43+0300\n"
++"PO-Revision-Date: 2006-02-27 11:59+0200\n"
  "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
  "Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
--"X-Generator: KBabel 1.9.1\n"
++"X-Generator: KBabel 1.11.2\n"
  "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
  
  #: cmdline/apt-cache.cc:135
@@@ -230,19 -230,19 +230,15 @@@ msgstr "
  
  #: cmdline/apt-cdrom.cc:78
  msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
--msgstr ""
++msgstr "Vă rog furnizaţi un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'"
  
  #: cmdline/apt-cdrom.cc:93
--#, fuzzy
  msgid "Please insert a Disc in the drive and press enter"
--msgstr ""
--"Schimbare de mediu: Vă rog introduceţi discul numit\n"
--" '%s'\n"
--"în unitatea '%s' şi apăsaţi Enter\n"
++msgstr "Vă rog introduceţi un disc în unitate şi apăsaţi Enter"
  
  #: cmdline/apt-cdrom.cc:117
  msgid "Repeat this process for the rest of the CDs in your set."
--msgstr ""
++msgstr "Repetaţi această procedură pentru restul CD-urilor."
  
  #: cmdline/apt-config.cc:41
  msgid "Arguments not in pairs"
@@@ -713,12 -713,12 +709,11 @@@ msgid "%s (due to %s) 
  msgstr "%s (datorită %s) "
  
  #: cmdline/apt-get.cc:546
--#, fuzzy
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
--"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n"
++"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse.\n"
  "Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!"
  
  #: cmdline/apt-get.cc:577
@@@ -780,7 -780,7 +775,7 @@@ msgstr "AVERTISMENT: Următoarele pache
  
  #: cmdline/apt-get.cc:693
  msgid "Authentication warning overridden.\n"
--msgstr ""
++msgstr "Avertisment de autentificare înlocuit.\n"
  
  #: cmdline/apt-get.cc:700
  msgid "Install these packages without verification [y/N]? "
@@@ -796,16 -796,16 +791,15 @@@ msgstr "Sunt unele probleme şi -y a fo
  
  #: cmdline/apt-get.cc:755
  msgid "Internal error, InstallPackages was called with broken packages!"
--msgstr ""
++msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
  
  #: cmdline/apt-get.cc:764
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
  
  #: cmdline/apt-get.cc:775
--#, fuzzy
  msgid "Internal error, Ordering didn't finish"
--msgstr "Eroare internă în timpul adăugării unei diversiuni"
++msgstr "Eroare internă, Ordering nu s-a terminat"
  
  #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
  msgid "Unable to lock the download directory"
@@@ -818,7 -818,7 +812,7 @@@ msgstr "Lista surselor nu poate fi citi
  
  #: cmdline/apt-get.cc:816
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
--msgstr ""
++msgstr "Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org"
  
  #: cmdline/apt-get.cc:821
  #, c-format
@@@ -841,9 -841,9 +835,9 @@@ msgid "After unpacking %sB disk space w
  msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
  
  #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
--#, fuzzy, c-format
++#, c-format
  msgid "Couldn't determine free space in %s"
--msgstr "Nu aveţi suficient spaţiu în %s"
++msgstr "N-am putut determina spaţiul disponibil în %s"
  
  #: cmdline/apt-get.cc:849
  #, c-format
@@@ -852,21 -852,21 +846,20 @@@ msgstr "Nu aveţi suficient spaţiu î
  
  #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
  msgid "Trivial Only specified but this is not a trivial operation."
--msgstr ""
--"A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
++msgstr "A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
  
  #: cmdline/apt-get.cc:866
  msgid "Yes, do as I say!"
  msgstr "Da, fă cum îţi spun!"
  
  #: cmdline/apt-get.cc:868
--#, fuzzy, c-format
++#, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
  "To continue type in the phrase '%s'\n"
  " ?] "
  msgstr ""
--"Sunteţi pe cale de a face ceva cu potenţial distructiv\n"
++"Sunteţi pe cale de a face ceva cu potenţial distructiv.\n"
  "Pentru a continua tastaţi fraza '%s'\n"
  " ?] "
  
@@@ -1082,9 -1082,9 +1075,8 @@@ msgid "Done
  msgstr "Terminat"
  
  #: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
--#, fuzzy
  msgid "Internal error, problem resolver broke stuff"
--msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
++msgstr "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
  
  #: cmdline/apt-get.cc:1885
  msgid "Must specify at least one package to fetch source for"
@@@ -1096,9 -1096,9 +1088,9 @@@ msgid "Unable to find a source package 
  msgstr "Nu pot găsi o sursă pachet pentru %s"
  
  #: cmdline/apt-get.cc:1959
--#, fuzzy, c-format
++#, c-format
  msgid "Skipping already downloaded file '%s'\n"
--msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
++msgstr "Sar peste fişierul deja descărcat '%s'\n"
  
  #: cmdline/apt-get.cc:1983
  #, c-format
@@@ -1137,7 -1137,7 +1129,7 @@@ msgstr "Comanda de despachetare '%s' eÅ
  #: cmdline/apt-get.cc:2069
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
--msgstr ""
++msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n"
  
  #: cmdline/apt-get.cc:2086
  #, c-format
@@@ -1370,17 -1370,17 +1362,14 @@@ msgstr "S-au produs unele erori în tim
  
  #: dselect/install:101
  msgid "packages that were installed. This may result in duplicate errors"
--msgstr ""
--"pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate"
++msgstr "pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate"
  
  #: dselect/install:102
  msgid "or errors caused by missing dependencies. This is OK, only the errors"
--msgstr ""
--"sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile"
++msgstr "sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile"
  
  #: dselect/install:103
--msgid ""
--"above this message are important. Please fix them and run [I]nstall again"
++msgid "above this message are important. Please fix them and run [I]nstall again"
  msgstr ""
  "de deasupra acestui mesaj sunt importante. Vă rog corectaţi-le şi porniţi "
  "din nou [I]nstalarea"
@@@ -1462,9 -1462,9 +1451,9 @@@ msgid "Duplicate conf file %s/%s
  msgstr "Fişier de configurare duplicat %s/%s"
  
  #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
--#, fuzzy, c-format
++#, c-format
  msgid "Failed to write file %s"
--msgstr "Eşuare în a scrie fişierul %s"
++msgstr "Eşuare în scrierea fişierului %s"
  
  #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
  #, c-format
@@@ -1612,7 -1612,7 +1601,6 @@@ msgid "Internal error adding a diversio
  msgstr "Eroare internă în timpul adăugării unei diversiuni"
  
  #: apt-inst/deb/dpkgdb.cc:383
--#, fuzzy
  msgid "The pkg cache must be initialized first"
  msgstr "Cache-ul pachetului trebuie întâi iniţializat"
  
@@@ -1685,9 -1685,9 +1673,8 @@@ msgid "Unable to unmount the CD-ROM in 
  msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat."
  
  #: methods/cdrom.cc:169
--#, fuzzy
  msgid "Disk not found."
--msgstr "Fişier negăsit"
++msgstr "Disc negăsit."
  
  #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
@@@ -1912,41 -1912,41 +1899,38 @@@ msgstr "Nu pot conecta la %s %s
  
  #: methods/gpgv.cc:92
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
--msgstr ""
++msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies."
  
  #: methods/gpgv.cc:191
--msgid ""
--"Internal error: Good signature, but could not determine key fingerprint?!"
--msgstr ""
++msgid "Internal error: Good signature, but could not determine key fingerprint?!"
++msgstr "Eroare internă: Semnătură corespunzătoare, dar n-am putut determina cheia amprentei digitale?!"
  
  #: methods/gpgv.cc:196
  msgid "At least one invalid signature was encountered."
--msgstr ""
++msgstr "Cel puţin o semnătură invalidă a fost întâlnită."
  
  #. FIXME String concatenation considered harmful.
  #: methods/gpgv.cc:201
--#, fuzzy
  msgid "Could not execute "
--msgstr "Nu pot determina blocajul %s"
++msgstr "Nu s-a putut executa "
  
  #: methods/gpgv.cc:202
  msgid " to verify signature (is gnupg installed?)"
--msgstr ""
++msgstr " verificarea semnăturii (este instalat gnupg?)"
  
  #: methods/gpgv.cc:206
  msgid "Unknown error executing gpgv"
--msgstr ""
++msgstr "Eroare necunoscută în timp ce se execută gpgv"
  
  #: methods/gpgv.cc:237
--#, fuzzy
  msgid "The following signatures were invalid:\n"
--msgstr "Următoarele extra pachete vor fi instalate:"
++msgstr "Următoarele semnături au fost invalide:\n"
  
  #: methods/gpgv.cc:244
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
--msgstr ""
++msgstr "Următoarele semnături n-au putut fi verificate datorită cheii publice care este indisponibilă:\n"
  
  #: methods/gzip.cc:57
  #, c-format
@@@ -2013,8 -2013,8 +1997,7 @@@ msgstr "Eroare la scrierea în fişieru
  
  #: methods/http.cc:874
  msgid "Error reading from server. Remote end closed connection"
--msgstr ""
--"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
++msgstr "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
  
  #: methods/http.cc:876
  msgid "Error reading from server"
@@@ -2079,8 -2079,8 +2062,7 @@@ msgstr "Eroare de sintaxă %s:%u: mizer
  #: apt-pkg/contrib/configuration.cc:684
  #, c-format
  msgid "Syntax error %s:%u: Directives can only be done at the top level"
--msgstr ""
--"Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior"
++msgstr "Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior"
  
  #: apt-pkg/contrib/configuration.cc:691
  #, c-format
@@@ -2136,8 -2136,8 +2118,7 @@@ msgstr "Opţiunea %s necesită un argum
  #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
  #, c-format
  msgid "Option %s: Configuration item specification must have an =<val>."
--msgstr ""
--"Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =<val>."
++msgstr "Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =<val>."
  
  #: apt-pkg/contrib/cmndline.cc:237
  #, c-format
@@@ -2372,7 -2372,7 +2353,7 @@@ msgid "Malformed line %u in source lis
  msgstr "Linie greşită %u în lista sursă %s (tip)"
  
  #: apt-pkg/sourcelist.cc:244
--#, fuzzy, c-format
++#, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
  
@@@ -2400,10 -2400,10 +2381,8 @@@ msgstr "Tipul de fişier index '%s' nu 
  
  #: apt-pkg/algorithms.cc:241
  #, c-format
--msgid ""
--"The package %s needs to be reinstalled, but I can't find an archive for it."
--msgstr ""
--"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
++msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
++msgstr "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
  
  #: apt-pkg/algorithms.cc:1059
  msgid ""
@@@ -2430,7 -2430,7 +2409,7 @@@ msgstr "Directorul de arhive %spartial 
  #: apt-pkg/acquire.cc:821
  #, c-format
  msgid "Downloading file %li of %li (%s remaining)"
--msgstr ""
++msgstr "Se descarcă fişierul %li din %li (%s rămas)"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2443,12 -2443,12 +2422,9 @@@ msgid "Method %s did not start correctl
  msgstr "Metoda %s nu s-a lansat corect"
  
  #: apt-pkg/acquire-worker.cc:377
--#, fuzzy, c-format
++#, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
--msgstr ""
--"Schimbare de mediu: Vă rog introduceţi discul numit\n"
--" '%s'\n"
--"în unitatea '%s' şi apăsaţi Enter\n"
++msgstr "Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter."
  
  #: apt-pkg/init.cc:120
  #, c-format
@@@ -2476,8 -2476,8 +2452,7 @@@ msgstr "
  
  #: apt-pkg/cachefile.cc:77
  msgid "You may want to run apt-get update to correct these problems"
--msgstr ""
--"Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme."
++msgstr "Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme."
  
  #: apt-pkg/policy.cc:269
  msgid "Invalid record in the preferences file, no Package header"
@@@ -2497,39 -2497,39 +2472,39 @@@ msgid "Cache has an incompatible versio
  msgstr "Cache are un versioning system incompatibil"
  
  #: apt-pkg/pkgcachegen.cc:117
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (NewPackage)"
--msgstr "Eroare în timpul procesării %s (Pachet Nou)"
++msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
  
  #: apt-pkg/pkgcachegen.cc:129
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
--msgstr "Eroare în timpul procesării %s (UsePackage1)"
++msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
  
  #: apt-pkg/pkgcachegen.cc:150
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
--msgstr "Eroare în timpul procesării %s (UsePackage2)"
++msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
  
  #: apt-pkg/pkgcachegen.cc:154
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
--msgstr "Eroare în timpul procesării %s (NewFileVer1)"
++msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
  
  #: apt-pkg/pkgcachegen.cc:184
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
--msgstr "Eroare în timpul procesării %s (NewVersion1)"
++msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
  
  #: apt-pkg/pkgcachegen.cc:188
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
--msgstr "Eroare în timpul procesării %s (UsePackage3)"
++msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
  
  #: apt-pkg/pkgcachegen.cc:192
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
--msgstr "Eroare în timpul procesării %s (NewVersion2)"
++msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
  
  #: apt-pkg/pkgcachegen.cc:207
  msgid "Wow, you exceeded the number of package names this APT is capable of."
@@@ -2539,29 -2539,29 +2514,26 @@@ msgstr "
  
  #: apt-pkg/pkgcachegen.cc:210
  msgid "Wow, you exceeded the number of versions this APT is capable of."
--msgstr ""
--"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
++msgstr "Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
  
  #: apt-pkg/pkgcachegen.cc:213
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
--msgstr ""
--"Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
++msgstr "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
  
  #: apt-pkg/pkgcachegen.cc:241
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (FindPkg)"
--msgstr "Eroare în timpul procesării %s (FindPkg)"
++msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
  
  #: apt-pkg/pkgcachegen.cc:254
--#, fuzzy, c-format
++#, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
--msgstr "Eroare în timpul procesării %s (CollectFileProvides)"
++msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
  
  #: apt-pkg/pkgcachegen.cc:260
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
--msgstr ""
--"Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
++msgstr "Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
  
  #: apt-pkg/pkgcachegen.cc:574
  #, c-format
@@@ -2587,7 -2587,7 +2559,7 @@@ msgstr "Nepotrivire MD5Sum
  
  #: apt-pkg/acquire-item.cc:645
  msgid "There are no public key available for the following key IDs:\n"
--msgstr ""
++msgstr "Nu există nici o cheie publică disponibilă pentru următoarele identificatoare de chei:\n"
  
  #: apt-pkg/acquire-item.cc:758
  #, c-format
@@@ -2609,8 -2609,8 +2581,7 @@@ msgstr "
  
  #: apt-pkg/acquire-item.cc:853
  #, c-format
--msgid ""
--"The package index files are corrupted. No Filename: field for package %s."
++msgid "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
  "pachetul %s."
@@@ -2716,59 -2716,59 +2687,59 @@@ msgstr "S-au scris %i înregistrări c
  #: apt-pkg/indexcopy.cc:269
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
--msgstr ""
--"S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n"
++msgstr "S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n"
  
  #: apt-pkg/deb/dpkgpm.cc:358
--#, fuzzy, c-format
++#, c-format
  msgid "Preparing %s"
--msgstr "Deschidere %s"
++msgstr "Se pregăteşte %s"
  
  #: apt-pkg/deb/dpkgpm.cc:359
--#, fuzzy, c-format
++#, c-format
  msgid "Unpacking %s"
--msgstr "Deschidere %s"
++msgstr "Se despachetează %s"
  
  #: apt-pkg/deb/dpkgpm.cc:364
--#, fuzzy, c-format
++#, c-format
  msgid "Preparing to configure %s"
--msgstr "Deschidere fişier de configurare %s"
++msgstr "Se pregăteşte configurarea %s"
  
  #: apt-pkg/deb/dpkgpm.cc:365
--#, fuzzy, c-format
++#, c-format
  msgid "Configuring %s"
--msgstr "Conectare la %s"
++msgstr "Se configurează %s"
  
  #: apt-pkg/deb/dpkgpm.cc:366
--#, fuzzy, c-format
++#, c-format
  msgid "Installed %s"
--msgstr "  Instalat: "
++msgstr "Instalat %s"
  
  #: apt-pkg/deb/dpkgpm.cc:371
  #, c-format
  msgid "Preparing for removal of %s"
--msgstr ""
++msgstr "Se pregăteşte ştergerea lui %s"
  
  #: apt-pkg/deb/dpkgpm.cc:372
--#, fuzzy, c-format
++#, c-format
  msgid "Removing %s"
--msgstr "Deschidere %s"
++msgstr "Se şterge %s"
  
  #: apt-pkg/deb/dpkgpm.cc:373
--#, fuzzy, c-format
++#, c-format
  msgid "Removed %s"
--msgstr "Recomandă"
++msgstr "Şters %s"
  
  #: apt-pkg/deb/dpkgpm.cc:378
  #, c-format
  msgid "Preparing for remove with config %s"
--msgstr ""
++msgstr "Se pregăteşte pentru ştergere inclusiv configurarea %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
  #, c-format
  msgid "Removed with config %s"
--msgstr ""
++msgstr "Şters inclusiv configurarea %s"
  
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Conexiune închisă prematur"
++
diff --cc po/tl.po
index dc7c0d0ae,dc7c0d0ae..79dfe5432
--- a/po/tl.po
+++ b/po/tl.po
@@@ -10,8 -10,8 +10,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-01-20 14:01+0100\n"
--"PO-Revision-Date: 2005-12-22 01:10+0800\n"
++"POT-Creation-Date: 2006-01-20 14:06+0100\n"
++"PO-Revision-Date: 2006-03-16 15:53+0800\n"
  "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
  "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
  "MIME-Version: 1.0\n"
@@@ -442,7 -442,7 +442,7 @@@ msgstr "Nasira ang DB, pinalitan ng pan
  #: ftparchive/cachedb.cc:63
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
--msgstr "Luma ang DB, sinusubukang maupgrade %s"
++msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
  
  #: ftparchive/cachedb.cc:73
  #, c-format
@@@ -452,7 -452,7 +452,7 @@@ msgstr "Hindi mabuksan ang talaksang D
  #: ftparchive/cachedb.cc:114
  #, c-format
  msgid "File date has changed %s"
--msgstr "Nagbago ang petsa ng talaksan %s"
++msgstr "Nagbago ang petsa ng talaksang %s"
  
  #: ftparchive/cachedb.cc:155
  msgid "Archive has no control record"
@@@ -541,7 -541,7 +541,7 @@@ msgstr "  %s ay walang override entry\n
  #: ftparchive/writer.cc:437 ftparchive/writer.cc:689
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
--msgstr "  Maintainer ng %s ay %s hindi %s\n"
++msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
  
  #: ftparchive/contents.cc:317
  #, c-format
@@@ -721,7 -721,7 +721,7 @@@ msgstr "
  #: cmdline/apt-get.cc:577
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
--msgstr "%lu nai-upgrade, %lu bagong luklok, "
++msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
  
  #: cmdline/apt-get.cc:581
  #, c-format
@@@ -835,12 -835,12 +835,13 @@@ msgstr "Kailangang kumuha ng %sB ng ark
  #: cmdline/apt-get.cc:829
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
--msgstr "Matapos magbuklat ay %sB na karagdagang puwang sa disk ay magagamit.\n"
++msgstr ""
++"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
  
  #: cmdline/apt-get.cc:832
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
--msgstr "Matapos magbuklat %sB na puwang sa disk ay mapapalaya.\n"
++msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
  
  #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
  #, c-format
@@@ -921,12 -921,12 +922,12 @@@ msgstr "Paunawa, pinili ang %s imbes n
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
--"Linaktawan ang %s, ito'y naka-instol na at hindi nakatakda ang upgrade.\n"
++"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
  
  #: cmdline/apt-get.cc:1058
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
--msgstr "Hindi naka-instol ang paketeng %s, kaya't hindi ito tinanggal\n"
++msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
  
  #: cmdline/apt-get.cc:1069
  #, c-format
@@@ -935,11 -935,11 +936,11 @@@ msgstr "Ang paketeng %s ay paketeng bir
  
  #: cmdline/apt-get.cc:1081
  msgid " [Installed]"
--msgstr " [Naka-instol]"
++msgstr " [Nakaluklok]"
  
  #: cmdline/apt-get.cc:1086
  msgid "You should explicitly select one to install."
--msgstr "Dapat ninyong piliin ang isa na instolahin."
++msgstr "Dapat kayong mamili ng isa na iluluklok."
  
  #: cmdline/apt-get.cc:1091
  #, c-format
@@@ -949,7 -949,7 +950,7 @@@ msgid "
  "is only available from another source\n"
  msgstr ""
  "Hindi magamit ang %s, ngunit ito'y tinutukoy ng ibang pakete.\n"
--"Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n"
++"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
  "sa ibang pinagmulan.\n"
  
  #: cmdline/apt-get.cc:1110
@@@ -964,7 -964,7 +965,7 @@@ msgstr "Ang paketeng %s ay walang kandi
  #: cmdline/apt-get.cc:1133
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
--msgstr "Ang pag-instol muli ng %s ay hindi maaari, hindi ito makuha.\n"
++msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
  
  #: cmdline/apt-get.cc:1141
  #, c-format
@@@ -1047,7 -1047,7 +1048,7 @@@ msgid "
  "that package should be filed."
  msgstr ""
  "Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete ay\n"
--"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n"
++"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
  "pakete na ito."
  
  #: cmdline/apt-get.cc:1583
@@@ -1061,7 -1061,7 +1062,7 @@@ msgstr "Sirang mga pakete
  
  #: cmdline/apt-get.cc:1612
  msgid "The following extra packages will be installed:"
--msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
++msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
  
  #: cmdline/apt-get.cc:1683
  msgid "Suggested packages:"
@@@ -1073,7 -1073,7 +1074,7 @@@ msgstr "Mga paketeng rekomendado:
  
  #: cmdline/apt-get.cc:1704
  msgid "Calculating upgrade... "
--msgstr "Kinakalkula ang upgrade... "
++msgstr "Sinusuri ang pag-upgrade... "
  
  #: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
@@@ -1097,9 -1097,9 +1098,9 @@@ msgid "Unable to find a source package 
  msgstr "Hindi mahanap ang paketeng source para sa %s"
  
  #: cmdline/apt-get.cc:1959
--#, fuzzy, c-format
++#, c-format
  msgid "Skipping already downloaded file '%s'\n"
--msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
++msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
  
  #: cmdline/apt-get.cc:1983
  #, c-format
@@@ -1310,7 -1310,7 +1311,7 @@@ msgstr "Nakakuha ng %sB ng %s (%sB/s)\n
  #: cmdline/acqprogress.cc:225
  #, c-format
  msgid " [Working]"
--msgstr " [May Ginagawa]"
++msgstr " [May ginagawa]"
  
  #: cmdline/acqprogress.cc:271
  #, c-format
@@@ -1367,7 -1367,7 +1368,7 @@@ msgstr "May mga error na naganap haban
  
  #: dselect/install:101
  msgid "packages that were installed. This may result in duplicate errors"
--msgstr "mga paketeng na-instol. Maaaring dumulot ito ng mga error na doble"
++msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble"
  
  #: dselect/install:102
  msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@@ -1379,7 -1379,7 +1380,7 @@@ msgid "
  "above this message are important. Please fix them and run [I]nstall again"
  msgstr ""
  "sa taas nitong kalatas ang importante. Paki-ayusin ang mga ito at patakbuhin "
--"muli ang [I]nstol."
++"muli ang [I]luklok/Instol."
  
  #: dselect/update:30
  msgid "Merging available information"
@@@ -1840,7 -1840,7 +1841,7 @@@ msgstr "Bigo ang paglipat ng datos, sab
  #. Get the files information
  #: methods/ftp.cc:997
  msgid "Query"
--msgstr "Query"
++msgstr "Tanong"
  
  #: methods/ftp.cc:1106
  msgid "Unable to invoke "
@@@ -1957,16 -1957,16 +1958,16 @@@ msgstr "Error sa pagbasa mula sa proses
  
  #: methods/http.cc:376
  msgid "Waiting for headers"
--msgstr "Naghihintay ng mga header"
++msgstr "Naghihintay ng panimula"
  
  #: methods/http.cc:522
  #, c-format
  msgid "Got a single header line over %u chars"
--msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter"
++msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
  
  #: methods/http.cc:530
  msgid "Bad header line"
--msgstr "Maling linyang header"
++msgstr "Maling linyang panimula"
  
  #: methods/http.cc:549 methods/http.cc:556
  msgid "The HTTP server sent an invalid reply header"
@@@ -2018,7 -2018,7 +2019,7 @@@ msgstr "Error sa pagbasa mula sa server
  
  #: methods/http.cc:1107
  msgid "Bad header data"
--msgstr "Maling datos sa header"
++msgstr "Maling datos sa panimula"
  
  #: methods/http.cc:1124
  msgid "Connection failed"
@@@ -2111,40 -2111,40 +2112,40 @@@ msgstr "%c%s... Tapos
  #: apt-pkg/contrib/cmndline.cc:80
  #, c-format
  msgid "Command line option '%c' [from %s] is not known."
--msgstr "Option sa command line '%c' [mula %s] ay di kilala."
++msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala."
  
  #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
  #: apt-pkg/contrib/cmndline.cc:122
  #, c-format
  msgid "Command line option %s is not understood"
--msgstr "Option sa command line %s ay di naintindihan."
++msgstr "Opsyon sa command line %s ay di naintindihan."
  
  #: apt-pkg/contrib/cmndline.cc:127
  #, c-format
  msgid "Command line option %s is not boolean"
--msgstr "Option sa command line %s ay hindi boolean"
++msgstr "Opsyon sa command line %s ay hindi boolean"
  
  #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
  #, c-format
  msgid "Option %s requires an argument."
--msgstr "Option %s ay nangangailangan ng argumento"
++msgstr "Opsyon %s ay nangangailangan ng argumento"
  
  #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
  #, c-format
  msgid "Option %s: Configuration item specification must have an =<val>."
  msgstr ""
--"Option %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
++"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
  "=<halaga>."
  
  #: apt-pkg/contrib/cmndline.cc:237
  #, c-format
  msgid "Option %s requires an integer argument, not '%s'"
--msgstr "Option %s ay nangangailangan ng argumentong integer, hindi '%s'"
++msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
  
  #: apt-pkg/contrib/cmndline.cc:268
  #, c-format
  msgid "Option '%s' is too long"
--msgstr "Option '%s' ay labis ang haba"
++msgstr "Opsyon '%s' ay labis ang haba"
  
  #: apt-pkg/contrib/cmndline.cc:301
  #, c-format
@@@ -2279,7 -2279,7 +2280,7 @@@ msgstr "Rekomendado
  
  #: apt-pkg/pkgcache.cc:219
  msgid "Conflicts"
--msgstr "Conflict"
++msgstr "Tunggali"
  
  #: apt-pkg/pkgcache.cc:219
  msgid "Replaces"
@@@ -2584,7 -2584,7 +2585,7 @@@ msgstr "Di tugmang MD5Sum
  
  #: apt-pkg/acquire-item.cc:645
  msgid "There are no public key available for the following key IDs:\n"
--msgstr ""
++msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n"
  
  #: apt-pkg/acquire-item.cc:758
  #, c-format