Browse Source

* doc/*.xml:

- add a few translator notes and reword some paragraphs to ensure that
    translators and users alike can better understand them (Closes: #669409)
tags/debian/0.9.4
David Kalnischkies 9 years ago
parent
commit
c086ac1851
17 changed files with 4610 additions and 3617 deletions
  1. +3
    -0
      debian/changelog
  2. +13
    -15
      doc/apt-cache.8.xml
  3. +4
    -3
      doc/apt-config.8.xml
  4. +4
    -3
      doc/apt-get.8.xml
  5. +4
    -4
      doc/apt-key.8.xml
  6. +2
    -2
      doc/apt-verbatim.ent
  7. +24
    -14
      doc/apt.conf.5.xml
  8. +10
    -4
      doc/apt.ent
  9. +422
    -378
      doc/po/apt-doc.pot
  10. +611
    -425
      doc/po/de.po
  11. +546
    -400
      doc/po/es.po
  12. +547
    -401
      doc/po/fr.po
  13. +425
    -385
      doc/po/it.po
  14. +523
    -401
      doc/po/ja.po
  15. +473
    -392
      doc/po/pl.po
  16. +547
    -399
      doc/po/pt.po
  17. +452
    -391
      doc/po/pt_BR.po

+ 3
- 0
debian/changelog View File

@@ -35,6 +35,9 @@ apt (0.9.4) UNRELEASED; urgency=low
- updated german manpage translation by Chris Leick, thanks!
* apt-pkg/packagemanager.cc:
- do not run into loop on new-pre-depends-breaks (Closes: #673536)
* doc/*.xml:
- add a few translator notes and reword some paragraphs to ensure that
translators and users alike can better understand them (Closes: #669409)

[ Raphael Geissert ]
* apt-pkg/acquire*.cc:


+ 13
- 15
doc/apt-cache.8.xml View File

@@ -46,13 +46,11 @@

<variablelist>
<varlistentry><term>gencaches</term>
<listitem><para><literal>gencaches</literal> performs the same operation as
<command>apt-get check</command>. It builds the source and package caches from
the sources in &sources-list; and from
<filename>/var/lib/dpkg/status</filename>.</para></listitem>
<listitem><para><literal>gencaches</literal> creates APT's package cache. This is done
implicitly by all commands needing this cache if it is missing or outdated.</para></listitem>
</varlistentry>

<varlistentry><term>showpkg <replaceable>pkg(s)</replaceable></term>
<varlistentry><term>showpkg <replaceable>&synopsis-pkg;</replaceable>…</term>
<listitem><para><literal>showpkg</literal> displays information about the packages listed on the
command line. Remaining arguments are package names. The available
versions and reverse dependencies of each package listed are listed, as
@@ -141,7 +139,7 @@ Reverse Provides:
</para></listitem>
</varlistentry>
<varlistentry><term>showsrc <replaceable>pkg(s)</replaceable></term>
<varlistentry><term>showsrc <replaceable>&synopsis-pkg;</replaceable>…</term>
<listitem><para><literal>showsrc</literal> displays all the source package records that match
the given package names. All versions are shown, as well as all
records that declare the name to be a Binary.</para></listitem>
@@ -162,13 +160,13 @@ Reverse Provides:
package cache.</para></listitem>
</varlistentry>

<varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
<varlistentry><term>show <replaceable>&synopsis-pkg;</replaceable>…</term>
<listitem><para><literal>show</literal> performs a function similar to
<command>dpkg --print-avail</command>; it displays the package records for the
named packages.</para></listitem>
</varlistentry>

<varlistentry><term>search <replaceable>regex [ regex ... ]</replaceable></term>
<varlistentry><term>search <replaceable>&synopsis-regex;</replaceable>…</term>
<listitem><para><literal>search</literal> performs a full text search on all available package
lists for the POSIX regex pattern given, see
<citerefentry><refentrytitle><command>regex</command></refentrytitle>
@@ -186,17 +184,17 @@ Reverse Provides:
are and'ed together.</para></listitem>
</varlistentry>

<varlistentry><term>depends <replaceable>pkg(s)</replaceable></term>
<varlistentry><term>depends <replaceable>&synopsis-pkg;</replaceable>…</term>
<listitem><para><literal>depends</literal> shows a listing of each dependency a package has
and all the possible other packages that can fulfill that dependency.</para></listitem>
</varlistentry>

<varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term>
<varlistentry><term>rdepends <replaceable>&synopsis-pkg;</replaceable>…</term>
<listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a
package has.</para></listitem>
</varlistentry>

<varlistentry><term>pkgnames <replaceable>[ prefix ]</replaceable></term>
<varlistentry><term>pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]</term>
<listitem><para>This command prints the name of each package APT knows. The optional
argument is a prefix match to filter the name list. The output is suitable
for use in a shell tab complete function and the output is generated
@@ -207,7 +205,7 @@ Reverse Provides:
</para></listitem>
</varlistentry>
<varlistentry><term>dotty <replaceable>pkg(s)</replaceable></term>
<varlistentry><term>dotty <replaceable>&synopsis-pkg;</replaceable>…</term>
<listitem><para><literal>dotty</literal> takes a list of packages on the command line and
generates output suitable for use by dotty from the
<ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
@@ -225,19 +223,19 @@ Reverse Provides:
<para>Caution, dotty cannot graph larger sets of packages.</para></listitem>
</varlistentry>
<varlistentry><term>xvcg <replaceable>pkg(s)</replaceable></term>
<varlistentry><term>xvcg <replaceable>&synopsis-pkg;</replaceable></term>
<listitem><para>The same as <literal>dotty</literal>, only for xvcg from the
<ulink url="http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html">VCG tool</ulink>.
</para></listitem></varlistentry>

<varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term>
<varlistentry><term>policy [ <replaceable>&synopsis-pkg;</replaceable>… ]</term>
<listitem><para><literal>policy</literal> is meant to help debug issues relating to the
preferences file. With no arguments it will print out the
priorities of each source. Otherwise it prints out detailed information
about the priority selection of the named package.</para></listitem>
</varlistentry>

<varlistentry><term>madison <replaceable>[ pkg(s) ]</replaceable></term>
<varlistentry><term>madison <replaceable>&synopsis-pkg;</replaceable>…</term>
<listitem><para><literal>apt-cache</literal>'s <literal>madison</literal> command attempts to mimic
the output format and a subset of the functionality of the Debian
archive management tool, <literal>madison</literal>. It displays


+ 4
- 3
doc/apt-config.8.xml View File

@@ -93,9 +93,10 @@ eval $RES

<varlistentry>
<term><option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n</replaceable>'</option></term>
<listitem><para>Defines the output of each config option. &percnt;t will be replaced with the tagname,
&percnt;f with the complete tagname and &percnt;v with the value of the option.
Use uppercase letters and the respective values will be quoted. Additionally
<listitem><para>Defines the output of each config option. &percnt;t will be replaced with the name of the option,
&percnt;f with the complete optionname and &percnt;v with the value of the option.
Use uppercase letters and special characters in the value will be encoded to ensure that
it can e.g. be savely used in a quoted-string as defined by RFC822. Additionally
&percnt;n will be replaced by a newline, &percnt;N by a tab. A &percnt; can be
printed by using &percnt;&percnt;.</para></listitem>
</varlistentry>


+ 4
- 3
doc/apt-get.8.xml View File

@@ -397,9 +397,10 @@
</varlistentry>

<varlistentry><term><option>--only-upgrade</option></term>
<listitem><para>Do not install new packages; When used in conjunction with <literal>install</literal>,
<literal>only-upgrade</literal> will prevent packages on the command line
from being upgraded if they are not already installed.
<listitem><para>Do not install new packages; When used in conjunction
with <literal>install</literal>, <literal>only-upgrade</literal> will
install upgrades for already installed packages only and ignore requests
to install new packages.
Configuration Item: <literal>APT::Get::Only-Upgrade</literal>.</para></listitem>
</varlistentry>



+ 4
- 4
doc/apt-key.8.xml View File

@@ -40,10 +40,10 @@
<varlistentry><term>add &synopsis-param-filename;</term>
<listitem>
<para>
Add a new key to the list of trusted keys. The key is read
from &synopsis-param-filename;, or standard input if
&synopsis-param-filename; is <literal>-</literal>.
Add a new key to the list of trusted keys.
The key is read from the filename given with the parameter
&synopsis-param-filename; or if the filename is <literal>-</literal>
from standard input.
</para>

</listitem>


+ 2
- 2
doc/apt-verbatim.ent View File

@@ -249,10 +249,10 @@
<arg choice='plain'>show &synopsis-arg-pkgver;</arg>
<arg choice='plain'>depends &synopsis-arg-pkgver;</arg>
<arg choice='plain'>rdepends &synopsis-arg-pkgver;</arg>
<arg choice='plain'>pkgnames <arg choice='plain'><replaceable>&synopsis-prefix;</replaceable></arg></arg>
<arg choice='plain'>pkgnames <arg><replaceable>&synopsis-prefix;</replaceable></arg></arg>
<arg choice='plain'>dotty &synopsis-arg-pkgver;</arg>
<arg choice='plain'>xvcg &synopsis-arg-pkgver;</arg>
<arg choice='plain'>policy &synopsis-arg-pkg;</arg>
<arg choice='plain'>policy <arg rep='repeat'><replaceable>&synopsis-pkg;</replaceable></arg></arg>
<arg choice='plain'>madison &synopsis-arg-pkg;</arg>
&synopsis-help;
</group>


+ 24
- 14
doc/apt.conf.5.xml View File

@@ -127,14 +127,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<para>All of the APT tools take a -o option which allows an arbitrary configuration
directive to be specified on the command line. The syntax is a full option
name (<literal>APT::Get::Assume-Yes</literal> for instance) followed by an equals
sign then the new value of the option. Lists can be appended too by adding
a trailing :: to the list name. (As you might suspect: The scope syntax can't be used
on the command line.)</para>
sign then the new value of the option. To append a new element to a list, add a
trailing :: to the name of the list. (As you might suspect: The scope syntax can't
be used on the command line.)</para>

<para>Note that you can use :: only for appending one item per line to a list and
that you should not use it in combination with the scope syntax.
(The scope syntax implicit insert ::) Using both syntaxes together will trigger a bug
which some users unfortunately relay on: An option with the unusual name "<literal>::</literal>"
which some users unfortunately depend on: An option with the unusual name "<literal>::</literal>"
which acts like every other option with a name. These introduces many problems
including that a user who writes multiple lines in this <emphasis>wrong</emphasis> syntax in
the hope to append to a list will gain the opposite as only the last assignment for this option
@@ -155,8 +155,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
</varlistentry>

<varlistentry><term>Architectures</term>
<listitem><para>All Architectures the system supports. Processors implementing the <literal>amd64</literal>
are e.g. also able to execute binaries compiled for <literal>i386</literal>; This list is use when fetching files and
<listitem><para>All Architectures the system supports. Processors implementing the
<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction set are
e.g. also able to execute binaries compiled for the <literal>i386</literal>
(<literal>x86</literal>) instruction set; This list is use when fetching files and
parsing package lists. The internal default is always the native architecture (<literal>APT::Architecture</literal>)
and all foreign architectures it can retrieve by calling <command>dpkg --print-foreign-architectures</command>.
</para></listitem>
@@ -216,10 +218,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<listitem><para>APT uses since version 0.7.26 a resizable memory mapped cache file to store the 'available'
information. <literal>Cache-Start</literal> acts as a hint to which size the Cache will grow
and is therefore the amount of memory APT will request at startup. The default value is
20971520 bytes (~20 MB). Note that these amount of space need to be available for APT
otherwise it will likely fail ungracefully, so for memory restricted devices these value should
be lowered while on systems with a lot of configured sources this might be increased.
<literal>Cache-Grow</literal> defines in byte with the default of 1048576 (~1 MB) how much
20971520 bytes (~20 MB). Note that this amount of space needs to be available for APT
otherwise it will likely fail ungracefully, so for memory restricted devices this value should
be lowered while on systems with a lot of configured sources it should be increased.
<literal>Cache-Grow</literal> defines in bytes with the default of 1048576 (~1 MB) how much
the Cache size will be increased in the event the space defined by <literal>Cache-Start</literal>
is not enough. These value will be applied again and again until either the cache is big
enough to store all information or the size of the cache reaches the <literal>Cache-Limit</literal>.
@@ -270,7 +272,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
it was created (indicated by the <literal>Date</literal> header).
If the Release file itself includes a <literal>Valid-Until</literal> header
the earlier date of the two is used as the expiration date.
The default value is <literal>0</literal> which stands for "for ever".
The default value is <literal>0</literal> which stands for "for ever valid".
Archive specific settings can be made by appending the label of the archive
to the option name.
</para></listitem>
@@ -293,7 +295,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
by default.</para>
<para>Two sub-options to limit the use of PDiffs are also available:
With <literal>FileLimit</literal> can be specified how many PDiff files
are downloaded at most to patch a file. <literal>SizeLimit</literal>
are downloaded at most to update a file. <literal>SizeLimit</literal>
on the other hand is the maximum percentage of the size of all patches
compared to the size of the targeted file. If one of these limits is
exceeded the complete file is downloaded instead of the patches.
@@ -347,6 +349,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
is now 0 (= disabled) to avoid problems with the ever-growing amount of webservers
and proxies which choose to not conform to the HTTP/1.1 specification.</para>

<para><literal>Acquire::http::AllowRedirect</literal> controls if APT will follow
redirects, which is enabled by default.</para>

<para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal>
which accepts integer values in kilobyte. The default value is 0 which deactivates
the limit and tries uses as much as possible of the bandwidth (Note that this option implicit
@@ -493,7 +498,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
actually use them if the environment doesn't specify this languages. So the following example configuration will
result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded,
but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en".
<programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para></listitem>
<programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para>
<para>Note: To prevent problems resulting from APT being executed in different environments
(e.g. by different users or by other programs) all Translation files which are found in
<filename>/var/lib/apt/lists/</filename> will be added to the end of the list
(after an implicit "<literal>none</literal>").</para>
</listitem>
</varlistentry>

</variablelist>
@@ -505,7 +515,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<para>The <literal>Dir::State</literal> section has directories that pertain to local
state information. <literal>lists</literal> is the directory to place downloaded
package lists in and <literal>status</literal> is the name of the dpkg status file.
<literal>preferences</literal> is the name of the APT preferences file.
<literal>preferences</literal> is the name of the APT <filename>preferences</filename> file.
<literal>Dir::State</literal> contains the default directory to prefix on all sub
items if they do not start with <filename>/</filename> or <filename>./</filename>.</para>



+ 10
- 4
doc/apt.ent View File

@@ -119,7 +119,7 @@

<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
<listitem><para>Storage area for package files in transit.
Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>
Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>
</varlistentry>
">

@@ -160,7 +160,7 @@

<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
<listitem><para>Storage area for state information in transit.
Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>
</varlistentry>
">

@@ -242,11 +242,17 @@
<!-- TRANSLATOR: used as in apt-extracttemplates filename -->
<!ENTITY synopsis-filename "filename">

<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive packages path override pathprefix -->
<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive packages path override-file pathprefix -->
<!ENTITY synopsis-path "path">

<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive packages path override-file pathprefix -->
<!ENTITY synopsis-override "override-file">

<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive packages path override-file pathprefix -->
<!ENTITY synopsis-pathprefix "pathprefix">

<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive generate section -->
<!ENTITY synopsis-section "section">
<!ENTITY synopsis-override "override">

<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export 473041FA -->
<!ENTITY synopsis-keyid "keyid">


+ 422
- 378
doc/po/apt-doc.pot
File diff suppressed because it is too large
View File


+ 611
- 425
doc/po/de.po
File diff suppressed because it is too large
View File


+ 546
- 400
doc/po/es.po
File diff suppressed because it is too large
View File


+ 547
- 401
doc/po/fr.po
File diff suppressed because it is too large
View File


+ 425
- 385
doc/po/it.po
File diff suppressed because it is too large
View File


+ 523
- 401
doc/po/ja.po
File diff suppressed because it is too large
View File


+ 473
- 392
doc/po/pl.po
File diff suppressed because it is too large
View File


+ 547
- 399
doc/po/pt.po
File diff suppressed because it is too large
View File


+ 452
- 391
doc/po/pt_BR.po
File diff suppressed because it is too large
View File


Loading…
Cancel
Save