diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/apt-cdrom.8.xml | 10 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 8 | ||||
| -rw-r--r-- | doc/po/de.po | 10 | ||||
| -rw-r--r-- | doc/po/es.po | 10 | ||||
| -rw-r--r-- | doc/po/fr.po | 10 | ||||
| -rw-r--r-- | doc/po/it.po | 14 | ||||
| -rw-r--r-- | doc/po/ja.po | 10 | ||||
| -rw-r--r-- | doc/po/pl.po | 14 | ||||
| -rw-r--r-- | doc/po/pt.po | 10 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 14 |
11 files changed, 57 insertions, 55 deletions
diff --git a/debian/changelog b/debian/changelog index 9951ea879..8c4ec4f27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,11 @@ apt (0.9.5.2) UNRELEASED; urgency=low * cmdline/apt-get.cc: - do not show 'list of broken packages' header if no package is broken as it happens e.g. for external resolver errors + [ Justin B Rye ] * doc/apt-cdrom.8.xml: - replace CDROM with the proper CD-ROM in text + - correct disc vs. disk issues -- David Kalnischkies <kalnischkies@gmail.com> Thu, 24 May 2012 19:40:58 +0200 diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index f5e393446..6030721e7 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -44,7 +44,7 @@ <para>It is necessary to use <command>apt-cdrom</command> to add CDs to the APT system; - it cannot be done by hand. Furthermore each disk in a multi-CD set must be + it cannot be done by hand. Furthermore each disc in a multi-CD set must be inserted and scanned separately to account for possible mis-burns. </para> @@ -55,9 +55,9 @@ <varlistentry><term><option>add</option></term> <listitem><para><literal>add</literal> is used to add a new disc to the source list. It will unmount the - CD-ROM device, prompt for a disk to be inserted and then proceed to + CD-ROM device, prompt for a disc to be inserted and then proceed to scan it and copy the index files. If the disc does not have a proper - <filename>disk</filename> directory you will be prompted for a descriptive + <filename>.disk</filename> directory you will be prompted for a descriptive title. </para> @@ -91,8 +91,8 @@ </varlistentry> <varlistentry><term><option>-r</option></term><term><option>--rename</option></term> - <listitem><para>Rename a disc; change the label of a disk or override the - disks given label. This option will cause <command>apt-cdrom</command> to + <listitem><para>Rename a disc; change the label of a disc or override the + disc's given label. This option will cause <command>apt-cdrom</command> to prompt for a new label. Configuration Item: <literal>APT::CDROM::Rename</literal>. </para> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index af1b01e13..afd0d256c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -1087,7 +1087,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" @@ -1095,9 +1095,9 @@ msgstr "" #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" @@ -1132,7 +1132,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given " +"Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " "new label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index fd1a634ca..8da5d2736 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1443,7 +1443,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" "Es ist notwendig, <command>apt-cdrom</command> zu benutzen, um CDs zum APT-" @@ -1455,15 +1455,15 @@ msgstr "" #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" "<literal>add</literal> wird benutzt, um ein neues Medium zur Quellenliste " "hinzuzufügen. Es wird das CD-ROM-Gerät aushängen, verlangen, dass ein Medium " "eingelegt wird und dann mit den Einlesen und Kopieren der Indexdateien " -"fortfahren. Wenn das Medium kein angemessenes <filename>disk</filename>-" +"fortfahren. Wenn das Medium kein angemessenes <filename>.disk</filename>-" "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1506,7 +1506,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given label. " +"Rename a disc; change the label of a disc or override the disc's given label. " "This option will cause <command>apt-cdrom</command> to prompt for a new " "label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" diff --git a/doc/po/es.po b/doc/po/es.po index a80aed85b..efd8f3c49 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -1509,7 +1509,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" "Es necesario usar <command>apt-cdrom</command> para añadir los discos al " @@ -1521,15 +1521,15 @@ msgstr "" #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" "<literal>add</literal> añade un disco nuevo a la lista de fuentes. " "Desmontará el dispositivo del disco y pedirá que se inserte un disco para " "iniciar el análisis y copiado de los ficheros de índice. Si el disco no " -"contiene un directorio <filename>disk</filename> apropiado, se le pedirá un " +"contiene un directorio <filename>.disk</filename> apropiado, se le pedirá un " "título descriptivo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1572,7 +1572,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given label. " +"Rename a disc; change the label of a disc or override the disc's given label. " "This option will cause <command>apt-cdrom</command> to prompt for a new " "label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index fb15cda6d..6c23da59b 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -1467,7 +1467,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" "Il est nécessaire d'utiliser <command>apt-cdrom</command> pour ajouter des " @@ -1479,15 +1479,15 @@ msgstr "" #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" "La commande <literal>add</literal> est utilisée pour ajouter un nouveau " "disque à la liste des sources. Elle démonte le CD, réclame l'insertion d'un " "disque, parcourt ensuite le disque et copie les fichiers d'index. Si le " -"disque ne possède pas de répertoire <filename>disk/</filename> correct, un " +"disque ne possède pas de répertoire <filename>.disk</filename> correct, un " "titre descriptif est demandé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1530,7 +1530,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given label. " +"Rename a disc; change the label of a disc or override the disc's given label. " "This option will cause <command>apt-cdrom</command> to prompt for a new " "label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" diff --git a/doc/po/it.po b/doc/po/it.po index 16d12cbde..ebc25fad6 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2012-05-24 17:24+0300\n" +"POT-Creation-Date: 2012-05-25 10:28+0300\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -1064,7 +1064,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" @@ -1072,9 +1072,9 @@ msgstr "" #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" @@ -1109,9 +1109,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given label. " -"This option will cause <command>apt-cdrom</command> to prompt for a new " -"label. Configuration Item: <literal>APT::CDROM::Rename</literal>." +"Rename a disc; change the label of a disc or override the disc's given " +"label. This option will cause <command>apt-cdrom</command> to prompt for a " +"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> diff --git a/doc/po/ja.po b/doc/po/ja.po index b5337f1ad..92949fd4e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -1516,7 +1516,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" "APT システムに手作業で CD を追加するのは難しいため、<command>apt-cdrom</" @@ -1527,14 +1527,14 @@ msgstr "" #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" "<literal>add</literal> は、新しいディスクを取得元リストに追加します。CD-ROM デ" "バイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャン" -"とインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</" +"とインデックスファイルのコピーを行います。ディスクに正しい <filename>.disk</" "filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@ -1581,7 +1581,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given label. " +"Rename a disc; change the label of a disc or override the disc's given label. " "This option will cause <command>apt-cdrom</command> to prompt for a new " "label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" diff --git a/doc/po/pl.po b/doc/po/pl.po index e6398a117..94834a21c 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -1546,7 +1546,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" "Dodanie nowych CD do systemu APT nie może być zrobione ręcznie, tak więc " @@ -1559,21 +1559,21 @@ msgstr "" #, fuzzy #| msgid "" #| "<literal>add</literal> is used to add a new disc to the source list. It " -#| "will unmount the CD-ROM device, prompt for a disk to be inserted and then " +#| "will unmount the CD-ROM device, prompt for a disc to be inserted and then " #| "procceed to scan it and copy the index files. If the disc does not have a " -#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "proper <filename>.disk</filename> directory you will be prompted for a " #| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" "<literal>add</literal> jest używane do dodania nowego dysku do listy źródeł. " "<literal>add</literal> odmontuje urządzenie CD-ROM, poprosi o włożenie dysku, " "a następnie zeskanuje go i skopiuje pliki indeksu. Jeżeli dysk nie ma " -"właściwego katalogu <filename>disk</filename>, użytkownik zostanie " +"właściwego katalogu <filename>.disk</filename>, użytkownik zostanie " "poproszony o podanie opisu dysku." # @@ -1620,7 +1620,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given label. " +"Rename a disc; change the label of a disc or override the disc's given label. " "This option will cause <command>apt-cdrom</command> to prompt for a new " "label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 1efe1eaaa..7001c343b 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -1468,7 +1468,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" "É necessário usar o <command>apt-cdrom</command> para adicionar CDs ao " @@ -1480,15 +1480,15 @@ msgstr "" #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" "<literal>add</literal> é usado para adicionar um novo disco à lista de " "fontes. Irá desmontar o dispositivo CD-ROM, pedir que seja inserido um disco " "e depois prosseguir com a sua sondagem e cópia dos ficheiros índice. Se o " -"disco não possuir um directório <filename>disk</filename> apropriado, ser-" +"disco não possuir um directório <filename>.disk</filename> apropriado, ser-" "lhe-à pedido um título descritivo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1531,7 +1531,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given label. " +"Rename a disc; change the label of a disc or override the disc's given label. " "This option will cause <command>apt-cdrom</command> to prompt for a new " "label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 0362d3aa9..3828a9f32 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2012-05-24 17:24+0300\n" +"POT-Creation-Date: 2012-05-25 10:28+0300\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" @@ -1112,7 +1112,7 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system; it cannot be done by hand. Furthermore each disk in a multi-CD set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" @@ -1120,9 +1120,9 @@ msgstr "" #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CD-ROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" @@ -1157,9 +1157,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given label. " -"This option will cause <command>apt-cdrom</command> to prompt for a new " -"label. Configuration Item: <literal>APT::CDROM::Rename</literal>." +"Rename a disc; change the label of a disc or override the disc's given " +"label. This option will cause <command>apt-cdrom</command> to prompt for a " +"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |