diff options
Diffstat (limited to 'doc/po/apt-doc.pot')
| -rw-r--r-- | doc/po/apt-doc.pot | 162 |
1 files changed, 152 insertions, 10 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index e58059267..586e0378c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" +<<<<<<< TREE "POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= +"POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -967,7 +971,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +======= +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +>>>>>>> MERGE-SOURCE msgid "<option>-s</option>" msgstr "" @@ -987,12 +995,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "" @@ -1067,7 +1083,7 @@ msgstr "" #: apt-cache.8.xml:317 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be twicked with these flags which will omit " +"print all dependencies. This can be tweaked with these flags which will omit " "the specified dependency type. Configuration Item: " "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> " "e.g. <literal>APT::Cache::ShowRecommends</literal>." @@ -1091,7 +1107,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "" @@ -1187,7 +1207,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> +<<<<<<< TREE #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +======= +#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +>>>>>>> MERGE-SOURCE msgid "&apt-commonoptions;" msgstr "" @@ -1202,7 +1226,11 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 +======= +#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 +>>>>>>> MERGE-SOURCE msgid "See Also" msgstr "" @@ -1212,7 +1240,11 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +======= +#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +>>>>>>> MERGE-SOURCE msgid "Diagnostics" msgstr "" @@ -1316,7 +1348,11 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "" @@ -1519,7 +1555,11 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73 +======= +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73 +>>>>>>> MERGE-SOURCE msgid "&apt-conf;" msgstr "" @@ -2443,26 +2483,47 @@ msgid "" "Configuration Items: " "<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and " "<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> " +<<<<<<< TREE "where <literal>Index</literal> can be <literal>Packages</literal>, " "<literal>Sources</literal> or <literal>Release</literal> and " "<literal>Checksum</literal> can be <literal>MD5</literal>, " "<literal>SHA1</literal> or <literal>SHA256</literal>." +======= +"where <literal><replaceable>Index</replaceable></literal> can be " +"<literal>Packages</literal>, <literal>Sources</literal> or " +"<literal>Release</literal> and " +"<literal><replaceable>Checksum</replaceable></literal> can be " +"<literal>MD5</literal>, <literal>SHA1</literal> or " +"<literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:539 +======= +#: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:541 +======= +#: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:547 +======= +#: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2471,12 +2532,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:553 +======= +#: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:555 +======= +#: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2485,12 +2554,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:561 +======= +#: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:563 +======= +#: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2500,12 +2577,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:571 +======= +#: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:573 +======= +#: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@ -2513,24 +2598,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:577 +======= +#: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:579 +======= +#: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:583 +======= +#: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:584 +======= +#: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2539,12 +2640,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:590 +======= +#: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:592 +======= +#: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2558,12 +2667,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE #: apt-ftparchive.1.xml:602 +======= +#: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:604 +======= +#: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2573,12 +2690,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 +======= +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 +>>>>>>> MERGE-SOURCE msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE #: apt-ftparchive.1.xml:622 +======= +#: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2587,14 +2712,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:618 +======= +#: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE #: apt-ftparchive.1.xml:632 +======= +#: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -2922,7 +3055,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directoy." +"current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4199,10 +4332,10 @@ msgstr "" #: apt.conf.5.xml:52 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have no or \"<literal>conf</literal>\" as filename extension and " -"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " -"characters. Otherwise APT will print a notice that it has ignored a file if " -"the file doesn't match a pattern in the " +"order which have either no or \"<literal>conf</literal>\" as filename " +"extension and which only contain alphanumeric, hyphen (-), underscore (_) " +"and period (.) characters. Otherwise APT will print a notice that it has " +"ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" @@ -4910,7 +5043,7 @@ msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " "checked: If this setting exists the method will only be used if this file " -"exists, e.g. for the bzip2 method (the inbuilt) setting is <placeholder " +"exists, e.g. for the bzip2 method (the inbuilt) setting is: <placeholder " "type=\"literallayout\" id=\"0\"/> Note also that list entries specified on " "the command line will be added at the end of the list specified in the " "configuration files, but before the default entries. To prefer a type in " @@ -4923,7 +5056,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives doesn't provide " +"uncompressed files a preference, but note that most archives don't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -5865,8 +5998,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have no or " -"\"<literal>pref</literal>\" as filename extension and which only contain " +"following naming convention: The files have either no or " +"\"<literal>pref</literal>\" as filename extension and only contain " "alphanumeric, hyphen (-), underscore (_) and period (.) characters. " "Otherwise APT will print a notice that it has ignored a file if the file " "doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> " @@ -6198,8 +6331,13 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a " +<<<<<<< TREE "glob()-like expression or contains the word kde (as a POSIX extended regular " "expression surrounded by slashes)." +======= +"glob()-like expression) or contains the word kde (as a POSIX extended " +"regular expression surrounded by slashes)." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> @@ -6215,7 +6353,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE "string can occur. Those, the following pin assigns the priority 990 to all " +======= +"string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" |