diff options
| -rw-r--r-- | doc/apt-ftparchive.1.xml | 2 | ||||
| -rw-r--r-- | doc/examples/apt-ftparchive.conf | 7 | ||||
| -rw-r--r-- | doc/guide.dbk | 4 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 35 | ||||
| -rw-r--r-- | doc/po/de.po | 129 | ||||
| -rw-r--r-- | doc/po/es.po | 66 | ||||
| -rw-r--r-- | doc/po/fr.po | 77 | ||||
| -rw-r--r-- | doc/po/it.po | 74 | ||||
| -rw-r--r-- | doc/po/ja.po | 59 | ||||
| -rw-r--r-- | doc/po/nl.po | 64 | ||||
| -rw-r--r-- | doc/po/pl.po | 161 | ||||
| -rw-r--r-- | doc/po/pt.po | 82 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 30 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 20 | ||||
| -rwxr-xr-x | dselect/setup | 8 | ||||
| -rw-r--r-- | vendor/debian/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vendor/debian/apt-vendor.ent | 10 |
17 files changed, 380 insertions, 450 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 25ca5e129..6c2982f0c 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -369,7 +369,7 @@ for i in Sections do <listitem><para> This is a space separated list of sections which appear under the distribution; typically this is something like - <literal>main contrib non-free</literal></para></listitem> + <literal>main contrib non-free non-free-firmware</literal></para></listitem> </varlistentry> <varlistentry><term><option>Architectures</option></term> diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf index 0e8bcb2ce..f3897ed40 100644 --- a/doc/examples/apt-ftparchive.conf +++ b/doc/examples/apt-ftparchive.conf @@ -38,6 +38,13 @@ BinDirectory "pool/non-free" { Contents "dists/sid/non-free/Contents-i386"; }; +// And this is (you guessed it) the same for the non-free-firmware section +BinDirectory "pool/non-free-firmware" { + Packages "dists/sid/non-free-firmware/binary-i386/Packages"; + Sources "dists/sid/non-free-firmware/source/Sources"; + Contents "dists/sid/non-free-firmware/Contents-i386"; +}; + // By default all Packages should have the extension ".deb" Default { Packages { diff --git a/doc/guide.dbk b/doc/guide.dbk index ab4b0c6d0..d2f650a20 100644 --- a/doc/guide.dbk +++ b/doc/guide.dbk @@ -252,9 +252,9 @@ packages into the US is legal however. </para> <screen> Please give the components to get - The components are typically something like: main contrib non-free + The components are typically something like: main contrib non-free non-free-firmware - Components [main contrib non-free]: + Components [main contrib non-free non-free-firmware]: </screen> <para> The components list refers to the list of sub distributions to fetch. The diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index d3d436b68..174524dd6 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5641,11 +5641,11 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or " "<literal>&debian-testing-codename;</literal> while component is one of " -"<literal>main</literal>, <literal>contrib</literal> or " -"<literal>non-free</literal>. The <literal>deb-src</literal> type references " -"a Debian distribution's source code in the same form as the " -"<literal>deb</literal> type. A <literal>deb-src</literal> line is required " -"to fetch source indexes." +"<literal>main</literal>, <literal>contrib</literal>, " +"<literal>non-free</literal> or <literal>non-free-firmware</literal>. The " +"<literal>deb-src</literal> type references a Debian distribution's source " +"code in the same form as the <literal>deb</literal> type. A " +"<literal>deb-src</literal> line is required to fetch source indexes." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -5880,7 +5880,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -6143,13 +6143,13 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -6159,7 +6159,7 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6170,7 +6170,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -6180,7 +6180,7 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6191,7 +6191,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "" +"deb-src file:/home/apt/debian unstable main contrib non-free " +"non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -6201,7 +6203,7 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6892,7 +6894,7 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib " -"non-free</literal>" +"non-free non-free-firmware</literal>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> @@ -9066,9 +9068,10 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free " +"non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" #. type: Content of: <book><chapter><para> diff --git a/doc/po/de.po b/doc/po/de.po index f68aec32b..57c7bb4ce 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -8057,10 +8057,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-" "Archiv, <filename>Distribution/Bestandteil</filename>. " @@ -8068,11 +8068,11 @@ msgstr "" "<literal>stable</literal> oder <literal>testing</literal> oder ein Codename " "wie <literal>&debian-stable-codename;</literal> oder <literal>&debian-" "testing-codename;</literal> während Bestandteil entweder <literal>main</" -"literal>, <literal>contrib</literal> oder <literal>non-free</literal> ist. " -"Der <literal>deb-src</literal>-Typ beschreibt den Quellcode einer Debian-" -"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine " -"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes " -"herunterzuladen." +"literal>, <literal>contrib</literal>, <literal>non-free</literal> oder " +"<literal>non-free-firmware</literal> ist. Der <literal>deb-src</literal>-Typ " +"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie " +"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird " +"benötigt, um Quellindizes herunterzuladen." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8429,7 +8429,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8846,16 +8846,17 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "benutzt die lokal gespeicherten (oder per NFS eingehängten) Archive in /home/" -"apt/debian für stable/main, stable/contrib und stable/non-free." +"apt/debian für stable/main, stable/contrib, stable/non-free und stable/non-" +"free-firmware." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8864,12 +8865,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8880,8 +8881,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8890,12 +8891,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8905,8 +8906,8 @@ msgstr "Quellenangabe für Obiges" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8915,12 +8916,12 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9873,11 +9874,11 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" "Dies ist eine durch Leerzeichen getrennte Liste der Abschnitte, die unter " "der Distribution erscheint, typischerweise etwas wie <literal>main contrib " -"non-free</literal>" +"non-free non-free-firmware</literal>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -11869,10 +11870,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?name(REGEX)</code>" msgid "<code>?codename(REGEX)</code>" -msgstr "<code>?name(REGULÄRER_AUSDRUCK)</code>" +msgstr "<code>?codename(REGULÄRER_AUSDRUCK)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-patterns.7.xml @@ -12033,115 +12032,83 @@ msgstr "Diese Muster wählen bestimmte Versionen eines Pakets aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?not(PATTERN)</code>" msgid "<code>?depends(PATTERN)</code>" -msgstr "<code>?not(MUSTER)</code>" +msgstr "<code>?depends(MUSTER)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>!PATTERN</code>" msgid "<code>~DPATTERN</code>" -msgstr "<code>!MUSTER</code>" +msgstr "<code>~DMUSTER</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?not(PATTERN)</code>" msgid "<code>?pre-depends(PATTERN)</code>" -msgstr "<code>?not(MUSTER)</code>" +msgstr "<code>?pre-depends(MUSTER)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>!PATTERN</code>" msgid "<code>~DPre-Depends:PATTERN</code>" -msgstr "<code>!MUSTER</code>" +msgstr "<code>~DPre-Depends:MUSTER</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?not(PATTERN)</code>" msgid "<code>?suggests(PATTERN)</code>" -msgstr "<code>?not(MUSTER)</code>" +msgstr "<code>?suggests(MUSTER)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>!PATTERN</code>" msgid "<code>~DSuggests:PATTERN</code>" -msgstr "<code>!MUSTER</code>" +msgstr "<code>~DSuggests:MUSTER</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?not(PATTERN)</code>" msgid "<code>?conflicts(PATTERN)</code>" -msgstr "<code>?not(MUSTER)</code>" +msgstr "<code>?conflicts(MUSTER)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?not(PATTERN)</code>" msgid "<code>~DConflicts:PATTERN</code>" -msgstr "<code>?not(MUSTER)</code>" +msgstr "<code>~DConflicts:MUSTER</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>(PATTERN)</code>" msgid "<code>?replaces(PATTERN)</code>" -msgstr "<code>(MUSTER)</code>" +msgstr "<code>?replaces(MUSTER)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>!PATTERN</code>" msgid "<code>~DReplaces:PATTERN</code>" -msgstr "<code>!MUSTER</code>" +msgstr "<code>~DReplaces:MUSTER</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?not(PATTERN)</code>" msgid "<code>?obsoletes(PATTERN)</code>" -msgstr "<code>?not(MUSTER)</code>" +msgstr "<code>?obsoletes(MUSTER)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?not(PATTERN)</code>" msgid "<code>~DObsoletes:PATTERN</code>" -msgstr "<code>?not(MUSTER)</code>" +msgstr "<code>~DObsoletes:MUSTER</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>(PATTERN)</code>" msgid "<code>?breaks(PATTERN)</code>" -msgstr "<code>(MUSTER)</code>" +msgstr "<code>?breaks(MUSTER)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>!PATTERN</code>" msgid "<code>~DBreaks:PATTERN</code>" -msgstr "<code>!MUSTER</code>" +msgstr "<code>~DBreaks:MUSTER</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>?not(PATTERN)</code>" msgid "<code>?enhances(PATTERN)</code>" -msgstr "<code>?not(MUSTER)</code>" +msgstr "<code>?enhances(MUSTER)</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml -#, fuzzy -#| msgid "<code>!PATTERN</code>" msgid "<code>~DEnhances:PATTERN</code>" -msgstr "<code>!MUSTER</code>" +msgstr "<code>~DEnhances:MUSTER</code>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-patterns.7.xml @@ -12817,14 +12784,14 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Bitte geben Sie die Bestandteile an, die Sie erhalten möchten\n" -" Die Bestandteile sind normalerweise etwas wie: »main« »contrib« »non-free«\n" +" Die Bestandteile sind normalerweise etwas wie: »main« »contrib« »non-free« »non-free-firmware«\n" "\n" -" Bestandteile [main contrib non-free]:\n" +" Bestandteile [main contrib non-free non-free-firmware]:\n" #. type: Content of: <book><chapter><para> #: guide.dbk diff --git a/doc/po/es.po b/doc/po/es.po index c3f53f1c9..145fd2124 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -7943,10 +7943,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" "El tipo <literal>deb</literal> hace referencia a un típico archivo de Debian " "de dos niveles, <filename>distribución/componente</filename>. Habitualmente, " @@ -8282,7 +8282,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8596,16 +8596,17 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Utiliza el archivo local (o montado mediante NFS) en «/home/apt/debian» para " -"«stable/main», «stable/contrib», y «stable/non-free»." +"«stable/main», «stable/contrib», «stable/non-free», y «stable/non-free-" +"firmware»." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8614,12 +8615,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8630,8 +8631,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8640,12 +8641,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8657,8 +8658,8 @@ msgstr "Línea para obtener el código fuente desde la ubicación anterior." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8667,12 +8668,12 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9637,11 +9638,11 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" "Es una lista de secciones separadas por espacios que aparecen bajo la " -"distribución; habitualmente, es similar a <literal>main contrib non-free</" -"literal>." +"distribución; habitualmente, es similar a <literal>main contrib non-free non-" +"free-firmware</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -12152,14 +12153,14 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" #. type: Content of: <book><chapter><para> #: guide.dbk @@ -13769,19 +13770,6 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos." #~ msgid "Some examples:" #~ msgstr "Algunos ejemplos:" -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " - #~ msgid "apt" #~ msgstr "apt" diff --git a/doc/po/fr.po b/doc/po/fr.po index a8c9beea8..4723c4981 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -8010,10 +8010,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" "Le type <literal>deb</literal> décrit une archive Debian classique à deux " "niveaux, <filename>distribution/composant</filename>. <literal>distribution</" @@ -8021,11 +8021,12 @@ msgstr "" "<literal>stable</literal> ou <literal>testing</literal> ou bien un nom de " "code comme <literal>&debian-stable-codename;</literal> ou <literal>&debian-" "testing-codename;</literal>, alors que composant prend les valeurs : " -"<literal>main</literal>, <literal>contrib</literal> ou <literal>non-free</" -"literal>. Le type <literal>deb-src</literal> décrit une archive de " -"distribution de code source pour une distribution Debian dans le même format " -"que le type <literal>deb</literal>. Une ligne <literal>deb-src</literal> est " -"nécessaire pour récupérer les index des sources." +"<literal>main</literal>, <literal>contrib</literal>, <literal>non-free</" +"literal>, ou <literal>non-free-firmware</literal>. Le type <literal>deb-src</" +"literal> décrit une archive de distribution de code source pour une " +"distribution Debian dans le même format que le type <literal>deb</literal>. " +"Une ligne <literal>deb-src</literal> est nécessaire pour récupérer les index " +"des sources." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8379,7 +8380,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8793,16 +8794,17 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Utiliser l'archive stockée localement (ou montée via NFS) dans /home/apt/" -"debian pour stable/main, stable/contrib et stable/non-free." +"debian pour stable/main, stable/contrib, stable/non-free et stable/non-free-" +"firmware." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8811,12 +8813,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8828,8 +8830,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8838,12 +8840,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8853,8 +8855,8 @@ msgstr "Indication des sources pour les lignes précédentes." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8863,12 +8865,12 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9813,11 +9815,11 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" "C'est une liste de sections séparées par des espaces qui appartiennent à une " -"distribution ; classiquement, on trouve <literal>main contrib non-free</" -"literal>." +"distribution ; classiquement, on trouve <literal>main contrib non-free non-" +"free-firmware</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -12644,15 +12646,15 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Veuillez indiquer les composants à utiliser\n" " Les composants sont en général de la forme suivante :\n" -" main contrib non-free\n" +" main contrib non-free non-free-firmware\n" "\n" -" Composants [main contrib non-free] :\n" +" Composants [main contrib non-free non-free-firmware] :\n" #. type: Content of: <book><chapter><para> #: guide.dbk @@ -14356,19 +14358,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque." #~ msgid "Some examples:" #~ msgstr "Exemples :" -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " - #~ msgid "apt" #~ msgstr "apt" diff --git a/doc/po/it.po b/doc/po/it.po index 15542586d..c7798913c 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -8025,10 +8025,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" "Il tipo <literal>deb</literal> è un riferimento a un tipico archivio Debian " "a due livelli, <filename>distribuzione/componente</filename>. " @@ -8036,11 +8036,11 @@ msgstr "" "<literal>stable</literal> o <literal>testing</literal>, oppure un nome in " "codice come <literal>&debian-stable-codename;</literal> o <literal>&debian-" "testing-codename;</literal>; componente è uno tra <literal>main</literal>, " -"<literal>contrib</literal> o <literal>non-free</literal>. Il tipo " -"<literal>deb-src</literal> è un riferimento al codice sorgente di una " -"distribuzione Debian nella stessa forma di quella del tipo <literal>deb</" -"literal>. Per recuperare gli indici dei pacchetti sorgente è necessaria una " -"riga <literal>deb-src</literal>." +"<literal>contrib</literal>, <literal>non-free</literal> o <literal>non-free-" +"firmware</literal>. Il tipo <literal>deb-src</literal> è un riferimento al " +"codice sorgente di una distribuzione Debian nella stessa forma di quella del " +"tipo <literal>deb</literal>. Per recuperare gli indici dei pacchetti " +"sorgente è necessaria una riga <literal>deb-src</literal>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8391,7 +8391,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8758,16 +8758,16 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Usa l'archivio memorizzato in locale (o montato via NFS) in /home/apt/debian " -"per stable/main, stable/contrib e stable/non-free." +"per stable/main, stable/contrib, stable/non-free e stable/non-free-firmware." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8776,12 +8776,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8793,8 +8793,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8803,12 +8803,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8818,8 +8818,8 @@ msgstr "Indicazione per i sorgenti corrispondente alla precedente." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8828,12 +8828,12 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9770,10 +9770,11 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" "Questa è una lista di sezioni che appaiono sotto la distribuzione, separate " -"da spazi; tipicamente è simile a <literal>main contrib non-free</literal>." +"da spazi; tipicamente è simile a <literal>main contrib non-free non-free-" +"firmware</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -12425,14 +12426,14 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" #. type: Content of: <book><chapter><para> #: guide.dbk @@ -14165,19 +14166,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ msgid "Some examples:" #~ msgstr "Alcuni esempi:" -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " - #~ msgid "apt" #~ msgstr "apt" diff --git a/doc/po/ja.po b/doc/po/ja.po index b10feb0a4..1b39133d5 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7710,10 +7710,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" "<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ " "<filename>distribution/component</filename> を参照します。" @@ -7721,10 +7721,10 @@ msgstr "" "<literal>testing</literal> または <literal>&debian-stable-codename;</" "literal> や <literal>&debian-testing-codename;</literal> のようなコード名にな" "ります。component は、<literal>main</literal>, <literal>contrib</literal>, " -"<literal>non-free</literal> のどれかです。<literal>deb-src</literal> タイプで" -"は、debian ディストリビューションのソースコードを、<literal>deb</literal> タ" -"イプと同じ形式で参照します。<literal>deb-src</literal> 行は、ソースインデック" -"スを取得するのに必要です。" +"<literal>non-free</literal>, <literal>non-free-firmware</literal> のどれかで" +"す。<literal>deb-src</literal> タイプでは、debian ディストリビューションの" +"ソースコードを、<literal>deb</literal> タイプと同じ形式で参照します。" +"<literal>deb-src</literal> 行は、ソースインデックスを取得するのに必要です。" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8057,7 +8057,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8413,16 +8413,17 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "/home/apt/debian に格納されている stable/main, stable/contrib, stable/non-" -"free 用のローカル (または NFS) アーカイブを使用します。" +"free, stable/non-free-firmware 用のローカル (または NFS) アーカイブを使用しま" +"す。" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8431,12 +8432,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8446,8 +8447,8 @@ msgstr "上記と同様ですが、不安定版 (開発版) を使用します #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8456,12 +8457,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8471,8 +8472,8 @@ msgstr "上記のソースの指定は以下のようになります。" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8481,12 +8482,12 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9402,10 +9403,10 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、" -"<literal>main contrib non-free</literal> のようになります。" +"<literal>main contrib non-free non-free-firmware</literal> のようになります。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -11925,14 +11926,14 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " 取得するコンポーネントを指定してください\n" -" コンポーネントには以下のようなものがあります: main contrib non-free\n" +" コンポーネントには以下のようなものがあります: main contrib non-free non-free-firmware\n" "\n" -" コンポーネント [main contrib non-free]:\n" +" コンポーネント [main contrib non-free non-free-firmware]:\n" #. type: Content of: <book><chapter><para> #: guide.dbk diff --git a/doc/po/nl.po b/doc/po/nl.po index 56792c845..1771adcb1 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -8221,10 +8221,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" "Het type <literal>deb</literal> verwijst naar een typisch Debian-archief met " "twee niveaus, <filename>distributie/component</filename>. De " @@ -8232,11 +8232,12 @@ msgstr "" "zoals <literal>stable</literal> of <literal>testing</literal> of een " "codenaam zoals <literal>&debian-stable-codename;</literal> of " "<literal>&debian-testing-codename;</literal>, terwijl component een van de " -"volgende kan zijn: <literal>main</literal>, <literal>contrib</literal> of " -"<literal>non-free</literal>. Het type <literal>deb-src</literal> verwijst in " -"dezelfde vorm als het type <literal>deb</literal> naar de broncode van een " -"Debian distributie. Om bronnenindexen te kunnen ophalen is een <literal>deb-" -"src</literal>-regel noodzakelijk." +"volgende kan zijn: <literal>main</literal>, <literal>contrib</literal>, " +"<literal>non-free</literal> of <literal>non-free-firmware</literal>. Het " +"type <literal>deb-src</literal> verwijst in dezelfde vorm als het type " +"<literal>deb</literal> naar de broncode van een Debian distributie. Om " +"bronnenindexen te kunnen ophalen is een <literal>deb-src</literal>-regel " +"noodzakelijk." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8595,7 +8596,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8610,7 +8611,7 @@ msgstr "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -9014,16 +9015,17 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Gebruikt het lokaal opgeslagen (of via NFS aangekoppelde) archief in /home/" -"apt/debian voor stable/main, stable/contrib, en stable/non-free." +"apt/debian voor stable/main, stable/contrib, stable/non-free, en stable/non-" +"free-firmware." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -9032,12 +9034,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9049,8 +9051,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -9059,12 +9061,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9074,8 +9076,8 @@ msgstr "Specificatie voor de bronbestanden van het voorgaande." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -9084,12 +9086,12 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -10053,11 +10055,11 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" "Dit is een door spaties gescheiden lijst van secties die onder de " "distributie te vinden zijn. Doorgaans is dat iets zoals <literal>main " -"contrib non-free</literal>" +"contrib non-free non-free-firmware</literal>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -12969,14 +12971,14 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Voer de op te halen componenten in\n" -" Componenten zijn typisch iets zoals: main contrib non-free\n" +" Componenten zijn typisch iets zoals: main contrib non-free non-free-firmware\n" "\n" -" Componenten [main contrib non-free]:\n" +" Componenten [main contrib non-free non-free-firmware]:\n" #. type: Content of: <book><chapter><para> #: guide.dbk diff --git a/doc/po/pl.po b/doc/po/pl.po index df643f65e..547e9e5fa 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -7373,10 +7373,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" "Typ <literal>deb</literal> opisuje typowe dwupoziomowe archiwum Debiana: " "<filename>dystrybucja/komponent</filename>. Zazwyczaj <literal>dystrybucja</" @@ -7714,7 +7714,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8027,34 +8027,33 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian " -#| "for stable/main, stable/contrib, and stable/non-free." msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Użycie archiwum lokalnego (lub montowanego przez NFS) w katalogu /home/jason/" -"debian dla zasobów stable/main, stable/contrib i stable/non-free." +"debian dla zasobów stable/main, stable/contrib, stable/non-free i stable/non-" +"free-firmware." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb file:/home/jason/debian stable main contrib non-free" -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/jason/debian stable main contrib non-free" +#, no-wrap +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb file:/home/jason/debian stable main contrib non-free" +#, no-wrap msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" -msgstr "deb file:/home/jason/debian stable main contrib non-free" +"Components: main contrib non-free non-free-firmware" +msgstr "" +"Types: deb\n" +"URIs: file:/home/apt/debian\n" +"Suites: stable\n" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8064,21 +8063,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb file:/home/jason/debian unstable main contrib non-free" -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/jason/debian unstable main contrib non-free" +#, no-wrap +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb file:/home/jason/debian unstable main contrib non-free" +#, no-wrap msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" -msgstr "deb file:/home/jason/debian unstable main contrib non-free" +"Components: main contrib non-free non-free-firmware" +msgstr "" +"Types: deb\n" +"URIs: file:/home/apt/debian\n" +"Suites: unstable\n" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8089,21 +8090,23 @@ msgstr "Linie źródeł dla powyższego przykładu" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free" -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" +#, no-wrap +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free" +#, no-wrap msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" -msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" +"Components: main contrib non-free non-free-firmware" +msgstr "" +"Types: deb-src\n" +"URIs: file:/home/apt/debian\n" +"Suites: unstable\n" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8118,23 +8121,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "" -#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" +#, no-wrap msgid "" "deb http://deb.debian.org/debian &debian-stable-codename; main\n" "deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" +"deb http://deb.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "" -#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" +#, no-wrap msgid "" "Types: deb\n" "URIs: http://deb.debian.org/debian\n" @@ -8147,8 +8144,16 @@ msgid "" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" +"Types: deb\n" +"URIs: http://deb.debian.org/debian\n" +"Suites: &debian-stable-codename;\n" +"Components: main\n" +"\n" +"Types: deb\n" +"URIs: http://deb.debian.org/debian\n" +"Suites: &debian-stable-codename;\n" +"Components: main\n" +"Architectures: amd64 armel\n" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8167,14 +8172,17 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb http://archive.debian.org/debian-archive hamm main" +#, no-wrap msgid "" "Types: deb\n" "URIs: http://archive.debian.org/debian-archive\n" "Suites: hamm\n" "Components: main" -msgstr "deb http://archive.debian.org/debian-archive hamm main" +msgstr "" +"Types: deb\n" +"URIs: http://archive.debian.org/debian-archive\n" +"Suites: hamm\n" +"Components: main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8193,14 +8201,17 @@ msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +#, no-wrap msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" "Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +msgstr "" +"Types: deb\n" +"URIs: ftp://ftp.debian.org/debian\n" +"Suites: &debian-stable-codename;\n" +"Components: contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8223,14 +8234,17 @@ msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb ftp://ftp.debian.org/debian unstable contrib" +#, no-wrap msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" "Suites: unstable\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian unstable contrib" +msgstr "" +"Types: deb\n" +"URIs: ftp://ftp.debian.org/debian\n" +"Suites: unstable\n" +"Components: contrib" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml @@ -8240,13 +8254,15 @@ msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" +#, no-wrap msgid "" "Types: deb\n" "URIs: http://ftp.tlh.debian.org/universe\n" "Suites: unstable/binary-$(ARCH)/" -msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" +msgstr "" +"Types: deb\n" +"URIs: http://ftp.tlh.debian.org/universe\n" +"Suites: unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8307,10 +8323,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;" -msgstr "&apt-cache;, &apt-config;, &apt-preferences;." +msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;." #. type: Content of: <refentry><refmeta><manvolnum> #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml @@ -8882,7 +8896,7 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> @@ -11299,14 +11313,14 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Proszę podać komponenty do pobrania\n" -" Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free\n" +" Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free non-free-firmware\n" "\n" -" Komponenty [main contrib non-free]:\n" +" Komponenty [main contrib non-free non-free-firmware]:\n" #. type: Content of: <book><chapter><para> #: guide.dbk @@ -12677,19 +12691,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku." #~ msgid "Some examples:" #~ msgstr "Kilka przykładów:" -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " - #~ msgid "apt" #~ msgstr "apt" diff --git a/doc/po/pt.po b/doc/po/pt.po index 0c73d2b3d..1d4847816 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7996,10 +7996,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" "O tipo <literal>deb</literal> descreve um arquivo Debian típico de dois " "níveis, <filename>distribution/component</filename>. A " @@ -8007,10 +8007,11 @@ msgstr "" "<literal>stable</literal> ou <literal>testing</literal> ou um nome de código " "como <literal>&debian-stable-codename;</literal> ou <literal>&debian-testing-" "codename;</literal> enquanto que componente é um de <literal>main</literal>, " -"<literal>contrib</literal> ou <literal>non-free</literal>. O tipo " -"<literal>deb-src</literal> faz referência a um código fonte de distribuição " -"Debian no mesmo formato que o tipo <literal>deb</literal>. É necessária uma " -"linha <literal>deb-src</literal> para obter índices das fontes." +"<literal>contrib</literal>, <literal>non-free</literal> ou <literal>non-free-" +"firmware</literal>. O tipo <literal>deb-src</literal> faz referência a um " +"código fonte de distribuição Debian no mesmo formato que o tipo " +"<literal>deb</literal>. É necessária uma linha <literal>deb-src</literal> " +"para obter índices das fontes." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8356,7 +8357,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8371,7 +8372,7 @@ msgstr "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8766,16 +8767,16 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Usa o arquivo armazenado localmente (ou montagem NFS) em /home/apt/debian " -"para stable/main, stable/contrib, e stable/non-free." +"para stable/main, stable/contrib, stable/non-free e stable/non-free-firmware." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8784,12 +8785,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8800,8 +8801,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8810,12 +8811,12 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8825,8 +8826,8 @@ msgstr "Especificação de fontes para o referido acima." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8835,12 +8836,12 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9786,11 +9787,11 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" "Isto é uma lista de secções separada por espaços que aparece sob a " -"distribuição, tipicamente isto é algo como <literal>main contrib non-free</" -"literal>" +"distribuição, tipicamente isto é algo como <literal>main contrib non-free " +"non-free-firmware</literal>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -12627,14 +12628,14 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Por favor forneça os componentes a obter\n" -" Tipicamente os componentes são algo como: main contrib non-free\n" +" Tipicamente os componentes são algo como: main contrib non-free non-free-firmware\n" "\n" -" Componentes [main contrib non-free]:\n" +" Componentes [main contrib non-free non-free-firmware]:\n" #. type: Content of: <book><chapter><para> #: guide.dbk @@ -14314,25 +14315,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." #~ msgid "Some examples:" #~ msgstr "Alguns exemplos:" -#, fuzzy -#~| msgid "" -#~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-" -#~| "free\n" -#~| "deb http://security.debian.org/ &stable-codename;/updates main contrib " -#~| "non-free\n" -#~| " " -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " -#~ "non-free\n" -#~ " " - #~ msgid "" #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if " #~ "it encounters unauthenticated archives to give a slightly longer grace " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index f0011f8f2..fdb04061f 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -5982,10 +5982,10 @@ msgid "" "<literal>stable</literal> or <literal>testing</literal> or a codename like " "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-" "codename;</literal> while component is one of <literal>main</literal>, " -"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-" -"src</literal> type references a Debian distribution's source code in the " -"same form as the <literal>deb</literal> type. A <literal>deb-src</literal> " -"line is required to fetch source indexes." +"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-" +"firmware</literal>. The <literal>deb-src</literal> type references a Debian " +"distribution's source code in the same form as the <literal>deb</literal> " +"type. A <literal>deb-src</literal> line is required to fetch source indexes." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6215,7 +6215,7 @@ msgid "" "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -6475,13 +6475,13 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -6491,7 +6491,7 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6502,7 +6502,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -6512,7 +6512,7 @@ msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6523,7 +6523,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -6533,7 +6533,7 @@ msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -7228,7 +7228,7 @@ msgstr "" msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like <literal>main contrib non-" -"free</literal>" +"free non-free-firmware</literal>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> @@ -9421,9 +9421,9 @@ msgstr "" #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" #. type: Content of: <book><chapter><para> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index f7da9ba43..c5a012fe4 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -129,8 +129,8 @@ <literal>distribution</literal> is generally a suite name like <literal>stable</literal> or <literal>testing</literal> or a codename like <literal>&debian-stable-codename;</literal> or <literal>&debian-testing-codename;</literal> - while component is one of <literal>main</literal>, <literal>contrib</literal> or - <literal>non-free</literal>. The + while component is one of <literal>main</literal>, <literal>contrib</literal>, + <literal>non-free</literal> or <literal>non-free-firmware</literal>. The <literal>deb-src</literal> type references a Debian distribution's source code in the same form as the <literal>deb</literal> type. A <literal>deb-src</literal> line is required to fetch source indexes.</para> @@ -321,7 +321,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [. <literallayout>Types: deb URIs: https://deb.debian.org Suites: stable -Components: main contrib non-free +Components: main contrib non-free non-free-firmware Signed-By: -----BEGIN PGP PUBLIC KEY BLOCK----- . @@ -505,26 +505,26 @@ Signed-By: <refsect1><title>Examples</title> <para>Uses the archive stored locally (or NFS mounted) at /home/apt/debian - for stable/main, stable/contrib, and stable/non-free.</para> - <literallayout>deb file:/home/apt/debian stable main contrib non-free</literallayout> + for stable/main, stable/contrib, stable/non-free and stable/non-free-firmware.</para> + <literallayout>deb file:/home/apt/debian stable main contrib non-free non-free-firmware</literallayout> <literallayout>Types: deb URIs: file:/home/apt/debian Suites: stable -Components: main contrib non-free</literallayout> +Components: main contrib non-free non-free-firmware</literallayout> <para>As above, except this uses the unstable (development) distribution.</para> - <literallayout>deb file:/home/apt/debian unstable main contrib non-free</literallayout> + <literallayout>deb file:/home/apt/debian unstable main contrib non-free non-free-firmware</literallayout> <literallayout>Types: deb URIs: file:/home/apt/debian Suites: unstable -Components: main contrib non-free</literallayout> +Components: main contrib non-free non-free-firmware</literallayout> <para>Sources specification for the above.</para> - <literallayout>deb-src file:/home/apt/debian unstable main contrib non-free</literallayout> + <literallayout>deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware</literallayout> <literallayout>Types: deb-src URIs: file:/home/apt/debian Suites: unstable -Components: main contrib non-free</literallayout> +Components: main contrib non-free non-free-firmware</literallayout> <para>The first line gets package information for the architectures in <literal>APT::Architectures</literal> while the second always retrieves <literal>amd64</literal> and <literal>armel</literal>.</para> diff --git a/dselect/setup b/dselect/setup index 8689d2388..58eecfcdc 100755 --- a/dselect/setup +++ b/dselect/setup @@ -30,8 +30,8 @@ my $boldoff=`setterm -bold off`; my @known_types = ('deb'); my @known_access = ('http', 'ftp', 'file'); -my @typical_distributions = ('stable', 'unstable', 'testing', 'non-US'); -my @typical_components = ('main', 'contrib', 'non-free'); +my @typical_distributions = ('stable', 'unstable', 'testing'); +my @typical_components = ('main', 'contrib', 'non-free', 'non-free-firmware'); my %known_access = map {($_,$_)} @known_access; my %typical_distributions = map {($_,$_)} @typical_distributions; @@ -118,9 +118,9 @@ sub get_source { } $type = 'deb'; - $urn = "http://http.us.debian.org/debian" unless $urn; + $urn = "http://deb.debian.org/debian" unless $urn; $distribution = "stable" unless $distribution; - $components = "main contrib non-free" unless $components; + $components = "main contrib non-free non-free-firmware" unless $components; $rec->{'Type'} = 'deb'; diff --git a/vendor/debian/CMakeLists.txt b/vendor/debian/CMakeLists.txt new file mode 100644 index 000000000..7c0ccb7d2 --- /dev/null +++ b/vendor/debian/CMakeLists.txt @@ -0,0 +1,2 @@ +execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/apt-vendor.ent.sh + OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/apt-vendor.ent) diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent index bb6180816..4d02343b2 100644 --- a/vendor/debian/apt-vendor.ent +++ b/vendor/debian/apt-vendor.ent @@ -6,15 +6,15 @@ <!ENTITY keyring-master-filename ""> <!ENTITY keyring-uri ""> -<!ENTITY sourceslist-list-format "deb http://deb.debian.org/debian &debian-stable-codename; main contrib non-free -deb http://deb.debian.org/debian &debian-stable-codename;-updates main contrib non-free -deb http://deb.debian.org/debian-security &debian-stable-codename;-security main contrib non-free"> +<!ENTITY sourceslist-list-format "deb http://deb.debian.org/debian &debian-stable-codename; main contrib non-free non-free-firmware +deb http://deb.debian.org/debian &debian-stable-codename;-updates main contrib non-free non-free-firmware +deb http://deb.debian.org/debian-security &debian-stable-codename;-security main contrib non-free non-free-firmware"> <!ENTITY sourceslist-sources-format "Types: deb URIs: http://deb.debian.org/debian Suites: &debian-stable-codename; &debian-stable-codename;-updates -Components: main contrib non-free +Components: main contrib non-free non-free-firmware Types: deb URIs: http://deb.debian.org/debian-security Suites: &debian-stable-codename;-security -Components: main contrib non-free"> +Components: main contrib non-free non-free-firmware"> |