diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-ftparchive.1.xml | 2 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 8 | ||||
| -rw-r--r-- | doc/apt.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 2 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 32 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 82 | ||||
| -rw-r--r-- | doc/po/de.po | 211 | ||||
| -rw-r--r-- | doc/po/es.po | 198 | ||||
| -rw-r--r-- | doc/po/fr.po | 204 | ||||
| -rw-r--r-- | doc/po/it.po | 196 | ||||
| -rw-r--r-- | doc/po/ja.po | 212 | ||||
| -rw-r--r-- | doc/po/nl.po | 211 | ||||
| -rw-r--r-- | doc/po/pl.po | 187 | ||||
| -rw-r--r-- | doc/po/pt.po | 198 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 91 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 16 |
16 files changed, 944 insertions, 908 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 523b1853b..f478564d3 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -345,7 +345,7 @@ The <literal>Tree</literal> section takes a scope tag which sets the <literal>$(DIST)</literal> variable and defines the root of the tree (the path is prefixed by <literal>ArchiveDir</literal>). - Typically this is a setting such as <filename>dists/&stable-codename;</filename>.</para> + Typically this is a setting such as <filename>dists/&debian-stable-codename;</filename>.</para> <para> All of the settings defined in the <literal>TreeDefault</literal> section can be used in a <literal>Tree</literal> section as well as three new variables.</para> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 31c25b9b3..31a936be7 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -240,10 +240,10 @@ <!ENTITY apt-product-version "1.2~exp1"> <!-- (Code)names for various things used all over the place --> -<!ENTITY oldstable-codename "wheezy"> -<!ENTITY stable-codename "jessie"> -<!ENTITY testing-codename "stretch"> -<!ENTITY stable-version "8"> +<!ENTITY debian-oldstable-codename "wheezy"> +<!ENTITY debian-stable-codename "jessie"> +<!ENTITY debian-testing-codename "stretch"> +<!ENTITY debian-stable-version "8"> <!ENTITY ubuntu-codename "trusty"> <!-- good and bad just refers to matching and not matching a pattern… diff --git a/doc/apt.8.xml b/doc/apt.8.xml index 0529a90fb..c3951b4b2 100644 --- a/doc/apt.8.xml +++ b/doc/apt.8.xml @@ -79,7 +79,7 @@ following the package name with an equals (=) and the version of the package to select. Alternatively the version from a specific release can be selected by following the package name with a forward slash (/) and - codename (&stable-codename;, &testing-codename;, sid …) or suite name (stable, + codename (&debian-stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, testing, unstable). This will also select versions from this release for dependencies of this package if needed to satisfy the request. </para><para> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index b366a7dcd..5c4dcd1aa 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -185,7 +185,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <varlistentry><term><option>Default-Release</option></term> <listitem><para>Default release to install packages from if more than one version is available. Contains release name, codename or release version. Examples: 'stable', 'testing', - 'unstable', '&stable-codename;', '&testing-codename;', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem> + 'unstable', '&debian-stable-codename;', '&debian-testing-codename;', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem> </varlistentry> <varlistentry><term><option>Ignore-Hold</option></term> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 513a0c135..cac9a96e1 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -235,21 +235,21 @@ Pin-Priority: 50 </programlisting> <simpara>The following record assigns a high priority to all package versions -belonging to any distribution whose Codename is "<literal>&testing-codename;</literal>".</simpara> +belonging to any distribution whose Codename is "<literal>&debian-testing-codename;</literal>".</simpara> <programlisting> Package: * -Pin: release n=&testing-codename; +Pin: release n=&debian-testing-codename; Pin-Priority: 900 </programlisting> <simpara>The following record assigns a high priority to all package versions belonging to any release whose Archive name is "<literal>stable</literal>" -and whose release Version number is "<literal>&stable-version;</literal>".</simpara> +and whose release Version number is "<literal>&debian-stable-version;</literal>".</simpara> <programlisting> Package: * -Pin: release a=stable, v=&stable-version; +Pin: release a=stable, v=&debian-stable-version; Pin-Priority: 500 </programlisting> </listitem> @@ -428,7 +428,7 @@ APT priorities: <para>The <filename>Release</filename> file is normally found in the directory <filename>.../dists/<replaceable>dist-name</replaceable></filename>: for example, <filename>.../dists/stable/Release</filename>, -or <filename>.../dists/&stable-codename;/Release</filename>. +or <filename>.../dists/&debian-stable-codename;/Release</filename>. It consists of a single multi-line record which applies to <emphasis>all</emphasis> of the packages in the directory tree below its parent. Unlike the <filename>Packages</filename> file, nearly all of the lines in a <filename>Release</filename> @@ -456,14 +456,14 @@ Pin: release a=stable <term>the <literal>Codename:</literal> line</term> <listitem><simpara>names the codename to which all the packages in the directory tree belong. For example, the line -"Codename: &testing-codename;" +"Codename: &debian-testing-codename;" specifies that all of the packages in the directory tree below the parent of the <filename>Release</filename> file belong to a version named -<literal>&testing-codename;</literal>. Specifying this value in the APT preferences file +<literal>&debian-testing-codename;</literal>. Specifying this value in the APT preferences file would require the line: </simpara> <programlisting> -Pin: release n=&testing-codename; +Pin: release n=&debian-testing-codename; </programlisting> </listitem> </varlistentry> @@ -472,16 +472,16 @@ Pin: release n=&testing-codename; <term>the <literal>Version:</literal> line</term> <listitem><simpara>names the release version. For example, the packages in the tree might belong to Debian release -version &stable-version;. Note that there is normally no version number for the +version &debian-stable-version;. Note that there is normally no version number for the <literal>testing</literal> and <literal>unstable</literal> distributions because they have not been released yet. Specifying this in the APT preferences file would require one of the following lines. </simpara> <programlisting> -Pin: release v=&stable-version; -Pin: release a=stable, v=&stable-version; -Pin: release &stable-version; +Pin: release v=&debian-stable-version; +Pin: release a=stable, v=&debian-stable-version; +Pin: release &debian-stable-version; </programlisting> </listitem> @@ -663,9 +663,9 @@ the example configurations above. <programlisting> Explanation: Uninstall or do not install any Debian-originated package versions -Explanation: other than those in the distribution codenamed with &testing-codename; or sid +Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid Package: * -Pin: release n=&testing-codename; +Pin: release n=&debian-testing-codename; Pin-Priority: 900 Explanation: Debian unstable is always codenamed with sid @@ -681,7 +681,7 @@ Pin-Priority: -10 <para>With a suitable &sources-list; file and the above preferences file, any of the following commands will cause APT to upgrade to the -latest version(s) in the release codenamed with <literal>&testing-codename;</literal>. +latest version(s) in the release codenamed with <literal>&debian-testing-codename;</literal>. <programlisting> apt-get install <replaceable>package-name</replaceable> @@ -693,7 +693,7 @@ apt-get dist-upgrade <para>The following command will cause APT to upgrade the specified package to the latest version from the <literal>sid</literal> distribution. Thereafter, <command>apt-get upgrade</command> will upgrade -the package to the most recent <literal>&testing-codename;</literal> version if that is +the package to the most recent <literal>&debian-testing-codename;</literal> version if that is more recent than the installed version, otherwise, to the most recent <literal>sid</literal> version if that is more recent than the installed version. diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index b4d9722c9..966190c44 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.2~exp1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -594,9 +594,9 @@ msgid "" "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " "by following the package name with a forward slash (/) and codename " -"(&stable-codename;, &testing-codename;, sid …) or suite name (stable, " -"testing, unstable). This will also select versions from this release for " -"dependencies of this package if needed to satisfy the request." +"(&debian-stable-codename;, &debian-testing-codename;, sid …) or suite name " +"(stable, testing, unstable). This will also select versions from this " +"release for dependencies of this package if needed to satisfy the request." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2861,8 +2861,8 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', " +"'&debian-testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4554,7 +4554,7 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is " -"\"<literal>&testing-codename;</literal>\"." +"\"<literal>&debian-testing-codename;</literal>\"." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> @@ -4562,7 +4562,7 @@ msgstr "" #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" @@ -4571,7 +4571,8 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is " +"\"<literal>&debian-stable-version;</literal>\"." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> @@ -4579,7 +4580,7 @@ msgstr "" #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" @@ -4854,11 +4855,12 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or " -"<filename>.../dists/&stable-codename;/Release</filename>. It consists of a " -"single multi-line record which applies to <emphasis>all</emphasis> of the " -"packages in the directory tree below its parent. Unlike the " -"<filename>Packages</filename> file, nearly all of the lines in a " -"<filename>Release</filename> file are relevant for setting APT priorities:" +"<filename>.../dists/&debian-stable-codename;/Release</filename>. It " +"consists of a single multi-line record which applies to " +"<emphasis>all</emphasis> of the packages in the directory tree below its " +"parent. Unlike the <filename>Packages</filename> file, nearly all of the " +"lines in a <filename>Release</filename> file are relevant for setting APT " +"priorities:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> @@ -4892,25 +4894,25 @@ msgstr "" #: apt_preferences.5.xml:1 msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " "<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"<literal>&debian-testing-codename;</literal>. Specifying this value in the " +"APT preferences file would require the line:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml:1 #, no-wrap -msgid "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:1 msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." @@ -4920,9 +4922,9 @@ msgstr "" #: apt_preferences.5.xml:1 #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> @@ -5151,9 +5153,9 @@ msgid "" "Explanation: Uninstall or do not install any Debian-originated package " "versions\n" "Explanation: other than those in the distribution codenamed with " -"&testing-codename; or sid\n" +"&debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -5186,7 +5188,7 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" @@ -5202,8 +5204,8 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent " +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " "<literal>sid</literal> version if that is more recent than the installed " "version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" @@ -5342,8 +5344,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or " -"<literal>&testing-codename;</literal> while component is one of " +"<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 " @@ -5774,9 +5776,9 @@ msgstr "" #: sources.list.5.xml:1 #, no-wrap msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" "deb [ arch=amd64,armel ] http://httpredir.debian.org/debian " -"&stable-codename; main" +"&debian-stable-codename; main" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -5785,12 +5787,12 @@ msgstr "" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" @@ -5822,13 +5824,13 @@ msgstr "" #: sources.list.5.xml:1 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:1 #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -5837,7 +5839,7 @@ msgstr "" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" msgstr "" @@ -6412,7 +6414,7 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> diff --git a/doc/po/de.po b/doc/po/de.po index bb370e716..8c43f2fb5 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2014-09-14 14:46+0200\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -740,10 +740,10 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" "Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von " "einem Gleichheitszeichen und der Version des Paketes zur Installation " @@ -4065,13 +4065,13 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" "Standard-Release von dem Pakete installiert werden, wenn mehr als eine " "Version verfügbar ist. Enthält Release-Name, Codename oder Release-Version. " -"Beispiele: »stable«, »testing, »unstable«, »&stable-codename;«, »&testing-" -"codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;." +"Beispiele: »stable«, »testing, »unstable«, »&debian-stable-codename;«, " +"»&debian-testing-codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -6556,23 +6556,23 @@ msgstr "" #: apt_preferences.5.xml msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution " -"gehören, deren Codename »<literal>&testing-codename;</literal>« ist, eine " -"hohe Priorität zu." +"gehören, deren Codename »<literal>&debian-testing-codename;</literal>« ist, " +"eine hohe Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -6580,22 +6580,24 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution " "gehören, deren Archivname »<literal>stable</literal>« und deren Release-" -"Nummer »<literal>&stable-version;</literal>« ist, eine hohe Priorität zu." +"Nummer »<literal>&debian-stable-version;</literal>« ist, eine hohe Priorität " +"zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6953,21 +6955,21 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis " "<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu " "finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder " -"<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus " -"einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> " -"Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses " -"zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu " -"alle Zeilen in einer <filename>Release</filename>-Datei für das Setzen von " -"APT-Prioritäten relevant:" +"<filename>…/dists/&debian-stable-codename;/Release</filename>. Sie besteht " +"aus einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</" +"emphasis> Pakete im Verzeichnisbaum unterhalb des übergeordneten " +"Verzeichnisses zutrifft. Anders als die <filename>Packages</filename>-Datei " +"sind nahezu alle Zeilen in einer <filename>Release</filename>-Datei für das " +"Setzen von APT-Prioritäten relevant:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7006,38 +7008,38 @@ msgstr "die <literal>Codename:</literal>-Zeile" #: apt_preferences.5.xml msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "benennt den Codenamen, zu dem alle Pakete im Verzeichnisbaum gehören. Die " -"Zeile »Codename: &testing-codename;« gibt zum Beispiel an, dass alle Pakete " -"im Verzeichnisbaum unterhalb des der <filename>Release</filename>-Datei " -"übergeordneten Verzeichnisses zu einer Version mit Namen <literal>&testing-" -"codename;</literal> gehören. Diesen Wert in der APT-Einstellungsdatei " -"anzugeben würde die folgende Zeile benötigen:" +"Zeile »Codename: &debian-testing-codename;« gibt zum Beispiel an, dass alle " +"Pakete im Verzeichnisbaum unterhalb des der <filename>Release</filename>-" +"Datei übergeordneten Verzeichnisses zu einer Version mit Namen " +"<literal>&debian-testing-codename;</literal> gehören. Diesen Wert in der APT-" +"Einstellungsdatei anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap -msgid "Pin: release n=&testing-codename;\n" -msgstr "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" +msgstr "Pin: release n=&debian-testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." msgstr "" "benennt die Release-Version. Die Pakete im Baum könnten zum Beispiel zur " -"Debian-Release-Version &stable-version; gehören. Beachten Sie, dass es " -"normalerweise keine Versionsnummer für <literal>testing</literal>- und " +"Debian-Release-Version &debian-stable-version; gehören. Beachten Sie, dass " +"es normalerweise keine Versionsnummer für <literal>testing</literal>- und " "<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht " "veröffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben würde " "eine der folgenden Zeilen benötigen:" @@ -7046,13 +7048,13 @@ msgstr "" #: apt_preferences.5.xml #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7360,9 +7362,9 @@ msgstr "Die Entwicklung eines Codename-Releases verfolgen" #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -7375,10 +7377,10 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n" -"Explanation: stammenden Paketversionen als denen der &testing-codename;-\n" +"Explanation: stammenden Paketversionen als denen der &debian-testing-codename;-\n" "Explanation: oder Sid-Distribution\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian-Unstable hat immer den Codenamen sid\n" @@ -7421,13 +7423,14 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " -"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" -"literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" +"letzte(n) Version(en) im Release mit Codenamen <literal>&debian-testing-" +"codename;</literal> durchzuführen. <placeholder type=\"programlisting\" id=" +"\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml @@ -7441,16 +7444,16 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets " "auf die letzte Version der <literal>sid</literal>-Distribution " "durchzuführen. Danach wird <command>apt-get upgrade</command> ein Upgrade " -"des Pakets auf die aktuellste <literal>&testing-codename;</literal>-Version " -"durchführen, wenn diese aktueller als die installierte Version ist, " +"des Pakets auf die aktuellste <literal>&debian-testing-codename;</literal>-" +"Version durchführen, wenn diese aktueller als die installierte Version ist, " "andernfalls auf die aktuellste <literal>sid</literal>-Version, wenn diese " "aktueller als die installierte Version ist. <placeholder type=" "\"programlisting\" id=\"0\"/>" @@ -7624,9 +7627,9 @@ msgstr "Die Typen deb und deb-src" #| "archive, <filename>distribution/component</filename>. The " #| "<literal>distribution</literal> is generally an archive name like " #| "<literal>stable</literal> or <literal>testing</literal> or a codename " -#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</" -#| "literal> while component is one of <literal>main</literal>, " -#| "<literal>contrib</literal> or <literal>non-free</literal>. The " +#| "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." @@ -7635,8 +7638,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -7645,13 +7648,13 @@ msgstr "" "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-" "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</" "literal> ist typischerweise ein Archivname wie <literal>stable</literal> " -"oder <literal>testing</literal> oder ein Codename wie <literal>&stable-" -"codename;</literal> oder <literal>&testing-codename;</literal> während " -"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder " -"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ " -"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie " -"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird " -"benötigt, um Quellindizes herunterzuladen." +"oder <literal>testing</literal> oder ein Codename wie <literal>&debian-" +"stable-codename;</literal> oder <literal>&debian-testing-codename;</literal> " +"während Komponente entweder <literal>main</literal>, <literal>contrib</" +"literal> oder <literal>non-free</literal> ist. Der <literal>deb-src</" +"literal>-Typ beschreibt den Quellcode einer Debian-Distribution in der " +"gleichen Form wie den <literal>deb</literal>-Typ. Eine <literal>deb-src</" +"literal>-Zeile wird benötigt, um Quellindizes herunterzuladen." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8235,35 +8238,35 @@ msgstr "" #: sources.list.5.xml #, fuzzy, no-wrap #| msgid "" -#| "deb http://ftp.debian.org/debian &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.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 &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8295,28 +8298,28 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" "benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-" -"Verzeichnis zuzugreifen und nur den &stable-codename;/contrib-Bereich zu " -"benutzen." +"Verzeichnis zuzugreifen und nur den &debian-stable-codename;/contrib-Bereich " +"zu benutzen." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +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 &stable-codename; contrib" +#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9110,12 +9113,12 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" "Der <literal>Tree</literal>-Abschnitt nimmt eine scope-Markierung, die die " "<literal>$(DIST)</literal>-Variable setzt und die Wurzel des Baumes " "definiert (der Pfad hat den Präfix von <literal>ArchiveDir</literal>). " -"Typischerweise ist dies eine Einstellung wie <filename>dists/&stable-" +"Typischerweise ist dies eine Einstellung wie <filename>dists/&debian-stable-" "codename;</filename>." #. type: Content of: <refentry><refsect1><refsect2><para> @@ -11470,12 +11473,14 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." #~ msgstr "Einige Beispiele:" #~ msgid "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " +#~ "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 " +#~ "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" #~ " " diff --git a/doc/po/es.po b/doc/po/es.po index e30d49419..4b7c54a5b 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -806,10 +806,10 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" "Puede seleccionar una versión especifica de un paquete poniendo a " "continuación del nombre del paquete un símbolo igual («=») seguido de la " @@ -4127,14 +4127,14 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" "La versión predeterminada de la que se instalarán los paquetes, si hay más " "de una versión disponible. Contiene el nombre de la versión, ya sea el " "nombre en código o el número de la versión. Por ejemplo: «stable», " -"«testing», «unstable», «&stable-codename;», «&testing-codename;», «4.0», " -"«5.0*». Consulte también &apt-preferences;." +"«testing», «unstable», «&debian-stable-codename;», «&debian-testing-" +"codename;», «4.0», «5.0*». Consulte también &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -6582,23 +6582,23 @@ msgstr "" #: apt_preferences.5.xml msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" "El siguiente registro asigna una prioridad alta a todas las versiones de los " "paquetes pertenecientes a cualquier distribución que tenga como nombre clave " -"«<literal>&testing-codename;</literal>»." +"«<literal>&debian-testing-codename;</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -6606,23 +6606,24 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "El siguiente registro asigna una prioridad alta a todas las versiones de los " "paquetes pertenecientes a cualquier publicación que tenga como nombre de " "archivo de paquetes «<literal>stable</literal>» y como número de versión " -"«<literal>&stable-version;</literal>»." +"«<literal>&debian-stable-version;</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6977,20 +6978,20 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "El fichero <filename>Release</filename> se suele encontrar en el directorio " "<filename>.../dists/<replaceable>nombre-dist</replaceable></filename>, por " "ejemplo <filename>.../dists/stable/Release</filename> o <filename>.../dists/" -"&stable-codename;/Release</filename>. El fichero consiste en registros de " -"una sola línea que se aplican a <emphasis>todos</emphasis> los paquetes por " -"debajo del directorio padre. Al contrario que el fichero <filename>Packages</" -"filename>, casi todas las líneas del fichero <filename>Release</filename> " -"son relevantes para las prioridades de APT:" +"&debian-stable-codename;/Release</filename>. El fichero consiste en " +"registros de una sola línea que se aplican a <emphasis>todos</emphasis> los " +"paquetes por debajo del directorio padre. Al contrario que el fichero " +"<filename>Packages</filename>, casi todas las líneas del fichero " +"<filename>Release</filename> son relevantes para las prioridades de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7030,55 +7031,55 @@ msgstr "La línea <literal>Codename:</literal>" #: apt_preferences.5.xml msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "indica el nombre de la distribución a la que pertenecen todos los paquetes " -"del árbol de directorios. Por ejemplo, la línea «Codename: &testing-" +"del árbol de directorios. Por ejemplo, la línea «Codename: &debian-testing-" "codename;» especifica que todos los paquetes en el árbol de directorios por " "debajo del directorio padre marcado en el fichero <filename>Release</" -"filename> pertenecen a la versión llamada <literal>&testing-codename;</" -"literal>. Para especificar una preferencia de acuerdo con este parámetro " +"filename> pertenecen a la versión llamada <literal>&debian-testing-codename;" +"</literal>. Para especificar una preferencia de acuerdo con este parámetro " "tendrá que poner una de las siguientes líneas en el fichero de preferencias " "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap -msgid "Pin: release n=&testing-codename;\n" -msgstr "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" +msgstr "Pin: release n=&debian-testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." msgstr "" "nombra la versión de la publicación. Por ejemplo, los paquetes en el árbol " -"pueden pertenecer a la versión &stable-version; de Debian. Observe que, " -"generalmente, <literal>testing</literal> y <literal>unstable</literal> no " -"tienen una versión asignada porque no se han publicado. Para especificar una " -"preferencia de acuerdo con este parámetro tendrá que poner una de las " +"pueden pertenecer a la versión &debian-stable-version; de Debian. Observe " +"que, generalmente, <literal>testing</literal> y <literal>unstable</literal> " +"no tienen una versión asignada porque no se han publicado. Para especificar " +"una preferencia de acuerdo con este parámetro tendrá que poner una de las " "siguientes línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7386,9 +7387,9 @@ msgstr "Seguir la evolución de una publicación por el nombre" #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -7403,7 +7404,7 @@ msgstr "" "Explanation: Eliminar o no instalar cualquier paquete de Debian cuya versión sea\n" "Explanation: distinta a aquellos en las distribuciones de nombre squeeze o sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: El nombre clave de Debian «unstable» siempre es sid\n" @@ -7447,14 +7448,14 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Con un fichero «&sources-list;» adecuado y el fichero de preferencias " "mostrado anteriormente, cualquiera de las siguientes órdenes provocará que " "APT actualice los paquetes a la última versión de la distribución llamada " -"<literal>&testing-codename;</literal>. <placeholder type=\"programlisting\" " -"id=\"0\"/>" +"<literal>&debian-testing-codename;</literal>. <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml @@ -7468,17 +7469,17 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "La siguiente orden hace que APT actualice un determinado paquete a la última " "versión de la distribución <literal>sid</literal>. Más tarde, <command>apt-" "get upgrade</command> actualizará el paquete a la última versión de la " -"distribución<literal>&testing-codename;</literal> si es más reciente que la " -"versión instalada. De otro modo, se instalará la versión más reciente de la " -"distribución <literal>sid</literal> si es más reciente que la versión " +"distribución<literal>&debian-testing-codename;</literal> si es más reciente " +"que la versión instalada. De otro modo, se instalará la versión más reciente " +"de la distribución <literal>sid</literal> si es más reciente que la versión " "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> @@ -7650,9 +7651,9 @@ msgstr "Los tipos «deb» y «deb-src»" #| "archive, <filename>distribution/component</filename>. The " #| "<literal>distribution</literal> is generally an archive name like " #| "<literal>stable</literal> or <literal>testing</literal> or a codename " -#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</" -#| "literal> while component is one of <literal>main</literal>, " -#| "<literal>contrib</literal> or <literal>non-free</literal>. The " +#| "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." @@ -7661,8 +7662,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -7672,10 +7673,10 @@ msgstr "" "de dos niveles, <filename>distribución/componente</filename>. Habitualmente, " "<literal>distribución</literal> es «<literal>stable</literal>» (estable) o " "«<literal>testing</literal>» (en pruebas), o un nombre código como " -"<literal>&stable-codename;</literal> o <literal>&testing-codename;</" -"literal>, mientras que el componente es <literal>main</literal> (principal), " -"<literal>contrib</literal>, <literal>non-free</literal> (no libre), o " -"<literal>non-us</literal>. El tipo <literal>deb-src</literal> hace " +"<literal>&debian-stable-codename;</literal> o <literal>&debian-testing-" +"codename;</literal>, mientras que el componente es <literal>main</literal> " +"(principal), <literal>contrib</literal>, <literal>non-free</literal> (no " +"libre), o <literal>non-us</literal>. El tipo <literal>deb-src</literal> hace " "referencia al código fuente de la distribución con la misma sintaxis que el " "tipo <literal>deb</literal>. Debe insertar una línea <literal>deb-src</" "literal> para obtener los índices de fuentes." @@ -8249,35 +8250,35 @@ msgstr "" #: sources.list.5.xml #, fuzzy, no-wrap #| msgid "" -#| "deb http://ftp.debian.org/debian &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.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 &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8309,27 +8310,28 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" "Utiliza FTP para acceder al archivo de Debian en «ftp.debian.org», debajo " -"del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»." +"del directorio «debian», y usa sólo la sección «&debian-stable-codename;/" +"contrib»." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +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 &stable-codename; contrib" +#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9124,12 +9126,12 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" "La sección <literal>Tree</literal> toma un ámbito de una etiqueta que define " "la variable <literal>$(DIST)</literal> y la raíz del árbol (a la ruta se le " "añade el prefijo <literal>ArchiveDir</literal>). Normalmente esto es un " -"valor como <filename>dists/&stable-codename;</filename>." +"valor como <filename>dists/&debian-stable-codename;</filename>." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml @@ -11381,14 +11383,16 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos." #~ msgstr "Algunos ejemplos:" #~ msgid "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " +#~ "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 " +#~ "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" diff --git a/doc/po/fr.po b/doc/po/fr.po index 2a36ba2ff..0880fe0c3 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2014-11-15 17:26+0100\n" "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -737,10 +737,10 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" "On peut choisir d'installer une version particulière d'un paquet en faisant " "suivre son nom par un signe égal et par la version. Cette version sera " @@ -4054,14 +4054,14 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" "Indique la distribution à utiliser par défaut lors de l'installation d'un " "paquet si plusieurs versions sont disponibles. La valeur peut être un nom de " "distribution ou un numéro de version. Exemples : « stable », « testing », " -"« &stable-codename; », « &testing-codename; », « 4.0 », « 5.0* ». Voir aussi " -"&apt-preferences;." +"« &debian-stable-codename; », « &debian-testing-codename; », « 4.0 », " +"« 5.0* ». Voir aussi &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -6531,23 +6531,23 @@ msgstr "" #: apt_preferences.5.xml msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" "L'entrée suivante affecte une priorité basse à toutes les versions d'un " "paquet appartenant à toute distribution dont le nom de code est " -"<literal>&testing-codename;</literal>." +"<literal>&debian-testing-codename;</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -6555,23 +6555,24 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "L'entrée suivante affecte une priorité haute à toutes les versions d'un " "paquet appartenant à toute distribution dont le nom d'« Archive » est " "<literal>stable</literal> et dont le numéro de « Version » est " -"<literal>&stable-version;</literal>." +"<literal>&debian-stable-version;</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6927,17 +6928,17 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "Le fichier <filename>Release</filename> se trouve normalement dans le " "répertoire <filename>.../dists/<replaceable>nom-distribution</replaceable></" "filename>, par exemple, <filename>.../dists/stable/Release</filename>, ou " -"<filename>.../dists/&stable-codename;/Release</filename>. Il consiste en " -"une seule entrée composée de plusieurs lignes qui s'applique à " +"<filename>.../dists/&debian-stable-codename;/Release</filename>. Il " +"consiste en une seule entrée composée de plusieurs lignes qui s'applique à " "<emphasis>tous</emphasis> les paquets situés dans les répertoires sous le " "répertoire parent. Contrairement au fichier <filename>Packages</filename>, " "presque toutes les lignes du fichier <filename>Release</filename> sont " @@ -6980,39 +6981,39 @@ msgstr "la ligne <literal>Codename:</literal>" #: apt_preferences.5.xml msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "indique le nom de code auquel appartiennent tous les paquets situés dans les " -"répertoires. Par exemple, la ligne <literal>Codename: &testing-codename;</" -"literal> indique que tous les paquets dans les répertoires situés sous le " -"répertoire parent du fichier <filename>Release</filename> appartiennent à la " -"version portant le nom de code <literal>&testing-codename;</literal>. " -"Indiquer cette valeur dans le fichier des préférences demanderait cette " -"ligne :" +"répertoires. Par exemple, la ligne <literal>Codename: &debian-testing-" +"codename;</literal> indique que tous les paquets dans les répertoires situés " +"sous le répertoire parent du fichier <filename>Release</filename> " +"appartiennent à la version portant le nom de code <literal>&debian-testing-" +"codename;</literal>. Indiquer cette valeur dans le fichier des préférences " +"demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap -msgid "Pin: release n=&testing-codename;\n" -msgstr "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" +msgstr "Pin: release n=&debian-testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." msgstr "" "indique la version de la distribution. Par exemple, les paquets dans les " -"répertoires peuvent appartenir à la distribution Debian version &stable-" -"version;. Il n'y a pas de numéro de version pour les distributions " +"répertoires peuvent appartenir à la distribution Debian version &debian-" +"stable-version;. Il n'y a pas de numéro de version pour les distributions " "<literal>testing</literal> et <literal>unstable</literal> car elles n'ont " "pas encore été publiées. Indiquer cette valeur dans le fichier des " "préférences demanderait ces lignes :" @@ -7021,13 +7022,13 @@ msgstr "" #: apt_preferences.5.xml #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7333,9 +7334,9 @@ msgstr "Suivre l'évolution d'une version par son nom de code" #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -7348,9 +7349,9 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Ne pas installer des exemplaires d'origine Debian\n" -"Explanation: sauf ceux de la distribution &testing-codename; ou sid\n" +"Explanation: sauf ceux de la distribution &debian-testing-codename; ou sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable porte toujours le nom sid\n" @@ -7391,13 +7392,13 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Avec le fichier des préférences ci-dessus et un fichier &sources-list; " "adéquat, les commandes suivantes utiliseront les versions les plus récentes " -"de <literal>&testing-codename;</literal> pour faire la mise à niveau : " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"de <literal>&debian-testing-codename;</literal> pour faire la mise à " +"niveau : <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml @@ -7411,18 +7412,18 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "La commande suivante utilisera la version la plus récente de la distribution " "<literal>sid</literal> pour mettre à niveau le paquet spécifié ; Par la " "suite, <command>apt-get upgrade</command> mettra le paquet à jour avec la " -"plus récente version dans <literal>&testing-codename;</literal> si elle est " -"plus récente que la version installée ou avec la plus récente version dans " -"<literal>sid</literal> si elle est plus récente que la version installée. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"plus récente version dans <literal>&debian-testing-codename;</literal> si " +"elle est plus récente que la version installée ou avec la plus récente " +"version dans <literal>sid</literal> si elle est plus récente que la version " +"installée. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml @@ -7595,9 +7596,9 @@ msgstr "Les types deb et deb-src." #| "archive, <filename>distribution/component</filename>. The " #| "<literal>distribution</literal> is generally an archive name like " #| "<literal>stable</literal> or <literal>testing</literal> or a codename " -#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</" -#| "literal> while component is one of <literal>main</literal>, " -#| "<literal>contrib</literal> or <literal>non-free</literal>. The " +#| "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." @@ -7606,8 +7607,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -7617,13 +7618,13 @@ msgstr "" "niveaux, <filename>distribution/composant</filename>. <literal>distribution</" "literal> peut prendre l'une des valeurs suivantes : un nom d'archive tel que " "<literal>stable</literal> ou <literal>testing</literal> ou bien un nom de " -"code comme <literal>&stable-codename;</literal> ou <literal>&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." +"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." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8203,35 +8204,35 @@ msgstr "" #: sources.list.5.xml #, fuzzy, no-wrap #| msgid "" -#| "deb http://ftp.debian.org/debian &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.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 &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8263,27 +8264,28 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" "Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le " -"répertoire debian, et n'utiliser que la section &stable-codename;/contrib." +"répertoire debian, et n'utiliser que la section &debian-stable-codename;/" +"contrib." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +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 &stable-codename; contrib" +#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9069,12 +9071,12 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" "La section <literal>Tree</literal> accepte une étiquette de visée (scope " "tag) qui détermine la variable <literal>$(DIST)</literal> et la racine de " "l'arborescence (le chemin est préfixé par <literal>ArchiveDir</literal>). " -"C'est par exemple : <filename>dists/&stable-codename;</filename>." +"C'est par exemple : <filename>dists/&debian-stable-codename;</filename>." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml @@ -11422,14 +11424,16 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque." #~ msgstr "Exemples :" #~ msgid "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " +#~ "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 " +#~ "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" diff --git a/doc/po/it.po b/doc/po/it.po index b6ddbdaea..520ce2c7d 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2015-12-27 21:26+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -788,19 +788,19 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" "È possibile selezionare una versione specifica di un pacchetto per " "l'installazione scrivendo dopo il nome del pacchetto un segno di uguale (=) " "e la versione del pacchetto da selezionare. In alternativa può essere " "selezionata la versione da un rilascio specifico scrivendo dopo il nome del " -"pacchetto una sbarra («/») e il nome in codice (&stable-codename;, &testing-" -"codename;, sid …) o il nome della suite (stable, testing, unstable). Se " -"necessarie per soddisfare la richiesta, anche le dipendenze del pacchetto in " -"oggetto saranno selezionate da questo rilascio." +"pacchetto una sbarra («/») e il nome in codice (&debian-stable-codename;, " +"&debian-testing-codename;, sid …) o il nome della suite (stable, testing, " +"unstable). Se necessarie per soddisfare la richiesta, anche le dipendenze " +"del pacchetto in oggetto saranno selezionate da questo rilascio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml @@ -4052,14 +4052,14 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" "Il rilascio predefinito da cui installare i pacchetti se è disponibile più " "di una versione. Contiene il nome del rilascio, il nome in codice o la " -"versione del rilascio. Esempi: «stable», «testing», «unstable», «&stable-" -"codename;», «&testing-codename;», «4.0», «5.0*». Vedere anche &apt-" -"preferences;." +"versione del rilascio. Esempi: «stable», «testing», «unstable», «&debian-" +"stable-codename;», «&debian-testing-codename;», «4.0», «5.0*». Vedere anche " +"&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -6561,23 +6561,23 @@ msgstr "" #: apt_preferences.5.xml msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" "Il record seguente assegna una priorità alta a tutte le versioni di " "pacchetto che appartengono ad una qualsiasi distribuzione il cui nome in " -"codice è «<literal>&testing-codename;</literal>»." +"codice è «<literal>&debian-testing-codename;</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -6585,23 +6585,24 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "Il record seguente assegna una priorità alta a tutte le versioni di " "pacchetto che appartengono ad un qualsiasi rilascio il cui nome di archivio " "è «<literal>stable</literal>» e il cui numero di versione del rilascio è " -"«<literal>&stable-version;</literal>»." +"«<literal>&debian-stable-version;</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6960,21 +6961,21 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "Il file <filename>Release</filename> si trova normalmente nella directory " "<filename>.../dists/<replaceable>nome-dist</replaceable></filename>: ad " "esempio, <filename>.../dists/stable/Release</filename> o <filename>.../dists/" -"&stable-codename;/Release</filename>. Consiste di un record su più righe che " -"si applica a <emphasis>tutti</emphasis> i pacchetti nell'albero di directory " -"sottostante alla directory genitrice. A differenza di ciò che avviene per il " -"file <filename>Packages</filename>, quasi tutte le righe in un file " -"<filename>Release</filename> sono importanti per l'impostazione delle " -"priorità di APT:" +"&debian-stable-codename;/Release</filename>. Consiste di un record su più " +"righe che si applica a <emphasis>tutti</emphasis> i pacchetti nell'albero di " +"directory sottostante alla directory genitrice. A differenza di ciò che " +"avviene per il file <filename>Packages</filename>, quasi tutte le righe in " +"un file <filename>Release</filename> sono importanti per l'impostazione " +"delle priorità di APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7013,53 +7014,53 @@ msgstr "la riga <literal>Codename:</literal>" #: apt_preferences.5.xml msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "indica il nome in codice a cui appartengono tutti i pacchetti nell'albero di " -"directory. Per esempio, la riga «Codename: &testing-codename;» specifica che " -"tutti i pacchetti nell'albero di directory sottostante la directory che " -"contiene il file <filename>Release</filename> appartengono ad una versione " -"chiamata <literal>&testing-codename;</literal>. Per specificare questo " -"valore nelle preferenze di APT si deve usare la riga:" +"directory. Per esempio, la riga «Codename: &debian-testing-codename;» " +"specifica che tutti i pacchetti nell'albero di directory sottostante la " +"directory che contiene il file <filename>Release</filename> appartengono ad " +"una versione chiamata <literal>&debian-testing-codename;</literal>. Per " +"specificare questo valore nelle preferenze di APT si deve usare la riga:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap -msgid "Pin: release n=&testing-codename;\n" -msgstr "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" +msgstr "Pin: release n=&debian-testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." msgstr "" "indica la versione del rilascio. Per esempio, i pacchetti nell'albero " -"potrebbero appartenere alla versione &stable-version; del rilascio Debian. " -"Notare che normalmente non esiste un numero di versione per le distribuzioni " -"<literal>testing</literal> e <literal>unstable</literal>, perché non sono " -"ancora state rilasciate. Per specificare questo valore nelle preferenze di " -"APT si deve usare una delle seguenti righe:" +"potrebbero appartenere alla versione &debian-stable-version; del rilascio " +"Debian. Notare che normalmente non esiste un numero di versione per le " +"distribuzioni <literal>testing</literal> e <literal>unstable</literal>, " +"perché non sono ancora state rilasciate. Per specificare questo valore nelle " +"preferenze di APT si deve usare una delle seguenti righe:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7365,9 +7366,9 @@ msgstr "Seguire l'evoluzione di un rilascio in base al nome in codice" #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -7381,9 +7382,9 @@ msgid "" msgstr "" "Explanation: Disinstallare o non installare qualsiasi versione di pacchetto\n" "Explanation: originata da Debian che non sia nella distribuzione con\n" -"Explanation: nome in codice &testing-codename; o sid\n" +"Explanation: nome in codice &debian-testing-codename; o sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable ha sempre il nome in codice side\n" @@ -7427,13 +7428,13 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Con un file &sources-list; adatto e il file di preferenze descritto sopra, " "uno qualsiasi dei seguenti comandi farà sì che APT aggiorni il sistema alle " -"versioni più recenti nel rilascio con nome in codice <literal>&testing-" -"codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" +"versioni più recenti nel rilascio con nome in codice <literal>&debian-" +"testing-codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml @@ -7447,16 +7448,16 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Il comando seguente farà sì che APT aggiorni il pacchetto specificato alla " "più recente versione nella distribuzione <literal>sid</literal>. " "Successivamente, <command>apt-get upgrade</command> aggiornerà il pacchetto " -"alla versione più recente in <literal>&testing-codename;</literal>, se è più " -"nuova di quella installata, altrimenti alla più recente versione in " +"alla versione più recente in <literal>&debian-testing-codename;</literal>, " +"se è più nuova di quella installata, altrimenti alla più recente versione in " "<literal>sid</literal> se è più recente di quella installata. <placeholder " "type=\"programlisting\" id=\"0\"/>" @@ -7662,8 +7663,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -7673,8 +7674,8 @@ msgstr "" "a due livelli, <filename>distribuzione/componente</filename>. " "<literal>distribuzione</literal> è tipicamente un nome di suite come " "<literal>stable</literal> o <literal>testing</literal>, oppure un nome in " -"codice come <literal>&stable-codename;</literal> o <literal>&testing-" -"codename;</literal>; componente è uno tra <literal>main</literal>, " +"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</" @@ -8305,11 +8306,11 @@ msgstr "" #: sources.list.5.xml #, no-wrap msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8317,23 +8318,23 @@ msgstr "" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" @@ -8370,16 +8371,16 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" "Usa FTP per accedere all'archivio in ftp.debian.org, nella directory debian " -"e usa solo l'area &stable-codename;/contrib." +"e usa solo l'area &debian-stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8387,9 +8388,9 @@ msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9168,12 +9169,13 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" "La sezione <literal>Tree</literal> accetta un tag di ambito che imposta la " "variabile <literal>$(DIST)</literal> e definisce la radice dell'albero (il " "percorso viene fatto precedere da <literal>ArchiveDir</literal>). Di solito " -"è un'impostazione simile a <filename>dists/&stable-codename;</filename>." +"è un'impostazione simile a <filename>dists/&debian-stable-codename;</" +"filename>." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml @@ -11484,14 +11486,16 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ msgstr "Alcuni esempi:" #~ msgid "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " +#~ "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 " +#~ "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" diff --git a/doc/po/ja.po b/doc/po/ja.po index 87a7f3cd1..fe8ad868b 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2014-07-10 19:52+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -782,10 +782,10 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" "パッケージにイコール記号とバージョンを続けることで、選択したバージョンのパッ" "ケージをインストールすることができます。つまり、指定のバージョンのパッケージ" @@ -3955,13 +3955,14 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" "ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト" "リリースです。リリース名や、コード名、リリースバージョンがあります。例えば " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*' となります。&apt-preferences; も参照してください。" +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*' となります。&apt-preferences; も参照してく" +"ださい。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -6294,23 +6295,23 @@ msgstr "" #: apt_preferences.5.xml msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" -"以下のレコードは、コード名が \"<literal>&testing-codename;</literal>\" となっ" -"ているディストリビューションに属するパッケージのバージョンを、高い優先度に割" -"り当てます。" +"以下のレコードは、コード名が \"<literal>&debian-testing-codename;</literal>" +"\" となっているディストリビューションに属するパッケージのバージョンを、高い優" +"先度に割り当てます。" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -6318,22 +6319,23 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "以下のレコードは、アーカイブ名が \"<literal>stable</literal>\" で、リリース" -"バージョン番号が \"<literal>&stable-version;</literal>\" となっているリリース" -"に属するパッケージを、すべて高い優先度に割り当てます。" +"バージョン番号が \"<literal>&debian-stable-version;</literal>\" となっている" +"リリースに属するパッケージを、すべて高い優先度に割り当てます。" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6681,20 +6683,20 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "<filename>Release</filename> ファイルは、通常 <filename>.../dists/" "<replaceable>dist-name</replaceable></filename> ディレクトリにあります。例え" "ば、<filename>.../dists/stable/Release</filename> や <filename>.../dists/" -"&stable-codename;/Release</filename> です。これは、このディレクトリ以下にある" -"<emphasis>全</emphasis>パッケージに適用する、複数行のレコード 1 つから成って" -"います。<filename>Packages</filename> ファイルと違い <filename>Release</" -"filename> ファイルは、以下のようにほとんどの行が APT 優先度の設定に関連しま" -"す。" +"&debian-stable-codename;/Release</filename> です。これは、このディレクトリ以" +"下にある<emphasis>全</emphasis>パッケージに適用する、複数行のレコード 1 つか" +"ら成っています。<filename>Packages</filename> ファイルと違い " +"<filename>Release</filename> ファイルは、以下のようにほとんどの行が APT 優先" +"度の設定に関連します。" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -6732,37 +6734,37 @@ msgstr "<literal>Codename:</literal> 行" #: apt_preferences.5.xml msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "このディレクトリツリーに属する全パッケージのコード名です。たとえ" -"ば、\"Codename: &testing-codename;\" という行は、<filename>Release</" +"ば、\"Codename: &debian-testing-codename;\" という行は、<filename>Release</" "filename> ファイルの親ディレクトリツリー以下にある全パッケージが、" -"<literal>&testing-codename;</literal> と名前のついたバージョンであると指定し" -"ます。APT プリファレンスファイルでこの値を指定するには、以下の行が必要になり" -"ます。" +"<literal>&debian-testing-codename;</literal> と名前のついたバージョンであると" +"指定します。APT プリファレンスファイルでこの値を指定するには、以下の行が必要" +"になります。" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap -msgid "Pin: release n=&testing-codename;\n" -msgstr "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" +msgstr "Pin: release n=&debian-testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." msgstr "" "リリースバージョン名です。例えば、このツリーのパッケージが、Debian リリース" -"バージョン &stable-version; に属するとします。通常 <literal>testing</" +"バージョン &debian-stable-version; に属するとします。通常 <literal>testing</" "literal> ディストリビューションや <literal>unstable</literal> ディストリ" "ビューションには、まだリリースされていないので、バージョン番号が付きません。" "APT プリファレンスファイルでこれを指定するには、以下の行のいずれかが必要にな" @@ -6772,13 +6774,13 @@ msgstr "" #: apt_preferences.5.xml #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7078,9 +7080,9 @@ msgstr "コード名リリースの進化の追跡" #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -7093,9 +7095,9 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -7136,12 +7138,12 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "適切な &sources-list; ファイルと上記のプリファレンスファイルにより、以下のコ" -"マンドのいずれかで、リリースコード名が <literal>&testing-codename;</literal> " -"である最新バージョンにアップグレードできます。<placeholder type=" +"マンドのいずれかで、リリースコード名が <literal>&debian-testing-codename;</" +"literal> である最新バージョンにアップグレードできます。<placeholder type=" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> @@ -7156,18 +7158,18 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "以下のコマンドで、指定したパッケージを <literal>sid</literal> ディストリ" "ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-" -"get upgrade</command> は <literal>&testing-codename;</literal> バージョンの" -"パッケージが更新されていれば <literal>&testing-codename;</literal> の最新版" -"に、<literal>sid</literal> バージョンのパッケージが更新されていれば " -"<literal>sid</literal>の最新版にアップグレードします。<placeholder type=" -"\"programlisting\" id=\"0\"/>" +"get upgrade</command> は <literal>&debian-testing-codename;</literal> バー" +"ジョンのパッケージが更新されていれば <literal>&debian-testing-codename;</" +"literal> の最新版に、<literal>sid</literal> バージョンのパッケージが更新され" +"ていれば <literal>sid</literal>の最新版にアップグレードします。<placeholder " +"type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml @@ -7336,9 +7338,9 @@ msgstr "deb タイプと deb-src タイプ" #| "archive, <filename>distribution/component</filename>. The " #| "<literal>distribution</literal> is generally an archive name like " #| "<literal>stable</literal> or <literal>testing</literal> or a codename " -#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</" -#| "literal> while component is one of <literal>main</literal>, " -#| "<literal>contrib</literal> or <literal>non-free</literal>. The " +#| "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." @@ -7347,8 +7349,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -7357,13 +7359,13 @@ msgstr "" "<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ " "<filename>distribution/component</filename> を参照します。" "<literal>distribution</literal> は通常 <literal>stable</literal> や " -"<literal>testing</literal> または <literal>&stable-codename;</literal> や " -"<literal>&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>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> 行は、ソースインデック" +"スを取得するのに必要です。" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7929,35 +7931,35 @@ msgstr "" #: sources.list.5.xml #, fuzzy, no-wrap #| msgid "" -#| "deb http://ftp.debian.org/debian &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.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 &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7989,27 +7991,27 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" "ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の " -"&stable-codename;/contrib のみを使用します。" +"&debian-stable-codename;/contrib のみを使用します。" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +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 &stable-codename; contrib" +#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8772,11 +8774,11 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" "<literal>Tree</literal> セクションは、<literal>$(DIST)</literal> 変数で設定さ" "れているスコープタグをとり、ツリーのルート (<literal>ArchiveDir</literal>が先" -"頭につくパス) を定義します。通常、この設定は <filename>dists/&stable-" +"頭につくパス) を定義します。通常、この設定は <filename>dists/&debian-stable-" "codename;</filename> のようになります。" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -11017,12 +11019,14 @@ msgstr "これで、ディスクにある取得済みのアーカイブを使用 #~ msgstr "例:" #~ msgid "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " +#~ "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 " +#~ "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" #~ " " diff --git a/doc/po/nl.po b/doc/po/nl.po index 79c9af12d..27779f5cf 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.10.1-nl\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2015-10-17 13:21+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -792,10 +792,10 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" "Een specifieke versie van een pakket kiezen voor installatie kan door de " "pakketnaam te laten volgen door een gelijkheidsteken en de te selecteren " @@ -4140,13 +4140,14 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" "De release waarvandaan pakketten standaard geïnstalleerd moeten worden als " "er meer dan een versie van beschikbaar is. Bevat releasenaam, codenaam of " -"releaseversie. Voorbeelden: 'stable', 'testing', 'unstable', '&stable-" -"codename;', '&testing-codename;', '4.0', '5.0*'. Zie ook &apt-preferences;." +"releaseversie. Voorbeelden: 'stable', 'testing', 'unstable', '&debian-stable-" +"codename;', '&debian-testing-codename;', '4.0', '5.0*'. Zie ook &apt-" +"preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -6653,23 +6654,23 @@ msgstr "" #: apt_preferences.5.xml msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" "De volgende structuur kent een hoge prioriteit toe aan alle pakketversies " "die behoren tot om het even welke distributie met de codenaam " -"\"<literal>&testing-codename;</literal>\"." +"\"<literal>&debian-testing-codename;</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -6677,23 +6678,24 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "De volgende structuur kent een hoge prioriteit toe aan alle pakketversies " "die behoren tot om het even welke uitgave die \"<literal>stable</literal>\" " -"als archiefnaam heeft en die \"<literal>&stable-version;</literal>\" als " -"releaseversienummer heeft." +"als archiefnaam heeft en die \"<literal>&debian-stable-version;</literal>\" " +"als releaseversienummer heeft." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -7057,17 +7059,17 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "Het bestand <filename>Release</filename> bevindt zich normaal in de map " "<filename>.../dists/<replaceable>distributienaam</replaceable></filename>, " "bijvoorbeeld <filename>.../dists/stable/Release</filename>, of " -"<filename>.../dists/&stable-codename;/Release</filename>. Het bevat een " -"enkele structuur bestaande uit meerdere regels, die van toepassing is op " +"<filename>.../dists/&debian-stable-codename;/Release</filename>. Het bevat " +"een enkele structuur bestaande uit meerdere regels, die van toepassing is op " "<emphasis>alle</emphasis> pakketten uit de volledige mappenboom die zich " "onder diens bovenliggende map bevindt. In tegenstelling tot wat het geval is " "voor het bestand <filename>Packages</filename>, zijn praktisch alle regels " @@ -7112,53 +7114,53 @@ msgstr "de regel <literal>Codename:</literal>" #: apt_preferences.5.xml msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "benoemt de codenaam waartoe alle pakketten in de mappenboom behoren. De " -"regel \"Codename: &testing-codename;\" geeft bijvoorbeeld aan dat alle " -"pakketten uit de mappenboom die zich onder de bovenliggende map van het " +"regel \"Codename: &debian-testing-codename;\" geeft bijvoorbeeld aan dat " +"alle pakketten uit de mappenboom die zich onder de bovenliggende map van het " "<filename>Release</filename>-bestand bevindt, tot een versie behoren die de " -"naam <literal>&testing-codename;</literal> draagt. Om deze waarde op te " -"geven in het APT-bestand preferences is de volgende regel nodig:" +"naam <literal>&debian-testing-codename;</literal> draagt. Om deze waarde op " +"te geven in het APT-bestand preferences is de volgende regel nodig:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap -msgid "Pin: release n=&testing-codename;\n" -msgstr "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" +msgstr "Pin: release n=&debian-testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." msgstr "" "benoemt de releaseversie. De pakketten uit de boomstructuur zouden " -"bijvoorbeeld kunnen komen uit de Debian releaseversie &stable-version;. Merk " -"op dat er normaal geen versienummer bestaat voor de distributies " -"<literal>testing</literal> en <literal>unstable</literal> omdat ze nog niet " -"uitgegeven werden. Om dit op te geven in het APT-bestand preferences is een " -"van de volgende regels nodig." +"bijvoorbeeld kunnen komen uit de Debian releaseversie &debian-stable-" +"version;. Merk op dat er normaal geen versienummer bestaat voor de " +"distributies <literal>testing</literal> en <literal>unstable</literal> omdat " +"ze nog niet uitgegeven werden. Om dit op te geven in het APT-bestand " +"preferences is een van de volgende regels nodig." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7467,9 +7469,9 @@ msgstr "De evolutie van een uitgave volgen aan de hand van zijn codenaam" #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -7482,10 +7484,10 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Installeer geen van Debian afkomstige pakketversies behalve \n" -"Explanation: die uit de distributie met codenaam &testing-codename; of sid\n" +"Explanation: die uit de distributie met codenaam &debian-testing-codename; of sid\n" "Explanation: of verwijder ze in het andere geval\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable heeft steeds de codenaam sid\n" @@ -7528,14 +7530,14 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Met een passend bestand &sources-list; en het bovenstaande preferences-" "bestand, zal elk van de volgende commando's APT ertoe aanzetten om op te " "waarderen naar de nieuwste versie(s) uit de release met de codenaam " -"<literal>&testing-codename;</literal>. <placeholder type=\"programlisting\" " -"id=\"0\"/>" +"<literal>&debian-testing-codename;</literal>. <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml @@ -7549,19 +7551,19 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Het volgende commando zal APT ertoe bewegen om het opgegeven pakket op te " "waarderen naar de nieuwste versie uit de distributie <literal>sid</literal>. " "Nadien zal de opdracht <command>apt-get upgrade</command> het pakket " -"opwaarderen naar de meest recente versie uit <literal>&testing-codename;</" +"opwaarderen naar de meest recente versie uit <literal>&debian-testing-" +"codename;</literal> indien dat een meer recente versie is dan die welke " +"geïnstalleerd is of anders naar de meest recente versie uit <literal>sid</" "literal> indien dat een meer recente versie is dan die welke geïnstalleerd " -"is of anders naar de meest recente versie uit <literal>sid</literal> indien " -"dat een meer recente versie is dan die welke geïnstalleerd is. <placeholder " -"type=\"programlisting\" id=\"0\"/>" +"is. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml @@ -7734,9 +7736,9 @@ msgstr "De types deb en deb-src" #| "archive, <filename>distribution/component</filename>. The " #| "<literal>distribution</literal> is generally an archive name like " #| "<literal>stable</literal> or <literal>testing</literal> or a codename " -#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</" -#| "literal> while component is one of <literal>main</literal>, " -#| "<literal>contrib</literal> or <literal>non-free</literal>. The " +#| "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." @@ -7745,8 +7747,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -7756,13 +7758,13 @@ msgstr "" "twee niveaus, <filename>distributie/component</filename>. De " "<literal>distributie</literal> is over het algemeen de naam van een archief " "zoals <literal>stable</literal> of <literal>testing</literal> of een " -"codenaam zoals <literal>&stable-codename;</literal> of <literal>&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 onder 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." +"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 " +"onder 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 @@ -8349,35 +8351,35 @@ msgstr "" #: sources.list.5.xml #, fuzzy, no-wrap #| msgid "" -#| "deb http://ftp.debian.org/debian &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.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 &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8409,27 +8411,28 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" "Gebruikt FTP om toegang te krijgen tot het archief op ftp.debian.org onder " -"de map debian en gebruikt er enkel het gebied &stable-codename;/contrib." +"de map debian en gebruikt er enkel het gebied &debian-stable-codename;/" +"contrib." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +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 &stable-codename; contrib" +#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9236,13 +9239,13 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" "De sectie <literal>Tree</literal> werkt met een bereiklabel dat de variabele " "<literal>$(DIST)</literal> instelt en de basis van de boomstructuur " "definieert (vooraan aan het pad wordt <literal>ArchiveDir</literal> " -"toegevoegd). Doorgaans is dat een instelling zoals <filename>dists/&stable-" -"codename;</filename>." +"toegevoegd). Doorgaans is dat een instelling zoals <filename>dists/&debian-" +"stable-codename;</filename>." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml @@ -11613,14 +11616,16 @@ msgstr "" #~ msgstr "Enkele voorbeelden:" #~ msgid "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " +#~ "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 " +#~ "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 "" diff --git a/doc/po/pl.po b/doc/po/pl.po index 82f62ab51..7019e177f 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@ -765,10 +765,10 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" "Konkretna wersja pakietu może być wybrana do zainstalowania przez " "umieszczenie po nazwie pakietu znaku równości, a za nim wybranej wersji " @@ -4099,8 +4099,8 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -5924,23 +5924,23 @@ msgstr "" #: apt_preferences.5.xml msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" "Następujący rekord przypisuje niski priorytet wszystkim wersjom pakietów " "należących do jakiejkolwiek dystrybucji, której nazwą kodową jest " -"\"<literal>&testing-codename;</literal>\"." +"\"<literal>&debian-testing-codename;</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -5948,24 +5948,25 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "Następujący rekord przypisuje wysoki priorytet wszystkim wersjom pakietów " "należącym do jakiegokolwiek wydania, którego pole <literal>Archive</literal> " "(zawierające nazwę archiwum) jest równe \"<literal>stable</literal>\", a " "pole <literal>Version</literal> (numer wersji wydania) wynosi " -"\"<literal>&stable-version;</literal>\"." +"\"<literal>&debian-stable-version;</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6324,17 +6325,17 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "Plik <filename>Release</filename> znajduje się zazwyczaj w " "katalogu<filename>.../dists/<replaceable>nazwa-dystrybucji</replaceable></" "filename>: na przykład <filename>.../dists/stable/Release</filename> lub " -"<filename>.../dists/&stable-codename;/Release</filename>. Składa się z " -"jednego wieloliniowego rekordu, który odnosi się do <emphasis>wszystkich</" +"<filename>.../dists/&debian-stable-codename;/Release</filename>. Składa się " +"z jednego wieloliniowego rekordu, który odnosi się do <emphasis>wszystkich</" "emphasis> pakietów znajdujących się w drzewie katalogów o korzeniu w " "katalogu, w którym znajduje się opisywany plik. W przeciwieństwie do pliku " "<filename>Packages</filename>, prawie wszystkie linie z pliku " @@ -6378,53 +6379,53 @@ msgstr "linia <literal>Codename:</literal>" #: apt_preferences.5.xml msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "nazwa kodowa dystrybucji, do której należą wszystkie pakiety w drzewie " -"katalogów. Na przykład linia \"Codename: &testing-codename;\" mówi, że " -"wszystkie pakiety w drzewie katalogów poniżej katalogu nadrzędnego pliku " -"<filename>Release</filename> należą do wersji nazwanej <literal>&testing-" -"codename;</literal>. Wartość tę można podać w pliku preferencji APT w " -"następujący sposób:" +"katalogów. Na przykład linia \"Codename: &debian-testing-codename;\" mówi, " +"że wszystkie pakiety w drzewie katalogów poniżej katalogu nadrzędnego pliku " +"<filename>Release</filename> należą do wersji nazwanej <literal>&debian-" +"testing-codename;</literal>. Wartość tę można podać w pliku preferencji APT " +"w następujący sposób:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap -msgid "Pin: release n=&testing-codename;\n" -msgstr "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" +msgstr "Pin: release n=&debian-testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." msgstr "" "określa wersję wydania. Na przykład pakiety w drzewie katalogów mogłyby " -"należeć do wersji &stable-version; dystrybucji Debiana. Proszę zauważyć, że " -"zazwyczaj dystrybucje <literal>testing</literal> i <literal>unstable</" -"literal> nie mają przypisanego numeru wersji, ponieważ nie są one oficjalnie " -"wydawane. Wersję wydania można podać w pliku preferencji APT w następujący " -"sposób:" +"należeć do wersji &debian-stable-version; dystrybucji Debiana. Proszę " +"zauważyć, że zazwyczaj dystrybucje <literal>testing</literal> i " +"<literal>unstable</literal> nie mają przypisanego numeru wersji, ponieważ " +"nie są one oficjalnie wydawane. Wersję wydania można podać w pliku " +"preferencji APT w następujący sposób:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -6729,9 +6730,9 @@ msgstr "Śledzenie ewolucji wydania o danej nazwie kodowej" #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -6744,9 +6745,9 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Odinstaluj lub nie instaluj wersji pakietów pochodzących z Debiana\n" -"Explanation: innych niż te w dystrybucji &testing-codename; lub sid\n" +"Explanation: innych niż te w dystrybucji &debian-testing-codename; lub sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable jest zawsze nazwany sid\n" @@ -6789,12 +6790,12 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Z odpowiednim plikiem &sources-list; i z powyższym plikiem preferencji, " "każde z następujących poleceń spowoduje, że APT zaktualizuje pakiety do " -"najnowszych wersji z wydania nazwanego <literal>&testing-codename;</" +"najnowszych wersji z wydania nazwanego <literal>&debian-testing-codename;</" "literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> @@ -6809,16 +6810,16 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Następujące polecenie spowoduje, że APT zaktualizuje podany pakiet do " "najnowszej wersji z dystrybucji <literal>sid</literal>. Od tej pory " "<command>apt-get upgrade</command> będzie aktualizował pakiet do najnowszej " -"wersji z dystrybucji <literal>&testing-codename;</literal>, jeśli ta wersja " -"będzie nowsza od wersji zainstalowanej, lub w przeciwnym wypadku - do " +"wersji z dystrybucji <literal>&debian-testing-codename;</literal>, jeśli ta " +"wersja będzie nowsza od wersji zainstalowanej, lub w przeciwnym wypadku - do " "najnowszej wersji z dystrybucji <literal>sid</literal>, jeśli ta wersja " "będzie nowsza od wersji zainstalowanej. <placeholder type=\"programlisting\" " "id=\"0\"/>" @@ -6993,9 +6994,9 @@ msgstr "Typy deb i deb-src" #| "archive, <filename>distribution/component</filename>. The " #| "<literal>distribution</literal> is generally an archive name like " #| "<literal>stable</literal> or <literal>testing</literal> or a codename " -#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</" -#| "literal> while component is one of <literal>main</literal>, " -#| "<literal>contrib</literal> or <literal>non-free</literal>. The " +#| "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." @@ -7004,8 +7005,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -7014,9 +7015,9 @@ msgstr "" "Typ <literal>deb</literal> opisuje typowe dwupoziomowe archiwum Debiana: " "<filename>dystrybucja/komponent</filename>. Zazwyczaj <literal>dystrybucja</" "literal> jest nazwą archiwum, taką jak: <literal>stable</literal> lub " -"<literal>testing</literal>, albo nazwą kodową, taką jak: <literal>&stable-" -"codename;</literal> lub <literal>&testing-codename;</literal>, a " -"<filename>komponent</filename> jest jednym z: <literal>main</literal>, " +"<literal>testing</literal>, albo nazwą kodową, taką jak: <literal>&debian-" +"stable-codename;</literal> lub <literal>&debian-testing-codename;</literal>, " +"a <filename>komponent</filename> jest jednym z: <literal>main</literal>, " "<literal>contrib</literal> lub <literal>non-free</literal>. Typ <literal>deb-" "src</literal> opisuje lokalizacje kodów źródłowych dystrybucji Debiana i " "używa takiego samego formatu jak typ <literal>deb</literal>. Linia " @@ -7592,35 +7593,35 @@ msgstr "" #: sources.list.5.xml #, fuzzy, no-wrap #| msgid "" -#| "deb http://ftp.debian.org/debian &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.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 &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7652,27 +7653,27 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" "Użycie FTP do uzyskania dostępu do archiwum na komputerze ftp.debian.org w " -"katalogu debian i używa tylko dystrybucji &stable-codename;/contrib." +"katalogu debian i używa tylko dystrybucji &debian-stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +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 &stable-codename; contrib" +#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8311,7 +8312,7 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -10478,14 +10479,16 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku." #~ msgstr "Kilka przykładów:" #~ msgid "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " +#~ "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 " +#~ "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" diff --git a/doc/po/pt.po b/doc/po/pt.po index ddf5e10d9..6c2036de6 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2014-08-29 00:34+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -785,10 +785,10 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" "Pode ser seleccionada para instalação uma versão específica de um pacote ao " "continuar o nome do pacote com um igual (=) e a versão do pacote a " @@ -4057,13 +4057,14 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" "Lançamento predefinido de onde instalar pacotes se existir mais de uma " "versão disponível. Contém o nome do lançamento, nome de código ou versão de " -"lançamento. Exemplos: 'stable', 'testing', 'unstable', '&stable-codename;', " -"'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;." +"lançamento. Exemplos: 'stable', 'testing', 'unstable', '&debian-stable-" +"codename;', '&debian-testing-codename;', '4.0', '5.0*'. Veja também &apt-" +"preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -6494,23 +6495,23 @@ msgstr "" #: apt_preferences.5.xml msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" "O seguinte registo atribui uma alta prioridade a todas as versões de pacotes " "pertencentes a qualquer distribuição cujo nome de código é " -"\"<literal>&testing-codename;</literal>\"." +"\"<literal>&debian-testing-codename;</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -6518,11 +6519,12 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "O seguinte registo atribui alta prioridade a todas as versões de pacotes " "pertencentes a qualquer lançamento cujo nome de Arquivo é \"<literal>stable</" -"literal>\" e cujo número de Versão de lançamento é \"<literal>&stable-" +"literal>\" e cujo número de Versão de lançamento é \"<literal>&debian-stable-" "version;</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> @@ -6530,11 +6532,11 @@ msgstr "" #, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6891,19 +6893,19 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "O ficheiro <filename>Release</filename> fica normalmente no directório " "<filename>.../dists/<replaceable>nome da distribuição</replaceable></" "filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou " -"<filename>.../dists/&stable-codename;/Release</filename>. Consiste num único " -"registo de várias linhas que se aplica a <emphasis>todos</emphasis> os " -"pacotes na árvore de directórios sob o seu pai. Ao contrário do ficheiro " -"<filename>Packages</filename>, quase todas as linhas num ficheiro " +"<filename>.../dists/&debian-stable-codename;/Release</filename>. Consiste " +"num único registo de várias linhas que se aplica a <emphasis>todos</" +"emphasis> os pacotes na árvore de directórios sob o seu pai. Ao contrário do " +"ficheiro <filename>Packages</filename>, quase todas as linhas num ficheiro " "<filename>Release</filename> são relevantes para definir as prioridades do " "APT:" @@ -6944,53 +6946,53 @@ msgstr "a linha <literal>Codename:</literal>" #: apt_preferences.5.xml msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "nomeia o nome de código a qual todos os pacotes na árvore de directórios " -"pertencem. Por exemplo, a linha \"Codename: &testing-codename;\" especifica " -"que todos os pacotes na árvore de directórios abaixo do pai do ficheiro " -"<filename>Release</filename> pertencem a uma versão chamada " -"<literal>&testing-codename;</literal>. Especificar este valor no ficheiro de " -"preferências do APT requer a linha:" +"pertencem. Por exemplo, a linha \"Codename: &debian-testing-codename;\" " +"especifica que todos os pacotes na árvore de directórios abaixo do pai do " +"ficheiro <filename>Release</filename> pertencem a uma versão chamada " +"<literal>&debian-testing-codename;</literal>. Especificar este valor no " +"ficheiro de preferências do APT requer a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap -msgid "Pin: release n=&testing-codename;\n" -msgstr "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" +msgstr "Pin: release n=&debian-testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." msgstr "" "nomeia a versão de lançamento. Por exemplo, os pacotes na árvore podem " -"pertencer ao lançamento de Debian versão &stable-version;. Note que não há " -"normalmente um número de versão para as distribuições <literal>testing</" -"literal> e <literal>unstable</literal>. porque ainda não foram lançadas. " -"Especificar isto no ficheiro de preferências do APT irá requerer uma das " -"seguintes linhas:" +"pertencer ao lançamento de Debian versão &debian-stable-version;. Note que " +"não há normalmente um número de versão para as distribuições " +"<literal>testing</literal> e <literal>unstable</literal>. porque ainda não " +"foram lançadas. Especificar isto no ficheiro de preferências do APT irá " +"requerer uma das seguintes linhas:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -7297,9 +7299,9 @@ msgstr "Acompanhando a evolução de um nome de código de lançamento" #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -7312,9 +7314,9 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explicação: Desinstala ou não instala nenhumas versões de pacotes originais Debian\n" -"Explicação: para além daquelas da distribuição com nome de código &testing-codename; ou sid\n" +"Explicação: para além daquelas da distribuição com nome de código &debian-testing-codename; ou sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explicação: Debian unstable tem sempre o nome de código sid\n" @@ -7357,13 +7359,13 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Com um ficheiro &sources-list; apropriado e o ficheiro de preferências " "acima, qualquer dos seguintes comandos fará com que o APT actualize para a " -"versão mais recente no lançamento com nome de código <literal>&testing-" -"codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" +"versão mais recente no lançamento com nome de código <literal>&debian-" +"testing-codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml @@ -7377,16 +7379,16 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "O seguinte comando irá fazer com que o APT actualize o pacote especificado " "para a versão mais recente da distribuição <literal>sid</literal>. " "Posteriormente, <command>apt-get upgrade</command> irá actualizar o pacote " -"para a versão <literal>&testing-codename;</literal> mais recente se essa for " -"mais recente que a versão instalada, caso contrário, para a versão " +"para a versão <literal>&debian-testing-codename;</literal> mais recente se " +"essa for mais recente que a versão instalada, caso contrário, para a versão " "<literal>sid</literal> mais recente se essa for mais recente que a versão " "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" @@ -7559,9 +7561,9 @@ msgstr "Os tipos deb e deb-src" #| "archive, <filename>distribution/component</filename>. The " #| "<literal>distribution</literal> is generally an archive name like " #| "<literal>stable</literal> or <literal>testing</literal> or a codename " -#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</" -#| "literal> while component is one of <literal>main</literal>, " -#| "<literal>contrib</literal> or <literal>non-free</literal>. The " +#| "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." @@ -7570,8 +7572,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -7581,8 +7583,8 @@ msgstr "" "níveis, <filename>distribution/component</filename>. A " "<literal>distribution</literal> é geralmente um nome de arquivo como " "<literal>stable</literal> ou <literal>testing</literal> ou um nome de código " -"como <literal>&stable-codename;</literal> ou <literal>&testing-codename;</" -"literal> enquanto que componente é um de <literal>main</literal>, " +"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 " @@ -8164,35 +8166,35 @@ msgstr "" #: sources.list.5.xml #, fuzzy, no-wrap #| msgid "" -#| "deb http://ftp.debian.org/debian &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.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 &stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8224,27 +8226,27 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" "Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório debian, e " -"usa apenas a área &stable-codename;/contrib." +"usa apenas a área &debian-stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +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 &stable-codename; contrib" +#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -9031,12 +9033,12 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" "A secção <literal>Tree</literal> recebe uma etiqueta scope que define a " "variável <literal>$(DIST)</literal> e define a raiz da árvore (o caminho é " "prefixado por <literal>ArchiveDir</literal>). Tipicamente esta é uma " -"definição tal como <filename>dists/&stable-codename;</filename>." +"definição tal como <filename>dists/&debian-stable-codename;</filename>." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml @@ -11330,12 +11332,14 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." #~ msgstr "Alguns exemplos:" #~ msgid "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " +#~ "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 " +#~ "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" #~ " " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index d0a24e5bf..ab577698a 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-01-08 21:45+0100\n" +"POT-Creation-Date: 2016-01-14 17:13+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -577,10 +577,10 @@ msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " "to select. Alternatively the version from a specific release can be selected " -"by following the package name with a forward slash (/) and codename (&stable-" -"codename;, &testing-codename;, sid …) or suite name (stable, testing, " -"unstable). This will also select versions from this release for dependencies " -"of this package if needed to satisfy the request." +"by following the package name with a forward slash (/) and codename (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, " +"testing, unstable). This will also select versions from this release for " +"dependencies of this package if needed to satisfy the request." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2846,8 +2846,8 @@ msgstr "" msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " -"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', " -"'4.0', '5.0*'. See also &apt-preferences;." +"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-" +"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4655,8 +4655,8 @@ msgstr "" #, fuzzy msgid "" "The following record assigns a high priority to all package versions " -"belonging to any distribution whose Codename is \"<literal>&testing-codename;" -"</literal>\"." +"belonging to any distribution whose Codename is \"<literal>&debian-testing-" +"codename;</literal>\"." msgstr "" "O registro a seguir atribui uma prioridade baixa para todas as versões de " "pacote que pertençam a qualquer distribuição cujo nome do Repositório seja " @@ -4667,7 +4667,7 @@ msgstr "" #, fuzzy, no-wrap msgid "" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" msgstr "" "<programlisting>\n" @@ -4681,7 +4681,8 @@ msgstr "" msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " -"and whose release Version number is \"<literal>&stable-version;</literal>\"." +"and whose release Version number is \"<literal>&debian-stable-version;</" +"literal>\"." msgstr "" "O registro a seguir atribui uma prioridade alta para todas as versões de " "pacotes que pertençam a qualquer versão cujo nome do Repositório seja " @@ -4693,7 +4694,7 @@ msgstr "" #, fuzzy, no-wrap msgid "" "Package: *\n" -"Pin: release a=stable, v=&stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" "Pin-Priority: 500\n" msgstr "" "<programlisting>\n" @@ -5058,11 +5059,11 @@ msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " "example, <filename>.../dists/stable/Release</filename>, or <filename>.../" -"dists/&stable-codename;/Release</filename>. It consists of a single multi-" -"line record which applies to <emphasis>all</emphasis> of the packages in the " -"directory tree below its parent. Unlike the <filename>Packages</filename> " -"file, nearly all of the lines in a <filename>Release</filename> file are " -"relevant for setting APT priorities:" +"dists/&debian-stable-codename;/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the <filename>Packages</" +"filename> file, nearly all of the lines in a <filename>Release</filename> " +"file are relevant for setting APT priorities:" msgstr "" "O arquivo <filename>Release</filename> é normalmente encontrado no diretório " "<filename>.../dists/<replaceable>nome-distribuição</replaceable></" @@ -5117,11 +5118,11 @@ msgstr "a linha <literal>Component:</literal>" #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " -"For example, the line \"Codename: &testing-codename;\" specifies that all of " -"the packages in the directory tree below the parent of the " -"<filename>Release</filename> file belong to a version named " -"<literal>&testing-codename;</literal>. Specifying this value in the APT " -"preferences file would require the line:" +"For example, the line \"Codename: &debian-testing-codename;\" specifies that " +"all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named <literal>&debian-" +"testing-codename;</literal>. Specifying this value in the APT preferences " +"file would require the line:" msgstr "" "dá nome ao repositório para o qual todos os pacotes na àrvore de diretório " "pertencem. Por exemplo, a linha \"Archive: stable\" especifica que todos os " @@ -5133,7 +5134,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml #, fuzzy, no-wrap -msgid "Pin: release n=&testing-codename;\n" +msgid "Pin: release n=&debian-testing-codename;\n" msgstr "" "<programlisting>\n" "Pin: release a=stable\n" @@ -5143,8 +5144,8 @@ msgstr "" #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian release version &stable-version;. Note that there is " -"normally no version number for the <literal>testing</literal> and " +"belong to Debian release version &debian-stable-version;. Note that there " +"is normally no version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." @@ -5160,9 +5161,9 @@ msgstr "" #: apt_preferences.5.xml #, fuzzy, no-wrap msgid "" -"Pin: release v=&stable-version;\n" -"Pin: release a=stable, v=&stable-version;\n" -"Pin: release &stable-version;\n" +"Pin: release v=&debian-stable-version;\n" +"Pin: release a=stable, v=&debian-stable-version;\n" +"Pin: release &debian-stable-version;\n" msgstr "" "<programlisting>\n" "Pin: release v=3.0\n" @@ -5498,9 +5499,9 @@ msgstr "" #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n" "Package: *\n" -"Pin: release n=&testing-codename;\n" +"Pin: release n=&debian-testing-codename;\n" "Pin-Priority: 900\n" "\n" "Explanation: Debian unstable is always codenamed with sid\n" @@ -5544,7 +5545,7 @@ msgstr "" msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " -"the release codenamed with <literal>&testing-codename;</literal>. " +"the release codenamed with <literal>&debian-testing-codename;</literal>. " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Com um arquivo &sources-list; apropriado e o arquivo de preferências acima, " @@ -5566,10 +5567,10 @@ msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " "<command>apt-get upgrade</command> will upgrade the package to the most " -"recent <literal>&testing-codename;</literal> version if that is more recent " -"than the installed version, otherwise, to the most recent <literal>sid</" -"literal> version if that is more recent than the installed version. " -"<placeholder type=\"programlisting\" id=\"0\"/>" +"recent <literal>&debian-testing-codename;</literal> version if that is more " +"recent than the installed version, otherwise, to the most recent " +"<literal>sid</literal> version if that is more recent than the installed " +"version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "O comando a seguir fará com que o APT atualize o pacote especificado para a " "última versão da distribuição <literal>unstable</literal>. Assim, o comando " @@ -5712,8 +5713,8 @@ msgid "" "archive, <filename>distribution/component</filename>. The " "<literal>distribution</literal> is generally a suite name like " "<literal>stable</literal> or <literal>testing</literal> or a codename like " -"<literal>&stable-codename;</literal> or <literal>&testing-codename;</" -"literal> while component is one of <literal>main</literal>, " +"<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> " @@ -6137,8 +6138,8 @@ msgstr "" #: sources.list.5.xml #, no-wrap msgid "" -"deb http://httpredir.debian.org/debian &stable-codename; main\n" -"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main" +"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -6147,12 +6148,12 @@ msgstr "" msgid "" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "\n" "Types: deb\n" "URIs: http://httpredir.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: main\n" "Architectures: amd64 armel\n" msgstr "" @@ -6184,13 +6185,13 @@ msgstr "" #: sources.list.5.xml msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " -"directory, and uses only the &stable-codename;/contrib area." +"directory, and uses only the &debian-stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml #, no-wrap -msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" +msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> @@ -6199,7 +6200,7 @@ msgstr "" msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" -"Suites: &stable-codename;\n" +"Suites: &debian-stable-codename;\n" "Components: contrib" msgstr "" @@ -6779,7 +6780,7 @@ msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " -"setting such as <filename>dists/&stable-codename;</filename>." +"setting such as <filename>dists/&debian-stable-codename;</filename>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 297939a1c..dcf33a9ba 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -126,7 +126,7 @@ archive, <filename>distribution/component</filename>. The <literal>distribution</literal> is generally a suite name like <literal>stable</literal> or <literal>testing</literal> or a codename like - <literal>&stable-codename;</literal> or <literal>&testing-codename;</literal> + <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 @@ -429,16 +429,16 @@ Components: main contrib non-free</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> - <literallayout>deb http://httpredir.debian.org/debian &stable-codename; main -deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main</literallayout> + <literallayout>deb http://httpredir.debian.org/debian &debian-stable-codename; main +deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main</literallayout> <literallayout>Types: deb URIs: http://httpredir.debian.org/debian -Suites: &stable-codename; +Suites: &debian-stable-codename; Components: main Types: deb URIs: http://httpredir.debian.org/debian -Suites: &stable-codename; +Suites: &debian-stable-codename; Components: main Architectures: amd64 armel </literallayout> @@ -452,11 +452,11 @@ Suites: hamm Components: main</literallayout> <para>Uses FTP to access the archive at ftp.debian.org, under the debian - directory, and uses only the &stable-codename;/contrib area.</para> - <literallayout>deb ftp://ftp.debian.org/debian &stable-codename; contrib</literallayout> + directory, and uses only the &debian-stable-codename;/contrib area.</para> + <literallayout>deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib</literallayout> <literallayout>Types: deb URIs: ftp://ftp.debian.org/debian -Suites: &stable-codename; +Suites: &debian-stable-codename; Components: contrib</literallayout> <para>Uses FTP to access the archive at ftp.debian.org, under the debian |