diff options
Diffstat (limited to 'doc/po/de.po')
-rw-r--r-- | doc/po/de.po | 241 |
1 files changed, 241 insertions, 0 deletions
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 |