diff options
Diffstat (limited to 'doc/po')
| -rw-r--r-- | doc/po/apt-doc.pot | 162 | ||||
| -rw-r--r-- | doc/po/de.po | 552 | ||||
| -rw-r--r-- | doc/po/es.po | 178 | ||||
| -rw-r--r-- | doc/po/fr.po | 209 | ||||
| -rw-r--r-- | doc/po/it.po | 166 | ||||
| -rw-r--r-- | doc/po/ja.po | 171 | ||||
| -rw-r--r-- | doc/po/pl.po | 194 | ||||
| -rw-r--r-- | doc/po/pt.po | 178 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 166 |
9 files changed, 1693 insertions, 283 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index e58059267..586e0378c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -967,7 +971,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +>>>>>>> MERGE-SOURCE msgid "<option>-s</option>" msgstr "" @@ -987,12 +995,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "" @@ -1067,7 +1083,7 @@ msgstr "" #: apt-cache.8.xml:317 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: " "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> " "e.g. <literal>APT::Cache::ShowRecommends</literal>." @@ -1091,7 +1107,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "" @@ -1187,7 +1207,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> +<<<<<<< TREE #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +======= +#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +>>>>>>> MERGE-SOURCE msgid "&apt-commonoptions;" msgstr "" @@ -1202,7 +1226,11 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 +======= +#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 +>>>>>>> MERGE-SOURCE msgid "See Also" msgstr "" @@ -1212,7 +1240,11 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +======= +#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +>>>>>>> MERGE-SOURCE msgid "Diagnostics" msgstr "" @@ -1316,7 +1348,11 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "" @@ -1519,7 +1555,11 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73 +>>>>>>> MERGE-SOURCE msgid "&apt-conf;" msgstr "" @@ -2443,26 +2483,47 @@ msgid "" "Configuration Items: " "<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and " "<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> " +<<<<<<< TREE "where <literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, " "<literal>SHA1</literal> or <literal>SHA256</literal>." +======= +"where <literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or " +"<literal>Release</literal> and " +"<literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or " +"<literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -2471,12 +2532,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2485,12 +2554,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -2500,12 +2577,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@ -2513,24 +2598,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2539,12 +2640,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2558,12 +2667,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2573,12 +2690,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 +>>>>>>> MERGE-SOURCE msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2587,14 +2712,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -2922,7 +3055,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4199,10 +4332,10 @@ msgstr "" #: apt.conf.5.xml:52 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the " +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" @@ -4910,7 +5043,7 @@ msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " "checked: If this setting exists the method will only be used if this file " -"exists, e.g. for the bzip2 method (the inbuilt) setting is <placeholder " +"exists, e.g. for the bzip2 method (the inbuilt) setting is: <placeholder " "type=\"literallayout\" id=\"0\"/> Note also that list entries specified on " "the command line will be added at the end of the list specified in the " "configuration files, but before the default entries. To prefer a type in " @@ -4923,7 +5056,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -5865,8 +5998,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or " -"\"<literal>pref</literal>\" as filename extension and which only contain " +"following naming convention: The files have either no or " +"\"<literal>pref</literal>\" as filename extension and only contain " "alphanumeric, hyphen (-), underscore (_) and period (.) characters. " "Otherwise APT will print a notice that it has ignored a file if the file " "doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> " @@ -6198,8 +6331,13 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a " +<<<<<<< TREE "glob()-like expression or contains the word kde (as a POSIX extended regular " "expression surrounded by slashes)." +======= +"glob()-like expression) or contains the word kde (as a POSIX extended " +"regular expression surrounded by slashes)." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> @@ -6215,7 +6353,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index a36144bb9..b10c657d4 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,14 +1,19 @@ # Translation of apt-doc to German # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # This file is distributed under the same license as the apt-doc package. -# Chris Leick <c.leick@vollbio.de>, 2009, 2010. +# Chris Leick <c.leick@vollbio.de>, 2009-2011. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.7.25.3\n" +"Project-Id-Version: apt-doc 0.8.14-1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" "PO-Revision-Date: 2010-09-16 19:04+0100\n" +======= +"POT-Creation-Date: 2011-06-28 13:40+0300\n" +"PO-Revision-Date: 2011-05-31 21:00+0100\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -656,16 +661,12 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " -#| "<date>14 February 2004</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 " "February 2011</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " -"<date>14. Februar 2004</date>" +"<date>04. Februar 2011</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-cache.8.xml:25 apt-cache.8.xml:32 @@ -690,33 +691,10 @@ msgstr "APT" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-cache.8.xml:33 msgid "query the APT cache" -msgstr "" +msgstr "den APT-Zwischenspeicher abfragen" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-cache.8.xml:39 -#, fuzzy -#| msgid "" -#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " -#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " -#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " -#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat" -#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> " -#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat" -#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</" -#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain" -#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=" -#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " -#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat" -#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice=" -#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg " -#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></" -#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat" -#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice=" -#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </" -#| "group>" msgid "" "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-" "o=<replaceable>config string</replaceable></option></arg> <arg><option>-" @@ -741,16 +719,15 @@ msgstr "" "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-" "o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> " "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group " -"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat" -"\"><replaceable>Datei</replaceable></arg></arg> <arg>gencaches</arg> " -"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat" -"\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</" -"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain" -"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain" -"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends " -"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></" -"arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" +"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=" +"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " +"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> " +"<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</" +"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " +"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain" "\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice=" "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " @@ -1310,7 +1287,11 @@ msgstr "" "pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1338,12 +1319,20 @@ msgstr "" "srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1422,12 +1411,18 @@ msgstr "<option>--no-replaces</option>" msgid "<option>--no-enhances</option>" msgstr "<option>--no-enhances</option>" -# FIXME s/twicked/tricked/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:317 +#, fuzzy +#| msgid "" +#| "Per default the <literal>depends</literal> and <literal>rdepends</" +#| "literal> print all dependencies. This can be twicked with these flags " +#| "which will omit the specified dependency type. Configuration Item: " +#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" +#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1458,7 +1453,11 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1575,7 +1574,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1593,7 +1596,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1607,7 +1614,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnose" @@ -1742,7 +1753,11 @@ msgid "Options" msgstr "Optionen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1912,7 +1927,7 @@ msgstr "" "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-" "o=<replaceable>Konfigurationszeichenkette</replaceable></option></" "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group " -"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" +"choice=\"req\"> <arg>shell</arg> <arg>Abbild</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:51 @@ -1996,7 +2011,11 @@ msgid "Just show the contents of the configuration space." msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2309,6 +2328,18 @@ msgid "" "literal>. It then writes to stdout a Release file containing a MD5, SHA1 " "and SHA256 digest for each file." msgstr "" +"Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem " +"Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene " +"Verzeichnis nach nicht komprimierten <filename>Packages</filename>- und " +"<filename>Sources</filename>-Dateien und denen, die mit <command>gzip</" +"command>, <command>bzip2</command> oder <command>lzma</command> komprimiert " +"wurden, ebenso wie <filename>Release</filename>- und <filename>md5sum.txt</" +"filename>-Dateien (<literal>APT::FTPArchive::Release::Default-Patterns</" +"literal>). Zusätzliche Muster für Dateinamen können hinzugefügt werden, " +"indem sie in <literal>APT::FTPArchive::Release::Patterns</literal> " +"aufgeführt werden. Dann schreibt er eine Release-Datei auf die " +"Standardausgabe, die für jede Datei eine MD5-, SHA1- und SHA256-Prüfsumme " +"enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:125 @@ -3147,6 +3178,10 @@ msgstr "" msgid "" "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" +<<<<<<< TREE +======= +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 @@ -3166,11 +3201,19 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE "<literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" "literal> or <literal>SHA256</literal>." -msgstr "" +======= +"<literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" +"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE +msgstr "" +<<<<<<< TREE "Werte für zusätzliche Metadatenfelder in der Release-Datei werden den " "entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> " "entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die " @@ -3179,14 +3222,34 @@ msgstr "" "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-Until</" "literal>, <literal>Architectures</literal>, <literal>Components</literal>, " "<literal>Description</literal>." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +======= +"erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig " +"aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach " +"Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: " +"<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> und " +"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::" +"<replaceable>Prüfsumme</replaceable></literal>, wobei <literal><replaceable>Index</replaceable></" +"literal> <literal>Packages</literal>, <literal>Sources</literal> oder " +"<literal>Release</literal> sein kann und <literal><replaceable>Prüfsumme</replaceable></literal> " +"<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</" +"literal> sein kann." +>>>>>>> MERGE-SOURCE + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3196,7 +3259,11 @@ msgstr "" "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3210,12 +3277,20 @@ msgstr "" "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3229,12 +3304,20 @@ msgstr "" "DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3250,12 +3333,20 @@ msgstr "" "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3266,12 +3357,20 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3280,12 +3379,20 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3299,12 +3406,20 @@ msgstr "" "Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3328,12 +3443,20 @@ msgstr "" "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3349,19 +3472,31 @@ msgstr "" "werden kann." #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3371,7 +3506,11 @@ msgstr "" ">" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3841,14 +3980,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:281 msgid "download" -msgstr "" +msgstr "download" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" +"<literal>download</literal> wird das angegebene Binärpaket in das aktuelle " +"Verzeichnis herunterladen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:288 @@ -3913,7 +4054,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:312 msgid "changelog" -msgstr "" +msgstr "changelog" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:313 @@ -3927,6 +4068,14 @@ msgid "" "installed. However, you can specify the same options as for the " "<option>install</option> command." msgstr "" +"<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und " +"zeigt es mit <command>sensible-pager</command> an. Der Servername und das " +"Basisverzeichnis sind in der Variable <literal>APT::Changelogs::Server</" +"literal> definiert (z.B. <ulink>http://packages.debian.org/changelogs</" +"ulink> für Debian oder <ulink>http://changelogs.ubuntu.com/changelogs</" +"ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die " +"installierte Version. Sie können jedoch die gleichen Optionen wie für den " +"Befehl <option>install</option> angeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:335 @@ -3944,23 +4093,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:340 -#, fuzzy -#| msgid "<option>--no-suggests</option>" msgid "<option>--install-suggests</option>" -msgstr "<option>--no-suggests</option>" +msgstr "<option>--install-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:341 -#, fuzzy -#| msgid "" -#| "Do not consider recommended packages as a dependency for installing. " -#| "Configuration Item: <literal>APT::Install-Recommends</literal>." msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" -"Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. " -"Konfigurationselement: <literal>APT::Install-Recommends</literal>." +"Empfohlene Pakete als Abhängigkeit für die Installation betrachten. " +"Konfigurationselement: <literal>APT::Install-Suggests</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:345 @@ -5290,14 +5433,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:147 -#, fuzzy -#| msgid "" -#| "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." msgid "" "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 " @@ -5310,8 +5445,9 @@ msgstr "" "(Sie sollten sicherstellen, dass Sie einen vertrauenswürdigen " "Kommunikationskanal benutzen, wenn Sie ihn herunterladen), ihn mit " "<command>apt-key</command> hinzufügen und dann <command>apt-get update</" -"command> ausführen, so dass APT die <filename>Release.gpg</filename>-Dateien " -"der von Ihnen konfigurierten Archive herunterladen und prüfen kann." +"command> ausführen, so dass APT die Dateien <filename>InRelease</filename> " +"oder <filename>Release.gpg</filename> der von Ihnen konfigurierten Archive " +"herunterladen und prüfen kann." #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml:156 @@ -5340,17 +5476,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 -#, fuzzy -#| msgid "" -#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -" -#| "abs -o Release.gpg Release</command>." msgid "" "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --" "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release." "gpg Release</command>." msgstr "" "<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie " -"<command>gpg -abs -o Release.gpg Release</command> ausführen." +"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -" +"abs -o Release.gpg Release</command> ausführen." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:172 @@ -5548,20 +5681,27 @@ msgstr "" #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " #| "order which have no or \"<literal>conf</literal>\" as filename extension " #| "and which only contain alphanumeric, hyphen (-), underscore (_) and " -#| "period (.) characters - otherwise they will be silently ignored." +#| "period (.) characters. Otherwise APT will print a notice that it has " +#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::" +#| "Ignore-Files-Silently</literal> configuration list - in this case it will " +#| "be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" -"literal> configuration list - in this case it will be silently ignored." +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the <literal>Dir::" +"Ignore-Files-Silently</literal> configuration list - in this case it will be " +"silently ignored." msgstr "" "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender " "alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als " -"Dateinamenserweiterung haben und die alphanumerische Zeichen, Bindestriche " -"(-), Unterstriche (_) und Punkte (.) enthalten – andernfalls werden sie " -"stillschweigend ignoriert." +"Dateinamenserweiterung haben und die nur alphanumerische Zeichen, " +"Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls " +"wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die " +"Datei nicht auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-" +"Files-Silently</literal> passt – in diesem Fall wird sie stillschweigend " +"ignoriert." #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:59 @@ -6601,16 +6741,16 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #| "also that list entries specified on the command line will be added at the " #| "end of the list specified in the configuration files, but before the " #| "default entries. To prefer a type in this case over the ones specified in " -#| "in the configuration files you can set the option direct - not in list " +#| "the configuration files you can set the option direct - not in list " #| "style. This will not override the defined list, it will only prefix the " #| "list with this type." msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " -"that list entries specified on the command line will be added at the end of " -"the list specified in the configuration files, but before the default " +"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " +"also that list entries specified on the command line will be added at the " +"end of the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6620,21 +6760,25 @@ msgstr "" "replaceable></literal> zur Laufzeit geprüft wird: Falls diese Einstellung " "existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. für " "die (integrierte) bzip2-Methode ist die Einstellung <placeholder type=" -"\"literallayout\" id=\"0\"/>. Beachten Sie, dass diese auf der Befehlszeile " +"\"literallayout\" id=\"0\"/>. Beachten Sie auch, dass auf der Befehlszeile " "eingegebenen Einträge an das Ende der Liste angehängt werden, die in den " "Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeinträgen. Um " -"einen Eintrag in diesem Fall vor einem, über die in der Konfigurationsdatei " -"angegebenen, zu bevorzugen, können Sie diese Option direkt setzen – nicht im " -"Listenstil. Dies wird die definierte Liste nicht überschreiben, es wird " -"diesen Typ nur vor die Liste setzen." +"einen Typ in diesem Fall gegenüber einem, der über die Konfigurationsdatei " +"angegebenen wurde, zu bevorzugen, können Sie diese Option direkt setzen – " +"nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es " +"wird diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" +"Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um " +"unkomprimierten Dateien einen Vorrang zu geben, beachten Sie jedoch, dass " +"die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass " +"dies meist nur für lokale Spiegel benutzt werden kann." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:454 @@ -7070,19 +7214,6 @@ msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:621 -#, fuzzy -#| msgid "" -#| "APT can call dpkg in a way so it can make aggressive use of triggers over " -#| "multiply calls of dpkg. Without further options dpkg will use triggers " -#| "only in between his own run. Activating these options can therefore " -#| "decrease the time needed to perform the install / upgrade. Note that it " -#| "is intended to activate these options per default in the future, but as " -#| "it changes the way APT calling dpkg drastically it needs a lot more " -#| "testing. <emphasis>These options are therefore currently experimental " -#| "and should not be used in productive environments.</emphasis> Also it " -#| "breaks the progress reporting so all frontends will currently stay around " -#| "half (or more) of the time in the 100% state while it actually configures " -#| "all packages." msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -7095,17 +7226,18 @@ msgid "" "all frontends will currently stay around half (or more) of the time in the " "100% state while it actually configures all packages." msgstr "" -"APT kann Dpkg auf eine Art aufrufen, auf die aggressiv Gebrauch von Triggern " -"über mehrere Dpkg-Aufrufe gemacht wird. Ohne weitere Optionen wird Dpkg " -"Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen zu " -"benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit verkürzen. " -"Beachten Sie, dass geplant ist, diese Optionen in Zukunft standardmäßig zu " -"aktivieren, aber da es die Art, wie APT Dpkg aufruft, drastisch ändert, " -"benötigt es noch viele weitere Tests. <emphasis>Diese Optionen sind daher " -"aktuell noch experimentell und sollten nicht in produktiven Umgebungen " -"benutzt werden.</emphasis> Außerdem unterbricht es die Fortschrittsanzeige, " -"so dass alle Oberflächen aktuell in der halben (oder mehr) Zeit auf dem " -"Status 100% stehen, während es aktuell alle Pakete konfiguriert." +"APT kann Dpkg auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern " +"über mehrere Dpkg-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird " +"Dpkg Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen " +"zu benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit " +"verkürzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft " +"standardmäßig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, " +"drastisch ändert, benötigt es noch viele weitere Tests. <emphasis>Diese " +"Optionen sind daher aktuell noch experimentell und sollten nicht in " +"produktiven Umgebungen benutzt werden.</emphasis> Außerdem unterbricht es " +"die Fortschrittsanzeige, so dass alle Oberflächen derzeit die halbe (oder " +"mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle Pakete " +"konfiguriert werden." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> #: apt.conf.5.xml:636 @@ -7931,23 +8063,28 @@ msgstr "" #| "directory are parsed in alphanumeric ascending order and need to obey the " #| "following naming convention: The files have no or \"<literal>pref</" #| "literal>\" as filename extension and which only contain alphanumeric, " -#| "hyphen (-), underscore (_) and period (.) characters - otherwise they " -#| "will be silently ignored." +#| "hyphen (-), underscore (_) and period (.) characters. Otherwise APT will " +#| "print a notice that it has ignored a file if the file doesn't match a " +#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> " +#| "configuration list - in this case it will be silently ignored." msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or \"<literal>pref</literal>" -"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"following naming convention: The files have either no or \"<literal>pref</" +"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" -"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in " -"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden " -"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als " -"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche " -"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden " +"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences." +"d</filename> in alphanumerisch aufsteigender Reihenfolge ausgewertet werden " +"und der folgenden Namenskonvention unterliegen: Die Dateien haben keine oder " +"<literal>»pref«</literal> als Dateierweiterung und sie enthalten nur " +"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte (.). " +"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert " +"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste " +"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird " "sie stillschweigend ignoriert." #. type: Content of: <refentry><refsect1><refsect2><title> @@ -8005,17 +8142,24 @@ msgstr "Priorität 1" #, fuzzy #| msgid "" #| "to the versions coming from archives which in their <filename>Release</" +<<<<<<< TREE #| "filename> files are marked as \"NotAutomatic: yes\" like the debian " #| "experimental archive." +======= +#| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +#| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +#| "<literal>experimental</literal> archive." +>>>>>>> MERGE-SOURCE msgid "" "to the versions coming from archives which in their <filename>Release</" "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " "<literal>experimental</literal> archive." msgstr "" -"zu den Versionen, die von Archiven kommen, deren <filename>Release</" -"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-" -"Experimental-Archiv." +"zu den Versionen, die von Archiven kommen, die in deren <filename>Release</" +"filename>-Dateien als »NotAutomatic: yes« markiert sind, aber " +"<emphasis>nicht</emphasis> als »ButAutomaticUpgrades: yes« wie das Archiv " +"<literal>experimental</literal> von Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:113 @@ -8024,20 +8168,31 @@ msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:114 +<<<<<<< TREE #, fuzzy #| msgid "" #| "to the versions coming from archives which in their <filename>Release</" #| "filename> files are marked as \"NotAutomatic: yes\" like the debian " #| "experimental archive." +======= +>>>>>>> MERGE-SOURCE msgid "" "to the version that is already installed (if any) and to the versions coming " "from archives which in their <filename>Release</filename> files are marked " "as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " "backports archive since <literal>squeeze-backports</literal>." msgstr "" +<<<<<<< TREE "zu den Versionen, die von Archiven kommen, deren <filename>Release</" "filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-" "Experimental-Archiv." +======= +"zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu " +"Versionen, die von Archiven kommen, die in deren <filename>Release</" +"filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« " +"markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-" +"backports</literal>." +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:121 @@ -8082,9 +8237,18 @@ msgstr "" #| msgid "" #| "If the target release has not been specified then APT simply assigns " #| "priority 100 to all installed package versions and priority 500 to all " +<<<<<<< TREE #| "uninstalled package versions, expect versions coming from archives which " +======= +#| "uninstalled package versions, except versions coming from archives which " +>>>>>>> MERGE-SOURCE #| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " +<<<<<<< TREE #| "yes\" - these versions get the priority 1." +======= +#| "yes\" - these versions get the priority 1 or priority 100 if it is " +#| "additionally marked as \"ButAutomaticUpgrades: yes\"." +>>>>>>> MERGE-SOURCE msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8096,8 +8260,10 @@ msgstr "" "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen " "installierten Paketversionen eine Priorität von 100 und allen nicht " "installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen " -"aus Archiven kommen, in deren Release-Dateien »NotAutomatic: yes« markiert " -"ist – diese Versionen erhalten die Prirität 1." +"aus Archiven kommen, die in deren <filename>Release<filename>-Dateien " +"»NotAutomatic: yes« markiert sind – diese Versionen erhalten die Priorität 1 " +"oder die Priorität 100, falls sie zusätzlich als »ButAutomaticUpgrades: yes« " +"markiert sind." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:139 @@ -8399,7 +8565,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:262 msgid "Regular expressions and glob() syntax" +<<<<<<< TREE msgstr "" +======= +msgstr "Reguläre Ausdrücke und glob()-Syntax" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:264 @@ -8407,61 +8577,114 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE "()-like expression or contains the word kde (as a POSIX extended regular " +======= +"()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" +<<<<<<< TREE +======= +"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären " +"Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist " +"beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei " +"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder " +"das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der " +"von Schrägstrichen umschlossen wird)." +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><programlisting> #: apt_preferences.5.xml:273 +<<<<<<< TREE #, fuzzy, no-wrap #| msgid "" #| "Package: *\n" #| "Pin: release a=unstable\n" #| "Pin-Priority: 50\n" +======= +#, no-wrap +>>>>>>> MERGE-SOURCE msgid "" "Package: gnome* /kde/\n" "Pin: release n=experimental\n" "Pin-Priority: 500\n" msgstr "" +<<<<<<< TREE "Package: *\n" "Pin: release a=unstable\n" "Pin-Priority: 50\n" +======= +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" +<<<<<<< TREE +======= +"Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, " +"wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen " +"Paketen von einem Release seit Karmic die Priorität 900 zu." +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><programlisting> #: apt_preferences.5.xml:285 +<<<<<<< TREE #, fuzzy, no-wrap #| msgid "" #| "Package: *\n" #| "Pin: release a=unstable\n" #| "Pin-Priority: 50\n" +======= +#, no-wrap +>>>>>>> MERGE-SOURCE msgid "" "Package: *\n" "Pin: release n=karmic*\n" "Pin-Priority: 990\n" msgstr "" "Package: *\n" +<<<<<<< TREE "Pin: release a=unstable\n" "Pin-Priority: 50\n" +======= +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><literal> #: apt_preferences.5.xml:290 +<<<<<<< TREE #, fuzzy #| msgid "Packages" +======= +>>>>>>> MERGE-SOURCE msgid "Package" +<<<<<<< TREE msgstr "Packages" +======= +msgstr "Package" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><literal> #: apt_preferences.5.xml:296 msgid "*" +<<<<<<< TREE msgstr "" +======= +msgstr "*" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:306 @@ -9287,14 +9510,6 @@ msgstr "sources.list.d" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:54 -#, fuzzy -#| msgid "" -#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way " -#| "to add sources.list entries in separate files. The format is the same as " -#| "for the regular <filename>sources.list</filename> file. File names need " -#| "to end with <filename>.list</filename> and may only contain letters (a-z " -#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) " -#| "characters. Otherwise they will be silently ignored." msgid "" "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " "add sources.list entries in separate files. The format is the same as for " @@ -9310,8 +9525,10 @@ msgstr "" "Das Format ist das gleiche wie für die normale <filename>sources.list</" "filename>-Datei. Dateinamen müssen mit <filename>.list</filename> enden und " "können nur Buchstaben (a-z und A-Z), Ziffern (0-9), Unterstriche (_), " -"Bindestriche (-) und Punkte (.) enthalten. Ansonsten werden sie " -"stillschweigend ignoriert." +"Bindestriche (-) und Punkte (.) enthalten. Andernfalls wird APT einen " +"Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die Datei nicht " +"auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-Files-" +"Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:65 @@ -9320,17 +9537,6 @@ msgstr "Die Typen deb und deb-src" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:66 -#, fuzzy -#| msgid "" -#| "The <literal>deb</literal> type describes a typical two-level Debian " -#| "archive, <filename>distribution/component</filename>. Typically, " -#| "<literal>distribution</literal> is generally one of <literal>stable</" -#| "literal> <literal>unstable</literal> or <literal>testing</literal> while " -#| "component is one of <literal>main</literal> <literal>contrib</literal> " -#| "<literal>non-free</literal> or <literal>non-us</literal>. The " -#| "<literal>deb-src</literal> type describes a debian distribution's source " -#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-" -#| "src</literal> line is required to fetch source indexes." msgid "" "The <literal>deb</literal> type describes a typical two-level Debian " "archive, <filename>distribution/component</filename>. Typically, " @@ -9345,14 +9551,14 @@ msgid "" msgstr "" "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-" "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</" -"literal> ist typischerweise entweder <literal>stable</literal>, " -"<literal>unstable</literal> oder <literal>testing</literal>, während " -"Komponente entweder <literal>main</literal>, <literal>contrib</literal>, " -"<literal>non-free</literal> oder <literal>non-us</literal> ist. Der " -"<literal>deb-src</literal>-Typ beschreibt einen Quellcode einer Debian-" -"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine " -"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes " -"herunterzuladen." +"literal> ist typischerweise ein Archivname wie <literal>stable</literal> " +"oder <literal>testing</literal> oder ein Kodename wie <literal>&stable-" +"codename;</literal> oder <literal>&testing-codename;</literal> während " +"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder " +"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ " +"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie " +"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird " +"benötigt, um Quellindizes herunterzuladen." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 @@ -9705,22 +9911,12 @@ msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml:230 -#, fuzzy, no-wrap -#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +#, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" -msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:223 -#, fuzzy -#| msgid "" -#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-" -#| "US directory, and uses only files found under <filename>unstable/binary-" -#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</" -#| "filename> on m68k, and so forth for other supported architectures. [Note " -#| "this example only illustrates how to use the substitution variable; non-" -#| "us is no longer structured like this] <placeholder type=\"literallayout\" " -#| "id=\"0\"/>" msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -9730,14 +9926,14 @@ msgid "" "archives are not structured like this] <placeholder type=\"literallayout\" " "id=\"0\"/>" msgstr "" -"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-" +"Benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-" "Verzeichnis zuzugreifen und benutzt nur Dateien, die unter " "<filename>unstable/binary-i386</filename> auf i386-Maschinen, " -"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere " -"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses " -"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. " -"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout" -"\" id=\"0\"/>" +"<filename>unstable/binary-amd64</filename> auf amd64 und so weiter für " +"andere unterstützte Architekturen, gefunden werden. [Beachten Sie, dass " +"dieses Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt " +"wird. Offizielle Debian-Archive sind nicht so strukturiert.] <placeholder " +"type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:235 diff --git a/doc/po/es.po b/doc/po/es.po index 2e0bda88b..74a0807c3 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -36,7 +36,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2010-08-25 03:25+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -1354,7 +1358,11 @@ msgstr "" "configuración: <literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1380,12 +1388,20 @@ msgstr "" "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1466,9 +1482,16 @@ msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:317 +#, fuzzy +#| msgid "" +#| "Per default the <literal>depends</literal> and <literal>rdepends</" +#| "literal> print all dependencies. This can be twicked with these flags " +#| "which will omit the specified dependency type. Configuration Item: " +#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" +#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1500,7 +1523,11 @@ msgstr "" "Opción de configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1617,7 +1644,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1635,7 +1666,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1649,7 +1684,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnósticos" @@ -1784,7 +1823,11 @@ msgid "Options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2041,7 +2084,11 @@ msgid "Just show the contents of the configuration space." msgstr "Sólo muestra el contenido del espacio de configuración." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3214,11 +3261,19 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE "<literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" "literal> or <literal>SHA256</literal>." -msgstr "" +======= +"<literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" +"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE +msgstr "" +<<<<<<< TREE "Los valores para los campos de metadatos adicionales en el fichero «Release» " "se toman de las variables correspondientes en <literal>APT::FTPArchive::" "Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</" @@ -3227,14 +3282,24 @@ msgstr "" "literal>, <literal>Codename</literal>, <literal>Date</literal>, " "<literal>Valid-Until</literal>, <literal>Architectures</literal>, " "<literal>Components</literal> y <literal>Description</literal>." +======= +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3243,7 +3308,11 @@ msgstr "" "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3257,12 +3326,20 @@ msgstr "" "configuración. Opción de configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3275,12 +3352,20 @@ msgstr "" "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3297,12 +3382,20 @@ msgstr "" "Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3313,12 +3406,20 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3327,12 +3428,20 @@ msgstr "" "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3346,12 +3455,20 @@ msgstr "" "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3375,12 +3492,20 @@ msgstr "" "comprobaciones adicionales son innecesarias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3396,19 +3521,31 @@ msgstr "" "con la orden «generate»." #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3417,7 +3554,11 @@ msgstr "" "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3890,7 +4031,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -5582,11 +5723,12 @@ msgstr "" #| "period (.) characters - otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" -"literal> configuration list - in this case it will be silently ignored." +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the <literal>Dir::" +"Ignore-Files-Silently</literal> configuration list - in this case it will be " +"silently ignored." msgstr "" "Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden " "alfanumérico ascendente que no tienen extensión o la extensión " @@ -6615,9 +6757,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " -"that list entries specified on the command line will be added at the end of " -"the list specified in the configuration files, but before the default " +"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " +"also that list entries specified on the command line will be added at the " +"end of the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6639,7 +6781,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -7932,8 +8074,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or \"<literal>pref</literal>" -"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"following naming convention: The files have either no or \"<literal>pref</" +"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -8401,7 +8543,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE "()-like expression or contains the word kde (as a POSIX extended regular " +======= +"()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -8425,7 +8571,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 0c6a75aae..3b0f486b1 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2011-02-17 07:50+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1277,7 +1281,11 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1304,12 +1312,20 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1391,9 +1407,16 @@ msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:317 +#, fuzzy +#| msgid "" +#| "Per default the <literal>depends</literal> and <literal>rdepends</" +#| "literal> print all dependencies. This can be twicked with these flags " +#| "which will omit the specified dependency type. Configuration Item: " +#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" +#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1425,7 +1448,11 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1545,7 +1572,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1563,7 +1594,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1577,7 +1612,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostics" @@ -1712,7 +1751,11 @@ msgid "Options" msgstr "Options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1969,7 +2012,11 @@ msgid "Just show the contents of the configuration space." msgstr "Affiche seulement le contenu de l'espace de configuration." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3142,11 +3189,19 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE "<literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" "literal> or <literal>SHA256</literal>." -msgstr "" +======= +"<literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" +"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE +msgstr "" +<<<<<<< TREE "La valeur des autres champs de métadonnées du fichier Release sont tirées de " "la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, " "p. ex. <literal>APT::FTPArchive::Release::Origin</literal>. Les champs " @@ -3155,14 +3210,24 @@ msgstr "" "literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, " "<literal>Architectures</literal>, <literal>Components</literal>, " "<literal>Description</literal>." +======= +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3172,7 +3237,11 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3187,12 +3256,20 @@ msgstr "" "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3206,12 +3283,20 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3227,12 +3312,20 @@ msgstr "" "de configuration : <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3243,12 +3336,20 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3257,12 +3358,20 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3276,12 +3385,20 @@ msgstr "" "<literal>APT::FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3304,12 +3421,20 @@ msgstr "" "survenir et l'ensemble de ces contrôles devient inutile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3325,19 +3450,31 @@ msgstr "" "generate." #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3346,7 +3483,11 @@ msgstr "" "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3822,7 +3963,7 @@ msgstr "download" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" "<literal>download</literal> télécharge le fichier binaire indiqué dans le " "répertoire courant." @@ -5497,13 +5638,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:52 +#, fuzzy +#| msgid "" +#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +#| "order which have no or \"<literal>conf</literal>\" as filename extension " +#| "and which only contain alphanumeric, hyphen (-), underscore (_) and " +#| "period (.) characters. Otherwise APT will print a notice that it has " +#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::" +#| "Ignore-Files-Silently</literal> configuration list - in this case it will " +#| "be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" -"literal> configuration list - in this case it will be silently ignored." +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the <literal>Dir::" +"Ignore-Files-Silently</literal> configuration list - in this case it will be " +"silently ignored." msgstr "" "tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre " "alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>" @@ -6539,13 +6690,25 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:442 +#, fuzzy +#| msgid "" +#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" +#| "replaceable></literal> will be checked: If this setting exists the method " +#| "will only be used if this file exists, e.g. for the bzip2 method (the " +#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note " +#| "also that list entries specified on the command line will be added at the " +#| "end of the list specified in the configuration files, but before the " +#| "default entries. To prefer a type in this case over the ones specified in " +#| "the configuration files you can set the option direct - not in list " +#| "style. This will not override the defined list, it will only prefix the " +#| "list with this type." msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " -"that list entries specified on the command line will be added at the end of " -"the list specified in the configuration files, but before the default " +"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " +"also that list entries specified on the command line will be added at the " +"end of the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6567,7 +6730,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" "Le type spécial <literal>uncompressed</literal> peut servir à donner la " @@ -7855,11 +8018,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:70 +#, fuzzy +#| msgid "" +#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> " +#| "directory are parsed in alphanumeric ascending order and need to obey the " +#| "following naming convention: The files have no or \"<literal>pref</" +#| "literal>\" as filename extension and which only contain alphanumeric, " +#| "hyphen (-), underscore (_) and period (.) characters. Otherwise APT will " +#| "print a notice that it has ignored a file if the file doesn't match a " +#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> " +#| "configuration list - in this case it will be silently ignored." msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or \"<literal>pref</literal>" -"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"following naming convention: The files have either no or \"<literal>pref</" +"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -8325,7 +8498,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE "()-like expression or contains the word kde (as a POSIX extended regular " +======= +"()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -8349,7 +8526,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/it.po b/doc/po/it.po index 3056b4c05..1b92632a7 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -934,7 +938,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -955,12 +963,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "" @@ -1035,7 +1051,7 @@ msgstr "" #: apt-cache.8.xml:317 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1059,7 +1075,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "" @@ -1155,7 +1175,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" @@ -1173,7 +1197,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1187,7 +1215,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1292,7 +1324,11 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "" @@ -1496,7 +1532,11 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@ -2419,26 +2459,45 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE "<literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" "literal> or <literal>SHA256</literal>." +======= +"<literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" +"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -2447,12 +2506,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2461,12 +2528,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -2476,12 +2551,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2489,24 +2572,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2515,12 +2614,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2534,12 +2641,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2549,26 +2664,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -2897,7 +3028,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4174,11 +4305,12 @@ msgstr "" #: apt.conf.5.xml:52 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" -"literal> configuration list - in this case it will be silently ignored." +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the <literal>Dir::" +"Ignore-Files-Silently</literal> configuration list - in this case it will be " +"silently ignored." msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> @@ -4876,9 +5008,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " -"that list entries specified on the command line will be added at the end of " -"the list specified in the configuration files, but before the default " +"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " +"also that list entries specified on the command line will be added at the " +"end of the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -4889,7 +5021,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -5830,8 +5962,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or \"<literal>pref</literal>" -"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"following naming convention: The files have either no or \"<literal>pref</" +"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -6159,7 +6291,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE "()-like expression or contains the word kde (as a POSIX extended regular " +======= +"()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -6176,7 +6312,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 53cdb6555..0446b0827 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2010-09-07 07:38+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -1357,7 +1361,11 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1384,12 +1392,20 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1475,7 +1491,7 @@ msgstr "<option>--no-enhances</option>" #, fuzzy msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1505,7 +1521,11 @@ msgstr "" "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1627,7 +1647,11 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1647,7 +1671,11 @@ msgstr "&file-sourceslist; &file-statelists;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1663,7 +1691,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "診断メッセージ" @@ -1805,7 +1837,11 @@ msgid "Options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2075,7 +2111,11 @@ msgstr "設定箇所の内容を表示するだけです。" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3308,11 +3348,19 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE "<literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" "literal> or <literal>SHA256</literal>." -msgstr "" +======= +"<literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" +"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE +msgstr "" +<<<<<<< TREE "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::" "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::" "Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</" @@ -3320,15 +3368,25 @@ msgstr "" "<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</" "literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, " "<literal>Components</literal>, <literal>Description</literal> です。" +======= +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3338,7 +3396,11 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3351,13 +3413,21 @@ msgstr "" "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3370,13 +3440,21 @@ msgstr "" "<literal>APT::FTPArchive::DeLinkAct</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3391,13 +3469,21 @@ msgstr "" "<literal>APT::FTPArchive::Contents</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3407,13 +3493,21 @@ msgstr "" "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3422,13 +3516,21 @@ msgstr "" "FTPArchive::ReadOnlyDB</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " @@ -3442,12 +3544,20 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3461,12 +3571,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " @@ -3482,14 +3600,22 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "サンプル" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" @@ -3498,7 +3624,11 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3508,7 +3638,11 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3984,7 +4118,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -5730,11 +5864,12 @@ msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存 #| "period (.) characters - otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" -"literal> configuration list - in this case it will be silently ignored." +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the <literal>Dir::" +"Ignore-Files-Silently</literal> configuration list - in this case it will be " +"silently ignored." msgstr "" "<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順に。" "ファイル名には拡張子がないか、\"<literal>conf</literal>\" となっており、英数" @@ -6729,9 +6864,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " -"that list entries specified on the command line will be added at the end of " -"the list specified in the configuration files, but before the default " +"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " +"also that list entries specified on the command line will be added at the " +"end of the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6751,7 +6886,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -7887,8 +8022,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or \"<literal>pref</literal>" -"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"following naming convention: The files have either no or \"<literal>pref</" +"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -8353,7 +8488,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE "()-like expression or contains the word kde (as a POSIX extended regular " +======= +"()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -8379,7 +8518,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/pl.po b/doc/po/pl.po index 1f8e275b1..b401a1ed1 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -10,7 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -1363,7 +1367,11 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1391,12 +1399,20 @@ msgstr "" "Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1503,7 +1519,7 @@ msgstr "<option>--no-act</option>" #| "<literal>APT::Cache::RecurseDepends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1534,7 +1550,11 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1660,7 +1680,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1678,7 +1702,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1693,7 +1721,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostyka" @@ -1842,7 +1874,11 @@ msgid "Options" msgstr "Opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2105,7 +2141,11 @@ msgid "Just show the contents of the configuration space." msgstr "Wyświetla zawartość przestrzeni konfiguracji." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3106,20 +3146,35 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE "<literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" "literal> or <literal>SHA256</literal>." +======= +"<literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" +"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Use a binary caching DB. This has no effect on the generate command. " @@ -3130,7 +3185,11 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3144,13 +3203,21 @@ msgstr "" "pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " @@ -3164,12 +3231,20 @@ msgstr "" "<literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3179,13 +3254,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Select the source override file to use with the <literal>sources</literal> " @@ -3197,13 +3280,21 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" @@ -3213,14 +3304,22 @@ msgstr "" "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE #, fuzzy #| msgid "<option>-a</option>" msgid "<option>--arch</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE #, fuzzy #| msgid "" #| "If the command is either <literal>install</literal> or <literal>remove</" @@ -3240,13 +3339,21 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3260,13 +3367,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3276,19 +3391,31 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Przykłady" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3296,7 +3423,11 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3833,7 +3964,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" # @@ -5456,14 +5587,29 @@ msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:52 +#, fuzzy +#| msgid "" +#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way " +#| "to add sources.list entries in separate files. The format is the same as " +#| "for the regular <filename>sources.list</filename> file. File names need " +#| "to end with <filename>.list</filename> and may only contain letters (a-z " +#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) " +#| "characters. Otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" -"literal> configuration list - in this case it will be silently ignored." +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the <literal>Dir::" +"Ignore-Files-Silently</literal> configuration list - in this case it will be " +"silently ignored." msgstr "" +"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie " +"pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w " +"przypadku zwykłego pliku <filename>sources.list</filename>. Nazwy plików w " +"tym katalogu muszą się kończyć rozszerzeniem <filename>.list</filename> i " +"mogą składać się tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreślenia " +"(_), pauzy (-) i kropki (.). Inne pliki zostaną zignorowane." #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:59 @@ -6168,9 +6314,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " -"that list entries specified on the command line will be added at the end of " -"the list specified in the configuration files, but before the default " +"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " +"also that list entries specified on the command line will be added at the " +"end of the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6181,7 +6327,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -7137,16 +7283,30 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:70 +#, fuzzy +#| msgid "" +#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way " +#| "to add sources.list entries in separate files. The format is the same as " +#| "for the regular <filename>sources.list</filename> file. File names need " +#| "to end with <filename>.list</filename> and may only contain letters (a-z " +#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) " +#| "characters. Otherwise they will be silently ignored." msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or \"<literal>pref</literal>" -"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"following naming convention: The files have either no or \"<literal>pref</" +"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" +"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie " +"pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w " +"przypadku zwykłego pliku <filename>sources.list</filename>. Nazwy plików w " +"tym katalogu muszą się kończyć rozszerzeniem <filename>.list</filename> i " +"mogą składać się tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreślenia " +"(_), pauzy (-) i kropki (.). Inne pliki zostaną zignorowane." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:79 @@ -7497,7 +7657,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE "()-like expression or contains the word kde (as a POSIX extended regular " +======= +"()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -7521,7 +7685,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 87ed16033..7ee9c17de 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2010-08-25 23:07+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -1306,7 +1310,11 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1332,12 +1340,20 @@ msgstr "" "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1418,9 +1434,16 @@ msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:317 +#, fuzzy +#| msgid "" +#| "Per default the <literal>depends</literal> and <literal>rdepends</" +#| "literal> print all dependencies. This can be twicked with these flags " +#| "which will omit the specified dependency type. Configuration Item: " +#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" +#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1451,7 +1474,11 @@ msgstr "" "<literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1568,7 +1595,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1586,7 +1617,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1600,7 +1635,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnóstico" @@ -1735,7 +1774,11 @@ msgid "Options" msgstr "Opções" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1988,7 +2031,11 @@ msgid "Just show the contents of the configuration space." msgstr "Apenas mostra o conteúdo do espaço de configuração." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3153,11 +3200,19 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE "<literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" "literal> or <literal>SHA256</literal>." -msgstr "" +======= +"<literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" +"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE +msgstr "" +<<<<<<< TREE "Valores para os campos de metadados adicionais no ficheiro Release são " "tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::" "Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>. " @@ -3166,14 +3221,24 @@ msgstr "" "<literal>Codename</literal>, <literal>Date</literal>, " "<literal>Architectures</literal>, <literal>Components</literal>, " "<literal>Description</literal>." +======= +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3182,7 +3247,11 @@ msgstr "" "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3196,12 +3265,20 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3214,12 +3291,20 @@ msgstr "" "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -3235,12 +3320,20 @@ msgstr "" "de Configuração: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3251,12 +3344,20 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3265,12 +3366,20 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3284,12 +3393,20 @@ msgstr "" "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3313,12 +3430,20 @@ msgstr "" "as verificações extras serão desnecessárias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3333,19 +3458,31 @@ msgstr "" "<filename>Translation-en</filename> só pode ser criado no comando generate." #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Examples" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3354,7 +3491,11 @@ msgstr "" "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3824,7 +3965,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -5505,11 +5646,12 @@ msgstr "" #| "period (.) characters - otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" -"literal> configuration list - in this case it will be silently ignored." +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the <literal>Dir::" +"Ignore-Files-Silently</literal> configuration list - in this case it will be " +"silently ignored." msgstr "" "todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente " "alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão " @@ -6530,9 +6672,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " -"that list entries specified on the command line will be added at the end of " -"the list specified in the configuration files, but before the default " +"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " +"also that list entries specified on the command line will be added at the " +"end of the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6553,7 +6695,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -7828,8 +7970,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or \"<literal>pref</literal>" -"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"following naming convention: The files have either no or \"<literal>pref</" +"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -8295,7 +8437,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE "()-like expression or contains the word kde (as a POSIX extended regular " +======= +"()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -8319,7 +8465,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 4f85c98b0..422fb43d2 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -984,7 +988,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -1005,12 +1013,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "" @@ -1085,7 +1101,7 @@ msgstr "" #: apt-cache.8.xml:317 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1109,7 +1125,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "" @@ -1205,7 +1225,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" @@ -1223,7 +1247,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1238,7 +1266,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1343,7 +1375,11 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "" @@ -1548,7 +1584,11 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 #, fuzzy msgid "&apt-conf;" @@ -2478,26 +2518,45 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE "<literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" "literal> or <literal>SHA256</literal>." +======= +"<literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" +"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -2506,12 +2565,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2520,12 +2587,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "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 " @@ -2535,12 +2610,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2548,24 +2631,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2574,12 +2673,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2593,12 +2700,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2608,27 +2723,43 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -2951,7 +3082,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4232,11 +4363,12 @@ msgstr "" #: apt.conf.5.xml:52 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" -"literal> configuration list - in this case it will be silently ignored." +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the <literal>Dir::" +"Ignore-Files-Silently</literal> configuration list - in this case it will be " +"silently ignored." msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> @@ -4934,9 +5066,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " -"that list entries specified on the command line will be added at the end of " -"the list specified in the configuration files, but before the default " +"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " +"also that list entries specified on the command line will be added at the " +"end of the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -4947,7 +5079,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -5931,8 +6063,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or \"<literal>pref</literal>" -"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"following naming convention: The files have either no or \"<literal>pref</" +"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -6396,7 +6528,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE "()-like expression or contains the word kde (as a POSIX extended regular " +======= +"()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -6417,7 +6553,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" |