change debian related entities to a more explicit name

Git-Dch: Ignore

1 files changed, 42 insertions, 40 deletions

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>