diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/po/apt-doc.pot | 140 | ||||
| -rw-r--r-- | doc/po/de.po | 241 | ||||
| -rw-r--r-- | doc/po/es.po | 160 | ||||
| -rw-r--r-- | doc/po/fr.po | 160 | ||||
| -rw-r--r-- | doc/po/it.po | 139 | ||||
| -rw-r--r-- | doc/po/ja.po | 159 | ||||
| -rw-r--r-- | doc/po/pl.po | 139 | ||||
| -rw-r--r-- | doc/po/pt.po | 160 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 139 |
9 files changed, 1437 insertions, 0 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 47a7c38d7..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 "" @@ -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,28 +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 " @@ -2473,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 " @@ -2487,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 " @@ -2502,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: " @@ -2515,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 " @@ -2541,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 " @@ -2560,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 " @@ -2575,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 " @@ -2589,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." @@ -6200,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> @@ -6217,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 dc4d34b81..b10c657d4 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "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" @@ -1282,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>" @@ -1310,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>" @@ -1436,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>" @@ -1553,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;" @@ -1571,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 @@ -1585,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" @@ -1720,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>" @@ -1974,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;" @@ -3137,21 +3178,51 @@ 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 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "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 "" +<<<<<<< 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 " +"unterstützten Felder sind: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-Until</" +"literal>, <literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." +======= "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: " @@ -3162,14 +3233,23 @@ msgstr "" "<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>." @@ -3179,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 " @@ -3193,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 " @@ -3212,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 " @@ -3233,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</" @@ -3249,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>." @@ -3263,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 " @@ -3282,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 " @@ -3311,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 " @@ -3332,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\"/>" @@ -3354,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." @@ -7986,9 +8142,14 @@ 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</" @@ -8007,17 +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 @@ -8062,10 +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 " @@ -8382,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 @@ -8390,60 +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 diff --git a/doc/po/es.po b/doc/po/es.po index c8fdc9fed..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>" @@ -1507,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>" @@ -1624,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;" @@ -1642,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 @@ -1656,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" @@ -1791,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>" @@ -2048,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;" @@ -3205,25 +3245,61 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "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 "" +<<<<<<< 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</" +"literal>. Los campos permitidos son: <literal>Origin</literal>, " +"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</" +"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>." @@ -3232,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 " @@ -3246,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 " @@ -3264,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 " @@ -3286,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</" @@ -3302,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>." @@ -3316,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 " @@ -3335,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 " @@ -3364,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 " @@ -3385,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\"/>" @@ -3406,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." @@ -8391,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 "" @@ -8415,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 6e3977c43..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>" @@ -1432,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>" @@ -1552,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;" @@ -1570,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 @@ -1584,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" @@ -1719,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>" @@ -1976,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;" @@ -3133,25 +3173,61 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "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 "" +<<<<<<< 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 " +"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <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> +<<<<<<< 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>." @@ -3161,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 " @@ -3176,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 " @@ -3195,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 " @@ -3216,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</" @@ -3232,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>." @@ -3246,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 " @@ -3265,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 " @@ -3293,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 " @@ -3314,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\"/>" @@ -3335,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." @@ -8346,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 "" @@ -8370,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 514e24442..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 "" @@ -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." @@ -6160,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 "" @@ -6177,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 8a75af980..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>" @@ -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;" @@ -3292,26 +3332,61 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "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 "" +<<<<<<< TREE +"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::" +"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::" +"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</" +"literal>, <literal>Label</literal>, <literal>Suite</literal>, " +"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</" +"literal>, <literal>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>." @@ -3321,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 " @@ -3334,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 " @@ -3353,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 " @@ -3374,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</" @@ -3390,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>." @@ -3405,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> " @@ -3425,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 " @@ -3444,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 " @@ -3465,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 "" @@ -3481,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\"/>" @@ -3491,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." @@ -8337,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 "" @@ -8363,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 b74746ffc..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>" @@ -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." @@ -7526,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 "" @@ -7550,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 6fd27a5c3..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>" @@ -1458,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>" @@ -1575,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;" @@ -1593,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 @@ -1607,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" @@ -1742,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>" @@ -1995,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;" @@ -3144,25 +3184,61 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "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 "" +<<<<<<< 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>. " +"Os campos suportados são: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." +======= +>>>>>>> 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>." @@ -3171,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 " @@ -3185,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 " @@ -3203,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 " @@ -3224,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</" @@ -3240,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>." @@ -3254,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 " @@ -3273,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 " @@ -3302,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 " @@ -3322,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\"/>" @@ -3343,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." @@ -8285,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 "" @@ -8309,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 0f171479f..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 "" @@ -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." @@ -6397,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 "" @@ -6418,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 "" |