From 2ffd35359fffac0ae9ac1def06237324b7204c97 Mon Sep 17 00:00:00 2001 From: Beatrice Torracca Date: Sun, 27 Dec 2015 22:25:25 +0100 Subject: fix 3 typos/omissions in apt.conf(5) Closes: 809160 --- doc/po/apt-doc.pot | 25 +++++++++++++------------ doc/po/de.po | 29 +++++++++++++++-------------- doc/po/es.po | 29 +++++++++++++++-------------- doc/po/fr.po | 29 +++++++++++++++-------------- doc/po/it.po | 29 +++++++++++++++-------------- doc/po/ja.po | 29 +++++++++++++++-------------- doc/po/nl.po | 29 +++++++++++++++-------------- doc/po/pl.po | 29 +++++++++++++++-------------- doc/po/pt.po | 29 +++++++++++++++-------------- doc/po/pt_BR.po | 29 +++++++++++++++-------------- 10 files changed, 148 insertions(+), 138 deletions(-) (limited to 'doc/po') diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 2fc1c1859..2100885bd 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.1.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3496,11 +3496,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL " "or " "Acquire::Changelogs::URI::Override::Origin::ORIGIN. " -"The value should be a normal URI to a text file, expect that package " +"The value should be a normal URI to a text file, except that package " "specific data is replaced with the placeholder " "@CHANGEPATH@. The value for it is: 1. if the package is " "from a component (e.g. main) this is the first part " -"otherwise it is omitted, 2. the first letter of source package name, expect " +"otherwise it is omitted, 2. the first letter of source package name, except " "if the source package name starts with 'lib' in which " "case it will be the first four letters. 3. The complete source package " "name. 4. the complete name again and 5. the source version. The first (if " @@ -3744,14 +3744,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:1 msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -3759,7 +3760,7 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that " +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " "\"none\" is an incorrect typename which is just kept to remain compatible, " "it should be read as \"no\" and users are encouraged to support both." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 42968b4cb..7de3dc7e1 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2014-09-14 14:46+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -5056,11 +5056,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -5397,14 +5397,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -5412,9 +5413,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: diff --git a/doc/po/es.po b/doc/po/es.po index c165aee04..3de64fe66 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -5098,11 +5098,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -5453,14 +5453,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -5468,9 +5469,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: diff --git a/doc/po/fr.po b/doc/po/fr.po index f83672420..181a8e95a 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2014-11-15 17:26+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" @@ -5046,11 +5046,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -5387,14 +5387,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -5402,9 +5403,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: diff --git a/doc/po/it.po b/doc/po/it.po index 8a095fa76..76ec8cd64 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2015-01-27 14:11+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" @@ -5073,11 +5073,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -5412,14 +5412,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -5427,9 +5428,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: diff --git a/doc/po/ja.po b/doc/po/ja.po index 0d76df2c2..fe72113df 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2014-07-10 19:52+0900\n" "Last-Translator: KURASAWA Nozomu \n" "Language-Team: Debian Japanese List \n" @@ -4882,11 +4882,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -5209,14 +5209,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -5224,9 +5225,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: diff --git a/doc/po/nl.po b/doc/po/nl.po index 7b28fba15..686fd1466 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2015-10-17 13:21+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -5137,11 +5137,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -5482,14 +5482,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -5497,9 +5498,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: diff --git a/doc/po/pl.po b/doc/po/pl.po index bee272958..3dc3c3f85 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda \n" "Language-Team: Polish \n" @@ -4719,11 +4719,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -4964,14 +4964,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -4979,9 +4980,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: diff --git a/doc/po/pt.po b/doc/po/pt.po index b1ed07ae2..c6a1f07c6 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2014-08-29 00:34+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -5027,11 +5027,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -5362,14 +5362,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -5377,9 +5378,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index b6f86b955..c72ad6013 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 \n" -"POT-Creation-Date: 2015-12-27 19:16+0100\n" +"POT-Creation-Date: 2015-12-27 22:52+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes \n" "Language-Team: \n" @@ -3466,11 +3466,11 @@ msgid "" "Acquire::Changelogs::URI::Override::Label::LABEL or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " -"normal URI to a text file, expect that package specific data is replaced " +"normal URI to a text file, except that package specific data is replaced " "with the placeholder @CHANGEPATH@. The value for it is: " "1. if the package is from a component (e.g. main) this " "is the first part otherwise it is omitted, 2. the first letter of source " -"package name, expect if the source package name starts with 'liblib' in which case it will be the first four letters. 3. The complete " "source package name. 4. the complete name again and 5. the source version. " "The first (if present), second, third and fourth part are separated by a " @@ -3709,14 +3709,15 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml msgid "" -"Package action lines consist of five fields in Version 2: old version, " -"direction of version change (< for upgrades, > for downgrades, = for " -"no change), new version, action. The version fields are \"-\" for no version " -"at all (for example when installing a package for the first time; no version " -"is treated as earlier than any real version, so that is an upgrade, " -"indicated as - < 1.23.4). The action field is " -"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it " -"is being removed, or the filename of a .deb file if it is being unpacked." +"Package action lines consist of five fields in Version 2: package name " +"(without architecture qualification even if foreign), old version, direction " +"of version change (< for upgrades, > for downgrades, = for no change), " +"new version, action. The version fields are \"-\" for no version at all (for " +"example when installing a package for the first time; no version is treated " +"as earlier than any real version, so that is an upgrade, indicated as " +"- < 1.23.4). The action field is \"**CONFIGURE**\" if " +"the package is being configured, \"**REMOVE**\" if it is being removed, or " +"the filename of a .deb file if it is being unpacked." msgstr "" #. type: Content of: @@ -3724,9 +3725,9 @@ msgstr "" msgid "" "In Version 3 after each version field follows the architecture of this " "version, which is \"-\" if there is no version, and a field showing the " -"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none" -"\" is an incorrect typename which is just kept to remain compatible, it " -"should be read as \"no\" and users are encouraged to support both." +"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that " +"\"none\" is an incorrect typename which is just kept to remain compatible, " +"it should be read as \"no\" and users are encouraged to support both." msgstr "" #. type: Content of: -- cgit v1.2.3