summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/el/bookinfo.po8
-rw-r--r--po/el/boot-installer.po4
-rw-r--r--po/el/boot-new.po16
-rw-r--r--po/el/hardware.po44
-rw-r--r--po/el/install-methods.po32
-rw-r--r--po/el/installation-howto.po4
-rw-r--r--po/el/partitioning.po12
-rw-r--r--po/el/post-install.po12
-rw-r--r--po/el/preface.po8
-rw-r--r--po/el/preparing.po56
-rw-r--r--po/el/random-bits.po34
-rw-r--r--po/el/using-d-i.po20
-rw-r--r--po/el/welcome.po22
-rw-r--r--po/fi/bookinfo.po8
-rw-r--r--po/fi/boot-installer.po4
-rw-r--r--po/fi/boot-new.po16
-rw-r--r--po/fi/hardware.po40
-rw-r--r--po/fi/install-methods.po32
-rw-r--r--po/fi/installation-howto.po4
-rw-r--r--po/fi/partitioning.po12
-rw-r--r--po/fi/post-install.po8
-rw-r--r--po/fi/preface.po8
-rw-r--r--po/fi/preparing.po52
-rw-r--r--po/fi/random-bits.po36
-rw-r--r--po/fi/using-d-i.po18
-rw-r--r--po/fi/welcome.po24
-rw-r--r--po/hu/bookinfo.po8
-rw-r--r--po/hu/boot-installer.po2
-rw-r--r--po/hu/boot-new.po16
-rw-r--r--po/hu/hardware.po48
-rw-r--r--po/hu/install-methods.po32
-rw-r--r--po/hu/installation-howto.po4
-rw-r--r--po/hu/partitioning.po10
-rw-r--r--po/hu/post-install.po6
-rw-r--r--po/hu/preface.po8
-rw-r--r--po/hu/preparing.po58
-rw-r--r--po/hu/random-bits.po40
-rw-r--r--po/hu/using-d-i.po18
-rw-r--r--po/hu/welcome.po22
-rw-r--r--po/ja/bookinfo.po8
-rw-r--r--po/ja/boot-installer.po28
-rw-r--r--po/ja/boot-new.po16
-rw-r--r--po/ja/hardware.po52
-rw-r--r--po/ja/install-methods.po36
-rw-r--r--po/ja/installation-howto.po4
-rw-r--r--po/ja/partitioning.po12
-rw-r--r--po/ja/post-install.po12
-rw-r--r--po/ja/preface.po8
-rw-r--r--po/ja/preparing.po56
-rw-r--r--po/ja/random-bits.po40
-rw-r--r--po/ja/using-d-i.po18
-rw-r--r--po/ja/welcome.po24
-rw-r--r--po/ko/bookinfo.po8
-rw-r--r--po/ko/boot-installer.po32
-rw-r--r--po/ko/boot-new.po20
-rw-r--r--po/ko/hardware.po52
-rw-r--r--po/ko/install-methods.po32
-rw-r--r--po/ko/installation-howto.po4
-rw-r--r--po/ko/partitioning.po16
-rw-r--r--po/ko/preface.po10
-rw-r--r--po/ko/preparing.po66
-rw-r--r--po/ko/random-bits.po40
-rw-r--r--po/ko/using-d-i.po16
-rw-r--r--po/ko/welcome.po28
-rw-r--r--po/nn/bookinfo.po8
-rw-r--r--po/nn/preface.po8
-rw-r--r--po/pt/bookinfo.po8
-rw-r--r--po/pt/boot-installer.po28
-rw-r--r--po/pt/boot-new.po16
-rw-r--r--po/pt/hardware.po52
-rw-r--r--po/pt/install-methods.po36
-rw-r--r--po/pt/installation-howto.po4
-rw-r--r--po/pt/partitioning.po12
-rw-r--r--po/pt/post-install.po12
-rw-r--r--po/pt/preface.po8
-rw-r--r--po/pt/preparing.po60
-rw-r--r--po/pt/random-bits.po40
-rw-r--r--po/pt/using-d-i.po20
-rw-r--r--po/pt/welcome.po24
-rw-r--r--po/ro/bookinfo.po8
-rw-r--r--po/ro/preface.po8
-rw-r--r--po/ro/using-d-i.po14
-rw-r--r--po/ro/welcome.po22
-rw-r--r--po/ru/bookinfo.po8
-rw-r--r--po/ru/boot-installer.po4
-rw-r--r--po/ru/boot-new.po16
-rw-r--r--po/ru/hardware.po44
-rw-r--r--po/ru/install-methods.po32
-rw-r--r--po/ru/installation-howto.po4
-rw-r--r--po/ru/partitioning.po12
-rw-r--r--po/ru/post-install.po12
-rw-r--r--po/ru/preface.po8
-rw-r--r--po/ru/preparing.po56
-rw-r--r--po/ru/random-bits.po36
-rw-r--r--po/ru/using-d-i.po18
-rw-r--r--po/ru/welcome.po24
-rw-r--r--po/sv/bookinfo.po8
-rw-r--r--po/sv/boot-installer.po28
-rw-r--r--po/sv/boot-new.po16
-rw-r--r--po/sv/hardware.po52
-rw-r--r--po/sv/install-methods.po36
-rw-r--r--po/sv/installation-howto.po4
-rw-r--r--po/sv/partitioning.po12
-rw-r--r--po/sv/post-install.po12
-rw-r--r--po/sv/preface.po8
-rw-r--r--po/sv/preparing.po60
-rw-r--r--po/sv/random-bits.po36
-rw-r--r--po/sv/using-d-i.po20
-rw-r--r--po/sv/welcome.po24
-rw-r--r--po/tl/bookinfo.po8
-rw-r--r--po/tl/preface.po8
-rw-r--r--po/tl/welcome.po22
-rw-r--r--po/vi/bookinfo.po8
-rw-r--r--po/vi/boot-installer.po4
-rw-r--r--po/vi/boot-new.po16
-rw-r--r--po/vi/hardware.po52
-rw-r--r--po/vi/install-methods.po36
-rw-r--r--po/vi/installation-howto.po4
-rw-r--r--po/vi/partitioning.po12
-rw-r--r--po/vi/post-install.po12
-rw-r--r--po/vi/preface.po8
-rw-r--r--po/vi/preparing.po54
-rw-r--r--po/vi/random-bits.po36
-rw-r--r--po/vi/using-d-i.po20
-rw-r--r--po/vi/welcome.po24
-rw-r--r--po/zh_CN/bookinfo.po8
-rw-r--r--po/zh_CN/boot-installer.po4
-rw-r--r--po/zh_CN/boot-new.po16
-rw-r--r--po/zh_CN/hardware.po44
-rw-r--r--po/zh_CN/install-methods.po32
-rw-r--r--po/zh_CN/installation-howto.po4
-rw-r--r--po/zh_CN/partitioning.po12
-rw-r--r--po/zh_CN/post-install.po12
-rw-r--r--po/zh_CN/preface.po8
-rw-r--r--po/zh_CN/preparing.po52
-rw-r--r--po/zh_CN/random-bits.po36
-rw-r--r--po/zh_CN/using-d-i.po20
-rw-r--r--po/zh_CN/welcome.po24
-rw-r--r--po/zh_TW/bookinfo.po8
-rw-r--r--po/zh_TW/boot-installer.po20
-rw-r--r--po/zh_TW/boot-new.po16
-rw-r--r--po/zh_TW/hardware.po28
-rw-r--r--po/zh_TW/install-methods.po32
-rw-r--r--po/zh_TW/installation-howto.po6
-rw-r--r--po/zh_TW/partitioning.po12
-rw-r--r--po/zh_TW/post-install.po6
-rw-r--r--po/zh_TW/preface.po8
-rw-r--r--po/zh_TW/preparing.po52
-rw-r--r--po/zh_TW/random-bits.po34
-rw-r--r--po/zh_TW/using-d-i.po16
-rw-r--r--po/zh_TW/welcome.po22
151 files changed, 1639 insertions, 1639 deletions
diff --git a/po/el/bookinfo.po b/po/el/bookinfo.po
index 793718743..affc7112f 100644
--- a/po/el/bookinfo.po
+++ b/po/el/bookinfo.po
@@ -25,20 +25,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "Οδηγός Εγκατάστασης &debian;"
+msgid "&debian-gnu; Installation Guide"
+msgstr "Οδηγός Εγκατάστασης &debian-gnu;"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Το κείμενο αυτό περιέχει οδηγίες για το σύστημα &debian; &release; για την "
+"Το κείμενο αυτό περιέχει οδηγίες για το σύστημα &debian-gnu; &release; για την "
"αρχιτεκτονική &arch-title; (<quote>&architecture;</quote>). Περιέχει επίσης "
"δείκτες σε επιπλέον πληροφορίες και πληροφορία σχετικά με το πώς να "
"αξιοποιήσετε κατά τον καλύτερο δυνατό τρόπο το καινούριο σας σύστημα Debian."
diff --git a/po/el/boot-installer.po b/po/el/boot-installer.po
index b7d531ae9..c34cd7673 100644
--- a/po/el/boot-installer.po
+++ b/po/el/boot-installer.po
@@ -576,11 +576,11 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
"Μετά την εκκίνηση του προγράμματος, θα σας γίνουν μερικές προκαταρκτικές "
"ερωτήσεις και το σύστημα θα προετοιμαστεί για την εκκίνηση του εγκαταστάτη "
-"του &debian;."
+"του &debian-gnu;."
#. Tag: title
#: boot-installer.xml:496
diff --git a/po/el/boot-new.po b/po/el/boot-new.po
index d22195ef6..8eee00040 100644
--- a/po/el/boot-new.po
+++ b/po/el/boot-new.po
@@ -209,12 +209,12 @@ msgstr "Συστήματα NewWorld PowerMac"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"Σε μηχανήματα G4 και iBook, μπορείτε να κρατήσετε κάτω το πλήκτρο "
"<keycap>option</keycap> για να βρεθείτε σε μια γραφική οθόνη με ένα κουμπί "
-"για κάθε εκκινήσιμο λειτουργικό σύστημα &debian; Το Debian θα είναι το "
+"για κάθε εκκινήσιμο λειτουργικό σύστημα &debian-gnu; Το Debian θα είναι το "
"πλήκτρο με το εικονίδιο ενός μικρού πιγκουίνου."
#. Tag: para
@@ -249,16 +249,16 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
"Επαναφορά του OpenFirmware σε μηχανήματα G3 ή G4 θα προκαλέσουν την αυτόματη "
-"εκκίνηση του &debian; (εφόσον έχετε κάνει σωστή κατάτμηση του δίσκου και "
-"έχετε τοποθετήσει το τμήμα Apple_Bootstrap στην αρχή). Αν έχετε το &debian; "
+"εκκίνηση του &debian-gnu; (εφόσον έχετε κάνει σωστή κατάτμηση του δίσκου και "
+"έχετε τοποθετήσει το τμήμα Apple_Bootstrap στην αρχή). Αν έχετε το &debian-gnu; "
"σε ένα δίσκο SCSI και το MacOS σε ένα δίσκο IDE αυτό μπορεί να μην "
"δουλέψει οπότε θα πρέπει να μπείτε στο OpenFirmware και να ρυθμίσετε την "
"μεταβλητή <envar>boot-device</envar>. Η εντολή <command>ybin</command> "
@@ -268,13 +268,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"Αφού έχετε ξεκινήσει για πρώτη φορά το &debian; μπορείτε να προσθέσετε "
+"Αφού έχετε ξεκινήσει για πρώτη φορά το &debian-gnu; μπορείτε να προσθέσετε "
"οποιεσδήποτε άλλες επιπλέον επιλογές θέλετε (για παράδειγμα την επιλογή για "
"διπλή εκκίνηση) στο αρχείο <filename>/etc/yaboot.conf</filename> και να "
"τρέξετε την εντολή <command>ybin</command> για να ενημερώσετε την εκκινήσιμη "
diff --git a/po/el/hardware.po b/po/el/hardware.po
index 6477405c4..fc1e56032 100644
--- a/po/el/hardware.po
+++ b/po/el/hardware.po
@@ -52,7 +52,7 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"To Debian δεν βάζει κάποιες απαιτήσεις υλικού πέρα από αυτές που έχουν ο "
"πυρήνας του Linux και τα εργαλεία του GNU. Κατά συνέπεια οποιαδήποτε "
@@ -61,7 +61,7 @@ msgstr ""
"του Debian μπορεί να τρέξει το Debian. Παρακαλούμε, δείτε τις σελίδες των "
"υλοποιήσεων (Ports) στο <ulink url=\"&url-ports;\"></ulink> για περισσότερες "
"λεπτομέρειες για συστήματα της αρχιτεκτονικής &arch-title; που έχουν "
-"δοκιμαστεί με το &debian;."
+"δοκιμαστεί με το &debian-gnu;."
#. Tag: para
#: hardware.xml:32
@@ -481,7 +481,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -490,7 +490,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"Αυτή είναι η πρώτη επίσημη έκδοση του &debian; για την αρχιτεκτονική &arch-"
+"Αυτή είναι η πρώτη επίσημη έκδοση του &debian-gnu; για την αρχιτεκτονική &arch-"
"title; Αισθανόμαστε ότι έχει δοκιμαστεί αρκετά ώστε να κυκλοφορήσει. Όμως "
"επειδή δεν έχει την έκθεση (και άρα την δοκιμασία από τους χρήστες) που "
"έχουν κάποιες άλλες αρχιτεκτονικές ίσως συναντήσετε μερικά προβλήματα. "
@@ -929,10 +929,10 @@ msgstr "Μηχανήματα Cobalt χρησιμοποιούν ρυθμό 115200
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"Για το &debian; &release; υποστηρίζονται μόνo οι υποαρχιτεκτονικές PMac "
+"Για το &debian-gnu; &release; υποστηρίζονται μόνo οι υποαρχιτεκτονικές PMac "
"(Power-Macintosh ή PowerMac) και PreP."
#. Tag: title
@@ -2098,11 +2098,11 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
"Διεπαφές καρτών ασύρματου δικτύου (NIC) που δεν υποστηρίζονται από τον "
-"επίσημο πυρήνα του &arch-kernel; μπορούν γενικά να δουλέψουν με το &debian;, αλλά "
+"επίσημο πυρήνα του &arch-kernel; μπορούν γενικά να δουλέψουν με το &debian-gnu;, αλλά "
"δεν υποστηρίζονται στη διάρκεια της εγκατάστασης."
#. Tag: para
@@ -2123,7 +2123,7 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
@@ -2131,7 +2131,7 @@ msgid ""
msgstr ""
"Αν υπάρχει κάποιο πρόβλημα με την ασύρματη σύνδεσή σας και δεν υπάρχει άλλη "
"διεπαφή δικτύου (NIC) που να μπορεί να χρησιμοποιηθεί στη διάρκεια της "
-"εγκατάστασης, υπάρχει ακόμα η δυνατότητα εγκατάστασης του &debian; "
+"εγκατάστασης, υπάρχει ακόμα η δυνατότητα εγκατάστασης του &debian-gnu; "
"χρησιμοποιώντας μια πλήρη εικόνα CD-ROM ή DVD. Επιλέξτε να μην γίνει ρύθμιση "
"ενός δικτύου και κάντε την εγκατάσταση μόνο με τα πακέτα που περιέχονται στο "
"CD/DVD. Μπορείτε έτσι να εγκαταστήσετε τον οδηγό και το firmware που "
@@ -2264,7 +2264,7 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"Η υποστήριξη για οθόνες braille καθορίζεται από την υποκείμενη υποστήριξη "
@@ -2272,7 +2272,7 @@ msgstr ""
"δουλεύουν με το <classname>brltty</classname>, συνδεόμενες μέσω μιας "
"σειριακής θύρας ή μέσω USB ή bluetooth. Λεπτομέρειες για υποστηριζόμενες "
"συσκευές braille μπορούν να βρεθούν στην <ulink url=\"&url-brltty;"
-"\">ιστοσελίδα του <classname>brltty</classname></ulink>. Η έκδοση &debian; "
+"\">ιστοσελίδα του <classname>brltty</classname></ulink>. Η έκδοση &debian-gnu; "
"&release; κυκλοφορεί με την έκδοση &brlttyver; του <classname>brltty</"
"classname>."
@@ -2292,7 +2292,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"Υποστήριξη για συσκευές σύνθεση ομιλίας με hardware καθορίζεται από την "
@@ -2302,7 +2302,7 @@ msgstr ""
"συσκευές USB ή προσαρμογείς από-σειριακό-σε-USB). Λεπτομέρειες για "
"υποστηριζόμενες συσκευές σύνθεσης ομιλίας μπορούν να βρεθούν στην <ulink url="
"\"&url-speakup;\">ιστοσελίδα του <classname>speakup</classname></ulink>. Η "
-"έκδοση &debian; &release; κυκλοφορεί με την έκδοση &speakupver; του "
+"έκδοση &debian-gnu; &release; κυκλοφορεί με την έκδοση &speakupver; του "
"<classname>speakup</classname>."
#. Tag: title
@@ -2398,16 +2398,16 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
"Στις περισσότερες περιπτώσεις το firmware είναι μη-ελεύθερο λογισμικό "
-"σύμφωνα με τα κριτήρια που χρησιμοποιεί το Σχέδιο &debian; και συνεπώς δεν "
+"σύμφωνα με τα κριτήρια που χρησιμοποιεί το Σχέδιο &debian-gnu; και συνεπώς δεν "
"μπορεί να συμπεριληφθεί στην κύρια διανομή ή στο εγκατεστημένο σύστημα. Αν ο "
-"οδηγός της ίδιας της συσκευής συμπεριλαμβάνεται στην διανομή και το &debian; "
+"οδηγός της ίδιας της συσκευής συμπεριλαμβάνεται στην διανομή και το &debian-gnu; "
"μπορεί νόμιμα να διανείμει το firmware, αυτό θα είναι συχνά διαθέσιμο σαν "
"ξεχωριστό πακέτο από την ενότητα μη-ελεύθερου λογισμικού της αρχειοθήκης."
@@ -2416,14 +2416,14 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
"Αυτό δεν σημαίνει όμως ότι τέτοιο υλικό δεν μπορεί να χρησιμοποιηθεί στη "
-"διάρκεια μιας εγκατάστασης. Ξεκινώντας με το &debian; 5.0 ο &d-i; "
+"διάρκεια μιας εγκατάστασης. Ξεκινώντας με το &debian-gnu; 5.0 ο &d-i; "
"υποστηρίζει την φόρτωση αρχείων firmware ή πακέτων που περιέχουν λογισμικό "
"firmware από αφαιρέσιμα μέσα όπως δισκέττες ή κλειδιά USB. Δείτε την ενότητα "
"<xref linkend=\"loading-firmware\"/> για αναλυτικές πληροφορίες σχετικά με "
@@ -2868,13 +2868,13 @@ msgstr "Σύστημα Un*x ή GNU"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
"Αν τρέχετε ένα άλλο σύστημα τύπου Unix μπορείτε να το χρησιμοποιήσετε για να "
-"εγκαταστήσετε το &debian; χωρίς να χρησιμοποιήσετε τον &d-i; ο οποίος "
+"εγκαταστήσετε το &debian-gnu; χωρίς να χρησιμοποιήσετε τον &d-i; ο οποίος "
"περιγράφεται στο υπόλοιπο αυτού του εγχειριδίου. Αυτός ο τρόπος εγκατάστασης "
"μπορεί να είναι χρήσιμος για χρήστες με μη υποστηριζόμενο υλικό ή για "
"συστήματα που δεν έχουν την πολυτέλεια να τεθούν εκτός λειτουργίας. Αν "
diff --git a/po/el/install-methods.po b/po/el/install-methods.po
index 2a55dd9ba..d9da8c339 100644
--- a/po/el/install-methods.po
+++ b/po/el/install-methods.po
@@ -32,14 +32,14 @@ msgstr "Αποκτώντας τα Μέσα Εγκατάστασης του Συ
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "Επίσημες Συλλογές των CD-ROM του &debian;"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "Επίσημες Συλλογές των CD-ROM του &debian-gnu;"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -52,7 +52,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"Ο ευκολότερος με διαφορά τρόπος για να εγκαταστήσετε το &debian; είναι από "
+"Ο ευκολότερος με διαφορά τρόπος για να εγκαταστήσετε το &debian-gnu; είναι από "
"ένα Επίσημο σετ CD-ROM του Debian. Μπορείτε να αγοράσετε ένα τέτοιο σετ από "
"έναν προμηθευτή (δείτε τη σελίδα <ulink url=\"&url-debian-cd-vendors;\">CD "
"vendors page</ulink>). Μπορείτε επίσης να κατεβάσετε είδωλα των CD-ROM από "
@@ -639,12 +639,12 @@ msgstr "Εγγραφή Ειδώλων Δίσκων με το <command>Disk Copy<
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
"Αν δημιουργείτε το είδωλο δισκέττας από αρχεία που βρίσκονταν αρχικά στο "
-"επίσημο CD του &debian; τότε οι παράμετροι Type και Creator είναι ήδη σωστά "
+"επίσημο CD του &debian-gnu; τότε οι παράμετροι Type και Creator είναι ήδη σωστά "
"ρυθμισμένοι. Τα παρακάτω <command>Creator-Changer</command> βήματα είναι "
"απαραίτητα μόνο αν κατεβάσατε τα αρχεία από έναν κατοπτριστή αρχείων του "
"Debian."
@@ -1778,12 +1778,12 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
msgstr ""
-"Για έναν εξυπηρετητή &debian; συνιστούμε <classname>tftpd-hpa</classname>. "
+"Για έναν εξυπηρετητή &debian-gnu; συνιστούμε <classname>tftpd-hpa</classname>. "
"Έχει γραφτεί από τον ίδιο συγγραφέα του φορτωτή εκκίνησης "
"<classname>syslinux</classname> και συνεπώς έχει τις μικρότερες πιθανότητες "
"να προκαλέσει οποιαδήποτε προβλήματα. Μια καλή εναλλακτική λύση είναι και το "
@@ -1851,13 +1851,13 @@ msgstr "Ρυθμίζοντας έναν εξυπηρετητή DHCP"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
"Ένας εξυπηρετητής DHCP που είναι ελεύθερο λογισμικό είναι ο <command>dhcpd</"
-"command> από το ISC. Για το &debian; συνίσταται το πακέτο <classname>dhcp3-"
+"command> από το ISC. Για το &debian-gnu; συνίσταται το πακέτο <classname>dhcp3-"
"server</classname>. Εδώ είναι ένα υπόδειγμα αρχείου ρυθμίσεων γι' αυτόν "
"(δείτε το <filename>/etc/dhcp3/dhcpd.conf</filename>):"
@@ -2026,14 +2026,14 @@ msgstr "Ρύθμιση ενός εξυπηρετητή BOOTP"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"Υπάρχουν δύο διαθέσιμοι εξυπηρετητές BOOTP για το GNU/Linux. Ο πρώος είναι ο "
"<command>bootpd</command> από το CMU (Carnegie Mellon University). O άλλος "
"είναι στην πραγματικότητα ένας εξυπηρετητής DHCP, ο <command>dhcpd</command> "
-"του ISC. Στο &debian; αυτοί περιλαμβάνονται στα πακέτα <classname>bootp</"
+"του ISC. Στο &debian-gnu; αυτοί περιλαμβάνονται στα πακέτα <classname>bootp</"
"classname> και <classname>dhcp3-server</classname> αντίστοιχα."
#. Tag: para
@@ -2041,7 +2041,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -2072,7 +2072,7 @@ msgid ""
msgstr ""
"Για να χρησιμοποιήσετε τον δαίμονα <command>bootpd</command> του CMU, πρέπει "
"πρώτα να αποσχολιάσετε (ή να προσθέσετε) την σχετική γραμμή στο αρχείο "
-"<filename>/etc/inetd.conf</filename>. Στο &debian;, μπορείτε να το κάνετε "
+"<filename>/etc/inetd.conf</filename>. Στο &debian-gnu;, μπορείτε να το κάνετε "
"αυτό τρέχοντας την εντολή <userinput>update-inetd --enable bootps</"
"userinput>, και μετά <userinput>/etc/init.d/inetd reload</userinput>. Στην "
"περίπτωση που ο εξυπηρετητής σας BOOTP δεν τρέχει Debian, η σχετική γραμμή "
@@ -2165,7 +2165,7 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
@@ -2173,7 +2173,7 @@ msgid ""
msgstr ""
"Κατά παράδοση οι εξυπηρετητές TFTP χρησιμοποιούσαν τον κατάλογο <filename>/"
"tftpboot</filename> σαν κατάλογο από τον οποίον διαθέτουν τις εικόνες που "
-"παρέχουν. Όμως τα πακέτα του &debian; πιθανόν να χρησιμοποιούν άλλους "
+"παρέχουν. Όμως τα πακέτα του &debian-gnu; πιθανόν να χρησιμοποιούν άλλους "
"καταλόγους ώστε να συμμορφώνονται με το πρότυπο <ulink url=\"&url-fhs-home;"
"\">Filesystem Hierarchy Standard</ulink>. Για παράδειγμα, το πακέτο "
"<classname>tftpd-hpa</classname> χρησιμοποιεί εξ ορισμού τον κατάλογο "
diff --git a/po/el/installation-howto.po b/po/el/installation-howto.po
index 9c38edf89..35c47dcea 100644
--- a/po/el/installation-howto.po
+++ b/po/el/installation-howto.po
@@ -32,14 +32,14 @@ msgstr "Οδηγός εγκατάστασης"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
"useful, we will link to more detailed explanations in other parts of this "
"document."
msgstr ""
-"Το έγγραφο αυτό περιγράφει πώς να εγκαταστήσετε το &debian; &releasename; "
+"Το έγγραφο αυτό περιγράφει πώς να εγκαταστήσετε το &debian-gnu; &releasename; "
"για την αρχιτεκτονική &arch-title; (<quote>&architecture;</quote>) με τον "
"καινούριο &d-i;. Είναι μια γρήγορη περιδιάβαση στη διαδικασία εγκατάστασης "
"και περιέχει όλες τις πληροφορίες που θα χρειαστείτε για την πλειοψηφία των "
diff --git a/po/el/partitioning.po b/po/el/partitioning.po
index f26af315e..0b49b9aef 100644
--- a/po/el/partitioning.po
+++ b/po/el/partitioning.po
@@ -134,13 +134,13 @@ msgstr "Το Δέντρο των Καταλόγων"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"Το &debian; ακολουθεί πιστά το πρότυπο <ulink url=\"&url-fhs-home;"
+"Το &debian-gnu; ακολουθεί πιστά το πρότυπο <ulink url=\"&url-fhs-home;"
"\">Filesystem Hierarchy Standard</ulink> για την ονομασία των καταλόγων και "
"των αρχείων. Το πρότυπο αυτό επιτρέπει στους χρήστες και στις εφαρμογές να "
"προβλέπουν την θέση των καταλόγων και των αρχείων. Ο ριζικός κατάλογος "
@@ -1166,14 +1166,14 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"Το Linux περιορίζει τις κατατμήσεις ανά δίσκο στις 15 κατατμήσεις για SCSI "
"δίσκους (3 χρησιμοποιήσιμες κύριες και 12 λογικές κατατμήσεις) και 63 για "
"ένα δίσκο IDE (3 χρησιμοποιήσιμες κύριες και 60 λογικές κατατμήσεις). Όμως "
-"ένα συνηθισμένο σύστημα &debian; παρέχει μόνο μέχρι 20 συσκευές για "
+"ένα συνηθισμένο σύστημα &debian-gnu; παρέχει μόνο μέχρι 20 συσκευές για "
"κατατμήσεις, οπότε δεν θα πρέπει να εγκαταστήσετε σε κατατμήσεις πάνω από "
"την 20η αν δεν έχετε πριν δημιουργήσει χειροκίνητα συσκευές για αυτές τις "
"κατατμήσεις."
@@ -1566,7 +1566,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1575,7 +1575,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"Για να ξεκινά το OpenFirmware αυτόματα το &debian; η κατάτμηση bootstrap θα "
+"Για να ξεκινά το OpenFirmware αυτόματα το &debian-gnu; η κατάτμηση bootstrap θα "
"πρέπει να εμφανίζεται πριν από οποιεσδήποτε άλλες κατατμήσεις εκκίνησης και "
"ειδικότερα πριν από κατατμήσεις εκκίνησης του MacOS. Η κατάτμηση bootstrap "
"θα πρέπει να είναι η πρώτη που δημιουργείτε. Αν όμως προσθέσετε μια τέτοια "
diff --git a/po/el/post-install.po b/po/el/post-install.po
index b0f5ed0ef..c566150c6 100644
--- a/po/el/post-install.po
+++ b/po/el/post-install.po
@@ -38,16 +38,16 @@ msgstr "Κλείνοντας το σύστημά σας"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"Για να κλείσετε ένα σύστημα &debian; σε λειτουργία, δεν θα πρέπει να "
+"Για να κλείσετε ένα σύστημα &debian-gnu; σε λειτουργία, δεν θα πρέπει να "
"επανεκκινήσετε το μηχάνημα από το κουμπί reset στο μπροστινό ή πίσω μέρος "
-"του μηχανήματος ούτε απλά να κλείσετε το μηχάνημα. Το &debian; θα πρέπει να "
+"του μηχανήματος ούτε απλά να κλείσετε το μηχάνημα. Το &debian-gnu; θα πρέπει να "
"τερματιστεί με έναν ελεγχόμενο τρόπο, διαφορετικά μπορεί να χάσετε αρχεία ή/"
"και να προκύψει ζημιά στον δίσκο σας. Αν τρέχετε ένα περιβάλλον γραφείου "
"εργασίας, υπάρχει συνήθως διαθέσιμη η επιλογή <quote>log out</quote> από το "
@@ -473,7 +473,7 @@ msgstr "Προκαθορισμένη διαμόρφωση E-mail"
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
"that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
@@ -481,7 +481,7 @@ msgid ""
msgstr ""
"Ακόμα κι αν σκοπεύετε να χρησιμοποιήσετε ένα γραφικό πρόγραμμα "
"αλληλογραφίας, είναι σημαντικό να είναι εγκατεστημμένο και σωστά ρυθμισμένο "
-"ένα παραδοσιακό πρόγραμμα MTA/MDA στο σύστημα &debian; που έχετε. Ο λόγος είναι "
+"ένα παραδοσιακό πρόγραμμα MTA/MDA στο σύστημα &debian-gnu; που έχετε. Ο λόγος είναι "
"ότι διάφορα βοηθητικά προγράμματα που τρέχουν στο σύστημα <footnote> <para> "
"Παραδείγματα είναι τα: <command>cron</command>, <command>quota</command>, "
"<command>logcheck</command>, <command>aide</command>, &hellip; </para> </"
diff --git a/po/el/preface.po b/po/el/preface.po
index 4fad198c1..35c57f090 100644
--- a/po/el/preface.po
+++ b/po/el/preface.po
@@ -20,23 +20,23 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
msgstr ""
-"Εγκαθιστώντας το &debian; &release; για την αρχιτεκτονική &architecture;"
+"Εγκαθιστώντας το &debian-gnu; &release; για την αρχιτεκτονική &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Είμαστε ενθουσιασμένοι που αποφασίσατε να δοκιμάσετε το Debian και είμαστε "
"βέβαιοι ότι θα διαπιστώσετε ότι η διανομή Debian GNU/&arch-kernel; είναι μοναδική.Το "
-"&debian; φέρνει μαζί υψηλής ποιότητας ελεύθερο λογισμικό από ολόκληροτον "
+"&debian-gnu; φέρνει μαζί υψηλής ποιότητας ελεύθερο λογισμικό από ολόκληροτον "
"κόσμο συνδυάζοντας το σε ένα συνεκτικό σύνολο. Πιστεύουμε ότι θα βρείτε "
"ότιτο αποτέλεσμα είναι πραγματικά κάτι περισσότερο από το άθροισμα των μερών."
diff --git a/po/el/preparing.po b/po/el/preparing.po
index 7647652c3..3f5e08183 100644
--- a/po/el/preparing.po
+++ b/po/el/preparing.po
@@ -24,8 +24,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "Πριν την εγκατάσταση του &debian;"
+msgid "Before Installing &debian-gnu;"
+msgstr "Πριν την εγκατάσταση του &debian-gnu;"
#. Tag: para
#: preparing.xml:6
@@ -79,7 +79,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -89,7 +89,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"Με το &debian;, είναι πολύ πιο πιθανό ότι το λειτουργικό σας μπορεί να "
+"Με το &debian-gnu;, είναι πολύ πιο πιθανό ότι το λειτουργικό σας μπορεί να "
"επιδιορθωθεί μάλλον και όχι να αντικατασταθεί αν κάτι πάει λάθος. Οι "
"αναβαθμίσεις ποτέ δεν απαιτούν μια ολοκληρωμένη εγκατάσταση και μπορείτε "
"πάντα να κάνετε επί τόπου αναβάθμιση. Τα προγράμματα είναι επίσης σχεδόν "
@@ -219,11 +219,11 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
"Εγκαταστήστε έναν <firstterm>φορτωτή εκκίνησης</firstterm>.που μπορεί να "
-"ξεκινήσει το &debian; και/ή το υπάρχον σύστημά σας."
+"ξεκινήσει το &debian-gnu; και/ή το υπάρχον σύστημά σας."
#. Tag: para
#: preparing.xml:134
@@ -305,7 +305,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"Μια σημαντική επιλογή κατά τη διάρκεια της εγκατάστασης είναι το αν "
@@ -316,7 +316,7 @@ msgstr ""
"στοιχειώδες, βασισμένο στην γραμμή εντολών σύστημα. Η εγκατάσταση της ομάδας "
"πακέτων του περιβάλλοντος Επιφάνειας Εργασίας είναι προαιρετική γιατί "
"απαιτεί έναν αρκετά μεγάλο χώρο στον σκληρό δίσκο και επειδή πολλά συστήματα "
-"&debian; είναι εξυπηρετητές που στην πραγματικότητα δεν χρειάζονται "
+"&debian-gnu; είναι εξυπηρετητές που στην πραγματικότητα δεν χρειάζονται "
"οποιαδήποτε τέτοια γραφική διεπαφή χρήστη για να κάνουν τη δουλειά τους."
#. Tag: para
@@ -347,7 +347,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -358,7 +358,7 @@ msgstr ""
"ήδη στο σύστημά σας. Αν αυτή είναι η πρώτη φορά που εγκαθίσταται στον "
"υπολογιστή σας ένα λειτουργικό σύστημα διαφορετικό από το δικό του, είναι "
"πιθανόν να χρειαστεί η επαναδιαμέριση του δίσκου σας ώστε να δημιουργήσετε "
-"χώρο για το &debian;. Κάθε φορά που επαναδιαμερίζετε τον δίσκο σας, "
+"χώρο για το &debian-gnu;. Κάθε φορά που επαναδιαμερίζετε τον δίσκο σας, "
"διατρέχετε τον κίνδυνο να χάσετε όλα τα δεδομένα σ' αυτόν, άσχετα από το "
"πρόγραμμα που θα χρησιμοποιήσετε γι΄αυτό. Τα προγράμματα που "
"χρησιμοποιούνται στον εγκαταστάτη είναι πολύ αξιόπιστα και χρησιμοποιούνται "
@@ -1189,7 +1189,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1200,7 +1200,7 @@ msgid ""
"graphical desktop environment."
msgstr ""
"Ο χώρος δίσκων που απαιτείται για την ομαλή λειτουργία του ίδιου του "
-"συστήματος &debian; λαμβάνεται υπόψιν στον υπολογισμό αυτών των "
+"συστήματος &debian-gnu; λαμβάνεται υπόψιν στον υπολογισμό αυτών των "
"προτεινόμενων απαιτήσεων του συστήματος. Ιδιαίτερα η κατάτμηση <filename>/"
"var</filename> περιέχει μεγάλο όγκο πληροφοριών για την κατάσταση του "
"συστήματος και που αφορούν συγκεκριμένα το Debian πέρα από τα συνηθισμένα "
@@ -1332,7 +1332,7 @@ msgstr ""
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1344,7 +1344,7 @@ msgid ""
"installation tapes or CDs."
msgstr ""
"Αν το μηχάνημά σας έχει μόνο έναν δίσκο και θα θέλατε να αντικαταστήσετε "
-"τελείως το υπάρχον λειτουργικό σύστημά σας με το &debian;, μπορείτε επίσης "
+"τελείως το υπάρχον λειτουργικό σύστημά σας με το &debian-gnu;, μπορείτε επίσης "
"να περιμένετε να κάνετε τη διαμέριση σαν μέρος της διαδικασίας εγκατάστασης "
"(<xref linkend=\"di-partition\"/>) μετά την εκκίνηση του συστήματος "
"εγκατάστασης. Όμως αυτό θα δουλέψει μόνο αν σκοπεύετε να εκκινήσετε τον "
@@ -1397,7 +1397,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1407,7 +1407,7 @@ msgstr ""
"καταμήσεις θα ανήκουν σε άλλα λειτουργικά συστήματα τότε θα ήταν καλίτερο να "
"δημιουργήσετε αυτές τις κατατμήσεις με κάποια προγράμματα διαμέρισης από τα "
"ίδια τα λειτουργικά αυτά. Συνιστούμε έντονα να <emphasis>μην</emphasis> "
-"προσπαθήσετε να φτιάξετε κάποιες κατατμήσεις για το &debian; χρησιμοποιώντας "
+"προσπαθήσετε να φτιάξετε κάποιες κατατμήσεις για το &debian-gnu; χρησιμοποιώντας "
"εργαλεία κάποιου άλλου λειτουργικού συστήματος. Αντίθετα θα πρέπει με αυτά "
"να δημιουργήσετε μόνο τις κατατμήσεις για το αρχικό λειτουργικό σύστημα που "
"θέλετε να διατηρήσετε."
@@ -1442,7 +1442,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the Linux "
+"In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a Linux placeholder partition to come <emphasis>before</"
@@ -1451,7 +1451,7 @@ msgid ""
"placeholder with the Linux partition tools later during the actual install, "
"and replace it with Linux partitions."
msgstr ""
-"Για να μπορεί το OpenFirmware να ξεκινά αυτόματα το &debian; οι κατατμήσεις "
+"Για να μπορεί το OpenFirmware να ξεκινά αυτόματα το &debian-gnu; οι κατατμήσεις "
"του Linux θα πρέπει να εμφανίζονται πριν από οποιεσδήποτε άλλες κατατμήσεις "
"στον δίσκο, ειδικότερα κατατνήσεις εκκίνησης του MacOS. Συγκρατείστε αυτό το "
"στοιχείο πριν κάνετε την προ-διαμέριση: θα πρέπει να δημιουργήσετε μια "
@@ -1499,11 +1499,11 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"Χρησιμοποιήστε εργαλεία του ίδιου του αρχικού λειτουργικού για να "
"δημιουργήσετε κατατμήσεις για αυτό. Αφήστε είτε έναν χώρο \"υποδοχής\" ή "
-"απλά ελεύθερο χώρο για το &debian;."
+"απλά ελεύθερο χώρο για το &debian-gnu;."
#. Tag: para
#: preparing.xml:903
@@ -1861,12 +1861,12 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"Θυμηθείτε να δημιουργήσετε μια θέση υποδοχής για το GNU/Linux, κατά "
"προτίμηση στην πρώτη θέση στην διάταξη του δίσκου. Δεν έχει σημασία ο τύπος "
"αυτής της κατάτμησης αφού θα διαγραφεί και θα αντικατασταθεί αργότερα μέσα "
-"από τον εγκαταστάτη του &debian;."
+"από τον εγκαταστάτη του &debian-gnu;."
#. Tag: para
#: preparing.xml:1107
@@ -1934,7 +1934,7 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"Η ενότητα αυτή θα σας καθοδηγήσει στην ρύθμιση του υλικού σας πριν την "
@@ -1944,7 +1944,7 @@ msgstr ""
"λογισμικό που χρησιμοποιείται από το υλικό του υπολογιστή και η πιο κρίσιμη "
"επίκληση του είναι κατά τη διαδικασία της πρώτης εκκίνησης (bootstrap) μετά "
"το άνοιγμα του υπολογιστή. Γνωστά προβλήματα που επηρρεάζουν την αξιοπιστία "
-"του &debian; στο σύστημά σας επίσης τονίζονται."
+"του &debian-gnu; στο σύστημά σας επίσης τονίζονται."
#. Tag: title
#: preparing.xml:1163
@@ -2727,7 +2727,7 @@ msgstr "Ρύθμιση του BIOS"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2736,7 +2736,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"Για να εγκαταστήσετε το &debian; στην αρχιτεκτονική &arch-title; ή σε ένα "
+"Για να εγκαταστήσετε το &debian-gnu; στην αρχιτεκτονική &arch-title; ή σε ένα "
"μηχάνημα zSeries πρέπει πρώτα να ξεκινήσετε έναν πυρήνα στο σύστημα. Ο "
"μηχανισμός εκκίνησης στην πλατφόρμα αυτή είναι εγγενώς διαφορετικός από "
"όλους τους άλλους, ειδικότερα από συστήματα τύπου-PC. Δεν υπάρχουν καθόλου "
@@ -2880,12 +2880,12 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
"O server εγκατάστασης πρέπει να αντιγράψει την ακριβή δομή των καταλόγων από "
-"οποιοδήποτε καθρέφτη του &debian; αλλά μόνο τα αρχεία που είναι συγκεκριμένα "
+"οποιοδήποτε καθρέφτη του &debian-gnu; αλλά μόνο τα αρχεία που είναι συγκεκριμένα "
"για την αρχιτεκτονική s390 και αυτά που είναι ανεξάρτητα αρχιτεκτονικής "
"απαιτούνται. Μπορείτε ακόμα να αντιγράψετε το περιεχόμενο όλων των CD "
"εγκατάστασης σε ένα τέτοιο δέντρο καταλόγων."
diff --git a/po/el/random-bits.po b/po/el/random-bits.po
index 244ed78d3..fc039dbfd 100644
--- a/po/el/random-bits.po
+++ b/po/el/random-bits.po
@@ -860,27 +860,27 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "Εγκαθιστώντας το &debian; από ένα Σύστημα Unix/Linux"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "Εγκαθιστώντας το &debian-gnu; από ένα Σύστημα Unix/Linux"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
-"Η ενότητα αυτή εξηγεί πώς να εγκαταστήσετε το &debian; από ένα υπάρχον from "
+"Η ενότητα αυτή εξηγεί πώς να εγκαταστήσετε το &debian-gnu; από ένα υπάρχον from "
"Unix ή Linux σύστημα, χωρίς τη χρήση του βασισμένου στις ncurses, και "
"οδηγούμενου από το μενού εγκαταστάτη όπως εξηγείται στο υπόλοιπο αυτού του "
"εγχειριδίου. Αυτό το \"cross-install\" HOWTO έχει ζητηθεί από χρήστες που "
-"αλλάζουν σε &debian; από διανομές όπως οι Redhat, Mandrake, και SUSE. Στην "
+"αλλάζουν σε &debian-gnu; από διανομές όπως οι Redhat, Mandrake, και SUSE. Στην "
"ενότητα αυτή προϋποθέτουμε κάποια οικειότητα στην εισαγωγή εντολών *nix και "
"πλοήγησης στο σύστημα αρχείων. Εδώ, η παρακίνηση <prompt>$</prompt> "
"συμβολίζει μια εντολή που πρέπει να εισαχθεί στο υπάρχον σύστημα του χρήστη, "
@@ -893,7 +893,7 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
@@ -1118,11 +1118,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"Αν έχετε ένα CD με την έκδοση &releasename; του &debian; προσαρτημένου στο "
+"Αν έχετε ένα CD με την έκδοση &releasename; του &debian-gnu; προσαρτημένου στο "
"<filename>/cdrom</filename>, μπορείτε να αντικαταστήσετε ένα URL αρχείου "
"αντί του ενός http URL: <userinput>file:/cdrom/debian/</userinput>"
@@ -1721,12 +1721,12 @@ msgstr "Ρύθμιση του Φορτωτή Εκκίνησης (Boot Loader)"
#: random-bits.xml:765
#, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"Για να καταστήσετε το σύστημά σας &debian; εκκινήσιμο, ρυθμίστε τον φορτωτή "
+"Για να καταστήσετε το σύστημά σας &debian-gnu; εκκινήσιμο, ρυθμίστε τον φορτωτή "
"εκκίνησης ώστε να φορτώνει τον εγκατεστημένο πυρήνα με την καινούρια ριζική "
"κατάτμησή σας. Σημειώστε ότι η διαδικασία <command>debootstrap</command> δεν "
"εγκαθιστά έναν φορτωτή εκκίνησης, αν και μπορείτε να χρησιμοποιήσετε την "
@@ -1957,19 +1957,19 @@ msgstr "# aptitude clean "
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "Εγκαθιστώντας το &debian; πάνω από Parallel Line IP (PLIP)"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "Εγκαθιστώντας το &debian-gnu; πάνω από Parallel Line IP (PLIP)"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
-"Η ενότητα αυτή εξηγεί πώς να εγκαταστήσετε το &debian; σε έναν υπολογιστή "
+"Η ενότητα αυτή εξηγεί πώς να εγκαταστήσετε το &debian-gnu; σε έναν υπολογιστή "
"χωρίς κάρτα Ethernet, αλλά μόνο μ' έναν απομακρυσμένο υπολογιστή σαν πύλη "
"συνδεδεμένο μέσω ενός καλωδίου Null-Modem (που λέγεται επίσης και καλώδιο "
"Null-Printer). Ο υπολογιστής-πύλη θα πρέπει να είναι συνδεδεμένος σ' ένα "
@@ -2248,8 +2248,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "Εγκαθιστώντας το &debian; χρησιμοποιώντας PPP over Ethernet (PPPoE)"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "Εγκαθιστώντας το &debian-gnu; χρησιμοποιώντας PPP over Ethernet (PPPoE)"
#. Tag: para
#: random-bits.xml:1048
diff --git a/po/el/using-d-i.po b/po/el/using-d-i.po
index ced89bd26..e5f7188fe 100644
--- a/po/el/using-d-i.po
+++ b/po/el/using-d-i.po
@@ -611,10 +611,10 @@ msgstr "base-installer "
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
+"operate under &debian-gnu; when rebooted."
msgstr ""
"Εγκαθιστά το πιό βασικό σύνολο πακέτων, γεγονός που θα επιτρέψει στον "
-"υπολογιστή να λειτουργήσει σε περιβάλλον &debian; μετά από την επανεκκίνησή του."
+"υπολογιστή να λειτουργήσει σε περιβάλλον &debian-gnu; μετά από την επανεκκίνησή του."
#. Tag: term
#: using-d-i.xml:324
@@ -846,13 +846,13 @@ msgstr "Κατάσταση ελέγχου διαθέσιμης / περιορι
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"Ένα από τα πρώτα πράγματα που εκτελεί ο &d-i; είναι ο έλεγχος της διαθέσιμης "
"μνήμης. Εάν η διαθέσιμη μνήμη είναι περιορισμένη, αυτό το συστατικό θα κάνει "
"μερικές αλλαγές στη διαδικασία εγκατάστασης, ενέργεια η οποία ελπίζουμε ότι "
-"θα σας επιτρέψει να εγκαταστήσετε το &debian; στο σύστημά σας."
+"θα σας επιτρέψει να εγκαταστήσετε το &debian-gnu; στο σύστημά σας."
#. Tag: para
#: using-d-i.xml:458
@@ -3832,7 +3832,7 @@ msgstr "Ρύθμιση του apt"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -3849,7 +3849,7 @@ msgid ""
"management."
msgstr ""
"Ένα από τα μέσα που χρησιμοποιούνται για την εγκατάσταση πακέτων σε ένα "
-"σύστημα &debian; είναι ένα πρόγραμμα που ονομάζεται <command>apt-get</"
+"σύστημα &debian-gnu; είναι ένα πρόγραμμα που ονομάζεται <command>apt-get</"
"command>, από το πακέτο <classname>apt</classname>.<footnote> <para> "
"Σημειώστε ότι το πρόγραμμα που στην πραγματικότητα εγκαθιστά τα πακέτα "
"ονομάζεται <command>dpkg</command>. Όμως αυτό το πρόγραμμα είναι ένα "
@@ -5042,7 +5042,7 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"Οι νεότεροι PowerMac (από το 1998 και μετά) χρησιμοποιούν ως φορτωτή "
"εκκίνησης τον <command>yaboot</command>. Ο εγκαταστάτης θα ρυθμίσει αυτόματα "
@@ -5051,7 +5051,7 @@ msgstr ""
"τύπου <emphasis>Apple_Bootstrap</emphasis>, το οποίο δημιουργείται στο "
"συστατικό δημιουργίας κατατμήσεων του εγκαταστάτη. Εάν αυτό το βήμα "
"ολοκληρωθεί με επιτυχία τότε ο δίσκος σας θα είναι εκκινήσιμος και το "
-"OpenFirmware θα είναι ρυθμισμένο να ξεκινά το &debian;."
+"OpenFirmware θα είναι ρυθμισμένο να ξεκινά το &debian-gnu;."
#. Tag: title
#: using-d-i.xml:2964
@@ -5273,13 +5273,13 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
"Μετά από μια τελική προτροπή το σύστημα θα σταματήσει γιατί η επανεκκίνηση "
"δεν υποστηρίζεται στην αρχιτεκτονική &arch-title;. Θα πρέπει τότε να "
-"εκκινήσετε το &debian; με την μέθοδο IPL από τη συσκευή DASD που επιλέξατε "
+"εκκινήσετε το &debian-gnu; με την μέθοδο IPL από τη συσκευή DASD που επιλέξατε "
"σαν ριζικό σύστημα αρχείων στα πρώτα βήματα της εγκατάστασης."
#. Tag: title
diff --git a/po/el/welcome.po b/po/el/welcome.po
index 28ebadaf2..76b3b4bd0 100644
--- a/po/el/welcome.po
+++ b/po/el/welcome.po
@@ -29,13 +29,13 @@ msgstr "Καλώς ήλθατε στο Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"Το κεφάλαιο αυτό παρέχει μια επισκόπηση του Σχεδίου Debian και του &debian;. "
+"Το κεφάλαιο αυτό παρέχει μια επισκόπηση του Σχεδίου Debian και του &debian-gnu;. "
"Αν γνωρίζετε ήδη στοιχεία για την ιστορία του Σχεδίου Debian και της "
-"διανομής &debian;, περάστε άφοβα στο επόμενο κεφάλαιο."
+"διανομής &debian-gnu;, περάστε άφοβα στο επόμενο κεφάλαιο."
#. Tag: title
#: welcome.xml:19
@@ -595,13 +595,13 @@ msgstr "Αποκτώντας το Debian"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"Για πληροφορίες σχετικά με το πώς να κατεβάσετε το &debian; από το Διαδίκτυο "
+"Για πληροφορίες σχετικά με το πώς να κατεβάσετε το &debian-gnu; από το Διαδίκτυο "
"ή από που μπορείτε να αγοράσετε επίσημα CD του Debian, κοιτάξτε τη <ulink "
"url=\"&url-debian-distrib;\">σελίδα της Διανομής </ulink>. Η <ulink url="
"\"&url-debian-mirrors;\">λίστα των ειδώλων του Debian </ulink> περιέχει ένα "
@@ -632,7 +632,7 @@ msgstr "Αποκτώντας την νεώτερη έκδοση αυτού το
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
@@ -684,12 +684,12 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"Γενικά, το κείμενο ακολουθεί μια γραμμική διάταξη, οδηγώντας σας στη "
"διαδικασία εγκατάστασης από την αρχή ως το τέλος. Εδώ είναι τα βήματα της "
-"εγκατάστασης του &debian;, και οι ενότητες του κειμένου που σχετίζονται με "
+"εγκατάστασης του &debian-gnu;, και οι ενότητες του κειμένου που σχετίζονται με "
"κάθε βήμα:"
#. Tag: para
@@ -845,7 +845,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -856,7 +856,7 @@ msgstr ""
"περισσότερα προγράμματα εμπορικού λογισμικού &mdash; λένε συνήθως ότι "
"μπορείτε μόνο να αντιγράψετε το λογισμικό σε ένα μοναδικό υπολογιστή. Η "
"άδεια χρήσης αυτού του συστήματος δεν μοιάζει καθόλου μ' αυτές. Σας "
-"ενθαρρύνουμε να βάλετε ένα αντίγραφο του &debian; σε κάθε υπολογιστή στο "
+"ενθαρρύνουμε να βάλετε ένα αντίγραφο του &debian-gnu; σε κάθε υπολογιστή στο "
"σχολείο σας ή στον τόπο δουλειάς σας. Δανείστε τα μέσα εγκατάστασης που "
"έχετε στους φίλους σας και βοηθήστε τους να το εγκαταστήσουν στους "
"υπολογιστές τους! Μπορείτε ακόμα να φτιάξετε χιλιάδες αντίγραφά τους και να "
diff --git a/po/fi/bookinfo.po b/po/fi/bookinfo.po
index d720da3ed..b46c8b5d4 100644
--- a/po/fi/bookinfo.po
+++ b/po/fi/bookinfo.po
@@ -18,20 +18,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "&debian;in asennusohje"
+msgid "&debian-gnu; Installation Guide"
+msgstr "&debian-gnu;in asennusohje"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Tässä oppaassa on asennusohjeet &debian; version &release; "
+"Tässä oppaassa on asennusohjeet &debian-gnu; version &release; "
"käyttöjärjestelmän (koodinimi <quote>&releasename;</quote>) asentamisesta "
"&arch-title;-laitealustalle (<quote>&architecture;</quote>). Mukana on myös "
"linkkejä lisätietoon ja neuvoja miten parhaiten käytät uutta Debian-"
diff --git a/po/fi/boot-installer.po b/po/fi/boot-installer.po
index 7175de993..8a85dfe7a 100644
--- a/po/fi/boot-installer.po
+++ b/po/fi/boot-installer.po
@@ -541,10 +541,10 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
"Kun ohjelma on käynnistynyt, kysytään muutamia valmistavia kysymyksiä\n"
-"ja järjestelmä valmistetaan käynnistämään &debian; asennin."
+"ja järjestelmä valmistetaan käynnistämään &debian-gnu; asennin."
#. Tag: title
#: boot-installer.xml:496
diff --git a/po/fi/boot-new.po b/po/fi/boot-new.po
index 76d4f2b41..29cda3ee7 100644
--- a/po/fi/boot-new.po
+++ b/po/fi/boot-new.po
@@ -189,12 +189,12 @@ msgstr "NewWorld PowerMacs"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"G4-koneilla ja iBookeilla pidetään pohjassa <keycap>option</keycap> ja "
"näkyviin tulee graafinen käyttöliittymä jossa on painike jokaiselle "
-"käynnistettävälle käyttöjärjestelmälle; &debian; on painike jossa on "
+"käynnistettävälle käyttöjärjestelmälle; &debian-gnu; on painike jossa on "
"kuvakkeena pieni pingviini."
#. Tag: para
@@ -227,16 +227,16 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
-"OpenFirmwaren alkuarvojen palauttaminen G3 tai G4-koneilla saa &debian;:in "
+"OpenFirmwaren alkuarvojen palauttaminen G3 tai G4-koneilla saa &debian-gnu;:in "
"käynnistymään oletuksena (jos osiot on tehty oikein ja Apple_Bootstrap-osio "
-"on ensimmäisenä). Jos &debian; on SCSI-levyllä ja MacOS IDE-levyllä tämä ei "
+"on ensimmäisenä). Jos &debian-gnu; on SCSI-levyllä ja MacOS IDE-levyllä tämä ei "
"ehkä toimi ja OpenFirmwaressa on asetettava muuttuja <envar>boot-device</"
"envar>, komento <command>ybin</command> tekee tämän tavallisesti "
"automaattisesti."
@@ -245,13 +245,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"Kun &debian; käynnistetään ensimmäistä kertaa halutut lisävalitsimet (kuten "
+"Kun &debian-gnu; käynnistetään ensimmäistä kertaa halutut lisävalitsimet (kuten "
"kaksoiskäynnistyksen valitsimet) lisätään tiedostoon <filename>/etc/yaboot."
"conf</filename> ja käynnistetään <command>ybin</command> jotta muuttuneet "
"tiedot päivitetään käynnistysosioon. Kannattaa lukea lisätietoja sivulta "
diff --git a/po/fi/hardware.po b/po/fi/hardware.po
index ad2b49fcb..a80a532a1 100644
--- a/po/fi/hardware.po
+++ b/po/fi/hardware.po
@@ -470,7 +470,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -479,7 +479,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"Tämä on &debian;in ensimmäinen virallinen julkistus laitealustalle &arch-"
+"Tämä on &debian-gnu;in ensimmäinen virallinen julkistus laitealustalle &arch-"
"title;. Mielestämme se on koitoksissa osoittautunut riittävän hyväksi "
"julkaistavaksi. Koska sitä ei kuitenkaan ole käytetty yhtä laajalti (eikä "
"käyttäjiä ole ollut yhtä paljon) kuin Debiania eräillä muilla "
@@ -914,10 +914,10 @@ msgstr "Cobalt-tietokoneet käyttävät nopeutta 115200 bit/s."
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"&debian; julkaisussa &release; vain PMac (Power-Macintosh tai PowerMac) ja "
+"&debian-gnu; julkaisussa &release; vain PMac (Power-Macintosh tai PowerMac) ja "
"PReP arkkitehtuurin muunnokset on tuettu."
#. Tag: title
@@ -2054,11 +2054,11 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
"Langattomat sovittimet joita virallinen &arch-kernel;-ydin ei tue voidaan yleensä "
-"saada toimimaan &debian;issa, mutta ne eivät ole tuettuja asennuksen aikana."
+"saada toimimaan &debian-gnu;issa, mutta ne eivät ole tuettuja asennuksen aikana."
#. Tag: para
#: hardware.xml:1346
@@ -2077,14 +2077,14 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
"(after the reboot) and configure your network manually."
msgstr ""
"Jos langattoman kanssa on vaikeuksia eikä asennuksen aikana ole "
-"käytettävissä toista verkkosovitinta, on &debian; -jakelun asentaminen silti "
+"käytettävissä toista verkkosovitinta, on &debian-gnu; -jakelun asentaminen silti "
"mahdollista käyttämällä täysiä CD-ROM- tai DVD-otoksia. Valitse vaihtoehto "
"olla tekemättä verkon asetuksia ja asenna käyttämällä vain CD:llä/DVD:llä "
"olevia asennuspaketteja. Tarvittava ajuri ja laiteohjelmisto voidaan asentaa "
@@ -2211,14 +2211,14 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"Pistekirjoitusnäyttöjen tuki määräytyy <classname>brltty</classname>:ssä "
"olevasta tuesta. Useimmat näytöt toimivat <classname>brltty</classname>:n "
"kanssa, liitäntänä voi olla sarjaportti, USB tai bluetooth. Tarkempaa tietoa "
"tuetuista pistekirjoitusnäytöistä löytyy <ulink url=\"&url-brltty;"
-"\"><classname>brltty</classname>:n webbisivulta</ulink>. &debian; versiossa "
+"\"><classname>brltty</classname>:n webbisivulta</ulink>. &debian-gnu; versiossa "
"&release; tulee mukana <classname>brltty</classname>:n versio &brlttyver;."
#. Tag: title
@@ -2237,7 +2237,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"Puhesyntetisaattorilaitteiden tuki määräytyy <classname>speakup</classname>:"
@@ -2246,7 +2246,7 @@ msgstr ""
"sovitin tai sarjaportista USB-portin tekevä sovitin ei ole tuettu). "
"Tarkempaa tietoa tuetuista puhesyntetisaattorilaitteista löytyy <ulink url="
"\"&url-speakup;\"><classname>speakup</classname>:in webbisivulta website</"
-"ulink>. &debian; version &release; mukana tulee <classname>speakup</"
+"ulink>. &debian-gnu; version &release; mukana tulee <classname>speakup</"
"classname> versio &speakupver;."
#. Tag: title
@@ -2341,16 +2341,16 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
-"Useimmissa tapauksissa laiteohjelmisto ei ole &debian;-projektin kriteerien "
+"Useimmissa tapauksissa laiteohjelmisto ei ole &debian-gnu;-projektin kriteerien "
"mukaisesti vapaa eikä sitä niin ollen voida ottaa mukaan jakeluun tai "
"asennusjärjestelmään. Jos itse laiteajuri on mukana jakelussa ja jos "
-"&debian; voi laillisesti välittää laiteohjelmiston, se on usein saatavilla "
+"&debian-gnu; voi laillisesti välittää laiteohjelmiston, se on usein saatavilla "
"erillisenä pakettina pakettivaraston epävapaasta (non-free) osasta."
#. Tag: para
@@ -2358,14 +2358,14 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
"Tämä ei kuitenkaan tarkoita etteikö tuollaista laitetta voisi käyttää "
-"asennuksen aikana. &debian; versiosta 5.0 alkaen &d-i; tukee "
+"asennuksen aikana. &debian-gnu; versiosta 5.0 alkaen &d-i; tukee "
"varusohjelmatiedostojen tai varusohjelmia sisältävien asennuspakettien "
"lataamista irroitettavalta taltiolta, kuten levyke tai USB-muisti. Katso "
"yksityiskohtaisia tietoja kohdasta <xref linkend=\"loading-firmware\"/> "
@@ -2788,13 +2788,13 @@ msgstr "Un*x- tai GNU-järjestelmä"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
"Jos koneessa ajetaan jotain muuta Unixin tapaista käyttöjärjestelmää, "
-"voidaan sitä käyttää &debian;in asentamiseen käyttämättä Debianin asenninta, "
+"voidaan sitä käyttää &debian-gnu;in asentamiseen käyttämättä Debianin asenninta, "
"jonka käyttöohje tämä teos on. Tällainen asennus saattaa olla hyödyllinen "
"jos koneen laitteisto ei muilla asennustavoilla ole tuettu tai jos konetta "
"ei voi ajaa alas asennuksen ajaksi. Kiinnostuneille löytyy lisätietoa <xref "
diff --git a/po/fi/install-methods.po b/po/fi/install-methods.po
index 0584d3ba3..eeefc4c4a 100644
--- a/po/fi/install-methods.po
+++ b/po/fi/install-methods.po
@@ -22,14 +22,14 @@ msgstr "Asennustaltioiden hankkiminen"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "Viralliset &debian; romput"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "Viralliset &debian-gnu; romput"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -42,7 +42,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"&debian; on helpointa asentaa virallisilta rompuilta. Romput voi ostaa "
+"&debian-gnu; on helpointa asentaa virallisilta rompuilta. Romput voi ostaa "
"kauppiaalta (katso <ulink url=\"&url-debian-cd-vendors;\">Debianin CD-"
"toimittajat</ulink> -sivulta). Jos Debianin romput on jo hankittuna ja "
"romput kelpaavat käynnistysrompuksi asennettavalla tietokoneella, voidaan "
@@ -605,12 +605,12 @@ msgstr ""
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
"Jos levykeotos luodaan tiedostoista jotka olivat alunperin virallisisilla "
-"&debian; -rompuilla, on kentillä Type ja Creator jo oikea arvo. Seuraavat "
+"&debian-gnu; -rompuilla, on kentillä Type ja Creator jo oikea arvo. Seuraavat "
"<command>Creator-Changer</command>-vaiheet ovat tarpeen vain jos "
"otostiedostot noudettiin Debianin asennuspalvelimelta."
@@ -1701,12 +1701,12 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
msgstr ""
-"&debian;-palvelimelle suositellaan sovellusta <classname>tftpd-hpa</"
+"&debian-gnu;-palvelimelle suositellaan sovellusta <classname>tftpd-hpa</"
"classname>. Siinä on tekijä sama kuin käynnistyslataimella "
"<classname>syslinux</classname>, joten todennäköisesti yhteistoiminnan "
"kanssa on vähiten vaikeuksia. Hyvä vaihtoehto on <classname>atftpd</"
@@ -1774,12 +1774,12 @@ msgstr "DHCP-palvelimen asetukset"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
-"Eräs vapaa DHCP-palvelinohjelmisto on ISC <command>dhcpd</command>. &debian;"
+"Eräs vapaa DHCP-palvelinohjelmisto on ISC <command>dhcpd</command>. &debian-gnu;"
"ille suositellaan pakettia <classname>dhcp3-server</classname>. Tässä on "
"esimerkki sen asetustiedostosta (katso <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
@@ -1946,13 +1946,13 @@ msgstr "BOOTP-palvelimen käyttöönotto"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"GNU/Linuxille on saatavilla kaksi BOOTP-palvelinta. Ensimmäinen on CMU "
"<command>bootpd</command>. Toinen on itse asiassa DHCP-palvelin: ISC "
-"<command>dhcpd</command>. &debian;issa ne sisältyvät paketteihin "
+"<command>dhcpd</command>. &debian-gnu;issa ne sisältyvät paketteihin "
"<classname>bootp</classname> ja <classname>dhcp3-server</classname>."
#. Tag: para
@@ -1960,7 +1960,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -1991,7 +1991,7 @@ msgid ""
msgstr ""
"Käytettäessä CMU <command>bootpd</command>:tä, on ensin poistettava "
"kommenttimerkki asiaankuuluvalta riviltä (tai lisättävä rivi) tiedostossa "
-"<filename>/etc/inetd.conf</filename>. &debian;issa tämä voidaan tehdä "
+"<filename>/etc/inetd.conf</filename>. &debian-gnu;issa tämä voidaan tehdä "
"komennoilla <userinput>update-inetd --enable bootps</userinput> ja sitten "
"<userinput>/etc/init.d/inetd reload</userinput>. Siltä varalta ettei "
"käytettävässä BOOTP-palvelimessa ole Debiania, rivin pitäisi näyttää "
@@ -2081,14 +2081,14 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
"configuration examples in this section accordingly."
msgstr ""
"Perinteisesti TFTP-palvelimet ovat jakaneet hakemiston <filename>/tftpboot</"
-"filename> tiedostoja. &debian;in paketit voivat kuitenkin käyttää muita "
+"filename> tiedostoja. &debian-gnu;in paketit voivat kuitenkin käyttää muita "
"hakemistoja, jotta ne noudattaisivat <ulink url=\"&url-fhs-home;"
"\">Filesystem Hierarchy Standard</ulink>-määrittelyä. Esimerkiksi "
"<classname>tftpd-hpa</classname> käyttää oletusarvona hakemistoa <filename>/"
diff --git a/po/fi/installation-howto.po b/po/fi/installation-howto.po
index 71aa52b0e..125e37a70 100644
--- a/po/fi/installation-howto.po
+++ b/po/fi/installation-howto.po
@@ -26,14 +26,14 @@ msgstr "Asennus-Howto"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
"useful, we will link to more detailed explanations in other parts of this "
"document."
msgstr ""
-"Tämä ohje kuvaa &debian; version &releasename; asennuksen arkkitehtuurille "
+"Tämä ohje kuvaa &debian-gnu; version &releasename; asennuksen arkkitehtuurille "
"&arch-title; (<quote>&architecture;</quote>) uudella asentimella &d-i;. "
"Asennuksen pikainen läpikäynti antanee riittävästi tietoa useimpiin "
"asennuksiin. Kun lisätieto voi olla hyödyllistä, annetaan viite "
diff --git a/po/fi/partitioning.po b/po/fi/partitioning.po
index 53f8d42f9..6bccf4beb 100644
--- a/po/fi/partitioning.po
+++ b/po/fi/partitioning.po
@@ -119,13 +119,13 @@ msgstr "Hakemistopuu"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"&debian; noudattaa <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; noudattaa <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>-julkaisua hakemistojen ja tiedostojen nimeämisessä. "
"Standardi auttaa käyttäjiä ja sovelluksia tietämään tiedostojen ja "
"hakemistojen sijainnin. Juurihakemiston nimenä on yksinkertaisesti vinoviiva "
@@ -1100,14 +1100,14 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"Linux rajoittaa osioiden määrän levyä kohti 15 osioon SCSI-levyille "
"(käytettävissä on 3 ensisijaista osiota ja 12 loogista osiota), ja 63 osioon "
"IDE-levyille (käytettävissä on 3 ensisijaista osiota ja 60 loogista osiota). "
-"Kuitenkin tavallinen &debian; järjestelmä tekee vain 20 laitetiedostoa "
+"Kuitenkin tavallinen &debian-gnu; järjestelmä tekee vain 20 laitetiedostoa "
"osioille, joten enempiä osioita ei voi levylle tehdä luomalla ensin itse "
"laitetiedostot ylimääräisille osioille."
@@ -1467,7 +1467,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1476,7 +1476,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"Jotta OpenFirmware osaisi automaattisesti käynnistää &debian;in pitäisi "
+"Jotta OpenFirmware osaisi automaattisesti käynnistää &debian-gnu;in pitäisi "
"käynnistysosion sijaita ennen muita levyn käynnistysosioita, erityisesti "
"ennen MacOS-käynnistysosioita. Käynnistysosion olisi oltava ensimmäinen "
"luotava osio. Jos kuitenkin käynnistysosio lisätään myöhemmin, voidaan "
diff --git a/po/fi/post-install.po b/po/fi/post-install.po
index 0bdea8436..9aa2ba34c 100644
--- a/po/fi/post-install.po
+++ b/po/fi/post-install.po
@@ -29,15 +29,15 @@ msgstr "Ajetaan järjestelmä alas"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"Käynnissä olevaa &debian;-järjestelmää ei saa sammuttaa tietokoneen edessä tai "
-"takana olevasta reset-nappulasta tai virtakytkimestä. &debian; olisi ajettava "
+"Käynnissä olevaa &debian-gnu;-järjestelmää ei saa sammuttaa tietokoneen edessä tai "
+"takana olevasta reset-nappulasta tai virtakytkimestä. &debian-gnu; olisi ajettava "
"alas siististi, muuten tiedostoja voi kadota ja/tai tulla levyvirheitä. Jos "
"käytössä on työpöytäympäristö, on sovellusvalikossa tavallisesti tarjolla "
"kohta <quote>kirjaudu ulos</quote> josta järjestelmä voidaan sammuttaa (tai "
diff --git a/po/fi/preface.po b/po/fi/preface.po
index f49722a45..df7e5e18c 100644
--- a/po/fi/preface.po
+++ b/po/fi/preface.po
@@ -20,21 +20,21 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "&debian; version &release; asentaminen laitealustalle &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "&debian-gnu; version &release; asentaminen laitealustalle &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Päätöksesi kokeilla Debiania ilahduttaa, ja olemme varmoja Debianin GNU/"
-"&arch-kernel;-jakelun osoittautuvan ainutlaatuiseksi. &debian; on koostanut "
+"&arch-kernel;-jakelun osoittautuvan ainutlaatuiseksi. &debian-gnu; on koostanut "
"yhteneväisen kokonaisuuden korkealaatuisista vapaista ohjelmista kaikilta "
"maailman kulmilta. Uskomme tämän kokonaisuuden olevan enemmän kuin osiensa "
"summa."
diff --git a/po/fi/preparing.po b/po/fi/preparing.po
index 5512c4063..71cb30ca4 100644
--- a/po/fi/preparing.po
+++ b/po/fi/preparing.po
@@ -16,8 +16,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "Ennen &debian;in asennusta"
+msgid "Before Installing &debian-gnu;"
+msgstr "Ennen &debian-gnu;in asennusta"
#. Tag: para
#: preparing.xml:6
@@ -69,7 +69,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -79,7 +79,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"Käytettäessä &debian;ia, on paljon todennäköisempää, että vikatilanteessa "
+"Käytettäessä &debian-gnu;ia, on paljon todennäköisempää, että vikatilanteessa "
"käyttöjärjestelmä voidaan korjata eikä sitä tarvitse asentaa uudelleen. "
"Päivitykset eivät koskaan vaadi kaiken asentamista uudelleen; Debian osaa "
"aina päivittää itse itsensä. Lisäksi ohjelmat ovat melkein aina "
@@ -201,10 +201,10 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
-"Asenna <firstterm>käynnistyslatain</firstterm> käynnistämään &debian; ja/tai "
+"Asenna <firstterm>käynnistyslatain</firstterm> käynnistämään &debian-gnu; ja/tai "
"tietokoneen vanha käyttöjärjestelmä."
#. Tag: para
@@ -284,7 +284,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"Yksi tärkeä valinta asennuksen aikana on päättää, asennetaanko graafinen "
@@ -293,7 +293,7 @@ msgstr ""
"asennettavaksi <quote>Desktop environment</quote>, saadaan komentoriviltä "
"käytettävä perusjärjestelmä. Desktop Environmentin (eli työpöytäympäristön) "
"asentaminen on valinnaista, koska se vaatii varsin paljon levytilaa, ja "
-"koska useat &debian; järjestelmät ovat palvelinkoneita joissa ei oikeastaan "
+"koska useat &debian-gnu; järjestelmät ovat palvelinkoneita joissa ei oikeastaan "
"ole lainkaan käyttöä graafiselle työpöytäympäristölle."
#. Tag: para
@@ -323,7 +323,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -333,7 +333,7 @@ msgstr ""
"Ennen kuin aloitat, muista ottaa varmuuskopio jokaisesta tietokoneella nyt "
"olevasta tiedostosta. Jos tietokoneella on nyt vain esiasennettu "
"käyttöjärjestelmä, on kiintolevy luultavimmin osioitava uudelleen jotta "
-"saadaan tilaa &debian;ille. Aina kun levy osioidaan on varauduttava kaikkien "
+"saadaan tilaa &debian-gnu;ille. Aina kun levy osioidaan on varauduttava kaikkien "
"tietojen menetykseen, riippumatta siitä millä ohjelmalla osiot tehdään. "
"Asennuksessa käytettävät ohjelmat ovat hyvin luotettavia ja useimmat ovat "
"olleet vuosia käytössä; mutta ne ovat myös mahtiohjelmia ja lipsahdus voi "
@@ -1144,7 +1144,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1154,7 +1154,7 @@ msgid ""
"least 200MB for <filename>/var</filename>, and a lot more if you install a "
"graphical desktop environment."
msgstr ""
-"Näissä suosituksissa on huomioitu &debian;in itse sujuvaan toimintaansa "
+"Näissä suosituksissa on huomioitu &debian-gnu;in itse sujuvaan toimintaansa "
"tarvitsema levytila. Erityisesti <filename>/var</filename>-osio sisältää "
"paljon Debianin omaa tilatietoa tavallisten tietojen kuten lokitiedostojen "
"lisäksi. Sovelluksen <command>dpkg</command> tiedostot (joissa on tiedot "
@@ -1276,7 +1276,7 @@ msgstr ""
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1288,7 +1288,7 @@ msgid ""
"installation tapes or CDs."
msgstr ""
"Jos tietokoneessa on vain yksi kiintolevy, ja levyllä oleva "
-"käyttöjärjestelmä halutaan kokonaan korvata &debian;illa, voidaan tässäkin "
+"käyttöjärjestelmä halutaan kokonaan korvata &debian-gnu;illa, voidaan tässäkin "
"tapauksessa tehdä osiot asennusprosessin osana (<xref linkend=\"di-partition"
"\"/>), kun asennusjärjestelmä on käynnistetty. Tämä kuitenkin toimii vain "
"jos asennusjärjestelmä on tarkoitus käynnistää nauhalta, rompulta tai "
@@ -1339,7 +1339,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1348,7 +1348,7 @@ msgstr ""
"kelpaavaa levytilaa. Jos jotkin osioista tulevat olemaan muiden "
"käyttöjärjestelmien käytössä, on ne osiot luotava kunkin käyttöjärjestelmän "
"omalla osiointisovelluksella. Suositellaan että <emphasis>ei</emphasis> "
-"yritetä luoda &debian;in osioita muiden käyttöjärjestelmien työkaluilla. "
+"yritetä luoda &debian-gnu;in osioita muiden käyttöjärjestelmien työkaluilla. "
"Olisi luotava kunkin käyttöjärjestelmän omilla työkaluilla ne osiot jotka "
"halutaan säilyttää."
@@ -1381,7 +1381,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the Linux "
+"In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a Linux placeholder partition to come <emphasis>before</"
@@ -1390,7 +1390,7 @@ msgid ""
"placeholder with the Linux partition tools later during the actual install, "
"and replace it with Linux partitions."
msgstr ""
-"Jotta OpenFirmware käynnistäisi &debian;in automaattisesti, olisi Linux-"
+"Jotta OpenFirmware käynnistäisi &debian-gnu;in automaattisesti, olisi Linux-"
"osioiden sijaittava ennen muita osioita, erityisesti ennen MacOS-"
"käynnistysosioita. Tämä olisi huomioitava kun osiot tehdään ennen asennusta; "
"Linuxille on luotava paikkaa varaava osio joka sijaitsee levyllä "
@@ -1436,7 +1436,7 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"Tee koneen oman käyttöjärjestelmän osio(t) sen omilla työkaluilla. Tee "
"Debianille joko paikkaa varaava osio tai käyttämätöntä levytilaa."
@@ -1774,7 +1774,7 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"Muista luoda paikkaa varaava osio GNU/Linuxille, mieluiten levyn "
"ensimmäiseksi osioksi. Osion tyypillä ei ole väliä, se poistetaan ja "
@@ -1842,7 +1842,7 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"Tässä luvussa käydään askel askeleeltä läpi laiteasetukset, jos niitä on, "
@@ -1850,7 +1850,7 @@ msgstr ""
"muutettava tietokoneen laiteohjelmiston asetuksia. <quote>Laiteohjelmisto</"
"quote> on laitteiston käyttämä perusohjelmisto; sen tärkein tehtävä on "
"alkulatauksen yhteydessä (kun laitteistoon on kytketty virta). Myös tiedossa "
-"olevat laiteiston ominaisuudet jotka vaikuttavat &debian;in luotettavuuteen "
+"olevat laiteiston ominaisuudet jotka vaikuttavat &debian-gnu;in luotettavuuteen "
"on korostettu."
#. Tag: title
@@ -2604,7 +2604,7 @@ msgstr "BIOSin asetukset"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2613,7 +2613,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"&debian;in asentamiseksi suoritinperheen &arch-title; koneelle tai zSeries-"
+"&debian-gnu;in asentamiseksi suoritinperheen &arch-title; koneelle tai zSeries-"
"koneelle on järjestelmään ensimmäiseksi käynnistettävä ydin. Tämän "
"laitealustan käynnistystapa on olennaisesti muista poikkeava, erityisesti se "
"on erilainen kuin PC-koneissa: levykeasemia ei ole lainkaan. Laitealustan "
@@ -2749,11 +2749,11 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
-"Asennuspalvelimeen on kopioitava jonkin &debian;in asennuspalvelimen tarkka "
+"Asennuspalvelimeen on kopioitava jonkin &debian-gnu;in asennuspalvelimen tarkka "
"hakemistorakenne, mutta vain s390:n tiedostot ja suoritinperheestä "
"riippumattomat tiedostot tarvitaan. Kaikkien asennusromppujen sisältö "
"voidaan myös kopioida tuollaiseen hakemistopuuhun."
diff --git a/po/fi/random-bits.po b/po/fi/random-bits.po
index 9aaa2c665..30791dc08 100644
--- a/po/fi/random-bits.po
+++ b/po/fi/random-bits.po
@@ -838,26 +838,26 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "&debian;in asentaminen Unix/Linux-järjestelmästä."
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "&debian-gnu;in asentaminen Unix/Linux-järjestelmästä."
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
-"Tämä luku selittää miten &debian; asennetaan koneessa jo olevasta Unix- tai "
+"Tämä luku selittää miten &debian-gnu; asennetaan koneessa jo olevasta Unix- tai "
"Linux-järjestelmästä käyttämättä valikkopohjaista asenninta josta muut osat "
"tätä ohjetta kertovat. Tämä ohjetta <quote>ristiinasennuksesta</quote> ovat "
-"pyytäneet käyttäjät jotka vaihtavat &debian;iin järjestelmistä Red Hat, "
+"pyytäneet käyttäjät jotka vaihtavat &debian-gnu;iin järjestelmistä Red Hat, "
"Mandrake ja SUSE. Tässä luvussa edellytetään jonkinlaista kokemusta *nix-"
"komennoista ja tiedostojärjestelmässä liikkumisesta. Tässä luvussa <prompt>"
"$</prompt> tarkoittaa komentoa joka kirjoitetaan koneessa jo olevassa "
@@ -870,13 +870,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"Kun uuden Debian-järjestelmän asetukset on saatu mieleisiksi, voidaan vanhan "
"järjestelmän käyttäjien tiedot (jos niitä on) siirtää ja jatkaa koneen "
-"käyttöä. Kyseessä on siis &debian; asennus <quote>ilman alhaallaoloaikaa</"
+"käyttöä. Kyseessä on siis &debian-gnu; asennus <quote>ilman alhaallaoloaikaa</"
"quote>. Tämä on myös näppärä keino jos laitteiston kanssa on vaikeuksia "
"käynnistys- ja asennustaltioiden kanssa."
@@ -1084,11 +1084,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"Jos &releasename; &debian; -romppu on liitettynä hakemistoon <filename>/"
+"Jos &releasename; &debian-gnu; -romppu on liitettynä hakemistoon <filename>/"
"cdrom</filename>, voidaan http URL korvata tiedostoon viittaavalla URL:llä: "
"<userinput>file:/cdrom/debian/</userinput>"
@@ -1676,12 +1676,12 @@ msgstr "Käynnistyslataimen asetukset"
#: random-bits.xml:765
#, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"&debian; -järjestelmä saadaan käynnistyskelpoiseksi säätämällä "
+"&debian-gnu; -järjestelmä saadaan käynnistyskelpoiseksi säätämällä "
"käynnistyslatain lataamaan asennettu ydin ja käyttämään uutta "
"juuritiedostojärjestelmää. Huomaa ettei <command>debootstrap</command> "
"asenna käynnistyslatainta, mutta sen voi asentaa komennolla "
@@ -1908,19 +1908,19 @@ msgstr "# aptitude clean"
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "&debian;:in asennus käyttäen Parallel Line IP:tä (PLIP)"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "&debian-gnu;:in asennus käyttäen Parallel Line IP:tä (PLIP)"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
-"Tässä luvussa kerrotaan miten &debian; asennetaan tietokoneelle jossa ei ole "
+"Tässä luvussa kerrotaan miten &debian-gnu; asennetaan tietokoneelle jossa ei ole "
"Ethernetliitäntää, vain yhdyskäytävänä toimiva etätietokone johon on yhteys "
"nollamodeemikaapelilla (eli nollatulostinkaapelilla). Yhdyskäytäväkoneen "
"olisi oltava verkossa jossa on Debianin asennuspalvelimen kopio (esim. "
@@ -2193,8 +2193,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "&debian;:in asennus käyttäen PPPP over Ethernet:tiä (PPPoE)"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "&debian-gnu;:in asennus käyttäen PPPP over Ethernet:tiä (PPPoE)"
#. Tag: para
#: random-bits.xml:1048
diff --git a/po/fi/using-d-i.po b/po/fi/using-d-i.po
index b26519145..f7f654337 100644
--- a/po/fi/using-d-i.po
+++ b/po/fi/using-d-i.po
@@ -570,9 +570,9 @@ msgstr "base-installer"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
+"operate under &debian-gnu; when rebooted."
msgstr ""
-"Asennetaan niukin peruskokoonpano, jolla &debian; saadaan käyttöön tietokonetta "
+"Asennetaan niukin peruskokoonpano, jolla &debian-gnu; saadaan käyttöön tietokonetta "
"käynnistettäessä."
#. Tag: term
@@ -789,12 +789,12 @@ msgstr "Käytettävissä olevan muistin määrä / niukan muistin tila"
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"Asentimen ensimmäisiä toimia on käytettävissä olevan muistin määrän "
"selvittäminen. Jos muistin määrä on rajoitettu, tämä osa muuttaa "
-"asennustapahtumaa mahdollistamaan &debian; -järjestelmän asentamisen."
+"asennustapahtumaa mahdollistamaan &debian-gnu; -järjestelmän asentamisen."
#. Tag: para
#: using-d-i.xml:458
@@ -3579,7 +3579,7 @@ msgstr "Tehdään apt:n asetukset"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -3595,7 +3595,7 @@ msgid ""
"<command>aptitude</command> is now the recommended utility for package "
"management."
msgstr ""
-"Eräs &debian;iin paketteja asentava työkalu on ohjelma nimeltä <command>apt-"
+"Eräs &debian-gnu;iin paketteja asentava työkalu on ohjelma nimeltä <command>apt-"
"get</command> joka tulee ohjelmapaketissa <classname>apt</classname>."
"<footnote> <para> Huomaa, että asennukset tekevä ohjelma on itse asiassa "
"<command>dpkg</command>. Se on kuitenkin alemman tason työkalu. <command>apt-"
@@ -4738,7 +4738,7 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"Uudet (vuoden 1998 jälkeiset) PowerMac:it käyttävät käynnistyslatainta "
"<command>yaboot</command>. Asennin tekee <command>yaboot</command>:n "
@@ -4746,7 +4746,7 @@ msgstr ""
"quote>-niminen osio tyypiltään <emphasis>Apple_Bootstrap</emphasis>. Osio "
"piti luoda aiemmin osioinnin yhteydessä. Jos tämä vaihe sujuu virheittä, "
"järjestelmän pitäisi pystyä käynnistymään levyltä ja OpenFirmware on valittu "
-"käynnistämään &debian;."
+"käynnistämään &debian-gnu;."
#. Tag: title
#: using-d-i.xml:2964
@@ -4957,7 +4957,7 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
diff --git a/po/fi/welcome.po b/po/fi/welcome.po
index 1e4a4036c..b7fae47e0 100644
--- a/po/fi/welcome.po
+++ b/po/fi/welcome.po
@@ -25,12 +25,12 @@ msgstr "Tervetuloa Debianin pariin"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"Tässä luvussa on katsaus Debian-projektiin ja &debian; -jakeluun. Jos olet "
-"jo perehtynyt Debian-projektin historiaan ja &debian; -jakeluun, voit "
+"Tässä luvussa on katsaus Debian-projektiin ja &debian-gnu; -jakeluun. Jos olet "
+"jo perehtynyt Debian-projektin historiaan ja &debian-gnu; -jakeluun, voit "
"halutessasi siirtyä seuraavaan lukuun."
#. Tag: title
@@ -566,13 +566,13 @@ msgstr "Debianin hankkiminen"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"Tietoa &debian; -jakelun noutamisesta Internetistä tai Debian-romppujen "
+"Tietoa &debian-gnu; -jakelun noutamisesta Internetistä tai Debian-romppujen "
"ostopaikoista löytyy <ulink url=\"&url-debian-distrib;\">Debianin "
"hankkiminen</ulink> -sivulta. <ulink url=\"&url-debian-mirrors;\">Luettelo "
"asennuspalvelimen kopioista</ulink> sisältää kaikki Debianin viralliset "
@@ -602,13 +602,13 @@ msgstr "Tämän ohjeen uusimman version hankkiminen"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"Tätä ohjetta muokataan jatkuvasti. Muista tarkistaa <ulink url=\"&url-"
"release-area;\">Debianin version &release; sivuilta</ulink> viimeisimmät "
-"tiedot Debianin &release; &debian; -julkaisusta. Tämän asennusohjeen "
+"tiedot Debianin &release; &debian-gnu; -julkaisusta. Tämän asennusohjeen "
"päivitettyjä versioita on saatavilla myös <ulink url=\"&url-install-manual;"
"\">virallisilta asennusohjeen sivuilta</ulink>."
@@ -652,11 +652,11 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"Pääpiirteissään tämä ohje on tarkoitettu luettavaksi järjestyksessä, jolloin "
-"asennus käydään läpi vaiheittain alusta loppuun. Tässä ovat &debian;in "
+"asennus käydään läpi vaiheittain alusta loppuun. Tässä ovat &debian-gnu;in "
"asennuksen vaiheet ja tämän ohjeen vastaavat luvut:"
#. Tag: para
@@ -805,7 +805,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -816,7 +816,7 @@ msgstr ""
"tulevista käyttöehdoista &mdash; tavallisesti ohjelmasta saa käyttää yhtä "
"kopiota yhdellä tietokoneella. Tämän järjestelmän käyttöehdot eivät ole "
"lainkaan samanlaiset. Olisi jopa hyväkin jos käyttäjä asentaisi kopion "
-"&debian; -jakelusta jokaiseen tietokoneeseen koulussa tai työpaikalla. "
+"&debian-gnu; -jakelusta jokaiseen tietokoneeseen koulussa tai työpaikalla. "
"Lainaa asennustaltio kavereillesi ja auta heitä asentamaan se "
"tietokoneelleen! Voit jopa tehdä tuhansia kopioita <emphasis>myytäväksi</"
"emphasis>; tosin muutamia reunaehtoja on. Järjestelmän asentamisen ja käytön "
diff --git a/po/hu/bookinfo.po b/po/hu/bookinfo.po
index 3bfef52d4..961e73cd6 100644
--- a/po/hu/bookinfo.po
+++ b/po/hu/bookinfo.po
@@ -19,20 +19,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "&debian; Telepítési Útmutató"
+msgid "&debian-gnu; Installation Guide"
+msgstr "&debian-gnu; Telepítési Útmutató"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"E dokumentum tartalmazza a telepítő leírást a &debian; &release; rendszerhez "
+"E dokumentum tartalmazza a telepítő leírást a &debian-gnu; &release; rendszerhez "
"(kódnév: <quote>&releasename;</quote>) &arch-title; (<quote>&architecture;</"
"quote>) architektúrára. További leírásokra is mutat és szól egy új Debian "
"telepítés leghasznosabb beállítási lehetőségeiről is."
diff --git a/po/hu/boot-installer.po b/po/hu/boot-installer.po
index a66a9b4df..71af9601c 100644
--- a/po/hu/boot-installer.po
+++ b/po/hu/boot-installer.po
@@ -492,7 +492,7 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
#. Tag: title
diff --git a/po/hu/boot-new.po b/po/hu/boot-new.po
index 29507f355..961ea9d47 100644
--- a/po/hu/boot-new.po
+++ b/po/hu/boot-new.po
@@ -189,12 +189,12 @@ msgstr "Újabb PowerMacek"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"G4 gépeken és iBookokon, nyomd le az <keycap>option</keycap> billentyűt, "
"mellyel kaphatsz egy rajzos képernyőt valamennyi indítható OS gombjaival, a "
-"&debian; gombján egy kis pingvin lesz."
+"&debian-gnu; gombján egy kis pingvin lesz."
#. Tag: para
#: boot-new.xml:104
@@ -226,16 +226,16 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
-"G3 és G4 gépen az OpenFirmware visszaállítása segítségével a &debian; már "
+"G3 és G4 gépen az OpenFirmware visszaállítása segítségével a &debian-gnu; már "
"alapértelmezetten elindul (ha helyesen particionáltál és az Apple_Bootstrap "
-"partíciót 1. helyre helyezted). Ha a &debian; egy SCSI a MacOS egy IDE "
+"partíciót 1. helyre helyezted). Ha a &debian-gnu; egy SCSI a MacOS egy IDE "
"lemezen van, lehet, hogy ehhez még az OpenFirmware <envar>boot-device</"
"envar> változóját ne kell állítani, a szokásos <command>ybin</command> "
"program általában ezt automatikusan megteszi."
@@ -244,13 +244,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"Miután a &debian; rendszeredet először elindítottad, mindent beállíthatsz "
+"Miután a &debian-gnu; rendszeredet először elindítottad, mindent beállíthatsz "
"(például kettős vagy többes indítási lehetőséget) a <filename>/etc/yaboot."
"conf</filename> fájlban és a yaboot <command>ybin</command> paranccsal "
"frissítheted az indító partíciót a módosított beállítáokkal. Részletek a "
diff --git a/po/hu/hardware.po b/po/hu/hardware.po
index f8acde28f..e8fc2d8d0 100644
--- a/po/hu/hardware.po
+++ b/po/hu/hardware.po
@@ -50,14 +50,14 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"A Debian nem igényel a Linux és a GNU eszköz-készletek által kívántnál több "
"hardvert. Ezért minden gépen, melyen a Linux kernel, a libc, a <command>gcc</"
"command> és a többi fut, és melyre a Debian portolva van, futtatható a "
"Debian. Lásd a Debian portok oldalát a <ulink url=\"&url-ports;\"></ulink> "
"címen a jelen &arch-title; architektúra rendszerekről, melyek teszteltek a "
-"&debian; rendszerrel."
+"&debian-gnu; rendszerrel."
#. Tag: para
#: hardware.xml:32
@@ -476,7 +476,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -485,7 +485,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"Az a &debian; 1. hivatalos &arch-title; kiadása. Tapasztalataink szerint "
+"Az a &debian-gnu; 1. hivatalos &arch-title; kiadása. Tapasztalataink szerint "
"megérett a kiadásra. De mivel még kevesebb felhasználó tesztelte, ezért "
"nagyobb az esély, hogy találsz benne hibát. Kérjük, a <ulink url=\"&url-bts;"
"\">Hibakövető rendszer</ulink> segítségével jelents minden hibát; említsd "
@@ -853,7 +853,7 @@ msgstr ""
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
@@ -1893,7 +1893,7 @@ msgstr "Drótnélküli hálózati kártyák"
#| "Wireless NICs are in general supported as well, with one big proviso. A "
#| "lot of wireless adapters require drivers that are either non-free or have "
#| "not been accepted into the official &arch-kernel; kernel. These NICs can "
-#| "generally be made to work under &debian;, but are not supported during "
+#| "generally be made to work under &debian-gnu;, but are not supported during "
#| "the installation."
msgid ""
"Wireless networking is in general supported as well and a growing number of "
@@ -1905,7 +1905,7 @@ msgid ""
msgstr ""
"A drótnélküli csatolók általában szintén támogatottak, egy nagy előszóval. "
"Sok drótnélküli adapter nem-szabad vagy a hivatalos &arch-kernel; kernelben most nem "
-"elfogadott meghajtót igényel. E csatolók általában elindíthatók &debian; "
+"elfogadott meghajtót igényel. E csatolók általában elindíthatók &debian-gnu; "
"alatt, de a telepítőben nem támogatottak."
#. Tag: para
@@ -1915,16 +1915,16 @@ msgstr ""
#| "Wireless NICs are in general supported as well, with one big proviso. A "
#| "lot of wireless adapters require drivers that are either non-free or have "
#| "not been accepted into the official &arch-kernel; kernel. These NICs can "
-#| "generally be made to work under &debian;, but are not supported during "
+#| "generally be made to work under &debian-gnu;, but are not supported during "
#| "the installation."
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
"A drótnélküli csatolók általában szintén támogatottak, egy nagy előszóval. "
"Sok drótnélküli adapter nem-szabad vagy a hivatalos Linux kernelben most nem "
-"elfogadott meghajtót igényel. E csatolók általában elindíthatók &debian; "
+"elfogadott meghajtót igényel. E csatolók általában elindíthatók &debian-gnu; "
"alatt, de a telepítőben nem támogatottak."
#. Tag: para
@@ -1941,17 +1941,17 @@ msgstr ""
#, fuzzy, no-c-format
#| msgid ""
#| "If there is no other NIC you can use during the installation, it is still "
-#| "possible to install &debian; using a full CD-ROM or DVD image. Use the "
+#| "possible to install &debian-gnu; using a full CD-ROM or DVD image. Use the "
#| "same procedure as described above for NICs that require firmware."
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
"(after the reboot) and configure your network manually."
msgstr ""
-"Ha nincs más NIC a telepítés alatt, a &debian; telepítése még mindig "
+"Ha nincs más NIC a telepítés alatt, a &debian-gnu; telepítése még mindig "
"lehetésges teljes CD-ROM vagy DVD kép használatával. Élj azzal az "
"eljárással, ami fent le van írva a firmware-t igénylő csatolók esetén."
@@ -2056,7 +2056,7 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
@@ -2076,7 +2076,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
@@ -2163,9 +2163,9 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
@@ -2175,7 +2175,7 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
@@ -2596,12 +2596,12 @@ msgstr "Un*x vagy GNU rendszer"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
-"Ha más Unix-szerű rendszert futtatsz, használhatod a &debian; telepítésére a "
+"Ha más Unix-szerű rendszert futtatsz, használhatod a &debian-gnu; telepítésére a "
"&d-i; nélkül e kézikönyvben is leírt módon. Ez hasznos a másképp nem-"
"támogatott hardvert használóknak vagy ha a gépen a telepítéskor nem lehet "
"üzemszünet. E technikáról lásd a <xref linkend=\"linux-upgrade\"/> részt."
@@ -3607,21 +3607,21 @@ msgstr ""
#~ msgid ""
#~ "If there is no other NIC you can use during the installation, it is still "
-#~ "possible to install &debian; using a full CD-ROM or DVD image. Select the "
+#~ "possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the "
#~ "option to not configure a network and install using only the packages "
#~ "available from the CD/DVD. You can then install the driver and firmware "
#~ "you need after the installation is completed (after the reboot) and "
#~ "configure your network manually. Note that the firmware may be packaged "
#~ "separately from the driver and may not be available in the <quote>main</"
-#~ "quote> section of the &debian; archive."
+#~ "quote> section of the &debian-gnu; archive."
#~ msgstr ""
-#~ "Ha nincs más NIC a telepítés alatt, a &debian; telepítése még mindig "
+#~ "Ha nincs más NIC a telepítés alatt, a &debian-gnu; telepítése még mindig "
#~ "lehetésges teljes CD-ROM vagy DVD kép használatával. Válaszd a hálózat "
#~ "beállítás elhalasztása lehetőséget és telepítsd csak a CD/DVD lemezen "
#~ "elérhető csomagokból. A telepítés végeztével (az újraindítás után) "
#~ "telepítheted a szükséges meghajtót és firmware-t és beállíthatod a "
#~ "hálózatot. Fontos, hogy a firmware a meghajtótól külön csomagolva lehet "
-#~ "és lehet, hogy nem elérhető a <quote>fő</quote> szakaszban a &debian; "
+#~ "és lehet, hogy nem elérhető a <quote>fő</quote> szakaszban a &debian-gnu; "
#~ "archívumban."
#~ msgid ""
diff --git a/po/hu/install-methods.po b/po/hu/install-methods.po
index 99ea52bc2..bf03d13b9 100644
--- a/po/hu/install-methods.po
+++ b/po/hu/install-methods.po
@@ -25,14 +25,14 @@ msgstr "A rendszer telepítő média elérése"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "Hivatalos &debian; CD-ROM készletek"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "Hivatalos &debian-gnu; CD-ROM készletek"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -45,7 +45,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"A &debian; legegyszerűbb telepítése a Hivatalos Debian CD-ROM Készlet "
+"A &debian-gnu; legegyszerűbb telepítése a Hivatalos Debian CD-ROM Készlet "
"segítségével lehetséges. Ez boltban is megvásárolható (lásd a <ulink url="
"\"&url-debian-cd-vendors;\">CD-forgalmazók oldalát</ulink>). A CD-ROM képek "
"letölthetők egy Debian tükörről is, így egy közepes hálózati kapcsolattal és "
@@ -574,7 +574,7 @@ msgstr ""
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
@@ -1588,7 +1588,7 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
@@ -1661,12 +1661,12 @@ msgstr "Egy DHCP kiszolgáló beállítása"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
-"Egy szabad DHCP kiszolgáló az ISC <command>dhcpd</command>. A &debian; "
+"Egy szabad DHCP kiszolgáló az ISC <command>dhcpd</command>. A &debian-gnu; "
"rendszerben a <classname>dhcp3-server</classname> csomagban van. Itt egy "
"példa beállító fájl (lásd: <filename>/etc/dhcp3/dhcpd.conf</filename>):"
@@ -1829,13 +1829,13 @@ msgstr "BOOTP kiszolgáló beállítása"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"2 BOOTP kiszolgáló van GNU/Linux alatt. Az 1. a CMU <command>bootpd</"
"command>. A másik egy DHCP kiszolgáló: az ISC <command>dhcpd</command>. A "
-"&debian; rendszerben ezek a <classname>bootp</classname> és <classname>dhcp3-"
+"&debian-gnu; rendszerben ezek a <classname>bootp</classname> és <classname>dhcp3-"
"server</classname> csomagokban vannak."
#. Tag: para
@@ -1843,7 +1843,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -1873,7 +1873,7 @@ msgid ""
"userinput> variable is the machine's MAC address. </phrase>"
msgstr ""
"A CMU <command>bootpd</command> használatához a <filename>/etc/inetd.conf</"
-"filename> megfelelő sora kell. A &debian; rendszeren így érdemes: "
+"filename> megfelelő sora kell. A &debian-gnu; rendszeren így érdemes: "
"<userinput>update-inetd --enable bootps</userinput>, majd <userinput>/etc/"
"init.d/inetd reload</userinput>. Csak arra az esetre mutatjuk, ha a BOOTP "
"kiszolgáló nem Debian rendszert futtatna, a kérdéses sor így áll össze: "
@@ -1963,14 +1963,14 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
"configuration examples in this section accordingly."
msgstr ""
"Régen a TFTP kiszolgálók a <filename>/tftpboot</filename> könyvtárat "
-"használták képek adására. De a &debian; csomagok képesek a <ulink url=\"&url-"
+"használták képek adására. De a &debian-gnu; csomagok képesek a <ulink url=\"&url-"
"fhs-home;\">Fájlrendszer Hierarchia Szabványnak</ulink> megfelelő könyvtárak "
"használatára. Például a <classname>tftpd-hpa</classname> alapban a "
"<filename>/var/lib/tftpboot</filename> könyvtárat használja. Állítsd be az e "
@@ -2195,13 +2195,13 @@ msgstr ""
#~ msgid ""
#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "a &debian-gnu; server, the <classname>atftpd</classname> and <classname>tftpd-"
#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
#~ "classname>."
#~ msgstr ""
#~ "A TFTP indítás indítás-előtti futtatási környezet (PXE) módja "
#~ "használatához <userinput>tsize</userinput> támogató TFTP kiszolgáló kell. "
-#~ "Egy &debian; kiszolgálón az <classname>atftpd</classname> és "
+#~ "Egy &debian-gnu; kiszolgálón az <classname>atftpd</classname> és "
#~ "<classname>tftpd-hpa</classname> csomagok ilyenek; a <classname>tftpd-"
#~ "hpa</classname>-t ajánljuk."
diff --git a/po/hu/installation-howto.po b/po/hu/installation-howto.po
index 385374be4..10bbdb291 100644
--- a/po/hu/installation-howto.po
+++ b/po/hu/installation-howto.po
@@ -26,14 +26,14 @@ msgstr "Telepítő Hogyan"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
"useful, we will link to more detailed explanations in other parts of this "
"document."
msgstr ""
-"E dokumentum leírja a &debian; &releasename; telepítését &arch-title; "
+"E dokumentum leírja a &debian-gnu; &releasename; telepítését &arch-title; "
"(<quote>&architecture;</quote>) gépre az új &d-i; által. Ez a telepítés "
"lépéseinek gyors áttekintése, mely tartalmazza a legtöbb telepítéshez "
"szükséges összes adatot. Ahol több adat is hasznos lehet, hivatkozunk e "
diff --git a/po/hu/partitioning.po b/po/hu/partitioning.po
index 0426fbe88..3b0460d8b 100644
--- a/po/hu/partitioning.po
+++ b/po/hu/partitioning.po
@@ -122,13 +122,13 @@ msgstr "A könyvtárfa"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"A &debian; a <ulink url=\"&url-fhs-home;\">Fájlrendszer Hierarchia Szabvány</"
+"A &debian-gnu; a <ulink url=\"&url-fhs-home;\">Fájlrendszer Hierarchia Szabvány</"
"ulink>-t követi. E szabvánnyal a felhasználók és programok számára "
"megjósolható a fájlok és könyvtárak helye. A gyökér szintű könyvtárat a "
"<filename>/</filename> jelenti. A gyökér szintjén minden Debian rendszer "
@@ -1093,13 +1093,13 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"A Linux a meghajtónként partíciók számát 15 partícióra korlátozza SCSI "
"lemezeknél (3 használható elsődleges és 12 logikai) és 63 partícióra IDE "
-"meghajtón (3 használható elsődleges és 60 logikai). De a &debian; rendszer "
+"meghajtón (3 használható elsődleges és 60 logikai). De a &debian-gnu; rendszer "
"csak 20 eszközt rendel partíciókhoz, így telepítésre 20 partíciót "
"használhatsz míg nem hozol előbb létre eszközöket továbbiakhoz."
@@ -1375,7 +1375,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
diff --git a/po/hu/post-install.po b/po/hu/post-install.po
index 08693d5d2..cf64e9bdb 100644
--- a/po/hu/post-install.po
+++ b/po/hu/post-install.po
@@ -32,14 +32,14 @@ msgstr "A rendszer leállítása"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"Egy futó &debian; rendszer leállításánál szerencsére mellőzhető a gép "
+"Egy futó &debian-gnu; rendszer leállításánál szerencsére mellőzhető a gép "
"durva, azonnali áramtalanítása az újraindító vagy kapcsoló gombbal, "
"irányított módon tesszük ezt, így a fájlok vagy a lemez nem sérülhet. Amikor "
"egy asztali környezetet futtatsz, általában megleled a <quote>kijelentkezés</"
diff --git a/po/hu/preface.po b/po/hu/preface.po
index a2484618d..cb816c9e7 100644
--- a/po/hu/preface.po
+++ b/po/hu/preface.po
@@ -19,22 +19,22 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "A &debian; &release; telepítése &architecture;-felépítésű gépre"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "A &debian-gnu; &release; telepítése &architecture;-felépítésű gépre"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Örülünk annak, hogy úgy döntöttél, kipróbálod a Debian-t, és biztosak "
"vagyunk benne, hogy a Debian alkotta GNU/&arch-kernel; terjesztést egyedülállónak "
-"fogod találni. A &debian; összehozza a világ legjobb szabad szoftvereit, és "
+"fogod találni. A &debian-gnu; összehozza a világ legjobb szabad szoftvereit, és "
"egy egységes egészbe fogja őket. Így az eredmény sokkal több, mint az egyes "
"részek összege."
diff --git a/po/hu/preparing.po b/po/hu/preparing.po
index 8af6297a9..f56cb1a86 100644
--- a/po/hu/preparing.po
+++ b/po/hu/preparing.po
@@ -19,8 +19,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "A &debian; telepítése előtt"
+msgid "Before Installing &debian-gnu;"
+msgstr "A &debian-gnu; telepítése előtt"
#. Tag: para
#: preparing.xml:6
@@ -70,7 +70,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -80,7 +80,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"A &debian; esetében a rendszer szinte mindig javítható, ha valami "
+"A &debian-gnu; esetében a rendszer szinte mindig javítható, ha valami "
"tönkremegy. A frissítések sohasem igényelnek teljes újratelepítést. A "
"programok szinte mindig kompatibilisek a rendszer új kiadásaival. Ha egy "
"program új változata újabb támogató szoftvereket igényel, a Debian csomagoló "
@@ -202,11 +202,11 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
"Telepíts egy <firstterm>boot betöltő</firstterm> programot, mely képes "
-"indítani a &debian; rendszert és/vagy a gépen már meglévő más rendszert."
+"indítani a &debian-gnu; rendszert és/vagy a gépen már meglévő más rendszert."
#. Tag: para
#: preparing.xml:134
@@ -283,7 +283,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"Fontos, hogy a telepítés alatt telepítünk-e grafikus asztali környezetet "
@@ -291,7 +291,7 @@ msgstr ""
"környezetből áll. Ha kiveszed az <quote>Asztali környezet</quote> feladatot, "
"csak egy alap, főleg parancssor-vezérelt rendszert kapsz. Az Asztali "
"környezet feladat telepítése opcionális, mert sok helyet foglal és mert sok "
-"&debian; rendszer alapvetően kiszolgáló, melynek nincs szüksége grafikus "
+"&debian-gnu; rendszer alapvetően kiszolgáló, melynek nincs szüksége grafikus "
"felhasználói felületre."
#. Tag: para
@@ -321,7 +321,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -330,7 +330,7 @@ msgid ""
msgstr ""
"A telepítés előtt, mentsd el fontos fájljaid. Ha most először telepítesz egy "
"nem a géppel szállított operációs rendszert, valószínűleg újra kell "
-"particionálnod a lemezt, hogy helyet csinálj a &debian; rendszernek. Egy "
+"particionálnod a lemezt, hogy helyet csinálj a &debian-gnu; rendszernek. Egy "
"lemez particionálásakor mindig számításba kell venni az adatok elvesztését, "
"függetlenül a használt programtól. A telepítéskor használt programok elég "
"megbízhatók és évek óta használtak, de épp, mivel nagyon hatásosak, a "
@@ -1129,7 +1129,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1139,7 +1139,7 @@ msgid ""
"least 200MB for <filename>/var</filename>, and a lot more if you install a "
"graphical desktop environment."
msgstr ""
-"A &debian; rendszer alapjainak sima használatához szükséges helyet szintén "
+"A &debian-gnu; rendszer alapjainak sima használatához szükséges helyet szintén "
"beszámítottuk ezekbe az ajánlott rendszer-követelményekbe. Főleg a "
"<filename>/var</filename> tartalmaz sok állapot adatot a Debian rendszerről "
"szabványos napló fájljaival együtt. A <command>dpkg</command> fájlok (a "
@@ -1259,7 +1259,7 @@ msgstr ""
#, fuzzy, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1270,7 +1270,7 @@ msgid ""
"some alternate means of reviving your machine like the original system's "
"installation tapes or CDs."
msgstr ""
-"Ha a gépben 1 merevlemez van és teljesen a &debian; rendszerre szánnád, "
+"Ha a gépben 1 merevlemez van és teljesen a &debian-gnu; rendszerre szánnád, "
"szintén el is kezdheted a telepítést, a telepítő rendszer elindítása után "
"particionál (<xref linkend=\"partman\"/>). De ez csak akkor megy, mikor a "
"telepítőt szalagos vagy CD-ROM eszközről vagy kapcsolt gépen lévő fájlokról "
@@ -1315,7 +1315,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1324,7 +1324,7 @@ msgstr ""
"rendszerek fogják használni, azok saját particionáló programjaival is létre "
"lehet majd hozni. Egyes particionáló programok hibái miatt ajánljuk, "
"<emphasis>ne</emphasis> más rendszerek particionáló programjaival hozd létre "
-"a &debian; partícióit. Legfeljebb azok saját partícióit hozd majd létre "
+"a &debian-gnu; partícióit. Legfeljebb azok saját partícióit hozd majd létre "
"azokkal."
#. Tag: para
@@ -1356,7 +1356,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the &arch-parttype; "
+"In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype; "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a &arch-parttype; placeholder partition to come <emphasis>before</"
@@ -1365,7 +1365,7 @@ msgid ""
"placeholder with the Debian partition tools later during the actual install, "
"and replace it with &arch-parttype; partitions."
msgstr ""
-"Annak érdekében, hogy az OpenFirmware automatikusan indítsa a &debian; "
+"Annak érdekében, hogy az OpenFirmware automatikusan indítsa a &debian-gnu; "
"rendszert, előbb a &arch-parttype; partícióknak meg kell előzniük másokat, főleg a "
"MacOS indító partíciókat. Erre figyelni kell particionáláskor. Létre kell "
"hozni egy &arch-parttype; hely-fenntartó partíciót más indítható partíciók "
@@ -1409,11 +1409,11 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"Használd a partíciós eszközöket az adott rendszer partíciói létrehozásához. "
"Az elején feltétlenül hagyj egy hely-fenntartó partíciót vagy üres helyet a "
-"&debian; számára."
+"&debian-gnu; számára."
#. Tag: para
#: preparing.xml:903
@@ -1725,7 +1725,7 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
#. Tag: para
@@ -1771,14 +1771,14 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"E szakasz átvisz a telepítés-előtti hardver beállításon, ha van, ami "
"szükséges a Debian telepítése előtt. Általában ellenőrizzük, és ha kell "
"cseréljük a firmware beállításokat. A <quote>firmware</quote> a hardverbe "
"épített mag szoftver; általában az indítási folyamatban játszik szerepet (a "
-"bekapcsolás után). A &debian; megbízhatóságára ható jól ismert hardver "
+"bekapcsolás után). A &debian-gnu; megbízhatóságára ható jól ismert hardver "
"gondokat is hangsúlyozzuk."
#. Tag: title
@@ -2431,7 +2431,7 @@ msgstr "BIOS beállítás"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2440,7 +2440,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"A &debian; telepítéséhez &arch-title; vagy zSeries gépen először el kell "
+"A &debian-gnu; telepítéséhez &arch-title; vagy zSeries gépen először el kell "
"indítani egy kernelt a rendszeren. E platform indító módja teljesen eltér "
"másoktól, főleg a PC-jellegű rendszerektől: még flopik sincsenek. A másik "
"nagy eltérés, hogy általában (ha nem mindig) távolról dolgozol egy ügyfél "
@@ -2570,11 +2570,11 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
-"A telepítő kiszolgálóra egy &debian; tükör könyvtár felépítése kell, de csak "
+"A telepítő kiszolgálóra egy &debian-gnu; tükör könyvtár felépítése kell, de csak "
"az s390 és gép-független fájlok kötelezők. Egy telepítő CD tartalma is "
"odamásolható."
@@ -2966,14 +2966,14 @@ msgstr ""
#~ "system load, you have only a very basic command line driven system. The "
#~ "graphical interface which displays windows on your monitor will not be "
#~ "installed unless you select it with <classname>tasksel</classname>. It's "
-#~ "optional because many &debian; systems are servers which don't really "
+#~ "optional because many &debian-gnu; systems are servers which don't really "
#~ "have any need for a graphical user interface to do their job."
#~ msgstr ""
#~ "Mikor a <classname>debian-installer</classname> végzett, a rendszer 1. "
#~ "betöltése előtt csak egy nagyon kis, parancs-vezérelt rendszer áll épp "
#~ "készen. A grafikus felület, mely ablakokat jelenít meg, csak a "
#~ "<classname>tasksel</classname> által települ. Ez választható, mert sok "
-#~ "&debian; rendszer kiszolgálóként üzemel, melynek nincs szüksége grafikus "
+#~ "&debian-gnu; rendszer kiszolgálóként üzemel, melynek nincs szüksége grafikus "
#~ "felhasználói felületre."
#~ msgid "<entry>RAM</entry>"
diff --git a/po/hu/random-bits.po b/po/hu/random-bits.po
index cca2cf2a9..939941d58 100644
--- a/po/hu/random-bits.po
+++ b/po/hu/random-bits.po
@@ -844,26 +844,26 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "A &debian; telepítése egy Unix/Linux rendszerből"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "A &debian-gnu; telepítése egy Unix/Linux rendszerből"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
-"E szakasz leírja, hogyan telepítsd a &debian; rendszeredet létező Unix vagy "
+"E szakasz leírja, hogyan telepítsd a &debian-gnu; rendszeredet létező Unix vagy "
"Linux rendszer alól a menü-vezérelt telepítő nélkül, amit már leírtunk e "
"kézikönyvben. E <quote>kereszt-telepítő</quote> HOGYAN leírást seregnyi "
-"felhasználónk kérte, akik &debian; rendszerre váltanak mégpedig üzemszünet "
+"felhasználónk kérte, akik &debian-gnu; rendszerre váltanak mégpedig üzemszünet "
"nélkül például Red Hat, Mandrake és SUSE disztribúciókról. A szakasz azért "
"feltételezi legalább a legalapvetőbb *nix parancsok és fájlrendszer "
"ismeretét. E szakaszban a <prompt>$</prompt> a felhasználó mostani "
@@ -876,13 +876,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"A Debian telepítés végeztével átviheted rá létező felhasználói adataidat (ha "
"vannak), és folyamatosan életben tarthatod. Ezért ez egy <quote>zéró "
-"leállású</quote> &debian; telepítés. A különböző indító vagy telepítő "
+"leállású</quote> &debian-gnu; telepítés. A különböző indító vagy telepítő "
"médiával nem baráti hardverekkel is el lehet így bánni."
#. Tag: para
@@ -1078,11 +1078,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"Egy <filename>/cdrom</filename> könyvtárba csatolt &releasename; &debian; CD "
+"Egy <filename>/cdrom</filename> könyvtárba csatolt &releasename; &debian-gnu; CD "
"esetén fájl URL is megadható: <userinput>file:/cdrom/debian/</userinput>"
#. Tag: para
@@ -1711,12 +1711,12 @@ msgstr "A boot betöltő beállítása"
#: random-bits.xml:765
#, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"A &debian; rendszer indíthatóvá tételéhez, állítsd be a boot betöltőt a "
+"A &debian-gnu; rendszer indíthatóvá tételéhez, állítsd be a boot betöltőt a "
"telepített kernel indítására az új gyökér partícióval. A "
"<command>debootstrap</command> nem telepít boot betöltőt, de az "
"<command>aptitude</command> használható a Debian chroot környezetben erre."
@@ -1932,19 +1932,19 @@ msgstr "# aptitude clean"
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "A &debian; telepítése Parallel Line IP (PLIP) felett"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "A &debian-gnu; telepítése Parallel Line IP (PLIP) felett"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
-"E szakasz bemutatja, hogy telepítsük a &debian; rendszert hálózati tükörrel "
+"E szakasz bemutatja, hogy telepítsük a &debian-gnu; rendszert hálózati tükörrel "
"egy Ethernet kártya nélküli gépen, csak egy Null-Modem kábel (Null-Printer "
"kábel) által csatolt átjáró géppel. Az átjáró gép Debian tükröt elérő "
"hálózaton van (például Interneten)."
@@ -2211,8 +2211,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "A &debian; telepítése PPP over Ethernet (PPPoE) használatával"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "A &debian-gnu; telepítése PPP over Ethernet (PPPoE) használatával"
#. Tag: para
#: random-bits.xml:1048
@@ -2659,12 +2659,12 @@ msgstr ""
#~ "Etch is the first release that includes the graphical installer and uses "
#~ "some relatively new technology. There are a few known issues that you may "
#~ "run into during the installation. We expect to be able to fix these "
-#~ "issues for the next release of &debian;."
+#~ "issues for the next release of &debian-gnu;."
#~ msgstr ""
#~ "Az Etch az 1. olyan kiadás, mely grafikus telepítőt tartalmaz és nagyon "
#~ "friss technológiát használ. Van pár ismert lehetséges hiba, mely "
#~ "előfordulhat telepítéskor, ha arra a grafikus felületet választjuk. A "
-#~ "&debian; következő kiadására még ezek is javulnak."
+#~ "&debian-gnu; következő kiadására még ezek is javulnak."
#~ msgid ""
#~ "Support for creating encrypted partitions is limited as it is not "
diff --git a/po/hu/using-d-i.po b/po/hu/using-d-i.po
index b67d141fd..c34cc1523 100644
--- a/po/hu/using-d-i.po
+++ b/po/hu/using-d-i.po
@@ -578,9 +578,9 @@ msgstr "base-installer (alap-telepítő)"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
+"operate under &debian-gnu; when rebooted."
msgstr ""
-"Telepíti a legfontosabb csomagokat, mely lehetővé teszi a gép &debian; alatti "
+"Telepíti a legfontosabb csomagokat, mely lehetővé teszi a gép &debian-gnu; alatti "
"működtetését újraindítás után."
#. Tag: term
@@ -787,12 +787,12 @@ msgstr "Elérhető memória ellenőrzése / alacsony memória mód"
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"A &d-i; 1. tettei egyike, az elérhető memória ellenőrzése. Ha szűkös, ez az "
"összetevő egyes módosításokat végez a telepítő folyamatban, mely, ha minden "
-"jól megy még így is lehetővé teszi a &debian; telepítését e gépen."
+"jól megy még így is lehetővé teszi a &debian-gnu; telepítését e gépen."
#. Tag: para
#: using-d-i.xml:458
@@ -3533,7 +3533,7 @@ msgstr "Az apt beállítása"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -3549,7 +3549,7 @@ msgid ""
"<command>aptitude</command> is now the recommended utility for package "
"management."
msgstr ""
-"A &debian; egyik eszköze csomagok telepítésére az <command>apt-get</command> "
+"A &debian-gnu; egyik eszköze csomagok telepítésére az <command>apt-get</command> "
"program az <classname>apt</classname> csomagban<footnote> <para> A "
"csomagokat ténylegesen telepítő program a <command>dpkg</command>. De e "
"program alacsonyabb szintű eszköz. Az <command>apt-get</command> magasabb-"
@@ -4576,14 +4576,14 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"Az újabb (1998 közepe és később) PowerMacek a <command>yaboot</command> "
"betöltőt használják. A telepítő elvégzi a <command>yaboot</command> önműködő "
"beállítását, így az egyetlen teendő egy kis 820k méretű <quote>bootstrap</"
"quote> nevű <emphasis>Apple_Bootstrap</emphasis> típusú partíció létrehozása "
"a particionálóban. Ha minden rendben ment, a lemez indítható és az "
-"OpenFirmware beállításra kerül a &debian; indítására."
+"OpenFirmware beállításra kerül a &debian-gnu; indítására."
#. Tag: title
#: using-d-i.xml:2964
@@ -4788,7 +4788,7 @@ msgstr ""
#, fuzzy, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
diff --git a/po/hu/welcome.po b/po/hu/welcome.po
index de9b49a4a..4897053bb 100644
--- a/po/hu/welcome.po
+++ b/po/hu/welcome.po
@@ -26,12 +26,12 @@ msgstr "Üdvözlet a Debianban"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"E fejezet bemutatja a Debian projektet és a &debian; rendszert magát. Ha már "
-"ismered a Debian projekt történetét és a &debian; terjesztést, a következő "
+"E fejezet bemutatja a Debian projektet és a &debian-gnu; rendszert magát. Ha már "
+"ismered a Debian projekt történetét és a &debian-gnu; terjesztést, a következő "
"fejezetre ugorhatsz."
#. Tag: title
@@ -574,13 +574,13 @@ msgstr "A Debian beszerzése"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"A &debian; letöltéséről vagy CD lemezek megvásárlásáról lásd a <ulink url="
+"A &debian-gnu; letöltéséről vagy CD lemezek megvásárlásáról lásd a <ulink url="
"\"&url-debian-distrib;\">terjesztési weboldalt</ulink>. A <ulink url=\"&url-"
"debian-mirrors;\">Debian tükrök listája</ulink> tartalmazza a hivatalos "
"Debian tükrök teljes listáját, így könnyű meglelni a legközelebbit."
@@ -609,12 +609,12 @@ msgstr "E dokumentum legújabb változata"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"E dokumentum folyamatosan frissül. Ellenőrizd a <ulink url=\"&url-release-"
-"area;\"> Debian &release;</ulink> oldalt a &debian; &release; kiadás "
+"area;\"> Debian &release;</ulink> oldalt a &debian-gnu; &release; kiadás "
"legutóbbi adataiért. E telepítő kézikönyv frissített változatai a <ulink url="
"\"&url-install-manual;\">hivatalos Telepítő Kézikönyv oldalak</ulink> címen "
"vannak."
@@ -658,11 +658,11 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"Általában e kézikönyv sorban halad, végigvezet a telepítés folyamán "
-"indításától a befejezéséig. Itt vannak a &debian; telepítés lépései, és az "
+"indításától a befejezéséig. Itt vannak a &debian-gnu; telepítés lépései, és az "
"egyes fejezetek rendre követik ezeket:"
#. Tag: para
@@ -822,7 +822,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
diff --git a/po/ja/bookinfo.po b/po/ja/bookinfo.po
index b6293cfc3..b7a279e37 100644
--- a/po/ja/bookinfo.po
+++ b/po/ja/bookinfo.po
@@ -17,21 +17,21 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "&debian; インストールガイド"
+msgid "&debian-gnu; Installation Guide"
+msgstr "&debian-gnu; インストールガイド"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
"この文書は &arch-title; (<quote>&architecture;</quote>) アーキテクチャ用 "
-"&debian; &release; システム (コードネーム <quote>&releasename;</quote>) のイ"
+"&debian-gnu; &release; システム (コードネーム <quote>&releasename;</quote>) のイ"
"ンストール説明書です。また、さらに詳しい情報へのポインタや、新しく Debian シ"
"ステムを構築する方法にも言及しています。"
diff --git a/po/ja/boot-installer.po b/po/ja/boot-installer.po
index 6761cd307..d2d900b6f 100644
--- a/po/ja/boot-installer.po
+++ b/po/ja/boot-installer.po
@@ -544,9 +544,9 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
-"プログラム起動後は、いくつか予備的な質問がなされた後、&debian; インストーラを"
+"プログラム起動後は、いくつか予備的な質問がなされた後、&debian-gnu; インストーラを"
"起動する準備が整います。"
#. Tag: title
@@ -4701,21 +4701,21 @@ msgstr ""
#~ msgid ""
#~ "GNU/Linux is the only operating system on Alpha that can be booted from "
-#~ "both console types, but &debian; &release; only supports booting on SRM-"
+#~ "both console types, but &debian-gnu; &release; only supports booting on SRM-"
#~ "based systems. If you have an Alpha for which no version of SRM is "
#~ "available, if you will be dual-booting the system with Windows NT, or if "
#~ "your boot device requires ARC console support for BIOS initialization, "
-#~ "you will not be able to use the &debian; &release; installer. You can "
-#~ "still run &debian; &release; on such systems by using other install "
+#~ "you will not be able to use the &debian-gnu; &release; installer. You can "
+#~ "still run &debian-gnu; &release; on such systems by using other install "
#~ "media; for instance, you can install Debian woody with MILO and upgrade."
#~ msgstr ""
#~ "GNU/Linux は、いずれのコンソールからも起動できる唯一の Alpha 用オペレー"
-#~ "ティングシステムですが、&debian; &release; は SRM ベースシステムでの起動の"
+#~ "ティングシステムですが、&debian-gnu; &release; は SRM ベースシステムでの起動の"
#~ "みをサポートしています。SRM が有効でないバージョンの Alpha をお持ちの場合"
#~ "や、Windows NT とのデュアルブートにしたい場合、起動デバイスが BIOS の初期"
-#~ "化に ARC コンソールを必要とする場合の時には、&debian; &release; インストー"
+#~ "化に ARC コンソールを必要とする場合の時には、&debian-gnu; &release; インストー"
#~ "ラを使用できません。そのようなシステムでは他のインストールメディアを使用し"
-#~ "て、&debian; &release; を実行できます (例えば、Debian woody を MILO でイン"
+#~ "て、&debian-gnu; &release; を実行できます (例えば、Debian woody を MILO でイン"
#~ "ストールし、アップグレードする)。"
#~ msgid ""
@@ -4937,7 +4937,7 @@ msgstr ""
#~ "firmware. Also, once SRM is installed, it is possible to run ARC/"
#~ "AlphaBIOS from a floppy disk (using the <command>arc</command> command). "
#~ "For the reasons mentioned above, we recommend switching to SRM before "
-#~ "installing &debian;."
+#~ "installing &debian-gnu;."
#~ msgstr ""
#~ "大部分の AlphaServer や、現行のサーバ・ワークステーション製品のすべてに"
#~ "は、ファームウェアに SRM と AlphaBIOS の両方が含まれています。各種の拡張"
@@ -4945,18 +4945,18 @@ msgstr ""
#~ "更新して、別のファームウェアに切り替えることもできます。また、一度 SRM を"
#~ "インストールすれば、フロッピーディスクから ARC/AlphaBIOS を実行することが"
#~ "できます (<command>arc</command> コマンドを使います)。上述の理由から、"
-#~ "&debian; のインストールのまえに、SRM へと切り替えることをお勧めします。"
+#~ "&debian-gnu; のインストールのまえに、SRM へと切り替えることをお勧めします。"
#~ msgid ""
#~ "As on other architectures, you should install the newest available "
#~ "revision of the firmware<footnote> <para> Except on Jensen, where Linux "
#~ "is not supported on firmware versions newer than 1.7 &mdash; see <ulink "
#~ "url=\"&url-jensen-howto;\"></ulink> for more information. </para> </"
-#~ "footnote> before installing &debian;. For Alpha, firmware updates can be "
+#~ "footnote> before installing &debian-gnu;. For Alpha, firmware updates can be "
#~ "obtained from <ulink url=\"&url-alpha-firmware;\">Alpha Firmware Updates</"
#~ "ulink>."
#~ msgstr ""
-#~ "他のアーキテクチャの場合と同様、&debian; をインストールする前に、入手でき"
+#~ "他のアーキテクチャの場合と同様、&debian-gnu; をインストールする前に、入手でき"
#~ "る限りの最新のファームウェア<footnote> <para>ただし Jensen は例外で、バー"
#~ "ジョン 1.7 以降のファームウェアでは Linux がサポートされていません。詳しく"
#~ "は <ulink url=\"&url-jensen-howto;\"></ulink> をご覧ください。</para> </"
@@ -5044,7 +5044,7 @@ msgstr ""
#~ msgstr "SRM コンソールでの CD-ROM からの起動"
#~ msgid ""
-#~ "The &debian; install CDs include several preconfigured boot options for "
+#~ "The &debian-gnu; install CDs include several preconfigured boot options for "
#~ "VGA and serial consoles. Type <informalexample><screen>\n"
#~ "&gt;&gt;&gt; boot xxxx -flags 0\n"
#~ "</screen></informalexample> to boot using VGA console, where "
@@ -5055,7 +5055,7 @@ msgstr ""
#~ "</screen></informalexample> and for console on the second serial port, "
#~ "type"
#~ msgstr ""
-#~ "&debian; インストールCDには、VGA コンソールやシリアルコンソール用の定義済"
+#~ "&debian-gnu; インストールCDには、VGA コンソールやシリアルコンソール用の定義済"
#~ "みブートオプションが含まれています。VGA コンソールで起動するには、次のよう"
#~ "に入力してください。<informalexample><screen>\n"
#~ "&gt;&gt;&gt; boot xxxx -flags 0\n"
diff --git a/po/ja/boot-new.po b/po/ja/boot-new.po
index 797cc61a4..6959ed512 100644
--- a/po/ja/boot-new.po
+++ b/po/ja/boot-new.po
@@ -192,11 +192,11 @@ msgstr "NewWorld PowerMacs"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"G4 マシンと iBook では、<keycap>option</keycap> キーを押すと、起動可能な OS "
-"のボタンが並んだグラフィカルな画面になります。&debian; は小さなペンギンのアイ"
+"のボタンが並んだグラフィカルな画面になります。&debian-gnu; は小さなペンギンのアイ"
"コンで示されます。"
#. Tag: para
@@ -230,16 +230,16 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
-"G3 や G4 において OpenFirmware をリセットすると、&debian; がデフォルトで起動"
+"G3 や G4 において OpenFirmware をリセットすると、&debian-gnu; がデフォルトで起動"
"するようになります (パーティションが正しく作成され、Apple_Bootstrap パーティ"
-"ションが最初に置かれている場合)。&debian; が SCSI ディスクに置かれていて "
+"ションが最初に置かれている場合)。&debian-gnu; が SCSI ディスクに置かれていて "
"MacOS が IDE ディスクに置かれている場合には、うまく働かないかもしれません。そ"
"の場合は OpenFirmware に入って <envar>ブートデバイス</envar> 変数を設定する必"
"要がありますが、通常は <command>ybin</command> が自動的にこの作業をします。"
@@ -248,13 +248,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"いちど &debian; が起動できたら、あなたが望むオプション (デュアルブートなど) "
+"いちど &debian-gnu; が起動できたら、あなたが望むオプション (デュアルブートなど) "
"を <filename>/etc/yaboot.conf</filename> に追加して <command>ybin</command> "
"を実行すれば、その変更をブートパーティションに反映させることができます。詳し"
"くは、<ulink url=\"&url-powerpc-yaboot-faq;\">yaboot HOWTO</ulink> を参照して"
diff --git a/po/ja/hardware.po b/po/ja/hardware.po
index e803e481b..511f8fd3b 100644
--- a/po/ja/hardware.po
+++ b/po/ja/hardware.po
@@ -47,12 +47,12 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"Debian は、Linux カーネルや GNU ツールセットが必要とする以上のハードウェアを"
"要求しません。それゆえ、Linux カーネル、libc、<command>gcc</command> などが移"
"植されていて、Debian の移植版が存在すれば、どんなアーキテクチャや プラット"
-"フォームでも Debian を動作させることができます。すでに &debian; でテストされて"
+"フォームでも Debian を動作させることができます。すでに &debian-gnu; でテストされて"
"いる &arch-title; アーキテクチャの詳細は、移植版のページ (<ulink url=\"&url-"
"ports;\"></ulink>) を参照してください。"
@@ -471,7 +471,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -480,7 +480,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"これは &arch-title; アーキテクチャ用 &debian; の初公式リリースです。すでにリ"
+"これは &arch-title; アーキテクチャ用 &debian-gnu; の初公式リリースです。すでにリ"
"リースとするに充分安定していると私たちは考えています。しかし、まだ他のアーキ"
"テクチャ版ほど広く使われていない (つまりユーザによるテストも多くない) ことか"
"ら、いくつかのバグにでくわす可能性もあります。何か問題が起きたら、<ulink url="
@@ -894,10 +894,10 @@ msgstr "Cobalt マシンは 115200 bps を使用します。"
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"&debian; &release; では、PMac (Power-Macintosh ないし PowerMac) サブアーキテ"
+"&debian-gnu; &release; では、PMac (Power-Macintosh ないし PowerMac) サブアーキテ"
"クチャと PreP サブアーキテクチャのみサポートしています。"
#. Tag: title
@@ -2028,10 +2028,10 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
-"公式 &arch-kernel; カーネルでサポートされていないワイヤレス NIC も &debian; で動作し"
+"公式 &arch-kernel; カーネルでサポートされていないワイヤレス NIC も &debian-gnu; で動作し"
"ますが、インストールの間はサポートされません。"
#. Tag: para
@@ -2051,14 +2051,14 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
"(after the reboot) and configure your network manually."
msgstr ""
"ワイヤレスに問題があり、その他の NIC がインストール中に使用できない場合でも、"
-"フルサイズの CD-ROM・DVD イメージを使用して、&debian; をインストールできま"
+"フルサイズの CD-ROM・DVD イメージを使用して、&debian-gnu; をインストールできま"
"す。ネットワークを設定しないようにし、CD/DVD にあるパッケージのみを使用してイ"
"ンストールを行ってください、インストールが完了後 (リブート後) に、必要なドラ"
"イバとファームウェアをインストールし、ネットワークを手動で設定してください。"
@@ -2182,14 +2182,14 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"点字ディスプレイのサポートは、<classname>brltty</classname> で見つかる基本的"
"なサポートにより決定されます。<classname>brltty</classname> で動作するほとん"
"どのディスプレイは、シリアルポートや USB、bluetooth で接続します。点字デバイ"
"スサポートの詳細は、 <ulink url=\"&url-brltty;\"><classname>brltty</"
-"classname> ウェブサイト</ulink> にあります。&debian; &release; では、"
+"classname> ウェブサイト</ulink> にあります。&debian-gnu; &release; では、"
"<classname>brltty</classname> のバージョン &brlttyver; を提供しています。"
#. Tag: title
@@ -2208,7 +2208,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"ハードウェア音声合成のサポートは、<classname>speakup</classname> で見つかる基"
@@ -2216,7 +2216,7 @@ msgstr ""
"やシリアルポートに接続された外部デバイスのみサポートしています (USB やシリア"
"ル-USB アダプタはサポートしていません)。ハードウェア音声合成サポートの詳細"
"は、<ulink url=\"&url-speakup;\"><classname>speakup</classname> ウェブサイト"
-"</ulink> にあります。&debian; &release; では、<classname>speakup</classname> "
+"</ulink> にあります。&debian-gnu; &release; では、<classname>speakup</classname> "
"のバージョン &speakupver; を提供しています。"
#. Tag: title
@@ -2310,15 +2310,15 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
-"多くの場合、&debian; プロジェクトで使用する基準において、non-free (非フリー) "
+"多くの場合、&debian-gnu; プロジェクトで使用する基準において、non-free (非フリー) "
"であるため、main ディストリビューションや、インストールシステムに含むことがで"
-"きません。デバイスドライバそのものがディストリビューションに含まれ、&debian; "
+"きません。デバイスドライバそのものがディストリビューションに含まれ、&debian-gnu; "
"が法的にファームウェアを配布できるのであれば、アーカイブの non-free セクショ"
"ンに独立したパッケージとして、利用できることがしばしばあります。"
@@ -2327,14 +2327,14 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
"しかしこのことは、そういったハードウェアが、インストール中に使用できないこと"
-"を意味するわけではありません。&debian; 5.0, &d-i; からは、フロッピーディスク"
+"を意味するわけではありません。&debian-gnu; 5.0, &d-i; からは、フロッピーディスク"
"や USB メモリなどのリムーバブルメディアにある、ファームウェアファイルやファー"
"ムウェアパッケージの読み込みをサポートしています。どのようにインストール中に"
"ファームウェアファイルやファームウェアパッケージを利用するのか、といった詳細"
@@ -2753,13 +2753,13 @@ msgstr "Un*x・GNU システム"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
"他の Unix ライクシステムが稼働していれば、本マニュアルの残りで説明している "
-"&d-i; を使用しないで、&debian; をインストールできます。このインストール方法な"
+"&d-i; を使用しないで、&debian-gnu; をインストールできます。このインストール方法な"
"ら、他の方法ではサポートしないハードウェアや、ダウンタイムを用意できないユー"
"ザにとって便利です。この方法に興味があれば、<xref linkend=\"linux-upgrade\"/"
"> へスキップしてください。"
@@ -3938,20 +3938,20 @@ msgstr ""
#~ msgid ""
#~ "If there is no other NIC you can use during the installation, it is still "
-#~ "possible to install &debian; using a full CD-ROM or DVD image. Select the "
+#~ "possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the "
#~ "option to not configure a network and install using only the packages "
#~ "available from the CD/DVD. You can then install the driver and firmware "
#~ "you need after the installation is completed (after the reboot) and "
#~ "configure your network manually. Note that the firmware may be packaged "
#~ "separately from the driver and may not be available in the <quote>main</"
-#~ "quote> section of the &debian; archive."
+#~ "quote> section of the &debian-gnu; archive."
#~ msgstr ""
#~ "インストールの間に使用できる、その他の NIC がない場合でも、フルサイズの "
-#~ "CD-ROM・DVD イメージを使用して、&debian; をインストールできます。ネット"
+#~ "CD-ROM・DVD イメージを使用して、&debian-gnu; をインストールできます。ネット"
#~ "ワークを設定せず、CD/DVD で有効なパッケージだけでインストールを行うオプ"
#~ "ションを選択してください。インストールが完了した後 (再起動後) で、必要なド"
#~ "ライバやファームウェアをインストールし、ネットワークの設定を手動で行えま"
-#~ "す。ファームウェアは、ドライバと分割されており、&debian; アーカイブの "
+#~ "す。ファームウェアは、ドライバと分割されており、&debian-gnu; アーカイブの "
#~ "<quote>main</quote> セクションにないかもしれないことに注意してください。"
#~ msgid ""
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 53e34fbb3..f4a1d3b96 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -23,14 +23,14 @@ msgstr "システムインストールメディアの入手"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "公式 &debian; CD-ROM セット"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "公式 &debian-gnu; CD-ROM セット"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -43,7 +43,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"現在、&debian; をインストールする最も簡単な方法は、公式 Debian CD-ROM セット"
+"現在、&debian-gnu; をインストールする最も簡単な方法は、公式 Debian CD-ROM セット"
"を使うことです。ベンダからこのセットを購入できます (<ulink url=\"&url-debian-"
"cd-vendors;\">CD ベンダページ</ulink>をご覧ください)。高速なネットワーク接続"
"と CD 書き込み装置があれば、 Debian ミラーから CD-ROM イメージをダウンロード"
@@ -611,11 +611,11 @@ msgstr "<command>Disk Copy</command> を用いたディスクイメージの書
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
-"公式 &debian; CD にあったファイルからフロッピーイメージを作る場合は、 Type "
+"公式 &debian-gnu; CD にあったファイルからフロッピーイメージを作る場合は、 Type "
"と Creator は既に適切な値になっています。 ここに示す <command>Creator-"
"Changer</command> の作業は、イメージファイルを Debian ミラーからダウンロード"
"した場合でのみ必要となります。"
@@ -1698,12 +1698,12 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
msgstr ""
-"&debian; のサーバでは、<classname>tftpd-hpa</classname> を推奨します。"
+"&debian-gnu; のサーバでは、<classname>tftpd-hpa</classname> を推奨します。"
"<classname>syslinux</classname> ブートローダの作者によって作られ、それ故にほ"
"とんど問題を起こしそうにありません。<classname>atftpd</classname> のよい代替"
"です。"
@@ -1768,13 +1768,13 @@ msgstr "DHCP サーバの設定"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
"フリーソフトウェアの DHCP サーバのひとつに、 ISC の <command>dhcpd</command> "
-"があります。 &debian; では、<classname>dhcp3-server</classname> パッケージを"
+"があります。 &debian-gnu; では、<classname>dhcp3-server</classname> パッケージを"
"お勧めします。 以下に、設定ファイルの例を示します。 (<filename>/etc/dhcpd."
"conf</filename> を参照)"
@@ -1939,13 +1939,13 @@ msgstr "BOOTP サーバの設定"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"GNU/Linux で使える BOOTP サーバは 2 つあります。 ひとつは CMU の "
"<command>bootpd</command> です。 もう 1 つは実際は DHCP サーバですが、ISC の "
-"<command>dhcpd</command> です。 &debian; では、 <classname>bootp</classname> "
+"<command>dhcpd</command> です。 &debian-gnu; では、 <classname>bootp</classname> "
"パッケージと <classname>dhcp3-server</classname> パッケージにそれぞれ入ってい"
"ます。"
@@ -1954,7 +1954,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -1985,7 +1985,7 @@ msgid ""
msgstr ""
"CMU <command>bootpd</command> を使う場合は、まず <filename>/etc/inetd.conf</"
"filename> ファイルの 該当行をアンコメント (または追加) する必要があります。 "
-"&debian; では <userinput>update-inetd --enable bootps</userinput> を実行し、 "
+"&debian-gnu; では <userinput>update-inetd --enable bootps</userinput> を実行し、 "
"続いて <userinput>/etc/init.d/inetd reload</userinput> とすれば OK です。 "
"BOOTP サーバが Debian で動かない場合は、以下のようにします。 "
"<informalexample><screen>\n"
@@ -2073,14 +2073,14 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
"configuration examples in this section accordingly."
msgstr ""
"歴史的に TFTP サーバは、 イメージを提供するディレクトリに <filename>/"
-"tftpboot</filename> を使用します。 しかし &debian; のパッケージでは、 <ulink "
+"tftpboot</filename> を使用します。 しかし &debian-gnu; のパッケージでは、 <ulink "
"url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> を満たす別のディ"
"レクトリを使用する可能性があります。 例えば、<classname>tftpd-hpa</"
"classname> では <filename>/var/lib/tftpboot</filename> をデフォルトで使用しま"
@@ -2349,13 +2349,13 @@ msgstr ""
#~ msgid ""
#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "a &debian-gnu; server, the <classname>atftpd</classname> and <classname>tftpd-"
#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
#~ "classname>."
#~ msgstr ""
#~ "TFTP ブートで Pre-boot Execution Environment (PXE) 法を使用するには、 "
#~ "<userinput>tsize</userinput>をサポートする TFTP サーバが必要になります。 "
-#~ "&debian; サーバでは、<classname>atftpd</classname> と <classname>tftpd-"
+#~ "&debian-gnu; サーバでは、<classname>atftpd</classname> と <classname>tftpd-"
#~ "hpa</classname> がその資格があります。 <classname>tftpd-hpa</classname> を"
#~ "お奨めします。"
diff --git a/po/ja/installation-howto.po b/po/ja/installation-howto.po
index 6e58af959..980faf970 100644
--- a/po/ja/installation-howto.po
+++ b/po/ja/installation-howto.po
@@ -24,7 +24,7 @@ msgstr "インストール Howto"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
@@ -32,7 +32,7 @@ msgid ""
"document."
msgstr ""
"この文書は、新しい &d-i; で &arch-title; (<quote>&architecture;</quote>) に "
-"&debian; &releasename; をインストールする方法について説明します。これは、イン"
+"&debian-gnu; &releasename; をインストールする方法について説明します。これは、イン"
"ストール作業の迅速なリハーサルで、たいていの導入のために必要となるであろうす"
"べての情報を含んでいます。もっと多くの情報が有用な場合には、この文書内の他の"
"部分にある、より詳細な説明にリンクします。"
diff --git a/po/ja/partitioning.po b/po/ja/partitioning.po
index 5cd64c29e..516311405 100644
--- a/po/ja/partitioning.po
+++ b/po/ja/partitioning.po
@@ -123,13 +123,13 @@ msgstr "ディレクトリツリー"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"ディレクトリとファイルの名前について、&debian; は <ulink url=\"&url-fhs-home;"
+"ディレクトリとファイルの名前について、&debian-gnu; は <ulink url=\"&url-fhs-home;"
"\">Filesystem Hierarchy Standard</ulink> に従っています。この規格を用いると、"
"ユーザやプログラムは、ファイルやディレクトリの場所を予想しやすくなります。"
"根っこ (ルート = root) にあるディレクトリは、単にスラッシュ <filename>/</"
@@ -1128,14 +1128,14 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"Linux におけるドライブあたりのパーティション数の制限は、 SCSI ディスクの場合 "
"15 個まで (基本パーティション 3 個と論理パーティション 12 個)、 IDE ディスク"
"の場合は 63 個まで (基本パーティション 3 個と論理パーティション 60 個) で"
-"す。 ただし通常の &debian; システムでは、 パーティション用に 20 のデバイスし"
+"す。 ただし通常の &debian-gnu; システムでは、 パーティション用に 20 のデバイスし"
"か用意していないので、 20 以上のパーティションを持つディスクにインストールす"
"るには、 最初にそれらのパーティション用のデバイスを自分で作成する必要がありま"
"す。"
@@ -1503,7 +1503,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1512,7 +1512,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"OpenFirmware に &debian; を自動的に起動させるためには、 ブートストラップパー"
+"OpenFirmware に &debian-gnu; を自動的に起動させるためには、 ブートストラップパー"
"ティションはディスク上の他のブートパーティション (特に MacOS のブートパーティ"
"ション) よりも前に置かなければなりません。 ブートストラップパーティションは"
"真っ先に作りましょう。 しかし、後からブートストラップパーティションを追加する"
diff --git a/po/ja/post-install.po b/po/ja/post-install.po
index 5b9ea15f8..8dd93b5e2 100644
--- a/po/ja/post-install.po
+++ b/po/ja/post-install.po
@@ -30,16 +30,16 @@ msgstr "システムをシャットダウンする"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"稼働中の &debian; システムをシャットダウンする際には、コンピュータの前面や背面に"
+"稼働中の &debian-gnu; システムをシャットダウンする際には、コンピュータの前面や背面に"
"あるリセットスイッチで再起動させたり、いきなり電源を落したりしてはいけませ"
-"ん。&debian; は適切な手順でシャットダウンすべきで、さもないとファイルを失ったり"
+"ん。&debian-gnu; は適切な手順でシャットダウンすべきで、さもないとファイルを失ったり"
"ディスクにダメージがもたらされたりします。デスクトップ環境を実行している場合"
"は、通常システムのシャットダウン (または再起動) を可能にする、アプリケーショ"
"ンメニューから利用できる <quote>ログアウト</quote> 用のオプションがあります。"
@@ -445,13 +445,13 @@ msgstr "デフォルトの電子メール設定"
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
"that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
"to inform the system administrator of (potential) problems or changes."
msgstr ""
-"グラフィカルなメールプログラムを使用するつもりでいても、&debian; システムに従来"
+"グラフィカルなメールプログラムを使用するつもりでいても、&debian-gnu; システムに従来"
"の MTA/MDA もインストールし、正確に設定するのは大切なことです。システムで起動"
"している様々なユーティリティ<footnote> <para> 例えば: <command>cron</"
"command>、<command>quota</command>、<command>logcheck</command>、"
diff --git a/po/ja/preface.po b/po/ja/preface.po
index 4f0fa4e4b..251cc62fc 100644
--- a/po/ja/preface.po
+++ b/po/ja/preface.po
@@ -17,22 +17,22 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "&architecture; 用 &debian; &release; のインストール"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "&architecture; 用 &debian-gnu; &release; のインストール"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Debian を試していただきありがとうございます。Debian の GNU/&arch-kernel; ディストリ"
"ビューションは、他に類を見ないものであることを分かっていただけることでしょ"
-"う。&debian; は、世界中から質の高い「自由なソフトウェア」をよりすぐり、首尾一"
+"う。&debian-gnu; は、世界中から質の高い「自由なソフトウェア」をよりすぐり、首尾一"
"貫したディストリビューションとしてまとめあげられています。こうして集められた"
"ものは、個々のソフトウェア以上の力を発揮することでしょう。"
diff --git a/po/ja/preparing.po b/po/ja/preparing.po
index d7bd898c5..95e551d9d 100644
--- a/po/ja/preparing.po
+++ b/po/ja/preparing.po
@@ -17,8 +17,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "&debian; のインストール前に"
+msgid "Before Installing &debian-gnu;"
+msgstr "&debian-gnu; のインストール前に"
#. Tag: para
#: preparing.xml:6
@@ -68,7 +68,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -78,7 +78,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"&debian; では、うまく行かない場合、OS を取り替えるのではなく修理できるケース"
+"&debian-gnu; では、うまく行かない場合、OS を取り替えるのではなく修理できるケース"
"の方がはるかに多いでしょう。アップグレードでは大量のインストールは必要ありま"
"せんし、常にその場でアップグレードできます。また OS のリリースが続いても、プ"
"ログラムにはほとんど常に互換性があります。プログラムの新バージョンが、より新"
@@ -197,10 +197,10 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
-"&debian; と既存システムを起動する<firstterm>ブートローダ</firstterm>をインス"
+"&debian-gnu; と既存システムを起動する<firstterm>ブートローダ</firstterm>をインス"
"トールする。"
#. Tag: para
@@ -278,14 +278,14 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"インストール時の重要な選択肢に、X Window System とグラフィカルデスクトップ環"
"境の 1 つからなる、グラフィカルデスクトップ環境をインストールするかどうかがあ"
"ります。<quote>デスクトップ環境</quote> タスクを選択しない場合、比較的基本的"
"な、コマンドライン駆動システムになります。かなり大きなディスク領域を必要と"
-"し、また、多くの &debian; システムは、グラフィカルユーザインターフェースを特"
+"し、また、多くの &debian-gnu; システムは、グラフィカルユーザインターフェースを特"
"に必要としないサーバであるため、デスクトップ環境タスクはオプションとなってい"
"ます。"
@@ -315,7 +315,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -325,7 +325,7 @@ msgstr ""
"インストールを始める前に、現在使用しているシステムのすべてのファイルをバック"
"アップしてください。今回が、最初から入っていたもの以外の OS をインストールす"
"る最初の試みでしたら、おそらくディスクのパーティション分割をやり直して "
-"&debian; 用の領域を作る必要があるでしょう。ディスクのパーティション分割作業で"
+"&debian-gnu; 用の領域を作る必要があるでしょう。ディスクのパーティション分割作業で"
"は、どんなプログラムを使ったとしても、ディスク上のすべてのデータを消してしま"
"う危険を冒すことになります。インストールに用いられるプログラム群は、極めて信"
"頼性が高く、何年も使用されてきたものです。しかし、これらは強力な機能を持つこ"
@@ -1129,7 +1129,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1139,7 +1139,7 @@ msgid ""
"least 200MB for <filename>/var</filename>, and a lot more if you install a "
"graphical desktop environment."
msgstr ""
-"&debian; システムを円滑に操作するのに必要なディスクスペースについては、お勧め"
+"&debian-gnu; システムを円滑に操作するのに必要なディスクスペースについては、お勧め"
"するシステム要件で考慮されています。特に、<filename>/var</filename> パーティ"
"ションには、ログファイルのような一般的な内容に加え、Debian 特有の状態情報が多"
"く置かれます。<command>dpkg</command> のファイル (インストールされたパッケー"
@@ -1260,7 +1260,7 @@ msgstr ""
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1271,7 +1271,7 @@ msgid ""
"some alternate means of reviving your machine like the original system's "
"installation tapes or CDs."
msgstr ""
-"マシンに 1 台しかディスクがなくても、現在の OS を &debian; で完全に置き換えて"
+"マシンに 1 台しかディスクがなくても、現在の OS を &debian-gnu; で完全に置き換えて"
"しまうつもりなら、パーティション分割はインストーラを起動した後で、インストー"
"ル作業の一部として行って構いません (<xref linkend=\"di-partition\"/>)。しかし"
"これが可能なのは、インストーラシステムをテープ、CD-ROM、接続されたマシンの"
@@ -1322,14 +1322,14 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
"上記のどれにも当てはまらない場合、インストールをはじめる前にパーティション分"
"割を行い、Debian に割り当て可能な領域を作ってやらなければなりません。一部の"
"パーティションを他の OS に使う場合は、そのパーティションはその OS のパーティ"
-"ション分割ツールで作成するほうが良いでしょう。しかし &debian; 用のパーティ"
+"ション分割ツールで作成するほうが良いでしょう。しかし &debian-gnu; 用のパーティ"
"ションは、他の OS のツールでは<emphasis>作らない</emphasis>ようお勧めします。"
"そのツールで作るのは、残しておきたい OS のパーティションだけにしてください。"
@@ -1363,7 +1363,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the &arch-parttype; "
+"In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype; "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a &arch-parttype; placeholder partition to come <emphasis>before</"
@@ -1372,7 +1372,7 @@ msgid ""
"placeholder with the Linux partition tools later during the actual install, "
"and replace it with Linux partitions."
msgstr ""
-"OpenFirmware に &debian; を自動的に起動させるには、&arch-parttype; パーティションを他"
+"OpenFirmware に &debian-gnu; を自動的に起動させるには、&arch-parttype; パーティションを他"
"の OS のパーティション (特に MacOS のブートパーティション) よりディスクの先頭"
"近くに置かなければなりません。事前パーティション分割を行うときにはこのことを"
"心に留めておきましょう。&arch-parttype; 用に使う場所を埋めておくパーティションを、他の"
@@ -1417,10 +1417,10 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"既存の OS のパーティション分割ツールを使って、そのシステムのパーティションを"
-"作る。&debian; 用にも場所埋めのパーティションか、空き領域を作る。"
+"作る。&debian-gnu; 用にも場所埋めのパーティションか、空き領域を作る。"
#. Tag: para
#: preparing.xml:903
@@ -1758,10 +1758,10 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"GNU/Linux で用いるところに、場所埋め用パーティションを作るのを忘れないでくだ"
-"さい。できればディスクの先頭に置きましょう。後で &debian; のインストーラか"
+"さい。できればディスクの先頭に置きましょう。後で &debian-gnu; のインストーラか"
"ら、一度消して置き換えることになりますので、タイプは何でも構いません。"
#. Tag: para
@@ -1825,14 +1825,14 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"この節では、Debian のインストールに先立って必要となるハードウェアの設定につい"
"て見ていきます。通常この作業では、システムのファームウェアの設定をチェック"
"し、場合によってはその設定を変更することになります。<quote>ファームウェア</"
"quote>は、ハードウェアが利用する中核的なソフトウェアで、電源投入後のブートプ"
-"ロセスの間に起動される、最も重要なものです。あなたが使うことになる &debian; "
+"ロセスの間に起動される、最も重要なものです。あなたが使うことになる &debian-gnu; "
"の信頼性に影響を与えうる、既知のハードウェアの諸問題についても、同様に取り"
"扱っていく予定です。"
@@ -2590,7 +2590,7 @@ msgstr "BIOS 設定"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2599,7 +2599,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"&debian; を S/390 や zSeries マシンにインストールするには、まずカーネルをこれ"
+"&debian-gnu; を S/390 や zSeries マシンにインストールするには、まずカーネルをこれ"
"らのシステムで起動しなければなりません。これらのプラットフォームにおける起動"
"メカニズムは、そもそもの成り立ちから他のプラットフォーム (特に PC 系のシステ"
"ム) とは異なっています。フロッピーデバイスは全く使えません。このプラット"
@@ -2734,11 +2734,11 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
-"インストールサーバには、&debian; ミラーのいずれかから、ディレクトリ構造をその"
+"インストールサーバには、&debian-gnu; ミラーのいずれかから、ディレクトリ構造をその"
"ままコピーしてこなければなりません。ただし必要なのは s390 とアーキテクチャに"
"依存しないファイルだけです。あるいは、インストール CD の内容をこのディレクト"
"リツリーにコピーしたのでも構いません。"
diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po
index a3bb0dd40..5ec3055d4 100644
--- a/po/ja/random-bits.po
+++ b/po/ja/random-bits.po
@@ -835,26 +835,26 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "Unix/Linux システムからの &debian; のインストール"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "Unix/Linux システムからの &debian-gnu; のインストール"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
"本節は、マニュアルの他の部分で説明されているメニュードリブンインストーラを使"
-"用せずに、既存の Unix・Linux システムから &debian; をインストールする方法につ"
+"用せずに、既存の Unix・Linux システムから &debian-gnu; をインストールする方法につ"
"いて説明します。この <quote>クロスインストール</quote> HOWTO は、Red Hat, "
-"Mandrake, SUSE から &debian; に移行するユーザの要望で書かれました。本節では、"
+"Mandrake, SUSE から &debian-gnu; に移行するユーザの要望で書かれました。本節では、"
"*nix コマンドの入力について熟知し、ファイルシステムを操作できるのが前提となっ"
"ています。本節では、<prompt>#</prompt>が Debian chroot に入力されたコマンドを"
"示し、<prompt>$</prompt> はユーザの現在のシステムに入力されるコマンドを表しま"
@@ -866,13 +866,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"一旦、新しい Debian システムを好みに設定したら、既存のユーザデータを (あるな"
"ら) 稼働したまま移行できます。したがって、これは <quote>0 ダウンタイム</"
-"quote> &debian; インストールになります。またこれは、様々な起動・インストール"
+"quote> &debian-gnu; インストールになります。またこれは、様々な起動・インストール"
"メディアと相性のよくないハードウェアに対処するうまい方法です。"
#. Tag: para
@@ -1078,11 +1078,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"&releasename; &debian; CD を持っていて、<filename>/cdrom</filename> にマウン"
+"&releasename; &debian-gnu; CD を持っていて、<filename>/cdrom</filename> にマウン"
"トしていれば、http URL に代えて file URL (<userinput>file:/cdrom/debian/</"
"userinput>) を使用することができます。"
@@ -1663,12 +1663,12 @@ msgstr "ブートローダのセットアップ"
#: random-bits.xml:765
#, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"&debian; システムを起動できるようにするために、インストールしたカーネルを新し"
+"&debian-gnu; システムを起動できるようにするために、インストールしたカーネルを新し"
"い root パーティションから読み込むように、ブートローダをセットアップしてくだ"
"さい。<command>debootstrap</command> は、ブートローダをインストールしないこと"
"に注意してください。とは言っても、セットアップするのに Debian chroot 内部の "
@@ -1891,20 +1891,20 @@ msgstr "# aptitude clean"
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "パラレルライン IP (PLIP) による &debian; のインストール"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "パラレルライン IP (PLIP) による &debian-gnu; のインストール"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
"本節では、イーサネットカードがなくても、リモートゲートウェイコンピュータにヌ"
-"ルモデムケーブル (ヌルプリンタケーブルとも呼ばれます) で接続して &debian; を"
+"ルモデムケーブル (ヌルプリンタケーブルとも呼ばれます) で接続して &debian-gnu; を"
"コンピュータにインストールする方法を説明します。ゲートウェイコンピュータは、"
"Debian ミラーがあるネットワーク (例: インターネット) に接続していなければなり"
"ません。"
@@ -2183,8 +2183,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "PPP over Ethernet (PPPoE) を用いた &debian; のインストール"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "PPP over Ethernet (PPPoE) を用いた &debian-gnu; のインストール"
#. Tag: para
#: random-bits.xml:1048
@@ -2618,11 +2618,11 @@ msgstr ""
#~ "Etch is the first release that includes the graphical installer and uses "
#~ "some relatively new technology. There are a few known issues that you may "
#~ "run into during the installation. We expect to be able to fix these "
-#~ "issues for the next release of &debian;."
+#~ "issues for the next release of &debian-gnu;."
#~ msgstr ""
#~ "etch はグラフィカルインストーラがある初めてのリリースで、比較的新しい技術"
#~ "がいくつも使われています。インストール中に遭遇する可能性のある問題が、まだ"
-#~ "残っています。&debian; の次期リリースでは、それらの問題を修正できる見込み"
+#~ "残っています。&debian-gnu; の次期リリースでは、それらの問題を修正できる見込み"
#~ "です。"
#~ msgid ""
diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po
index 4e480a65e..22447d182 100644
--- a/po/ja/using-d-i.po
+++ b/po/ja/using-d-i.po
@@ -569,9 +569,9 @@ msgstr "base-installer"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
+"operate under &debian-gnu; when rebooted."
msgstr ""
-"再起動時に、コンピュータが &debian; として動作するための、もっとも基本的なパッ"
+"再起動時に、コンピュータが &debian-gnu; として動作するための、もっとも基本的なパッ"
"ケージセットをインストールします。"
#. Tag: term
@@ -785,11 +785,11 @@ msgstr "利用可能なメモリのチェック / 低メモリモード"
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"&d-i; がまず行うことの一つが、利用可能なメモリをチェックすることです。利用可"
-"能なメモリに制限がある場合、このコンポーネントは、システムに &debian; をイン"
+"能なメモリに制限がある場合、このコンポーネントは、システムに &debian-gnu; をイン"
"ストールできるように、インストールプロセスにいくらかの変更を加えます。"
#. Tag: para
@@ -3552,7 +3552,7 @@ msgstr "apt の設定"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -3568,7 +3568,7 @@ msgid ""
"<command>aptitude</command> is now the recommended utility for package "
"management."
msgstr ""
-"&debian; システムにパッケージをインストールするツールの 1 つに "
+"&debian-gnu; システムにパッケージをインストールするツールの 1 つに "
"<classname>apt</classname> パッケージの <command>apt-get</command> プログラム"
"があります<footnote> <para> パッケージを実際にインストールするプログラムは、"
"<command>dpkg</command> であることに注意してください。ですが、このプログラム"
@@ -4689,7 +4689,7 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"新しめ (1998 年中期以降) の PowerMac は、ブートローダに <command>yaboot</"
"command> を使用します。インストーラは、<command>yaboot</command> を自動でセッ"
@@ -4697,7 +4697,7 @@ msgstr ""
"小さなパーティションが必要です。このパーティションは、パーティション分割コン"
"ポーネントで <emphasis>Apple_Bootstrap</emphasis> 形式にしてください。このス"
"テップが正常に完了したら、そのディスクが起動可能になっており、OpenFirmware "
-"が &debian; を起動できるように設定されています。"
+"が &debian-gnu; を起動できるように設定されています。"
#. Tag: title
#: using-d-i.xml:2964
@@ -4905,7 +4905,7 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
diff --git a/po/ja/welcome.po b/po/ja/welcome.po
index 4769b118a..77063b800 100644
--- a/po/ja/welcome.po
+++ b/po/ja/welcome.po
@@ -24,12 +24,12 @@ msgstr "ようこそ Debian へ"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"この章では、Debian プロジェクトと &debian; の概略を紹介します。Debian プロ"
-"ジェクトの歴史と &debian; についてすでにご存知でしたら、この章を飛ばして構い"
+"この章では、Debian プロジェクトと &debian-gnu; の概略を紹介します。Debian プロ"
+"ジェクトの歴史と &debian-gnu; についてすでにご存知でしたら、この章を飛ばして構い"
"ません。"
#. Tag: title
@@ -553,13 +553,13 @@ msgstr "Debian の入手"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"インターネットを通じて &debian; をダウンロードしたり Debian の公式 CD を購入"
+"インターネットを通じて &debian-gnu; をダウンロードしたり Debian の公式 CD を購入"
"したりするための情報については、<ulink url=\"&url-debian-distrib;\">入手方法"
"についてのページ</ulink> を参照して下さい。<ulink url=\"&url-debian-mirrors;"
"\">Debian のミラー一覧</ulink> には、Debian の公式ミラーサイトがすべて載って"
@@ -589,11 +589,11 @@ msgstr "このドキュメントの最新版の入手"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
-"この文書には絶えず変更が加えられています。&debian; システムの &release; リ"
+"この文書には絶えず変更が加えられています。&debian-gnu; システムの &release; リ"
"リースに関する最新情報については、<ulink url=\"&url-release-area;\">Debian "
"&release; ページ</ulink> にて確認してください。このインストールマニュアルの最"
"新版は、<ulink url=\"&url-install-manual;\">公式インストールマニュアルページ"
@@ -638,11 +638,11 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"基本的にこの文書は、実際に体験するインストールのプロセスに沿って、順々に説明"
-"するように構成されています。&debian; のインストールの各作業段階と、それに関連"
+"するように構成されています。&debian-gnu; のインストールの各作業段階と、それに関連"
"するこの文書の各節は以下の通りになっています。"
#. Tag: para
@@ -790,7 +790,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -800,7 +800,7 @@ msgstr ""
"この文書を読んでいる方は、多数の商用ソフトウェアにあるようなライセンス (購入"
"したソフトウェアのコピー 1 部を、1 台のコンピュータで使用できる) はご存知のこ"
"とでしょう。しかし、このシステムはそのようなものとは違います。私たちは、あな"
-"たの通っている学校や仕事場にあるすべてのコンピュータに &debian; をインストー"
+"たの通っている学校や仕事場にあるすべてのコンピュータに &debian-gnu; をインストー"
"ルすることを勧めます。また、友達に貸して、彼らのコンピュータにインストールす"
"るのを手伝ってあげましょう。さらには、わずかな制限にさえ気をつければ、何千部"
"ものコピーを作って<emphasis>売る</emphasis>ことも可能です。なぜなら、Debian "
diff --git a/po/ko/bookinfo.po b/po/ko/bookinfo.po
index 608b75d60..7bff64130 100644
--- a/po/ko/bookinfo.po
+++ b/po/ko/bookinfo.po
@@ -20,20 +20,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "&debian; 설치 안내서"
+msgid "&debian-gnu; Installation Guide"
+msgstr "&debian-gnu; 설치 안내서"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"이 문서는 &arch-title; (<quote>&architecture;</quote>) 아키텍처용 &debian; "
+"이 문서는 &arch-title; (<quote>&architecture;</quote>) 아키텍처용 &debian-gnu; "
"&release;시스템을 (코드명 <quote>&releasename;</quote>) 설치하는 절차가 쓰여 "
"있습니다. 새로운 데비안 시스템을 만들어 나가는 방법에 대한 정보가 들어 있고 "
"더 많은 정보가 들어 있는 다른 자료를 안내합니다."
diff --git a/po/ko/boot-installer.po b/po/ko/boot-installer.po
index b5bb6ac70..e21a3c1c8 100644
--- a/po/ko/boot-installer.po
+++ b/po/ko/boot-installer.po
@@ -542,9 +542,9 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
-"프로그램이 시작하면 몇 가지 질문을 한 다음 &debian; 설치 프로그램을 시작하도"
+"프로그램이 시작하면 몇 가지 질문을 한 다음 &debian-gnu; 설치 프로그램을 시작하도"
"록 준비합니다."
#. Tag: title
@@ -4612,20 +4612,20 @@ msgstr ""
#~ msgid ""
#~ "GNU/Linux is the only operating system on Alpha that can be booted from "
-#~ "both console types, but &debian; &release; only supports booting on SRM-"
+#~ "both console types, but &debian-gnu; &release; only supports booting on SRM-"
#~ "based systems. If you have an Alpha for which no version of SRM is "
#~ "available, if you will be dual-booting the system with Windows NT, or if "
#~ "your boot device requires ARC console support for BIOS initialization, "
-#~ "you will not be able to use the &debian; &release; installer. You can "
-#~ "still run &debian; &release; on such systems by using other install "
+#~ "you will not be able to use the &debian-gnu; &release; installer. You can "
+#~ "still run &debian-gnu; &release; on such systems by using other install "
#~ "media; for instance, you can install Debian woody with MILO and upgrade."
#~ msgstr ""
#~ "Alpha에서 GNU/리눅스는 이 두 콘솔에서 모두 부팅할 수 있는 유일한 운영체제"
-#~ "입니다. 하지만 &debian; &release; 릴리스는 SRM 기반 시스템에서만 부팅을 지"
+#~ "입니다. 하지만 &debian-gnu; &release; 릴리스는 SRM 기반 시스템에서만 부팅을 지"
#~ "원합니다. SRM이 없는 Alpha 시스템을 가지고 있다면, 윈도우즈 NT와 같이 선"
-#~ "택 부팅을 할 것이고, BIOS 초기화에 ARC 콘솔 기능이 필요하다면, &debian; "
+#~ "택 부팅을 할 것이고, BIOS 초기화에 ARC 콘솔 기능이 필요하다면, &debian-gnu; "
#~ "&release; 설치 프로그램을 사용할 수 없을 것입니다. ARC 콘솔이 필요한 경우"
-#~ "에도 다른 설치 미디어를 이용해서 &debian; &release; 릴리스를 실행할 수 있"
+#~ "에도 다른 설치 미디어를 이용해서 &debian-gnu; &release; 릴리스를 실행할 수 있"
#~ "습니다. 예를 들어 MILO로 데비안 우디(woody)를 설치하고 업그레이드할 수 있"
#~ "습니다."
@@ -4836,7 +4836,7 @@ msgstr ""
#~ "는 없으므로, 가능하면 SRM을 사용하기를 권장합니다. (윈도우즈 NT와 듀얼 부"
#~ "팅을 하는 경우가 아니라면.)"
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#~ msgid ""
#~ "The majority of AlphaServers and all current server and workstation "
#~ "products contain both SRM and AlphaBIOS in their firmware. For "
@@ -4845,27 +4845,27 @@ msgstr ""
#~ "firmware. Also, once SRM is installed, it is possible to run ARC/"
#~ "AlphaBIOS from a floppy disk (using the <command>arc</command> command). "
#~ "For the reasons mentioned above, we recommend switching to SRM before "
-#~ "installing &debian;."
+#~ "installing &debian-gnu;."
#~ msgstr ""
#~ "AlphaServer의 대다수와 현재의 모든 서버와 워크스테이션 제품에는 펌웨어 안"
#~ "에 SRM과 AlphaBIOS가 모두 들어 있습니다. 여러가지 평가보드처럼 <quote>반"
#~ "쪽-플래시</quote> 컴퓨터의 경우에는, 펌웨어를 플래시에 다시 쓰는 방법을 통"
#~ "해 두 가지 사이를 전환할 수 있습니다. 또 SRM을 설치하면 플로피 디스크에서 "
#~ "ARC/AlphaBIOS를 실행할 수 있습니다 (<command>arc</command> 명령어 사용). "
-#~ "위에서 설명한 이유때문에, 우리는 &debian;를 설치하기 전에 SRM으로 바꾸기"
+#~ "위에서 설명한 이유때문에, 우리는 &debian-gnu;를 설치하기 전에 SRM으로 바꾸기"
#~ "를 권장합니다."
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#~ msgid ""
#~ "As on other architectures, you should install the newest available "
#~ "revision of the firmware<footnote> <para> Except on Jensen, where Linux "
#~ "is not supported on firmware versions newer than 1.7 &mdash; see <ulink "
#~ "url=\"&url-jensen-howto;\"></ulink> for more information. </para> </"
-#~ "footnote> before installing &debian;. For Alpha, firmware updates can be "
+#~ "footnote> before installing &debian-gnu;. For Alpha, firmware updates can be "
#~ "obtained from <ulink url=\"&url-alpha-firmware;\">Alpha Firmware Updates</"
#~ "ulink>."
#~ msgstr ""
-#~ "다른 아키텍처와 마찬가지로, &debian;를 설치하기 전에 항상 최신 버전의 펌웨"
+#~ "다른 아키텍처와 마찬가지로, &debian-gnu;를 설치하기 전에 항상 최신 버전의 펌웨"
#~ "어를 <footnote><para>Jensen의 경우는 예외입니다. Jensen에서는 1.7 뒤 버전"
#~ "의 펌웨어에서 리눅스를 사용할 수 없습니다. 자세한 정보는 <ulink url="
#~ "\"&url-jensen-howto;\"></ulink> 참고.</para></footnote> 설치해야 합니다. "
@@ -4949,7 +4949,7 @@ msgstr ""
#~ msgstr "SRM 콘솔로 CD-ROM에서 부팅하기"
#~ msgid ""
-#~ "The &debian; install CDs include several preconfigured boot options for "
+#~ "The &debian-gnu; install CDs include several preconfigured boot options for "
#~ "VGA and serial consoles. Type <informalexample><screen>\n"
#~ "&gt;&gt;&gt; boot xxxx -flags 0\n"
#~ "</screen></informalexample> to boot using VGA console, where "
@@ -4960,7 +4960,7 @@ msgstr ""
#~ "</screen></informalexample> and for console on the second serial port, "
#~ "type"
#~ msgstr ""
-#~ "&debian; 설치 CD에는 VGA 및 시리얼 콘솔용 부팅 옵션이 들어 있습니다. 다음"
+#~ "&debian-gnu; 설치 CD에는 VGA 및 시리얼 콘솔용 부팅 옵션이 들어 있습니다. 다음"
#~ "을 입력하면 VGA 콘솔을 사용합니다. <informalexample><screen>\n"
#~ "&gt;&gt;&gt; boot xxxx -flags 0\n"
#~ "</screen></informalexample> 여기서 <replaceable>xxxx</replaceable>는 CD-"
diff --git a/po/ko/boot-new.po b/po/ko/boot-new.po
index 3d8fbe539..7fca1b85b 100644
--- a/po/ko/boot-new.po
+++ b/po/ko/boot-new.po
@@ -184,17 +184,17 @@ msgstr ""
msgid "NewWorld PowerMacs"
msgstr "뉴월드 파워맥"
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: boot-new.xml:97
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"G4와 아이북에서 <keycap>option</keycap> 키를 누르고 있으면, 부팅 가능한 운영 "
-"체제마다 단추가 하나씩 있는 그래픽 화면이 나타납니다. &debian;는 작은 펭귄 아"
+"체제마다 단추가 하나씩 있는 그래픽 화면이 나타납니다. &debian-gnu;는 작은 펭귄 아"
"이콘이 들어 있는 단추입니다."
#. Tag: para
@@ -223,37 +223,37 @@ msgstr ""
"<prompt>boot:</prompt> 프롬프트에서 <keycap>tab</keycap> 키를 누르면 "
"<filename>yaboot.conf</filename>에 정의한 레이블을 표시합니다."
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
-"G3 또는 G4 하드웨어에서 OpenFirmware를 리셋하면 기본으로 &debian;를 부팅합니"
+"G3 또는 G4 하드웨어에서 OpenFirmware를 리셋하면 기본으로 &debian-gnu;를 부팅합니"
"다. (올바르게 파티션을 나누고 Apple_Bootstrap 파티션이 앞쪽에 놓여 있는 경"
"우.) 데비안이 SCSI 디스크에 들어 있고 맥오에스가 IDE 디스크에 들어 있으면, 리"
"셋해도 데비안으로 부팅하지 않을 것입니다. OpenFirmware에 들어가 <envar>boot-"
"device</envar> 변수를 설정해야 합니다. <command>ybin</command> 프로그램을 이"
"용하면 이 변수 설정을 자동으로 합니다."
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"&debian;가 처음으로 부팅하면, <filename>/etc/yaboot.conf</filename>에 (듀얼 "
+"&debian-gnu;가 처음으로 부팅하면, <filename>/etc/yaboot.conf</filename>에 (듀얼 "
"부팅 옵션 등) 원하는 어떤 옵션이라도 추가 할 수 있고, <command>ybin</command>"
"를 실행하면 바꾼 설정에 맞춰 부팅 파티션을 업데이트할 수 있습니다. 더 자세한 "
"정보는 <ulink url=\"&url-powerpc-yaboot-faq;\">yaboot HOWTO</ulink>를 읽어 보"
diff --git a/po/ko/hardware.po b/po/ko/hardware.po
index affbb3f0a..a0d1fd036 100644
--- a/po/ko/hardware.po
+++ b/po/ko/hardware.po
@@ -471,7 +471,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -885,10 +885,10 @@ msgstr "Cobalt 컴퓨터는 115200 bps를 사용합니다."
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"&debian; &release; 버전은 PMac (파워 매킨토시 혹은 파워맥) 및 PreP 서브 아키"
+"&debian-gnu; &release; 버전은 PMac (파워 매킨토시 혹은 파워맥) 및 PreP 서브 아키"
"텍쳐만 지원합니다."
#. Tag: title
@@ -1993,7 +1993,7 @@ msgstr "무선 네트워크 카드"
#| "of wireless adapters is supported by the official Linux kernel, although "
#| "many of them do require firmware to be loaded. Wireless NICs that are not "
#| "supported by the official Linux kernel can generally be made to work "
-#| "under &debian;, but are not supported during the installation."
+#| "under &debian-gnu;, but are not supported during the installation."
msgid ""
"Wireless networking is in general supported as well and a growing number of "
"wireless adapters are supported by the official Linux kernel, although many "
@@ -2004,7 +2004,7 @@ msgid ""
msgstr ""
"무선 네트워크는 일반적으로는 잘 지원하고 공식 리눅스 커널에서 지원하는 무선 "
"네트워크 카드가 점점 늘어나고 있습니다. 하지만 상당수가 펌웨어를 읽어들여야 "
-"합니다. 공식 리눅스 커널에서 지원하지 않는 네트워크 카드도 대부분 &debian;에"
+"합니다. 공식 리눅스 커널에서 지원하지 않는 네트워크 카드도 대부분 &debian-gnu;에"
"서 동작하도록 만들 수 있지만, 설치할 때는 지원하지 않습니다."
#. Tag: para
@@ -2015,15 +2015,15 @@ msgstr ""
#| "of wireless adapters is supported by the official Linux kernel, although "
#| "many of them do require firmware to be loaded. Wireless NICs that are not "
#| "supported by the official Linux kernel can generally be made to work "
-#| "under &debian;, but are not supported during the installation."
+#| "under &debian-gnu;, but are not supported during the installation."
msgid ""
"Wireless NICs that are not supported by the official Linux kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
"무선 네트워크는 일반적으로는 잘 지원하고 공식 리눅스 커널에서 지원하는 무선 "
"네트워크 카드가 점점 늘어나고 있습니다. 하지만 상당수가 펌웨어를 읽어들여야 "
-"합니다. 공식 리눅스 커널에서 지원하지 않는 네트워크 카드도 대부분 &debian;에"
+"합니다. 공식 리눅스 커널에서 지원하지 않는 네트워크 카드도 대부분 &debian-gnu;에"
"서 동작하도록 만들 수 있지만, 설치할 때는 지원하지 않습니다."
#. Tag: para
@@ -2043,14 +2043,14 @@ msgstr ""
#| "development and whether it will work depends on the type of adaptor and "
#| "the configuration of your wireless access point. If there is no other NIC "
#| "you can use during the installation, it is still possible to install "
-#| "&debian; using a full CD-ROM or DVD image. Select the option to not "
+#| "&debian-gnu; using a full CD-ROM or DVD image. Select the option to not "
#| "configure a network and install using only the packages available from "
#| "the CD/DVD. You can then install the driver and firmware you need after "
#| "the installation is completed (after the reboot) and configure your "
#| "network manually."
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
@@ -2059,7 +2059,7 @@ msgstr ""
"설치할 때 무선 네트워크를 이용하는 방법은 개발 중에 있습니다. 네트워크 카드"
"의 종류와 무선 AP의 설정에 따라 동작하느냐 마느냐가 달라집니다. 설치할 때 사"
"용할 수 있는 다른 네트워크 카드가 없는 경우에도 전체 CD-ROM이나 DVD 이미지를 "
-"사용해 &debian; 시스템을 설치할 수 있습니다. 이 옵션을 선택하면 네트워크를 설"
+"사용해 &debian-gnu; 시스템을 설치할 수 있습니다. 이 옵션을 선택하면 네트워크를 설"
"정하지 않고 CD/DVD에 있는 패키지만 설치합니다. 그러면 설치가 끝난 다음에 (컴"
"퓨터를 다시 시작해서) 필요한 드라이버와 펌웨어를 설치하고 네트워크를 수동으"
"로 설치할 수 있습니다."
@@ -2184,14 +2184,14 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"점자 디스플레이 지원은 <classname>brltty</classname>에서 얼마나 지원하느냐에 "
"따라 달라집니다. 시리얼 포트, USB 혹은 블루투스로 연결하는 점자 디스플레이 대"
"부분은 <classname>brltty</classname>에서 동작합니다. 지원하는 점자 장치에 대"
"한 자세한 정보는 <ulink url=\"&url-brltty;\"><classname>brltty</classname> 웹"
-"사이트</ulink>에 있습니다. &debian; &release;에는 <classname>brltty</"
+"사이트</ulink>에 있습니다. &debian-gnu; &release;에는 <classname>brltty</"
"classname> &brlttyver; 버전이 들어 있습니다."
#. Tag: title
@@ -2210,14 +2210,14 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"하드웨어 음성 합성 장치 지원은 <classname>speakup</classname>이 지원하느냐에 "
"따라 달라집니다. <classname>speakup</classname>은 내장 보드 및 시리얼 포트에 "
"연결한 외장 장치만 지원합니다. USB나 USB 시리얼 장치는 지원하지 않습니다. 지"
"원하는 하드웨어 음성 합성 장치에 대한 정보는 <ulink url=\"&url-speakup;"
-"\"><classname>speakup</classname> 웹사이트</ulink>에 있습니다. &debian; "
+"\"><classname>speakup</classname> 웹사이트</ulink>에 있습니다. &debian-gnu; "
"&release;에는 <classname>speakup</classname> &speakupver; 버전이 들어 있습니"
"다."
@@ -2309,15 +2309,15 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
-"대부분 이 펌웨어는 &debian; 프로젝트의 기준에 따르면 자유롭지 않은 소프트웨어"
+"대부분 이 펌웨어는 &debian-gnu; 프로젝트의 기준에 따르면 자유롭지 않은 소프트웨어"
"이기 때문에 메인 배포판이나 설치 시스템에 들어 있지 않습니다. 장치 드라이버"
-"가 배포판에 들어 있고 펌웨어를 &debian;에서 합법적으로 배포할 수 있는 경우, "
+"가 배포판에 들어 있고 펌웨어를 &debian-gnu;에서 합법적으로 배포할 수 있는 경우, "
"아카이브의 non-free 섹션에 별도 패키지로 들어 있기도 합니다."
#. Tag: para
@@ -2325,14 +2325,14 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
"하지만 그렇다고 해서 이러한 하드웨어를 설치할 때 사용할 수 없는 건 아닙니다. "
-"&debian; 5.0부터 &d-i;는 플로피 디스크나 USB 메모리같은 이동식 장치에서 펌웨"
+"&debian-gnu; 5.0부터 &d-i;는 플로피 디스크나 USB 메모리같은 이동식 장치에서 펌웨"
"어 파일이나 펌웨어가 들어 있는 패키지를 읽어들일 수 있습니다. 설치할 때 펌웨"
"어 파일이나 패키지를 읽어들이는 방법은 <xref linkend=\"loading-firmware\"/> "
"부분을 참고하십시오."
@@ -2742,7 +2742,7 @@ msgstr "유닉스 계열 혹은 GNU 시스템"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
@@ -3871,20 +3871,20 @@ msgstr ""
#~ msgid ""
#~ "If there is no other NIC you can use during the installation, it is still "
-#~ "possible to install &debian; using a full CD-ROM or DVD image. Select the "
+#~ "possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the "
#~ "option to not configure a network and install using only the packages "
#~ "available from the CD/DVD. You can then install the driver and firmware "
#~ "you need after the installation is completed (after the reboot) and "
#~ "configure your network manually. Note that the firmware may be packaged "
#~ "separately from the driver and may not be available in the <quote>main</"
-#~ "quote> section of the &debian; archive."
+#~ "quote> section of the &debian-gnu; archive."
#~ msgstr ""
#~ "설치할 때 사용할 수 있는 네트워크 카드가 없다고 해도, 전체 CD-ROM이나 DVD "
-#~ "이미지를 사용해 &debian; 시스템을 설치할 수 있습니다. 네트워크를 설정하지 "
+#~ "이미지를 사용해 &debian-gnu; 시스템을 설치할 수 있습니다. 네트워크를 설정하지 "
#~ "않도록 선택한 다음 CD/DVD에 있는 패키지를 사용해 설치하십시오. 설치가 끝"
#~ "난 다음에 (다시 부팅하고) 필요한 드라이버 및 펌웨어를 설치한 다음 네트워크"
#~ "를 수동으로 설정하십시오. 펌웨어는 드라이버와는 별도의 패키지로 만들어졌"
-#~ "을 수도 있고, &debian; 아카이브의 <quote>main</quote>에 없을 수도 있습니"
+#~ "을 수도 있고, &debian-gnu; 아카이브의 <quote>main</quote>에 없을 수도 있습니"
#~ "다."
#~ msgid ""
diff --git a/po/ko/install-methods.po b/po/ko/install-methods.po
index 4fc056614..cb7c34df1 100644
--- a/po/ko/install-methods.po
+++ b/po/ko/install-methods.po
@@ -27,14 +27,14 @@ msgstr "시스템 설치 미디어 구하기"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "공식 &debian; CD-ROM 세트"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "공식 &debian-gnu; CD-ROM 세트"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -47,7 +47,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"여러 가지 방법 중에서 &debian; 설치에 가장 쉬운 방법은 공식 데비안 CD-ROM 세"
+"여러 가지 방법 중에서 &debian-gnu; 설치에 가장 쉬운 방법은 공식 데비안 CD-ROM 세"
"트로 설치하는 것입니다. CD 세트는 판매하는 회사에서 (<ulink url=\"&url-"
"debian-cd-vendors;\">CD 판매 회사 페이지</ulink> 참고) 구입할 수 있습니다. 네"
"트워크 연결이 빠르고, CD 라이터가 있으면, 데비안 미러 사이트에서 CD-ROM 이미"
@@ -591,11 +591,11 @@ msgstr "<command>Disk Copy</command>로 디스크 이미지 쓰기"
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
-"공식 &debian; CD에 있는 파일에서 플로피 이미지를 만들면, Type과 Creator가 이"
+"공식 &debian-gnu; CD에 있는 파일에서 플로피 이미지를 만들면, Type과 Creator가 이"
"미 지정되어 있습니다. 다음의 <command>Creator-Changer</command> 단계는 데비"
"안 미러에서 이미지 파일을 다운로드할 경우에만 상관 있습니다."
@@ -1682,7 +1682,7 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
@@ -1754,13 +1754,13 @@ msgstr "DHCP 서버 준비하기"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
"자유 소프트웨어 DHCP 서버의 하나로 ISC <command>dhcpd</command>가 있습니다. "
-"&debian;에서는 <classname>dhcp3-server</classname> 패키지를 권장합니다. 다음"
+"&debian-gnu;에서는 <classname>dhcp3-server</classname> 패키지를 권장합니다. 다음"
"은 간단한 설정 파일 예제입니다 (<filename>/etc/dhcp3/dhcpd.conf</filename> 파"
"일을 보십시오):"
@@ -1924,7 +1924,7 @@ msgstr "BOOTP 서버 준비하기"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
@@ -1938,7 +1938,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -1968,7 +1968,7 @@ msgid ""
"userinput> variable is the machine's MAC address. </phrase>"
msgstr ""
"CMU <command>bootpd</command>를 사용하려면, <filename>/etc/inetd.conf</"
-"filename>에서 관련된 줄의 주석을 없애거나 한 줄을 추가해야 합니다. &debian;에"
+"filename>에서 관련된 줄의 주석을 없애거나 한 줄을 추가해야 합니다. &debian-gnu;에"
"선 <userinput>update-inetd --enable bootps</userinput>를 실행한 다음 적용하"
"려면 <userinput>/etc/init.d/inetd reload</userinput> 명령을 실행합니다. 데비"
"안에서 BOOTP서버가 실행이 되지 않는 다면, 문제에 나온 줄은 다음과 같은 모양입"
@@ -2048,14 +2048,14 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
"configuration examples in this section accordingly."
msgstr ""
"전통적으로 부팅 이미지를 저장하는 위치로 TFTP 서버는 <filename>/tftpboot</"
-"filename> 디렉터리를 사용합니다. 하지만, &debian; 패키지는 <ulink url=\"&url-"
+"filename> 디렉터리를 사용합니다. 하지만, &debian-gnu; 패키지는 <ulink url=\"&url-"
"fhs-home;\">Filesystem Hierarchy Standard</ulink>에 맞추기 위해 다른 디렉터리"
"를 사용합니다. 예를 들어, <classname>tftpd-hpa</classname>는 기본값으로 "
"<filename>/var/lib/tftpboot</filename>를 사용합니다. 여기서 설명하는 설정 파"
@@ -2313,13 +2313,13 @@ msgstr ""
#~ msgid ""
#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "a &debian-gnu; server, the <classname>atftpd</classname> and <classname>tftpd-"
#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
#~ "classname>."
#~ msgstr ""
#~ "TFTP 부팅에서 Pre-boot Execution Environment (PXE) 방식을 사용하려면, "
#~ "<userinput>tsize</userinput>를 지원하는 TFTP 서버가 있어야 합니다. "
-#~ "&debian; 서버에서는, <classname>atftpd</classname> 및 <classname>tftpd-"
+#~ "&debian-gnu; 서버에서는, <classname>atftpd</classname> 및 <classname>tftpd-"
#~ "hpa</classname> 패키지가 이 기능을 지원합니다. <classname>tftpd-hpa</"
#~ "classname>를 권장합니다."
diff --git a/po/ko/installation-howto.po b/po/ko/installation-howto.po
index add94fc89..c9396819d 100644
--- a/po/ko/installation-howto.po
+++ b/po/ko/installation-howto.po
@@ -28,14 +28,14 @@ msgstr "설치 하우투"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
"useful, we will link to more detailed explanations in other parts of this "
"document."
msgstr ""
-"이 문서는 &d-i;를 사용해 &arch-title;용 &debian; &releasename;"
+"이 문서는 &d-i;를 사용해 &arch-title;용 &debian-gnu; &releasename;"
"(<quote>&architecture;</quote>) 배포판을 설치하는 방법을 설명합니다. 간단히 "
"설치 절차만 설명한 문서로, 설치할 때 필요한 정보 대부분이 들어 있습니다. 더 "
"많은 정보가 필요한 경우 더 자세히 설명한 이 문서의 다른 부분으로 링크되어 있"
diff --git a/po/ko/partitioning.po b/po/ko/partitioning.po
index 437aff13f..0c01e9c89 100644
--- a/po/ko/partitioning.po
+++ b/po/ko/partitioning.po
@@ -116,18 +116,18 @@ msgstr ""
msgid "The Directory Tree"
msgstr "디렉토리 구조"
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"&debian;는 디렉토리와 파일의 이름을 정할 때 <ulink url=\"&url-fhs-home;"
+"&debian-gnu;는 디렉토리와 파일의 이름을 정할 때 <ulink url=\"&url-fhs-home;"
"\">Filesystem Hierarchy Standard</ulink>를 따릅니다. 이 표준을 준수하면 사용"
"자와 소프트웨어에서 처음 접하는 시스템이라도 파일과 디렉토리의 위치가 어디인"
"지 알 수 있습니다. 루트 디렉토리는 간단히 슬래쉬 <filename>/</filename>로 표"
@@ -1080,13 +1080,13 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"리눅스는 파티션을 SCSI 디스크의 경우 15개(주 파티션 3개, 논리 파티션 12개), "
"IDE 디스크의 경우 63개(주 파티션 3개, 논리 파티션 60개)까지 쓸 수 있습니다. "
-"하지만 일반적인 &debian; 시스템은 기본으로 파티션용 장치 파일이 20개만 들어 "
+"하지만 일반적인 &debian-gnu; 시스템은 기본으로 파티션용 장치 파일이 20개만 들어 "
"있으므로 20개보다 많은 파티션을 만드려면 직접 파티션용 장치를 추가해야 합니"
"다."
@@ -1429,12 +1429,12 @@ msgstr ""
"command> 프로그램과 <command>mkofboot</command> 프로그램을 통해서 관리할 수 "
"있습니다."
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1443,7 +1443,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"OpenFirmware에서 &debian;가 부팅하려면, 부트스트랩 파티션이 다른 나머지 부팅 "
+"OpenFirmware에서 &debian-gnu;가 부팅하려면, 부트스트랩 파티션이 다른 나머지 부팅 "
"파티션보다 앞에 와야 합니다. 특히 맥오에스 부팅 파티션보다 앞에 와야 합니다. "
"부트스트랩 파티션을 가장 먼저 만드는 것이 좋습니다. 나중에 부트스트랩 파티션"
"을 만든 경우에는 <command>mac-fdisk</command>의 <userinput>r</userinput> 명령"
diff --git a/po/ko/preface.po b/po/ko/preface.po
index 9ea62fec2..8cf86eb24 100644
--- a/po/ko/preface.po
+++ b/po/ko/preface.po
@@ -20,22 +20,22 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "&architecture;용 &debian; &release; 설치하기"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "&architecture;용 &debian-gnu; &release; 설치하기"
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"여러분이 데비안을 사용하게 되어 매우 기쁩니다. 데비안의 GNU/리눅스 배포판이 "
-"다른 데 비길 데 없는 배포판이라고 아시게 될 거라고 확신합니다. &debian;는 세"
+"다른 데 비길 데 없는 배포판이라고 아시게 될 거라고 확신합니다. &debian-gnu;는 세"
"상 최고 품질의 소프트웨어를 모아서, 그 소프트웨어들을 완벽하게 통합합니다. 데"
"비안이 그 소프트웨어를 하나 하나 합친 것보다 훨씬 더 뛰어나다는 사실을 아시"
"게 될 거라 확신합니다."
diff --git a/po/ko/preparing.po b/po/ko/preparing.po
index 452de673c..14749112d 100644
--- a/po/ko/preparing.po
+++ b/po/ko/preparing.po
@@ -18,12 +18,12 @@ msgstr ""
"Content-Type: application/x-xml2pot; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-# &debian; => 데비안 GNU/리눅스, 조사 사용 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "&debian;를 설치하기 전에"
+msgid "Before Installing &debian-gnu;"
+msgstr "&debian-gnu;를 설치하기 전에"
#. Tag: para
#: preparing.xml:6
@@ -73,7 +73,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -83,7 +83,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"&debian;에서는 운영 체제에서 무언가 문제점이 있으면, 운영 체제를 바꿔 버리는 "
+"&debian-gnu;에서는 운영 체제에서 무언가 문제점이 있으면, 운영 체제를 바꿔 버리는 "
"게 아니라 바로 잡습니다. 업그레이드할 때 전부 다 설치할 필요는 없고, 항상 그 "
"자리에서 업그레이드할 수 있습니다. 그리고 프로그램은 거의 대부분 뒤의 운영 체"
"제 릴리스에서도 호환됩니다. 어떤 프로그램의 새 버전에서 또 다른 소프트웨어의 "
@@ -200,10 +200,10 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
-"&debian; 및 기존 시스템을 시작할 수 있는 <firstterm>부트로더</firstterm>를 설"
+"&debian-gnu; 및 기존 시스템을 시작할 수 있는 <firstterm>부트로더</firstterm>를 설"
"치하십시오."
#. Tag: para
@@ -280,7 +280,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"설치할 때 중요한 옵션의 하나가 그래픽 데스크탑 환경을 설치할 지 옵션입니다. "
@@ -288,7 +288,7 @@ msgstr ""
"어 있습니다. <quote>데스크탑 환경</quote> 태스크를 선택하지 않으면, 아주 기본"
"적인 명령행 기반 시스템만 설치합니다. 이 태스크 설치는 옵션입니다. 데스크탑 "
"환경 태스크를 설치하면 상당히 큰 디스크 공간을 차지하기 때문이고, 또 많은 "
-"&debian; 시스템은 서버로 동작하기 때문에 동작하는 데 그래픽 사용자 인터페이스"
+"&debian-gnu; 시스템은 서버로 동작하기 때문에 동작하는 데 그래픽 사용자 인터페이스"
"가 전혀 필요없기 때문입니다."
#. Tag: para
@@ -317,7 +317,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -325,7 +325,7 @@ msgid ""
"actions. Two minutes of thinking can save hours of unnecessary work."
msgstr ""
"시작하기 전에 지금 시스템에 있는 모든 파일을 백업해 두십시오. 원래 설치된 운"
-"영 체제가 아닌 운영 체제를 처음으로 설치하는 거라면, &debian;의 루트로 쓸 디"
+"영 체제가 아닌 운영 체제를 처음으로 설치하는 거라면, &debian-gnu;의 루트로 쓸 디"
"스크를 다시 파티션해야 합니다. 파티션 프로그램으로 어떤 프로그램을 사용하든 "
"간에, 디스크를 파티션하면 그 디스크에 있는 모든 파일을 잃어버리는 걸 감수해"
"야 합니다. 설치에 사용하는 프로그램은 상당히 안정적이고 수년동안 사용해 온 프"
@@ -1119,7 +1119,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1129,7 +1129,7 @@ msgid ""
"least 200MB for <filename>/var</filename>, and a lot more if you install a "
"graphical desktop environment."
msgstr ""
-"&debian; 시스템을 원활히 동작시키는 데 필요한 디스크 공간까지 추천하는 시스"
+"&debian-gnu; 시스템을 원활히 동작시키는 데 필요한 디스크 공간까지 추천하는 시스"
"템 요구사항에 반영되어 있습니다. 특히, <filename>/var</filename> 파티션에는 "
"여러 가지 데비안의 상태 정보와 로그 파일같은 일반적인 데이터가 들어 있습니"
"다. <command>dpkg</command> 파일은 (설치 패키지에 대한 정보를 합쳐서) 간단히 "
@@ -1242,13 +1242,13 @@ msgstr ""
"리 파티션할 필요가 없습니다. 설치 프로그램에 포함된 파티션 프로그램이 파티션 "
"작업을 훌륭하게 처리합니다."
-# &debian; => 데비안 GNU/리눅스, 조사 사용 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
#. Tag: para
#: preparing.xml:806
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1259,7 +1259,7 @@ msgid ""
"some alternate means of reviving your machine like the original system's "
"installation tapes or CDs."
msgstr ""
-"컴퓨터에 하드 디스크가 1개 있고, 지금 운영 체제를 &debian;로 완전히 덮어 쓰려"
+"컴퓨터에 하드 디스크가 1개 있고, 지금 운영 체제를 &debian-gnu;로 완전히 덮어 쓰려"
"고 한다면, 설치 시스템을 부팅한 다음에 설치하는 과정에서 파티션을 할 수도 있"
"습니다. (<xref linkend=\"di-partition\"/>.) 하지만 설치 시스템을 테이프에서 "
"부팅하거나 CD-ROM에서 부팅하거나 연결되어 있는 다른 컴퓨터에 있는 파일에서 부"
@@ -1306,14 +1306,14 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
"위의 경우 중 아무것도 아니라면, 데비안에 파티션 가능한 공간을 만들기 위해 설"
"치 전에 파티션을 해야 합니다. 다른 운영 체제가 들어 있는 파티션이 들어 있으"
"면, 원래 운영 체제 프로그램의 파티션 프로그램을 이용해 파티션해야 합니다. 다"
-"른 운영 체제의 도구로 &debian;의 파티션을 만들지 <emphasis>않기를</emphasis> "
+"른 운영 체제의 도구로 &debian-gnu;의 파티션을 만들지 <emphasis>않기를</emphasis> "
"권장합니다. 그 대신 계속 유지하려는 원래 운영 체제의 파티션만 만들어야 합니"
"다."
@@ -1341,12 +1341,12 @@ msgstr ""
"이런 동작은 복구할 수도 있고, 피할 수 있습니다. 하지만 원래 운영 체제를 먼저 "
"설치하면 이런 문제가 없습니다."
-# &debian; => 데비안 GNU/리눅스, 조사 사용 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
#. Tag: para
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the Linux "
+"In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a Linux placeholder partition to come <emphasis>before</"
@@ -1355,7 +1355,7 @@ msgid ""
"placeholder with the Linux partition tools later during the actual install, "
"and replace it with Linux partitions."
msgstr ""
-"OpenFirmware에서 &debian;를 자동으로 부팅하도록 하려면, 리눅스 파티션이 해당 "
+"OpenFirmware에서 &debian-gnu;를 자동으로 부팅하도록 하려면, 리눅스 파티션이 해당 "
"디스크의 다른 파티션보다, 특히 맥오에스 부팅 파티션보다 앞에 있어야 합니다. "
"미리 파티션할 때 다음을 염두에 둬야 합니다. 디스크의 다른 부팅 가능 파티션보"
"다 앞 쪽 위치에 리눅스 파티션이 들어갈 파티션을 만드십시오. (애플 디스크 드라"
@@ -1392,16 +1392,16 @@ msgstr ""
"arch=\"powerpc\">맥오에스 CD에서 부팅할 때, CD에서 맥오에스 시스템을 시작하려"
"면 부팅하는 동안 <keycap>c</keycap> 키를 누르고 있으십시오.</phrase>"
-# &debian; => 데비안 GNU/리눅스, 조사 사용 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
#. Tag: para
#: preparing.xml:896
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"원래 운영 체제에 들어 있는 파티션 도구로 그 운영 체제용 시스템 파티션을 만드"
-"십시오. &debian;로 사용할 위치에 파티션을 만들거나 빈 공간을 만들어 놓으십시"
+"십시오. &debian-gnu;로 사용할 위치에 파티션을 만들거나 빈 공간을 만들어 놓으십시"
"오."
#. Tag: para
@@ -1725,10 +1725,10 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"GNU/리눅스가 들어갈 위치에 공간을 차지하는 파티션을 만들도록 하십시오. 가능하"
-"면 디스크에서 첫번째에 놓으십시오. 파티션 종류는 중요하지 않습니다. &debian; "
+"면 디스크에서 첫번째에 놓으십시오. 파티션 종류는 중요하지 않습니다. &debian-gnu; "
"설치 프로그램에서 나중에 그 파티션을 지워서 다른 파티션으로 바꾸게 됩니다."
#. Tag: para
@@ -1790,14 +1790,14 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"여기서는 데비안을 설치하기 전에 해야 할 하드웨어 설정에 대해 (설정이 따로 필"
"요하다면) 다룹니다. 보통 시스템의 펌웨어 설정을 확인하고 필요하다면 설정을 바"
"꾸는 일입니다. <quote>펌웨어</quote>는 하드웨어가 사용하는 주요 소프트웨어"
"로, 전원을 켠 다음에 부트스트랩 과정에서 반드시 동작합니다. 여러분 시스템에서"
-"의 &debian; 안정성과 관련된 하드웨어 문제도 다룹니다."
+"의 &debian-gnu; 안정성과 관련된 하드웨어 문제도 다룹니다."
#. Tag: title
#: preparing.xml:1163
@@ -2523,12 +2523,12 @@ msgstr "eeprom boot-device=disk1:1"
msgid "BIOS Setup"
msgstr "BIOS 설정"
-# &debian; => 데비안 GNU/리눅스, 조사 사용 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
#. Tag: para
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2537,7 +2537,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"&debian;를 &arch-title; 혹은 zSeries 컴퓨터에 설치하려면 먼저 커널을 부팅합니"
+"&debian-gnu;를 &arch-title; 혹은 zSeries 컴퓨터에 설치하려면 먼저 커널을 부팅합니"
"다. 이 플랫폼의 부팅 방법은 다른 플랫폼과는 (특히 PC 시스템과는) 완전히 다릅"
"니다. 플로피 장치가 아예 없습니다. 이 플랫폼으로 작업할 때 다른 큰 차이점도 "
"하나 있는데, (항상 그렇지는 않더라도) 대부분 원격에서 telnet이나 브라우저같"
@@ -2668,11 +2668,11 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
-"설치 서버에는 &debian; 미러에서 디렉토리 구조를 정확히 복사해 놓아야 합니다. "
+"설치 서버에는 &debian-gnu; 미러에서 디렉토리 구조를 정확히 복사해 놓아야 합니다. "
"s390 아키텍처용 파일 및 아키텍처 공용 파일만 필요합니다. 그 디렉토리에서 설"
"치 CD의 내용만 복사해 올 수도 있습니다."
diff --git a/po/ko/random-bits.po b/po/ko/random-bits.po
index 2466920a3..4f1dc71e3 100644
--- a/po/ko/random-bits.po
+++ b/po/ko/random-bits.po
@@ -833,26 +833,26 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "유닉스/리눅스 시스템에서 &debian; 설치하기"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "유닉스/리눅스 시스템에서 &debian-gnu; 설치하기"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
"이 부분에서는 (이 안내서의 다른 부분에 설명한) ncurses 기반 메뉴 방식 설치 프"
-"로그램을 사용하지 않고, 기존 유닉스 혹은 리눅스 시스템을 이용해 &debian; 배포"
+"로그램을 사용하지 않고, 기존 유닉스 혹은 리눅스 시스템을 이용해 &debian-gnu; 배포"
"판을 설치하는 방법을 설명합니다. 이 <quote>크로스 설치</quote> 하우투는 Red "
-"Hat, Mandrake, SUSE에서 &debian; 배포판으로 바꾸려는 사용자에게 필요한 부분입"
+"Hat, Mandrake, SUSE에서 &debian-gnu; 배포판으로 바꾸려는 사용자에게 필요한 부분입"
"니다. 여기서는 유닉스 계열의 명령어를 입력하는 방법이나 파일 시스템을 돌아다"
"니는 데 익숙해져 있다고 가정합니다. 여기서 <prompt>$</prompt> 표시는 사용자"
"의 기존 시스템에서 입력하는 명령어이고, <prompt>#</prompt> 표시는 데비안 "
@@ -864,13 +864,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"새로 설치한 데비안 시스템을 필요에 맞게 설정하기만 하면, 기존 사용자 데이터"
"를 (있다면) 옮겨와서 계속 사용할 수 있습니다. 즉 <quote>다운타임이 없는</"
-"quote> &debian; 설치입니다. 또 이 방법은 여러가지 부팅 미디어나 설치 미디어"
+"quote> &debian-gnu; 설치입니다. 또 이 방법은 여러가지 부팅 미디어나 설치 미디어"
"가 동작하지 않는 하드웨어에서 좋은 설치 방법입니다."
#. Tag: para
@@ -1070,11 +1070,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"&releasename; &debian; CD를 <filename>/cdrom</filename>에 마운트했다면 http "
+"&releasename; &debian-gnu; CD를 <filename>/cdrom</filename>에 마운트했다면 http "
"URL 대신에 file URL을 쓸 수 있습니다: <userinput>file:/cdrom/debian/</"
"userinput>"
@@ -1710,12 +1710,12 @@ msgstr "부트로더 설정하기"
#: random-bits.xml:765
#, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"&debian; 시스템을 부팅 가능하게 하려면, 부트로더를 설정해서 루트 파티션에서 "
+"&debian-gnu; 시스템을 부팅 가능하게 하려면, 부트로더를 설정해서 루트 파티션에서 "
"설치한 커널을 읽어들이도록 하십시오. <command>debootstrap</command>은 부트로"
"더를 설치하지 않는다는 점에 주의하십시오. 하지만 <command>aptitude</command>"
"을 데비안 chroot 안에서 사용하면 부트로더를 설치할 수 있습니다."
@@ -1933,21 +1933,21 @@ msgstr "# aptitude clean"
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "패러렐 라인 IP를 (PLIP) 이용해 &debian; 설치하기"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "패러렐 라인 IP를 (PLIP) 이용해 &debian-gnu; 설치하기"
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
"이 부분은 이더넷 카드는 없지만 게이트웨이 컴퓨터와 널 모뎀 케이블을 (널 프린"
-"터 케이블이라고도 합니다) 통해 연결되어 있는 컴퓨터에 &debian;를 설치하는 방"
+"터 케이블이라고도 합니다) 통해 연결되어 있는 컴퓨터에 &debian-gnu;를 설치하는 방"
"법을 설명합니다. 게이트웨이 컴퓨터는 데비안 미러가 있는 네트워크에 (예를 들"
"어 인터넷에) 연결되어 있어야 합니다."
@@ -2212,8 +2212,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "PPP 오버 이더넷을 (PPPoE) 이용해 &debian; 설치하기"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "PPP 오버 이더넷을 (PPPoE) 이용해 &debian-gnu; 설치하기"
#. Tag: para
#: random-bits.xml:1048
@@ -2637,7 +2637,7 @@ msgstr ""
#~ "Etch is the first release that includes the graphical installer and uses "
#~ "some relatively new technology. There are a few known issues that you may "
#~ "run into during the installation. We expect to be able to fix these "
-#~ "issues for the next release of &debian;."
+#~ "issues for the next release of &debian-gnu;."
#~ msgstr ""
#~ "etch는 그래픽 설치 프로그램이 들어 있는 첫번째 릴리스로 비교적 새로운 기술"
#~ "을 사용합니다. 설치하면서 알려진 문제점이 몇 가지 있을 수 있습니다. 다음 "
diff --git a/po/ko/using-d-i.po b/po/ko/using-d-i.po
index 0563be561..055d7ceff 100644
--- a/po/ko/using-d-i.po
+++ b/po/ko/using-d-i.po
@@ -772,18 +772,18 @@ msgstr ""
msgid "Check available memory / low memory mode"
msgstr "사용 가능 메모리 검사 / 저용량 메모리 모드"
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: using-d-i.xml:451
#, no-c-format
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"&d-i;가 맨 처음에 하는 일 중의 하나는 메모리 검사입니다. 메모리가 부족할 경"
-"우 이 컴포넌트에서는 시스템에서 &debian;를 설치하는 데 문제가 없도록 설치 과"
+"우 이 컴포넌트에서는 시스템에서 &debian-gnu;를 설치하는 데 문제가 없도록 설치 과"
"정에 약간 수정을 가합니다."
#. Tag: para
@@ -3466,7 +3466,7 @@ msgstr "APT 설정하기"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -3482,7 +3482,7 @@ msgid ""
"<command>aptitude</command> is now the recommended utility for package "
"management."
msgstr ""
-"&debian;에서 패키지를 설치할 때 쓰는 프로그램의 하나는 <classname>apt</"
+"&debian-gnu;에서 패키지를 설치할 때 쓰는 프로그램의 하나는 <classname>apt</"
"classname> 패키지에 있는 <command>apt-get</command>입니다. <footnote> <para>"
"참고로 패키지를 실제로 설치하는 프로그램은 <command>dpkg</command>입니다. 하"
"지만 이 프로그램은 저수준 도구에 가깝습니다. <command>apt-get</command>은 고"
@@ -4571,14 +4571,14 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"최근의 (1998년 중반 이후) 파워맥에서는 부트로더로 <command>yaboot</command>"
"를 사용합니다. 설치 프로그램은 자동으로 <command>yaboot</command>를 설정하기 "
"때문에, 필요한 건 <emphasis>Apple_Bootstrap</emphasis> 타입의 "
"<quote>bootstrap</quote>이라는 이름의 820k 크기의 작은 파티션뿐입니다. 이 파"
"티션은 앞의 파티션 컴포넌트에서 만듭니다. 이 단계에서 성공적으로 끝나면 디스"
-"크가 부팅 가능하게 되고 OpenFirmware에서 &debian; 부팅 준비가 끝납니다."
+"크가 부팅 가능하게 되고 OpenFirmware에서 &debian-gnu; 부팅 준비가 끝납니다."
#. Tag: title
#: using-d-i.xml:2964
@@ -4783,7 +4783,7 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
diff --git a/po/ko/welcome.po b/po/ko/welcome.po
index e8a9388a4..d6009ead8 100644
--- a/po/ko/welcome.po
+++ b/po/ko/welcome.po
@@ -28,12 +28,12 @@ msgstr "데비안을 만나신 것을 환영합니다"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"이 장에서는 데비안 프로젝트와 &debian;에 대해 간단히 설명합니다. 데비안 프로"
-"젝트의 역사와 &debian; 배포판에 대해 이미 알고 있다면 다음 장으로 넘어가셔도 "
+"이 장에서는 데비안 프로젝트와 &debian-gnu;에 대해 간단히 설명합니다. 데비안 프로"
+"젝트의 역사와 &debian-gnu; 배포판에 대해 이미 알고 있다면 다음 장으로 넘어가셔도 "
"됩니다."
#. Tag: title
@@ -379,14 +379,14 @@ msgstr ""
"에서 가장 성장이 빠른 운영체제입니다. 최근에 리눅스는 가정과 업무용 사용자에"
"게도 퍼져 나가고 있습니다."
-# &debian; => 데비안 GNU/리눅스 (조사 사용 주의)
+# &debian-gnu; => 데비안 GNU/리눅스 (조사 사용 주의)
#. Tag: title
#: welcome.xml:231
#, no-c-format
msgid "What is Debian GNU/Linux?"
msgstr "Debian GNU/Linux란?"
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: welcome.xml:232
#, no-c-format
@@ -566,7 +566,7 @@ msgstr "데비안 구하기"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
@@ -601,11 +601,11 @@ msgstr "이 문서의 최신 버전 구하는 법"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
-"이 문서는 계속해서 바뀝니다. &debian; 시스템의 &release; 릴리스에 대한 최신 "
+"이 문서는 계속해서 바뀝니다. &debian-gnu; 시스템의 &release; 릴리스에 대한 최신 "
"정보는 <ulink url=\"&url-release-area;\">데비안 &release; 페이지</ulink>를 확"
"인하기 바랍니다. 이 설치문서의 최신 버전은 <ulink url=\"&url-install-manual;"
"\">공식 데비안 설치 안내서 페이지</ulink>에서도 구할 수 있습니다."
@@ -643,18 +643,18 @@ msgstr ""
"용이 있습니다. 전문적인 사용자는 이 문서를 처음부터 읽지 말고 필요한 부분만 "
"읽어 나가기를 권합니다."
-# &debian; => 데비안 GNU/리눅스, 조사 구분에 주의
+# &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
#. Tag: para
#: welcome.xml:408
#, no-c-format
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"이 안내서는 설치 과정의 처음부터 끝까지, 각 과정의 순서대로 쓰여 있습니다. 아"
-"래는 &debian;를 설치하는 과정으로, 각 과정에 관련된 문서 부분을 안내해 놓았습"
+"래는 &debian-gnu;를 설치하는 과정으로, 각 과정에 관련된 문서 부분을 안내해 놓았습"
"니다:"
#. Tag: para
@@ -802,7 +802,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -812,7 +812,7 @@ msgstr ""
"대부분의 상업용 소프트웨어에는 라이선스가 따라 나오는데, 아마도 이 라이선스"
"를 조금이라도 읽어 본 적이 있을 것입니다. 이러한 라이선스는 보통 하나의 컴퓨"
"터에 한 복사본만 사용하도록 정하고 있습니다. 데비안 시스템의 라이선스는 이 라"
-"이선스와 전혀 다릅니다. &debian; 복사본 하나로 학교나 회사의 모든 컴퓨터에 얼"
+"이선스와 전혀 다릅니다. &debian-gnu; 복사본 하나로 학교나 회사의 모든 컴퓨터에 얼"
"마든지 설치하십시오. 설치 미디어를 여러분의 친구에게 빌려주고 컴퓨터에 설치하"
"는 것을 도와주십시오! 수천장을 복사하고, <emphasis>판매</emphasis>하십시오. "
"(약간 제한이 있습니다.) 데비안은 <emphasis>자유 소프트웨어</emphasis>를 기반"
diff --git a/po/nn/bookinfo.po b/po/nn/bookinfo.po
index 60f864d0e..1fef2be08 100644
--- a/po/nn/bookinfo.po
+++ b/po/nn/bookinfo.po
@@ -18,20 +18,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "Installasjonsmanual for &debian;"
+msgid "&debian-gnu; Installation Guide"
+msgstr "Installasjonsmanual for &debian-gnu;"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Dette dokumentet inneheld installsjonsinstruksjonar for &debian; &release;-"
+"Dette dokumentet inneheld installsjonsinstruksjonar for &debian-gnu; &release;-"
"systemet (kodenamn <quote><quote></quote>), for arkitekturen &arch-title;(</"
"quote>&architecture;<quote>). Det inneheld også peikarar til meir "
"informasjon og informasjon om korleis du kan gjere mest ut av det nye "
diff --git a/po/nn/preface.po b/po/nn/preface.po
index 7a12051a8..5f24eac90 100644
--- a/po/nn/preface.po
+++ b/po/nn/preface.po
@@ -18,21 +18,21 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "Installasjon av &debian; &release; for &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "Installasjon av &debian-gnu; &release; for &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Vi er glade for at du har valt å prøve Debian og vi er sikre på at du kjem "
-"til å synes at Debian sin GNU/&arch-kernel; distribusjon er unik. &debian; fører "
+"til å synes at Debian sin GNU/&arch-kernel; distribusjon er unik. &debian-gnu; fører "
"saman høgkvalitets fri programvare frå heile verda, og integrerer det i ein "
"samanhengande heilskap. Vi trur at du vil finne at resultatet er meir enn "
"summen av delane."
diff --git a/po/pt/bookinfo.po b/po/pt/bookinfo.po
index 426dc8a7f..98cf5b7ab 100644
--- a/po/pt/bookinfo.po
+++ b/po/pt/bookinfo.po
@@ -17,20 +17,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "Guia de Instalação de &debian;"
+msgid "&debian-gnu; Installation Guide"
+msgstr "Guia de Instalação de &debian-gnu;"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Este documento contém as instruções de instalação para o sistema &debian; "
+"Este documento contém as instruções de instalação para o sistema &debian-gnu; "
"&release;, (nome de código <quote>&releasename;</quote>), para a "
"arquitectura &arch-title; (<quote>&architecture;</quote>). Também contém "
"indicações para mais informações e formas de tirar o máximo do seu novo "
diff --git a/po/pt/boot-installer.po b/po/pt/boot-installer.po
index 168af12e2..488a14999 100644
--- a/po/pt/boot-installer.po
+++ b/po/pt/boot-installer.po
@@ -559,11 +559,11 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
"Após o programa ter sido iniciado, serão colocadas algumas questões "
"preliminares e o sistema será preparado para iniciar o instalador de "
-"&debian;."
+"&debian-gnu;."
#. Tag: title
#: boot-installer.xml:496
@@ -4837,22 +4837,22 @@ msgstr ""
#~ msgid ""
#~ "GNU/Linux is the only operating system on Alpha that can be booted from "
-#~ "both console types, but &debian; &release; only supports booting on SRM-"
+#~ "both console types, but &debian-gnu; &release; only supports booting on SRM-"
#~ "based systems. If you have an Alpha for which no version of SRM is "
#~ "available, if you will be dual-booting the system with Windows NT, or if "
#~ "your boot device requires ARC console support for BIOS initialization, "
-#~ "you will not be able to use the &debian; &release; installer. You can "
-#~ "still run &debian; &release; on such systems by using other install "
+#~ "you will not be able to use the &debian-gnu; &release; installer. You can "
+#~ "still run &debian-gnu; &release; on such systems by using other install "
#~ "media; for instance, you can install Debian woody with MILO and upgrade."
#~ msgstr ""
#~ "GNU/Linux é o único sistema operativo em Alpha que pode ser iniciado a "
-#~ "partir de ambos os tipos de consola, mas &debian; &release; apenas "
+#~ "partir de ambos os tipos de consola, mas &debian-gnu; &release; apenas "
#~ "suporta arranque em sistemas baseados em SRM (SRM-based). Se tem um Alpha "
#~ "para o qual nenhuma versão de SRM está disponível, se irá fazer dual-boot "
#~ "do sistema com Windows NT, ou se o seu periférico de boot requer suporte "
#~ "para uma consola ARC para inicialização por BIOS, não lhe irá ser "
-#~ "possível correr o instalador de &debian; &release;. Será, no entanto, "
-#~ "possível correr &debian; &release; em tais sistemas usando outro meio "
+#~ "possível correr o instalador de &debian-gnu; &release;. Será, no entanto, "
+#~ "possível correr &debian-gnu; &release; em tais sistemas usando outro meio "
#~ "para instalar; por exemplo, poderá instalar o Debian woody com recurso ao "
#~ "MILO e fazendo upgrade."
@@ -5078,7 +5078,7 @@ msgstr ""
#~ "firmware. Also, once SRM is installed, it is possible to run ARC/"
#~ "AlphaBIOS from a floppy disk (using the <command>arc</command> command). "
#~ "For the reasons mentioned above, we recommend switching to SRM before "
-#~ "installing &debian;."
+#~ "installing &debian-gnu;."
#~ msgstr ""
#~ "A maioria dos AlphaServers e todos os produtos actuais para servidores e "
#~ "estações de trabalho contém tanto SRM como AlphaBIOS no seu firmware. "
@@ -5087,14 +5087,14 @@ msgstr ""
#~ "novamente o flash ao firmware. Além disso, uma vez o SRM esteja "
#~ "instalado, é possível correr o ARC/AlphaBIOS a partir de uma disquete "
#~ "(usando o comando <command>arc</command>). Pelas razões mencionadas "
-#~ "acima, nós recomendamos que mude para SRM antes de instalar &debian;."
+#~ "acima, nós recomendamos que mude para SRM antes de instalar &debian-gnu;."
#~ msgid ""
#~ "As on other architectures, you should install the newest available "
#~ "revision of the firmware<footnote> <para> Except on Jensen, where Linux "
#~ "is not supported on firmware versions newer than 1.7 &mdash; see <ulink "
#~ "url=\"&url-jensen-howto;\"></ulink> for more information. </para> </"
-#~ "footnote> before installing &debian;. For Alpha, firmware updates can be "
+#~ "footnote> before installing &debian-gnu;. For Alpha, firmware updates can be "
#~ "obtained from <ulink url=\"&url-alpha-firmware;\">Alpha Firmware Updates</"
#~ "ulink>."
#~ msgstr ""
@@ -5102,7 +5102,7 @@ msgstr ""
#~ "mais recente<footnote> <para> Excepto em Jensen, onde o Linux não é "
#~ "suportado nas versões superiores a 1.7 &mdash; ver <ulink url=\"&url-"
#~ "jensen-howto;\"></ulink> para mais informação. </para> </footnote> antes "
-#~ "de instalar &debian;. Para Alpha, os updates de firmware podem ser "
+#~ "de instalar &debian-gnu;. Para Alpha, os updates de firmware podem ser "
#~ "obtidos a partir de <ulink url=\"&url-alpha-firmware;\">Alpha Firmware "
#~ "Updates </ulink>."
@@ -5186,7 +5186,7 @@ msgstr ""
#~ msgstr "Iniciar a partir de CD-ROM com a Consola SRM"
#~ msgid ""
-#~ "The &debian; install CDs include several preconfigured boot options for "
+#~ "The &debian-gnu; install CDs include several preconfigured boot options for "
#~ "VGA and serial consoles. Type <informalexample><screen>\n"
#~ "&gt;&gt;&gt; boot xxxx -flags 0\n"
#~ "</screen></informalexample> to boot using VGA console, where "
@@ -5197,7 +5197,7 @@ msgstr ""
#~ "</screen></informalexample> and for console on the second serial port, "
#~ "type"
#~ msgstr ""
-#~ "Os CDs de instalação &debian; incluem opções de arranque pré-configuradas "
+#~ "Os CDs de instalação &debian-gnu; incluem opções de arranque pré-configuradas "
#~ "para consolas VGA e série. Escreva <informalexample><screen>\n"
#~ "&gt;&gt;&gt; boot xxxx -flags 0\n"
#~ "</screen></informalexample> para arrancar utilizando a consola VGA, onde "
diff --git a/po/pt/boot-new.po b/po/pt/boot-new.po
index 63fbda35a..88fdfc891 100644
--- a/po/pt/boot-new.po
+++ b/po/pt/boot-new.po
@@ -195,12 +195,12 @@ msgstr "NewWorld PowerMacs"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"Nas máquinas G4 e iBooks, pode pressionar a tecla <keycap>option</keycap> e "
"obter um ecrã gráfico com um botão para cada um dos SO que podem arrancar, o "
-"&debian; será um botão com um icon contendo um pequeno pinguim."
+"&debian-gnu; será um botão com um icon contendo um pequeno pinguim."
#. Tag: para
#: boot-new.xml:104
@@ -232,16 +232,16 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
"Reinicializar o OpenFirmware no hardware G3 ou G4 irá fazer com que o "
-"&debian; inicie por defeito (caso tenha particionado correctamente e "
-"colocado a partição Apple_Bootstrap em primeiro lugar). Se tiver o &debian; "
+"&debian-gnu; inicie por defeito (caso tenha particionado correctamente e "
+"colocado a partição Apple_Bootstrap em primeiro lugar). Se tiver o &debian-gnu; "
"num disco SCSI e o MacOS num disco IDE esta operação pode não funcionar e "
"terá que entrar no OpenFirmware e definir a variável <envar>boot-device</"
"envar>, normalmente o <command>ybin</command> efectua esta operação "
@@ -251,13 +251,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"Após iniciar o &debian; pela primeira vez poderá adicionar qualquer opção "
+"Após iniciar o &debian-gnu; pela primeira vez poderá adicionar qualquer opção "
"adicional que desejar (tal como opções de duplo arranque) ao <filename>/etc/"
"yaboot.conf</filename> e correr o <command>ybin</command> para actualizar a "
"partição de arranque com a configuração modificada. Para mais informação por "
diff --git a/po/pt/hardware.po b/po/pt/hardware.po
index dcbaf7f01..ebad85643 100644
--- a/po/pt/hardware.po
+++ b/po/pt/hardware.po
@@ -49,14 +49,14 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"O Debian não impõe requisitos de hardware para além do que é requerido pelo "
"kernel Linux e pelas ferramentas GNU. Por isso qualquer arquitectura ou "
"plataforma para a qual tenha sido portado o kernel Linux, libc, "
"<command>gcc</command>, etc. e para o qual exista um port de Debian, pode "
"correr Debian. Para mais detalhes de sistema com a arquitectura &arch-title; "
-"que tenham sido testados com &debian; por favor veja as páginas dos Ports em "
+"que tenham sido testados com &debian-gnu; por favor veja as páginas dos Ports em "
"<ulink url=\"&url-ports;\"></ulink>."
#. Tag: para
@@ -475,7 +475,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -484,7 +484,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"Esta é o primeiro lançamento oficial de &debian; para a arquitectura &arch-"
+"Esta é o primeiro lançamento oficial de &debian-gnu; para a arquitectura &arch-"
"title;. Nós pensamos que já se provou o suficiente para ser lançado. No "
"entanto, devido a não ter a exposição (e consequentemente o teste por "
"utilizadores) que algumas outras arquitecturas tiveram, poderá encontrar "
@@ -906,10 +906,10 @@ msgstr "As máquinas Cobalt utilizam 115200 bps."
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"Para &debian; &release; apenas são suportadas as sub-arquitecturas PMac "
+"Para &debian-gnu; &release; apenas são suportadas as sub-arquitecturas PMac "
"(Power-Macintosh ou PowerMac) e PreP."
#. Tag: title
@@ -2054,11 +2054,11 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
"As placas de rede sem fios que não sejam suportadas pelo kernel &arch-kernel; "
-"oficial podem normalmente ser postas a funcionar em &debian;, mas não são "
+"oficial podem normalmente ser postas a funcionar em &debian-gnu;, mas não são "
"suportadas durante a instalação."
#. Tag: para
@@ -2078,7 +2078,7 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
@@ -2086,7 +2086,7 @@ msgid ""
msgstr ""
"Se existir algum problema com a rede sem fios e se não existir outra placa "
"de rede que possa utilizar durante a instalação, ainda assim é possível "
-"instalar &debian; utilizando uma imagem completa de CD-ROM ou DVD. Escolha a "
+"instalar &debian-gnu; utilizando uma imagem completa de CD-ROM ou DVD. Escolha a "
"opção de não configurar uma rede e instalar utilizando apenas os pacotes "
"disponíveis a partir do CD/DVD. Depois, poderá então instalar o controlador "
"e o firmware que necessite após a instalação estar terminada (após "
@@ -2214,7 +2214,7 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"O suporte para ecrãs braille é determinado pelo suporte encontrado em "
@@ -2222,7 +2222,7 @@ msgstr ""
"<classname>brltty</classname>, ligado através de uma porta série, USB ou "
"bluetooth. Os detalhes dos dispositivos braille suportados podem ser "
"encontrados no website <ulink url=\"&url-brltty;\"><classname>brltty</"
-"classname></ulink>. &debian; &release; vem com <classname>brltty</classname> "
+"classname></ulink>. &debian-gnu; &release; vem com <classname>brltty</classname> "
"versão &brlttyver;."
#. Tag: title
@@ -2241,7 +2241,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"O suporte a hardware sintetizador de voz é determinado pelo suporte dado "
@@ -2250,7 +2250,7 @@ msgstr ""
"(não são suportados adaptadores USB ou série-para-USB). Detalhes dos "
"dispositivos de hardware suportados para sintetizar voz podem ser "
"encontrados no <ulink url=\"&url-speakup;\">website <classname>speakup</"
-"classname></ulink>. &debian; &release; vem com <classname>speakup</"
+"classname></ulink>. &debian-gnu; &release; vem com <classname>speakup</"
"classname> versão &speakupver;."
#. Tag: title
@@ -2344,16 +2344,16 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
"Na maioria dos casos o firmware é não-livre de acordo com os critérios "
-"utilizados pelo projecto &debian; e por isso não pode ser incluído na "
+"utilizados pelo projecto &debian-gnu; e por isso não pode ser incluído na "
"distribuição principal ou no sistema de instalação. Se o próprio controlador "
-"do dispositivo for incluído na distribuição e se legalmente &debian; puder "
+"do dispositivo for incluído na distribuição e se legalmente &debian-gnu; puder "
"distribuir o firmware, este estará frequentemente disponível como um pacote "
"separado a partir da secção não-livre do arquivo."
@@ -2362,14 +2362,14 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
"No entanto, isto não significa que tal hardware não possa ser utilizado "
-"durante a instalação. Desde o &debian; 5.0 que o &d-i; suporta o "
+"durante a instalação. Desde o &debian-gnu; 5.0 que o &d-i; suporta o "
"carregamento de ficheiros ou pacotes contendo firmware, a partir de um meio "
"amovível, tal como uma disquete ou uma pen USB. Para informações detalhadas "
"acerca de como carregar ficheiros de firmware durante a instalação veja "
@@ -2800,13 +2800,13 @@ msgstr "Un*x ou sistema GNU"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
"Se estiver a correr outro sistema de tipo UNIX, você pode utilizá-lo para "
-"instalar &debian; sem utilizar o &d-i; descrito no resto do manual. Este "
+"instalar &debian-gnu; sem utilizar o &d-i; descrito no resto do manual. Este "
"tipo de instalação pode ser útil para utilizadores com hardware que não é "
"suportado de outra forma ou em sistemas que não se podem dar ao luxo de "
"estarem em baixo. Se está interessado nesta técnica, veja a <xref linkend="
@@ -3996,22 +3996,22 @@ msgstr ""
#~ msgid ""
#~ "If there is no other NIC you can use during the installation, it is still "
-#~ "possible to install &debian; using a full CD-ROM or DVD image. Select the "
+#~ "possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the "
#~ "option to not configure a network and install using only the packages "
#~ "available from the CD/DVD. You can then install the driver and firmware "
#~ "you need after the installation is completed (after the reboot) and "
#~ "configure your network manually. Note that the firmware may be packaged "
#~ "separately from the driver and may not be available in the <quote>main</"
-#~ "quote> section of the &debian; archive."
+#~ "quote> section of the &debian-gnu; archive."
#~ msgstr ""
#~ "Se não existir outra placa de rede que possa utilizar durante a "
-#~ "instalação, ainda é possível instalar &debian; utilizando uma imagem de "
+#~ "instalação, ainda é possível instalar &debian-gnu; utilizando uma imagem de "
#~ "um CD-ROM ou DVD completo. Escolha a opção para não configurar uma rede e "
#~ "instalar utilizando apenas os pacotes disponíveis a partir do CD/DVD. "
#~ "Pode então instalar o driver e o firmware que necessita após a instalação "
#~ "estar completada (após reiniciar) e configure menualmente a sua rede. "
#~ "Note que o formware pode ser empacotado separado do driver e pode não "
-#~ "estar disponível na secção <quote>main</quote> do arquivo &debian;."
+#~ "estar disponível na secção <quote>main</quote> do arquivo &debian-gnu;."
#~ msgid ""
#~ "If the driver itself <emphasis>is</emphasis> supported, you may also be "
diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po
index 4c52fb322..df4de9281 100644
--- a/po/pt/install-methods.po
+++ b/po/pt/install-methods.po
@@ -25,14 +25,14 @@ msgstr "Obter o Meio de Instalação do Sistema"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "Conjuntos Oficiais de CD-ROMs &debian;"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "Conjuntos Oficiais de CD-ROMs &debian-gnu;"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -45,7 +45,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"A forma mais simples para se instalar o &debian; é de longe a partir de um "
+"A forma mais simples para se instalar o &debian-gnu; é de longe a partir de um "
"conjunto de CD-ROM oficiais. Pode também comprar um conjunto de CDs a um "
"vendedor (visite a <ulink url=\"&url-debian-cd-vendors;\">página de "
"vendedores de CDs</ulink>). Também pode fazer o download das imagens a "
@@ -623,12 +623,12 @@ msgstr "Escrever Imagens de Disco com <command>Disk Copy</command>"
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
"Se está a criar as imagens de disquetes a partir de ficheiros que estavam "
-"originalmente no CD oficial &debian;, então o Type e Creator já estão "
+"originalmente no CD oficial &debian-gnu;, então o Type e Creator já estão "
"definidos correctamente. Os seguintes passos, <command>Creator-Changer</"
"command> apenas são necessários se fez o download da imagem a partir de um "
"mirror Debian."
@@ -1730,12 +1730,12 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
msgstr ""
-"Para um servidor &debian; nós recomendamos o <classname>tftpd-hpa</"
+"Para um servidor &debian-gnu; nós recomendamos o <classname>tftpd-hpa</"
"classname>. É escrito pelo mesmo autor do carregador de arranque "
"<classname>syslinux</classname> e por isso será menos provável que cause "
"problemas. Uma boa alternativa é o <classname>atftpd</classname>."
@@ -1801,13 +1801,13 @@ msgstr "Configurar um servidor DHCP"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
"Um servidor DHCP de software livre é o ISC <command>dhcpd</command>. Para "
-"&debian; é recomendado o pacote <classname>dhcp3-server</classname>. Aqui "
+"&debian-gnu; é recomendado o pacote <classname>dhcp3-server</classname>. Aqui "
"está um exemplo de ficheiro de configuração para ele (veja <filename>/etc/"
"dhcp3/dhcpd.conf</filename>):"
@@ -1973,13 +1973,13 @@ msgstr "Configurar o servidor BOOTP"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"Estão disponíveis dois servidores de BOOTP para GNU/Linux. O primeiro é o "
"CMU <command>bootpd</command>. O outro é na verdade um servidor de DHCP: o "
-"ISC <command>dhcpd</command>. Em &debian; estes estão contidos "
+"ISC <command>dhcpd</command>. Em &debian-gnu; estes estão contidos "
"respectivamente nos pacotes <classname>bootp</classname> e <classname>dhcp3-"
"server</classname>."
@@ -1988,7 +1988,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -2019,7 +2019,7 @@ msgid ""
msgstr ""
"Para utilizar o CMU <command>bootpd</command>, primeiro você tem de retirar "
"o comentário (ou adicionar) da linha relevante em <filename>/etc/inetd.conf</"
-"filename>. Em &debian;, você pode executar <userinput>update-inetd --enable "
+"filename>. Em &debian-gnu;, você pode executar <userinput>update-inetd --enable "
"bootps</userinput>, para o fazer. No caso do seu servidor de BOOTP não "
"correr em Debian, a linha em questão deve parecer-se com: "
"<informalexample><screen>\n"
@@ -2108,14 +2108,14 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
"configuration examples in this section accordingly."
msgstr ""
"Historicamente os servidores TFTP utilizavam <filename>/tftpboot</filename> "
-"como directório para servir imagens. No entanto, os pacotes &debian; podem "
+"como directório para servir imagens. No entanto, os pacotes &debian-gnu; podem "
"utilizar outros directórios para estarem de acordo com o <ulink url=\"&url-"
"fhs-home;\">Filesystem Hierarchy Standard</ulink>. Por exemplo, "
"<classname>tftpd-hpa</classname> por omissão utiliza <filename>/var/lib/"
@@ -2390,13 +2390,13 @@ msgstr ""
#~ msgid ""
#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "a &debian-gnu; server, the <classname>atftpd</classname> and <classname>tftpd-"
#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
#~ "classname>."
#~ msgstr ""
#~ "Para utilizar o método Pre-boot Execution Environment (PXE), vai "
#~ "necessitar de um servidor TFTP com suporte para <userinput>tsize</"
-#~ "userinput>. Num servidor &debian;, os pacotes <classname>atftpd</"
+#~ "userinput>. Num servidor &debian-gnu;, os pacotes <classname>atftpd</"
#~ "classname> e <classname>tftpd-hpa</classname> permitem-no; nós "
#~ "recomendamos o <classname>tftpd-hpa</classname>."
diff --git a/po/pt/installation-howto.po b/po/pt/installation-howto.po
index 4dc9a9b3e..e5eabe566 100644
--- a/po/pt/installation-howto.po
+++ b/po/pt/installation-howto.po
@@ -26,14 +26,14 @@ msgstr "Howto de Instalação"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
"useful, we will link to more detailed explanations in other parts of this "
"document."
msgstr ""
-"Este documento descreve como instalar &debian; &releasename; para &arch-"
+"Este documento descreve como instalar &debian-gnu; &releasename; para &arch-"
"title; (<quote>&architecture;</quote>) com o novo &d-i;. É uma rápida "
"passagem pelo processo de instalação que deve conter toda a informação que "
"precisa para a maioria das instalações. Quando mais informação puder ser "
diff --git a/po/pt/partitioning.po b/po/pt/partitioning.po
index db4861e3c..41ea1ec73 100644
--- a/po/pt/partitioning.po
+++ b/po/pt/partitioning.po
@@ -125,13 +125,13 @@ msgstr "A Árvore de Directórios"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"&debian; adere ao <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adere ao <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> para os directórios e nomes de ficheiros. Este padrão "
"permite aos utilizadores e a programas de software predizer o local dos "
"ficheiros e directórios. O nível do directório raiz é representada "
@@ -1133,14 +1133,14 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"Linux limita as partições por dispositivo a 15 partições para discos SCSI (3 "
"usadas como partições primárias, 12 partições lógicas), e 63 partições num "
"dispositivo IDE (3 usadas como partições primárias, 60 partições lógicas). "
-"Contudo o normal no sistema &debian; é fornecer apenas 20 dispositivos por "
+"Contudo o normal no sistema &debian-gnu; é fornecer apenas 20 dispositivos por "
"partição, não poderá portanto instalar mais que 20 numa partição a menos que "
"primeiro crie manualmente dispositivos para essas partições."
@@ -1515,7 +1515,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1524,7 +1524,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"Com a finalidade do OpenFirmware iniciar automaticamente &debian; a partição "
+"Com a finalidade do OpenFirmware iniciar automaticamente &debian-gnu; a partição "
"bootstrap deverá aparecer antes das outras partições de arranque no disco, "
"especialmente partições de arranque MacOS. A partição bootstrap deve ser a "
"primeira que criou. Contudo se só mais tarde adicionou a partição bootstrap, "
diff --git a/po/pt/post-install.po b/po/pt/post-install.po
index 00c58d233..882db8bd7 100644
--- a/po/pt/post-install.po
+++ b/po/pt/post-install.po
@@ -32,16 +32,16 @@ msgstr "A desligar o sistema"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"Para desligar um sistema &debian; em execução, não deve fazer reboot com o "
+"Para desligar um sistema &debian-gnu; em execução, não deve fazer reboot com o "
"botão de reset na parte da frente ou detrás do seu computador, ou muito "
-"simplesmente desligar o computador. &debian; deve ser desligado de uma forma "
+"simplesmente desligar o computador. &debian-gnu; deve ser desligado de uma forma "
"controlada, caso contrário podem peder-se ficheiros e/ou pode-se danificar o "
"disco. Se corre um ambiente de desktop, normalmente existe disponível uma "
"opção para fazer <quote>log out</quote> a partir do menu de aplicações que "
@@ -455,7 +455,7 @@ msgstr "Configuração Predefinida de E-Mail"
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
"that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
@@ -463,7 +463,7 @@ msgid ""
msgstr ""
"Mesmo que esteja a planear utilizar um programa de mail gráfico, é "
"importante que um MTA/MDA tradicional também esteja instalado e "
-"correctamente configurado no seu sistema &debian;. A razão é que vários "
+"correctamente configurado no seu sistema &debian-gnu;. A razão é que vários "
"utilitários que correm no sistema<footnote> <para> Exemplos são: "
"<command>cron</command>, <command>quota</command>, <command>logcheck</"
"command>, <command>aide</command>, &hellip; </para> </footnote> podem enviar "
diff --git a/po/pt/preface.po b/po/pt/preface.po
index 76adc826d..4c0863d9a 100644
--- a/po/pt/preface.po
+++ b/po/pt/preface.po
@@ -15,21 +15,21 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "Instalar &debian; &release; para &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "Instalar &debian-gnu; &release; para &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Nós estamos deliciados que você tenha decidido experimentar Debian, e temos "
-"a certeza que você vai achar a distribuição Debian GNU/&arch-kernel; única. &debian; "
+"a certeza que você vai achar a distribuição Debian GNU/&arch-kernel; única. &debian-gnu; "
"junta software livre de alta qualidade de todo o mundo, integrando-o como um "
"todo coerente. Nós acreditamos que você vai achar que o resultado é "
"verdadeiramente mais que a soma das partes."
diff --git a/po/pt/preparing.po b/po/pt/preparing.po
index 9c46b364b..37b192af9 100644
--- a/po/pt/preparing.po
+++ b/po/pt/preparing.po
@@ -19,8 +19,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "Antes de Instalar &debian;"
+msgid "Before Installing &debian-gnu;"
+msgstr "Antes de Instalar &debian-gnu;"
#. Tag: para
#: preparing.xml:6
@@ -72,7 +72,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -82,7 +82,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"Em &debian;, é muito provável que o seu SO possa ser reparado em vez de ser "
+"Em &debian-gnu;, é muito provável que o seu SO possa ser reparado em vez de ser "
"substituído se as coisas correrem mal. As actualizações nunca precisam de "
"uma instalação completa; Podem-se sempre fazer actualizações no local. E os "
"programas são quase sempre compatíveis com as sucessivas versões do SO. Se "
@@ -208,11 +208,11 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
"Instalar um <firstterm>gestor de arranque</firstterm> que possa iniciar o "
-"&debian; e/ou o seu sistema existente."
+"&debian-gnu; e/ou o seu sistema existente."
#. Tag: para
#: preparing.xml:134
@@ -291,7 +291,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"Uma opção importante durante a instalação é se instala ou não um ambiente "
@@ -300,7 +300,7 @@ msgstr ""
"<quote>Ambiente Desktop</quote>, terá apenas um sistema relativamente básico "
"de linha de comandos. Instalar a tarefa Ambiente de desktop é opcional "
"porque necessita de uma grande quantidade de espaço em disco, e porque "
-"muitos sistemas &debian; são servidores que não têm nenhuma necessidade de um "
+"muitos sistemas &debian-gnu; são servidores que não têm nenhuma necessidade de um "
"interface gráfico com o utilizador para fazer o seu trabalho."
#. Tag: para
@@ -330,7 +330,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -340,7 +340,7 @@ msgstr ""
"Antes de começar, certifique-se que salvaguarda cada ficheiro que está agora "
"no seu sistema. Se esta é a primeira vez que um sistema operativo não-nativo "
"está a ser instalado no teu computador, o mais provável é ter de "
-"reparticionar o seu disco rígido para disponibilizar espaço para &debian;. "
+"reparticionar o seu disco rígido para disponibilizar espaço para &debian-gnu;. "
"Em qualquer altura que particionar o seu disco, corre o risco de perder tudo "
"o que está no disco, independentemente do programa que está a utilizar para "
"o fazer. Os programas utilizados na instalação são de bastante confiança e a "
@@ -1163,7 +1163,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1174,7 +1174,7 @@ msgid ""
"graphical desktop environment."
msgstr ""
"Espaço em disco necessário para uma operação sem problemas do próprio "
-"sistema &debian; e tida em conta nestes requisitos de sistema recomendados. "
+"sistema &debian-gnu; e tida em conta nestes requisitos de sistema recomendados. "
"Notavelmente a partição <filename>/var</filename> contém muita informação de "
"estado específica de Debian além do seu conteúdo usual como ficheiros de "
"log. Os ficheiros do <command>dpkg</command> (com a informação de todos os "
@@ -1299,7 +1299,7 @@ msgstr ""
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1311,7 +1311,7 @@ msgid ""
"installation tapes or CDs."
msgstr ""
"Se a sua máquina tem apenas um disco rígido, e se desejar substituir "
-"completamente o sistema operativo actual por &debian;, pode também esperar "
+"completamente o sistema operativo actual por &debian-gnu;, pode também esperar "
"para particionar como parte do processo de instalação (<xref linkend=\"di-"
"partition\"/>), após ter arrancado com o sistema de instalação. No entanto "
"isto só funciona se planear iniciar o instalador a partir de tapes, CD-ROM "
@@ -1363,7 +1363,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1372,7 +1372,7 @@ msgstr ""
"particionável para Debian. Se algumas das partições pertencerem a outros "
"sistemas operativos, você deve criar essas partições utilizando os programas "
"nativos desses sistemas operativos. Nós recomendamos que você <emphasis>NÃO</"
-"emphasis> tente criar partições para &debian; utilizando utilitários de "
+"emphasis> tente criar partições para &debian-gnu; utilizando utilitários de "
"outro sistema operativo. Em vez disso, você deve apenas criar as partições "
"do sistema operativo nativo com que deseja ficar."
@@ -1405,7 +1405,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the &arch-parttype; "
+"In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype; "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a &arch-parttype; placeholder partition to come <emphasis>before</"
@@ -1414,7 +1414,7 @@ msgid ""
"placeholder with the Debian partition tools later during the actual install, "
"and replace it with &arch-parttype; partitions."
msgstr ""
-"De modo que o OpenFirmware possa iniciar automaticamente &debian; as "
+"De modo que o OpenFirmware possa iniciar automaticamente &debian-gnu; as "
"partições de &arch-parttype; devem aparecer antes das outras partições no disco, "
"especialmente as partições MacOS. Deve ter isto em mente antes do pré-"
"particionamento; Você deve criar uma partição para marcar o espaço de &arch-parttype; "
@@ -1461,11 +1461,11 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"Utilizar as ferramentas de particionamento nativas para criar partições para "
"o sistema nativo. Deixe uma partição para marcar o espaço ou espaço livre "
-"para &debian;."
+"para &debian-gnu;."
#. Tag: para
#: preparing.xml:903
@@ -1810,12 +1810,12 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"Lembre-se de criar uma partição para marcar o espaço para GNU/Linux, de "
"preferência posicionada no início da disposição do disco. Não interessa de "
"que tipo é, posteriormente será apagada e substituída pelo instalador de !"
-"&debian;."
+"&debian-gnu;."
#. Tag: para
#: preparing.xml:1107
@@ -1877,7 +1877,7 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"Esta secção vai levá-lo através da preparação do hardware da pré-instalação, "
@@ -1886,7 +1886,7 @@ msgstr ""
"seu sistema. O <quote>firmware</quote> é o software mais importante "
"utilizado pelo hardware; é o mais crítico invocado pelo processo de arranque "
"(depois de o ligar). Também são sublinhados alguns casos conhecidos de "
-"hardware que afectam a estabilidade de &debian; no seu sistema."
+"hardware que afectam a estabilidade de &debian-gnu; no seu sistema."
#. Tag: title
#: preparing.xml:1163
@@ -2650,7 +2650,7 @@ msgstr "Configuração da BIOS"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2659,7 +2659,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"De modo a instalar &debian; em &arch-title; ou numa máquina "
+"De modo a instalar &debian-gnu; em &arch-title; ou numa máquina "
"zSeries primeiro tem de iniciar um kernel para o sistema. O mecanismo de "
"arranque para esta plataforma é inerentemente diferente das outros, "
"especialmente dos sistemas do tipo PC: não existe nenhum dispositivo de "
@@ -2799,12 +2799,12 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
"O servidor de instalação necessita copiar a estrutura exacta de directórios "
-"a partir de qualquer mirror &debian; mas apenas são necessários os ficheiros "
+"a partir de qualquer mirror &debian-gnu; mas apenas são necessários os ficheiros "
"de s390 e independentes de arquitectura. Pode também copiar o conteúdo de "
"todos os CDs de instalação para essa tal estrutura de directórios."
@@ -3269,7 +3269,7 @@ msgstr ""
#~ "system load, you have only a very basic command line driven system. The "
#~ "graphical interface which displays windows on your monitor will not be "
#~ "installed unless you select it with <classname>tasksel</classname>. It's "
-#~ "optional because many &debian; systems are servers which don't really "
+#~ "optional because many &debian-gnu; systems are servers which don't really "
#~ "have any need for a graphical user interface to do their job."
#~ msgstr ""
#~ "Quando o <classname>debian-installer</classname> termina, antes do "
@@ -3277,7 +3277,7 @@ msgstr ""
#~ "comandado por uma linha de comandos. O interface gráfico que mostra as "
#~ "janelas no seu monitor não será instalado a menos que o seleccione com o "
#~ "<classname>tasksel</classname>. É opcional porque muitos sistemas "
-#~ "&debian; são servidores e não têm qualquer necessidade de ter um "
+#~ "&debian-gnu; são servidores e não têm qualquer necessidade de ter um "
#~ "interface gráfico com o utilizador para fazer o seu trabalho."
#~ msgid "<entry>RAM</entry>"
diff --git a/po/pt/random-bits.po b/po/pt/random-bits.po
index f771d752b..48ba07c49 100644
--- a/po/pt/random-bits.po
+++ b/po/pt/random-bits.po
@@ -847,26 +847,26 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "Instalar &debian; a partir de um sistema Unix/Linux"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "Instalar &debian-gnu; a partir de um sistema Unix/Linux"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
-"Esta secção explica como instalar &debian; a partir de um sistema Unix ou "
+"Esta secção explica como instalar &debian-gnu; a partir de um sistema Unix ou "
"Linux existente, sem utilizar o instalador guiado pelo menu como é explicado "
"no resto do manual. Este <quote>cross-install</quote> HOWTO foi pedido por "
-"utilizadores que mudam para &debian; a partir de Red Hat, Mandrake e SUSE. "
+"utilizadores que mudam para &debian-gnu; a partir de Red Hat, Mandrake e SUSE. "
"Nesta secção é assumida alguma familiaridade em introduzir comandos *nix e "
"navegar através do sistema de ficheiros. Nesta secção, <prompt>$</prompt> "
"simboliza um comando a ser escrito pelo utilizador do sistema actual, e "
@@ -878,13 +878,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"Assim que tiver o novo sistema Debian configurado de acordo com as suas "
"preferências, você pode migrar os dados existentes dos utilizadores (se os "
-"tiver) para lá, e continuar a rolar. Isto é portanto uma instalação &debian; "
+"tiver) para lá, e continuar a rolar. Isto é portanto uma instalação &debian-gnu; "
"com <quote>zero paragens</quote>. É também uma maneira inteligente de lidar "
"com hardware que de outro modo não se dá bem com os vários media ou tipos de "
"arranque."
@@ -1095,11 +1095,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"Se você tem o CD &debian; &releasename; montado em <filename>/cdrom</"
+"Se você tem o CD &debian-gnu; &releasename; montado em <filename>/cdrom</"
"filename>, você pode substituir um URL de ficheiro em vez do URL http: "
"<userinput>file:/cdrom/debian/</userinput>"
@@ -1677,12 +1677,12 @@ msgstr "Configurar o Boot Loader"
#: random-bits.xml:765
#, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"Para tornar o seu sistema &debian; iniciável, prepare o gestor de arranque "
+"Para tornar o seu sistema &debian-gnu; iniciável, prepare o gestor de arranque "
"para carregar o kernel instalado com a sua nova partição raiz. Note que o "
"<command>debootstrap</command> não instala um gestor de arranque, embora "
"possa utilizar o <command>aptitude</command> dentro do seu chroot Debian "
@@ -1906,19 +1906,19 @@ msgstr "# aptitude clean"
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "Instalar &debian; a partir de uma linha IP Paralela (PLIP)"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "Instalar &debian-gnu; a partir de uma linha IP Paralela (PLIP)"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
-"Esta secção explica como instalar &debian; num computador sem placa "
+"Esta secção explica como instalar &debian-gnu; num computador sem placa "
"Ethernet, mas sim com apenas uma gateway remota ligada através de um cabo "
"Null-modem (também chamado cabo Null-Printer). O computador gateway deve "
"estar ligado a uma rede que tenha um mirror Debian (e.g. à Internet)."
@@ -2192,8 +2192,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "Instalar &debian; utilizando PPP over Ethernet (PPPoE)"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "Instalar &debian-gnu; utilizando PPP over Ethernet (PPPoE)"
#. Tag: para
#: random-bits.xml:1048
@@ -2646,12 +2646,12 @@ msgstr ""
#~ "Etch is the first release that includes the graphical installer and uses "
#~ "some relatively new technology. There are a few known issues that you may "
#~ "run into during the installation. We expect to be able to fix these "
-#~ "issues for the next release of &debian;."
+#~ "issues for the next release of &debian-gnu;."
#~ msgstr ""
#~ "O Etch é o primeiro lançamento que inclui o instalador gráfico e utiliza "
#~ "tecnologia relativamente nova. Existem alguns problemas conhecidos que "
#~ "você pode encontrar durante a instalação. Nós esperamos ser capazes de "
-#~ "corrigir esses problemas para o próximo lançamento de &debian;."
+#~ "corrigir esses problemas para o próximo lançamento de &debian-gnu;."
#~ msgid ""
#~ "Support for creating encrypted partitions is limited as it is not "
diff --git a/po/pt/using-d-i.po b/po/pt/using-d-i.po
index 02fd41c07..703312c61 100644
--- a/po/pt/using-d-i.po
+++ b/po/pt/using-d-i.po
@@ -598,10 +598,10 @@ msgstr "base-installer"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
+"operate under &debian-gnu; when rebooted."
msgstr ""
"Instala o conjunto de pacotes mais básicos que permitem ao computador operar "
-"sob &debian; quando for reiniciado."
+"sob &debian-gnu; quando for reiniciado."
#. Tag: term
#: using-d-i.xml:324
@@ -824,12 +824,12 @@ msgstr "Verificar a memória disponível / modo de baixa memória"
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"Uma das primeiras coisas que o &d-i; faz, é verificar a memória disponível. "
"Se a memória disponível é limitada, este componente fará algumas alterações "
-"no processo de instalação que lhe irão permitir instalar o &debian; no seu "
+"no processo de instalação que lhe irão permitir instalar o &debian-gnu; no seu "
"sistema."
#. Tag: para
@@ -3719,7 +3719,7 @@ msgstr "Configurar o apt"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -3735,7 +3735,7 @@ msgid ""
"<command>aptitude</command> is now the recommended utility for package "
"management."
msgstr ""
-"Uma das ferramentas utilizadas para instalar pacotes num sistema &debian;, é "
+"Uma das ferramentas utilizadas para instalar pacotes num sistema &debian-gnu;, é "
"um programa chamado <command>apt-get</command>, do pacote <classname>apt</"
"classname><footnote> <para>Note que o programa que realmente instala os "
"pacotes tem o nome <command>dpkg</command>. No entanto, este programa é mais "
@@ -4891,7 +4891,7 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"Os novos PowerMacs (meados de 1998 e mais recentes) utilizam o "
"<command>yaboot</command> como gestor de arranque. O instalador configurará "
@@ -4900,7 +4900,7 @@ msgstr ""
"<emphasis>Apple_Bootstrap</emphasis>, criadas anteriormente pelo componente "
"de particionamento. Se esta fase for completada com sucesso, o seu disco "
"estará então preparado para arrancar e o OpenFirmware será configurado para "
-"iniciar o &debian;."
+"iniciar o &debian-gnu;."
#. Tag: title
#: using-d-i.xml:2964
@@ -5117,12 +5117,12 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
"Após a questão final o sistema irá ser parado porque não é suportado "
-"reiniciar em &arch-title;. Você, então, terá de fazer IPL &debian; a partir "
+"reiniciar em &arch-title;. Você, então, terá de fazer IPL &debian-gnu; a partir "
"do DASD que escolheu para sistema de ficheiros root durante as primeiras "
"etapas da instalação."
diff --git a/po/pt/welcome.po b/po/pt/welcome.po
index 82ea6fc17..982b3c765 100644
--- a/po/pt/welcome.po
+++ b/po/pt/welcome.po
@@ -26,13 +26,13 @@ msgstr "Bem-vindo a Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
"Este capítulo pretende dar a conhecer, de uma forma geral, o Debian Project "
-"e &debian;. Se já conhece a história do Debian Project e a distribuição "
-"&debian;, pode tomar a liberdade de avançar para o próximo capítulo."
+"e &debian-gnu;. Se já conhece a história do Debian Project e a distribuição "
+"&debian-gnu;, pode tomar a liberdade de avançar para o próximo capítulo."
#. Tag: title
#: welcome.xml:19
@@ -577,13 +577,13 @@ msgstr "Obter Debian"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"Para informação de como fazer o download de &debian; através da Internet ou "
+"Para informação de como fazer o download de &debian-gnu; através da Internet ou "
"ainda para saber onde pode comprar os CDs Debian oficiais, veja <ulink url="
"\"&url-debian-distrib;\">a página da distribuição</ulink>. A <ulink url="
"\"&url-debian-mirrors;\">lista de mirrors Debian</ulink> contém a lista "
@@ -615,14 +615,14 @@ msgstr "Obter a Versão Mais Recente Deste Documento"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"Este documento está constantemente a ser revisto. Assegure-se de que "
"verifica as <ulink url=\"&url-release-area;\">páginas de Debian &release;</"
"ulink> para verificar a existência de informação de última hora acerca do "
-"lançamento do sistema &debian; &release;. Versões mais actualizadas deste "
+"lançamento do sistema &debian-gnu; &release;. Versões mais actualizadas deste "
"manual estão também disponíveis nas <ulink url=\"&url-install-manual;"
"\">páginas do Manual de Instalação oficial</ulink>."
@@ -668,12 +668,12 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"Genericamente, este manual está disposto numa forma linear, acompanhando-o "
"ao longo do processo de instalação desde o início até ao fim. Aqui estão as "
-"etapas da instalação de &debian;, e as secções deste documento relacionadas "
+"etapas da instalação de &debian-gnu;, e as secções deste documento relacionadas "
"com cada etapa:"
#. Tag: para
@@ -825,7 +825,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -836,7 +836,7 @@ msgstr ""
"do software comercial &mdash; estas geralmente dizem que você só pode "
"utilizar uma cópia do software num único computador. A licença deste sistema "
"não é mesmo nada como essas. Nós encorajamos a colocar uma cópia de "
-"&debian; em cada computador da sua escola ou local de trabalho. Empreste o "
+"&debian-gnu; em cada computador da sua escola ou local de trabalho. Empreste o "
"seu meio de instalação aos seus amigos e ajude-os a instalar nos seus "
"computadores! Pode mesmo fazer milhares de cópias e <emphasis>vendê-las</"
"emphasis>&mdash; embora com algumas restrições. A sua liberdade de instalar "
diff --git a/po/ro/bookinfo.po b/po/ro/bookinfo.po
index 222827a43..caac0d60a 100644
--- a/po/ro/bookinfo.po
+++ b/po/ro/bookinfo.po
@@ -19,20 +19,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "&debian; - Ghid de instalare"
+msgid "&debian-gnu; Installation Guide"
+msgstr "&debian-gnu; - Ghid de instalare"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Acest document conţine instrucţiuni de instalare pentru sistemul &debian; "
+"Acest document conţine instrucţiuni de instalare pentru sistemul &debian-gnu; "
"&release; (nume de cod <quote>&releasename;</quote>), pentru arhitectura "
"&arch-title; (<quote>&architecture;</quote>). Conţine, de asemenea, indicii "
"pentru a găsi mai multe informaţii, în general, şi informaţii legate de "
diff --git a/po/ro/preface.po b/po/ro/preface.po
index bee9940b2..81e53755c 100644
--- a/po/ro/preface.po
+++ b/po/ro/preface.po
@@ -19,21 +19,21 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "Instalarea &debian; &release; pentru &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "Instalarea &debian-gnu; &release; pentru &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Suntem încântaţi că v-aţi decis să încercaţi Debian, şi suntem siguri că "
-"veţi alfa că distribuiţia Debian GNU/&arch-kernel; este unică. &debian; aduce "
+"veţi alfa că distribuiţia Debian GNU/&arch-kernel; este unică. &debian-gnu; aduce "
"laolaltă software liber de înaltă calitate de peste tot din lume, întegrându-"
"l într-un tot coerent. Credem că veţi considera că rezultatul este, într-"
"adevăr, mai bun decât părţile însumate."
diff --git a/po/ro/using-d-i.po b/po/ro/using-d-i.po
index b72ae8af0..86519e922 100644
--- a/po/ro/using-d-i.po
+++ b/po/ro/using-d-i.po
@@ -607,10 +607,10 @@ msgstr "instalatorul bazei - base-installer"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
+"operate under &debian-gnu; when rebooted."
msgstr ""
"Instalează un set de pachete de bază care ar permite calculatorului să "
-"opereze în &debian; după ce va fi repornit."
+"opereze în &debian-gnu; după ce va fi repornit."
#. Tag: term
#: using-d-i.xml:324
@@ -822,13 +822,13 @@ msgstr "Verificarea memoriei disponibile / modul memorie puțină"
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"Unul dintre primele lucruri pe care le face &d-i; este verificarea memoriei "
"disponibile. Dacă memoria disponibilă este limitată, această componentă va "
"face câteva schimbări în procesul de instalare care se speră că vă va "
-"permite să instalați &debian; pe sistemul dumneavoastră."
+"permite să instalați &debian-gnu; pe sistemul dumneavoastră."
#. Tag: para
#: using-d-i.xml:458
@@ -3575,7 +3575,7 @@ msgstr ""
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -4423,7 +4423,7 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
#. Tag: title
@@ -4584,7 +4584,7 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
diff --git a/po/ro/welcome.po b/po/ro/welcome.po
index 683e45a4c..7e9740cf4 100644
--- a/po/ro/welcome.po
+++ b/po/ro/welcome.po
@@ -27,13 +27,13 @@ msgstr "Bine aţi venit în Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
"Acest capitol oferă o vedere de ansamblu asupra Proiectului Debian şi "
-"&debian;. Dacă cunoaşteţi deja cu isoria Proiectului Debian şi distribuţia "
-"&debian;, puteţi să treceţi direct la capitolul următor."
+"&debian-gnu;. Dacă cunoaşteţi deja cu isoria Proiectului Debian şi distribuţia "
+"&debian-gnu;, puteţi să treceţi direct la capitolul următor."
#. Tag: title
#: welcome.xml:19
@@ -594,14 +594,14 @@ msgstr "Cum obţineţi Debian"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
"Pentru mai multe informaţii legate de felul în care se poate descărca "
-"&debian; de pe Internet sau de la cine se pot cumpăra CD-uri oficiale "
+"&debian-gnu; de pe Internet sau de la cine se pot cumpăra CD-uri oficiale "
"Debian, a se vedea <ulink url=\"&url-debian-distrib;\">pagina de "
"distribuţie</ulink>. <ulink url=\"&url-debian-mirrors;\">Lista arhivelor-"
"copie Debian</ulink> conţine un set complet de arhive, copii a celei "
@@ -632,14 +632,14 @@ msgstr "Cum obţineţi cea mai recentă versiune a acestui document"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"Acst document este revizuit constant. Verificaţi <ulink url=\"&url-release-"
"area;\"> paginile Debian &release; </ulink> pentru a verifica dacă există "
"informaţii de ultimă oră în legătură cu versiunea &release; a sistemului "
-"&debian;. Versiuni actualizate ale acstui manual de instalare sunt, de "
+"&debian-gnu;. Versiuni actualizate ale acstui manual de instalare sunt, de "
"asemenea, disponibile de pe <ulink url=\"&url-install-manual;\">paginile "
"oficiale ale Manualilui de instalare</ulink>."
@@ -684,12 +684,12 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"În general, acest manual este dispus într-o manieră liniară, purtându-vă "
"prin procesul de instalare, de la început până la sfârşit. Iată aici paşii "
-"necesari pentru a instala &debian; şi secţiunile acestui document care sunt "
+"necesari pentru a instala &debian-gnu; şi secţiunile acestui document care sunt "
"corelate cu fiecare dintre paşi:"
#. Tag: para
@@ -851,7 +851,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
diff --git a/po/ru/bookinfo.po b/po/ru/bookinfo.po
index 481d45f2e..a2f31aa79 100644
--- a/po/ru/bookinfo.po
+++ b/po/ru/bookinfo.po
@@ -21,20 +21,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "Руководство по установке &debian;"
+msgid "&debian-gnu; Installation Guide"
+msgstr "Руководство по установке &debian-gnu;"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Данный документ содержит инструкции по установке системы &debian; &release; "
+"Данный документ содержит инструкции по установке системы &debian-gnu; &release; "
"(<quote>&releasename;</quote>) для архитектуры &arch-title; "
"(<quote>&architecture;</quote>). Кроме того, в нём указаны источники более "
"подробной информации и описаны методы наиболее эффективного применения "
diff --git a/po/ru/boot-installer.po b/po/ru/boot-installer.po
index 3f469397b..2a94d3e5b 100644
--- a/po/ru/boot-installer.po
+++ b/po/ru/boot-installer.po
@@ -570,10 +570,10 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
"Когда программа запустится, будет задано несколько предварительных вопросов, "
-"и система будет подготовлена для запуска программы установки &debian;."
+"и система будет подготовлена для запуска программы установки &debian-gnu;."
#. Tag: title
#: boot-installer.xml:496
diff --git a/po/ru/boot-new.po b/po/ru/boot-new.po
index 156c94de8..bea30dbb1 100644
--- a/po/ru/boot-new.po
+++ b/po/ru/boot-new.po
@@ -196,11 +196,11 @@ msgstr "NewWorld PowerMacs"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"На машинах G4 и iBook, вы может нажать клавишу <keycap>option</keycap> и "
-"получить графический экран с кнопкой для каждой загружаемой ОС, &debian; "
+"получить графический экран с кнопкой для каждой загружаемой ОС, &debian-gnu; "
"будет кнопкой с иконкой маленького пингвина."
#. Tag: para
@@ -233,16 +233,16 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
-"Сброс OpenFirmware на оборудовании G3 или G4 приведет к загрузке &debian; по "
+"Сброс OpenFirmware на оборудовании G3 или G4 приведет к загрузке &debian-gnu; по "
"умолчанию (если вы корректно разметили разделы и поместили раздел "
-"Apple_Bootstrap первым). Если &debian; у вас на SCSI-диске, а MacOS на IDE-"
+"Apple_Bootstrap первым). Если &debian-gnu; у вас на SCSI-диске, а MacOS на IDE-"
"диске, это может не сработать, и вам придётся зайти в OpenFirmware и "
"установить переменную <envar>boot-device</envar>. В нормальной ситуации "
"<command>ybin</command> делает это автоматически."
@@ -251,13 +251,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"После того, как вы загрузили &debian; в первый раз, вы можете добавить "
+"После того, как вы загрузили &debian-gnu; в первый раз, вы можете добавить "
"дополнительные опции, какие пожелаете (такие, как опции двойной загрузки) в "
"<filename>/etc/yaboot.conf</filename> и запустить <command>ybin</command> "
"чтобы обновить изменённую информацию в вашем загрузочном разделе. "
diff --git a/po/ru/hardware.po b/po/ru/hardware.po
index 4f30e689a..82e4e7b26 100644
--- a/po/ru/hardware.po
+++ b/po/ru/hardware.po
@@ -49,14 +49,14 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"Debian не требует от оборудования сверх того, что требуют ядро Linux и "
"утилиты GNU. Таким образом, любая архитектура или платформа, на которую были "
"перенесены ядро Linux, libc, <command>gcc</command> и т.д. и на которую "
"перенесён Debian, может работать под Debian. Сверьтесь со страницами "
"переносов <ulink url=\"&url-ports;\"></ulink>, какие системы на архитектуре "
-"&arch-title; были протестированы с &debian;."
+"&arch-title; были протестированы с &debian-gnu;."
#. Tag: para
#: hardware.xml:32
@@ -482,7 +482,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -491,7 +491,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"Это первый официальный выпуск &debian; для архитектуры &arch-title;. Мы "
+"Это первый официальный выпуск &debian-gnu; для архитектуры &arch-title;. Мы "
"решили, что он доказал, что готов к выпуску. Однако, поскольку эта "
"архитектура не так сильно распространёна (и, следовательно, не "
"протестирована пользователями), как другие, вы можете встретить некоторые "
@@ -914,10 +914,10 @@ msgstr "На машинах Cobalt используется скорость 115
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"В &debian; &release; поддерживаются только субархитектуры PMac (Power-"
+"В &debian-gnu; &release; поддерживаются только субархитектуры PMac (Power-"
"Macintosh или PowerMac) и PreP."
#. Tag: title
@@ -2060,11 +2060,11 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
"Беспроводные адаптеры, не поддерживаемые официальным ядром &arch-kernel;, обычно, "
-"можно заставить работать в &debian;, но это не поддерживается во время "
+"можно заставить работать в &debian-gnu;, но это не поддерживается во время "
"установки."
#. Tag: para
@@ -2084,7 +2084,7 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
@@ -2092,7 +2092,7 @@ msgid ""
msgstr ""
"Если есть проблемы с беспроводной сетью и других сетевых устройств нет, "
"которые можно использовать во время установки, то всё ещё возможно "
-"установить &debian; с полного образа CD-ROM или DVD. Добавьте параметр для "
+"установить &debian-gnu; с полного образа CD-ROM или DVD. Добавьте параметр для "
"выключения настройки сети и установите только пакеты с CD/DVD. После "
"завершения установки (после перезагрузки) вы сможете установить драйвер и "
"микропрограмму, которые требуются, и настроить сеть вручную."
@@ -2218,14 +2218,14 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"Поддержка дисплеев Брайля обеспечивается программой <classname>brltty</"
"classname>. С её помощью работает заработает большинство дисплеев, "
"подключаемых к последовательному порту, USB или bluetooth. Список "
"поддерживаемых устройств можно найти на сайте <ulink url=\"&url-brltty;"
-"\"><classname>brltty</classname></ulink>. В &debian; &release; включена "
+"\"><classname>brltty</classname></ulink>. В &debian-gnu; &release; включена "
"<classname>brltty</classname> версии &brlttyver;."
#. Tag: title
@@ -2244,7 +2244,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"Поддержка устройств речевого синтеза обеспечивается программой "
@@ -2252,7 +2252,7 @@ msgstr ""
"только встраиваемые платы и внешние устройства, подключаемые к "
"последовательному порту (USB или serial-to-USB адаптеры не поддерживаются). "
"Список поддерживаемых устройств можно найти на сайте <ulink url=\"&url-"
-"speakup;\"><classname>speakup</classname></ulink>. В &debian; &release; "
+"speakup;\"><classname>speakup</classname></ulink>. В &debian-gnu; &release; "
"включена <classname>speakup</classname> версии &speakupver;."
#. Tag: title
@@ -2346,16 +2346,16 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
"В большинстве случаев микропрограмма является несвободной, если исходить из "
-"критериев, используемых проектом &debian;, и поэтому не может быть включена "
+"критериев, используемых проектом &debian-gnu;, и поэтому не может быть включена "
"в основной дистрибутив или в систему установки. Если сам драйвер устройства "
-"включён в дистрибутив и если для &debian; разрешено легально распространять "
+"включён в дистрибутив и если для &debian-gnu; разрешено легально распространять "
"микропрограмму, то а, чаще всего, доступна в виде отдельного пакета в архиве "
"в разделе non-free."
@@ -2364,14 +2364,14 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
"Однако, это не означает, что такое аппаратное обеспечение не может "
-"использоваться во время установки. Начиная с &debian; 5.0, &d-i; "
+"использоваться во время установки. Начиная с &debian-gnu; 5.0, &d-i; "
"поддерживает загрузку файлов микропрограмм или пакетов с микропрограммами со "
"сменных носителей, таких как дискеты или USB-накопители. Подробней о том, "
"как загружать файлы микропрограмм и пакеты во время установки см. <xref "
@@ -2800,13 +2800,13 @@ msgstr "Система Un*x или GNU"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
"Если вы работаете в другой Unix системе, то можете использовать её для "
-"установки &debian; без использования &d-i;, описанного в остальной части "
+"установки &debian-gnu; без использования &d-i;, описанного в остальной части "
"руководства. Этот тип установки может пригодиться пользователям с каким-то "
"неподдерживаемым оборудованием или на машинах, работу которых нельзя "
"прерывать. Если вы заинтересовались данным способом, перейдите в <xref "
diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index 10c43ce7b..18c64a1cd 100644
--- a/po/ru/install-methods.po
+++ b/po/ru/install-methods.po
@@ -27,14 +27,14 @@ msgstr "Получение носителя с дистрибутивом"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "Официальный набор компакт-дисков &debian;"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "Официальный набор компакт-дисков &debian-gnu;"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -47,7 +47,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"Самым лёгким путём установки &debian; является установка с официального "
+"Самым лёгким путём установки &debian-gnu; является установка с официального "
"набора компакт-дисков Debian (смотрите <ulink url=\"&url-debian-cd-vendors;"
"\">страницу продавцов компакт-дисков Debian</ulink>). Также, вы можете "
"загрузить образы компакт-дисков с сервера-зеркала Debian и сделать из них "
@@ -616,12 +616,12 @@ msgstr "Запись образов дисков с помощью <command>Disk
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
"Если вы создаёте дискету из образа файла, который взят с "
-"официального&debian; CD, то Тип и Создатель уже установлены правильно. "
+"официального&debian-gnu; CD, то Тип и Создатель уже установлены правильно. "
"Следующие шаги <command>Creator-Changer</command> необходимы только если вы "
"загрузили файлы образов с сервера-зеркала Debian."
@@ -1707,12 +1707,12 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
msgstr ""
-"Для сервера &debian; мы рекомендуем <classname>tftpd-hpa</classname>. Он "
+"Для сервера &debian-gnu; мы рекомендуем <classname>tftpd-hpa</classname>. Он "
"написан автором системного загрузчика <classname>syslinux</classname> и "
"поэтому, скорее всего, не вызовет проблем. Также неплох <classname>atftpd</"
"classname>."
@@ -1777,13 +1777,13 @@ msgstr "Настройка DHCP сервера"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
"Одним из свободных DHCP серверов является ISC <command>dhcpd</command>. В "
-"&debian; он доступен из пакета <classname>dhcp3-server</classname>. Вот "
+"&debian-gnu; он доступен из пакета <classname>dhcp3-server</classname>. Вот "
"пример его конфигурационного файла (обычно <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
@@ -1948,13 +1948,13 @@ msgstr "Настройка BOOTP сервера"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"Для GNU/Linux есть два BOOTP сервера. Первый &mdash; CMU <command>bootpd</"
"command>. Второй, на самом деле являющийся сервером DHCP &mdash; ISC "
-"<command>dhcpd</command>. В &debian; они находятся в пакетах "
+"<command>dhcpd</command>. В &debian-gnu; они находятся в пакетах "
"<classname>bootp</classname> и <classname>dhcp3-server</classname> "
"соответственно."
@@ -1963,7 +1963,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -1994,7 +1994,7 @@ msgid ""
msgstr ""
"Чтобы использовать CMU <command>bootpd</command>, во-первых, вы должны "
"раскомментировать (или добавить) соответствующую строку в <filename>/etc/"
-"inetd.conf</filename>. Для этого в &debian; вы можете запустить "
+"inetd.conf</filename>. Для этого в &debian-gnu; вы можете запустить "
"<userinput>update-inetd --enable bootps</userinput>, затем <userinput>/etc/"
"init.d/inetd reload</userinput>. Если BOOTP сервер работает не под Debian, "
"то строка выглядит так: <informalexample><screen>\n"
@@ -2082,14 +2082,14 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
"configuration examples in this section accordingly."
msgstr ""
"Исторически, TFTP-серверы используют каталог <filename>/tftpboot</filename> "
-"для хранения образов. Однако, пакеты &debian; могут использовать другие "
+"для хранения образов. Однако, пакеты &debian-gnu; могут использовать другие "
"каталоги, чтобы соответствовать <ulink url=\"&url-fhs-home;\">Filesystem "
"Hierarchy Standard</ulink>. Например, <classname>tftpd-hpa</classname> по "
"умолчанию использует <filename>/var/lib/tftpboot</filename>. Вам может "
diff --git a/po/ru/installation-howto.po b/po/ru/installation-howto.po
index 9005d866a..602dee19e 100644
--- a/po/ru/installation-howto.po
+++ b/po/ru/installation-howto.po
@@ -27,14 +27,14 @@ msgstr "Краткая инструкция по установке"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
"useful, we will link to more detailed explanations in other parts of this "
"document."
msgstr ""
-"Данный документ описывает установку &debian; &releasename; на &arch-title; "
+"Данный документ описывает установку &debian-gnu; &releasename; на &arch-title; "
"(<quote>&architecture;</quote>) с помощью нового &d-i;. Это краткое описание "
"процесса установки, в нём содержится вся информация, необходимая для "
"большинства установок. В тех местах, где полезно прочитать более обширное "
diff --git a/po/ru/partitioning.po b/po/ru/partitioning.po
index 281020382..43b0f1e99 100644
--- a/po/ru/partitioning.po
+++ b/po/ru/partitioning.po
@@ -125,13 +125,13 @@ msgstr "Структура каталогов"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"&debian; придерживается стандарта <ulink url=\"&url-fhs-home;\">Filesystem "
+"&debian-gnu; придерживается стандарта <ulink url=\"&url-fhs-home;\">Filesystem "
"Hierarchy Standard</ulink> для каталогов и имён файлов. Этот стандарт "
"позволяет пользователям и программному обеспечению быть уверенным в "
"расположении файлов и каталогов. Уровень корневого каталога представляется "
@@ -1123,13 +1123,13 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"Linux ограничивает количество разделов до 15 на SCSI дисках (3 первичных "
"раздела, 12 логических разделов), и 63 раздела на IDE дисках (3 первичных "
-"раздела, 60 логических разделов). Однако, обычная система &debian; "
+"раздела, 60 логических разделов). Однако, обычная система &debian-gnu; "
"предоставляет только 20 устройств под разделы, поэтому вы не сможете "
"произвести установку на раздел выше чем 20, если только сначала вручную не "
"создадите устройства для этих разделов."
@@ -1498,7 +1498,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1507,7 +1507,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"Чтобы OpenFirmware автоматически загружал &debian; этот специальный "
+"Чтобы OpenFirmware автоматически загружал &debian-gnu; этот специальный "
"загрузочный раздел должен располагаться перед любыми другими загрузочными "
"разделами на диске, особенно перед загрузочным разделом MacOS. Специальный "
"загрузочный раздел должен быть создан первым. Однако, если вы добавите "
diff --git a/po/ru/post-install.po b/po/ru/post-install.po
index 3db497bb3..4587aa8e0 100644
--- a/po/ru/post-install.po
+++ b/po/ru/post-install.po
@@ -32,16 +32,16 @@ msgstr "Выключение системы"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"Чтобы выключить работающую &debian; систему, вы не должны использовать кнопку "
+"Чтобы выключить работающую &debian-gnu; систему, вы не должны использовать кнопку "
"сброса на передней панели корпуса компьютера или просто выключать "
-"электропитание. &debian; нужно выключать правильно, иначе можно потерять файлы "
+"электропитание. &debian-gnu; нужно выключать правильно, иначе можно потерять файлы "
"и/или повредить жёсткий диск. Если вы работаете в окружении рабочего стола, "
"то обычно есть возможность <quote>завершить сеанс</quote> из меню "
"приложений, которая позволяет выключить (или перезагрузить) систему."
@@ -449,14 +449,14 @@ msgstr "Почтовая конфигурация по умолчанию"
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
"that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
"to inform the system administrator of (potential) problems or changes."
msgstr ""
"Даже если вы планируете использовать почтовую программу с графическим "
-"интерфейсом, очень важно, чтобы в системе &debian; также были установлены и "
+"интерфейсом, очень важно, чтобы в системе &debian-gnu; также были установлены и "
"правильно настроены классические MTA/MDA. Они нужны для различных утилит, "
"которые работают в системе <footnote> <para> Примеры: <command>cron</"
"command>, <command>quota</command>, <command>logcheck</command>, "
diff --git a/po/ru/preface.po b/po/ru/preface.po
index 9af271f56..c1a26dd42 100644
--- a/po/ru/preface.po
+++ b/po/ru/preface.po
@@ -17,21 +17,21 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "Установка &debian; &release; на &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "Установка &debian-gnu; &release; на &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Мы рады, что вы решили попробовать Debian. Мы уверены, что дистрибутив "
-"Debian GNU/&arch-kernel; покажется вам уникальным. &debian; собирает "
+"Debian GNU/&arch-kernel; покажется вам уникальным. &debian-gnu; собирает "
"высококачественное свободное ПО со всего света, объединяя его в единое "
"целое. Мы верим, вы признаете, что получившийся результат &mdash; это "
"действительно больше, чем сумма частей."
diff --git a/po/ru/preparing.po b/po/ru/preparing.po
index 363626e52..bf888c886 100644
--- a/po/ru/preparing.po
+++ b/po/ru/preparing.po
@@ -20,8 +20,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "Перед установкой &debian;"
+msgid "Before Installing &debian-gnu;"
+msgstr "Перед установкой &debian-gnu;"
#. Tag: para
#: preparing.xml:6
@@ -71,7 +71,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -81,7 +81,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"В случае &debian; у вас намного больше шансов, что ОС будет восстановлена "
+"В случае &debian-gnu; у вас намного больше шансов, что ОС будет восстановлена "
"без переустановки. При обновлении до новой версии установка \"всего\" не "
"требуется никогда; достаточно обновления только нужных частей. Все программы "
"почти всегда совместимы с новыми версиями операционной системы. Если новая "
@@ -207,11 +207,11 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
"Установить <firstterm>системный загрузчик</firstterm>, который сможет "
-"запускать &debian; и/или другую существующую систему."
+"запускать &debian-gnu; и/или другую существующую систему."
#. Tag: para
#: preparing.xml:134
@@ -290,7 +290,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"Одним из важных пунктов установки &mdash; это будет или нет установлена "
@@ -300,7 +300,7 @@ msgstr ""
"относительно простая система, управляемая из командной строки. Установка "
"Окружения рабочего стола является необязательной задачей, так как для неё "
"требуется огромное количество дискового пространства, и из-за того, что "
-"многие системы &debian; являются серверами, которым не нужен графический "
+"многие системы &debian-gnu; являются серверами, которым не нужен графический "
"интерфейс пользователя для выполнения требуемых задач."
#. Tag: para
@@ -330,7 +330,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -340,7 +340,7 @@ msgstr ""
"Перед тем как начать, убедитесь, что вы сохранили каждый файл из вашей "
"системы. Если вы впервые устанавливаете на компьютер не родную операционную "
"систему, скорее всего вам придётся переразметить диск, чтобы выделить место "
-"для &debian;. Всегда при разметке диска вы должны считать, что теряете всё "
+"для &debian-gnu;. Всегда при разметке диска вы должны считать, что теряете всё "
"на диске, вне зависимости от используемого для этого инструмента. Программы, "
"используемые в установке, достаточно надёжны; с большинством из них люди "
"работают не первый год; но они достаточно мощны для того, чтобы одно "
@@ -1163,7 +1163,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1173,7 +1173,7 @@ msgid ""
"least 200MB for <filename>/var</filename>, and a lot more if you install a "
"graphical desktop environment."
msgstr ""
-"Дисковое пространство, необходимое для гладкой работы в &debian; уже "
+"Дисковое пространство, необходимое для гладкой работы в &debian-gnu; уже "
"включено в рекомендуемые требования к системе. В частности, раздел "
"<filename>/var</filename> содержит много специфичной для Debian информации, "
"а также обычные данные типа журнальных файлов. Файлы <command>dpkg</command> "
@@ -1296,7 +1296,7 @@ msgstr ""
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1308,7 +1308,7 @@ msgid ""
"installation tapes or CDs."
msgstr ""
"Если ваша машина содержит только один жёсткий диск и вы хотите заменить "
-"установленную операционную систему на &debian;, то также можете произвести "
+"установленную операционную систему на &debian-gnu;, то также можете произвести "
"разметку в процессе установки (<xref linkend=\"di-partition\"/>) после "
"загрузки системы установки. Однако, это сработает только если вы планируете "
"загружать программу установки с лент, CD-ROM или с удалённой машины. Учтите: "
@@ -1357,7 +1357,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1366,7 +1366,7 @@ msgstr ""
"некоторые разделы должны принадлежать другим операционным системам, то вы "
"должны создать эти разделы с помощью программ разметки из этих операционных "
"систем. Мы <emphasis>не</emphasis> рекомендуем пытаться создавать разделы "
-"&debian; с помощью утилит других операционных систем. Пользуйтесь ими только "
+"&debian-gnu; с помощью утилит других операционных систем. Пользуйтесь ими только "
"для создания разделов операционных систем, которые вы захотели оставить."
#. Tag: para
@@ -1397,7 +1397,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the &arch-parttype; "
+"In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype; "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a &arch-parttype; placeholder partition to come <emphasis>before</"
@@ -1406,7 +1406,7 @@ msgid ""
"placeholder with the Debian partition tools later during the actual install, "
"and replace it with &arch-parttype; partitions."
msgstr ""
-"Чтобы из OpenFirmware автоматически загружался &debian; &arch-parttype; разделы должны "
+"Чтобы из OpenFirmware автоматически загружался &debian-gnu; &arch-parttype; разделы должны "
"стоять перед остальными разделами на диске, особенно перед загрузочным "
"разделом MacOS. Это нужно помнить при переразметке; вы должны создать раздел-"
"пустышку под &arch-parttype; <emphasis>перед</emphasis> другими загрузочными разделами "
@@ -1449,10 +1449,10 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"С помощью родных утилит разметки создать родной системный раздел(ы). "
-"Оставить или раздел-пустышку, или свободное место для &debian;."
+"Оставить или раздел-пустышку, или свободное место для &debian-gnu;."
#. Tag: para
#: preparing.xml:903
@@ -1787,11 +1787,11 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"Не забудьте создать раздел болванку для GNU/Linux, желательно в начале "
"диска. Неважно какого типа он будет, это поправит позже сама программа "
-"установки &debian;."
+"установки &debian-gnu;."
#. Tag: para
#: preparing.xml:1107
@@ -1853,7 +1853,7 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"Этот раздел расскажет про аппаратное обеспечение, для которого требуется "
@@ -1862,7 +1862,7 @@ msgstr ""
"<quote>Микропрограмма (firmware)</quote> &mdash; это программное обеспечение "
"используемое аппаратным обеспечением; она почти всегда вызывается во время "
"загрузки машины (после подачи питания). Здесь также описаны известные "
-"проблемы аппаратного обеспечения, которые влияют на надёжность &debian;."
+"проблемы аппаратного обеспечения, которые влияют на надёжность &debian-gnu;."
#. Tag: title
#: preparing.xml:1163
@@ -2612,7 +2612,7 @@ msgstr "Настройка BIOS"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2621,7 +2621,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"Чтобы установить &debian; на &arch-title; или машины zSeries, сначала вам "
+"Чтобы установить &debian-gnu; на &arch-title; или машины zSeries, сначала вам "
"нужно загрузить в систему ядро. Механизм загрузки на этой платформе в корне "
"отличается от всех остальных, особенно от PC-совместимых систем: на ней нет "
"дисководов.Ещё одно большое отличие от других платформ: большинство (если не "
@@ -2758,12 +2758,12 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
"На сервер установки нужно скопировать полную структуру каталогов с любого "
-"сервера-зеркала &debian;, но нужны только для s390 и архитектуро-независимые "
+"сервера-зеркала &debian-gnu;, но нужны только для s390 и архитектуро-независимые "
"файлы. Также, вы можете скопировать содержимое всех установочных CD с таким "
"же деревом каталогов."
diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po
index 7ae771651..834d34b50 100644
--- a/po/ru/random-bits.po
+++ b/po/ru/random-bits.po
@@ -846,27 +846,27 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "Установка &debian; из системы Unix/Linux"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "Установка &debian-gnu; из системы Unix/Linux"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
-"В этом разделе объясняется, как установить &debian; из существующей системы "
+"В этом разделе объясняется, как установить &debian-gnu; из существующей системы "
"Unix или Linux без использования управляемой из меню программы установки, "
"основанной на библиотеке ncurses, как это описывается в остальном "
"руководстве. Это <quote>междистрибутивное</quote> HOWTO попросили "
-"пользователи, переходящие на &debian; из Redhat, Mandrake и SUSE. В этом "
+"пользователи, переходящие на &debian-gnu; из Redhat, Mandrake и SUSE. В этом "
"разделе подразумевается наличие некоторого опыта работы с командами *nix и "
"навигации по файловой системе. Здесь символ <prompt>$</prompt> означает "
"команду, вводимую в текущей пользовательской системе, а <prompt>#</prompt> "
@@ -878,13 +878,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"Как только вы получите новую систему Debian, настроенную по вашим "
"предпочтениям, вы можете перенести ваши данные (если они есть) в неё и "
-"продолжать работу. Поэтому такая установка &debian; считается <quote>с "
+"продолжать работу. Поэтому такая установка &debian-gnu; считается <quote>с "
"нулевым временем простоя</quote> (zero downtime). Также это мудрый способ "
"работы с аппаратурой, которая не может нормально работать с разными "
"загрузочными или установочными носителями."
@@ -1092,11 +1092,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"Если у вас есть компакт-диск с &releasename; &debian;, смонтированный в "
+"Если у вас есть компакт-диск с &releasename; &debian-gnu;, смонтированный в "
"<filename>/cdrom</filename>, вы можете подставить URL типа file вместо http "
"URL: <userinput>file:/cdrom/debian/</userinput>"
@@ -1688,12 +1688,12 @@ msgstr "Установка системного загрузчика"
#: random-bits.xml:765
#, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"Чтобы сделать систему &debian; загружаемой, настройте системный загрузчик на "
+"Чтобы сделать систему &debian-gnu; загружаемой, настройте системный загрузчик на "
"загрузку установленного ядра с новым корневым разделом. Заметим, что "
"<command>debootstrap</command> не устанавливает системный загрузчик, хотя вы "
"можете использовать <command>aptitude</command> внутри вашего Debian chroot, "
@@ -1918,19 +1918,19 @@ msgstr "# aptitude clean"
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "Установка &debian; через Parallel Line IP (PLIP)"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "Установка &debian-gnu; через Parallel Line IP (PLIP)"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
-"Этот раздел описывает установку &debian; на компьютер без сетевой карты "
+"Этот раздел описывает установку &debian-gnu; на компьютер без сетевой карты "
"Ethernet, но подключённый к другому компьютеру-шлюзу с помощью нуль-"
"модемного кабеля (также называемого нуль-принтерным кабелем). Компьютер-шлюз "
"должен быть подключён к сети, где есть сервер зеркало Debian (например, к "
@@ -2199,8 +2199,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "Установка &debian; с использованием PPP через Ethernet (PPPoE)"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "Установка &debian-gnu; с использованием PPP через Ethernet (PPPoE)"
#. Tag: para
#: random-bits.xml:1048
diff --git a/po/ru/using-d-i.po b/po/ru/using-d-i.po
index f461a1532..39d32e411 100644
--- a/po/ru/using-d-i.po
+++ b/po/ru/using-d-i.po
@@ -587,10 +587,10 @@ msgstr "base-installer"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
+"operate under &debian-gnu; when rebooted."
msgstr ""
"Устанавливает самый минимальный набор пакетов, который позволит компьютеру "
-"работать под &debian; после перезагрузки."
+"работать под &debian-gnu; после перезагрузки."
#. Tag: term
#: using-d-i.xml:324
@@ -811,12 +811,12 @@ msgstr "Определение доступной памяти / режим с
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"Одну из первых вещей, которую делает &d-i;, это проверка размера доступной "
"памяти. Если размер ограничен, то эта компонента делает некоторые изменения "
-"процесса установки, которые, будем надеяться, позволят установить &debian; "
+"процесса установки, которые, будем надеяться, позволят установить &debian-gnu; "
"на вашу машину."
#. Tag: para
@@ -3664,7 +3664,7 @@ msgstr "Настройка apt"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -4823,7 +4823,7 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"Новые (с середины 1998 и новее) PowerMacs используют <command>yaboot</"
"command> в качестве своих системных загрузчиков. Программа установки "
@@ -4831,7 +4831,7 @@ msgstr ""
"это маленький 820k раздел с именем <quote>bootstrap</quote> и типом "
"<emphasis>Apple_Bootstrap</emphasis>, созданный ранее компонентой разбивки. "
"Если этот шаг завершился удачно, то ваш диск должен стать загрузочным и "
-"OpenFirmware установлена на загрузку &debian;."
+"OpenFirmware установлена на загрузку &debian-gnu;."
#. Tag: title
#: using-d-i.xml:2964
@@ -5047,13 +5047,13 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
"После завершающего вопроса система будет остановлена, так как перезагрузка "
"не поддерживается на архитектуре &arch-title;. Затем, вам нужно перейти в "
-"IPL &debian; из DASD, который вы выбрали в качестве корневой файловой "
+"IPL &debian-gnu; из DASD, который вы выбрали в качестве корневой файловой "
"системы в самом начале установки."
#. Tag: title
diff --git a/po/ru/welcome.po b/po/ru/welcome.po
index b6622c40d..fcc3c4e19 100644
--- a/po/ru/welcome.po
+++ b/po/ru/welcome.po
@@ -28,12 +28,12 @@ msgstr "Добро пожаловать в Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"Эта глава посвящена обзору проекта Debian и &debian;. Если вы уже знаете "
-"историю проекта Debian и дистрибутива &debian;, спокойно переходите к "
+"Эта глава посвящена обзору проекта Debian и &debian-gnu;. Если вы уже знаете "
+"историю проекта Debian и дистрибутива &debian-gnu;, спокойно переходите к "
"следующей главе."
#. Tag: title
@@ -577,13 +577,13 @@ msgstr "Получение Debian"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"Информацию о том, как загрузить &debian; из Интернет или у кого можно купить "
+"Информацию о том, как загрузить &debian-gnu; из Интернет или у кого можно купить "
"официальные компакт-диски с Debian, смотрите на <ulink url=\"&url-debian-"
"distrib;\">странице распространения</ulink>. <ulink url=\"&url-debian-"
"mirrors;\">Список серверов-зеркал Debian</ulink> содержит полный перечень "
@@ -613,13 +613,13 @@ msgstr "Получение последней версии этого докум
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"Этот документ постоянно обновляется. На <ulink url=\"&url-release-area;\"> "
"странице Debian &release;</ulink> вы найдёте самую свежую информацию о "
-"последних изменениях в выпуске &release; системы &debian;. Обновлённые "
+"последних изменениях в выпуске &release; системы &debian-gnu;. Обновлённые "
"версии этого руководства по установке также доступны на <ulink url=\"&url-"
"install-manual;\">официальных страницах руководства по установке</ulink>."
@@ -663,11 +663,11 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"Это руководство построено последовательно, оно проведёт вас через процесс "
-"установки от начала и до конца. Вот шаги установки &debian; и "
+"установки от начала и до конца. Вот шаги установки &debian-gnu; и "
"соответствующие им разделы документа:"
#. Tag: para
@@ -817,7 +817,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -828,7 +828,7 @@ msgstr ""
"распространяется большинство коммерческих программ &mdash; обычно в них "
"говорится, что вы можете использовать только одну копию программы на одном "
"компьютере. Лицензия этой системы совсем не такая. Мы предлагаем вам "
-"установить копию &debian; на каждый компьютер в вашей школе или на работе. "
+"установить копию &debian-gnu; на каждый компьютер в вашей школе или на работе. "
"Дайте ваши установочные носители друзьям и помогите им поставить систему на "
"их компьютеры! Вы даже можете сделать тысячи копий и <emphasis>продавать</"
"emphasis> их &mdash; хотя и с некоторыми ограничениями. Ваша свобода ставить "
diff --git a/po/sv/bookinfo.po b/po/sv/bookinfo.po
index 03778b521..5dbfc0f8e 100644
--- a/po/sv/bookinfo.po
+++ b/po/sv/bookinfo.po
@@ -17,20 +17,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "Installationsguide för &debian;"
+msgid "&debian-gnu; Installation Guide"
+msgstr "Installationsguide för &debian-gnu;"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Det här dokumentet innehåller installationsinstruktioner för &debian; "
+"Det här dokumentet innehåller installationsinstruktioner för &debian-gnu; "
"&release; system (kodnamn <quote>&releasename;</quote>) för arkitekturen "
"&arch-title; (<quote>&architecture;</quote>). Den innehåller även referenser "
"till mer information och information om hur du får ut det mesta av ditt nya "
diff --git a/po/sv/boot-installer.po b/po/sv/boot-installer.po
index 5f770af12..23a4c601b 100644
--- a/po/sv/boot-installer.po
+++ b/po/sv/boot-installer.po
@@ -553,11 +553,11 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
"Efter att programmet har startats så kommer ett par inledande frågor att "
"ställas och systemet kommer att förberedas för att starta "
-"installationsprogrammet för &debian;."
+"installationsprogrammet för &debian-gnu;."
#. Tag: title
#: boot-installer.xml:496
@@ -4840,22 +4840,22 @@ msgstr ""
#~ msgid ""
#~ "GNU/Linux is the only operating system on Alpha that can be booted from "
-#~ "both console types, but &debian; &release; only supports booting on SRM-"
+#~ "both console types, but &debian-gnu; &release; only supports booting on SRM-"
#~ "based systems. If you have an Alpha for which no version of SRM is "
#~ "available, if you will be dual-booting the system with Windows NT, or if "
#~ "your boot device requires ARC console support for BIOS initialization, "
-#~ "you will not be able to use the &debian; &release; installer. You can "
-#~ "still run &debian; &release; on such systems by using other install "
+#~ "you will not be able to use the &debian-gnu; &release; installer. You can "
+#~ "still run &debian-gnu; &release; on such systems by using other install "
#~ "media; for instance, you can install Debian woody with MILO and upgrade."
#~ msgstr ""
#~ "GNU/Linux är det enda operativsystemet på Alpha som kan startas upp från "
-#~ "båda konsolltyperna, men &debian; &release; har endast stöd för uppstart "
+#~ "båda konsolltyperna, men &debian-gnu; &release; har endast stöd för uppstart "
#~ "på SRM-baserade system. Om du har en Alpha som det inte finns någon SRM-"
#~ "version tillgänglig för, om du vill använda dubbel-uppstart tillsammans "
#~ "med Windows NT, eller om din uppstartsenhet kräver stöd för ARC-konsoll "
#~ "för initiering av BIOS kommer du inte kunna använda "
-#~ "installationsprogrammet för &debian; &release;. Du kan fortfarande köra "
-#~ "&debian; &release; på sådana system genom att använda andra "
+#~ "installationsprogrammet för &debian-gnu; &release;. Du kan fortfarande köra "
+#~ "&debian-gnu; &release; på sådana system genom att använda andra "
#~ "installationsmedia, till exempel kan du installera Debian woody med MILO "
#~ "och uppgradera."
@@ -5080,7 +5080,7 @@ msgstr ""
#~ "firmware. Also, once SRM is installed, it is possible to run ARC/"
#~ "AlphaBIOS from a floppy disk (using the <command>arc</command> command). "
#~ "For the reasons mentioned above, we recommend switching to SRM before "
-#~ "installing &debian;."
+#~ "installing &debian-gnu;."
#~ msgstr ""
#~ "Majoriteten av de AlphaServer-modeller och alla nuvarande server- och "
#~ "arbetsstationsprodukter innehåller både SRM och AlphaBIOS i sin fasta "
@@ -5089,14 +5089,14 @@ msgstr ""
#~ "genom att skriva om den fasta programvaran. När SRM har installerats, är "
#~ "det möjligt att köra ARC/AlphaBIOS från en diskett (med kommandot "
#~ "<command>arc</command>). Med anledningarna nämnda ovan, rekommenderar vi "
-#~ "ett byte till SRM före installation av &debian;."
+#~ "ett byte till SRM före installation av &debian-gnu;."
#~ msgid ""
#~ "As on other architectures, you should install the newest available "
#~ "revision of the firmware<footnote> <para> Except on Jensen, where Linux "
#~ "is not supported on firmware versions newer than 1.7 &mdash; see <ulink "
#~ "url=\"&url-jensen-howto;\"></ulink> for more information. </para> </"
-#~ "footnote> before installing &debian;. For Alpha, firmware updates can be "
+#~ "footnote> before installing &debian-gnu;. For Alpha, firmware updates can be "
#~ "obtained from <ulink url=\"&url-alpha-firmware;\">Alpha Firmware Updates</"
#~ "ulink>."
#~ msgstr ""
@@ -5104,7 +5104,7 @@ msgstr ""
#~ "revisionen av den fasta programvaran<footnote> <para> Utom på Jensen, där "
#~ "Linux inte stöds av fasta programvaruversioner senare än 1.7 &mdash; se "
#~ "<ulink url=\"&url-jensen-howto;\"></ulink> för mer information. </para> </"
-#~ "footnote> före installation av &debian;. För Alpha, uppdateringar av den "
+#~ "footnote> före installation av &debian-gnu;. För Alpha, uppdateringar av den "
#~ "fasta programvaran kan hämtas från <ulink url=\"&url-alpha-firmware;"
#~ "\">Alpha Firmware Updates</ulink>."
@@ -5188,7 +5188,7 @@ msgstr ""
#~ msgstr "Uppstart från cd-rom med SRM-konsoll"
#~ msgid ""
-#~ "The &debian; install CDs include several preconfigured boot options for "
+#~ "The &debian-gnu; install CDs include several preconfigured boot options for "
#~ "VGA and serial consoles. Type <informalexample><screen>\n"
#~ "&gt;&gt;&gt; boot xxxx -flags 0\n"
#~ "</screen></informalexample> to boot using VGA console, where "
@@ -5199,7 +5199,7 @@ msgstr ""
#~ "</screen></informalexample> and for console on the second serial port, "
#~ "type"
#~ msgstr ""
-#~ "Installationsskivorna för &debian; inkluderar flera förkonfigurerade "
+#~ "Installationsskivorna för &debian-gnu; inkluderar flera förkonfigurerade "
#~ "uppstartsalternativ för VGA och seriekonsoller. Ange "
#~ "<informalexample><screen>\n"
#~ "&gt;&gt;&gt; boot xxxx -flags 0\n"
diff --git a/po/sv/boot-new.po b/po/sv/boot-new.po
index 4f477b356..e31b3373a 100644
--- a/po/sv/boot-new.po
+++ b/po/sv/boot-new.po
@@ -194,12 +194,12 @@ msgstr "NewWorld PowerMac"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"På G4-maskiner och iBook:ar kan du hålla ned tangenten <keycap>option</"
"keycap> och få en grafisk skärm med en knapp för varje startbart OS, "
-"&debian; kommer att vara en knapp med en liten pingvin på."
+"&debian-gnu; kommer att vara en knapp med en liten pingvin på."
#. Tag: para
#: boot-new.xml:104
@@ -232,16 +232,16 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
"Återställning av OpenFirmware på G3 eller G4-maskinvara kommer att göra att "
-"den startar upp &debian; som standard (om du partitionerat den korrekt och "
-"placerat Apple_Bootstrap-partitionen först). Om du har &debian; på en SCSI-"
+"den startar upp &debian-gnu; som standard (om du partitionerat den korrekt och "
+"placerat Apple_Bootstrap-partitionen först). Om du har &debian-gnu; på en SCSI-"
"disk och MacOS på en IDE-disk kanske inte det här fungerar om du kommer att "
"behöva på in i OpenFirmware och ställa in variabeln <envar>boot-device</"
"envar>, <command>ybin</command> gör normalt det här helt automatiskt."
@@ -250,13 +250,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"Efter du har startat upp &debian; för första gången kan du lägga till "
+"Efter du har startat upp &debian-gnu; för första gången kan du lägga till "
"ytterligare flaggor som du önskar (såsom flaggor för dubbla startalternativ) "
"till <filename>/etc/yaboot.conf</filename> och köra <command>ybin</command> "
"för att uppdatera din startpartition med den ändrade konfigurationen. Läs "
diff --git a/po/sv/hardware.po b/po/sv/hardware.po
index b00c926c2..ebad472b5 100644
--- a/po/sv/hardware.po
+++ b/po/sv/hardware.po
@@ -47,14 +47,14 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"Debian ställer inga maskinvarukrav utöver kraven ställda för Linuxkärnan och "
"GNU:s verktyg. Därför kan alla arkitekturer eller plattformar till vilka "
"Linuxkärnan, libc, <command>gcc</command> och så vidare, blivit porterade, "
"och för vilken en portering till Debian finns, köra Debian. Referera till "
"ports-sidorna på <ulink url=\"&url-ports;\"></ulink> för mera detaljer om "
-"&arch-title;-arkitektursystem som har blivit testade med &debian;."
+"&arch-title;-arkitektursystem som har blivit testade med &debian-gnu;."
#. Tag: para
#: hardware.xml:32
@@ -472,7 +472,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -481,7 +481,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"Det här är den första officiella utgåvan av &debian; för arkitekturen &arch-"
+"Det här är den första officiella utgåvan av &debian-gnu; för arkitekturen &arch-"
"title;. Vi tycker att den har bevisat sig vara tillräckligt bra för att ges "
"ut. Dock har den inte haft samma exponering (och följaktligen blivit testad "
"av användarna) som andra arkitekturer har haft, och du kan kanske påträffa "
@@ -897,10 +897,10 @@ msgstr "Cobalt-maskiner använder 115200 bps."
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"För &debian; &release; stöds endast underarkitekturerna PMac (Power-"
+"För &debian-gnu; &release; stöds endast underarkitekturerna PMac (Power-"
"Macintosh eller PowerMac) och PreP."
#. Tag: title
@@ -2037,11 +2037,11 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
"Trådlösa nätverkskort som inte stöds av den officiella &arch-kernel;-kärnan går i "
-"allmänhet att få igång under &debian; men de stöds inte under installationen."
+"allmänhet att få igång under &debian-gnu; men de stöds inte under installationen."
#. Tag: para
#: hardware.xml:1346
@@ -2060,7 +2060,7 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
@@ -2068,7 +2068,7 @@ msgid ""
msgstr ""
"Om det uppstår ett problem med det trådlösa och det inte finns något annat "
"nätverkskort som du kan använda under installationen så är det fortfarande "
-"möjligt att installera &debian; med en komplett cd-rom- eller dvd-"
+"möjligt att installera &debian-gnu; med en komplett cd-rom- eller dvd-"
"avbildning. Välj alternativet att inte konfigurera ett nätverk och "
"installera endast de paket som finns tillgängliga på cd/dvd-skivan. Du kan "
"sedan installera drivrutinen och den fasta programvara som du behöver efter "
@@ -2199,7 +2199,7 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"Stöd för punktskriftsskärmar bestäms av det underliggande stödet som finns i "
@@ -2207,7 +2207,7 @@ msgstr ""
"<classname>brltty</classname>, anslutna via antingen en serieport, USB eller "
"Bluetooth. Information om vilka punktskriftsenheter som stöds kan hittas på "
"<ulink url=\"&url-brltty;\"><classname>webbplatsen för </classname>brltty</"
-"ulink>. &debian; &release; levereras med <classname>brltty</classname> "
+"ulink>. &debian-gnu; &release; levereras med <classname>brltty</classname> "
"version &brlttyver;."
#. Tag: title
@@ -2226,7 +2226,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"Stöd för talsyntes (maskinvara) bestäms av det underliggande stödet som "
@@ -2234,7 +2234,7 @@ msgstr ""
"endast stöd för integrerade kort och external enheter anslutnas till en "
"serieport (inga USB eller serie-till-USB-adaptrar stöds). Information om "
"talsyntesenheter (maskinvara) kan hittas på <ulink url=\"&url-speakup;"
-"\"><classname>webbplatsen för </classname>speakup</ulink>. &debian; "
+"\"><classname>webbplatsen för </classname>speakup</ulink>. &debian-gnu; "
"&release; levereras med <classname>speakup</classname> version &speakupver;."
#. Tag: title
@@ -2327,16 +2327,16 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
"I de flesta fall så är den fasta programvaran icke-fri enligt de kriteria "
-"som används av &debian;-projektet och kan därför inte inkluderas i "
+"som används av &debian-gnu;-projektet och kan därför inte inkluderas i "
"huvuddistributionen eller i installationssystemet. Om själva "
-"enhetsdrivrutinen är inkluderad i distributionen och om &debian; juridiskt "
+"enhetsdrivrutinen är inkluderad i distributionen och om &debian-gnu; juridiskt "
"sett kan distribuera den fasta programvaran så finns den ofta tillgänglig "
"som ett separat paket från sektionen non-free i arkivet."
@@ -2345,14 +2345,14 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
"Dock betyder inte det att sådan maskinvara inte kan användas under en "
-"installation. Från och med &debian; 5.0, &d-i; finns stöd för inläsning av "
+"installation. Från och med &debian-gnu; 5.0, &d-i; finns stöd för inläsning av "
"fast programvara eller paket som innehåller fast programvara från ett "
"flyttbart media, såsom en diskett eller USB-minne. Se <xref linkend="
"\"loading-firmware\"/> för detaljerad information om hur man läser in fast "
@@ -2782,13 +2782,13 @@ msgstr "Un*x eller GNU-system"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
"Om du kör ett annat Unix-liknande system skulle du kunna använda det för att "
-"installera &debian; utan att använda &d-i; som beskrivs i resten av den här "
+"installera &debian-gnu; utan att använda &d-i; som beskrivs i resten av den här "
"handboken. Den här typen av installation kan vara användbar för användare "
"med maskinvara som annars inte stöds eller på datorer som inte kan vara "
"frånkopplade. Om du är intresserad av den här tekniken, hoppa till <xref "
@@ -3956,23 +3956,23 @@ msgstr ""
#~ msgid ""
#~ "If there is no other NIC you can use during the installation, it is still "
-#~ "possible to install &debian; using a full CD-ROM or DVD image. Select the "
+#~ "possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the "
#~ "option to not configure a network and install using only the packages "
#~ "available from the CD/DVD. You can then install the driver and firmware "
#~ "you need after the installation is completed (after the reboot) and "
#~ "configure your network manually. Note that the firmware may be packaged "
#~ "separately from the driver and may not be available in the <quote>main</"
-#~ "quote> section of the &debian; archive."
+#~ "quote> section of the &debian-gnu; archive."
#~ msgstr ""
#~ "Om det inte finns något annat nätverkskort som du kan använda under "
-#~ "installationen, är det fortfarande möjligt att installera &debian; med en "
+#~ "installationen, är det fortfarande möjligt att installera &debian-gnu; med en "
#~ "fullständig cd-rom eller dvd-avbildning. Välj alternativet att inte "
#~ "konfigurera ett nätverk och installera endast med de paket som finns "
#~ "tillgängliga på cd/dvd-skivan. Du kan då installera drivrutinen och den "
#~ "fasta programvaran som du behöver efter att installationen är färdig "
#~ "(efter omstarten) och konfigurera ditt nätverk manuellt. Observera att "
#~ "den fasta programvaran kan vara paketerad separat från drivrutinen och "
-#~ "kanske inte finns tillgänglig i sektionen <quote>main</quote> i &debian;-"
+#~ "kanske inte finns tillgänglig i sektionen <quote>main</quote> i &debian-gnu;-"
#~ "arkivet."
#~ msgid ""
diff --git a/po/sv/install-methods.po b/po/sv/install-methods.po
index c530d5f15..9cb7d6b67 100644
--- a/po/sv/install-methods.po
+++ b/po/sv/install-methods.po
@@ -23,14 +23,14 @@ msgstr "Få tag på installationsmedia"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "Officiella &debian; cd-rom-uppsättningar"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "Officiella &debian-gnu; cd-rom-uppsättningar"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
-msgid "By far the easiest way to install &debian; is from an Official Debian CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images from a Debian mirror and make your own set, if you have a fast network connection and a CD burner (see the <ulink url=\"&url-debian-cd;\">Debian CD page</ulink> for detailed instructions). If you have a Debian CD set and CDs are bootable on your machine, you can skip right to <xref linkend=\"boot-installer\"/>; much effort has been expended to ensure the files most people need are there on the CD. Although a full set of binary packages requires several CDs, it is unlikely you will need packages on the third CD and above. You may also consider using the DVD version, which saves a lot of space on your shelf and you avoid the CD shuffling marathon."
-msgstr "Det klart enklaste sättet att installera &debian; är från en officiell uppsättning av Debians cd-skivor. Du kan köpa uppsättningen från en leverantör (se <ulink url=\"&url-debian-cd-vendors;\">Debian-cd-försäljare</ulink>). Du kan också hämta cd-avbildningar från en Debian-spegel och göra en egen uppsättning, om du har en snabb nätverksanslutning och en cd-brännare (se <ulink url=\"&url-debian-cd;\">Debian GNU/Linux på cd</ulink> för detaljerade instruktioner). Om du har en uppsättning av Debians cd-skivor och möjligheten att starta upp din dator på en cd-skiva kan du hoppa till <xref linkend=\"boot-installer\"/>; mycket jobb har lagts ner på att se till att filer som de flesta behöver finns på cd-skivan. Även om en full uppsättning av binära paket kräver många cd-skivor är det ovanligt att du behöver paket på tredje cd-skivan och uppåt. Du kan också använda dvd-versionen som sparar en hel del plats på din bokhylla och du slipper mata skivor in och ut. "
+msgid "By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images from a Debian mirror and make your own set, if you have a fast network connection and a CD burner (see the <ulink url=\"&url-debian-cd;\">Debian CD page</ulink> for detailed instructions). If you have a Debian CD set and CDs are bootable on your machine, you can skip right to <xref linkend=\"boot-installer\"/>; much effort has been expended to ensure the files most people need are there on the CD. Although a full set of binary packages requires several CDs, it is unlikely you will need packages on the third CD and above. You may also consider using the DVD version, which saves a lot of space on your shelf and you avoid the CD shuffling marathon."
+msgstr "Det klart enklaste sättet att installera &debian-gnu; är från en officiell uppsättning av Debians cd-skivor. Du kan köpa uppsättningen från en leverantör (se <ulink url=\"&url-debian-cd-vendors;\">Debian-cd-försäljare</ulink>). Du kan också hämta cd-avbildningar från en Debian-spegel och göra en egen uppsättning, om du har en snabb nätverksanslutning och en cd-brännare (se <ulink url=\"&url-debian-cd;\">Debian GNU/Linux på cd</ulink> för detaljerade instruktioner). Om du har en uppsättning av Debians cd-skivor och möjligheten att starta upp din dator på en cd-skiva kan du hoppa till <xref linkend=\"boot-installer\"/>; mycket jobb har lagts ner på att se till att filer som de flesta behöver finns på cd-skivan. Även om en full uppsättning av binära paket kräver många cd-skivor är det ovanligt att du behöver paket på tredje cd-skivan och uppåt. Du kan också använda dvd-versionen som sparar en hel del plats på din bokhylla och du slipper mata skivor in och ut. "
#. Tag: para
#: install-methods.xml:30
@@ -305,8 +305,8 @@ msgstr "Skriva diskettavbildningar med <command>Disk Copy</command>"
#. Tag: para
#: install-methods.xml:426
#, no-c-format
-msgid "If you are creating the floppy image from files which were originally on the official &debian; CD, then the Type and Creator are already set correctly. The following <command>Creator-Changer</command> steps are only necessary if you downloaded the image files from a Debian mirror."
-msgstr "Om du skapar diskettavbildningarna från filer som från början kom från en officiell &debian;-cd, så är Type och Creator redan korrekt inställda. Följande steg för <command>Creator-Changer</command> är endast nödvändiga om du hämtade avbildningsfilerna från en Debian-spegel."
+msgid "If you are creating the floppy image from files which were originally on the official &debian-gnu; CD, then the Type and Creator are already set correctly. The following <command>Creator-Changer</command> steps are only necessary if you downloaded the image files from a Debian mirror."
+msgstr "Om du skapar diskettavbildningarna från filer som från början kom från en officiell &debian-gnu;-cd, så är Type och Creator redan korrekt inställda. Följande steg för <command>Creator-Changer</command> är endast nödvändiga om du hämtade avbildningsfilerna från en Debian-spegel."
#. Tag: para
#: install-methods.xml:435
@@ -873,8 +873,8 @@ msgstr "Trivial File Transfer Protocol (TFTP) används för att erbjuda uppstart
#. Tag: para
#: install-methods.xml:1124
#, no-c-format
-msgid "For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's written by the same author as the <classname>syslinux</classname> bootloader and is therefore least likely to cause issues. A good alternative is <classname>atftpd</classname>."
-msgstr "För en &debian;-server så rekommenderar vi <classname>tftpd-hpa</classname>. Den är skriven av samma upphovsman som starthanteraren <classname>syslinux</classname> och är därför minst sannolik att orsaka problem. Ett bra alternativ är <classname>atftpd</classname>."
+msgid "For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's written by the same author as the <classname>syslinux</classname> bootloader and is therefore least likely to cause issues. A good alternative is <classname>atftpd</classname>."
+msgstr "För en &debian-gnu;-server så rekommenderar vi <classname>tftpd-hpa</classname>. Den är skriven av samma upphovsman som starthanteraren <classname>syslinux</classname> och är därför minst sannolik att orsaka problem. Ett bra alternativ är <classname>atftpd</classname>."
#. Tag: title
#: install-methods.xml:1140
@@ -903,8 +903,8 @@ msgstr "Konfigurering av DHCP-server"
#. Tag: para
#: install-methods.xml:1175
#, no-c-format
-msgid "One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, the <classname>dhcp3-server</classname> package is recommended. Here is a sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</filename>):"
-msgstr "En fri DHCP-serverprogramvara är ISC <command>dhcpd</command>. För &debian;, rekommenderas paketet <classname>dhcp3-server</classname>. Här är en exempelkonfigurationsfil för det (se <filename>/etc/dhcp3/dhcpd.conf</filename>):"
+msgid "One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, the <classname>dhcp3-server</classname> package is recommended. Here is a sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</filename>):"
+msgstr "En fri DHCP-serverprogramvara är ISC <command>dhcpd</command>. För &debian-gnu;, rekommenderas paketet <classname>dhcp3-server</classname>. Här är en exempelkonfigurationsfil för det (se <filename>/etc/dhcp3/dhcpd.conf</filename>):"
#. Tag: screen
#: install-methods.xml:1182
@@ -1041,14 +1041,14 @@ msgstr "Konfigurera en BOOTP-server"
#. Tag: para
#: install-methods.xml:1224
#, no-c-format
-msgid "There are two BOOTP servers available for GNU/Linux. The first is CMU <command>bootpd</command>. The other is actually a DHCP server: ISC <command>dhcpd</command>. In &debian; these are contained in the <classname>bootp</classname> and <classname>dhcp3-server</classname> packages respectively."
-msgstr "Det finns två BOOTP-servrar tillgängliga för GNU/Linux. Den första är CMU <command>bootpd</command>. Den andra är faktiskt en DHCP-server: ISC <command>dhcpd</command>. I &debian; finns dessa i paketen <classname>bootp</classname> respektive <classname>dhcp3-server</classname>."
+msgid "There are two BOOTP servers available for GNU/Linux. The first is CMU <command>bootpd</command>. The other is actually a DHCP server: ISC <command>dhcpd</command>. In &debian-gnu; these are contained in the <classname>bootp</classname> and <classname>dhcp3-server</classname> packages respectively."
+msgstr "Det finns två BOOTP-servrar tillgängliga för GNU/Linux. Den första är CMU <command>bootpd</command>. Den andra är faktiskt en DHCP-server: ISC <command>dhcpd</command>. I &debian-gnu; finns dessa i paketen <classname>bootp</classname> respektive <classname>dhcp3-server</classname>."
#. Tag: para
#: install-methods.xml:1232
#, no-c-format
msgid ""
-"To use CMU <command>bootpd</command>, you must first uncomment (or add) the relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server does not run Debian, the line in question should look like: <informalexample><screen>\n"
+"To use CMU <command>bootpd</command>, you must first uncomment (or add) the relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server does not run Debian, the line in question should look like: <informalexample><screen>\n"
"bootps dgram udp wait root /usr/sbin/bootpd bootpd -i -t 120\n"
"</screen></informalexample> Now, you must create an <filename>/etc/bootptab</filename> file. This has the same sort of familiar and cryptic format as the good old BSD <filename>printcap</filename>, <filename>termcap</filename>, and <filename>disktab</filename> files. See the <filename>bootptab</filename> manual page for more information. For CMU <command>bootpd</command>, you will need to know the hardware (MAC) address of the client. Here is an example <filename>/etc/bootptab</filename>: <informalexample><screen>\n"
"client:\\\n"
@@ -1060,7 +1060,7 @@ msgid ""
" ha=0123456789AB:\n"
"</screen></informalexample> You will need to change at least the <quote>ha</quote> option, which specifies the hardware address of the client. The <quote>bf</quote> option specifies the file a client should retrieve via TFTP; see <xref linkend=\"tftp-images\"/> for more details. <phrase arch=\"mips\"> On SGI machines you can just enter the command monitor and type <userinput>printenv</userinput>. The value of the <userinput>eaddr</userinput> variable is the machine's MAC address. </phrase>"
msgstr ""
-"För att använda CMU <command>bootpd</command>, måste du först kommentera bort (eller lägga till) den relevanta raden i <filename>/etc/inetd.conf</filename>. På &debian; kan du köra <userinput>update-inetd --enable bootps</userinput>, sedan <userinput>/etc/init.d/inetd reload</userinput> för att göra det. Om din BOOTP-server inte kör Debian, bör raden i fråga se ut så här: <informalexample><screen>\n"
+"För att använda CMU <command>bootpd</command>, måste du först kommentera bort (eller lägga till) den relevanta raden i <filename>/etc/inetd.conf</filename>. På &debian-gnu; kan du köra <userinput>update-inetd --enable bootps</userinput>, sedan <userinput>/etc/init.d/inetd reload</userinput> för att göra det. Om din BOOTP-server inte kör Debian, bör raden i fråga se ut så här: <informalexample><screen>\n"
"bootps dgram udp wait root /usr/sbin/bootpd bootpd -i -t 120\n"
"</screen></informalexample> Nu måste du skapa filen <filename>/etc/bootptab</filename>. Den har samma sorts familjära och kryptiska format som de gamla goda BSD-filerna <filename>printcap</filename>, <filename>termcap</filename> och <filename>disktab</filename>. Se manualsidan för <filename>bootptab</filename> för mer information. För CMU <command>bootpd</command> behöver du känna till maskinvaruadressen (MAC) för klienten. Här är ett exempel på en <filename>/etc/bootptab</filename>: <informalexample><screen>\n"
"client:\\\n"
@@ -1099,8 +1099,8 @@ msgstr "I det fallet med <classname>tftpd-hpa</classname> så finns det två sä
#. Tag: para
#: install-methods.xml:1299
#, no-c-format
-msgid "Historically, TFTP servers used <filename>/tftpboot</filename> as directory to serve images from. However, &debian; packages may use other directories to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the configuration examples in this section accordingly."
-msgstr "Historiskt sett hanterade TFTP-servrarna avbildningar från katalogen <filename>/tftpboot</filename>. Dock kan &debian;-paket använda andra kataloger för att följa <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink>. Till exempel, <classname>tftpd-hpa</classname> använder som standard <filename>/var/lib/tftpboot</filename>. Du kan därför behöva justera konfigurationsexemplen i det här avsnittet."
+msgid "Historically, TFTP servers used <filename>/tftpboot</filename> as directory to serve images from. However, &debian-gnu; packages may use other directories to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the configuration examples in this section accordingly."
+msgstr "Historiskt sett hanterade TFTP-servrarna avbildningar från katalogen <filename>/tftpboot</filename>. Dock kan &debian-gnu;-paket använda andra kataloger för att följa <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink>. Till exempel, <classname>tftpd-hpa</classname> använder som standard <filename>/var/lib/tftpboot</filename>. Du kan därför behöva justera konfigurationsexemplen i det här avsnittet."
#. Tag: para
#: install-methods.xml:1309
@@ -1237,13 +1237,13 @@ msgstr "Full dokumentation om förinställning inklusive ett fungerande exempel
#~ msgid ""
#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "a &debian-gnu; server, the <classname>atftpd</classname> and <classname>tftpd-"
#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
#~ "classname>."
#~ msgstr ""
#~ "För att använda metoden Pre-boot Execution Environment (PXE) av TFTP-"
#~ "uppstarten, behöver du en TFTP-server med stöd för <userinput>tsize</"
-#~ "userinput>. På en &debian;-server är paketen <classname>atftpd</"
+#~ "userinput>. På en &debian-gnu;-server är paketen <classname>atftpd</"
#~ "classname> och <classname>tftpd-hpa</classname> kvalificerade; vi "
#~ "rekommenderar <classname>tftpd-hpa</classname>."
#~ msgid ""
diff --git a/po/sv/installation-howto.po b/po/sv/installation-howto.po
index 55c926d61..4e210806c 100644
--- a/po/sv/installation-howto.po
+++ b/po/sv/installation-howto.po
@@ -24,14 +24,14 @@ msgstr "Installationshjälp"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
"useful, we will link to more detailed explanations in other parts of this "
"document."
msgstr ""
-"Det här dokumentet beskriver hur man installerar &debian; &releasename; för "
+"Det här dokumentet beskriver hur man installerar &debian-gnu; &releasename; för "
"&arch-title; (<quote>&architecture;</quote>) med den nya &d-i;. Det här är "
"en snabb genomgång av installationsprocessen vilken bör innehålla all "
"information du behöver för de flesta typer av installationer. När mer "
diff --git a/po/sv/partitioning.po b/po/sv/partitioning.po
index 815da488a..4a16782df 100644
--- a/po/sv/partitioning.po
+++ b/po/sv/partitioning.po
@@ -59,8 +59,8 @@ msgstr "Katalogträdet"
#. Tag: para
#: partitioning.xml:68
#, no-c-format
-msgid "&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> for directory and file naming. This standard allows users and software programs to predict the location of files and directories. The root level directory is represented simply by the slash <filename>/</filename>. At the root level, all Debian systems include these directories:"
-msgstr "&debian; följer <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> för namngivning av kataloger och filer. Den här standarden låter användarna och programvaror att förutse platsen för filer och kataloger. Rotnivåkatalogen representeras helt enkelt av ett snedstreck, <filename>/</filename>. På rotnivån, alla inkluderar Debian-system dessa kataloger:"
+msgid "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> for directory and file naming. This standard allows users and software programs to predict the location of files and directories. The root level directory is represented simply by the slash <filename>/</filename>. At the root level, all Debian systems include these directories:"
+msgstr "&debian-gnu; följer <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> för namngivning av kataloger och filer. Den här standarden låter användarna och programvaror att förutse platsen för filer och kataloger. Rotnivåkatalogen representeras helt enkelt av ett snedstreck, <filename>/</filename>. På rotnivån, alla inkluderar Debian-system dessa kataloger:"
#. Tag: entry
#: partitioning.xml:82
@@ -651,8 +651,8 @@ msgstr "<quote>Primära</quote> partitioner är den originella partitioneringspl
#. Tag: para
#: partitioning.xml:623
#, no-c-format
-msgid "Linux limits the partitions per drive to 15 partitions for SCSI disks (3 usable primary partitions, 12 logical partitions), and 63 partitions on an IDE drive (3 usable primary partitions, 60 logical partitions). However the normal &debian; system provides only 20 devices for partitions, so you may not install on partitions higher than 20 unless you first manually create devices for those partitions."
-msgstr "Linux begränsar antalet partitioner per disk till 15 partitioner för SCSI-diskar (3 användbara primära partitioner, 12 logiska partitioner), och 63 partitioner på en IDE-disk (3 användbara primära partitioner, 60 logiska partitioner). Dock ger det normala &debian;-systemet endast 20 enheter för partitioner, så du kan inte installera på partitioner högre än 20 om du inte manuellt skapar enheterna för dessa partitioner först."
+msgid "Linux limits the partitions per drive to 15 partitions for SCSI disks (3 usable primary partitions, 12 logical partitions), and 63 partitions on an IDE drive (3 usable primary partitions, 60 logical partitions). However the normal &debian-gnu; system provides only 20 devices for partitions, so you may not install on partitions higher than 20 unless you first manually create devices for those partitions."
+msgstr "Linux begränsar antalet partitioner per disk till 15 partitioner för SCSI-diskar (3 användbara primära partitioner, 12 logiska partitioner), och 63 partitioner på en IDE-disk (3 användbara primära partitioner, 60 logiska partitioner). Dock ger det normala &debian-gnu;-systemet endast 20 enheter för partitioner, så du kan inte installera på partitioner högre än 20 om du inte manuellt skapar enheterna för dessa partitioner först."
#. Tag: para
#: partitioning.xml:633
@@ -795,8 +795,8 @@ msgstr "Observera att bootstrap-partitionen endast är tänkt att tillhandahåll
#. Tag: para
#: partitioning.xml:850
#, no-c-format
-msgid "In order for OpenFirmware to automatically boot &debian; the bootstrap partition should appear before other boot partitions on the disk, especially MacOS boot partitions. The bootstrap partition should be the first one you create. However, if you add a bootstrap partition later, you can use <command>mac-fdisk</command>'s <userinput>r</userinput> command to reorder the partition map so the bootstrap partition comes right after the map (which is always partition 1). It's the logical map order, not the physical address order, that counts."
-msgstr "För att OpenFirmware ska starta upp &debian; automatiskt bör bootstrap-partitionen synas före andra uppstartspartitioner på disken, speciellt uppstartspartitioner för MacOS. Bootstrap-partitionen bör vara den första du skapar. Dock, om du lägger till en bootstrap-partition senare, kan du använda kommandot <userinput>r</userinput> i <command>mac-fdisk</command> för att ordna om partitionskartan så att bootstrap-partitionen kommer rätt efter kartan (som alltid är partition 1). Det är den logiska kartordningen, inte den fysiska adressordningen, som räknas."
+msgid "In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap partition should appear before other boot partitions on the disk, especially MacOS boot partitions. The bootstrap partition should be the first one you create. However, if you add a bootstrap partition later, you can use <command>mac-fdisk</command>'s <userinput>r</userinput> command to reorder the partition map so the bootstrap partition comes right after the map (which is always partition 1). It's the logical map order, not the physical address order, that counts."
+msgstr "För att OpenFirmware ska starta upp &debian-gnu; automatiskt bör bootstrap-partitionen synas före andra uppstartspartitioner på disken, speciellt uppstartspartitioner för MacOS. Bootstrap-partitionen bör vara den första du skapar. Dock, om du lägger till en bootstrap-partition senare, kan du använda kommandot <userinput>r</userinput> i <command>mac-fdisk</command> för att ordna om partitionskartan så att bootstrap-partitionen kommer rätt efter kartan (som alltid är partition 1). Det är den logiska kartordningen, inte den fysiska adressordningen, som räknas."
#. Tag: para
#: partitioning.xml:862
diff --git a/po/sv/post-install.po b/po/sv/post-install.po
index f5f6e325e..f710ec3d7 100644
--- a/po/sv/post-install.po
+++ b/po/sv/post-install.po
@@ -30,16 +30,16 @@ msgstr "Stänga av systemet"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"För att stänga av ett körande &debian;-system ska du inte starta om med reset-"
+"För att stänga av ett körande &debian-gnu;-system ska du inte starta om med reset-"
"knappen på fram- eller baksidan av din dator, eller helt enkelt stänga av "
-"datorn. &debian; bör stängas ner på ett kontrollerat sätt, annars kan filer gå "
+"datorn. &debian-gnu; bör stängas ner på ett kontrollerat sätt, annars kan filer gå "
"förlorade eller hårddisken bli skadad. Om du kör en skrivbordsmiljö finns "
"det ofta ett alternativ tillgängligt för att <quote>logga ut</quote> från "
"programmenyn som låter dig stänga av (eller starta om) systemet."
@@ -447,7 +447,7 @@ msgstr "Standardkonfiguration för e-post"
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
"that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
@@ -455,7 +455,7 @@ msgid ""
msgstr ""
"Även om du planerar att använda ett grafiskt e-postprogram, är det viktigt "
"att en traditionell MTA/MDA även är installerad och rätt konfigurerad på "
-"ditt &debian;-system. Anledningen är att olika verktyg som kör på "
+"ditt &debian-gnu;-system. Anledningen är att olika verktyg som kör på "
"systemet<footnote> <para> Exempel är: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> kan skicka viktiga notifieringar via "
diff --git a/po/sv/preface.po b/po/sv/preface.po
index 784172ecd..c931ad1b9 100644
--- a/po/sv/preface.po
+++ b/po/sv/preface.po
@@ -17,21 +17,21 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "Installation av &debian; &release; för &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "Installation av &debian-gnu; &release; för &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Vi är glada att du har valt att prova Debian och är säkra på att du kommer "
-"att tycka att utgåvan av Debian GNU/&arch-kernel; är unik. &debian; sammanför "
+"att tycka att utgåvan av Debian GNU/&arch-kernel; är unik. &debian-gnu; sammanför "
"högkvalitativa fria programvaror från hela världen och integrerar dem i en "
"sammanhängande helhet. Vi tror att du kommer att tycka att resultatet "
"verkligen är mer än summan av delarna."
diff --git a/po/sv/preparing.po b/po/sv/preparing.po
index 2e0aa941b..395f7caab 100644
--- a/po/sv/preparing.po
+++ b/po/sv/preparing.po
@@ -17,8 +17,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "Före installation av &debian;"
+msgid "Before Installing &debian-gnu;"
+msgstr "Före installation av &debian-gnu;"
#. Tag: para
#: preparing.xml:6
@@ -70,7 +70,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -80,7 +80,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"Med &debian; är det troligt att ditt operativsystem kan lagas istället för "
+"Med &debian-gnu; är det troligt att ditt operativsystem kan lagas istället för "
"att bytas ut om saker går fel. Uppgraderingar kräver aldrig en total "
"fullständig installation; du kan alltid uppgradera direkt. Program är nästan "
"alltid kompatibla med tidigare utgåvor av operativsystemet. Om en ny "
@@ -203,11 +203,11 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
"Installera en <firstterm>starthanterare</firstterm> som kan starta upp "
-"&debian; eller dina andra operativsystem."
+"&debian-gnu; eller dina andra operativsystem."
#. Tag: para
#: preparing.xml:134
@@ -286,7 +286,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"Ett viktigt alternativ under installationen är huruvida en grafisk "
@@ -295,7 +295,7 @@ msgstr ""
"inte markera funktionen <quote>Skrivbordsmiljö</quote>, kommer du att få ett "
"relativt grundläggande, kommandoradsdrivet system. Installering av "
"funktionen Skrivbordsmiljö är valfri därför att den kräver den hel del "
-"diskutrymme, och för att många &debian;-system är servrar som egentligen "
+"diskutrymme, och för att många &debian-gnu;-system är servrar som egentligen "
"inte har något behov för ett grafiskt användargränssnitt för att göra sitt "
"jobb."
@@ -326,7 +326,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -336,7 +336,7 @@ msgstr ""
"Innan du börjar, se till att säkerhetskopiera alla filer som nu finns på "
"ditt system. Om det här är första gången som ett icke-urspungligt "
"operativsystem installeras på din dator, är det antagligen så att du behöver "
-"partitionera om din disk för att skapa plats åt &debian;. När du "
+"partitionera om din disk för att skapa plats åt &debian-gnu;. När du "
"partitionerar din disk bör du räkna med att allting på disken kan komma att "
"förloras, oavsett vilket program du använder för att göra det. Programmen "
"som används i installationen är ganska tillförlitliga och de flesta har "
@@ -1154,7 +1154,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1164,7 +1164,7 @@ msgid ""
"least 200MB for <filename>/var</filename>, and a lot more if you install a "
"graphical desktop environment."
msgstr ""
-"Diskutrymmet som krävs för oproblematisk körning av själva &debian;-systemet "
+"Diskutrymmet som krävs för oproblematisk körning av själva &debian-gnu;-systemet "
"är inkluderat i dessa rekommenderade systemkrav. Noterbart är att "
"partitionen <filename>/var</filename> innehåller en hel del "
"tillståndsinformation som är specifik för Debian i tillägg till dess vanliga "
@@ -1289,7 +1289,7 @@ msgstr ""
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1301,7 +1301,7 @@ msgid ""
"installation tapes or CDs."
msgstr ""
"Om din dator endast har en hårddisk, och du vill ersätta hela det redan "
-"installerade operativsystemet med &debian;, kan du också vänta med att "
+"installerade operativsystemet med &debian-gnu;, kan du också vänta med att "
"partitionera den som en del av installationsprocessen (<xref linkend=\"di-"
"partition\"/>), efter att du har startat upp installationssystemet. Dock "
"fungerar endast det här om du planerar att starta upp installationssystemet "
@@ -1352,7 +1352,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1361,7 +1361,7 @@ msgstr ""
"för Debian. Om några av partitionerna kommer att ägas av andra "
"operativsystem, bör du skapa de partitionerna med partitionsprogrammen för "
"det operativsystemet. Vi rekommenderar att du <emphasis>inte</emphasis> "
-"försöker skapa partitioner för &debian; med verktyg från ett annat "
+"försöker skapa partitioner för &debian-gnu; med verktyg från ett annat "
"operativsystem. Du bör istället bara skapa de partitioner för det "
"ursprungliga operativsystemet som du vill bibehålla."
@@ -1394,7 +1394,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the &arch-parttype; "
+"In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype; "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a &arch-parttype; placeholder partition to come <emphasis>before</"
@@ -1403,7 +1403,7 @@ msgid ""
"placeholder with the Debian partition tools later during the actual install, "
"and replace it with &arch-parttype; partitions."
msgstr ""
-"För att OpenFirmware ska automatiskt starta upp &debian; bör &arch-parttype;-"
+"För att OpenFirmware ska automatiskt starta upp &debian-gnu; bör &arch-parttype;-"
"partitionerna visas före alla andra partitioner på disken, speciellt "
"uppstartspartitioner för MacOS. Det bör tänkas på vid förpartitionering; du "
"bör skapa en tom &arch-parttype;-partition som kommer <emphasis>före</emphasis> de "
@@ -1449,11 +1449,11 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"Använd de ursprungliga partitioneringsverktygen för att skapa ursprungliga "
"systempartition(er). Lämna antingen kvar en tom partition eller frigör "
-"utrymme för &debian;."
+"utrymme för &debian-gnu;."
#. Tag: para
#: preparing.xml:903
@@ -1792,11 +1792,11 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"Kom ihåg att skapa en tom partition för GNU/Linux, helst placerad först i "
"disklayouten. Det spelar ingen roll vilken typ det är, den kommer att tas "
-"bort och ersättas senare av &debian;s installationsprogram."
+"bort och ersättas senare av &debian-gnu;s installationsprogram."
#. Tag: para
#: preparing.xml:1107
@@ -1858,7 +1858,7 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"Det här avsnittet kommer att gå igenom inställning av maskinvara före "
@@ -1867,7 +1867,7 @@ msgstr ""
"i den fasta programvaran för ditt system. <quote>Fast programvara</quote> "
"(firmware) är kärnprogramvaran som används av maskinvaran; den anropas under "
"bootstrap-processen (efter påslagning av ström). Kända maskinvaruproblem som "
-"påverkar tillförlitligheten för &debian; på ditt system kommer också tas med."
+"påverkar tillförlitligheten för &debian-gnu; på ditt system kommer också tas med."
#. Tag: title
#: preparing.xml:1163
@@ -2623,7 +2623,7 @@ msgstr "BIOS-inställning"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2632,7 +2632,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"För att installera &debian; på en &arch-title; eller zSeries-maskin behöver "
+"För att installera &debian-gnu; på en &arch-title; eller zSeries-maskin behöver "
"du först starta upp en kärna i systemen. Uppstartsmekanismen på denna "
"plattform är annorlunda än andra, speciellt från PC-liknande system: det "
"finns inga diskettenheter tillgängliga alls. Du kommer att upptäcka en annan "
@@ -2771,12 +2771,12 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
"Installationsservern behöver kopiera den exakta katalogstrukturen från en "
-"&debian;-spegel men endast de s390 och arkitektursoberoende filerna är "
+"&debian-gnu;-spegel men endast de s390 och arkitektursoberoende filerna är "
"nödvändiga. Du kan även kopiera innehållet av alla installations-cd till ett "
"sådant katalogträd."
@@ -3237,14 +3237,14 @@ msgstr ""
#~ "system load, you have only a very basic command line driven system. The "
#~ "graphical interface which displays windows on your monitor will not be "
#~ "installed unless you select it with <classname>tasksel</classname>. It's "
-#~ "optional because many &debian; systems are servers which don't really "
+#~ "optional because many &debian-gnu; systems are servers which don't really "
#~ "have any need for a graphical user interface to do their job."
#~ msgstr ""
#~ "När <classname>debian-installer</classname> är klar, före första "
#~ "systemuppstarten, har du endast ett enkelt kommandoradsstyrt system. Det "
#~ "grafiska gränssnittet som visar fönster på din skärm kommer inte att "
#~ "installeras om du inte väljer det med <classname>tasksel</classname>. Det "
-#~ "är valfritt på grund av att många &debian;-system är servrar som "
+#~ "är valfritt på grund av att många &debian-gnu;-system är servrar som "
#~ "egentligen inte har något behov av ett grafiskt användargränssnitt för "
#~ "att göra sitt jobb."
diff --git a/po/sv/random-bits.po b/po/sv/random-bits.po
index f744f4c59..0a236b89a 100644
--- a/po/sv/random-bits.po
+++ b/po/sv/random-bits.po
@@ -707,20 +707,20 @@ msgstr "Om du installerar i ett annat språk än engelska, kan <command>tasksel<
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "Installera &debian; från ett Unix/Linux-system"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "Installera &debian-gnu; från ett Unix/Linux-system"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
-msgid "This section explains how to install &debian; from an existing Unix or Linux system, without using the menu-driven installer as explained in the rest of the manual. This <quote>cross-install</quote> HOWTO has been requested by users switching to &debian; from Red Hat, Mandrake, and SUSE. In this section some familiarity with entering *nix commands and navigating the file system is assumed. In this section, <prompt>$</prompt> symbolizes a command to be entered in the user's current system, while <prompt>#</prompt> refers to a command entered in the Debian chroot."
-msgstr "Det här avsnittet förklarar hur man installerar &debian; från ett befintligt Unix- eller Linux-system, utan att använda det menystyrda installationsprogrammet som förklaras i resten av handboken. Den här HOWTO:n för <quote>cross-installation</quote> har efterfrågats av användare som byter till &debian; från Red Hat, Mandrake och SUSE. I detta avsnitt antas att viss erfarenhet av *nix-kommandon och navigering i filsystemet. I detta avsnitt symboliserar <prompt>$</prompt> ett kommando som ska anges i användarens aktuella system, medan <prompt>#</prompt> refererar till ett kommando som ska anges i Debians chroot-miljö."
+msgid "This section explains how to install &debian-gnu; from an existing Unix or Linux system, without using the menu-driven installer as explained in the rest of the manual. This <quote>cross-install</quote> HOWTO has been requested by users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this section some familiarity with entering *nix commands and navigating the file system is assumed. In this section, <prompt>$</prompt> symbolizes a command to be entered in the user's current system, while <prompt>#</prompt> refers to a command entered in the Debian chroot."
+msgstr "Det här avsnittet förklarar hur man installerar &debian-gnu; från ett befintligt Unix- eller Linux-system, utan att använda det menystyrda installationsprogrammet som förklaras i resten av handboken. Den här HOWTO:n för <quote>cross-installation</quote> har efterfrågats av användare som byter till &debian-gnu; från Red Hat, Mandrake och SUSE. I detta avsnitt antas att viss erfarenhet av *nix-kommandon och navigering i filsystemet. I detta avsnitt symboliserar <prompt>$</prompt> ett kommando som ska anges i användarens aktuella system, medan <prompt>#</prompt> refererar till ett kommando som ska anges i Debians chroot-miljö."
#. Tag: para
#: random-bits.xml:372
#, no-c-format
-msgid "Once you've got the new Debian system configured to your preference, you can migrate your existing user data (if any) to it, and keep on rolling. This is therefore a <quote>zero downtime</quote> &debian; install. It's also a clever way for dealing with hardware that otherwise doesn't play friendly with various boot or installation media."
-msgstr "När du har fått det nya Debian-systemet konfigurerat enligt din smak, kan du migrera din befintliga användardata (om den finns) till det, och fortsätta köra. Det här är alltså en installation av &debian; <quote>utan nedtid</quote>. Det är också ett klurigt sätt att hantera maskinvara som annars inte fungerar snällt med olika uppstarts- eller installationsmedia."
+msgid "Once you've got the new Debian system configured to your preference, you can migrate your existing user data (if any) to it, and keep on rolling. This is therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a clever way for dealing with hardware that otherwise doesn't play friendly with various boot or installation media."
+msgstr "När du har fått det nya Debian-systemet konfigurerat enligt din smak, kan du migrera din befintliga användardata (om den finns) till det, och fortsätta köra. Det här är alltså en installation av &debian-gnu; <quote>utan nedtid</quote>. Det är också ett klurigt sätt att hantera maskinvara som annars inte fungerar snällt med olika uppstarts- eller installationsmedia."
#. Tag: para
#: random-bits.xml:383
@@ -837,8 +837,8 @@ msgstr "<command>debootstrap</command> kan hämta de nödvändiga filerna direkt
#. Tag: para
#: random-bits.xml:503
#, no-c-format
-msgid "If you have a &releasename; &debian; CD mounted at <filename>/cdrom</filename>, you could substitute a file URL instead of the http URL: <userinput>file:/cdrom/debian/</userinput>"
-msgstr "Om du har en &releasename; &debian; cd monterad på <filename>/cdrom</filename>, kan du ersätta en fil-url istället för en http-URL: <userinput>file:/cdrom/debian/</userinput>"
+msgid "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</filename>, you could substitute a file URL instead of the http URL: <userinput>file:/cdrom/debian/</userinput>"
+msgstr "Om du har en &releasename; &debian-gnu; cd monterad på <filename>/cdrom</filename>, kan du ersätta en fil-url istället för en http-URL: <userinput>file:/cdrom/debian/</userinput>"
#. Tag: para
#: random-bits.xml:509
@@ -1275,8 +1275,8 @@ msgstr "Ställ in starthanteraren"
#. Tag: para
#: random-bits.xml:765
#, no-c-format
-msgid "To make your &debian; system bootable, set up your boot loader to load the installed kernel with your new root partition. Note that <command>debootstrap</command> does not install a boot loader, though you can use <command>aptitude</command> inside your Debian chroot to do so."
-msgstr "För att göra ditt &debian;-system startbart, ställ in din starthanterare att läsa in den installerade kärnan med din nya rotpartition. Observera att <command>debootstrap</command> inte installerar en starthanterare, dock kan du använda <command>aptitude</command> inne i din Debian chroot-miljö för att göra det."
+msgid "To make your &debian-gnu; system bootable, set up your boot loader to load the installed kernel with your new root partition. Note that <command>debootstrap</command> does not install a boot loader, though you can use <command>aptitude</command> inside your Debian chroot to do so."
+msgstr "För att göra ditt &debian-gnu;-system startbart, ställ in din starthanterare att läsa in den installerade kärnan med din nya rotpartition. Observera att <command>debootstrap</command> inte installerar en starthanterare, dock kan du använda <command>aptitude</command> inne i din Debian chroot-miljö för att göra det."
#. Tag: para
#: random-bits.xml:772
@@ -1419,14 +1419,14 @@ msgstr "# aptitude clean"
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "Installera &debian; över Parallel Line IP (PLIP)"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "Installera &debian-gnu; över Parallel Line IP (PLIP)"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
-msgid "This section explains how to install &debian; on a computer without an Ethernet card, but with just a remote gateway computer attached via a Null-Modem cable (also called Null-Printer cable). The gateway computer should be connected to a network that has a Debian mirror on it (e.g. to the Internet)."
-msgstr "Det här avsnittet förklarar hur man installerar &debian; på en dator som saknar ett Ethernet-kort, men med en dator som fjärrgateway ansluten via en nollmodemkabel (kallas även för nollskrivarkabel). Gatewaydatorn bör vara ansluten till ett nätverk som har en Debian-spegel på sig (t.ex. Internet)."
+msgid "This section explains how to install &debian-gnu; on a computer without an Ethernet card, but with just a remote gateway computer attached via a Null-Modem cable (also called Null-Printer cable). The gateway computer should be connected to a network that has a Debian mirror on it (e.g. to the Internet)."
+msgstr "Det här avsnittet förklarar hur man installerar &debian-gnu; på en dator som saknar ett Ethernet-kort, men med en dator som fjärrgateway ansluten via en nollmodemkabel (kallas även för nollskrivarkabel). Gatewaydatorn bör vara ansluten till ett nätverk som har en Debian-spegel på sig (t.ex. Internet)."
#. Tag: para
#: random-bits.xml:885
@@ -1605,8 +1605,8 @@ msgstr "Namnserveradresser: du kan ange samma adresser som används på källan
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "Installera &debian; över PPP over Ethernet (PPPoE)"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "Installera &debian-gnu; över PPP over Ethernet (PPPoE)"
#. Tag: para
#: random-bits.xml:1048
@@ -1838,12 +1838,12 @@ msgstr "För att växla till en annan konsoll behöver du även använda <keycap
#~ "Etch is the first release that includes the graphical installer and uses "
#~ "some relatively new technology. There are a few known issues that you may "
#~ "run into during the installation. We expect to be able to fix these "
-#~ "issues for the next release of &debian;."
+#~ "issues for the next release of &debian-gnu;."
#~ msgstr ""
#~ "Etch är den första utgåvan som inkluderar det grafiska "
#~ "installationsprogrammet och använder en del relativt ny teknik. Det finns "
#~ "ett par kända problem som du kan påträffa under installationen. Vi hoppas "
-#~ "kunna rätta till dessa problem inför nästa utgåva av &debian;."
+#~ "kunna rätta till dessa problem inför nästa utgåva av &debian-gnu;."
#~ msgid ""
#~ "Support for creating encrypted partitions is limited as it is not "
#~ "possible to generate a random encryption key. It is possible to set up an "
diff --git a/po/sv/using-d-i.po b/po/sv/using-d-i.po
index c504819aa..c71aa3fd8 100644
--- a/po/sv/using-d-i.po
+++ b/po/sv/using-d-i.po
@@ -347,8 +347,8 @@ msgstr "base-installer"
#. Tag: para
#: using-d-i.xml:315
#, no-c-format
-msgid "Installs the most basic set of packages which would allow the computer to operate under &debian; when rebooted."
-msgstr "Installerar de mest enkla paketuppsättningar som tillåter datorn att köra &debian; efter omstart."
+msgid "Installs the most basic set of packages which would allow the computer to operate under &debian-gnu; when rebooted."
+msgstr "Installerar de mest enkla paketuppsättningar som tillåter datorn att köra &debian-gnu; efter omstart."
#. Tag: term
#: using-d-i.xml:324
@@ -479,8 +479,8 @@ msgstr "Kontrollera tillgängligt minne / minimalt minnesläge"
#. Tag: para
#: using-d-i.xml:451
#, no-c-format
-msgid "One of the first things &d-i; does, is to check available memory. If the available memory is limited, this component will make some changes in the installation process which hopefully will allow you to install &debian; on your system."
-msgstr "En av de första sakerna som &d-i; gör är att kontrollera tillgängligt minne. Om det tillgängliga minnet är begränsat kommer den här komponenten att göra ändringar i installationsprocessen som förhoppningsvis låter dig installera &debian; på ditt system."
+msgid "One of the first things &d-i; does, is to check available memory. If the available memory is limited, this component will make some changes in the installation process which hopefully will allow you to install &debian-gnu; on your system."
+msgstr "En av de första sakerna som &d-i; gör är att kontrollera tillgängligt minne. Om det tillgängliga minnet är begränsat kommer den här komponenten att göra ändringar i installationsprocessen som förhoppningsvis låter dig installera &debian-gnu; på ditt system."
#. Tag: para
#: using-d-i.xml:458
@@ -1901,8 +1901,8 @@ msgstr "Konfigurera apt"
#. Tag: para
#: using-d-i.xml:2236
#, no-c-format
-msgid "One of the tools used to install packages on a &debian; system is a program called <command>apt-get</command>, from the <classname>apt</classname> package<footnote> <para> Note that the program which actually installs the packages is called <command>dpkg</command>. However, this program is more of a low-level tool. <command>apt-get</command> is a higher-level tool, which will invoke <command>dpkg</command> as appropriate. It knows how to retrieve packages from your CD, the network, or wherever. It is also able to automatically install other packages which are required to make the package you're trying to install work correctly. </para> </footnote>. Other front-ends for package management, like <command>aptitude</command> and <command>synaptic</command>, are also in use. These front-ends are recommended for new users, since they integrate some additional features (package searching and status checks) in a nice user interface. In fact, <command>aptitude</command> is now the recommended utility for package management."
-msgstr "Ett av verktygen som används för att installera paket på ett &debian;-system är ett program som kallas <command>apt-get</command>, från paketet <classname>apt</classname><footnote> <para> Observera att det program som faktiskt installerar paketen kallas för <command>dpkg</command>. Dock är det här programmet mer av ett lågnivåverktyg. <command>apt-get</command> är ett verktyg på högre nivå som anropar <command>dpkg</command> när det behövs. Det vet hur man hämtar paket från din cd, nätverket, eller varifrån. Det har också möjligheten att automatiskt installera andra paket som krävs för att få det paket som du försöker installera att fungera korrekt. </para> </footnote> Andra gränssnitt för pakethantering, såsom <command>aptitude</command> och <command>synaptic</command> används också. Dessa gränssnitt rekommenderas för nybörjare, eftersom de innehåller vissa extrafunktioner (paketsökning och statuskontroller) i ett trevligt användargränssnitt. Faktum är att <command>aptitude</command> numera är det rekommenderade verktyget för pakethantering."
+msgid "One of the tools used to install packages on a &debian-gnu; system is a program called <command>apt-get</command>, from the <classname>apt</classname> package<footnote> <para> Note that the program which actually installs the packages is called <command>dpkg</command>. However, this program is more of a low-level tool. <command>apt-get</command> is a higher-level tool, which will invoke <command>dpkg</command> as appropriate. It knows how to retrieve packages from your CD, the network, or wherever. It is also able to automatically install other packages which are required to make the package you're trying to install work correctly. </para> </footnote>. Other front-ends for package management, like <command>aptitude</command> and <command>synaptic</command>, are also in use. These front-ends are recommended for new users, since they integrate some additional features (package searching and status checks) in a nice user interface. In fact, <command>aptitude</command> is now the recommended utility for package management."
+msgstr "Ett av verktygen som används för att installera paket på ett &debian-gnu;-system är ett program som kallas <command>apt-get</command>, från paketet <classname>apt</classname><footnote> <para> Observera att det program som faktiskt installerar paketen kallas för <command>dpkg</command>. Dock är det här programmet mer av ett lågnivåverktyg. <command>apt-get</command> är ett verktyg på högre nivå som anropar <command>dpkg</command> när det behövs. Det vet hur man hämtar paket från din cd, nätverket, eller varifrån. Det har också möjligheten att automatiskt installera andra paket som krävs för att få det paket som du försöker installera att fungera korrekt. </para> </footnote> Andra gränssnitt för pakethantering, såsom <command>aptitude</command> och <command>synaptic</command> används också. Dessa gränssnitt rekommenderas för nybörjare, eftersom de innehåller vissa extrafunktioner (paketsökning och statuskontroller) i ett trevligt användargränssnitt. Faktum är att <command>aptitude</command> numera är det rekommenderade verktyget för pakethantering."
#. Tag: para
#: using-d-i.xml:2260
@@ -2449,8 +2449,8 @@ msgstr "Installera <command>Yaboot</command> på en hårddisk"
#. Tag: para
#: using-d-i.xml:2946
#, no-c-format
-msgid "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their boot loader. The installer will set up <command>yaboot</command> automatically, so all you need is a small 820k partition named <quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> created back in the partitioning component. If this step completes successfully then your disk should now be bootable and OpenFirmware will be set to boot &debian;."
-msgstr "Nyare (mitten av 1998 och senare) PowerMac använder <command>yaboot</command> som sin starthanterare. Installationsprogrammet kommer att ställa in <command>yaboot</command> automatiskt, så allt du behöver är en liten 820k stor partition med namnet <quote>bootstrap</quote> med typen <emphasis>Apple_Bootstrap</emphasis> skapad tidigare i partitioneringskomponenten. Om det här steget slutförs korrekt ska din disk nu vara startbar och OpenFirmware kommer att vara inställd att starta upp &debian;."
+msgid "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their boot loader. The installer will set up <command>yaboot</command> automatically, so all you need is a small 820k partition named <quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> created back in the partitioning component. If this step completes successfully then your disk should now be bootable and OpenFirmware will be set to boot &debian-gnu;."
+msgstr "Nyare (mitten av 1998 och senare) PowerMac använder <command>yaboot</command> som sin starthanterare. Installationsprogrammet kommer att ställa in <command>yaboot</command> automatiskt, så allt du behöver är en liten 820k stor partition med namnet <quote>bootstrap</quote> med typen <emphasis>Apple_Bootstrap</emphasis> skapad tidigare i partitioneringskomponenten. Om det här steget slutförs korrekt ska din disk nu vara startbar och OpenFirmware kommer att vara inställd att starta upp &debian-gnu;."
#. Tag: title
#: using-d-i.xml:2964
@@ -2557,8 +2557,8 @@ msgstr "Du kommer att bli uppmanad att mata ut uppstartsmediumet (cd-skiva, disk
#. Tag: para
#: using-d-i.xml:3109
#, no-c-format
-msgid "After a final prompt the system will be halted because rebooting is not supported on &arch-title;. You then need to IPL &debian; from the DASD which you selected for the root filesystem during the first steps of the installation."
-msgstr "Efter den sista prompten kommer systemet att stängas av på grund av att omstarter inte stöds på &arch-title;. Du behöver sedan köra en IPL för &debian; från den DASD som du valde för rotfilsystemet under de första stegen av installationen."
+msgid "After a final prompt the system will be halted because rebooting is not supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which you selected for the root filesystem during the first steps of the installation."
+msgstr "Efter den sista prompten kommer systemet att stängas av på grund av att omstarter inte stöds på &arch-title;. Du behöver sedan köra en IPL för &debian-gnu; från den DASD som du valde för rotfilsystemet under de första stegen av installationen."
#. Tag: title
#: using-d-i.xml:3122
diff --git a/po/sv/welcome.po b/po/sv/welcome.po
index addf60e7a..285d10761 100644
--- a/po/sv/welcome.po
+++ b/po/sv/welcome.po
@@ -24,12 +24,12 @@ msgstr "Välkommen till Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"Det här kapitlet ger en överblick av Debian-projektet och &debian;. Om du "
-"redan känner till historien bakom Debian-projektet och &debian;-utgåvan kan "
+"Det här kapitlet ger en överblick av Debian-projektet och &debian-gnu;. Om du "
+"redan känner till historien bakom Debian-projektet och &debian-gnu;-utgåvan kan "
"du hoppa till nästa kapitel."
#. Tag: title
@@ -567,13 +567,13 @@ msgstr "Få tag på Debian"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"För information om hur man hämtar &debian; från Internet eller från var man "
+"För information om hur man hämtar &debian-gnu; från Internet eller från var man "
"kan köpa officiella Debian cd-skivor, se webbsidan <ulink url=\"&url-debian-"
"distrib;\">Få tag på Debian</ulink>. Webbsidan <ulink url=\"&url-debian-"
"mirrors;\">Hämta Debian från Internet</ulink> innehåller en full lista av "
@@ -603,13 +603,13 @@ msgstr "Få tag på senaste versionen av det här dokumentet"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"Det här dokumentet är under konstant omarbetning. Se på webbsidorna för "
"<ulink url=\"&url-release-area;\"> Debian &release;</ulink> efter den "
-"absolut senaste information om &release;-utgåvan av &debian;-systemet. "
+"absolut senaste information om &release;-utgåvan av &debian-gnu;-systemet. "
"Uppdaterade versioner av den här installationshandboken finns också "
"tillgängliga från <ulink url=\"&url-install-manual;\">officiella "
"installationshandboken</ulink>."
@@ -654,12 +654,12 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"I allmänhet är handboken uppbyggd i en linjär form som tar dig genom "
"installationsprocessen från början till slut. Här är stegen som krävs för "
-"att installera &debian; och avsnitten i det här dokumentet som motsvarar "
+"att installera &debian-gnu; och avsnitten i det här dokumentet som motsvarar "
"varje steg:"
#. Tag: para
@@ -810,7 +810,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -821,7 +821,7 @@ msgstr ""
"kommersiella programvaror &mdash; de säger normalt sett att du bara kan "
"använda en kopia av programvaran på en enda dator. Licensen för det här "
"systemet är inte alls som sådan. Vi uppmuntrar dig att lägga en kopia av "
-"&debian; på varje dator i din skola eller arbetsplats. Låna ut ditt "
+"&debian-gnu; på varje dator i din skola eller arbetsplats. Låna ut ditt "
"installationsmedium till dina vänner och hjälp dem att installera det på "
"deras datorer! Du kan även göra tusentals kopior och <emphasis>sälja</"
"emphasis> dem &mdash; dock med några få restriktioner. Din frihet att "
diff --git a/po/tl/bookinfo.po b/po/tl/bookinfo.po
index ee998b35a..d15298219 100644
--- a/po/tl/bookinfo.po
+++ b/po/tl/bookinfo.po
@@ -19,20 +19,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "Patnubay sa Pagluklok ng &debian;"
+msgid "&debian-gnu; Installation Guide"
+msgstr "Patnubay sa Pagluklok ng &debian-gnu;"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Nilalaman nito ang mga bilin sa pagluklok ng sistemang &debian; &release;, "
+"Nilalaman nito ang mga bilin sa pagluklok ng sistemang &debian-gnu; &release;, "
"para sa arkitekturang &arch-title; (<quote>&architecture;</quote>). "
"Nilalaman din nito ang ilang mga pahiwatig tungo sa karagdagang impormasyon "
"at impormasyon kung paano magamit ng husto ang inyong bagong sistemang "
diff --git a/po/tl/preface.po b/po/tl/preface.po
index bde5a0b93..4f0c49ec7 100644
--- a/po/tl/preface.po
+++ b/po/tl/preface.po
@@ -25,22 +25,22 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "Ang pagluklok ng &debian; &release; para sa &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "Ang pagluklok ng &debian-gnu; &release; para sa &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Nagagalak kami na nagpasiya kayong subukan ang Debian, at tiyak na "
"matatagpuan niyo na ang pamudmod na GNU/&arch-kernel; ng Debian ay kakaiba at "
-"natatangi. Pinagsasama-sama ng &debian; ang de kalidad na malayang software "
+"natatangi. Pinagsasama-sama ng &debian-gnu; ang de kalidad na malayang software "
"mula sa iba't ibang dako ng daigdig at pinag-iisa sa magkaugnay na kabuuan. "
"Naniniwala kami na matatagpuan niyo na ang bunga ay siya ngang higit pa sa "
"paglagom ng mga bahagi."
diff --git a/po/tl/welcome.po b/po/tl/welcome.po
index 48153ad03..5ce6097dd 100644
--- a/po/tl/welcome.po
+++ b/po/tl/welcome.po
@@ -26,13 +26,13 @@ msgstr "Maligayang pagdating sa Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"Nagbibigay ng malawakang tanaw ng Gawaing Debian at ng &debian; ang "
+"Nagbibigay ng malawakang tanaw ng Gawaing Debian at ng &debian-gnu; ang "
"kabanatang ito. Kung alam na ninyo ang kasaysayan ng Gawaing Debian at "
-"tungkol sa pamudmod na &debian;, maaari kayong sumulong sa susunod na "
+"tungkol sa pamudmod na &debian-gnu;, maaari kayong sumulong sa susunod na "
"kabanata."
#. Tag: title
@@ -322,7 +322,7 @@ msgstr ""
#. Tag: title
#: welcome.xml:231
#, no-c-format
-msgid "What is &debian;?"
+msgid "What is &debian-gnu;?"
msgstr ""
#. Tag: para
@@ -331,7 +331,7 @@ msgstr ""
msgid ""
"The combination of Debian's philosophy and methodology and the GNU tools, "
"the Linux kernel, and other important free software, form a unique software "
-"distribution called &debian;. This distribution is made up of a large number "
+"distribution called &debian-gnu;. This distribution is made up of a large number "
"of software <emphasis>packages</emphasis>. Each package in the distribution "
"contains executables, scripts, documentation, and configuration information, "
"and has a <emphasis>maintainer</emphasis> who is primarily responsible for "
@@ -411,7 +411,7 @@ msgstr ""
#: welcome.xml:295
#, no-c-format
msgid ""
-"The primary, and best, method of getting support for your &debian; system "
+"The primary, and best, method of getting support for your &debian-gnu; system "
"and communicating with Debian Developers is through the many mailing lists "
"maintained by the Debian Project (there are more than &num-of-debian-"
"maillists; at this writing). The easiest way to subscribe to one or more of "
@@ -457,7 +457,7 @@ msgstr ""
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
@@ -485,7 +485,7 @@ msgstr ""
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
@@ -522,7 +522,7 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
@@ -649,7 +649,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
diff --git a/po/vi/bookinfo.po b/po/vi/bookinfo.po
index 674fd30aa..36feb4441 100644
--- a/po/vi/bookinfo.po
+++ b/po/vi/bookinfo.po
@@ -19,20 +19,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "Hướng Dẫn Cài Đặt &debian;"
+msgid "&debian-gnu; Installation Guide"
+msgstr "Hướng Dẫn Cài Đặt &debian-gnu;"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"Tài liệu này chứa hướng dẫn cài đặt hệ thống &debian; &release; (tên mã là "
+"Tài liệu này chứa hướng dẫn cài đặt hệ thống &debian-gnu; &release; (tên mã là "
"<quote>&releasename;</quote>) vào kiến trúc &arch-title; "
"(<quote>&architecture;</quote>). Nó cũng chứa lời trỏ đến thông tin thêm, "
"cũng đến thông tin về cách sử dụng hệ thống Debian mới một cách hữu hiệu "
diff --git a/po/vi/boot-installer.po b/po/vi/boot-installer.po
index 22b30387a..a64e389a2 100644
--- a/po/vi/boot-installer.po
+++ b/po/vi/boot-installer.po
@@ -543,10 +543,10 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
"Một khi khởi chạy chương trình đó, vài câu mở đầu sẽ được hỏi để chuẩn bị hệ "
-"thống để khởi chạy tiến trình cài đặt &debian;."
+"thống để khởi chạy tiến trình cài đặt &debian-gnu;."
#. Tag: title
#: boot-installer.xml:496
diff --git a/po/vi/boot-new.po b/po/vi/boot-new.po
index 37a3256f9..9780418b9 100644
--- a/po/vi/boot-new.po
+++ b/po/vi/boot-new.po
@@ -194,13 +194,13 @@ msgstr "PowerMac kiểu mới"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"Trên máy tính (PowerMac, iMac, eMac) và máy tính xách tay (PowerBook, iBook) "
"có bộ xử lý kiểu G4, bạn có thể nhấn giữ phím <keycap>option</keycap> để xem "
"màn hình đồ họa có một cái nút dành cho mỗi hệ điều hành khởi động được: "
-"&debian; sẽ là cái nút có hình chím cụt nhỏ."
+"&debian-gnu; sẽ là cái nút có hình chím cụt nhỏ."
#. Tag: para
#: boot-new.xml:104
@@ -233,16 +233,16 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
"Việc lập lại OpenFirmware trên phần cứng kiểu G3 hay G4 sẽ gây ra nó khởi "
-"động &debian; theo mặc định (nếu bạn đã phân vùng và định vị phân vùng "
-"<filename>Apple_Bootstrap</filename> cho đúng trước đó). Nếu bạn có &debian; "
+"động &debian-gnu; theo mặc định (nếu bạn đã phân vùng và định vị phân vùng "
+"<filename>Apple_Bootstrap</filename> cho đúng trước đó). Nếu bạn có &debian-gnu; "
"nằm trên một đĩa kiểu SCSI còn có MacOS nằm trên một đĩa kiểu IDE, việc này "
"có lẽ sẽ không hoạt động được, vậy bạn sẽ cần phải vào OpenFirmware để lập "
"biến <envar>boot-device</envar> (thiết bị khởi động); lệnh <command>ybin</"
@@ -252,13 +252,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"Sau khi bạn khởi động &debian; lần đầu tiên, bạn có khả năng thêm bất cứ tùy "
+"Sau khi bạn khởi động &debian-gnu; lần đầu tiên, bạn có khả năng thêm bất cứ tùy "
"chọn thêm nào bạn muốn (v.d. tùy chọn khởi động đôi) vào tập tin cấu hình "
"<filename>/etc/yaboot.conf</filename>, rồi chạy lệnh <command>ybin</command> "
"để cập nhật phân vùng khởi động với cấu hình đã thay đổi. Xem tài liệu Cách "
diff --git a/po/vi/hardware.po b/po/vi/hardware.po
index 5ad48c9b1..1d67a72c6 100644
--- a/po/vi/hardware.po
+++ b/po/vi/hardware.po
@@ -48,7 +48,7 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"Debian không yêu cầu phần cứng đặc biệt khác với điều cần thiết cho hạt nhân "
"Linux và các bộ công cụ GNU. Vì vậy, bất kỳ kiến trúc hay nền tảng nào sang "
@@ -56,7 +56,7 @@ msgstr ""
"đã được chuyển, cũng cho đó có bản chuyển Debian, có khả năng chạy được hệ "
"thống Debian. Xem những trang <emphasis>Bản Chuyển</emphasis> (Ports) tại "
"<ulink url=\"&url-ports;\"></ulink> để tìm thông tin thêm về hệ thống kiến "
-"trúc &arch-title; đã được thử ra với &debian;."
+"trúc &arch-title; đã được thử ra với &debian-gnu;."
#. Tag: para
#: hardware.xml:32
@@ -478,7 +478,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -487,7 +487,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"Đây là bản phát hành &debian; chính thức thứ nhất cho kiến trúc kiểu &arch-"
+"Đây là bản phát hành &debian-gnu; chính thức thứ nhất cho kiến trúc kiểu &arch-"
"title;. Chúng tôi xem là nó đủ hữu hiệu để được phát hành. Tuy nhiên, vì nó "
"chưa được thử ra hoàn toàn như một số kiến trúc khác, bạn có thể gặp vài "
"lỗi. Xin hãy sử dụng <ulink url=\"&url-bts;\">Hệ thống theo dõi lỗi</ulink> "
@@ -904,10 +904,10 @@ msgstr "Máy Cobalt dùng 115200 bps."
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"Trong &debian; &release;, chỉ hỗ trợ hai kiến trúc con PMac (Power-Macintosh "
+"Trong &debian-gnu; &release;, chỉ hỗ trợ hai kiến trúc con PMac (Power-Macintosh "
"hay PowerMac) và PreP."
#. Tag: title
@@ -2042,11 +2042,11 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
"NIC không dây mà không phải được hỗ trợ bởi hạt nhân &arch-kernel; chính thức vẫn "
-"còn có thể được làm cho hoạt động dưới &debian;, nhưng không phải được hỗ "
+"còn có thể được làm cho hoạt động dưới &debian-gnu;, nhưng không phải được hỗ "
"trợ trong khi cài đặt."
#. Tag: para
@@ -2066,14 +2066,14 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
"(after the reboot) and configure your network manually."
msgstr ""
"Nếu bạn gặp vấn đề sử dụng chức năng chạy mạng không dây và không có NIC "
-"khác nào có thể dùng trong khi cài đặt, vẫn còn có thể cài đặt &debian; dùng "
+"khác nào có thể dùng trong khi cài đặt, vẫn còn có thể cài đặt &debian-gnu; dùng "
"một ảnh đĩa CD/DVD đầy đủ. Hãy bật tuỳ chọn để không cấu hình một mạng, và "
"cài đặt dùng chỉ những gói sẵn sàng trên đĩa CD/DVD. Sau đó thì bạn có thể "
"cài đặt trình điều khiển và phần vững yêu cầu sau khi cài đặt xong (sau khi "
@@ -2198,7 +2198,7 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"Khả năng hỗ trợ thiết bị thiết bị chữ nổi phụ thuộc vào chương trình "
@@ -2206,7 +2206,7 @@ msgstr ""
"hoạt động được với <classname>brltty</classname>, khi được kết nối qua một "
"cổng nối tiếp, USB hay Bluetooth. Chi tiết về những thiết bị chữ nổi được hỗ "
"trợ có thể được tìm trên trang Web của <ulink url=\"&url-brltty;"
-"\"><classname>brltty</classname></ulink>. &debian; &release; có sẵn "
+"\"><classname>brltty</classname></ulink>. &debian-gnu; &release; có sẵn "
"<classname>brltty</classname> phiên bản &brlttyver;."
#. Tag: title
@@ -2225,7 +2225,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"Khả năng hỗ trợ thiết bị phần cứng tổng hợp giọng nói thì phụ thuộc vào "
@@ -2234,7 +2234,7 @@ msgstr ""
"nối tiếp (không có bộ điều hợp kiểu USB hay nối-tiếp-đến-USB nào được hỗ "
"trợ). Chi tiết về những thiết bị phần cứng tổng hợp giọng nói được hỗ trợ có "
"thể được tìm trên trang Web của <ulink url=\"&url-speakup;"
-"\"><classname>speakup</classname></ulink>. &debian; &release; có sẵn "
+"\"><classname>speakup</classname></ulink>. &debian-gnu; &release; có sẵn "
"<classname>speakup</classname> phiên bản &speakupver;."
#. Tag: title
@@ -2327,16 +2327,16 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
"Trong hậu hết các trường hợp, phần cững khác tự do tùy theo những tiêu chuẩn "
-"được Dự án &debian; dùng thì không thể được bao gồm trong bản phát hành "
+"được Dự án &debian-gnu; dùng thì không thể được bao gồm trong bản phát hành "
"chính hoặc trong hệ thống cài đặt. Nếu trình điều khiển thiết bị chính nó "
-"được bao gồm tong bản phát hành, và nếu &debian; có quyền hợp pháp để phát "
+"được bao gồm tong bản phát hành, và nếu &debian-gnu; có quyền hợp pháp để phát "
"hành phần vững đó, nó thường sẵn sàng dưới dạng một gói riêng từ phần khác "
"tự do (non-free) của kho gói."
@@ -2345,14 +2345,14 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
"Tuy nhiên, không có nghĩa là phần cứng như vậy không thể được dùng trong khi "
-"cài đặt. Kể từ &debian; 5.0, &d-i; hỗ trợ chức năng nạp tập tin phần vững "
+"cài đặt. Kể từ &debian-gnu; 5.0, &d-i; hỗ trợ chức năng nạp tập tin phần vững "
"hay gọi chứa phần vững từ một vật chứa rời, như một đĩa mềm hay thanh USB. "
"Xem <xref linkend=\"loading-firmware\"/> để tìm thông tin chi tiết về phương "
"pháp nạp tập tin hay gói kiểu phần vững trong khi cài đặt."
@@ -2781,13 +2781,13 @@ msgstr "Hệ thống Un*x hay GNU"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
"Nếu bạn chạy một hệ thống kiểu Unix khác, bạn có thể sử dụng nó để cài đặt "
-"&debian;, không cần dùng &d-i; được diễn tả trong phần còn lại của sổ tay "
+"&debian-gnu;, không cần dùng &d-i; được diễn tả trong phần còn lại của sổ tay "
"này. Tiến trình cài đặt kiểu này có thể hữu ích cho người dùng có phần cứng "
"không được hỗ trợ bằng cách khác, hoặc trên máy phải cứ chạy. Nếu bạn quan "
"tâm đến kỹ thuật này, hãy nhảy tới <xref linkend=\"linux-upgrade\"/>."
@@ -3956,21 +3956,21 @@ msgstr ""
#~ msgid ""
#~ "If there is no other NIC you can use during the installation, it is still "
-#~ "possible to install &debian; using a full CD-ROM or DVD image. Select the "
+#~ "possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the "
#~ "option to not configure a network and install using only the packages "
#~ "available from the CD/DVD. You can then install the driver and firmware "
#~ "you need after the installation is completed (after the reboot) and "
#~ "configure your network manually. Note that the firmware may be packaged "
#~ "separately from the driver and may not be available in the <quote>main</"
-#~ "quote> section of the &debian; archive."
+#~ "quote> section of the &debian-gnu; archive."
#~ msgstr ""
#~ "Nếu không có NIC khác nào dùng được trong khi cài đặt, vẫn còn có thể cài "
-#~ "đặt &debian; bằng ảnh đĩa CD-ROM hay DVD. Hãy chọn tùy chọn không cấu "
+#~ "đặt &debian-gnu; bằng ảnh đĩa CD-ROM hay DVD. Hãy chọn tùy chọn không cấu "
#~ "hình mạng, và cài đặt chỉ những gói có sẵn trên đĩa CD/DVD. Sau khi cài "
#~ "đặt xong và khởi động lại, bạn cũng có thể cài đặt trình điều khiển và "
#~ "phần vững cần thiết và tự cấu hình mạng. Ghi chú rằng phần vững có thể "
#~ "nằm trong gói riêng với trình điều khiển và có lẽ không có sẵn trong phần "
-#~ "<quote>chính</quote> của kho lưu &debian;."
+#~ "<quote>chính</quote> của kho lưu &debian-gnu;."
#~ msgid ""
#~ "If the driver itself <emphasis>is</emphasis> supported, you may also be "
diff --git a/po/vi/install-methods.po b/po/vi/install-methods.po
index 5f04d375c..0b883e63e 100644
--- a/po/vi/install-methods.po
+++ b/po/vi/install-methods.po
@@ -25,14 +25,14 @@ msgstr "Lấy vật chứa cài đặt hệ thống"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "Bộ đĩa CD &debian; chính thức"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "Bộ đĩa CD &debian-gnu; chính thức"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -45,7 +45,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"Phương pháp dễ nhất cài đặt &debian; là sử dụng một bộ đĩa CD-ROM Debian "
+"Phương pháp dễ nhất cài đặt &debian-gnu; là sử dụng một bộ đĩa CD-ROM Debian "
"chính thức. Bạn có thể mua bộ đĩa như thế từ nhà bán (xem <ulink url=\"&url-"
"debian-cd-vendors;\">trang nhà bán đĩa CD</ulink>). Cũng có khả năng tải các "
"ảnh đĩa CD-ROM xuống một máy nhân bản Debian, tạo bộ đĩa CD cài đặt của "
@@ -614,11 +614,11 @@ msgstr "Ghi ảnh đĩa bằng <command>Disk Copy</command>"
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
-"Nếu bạn đang tạo ảnh đĩa mềm từ các tập tin đã có trên đĩa CD &debian; chính "
+"Nếu bạn đang tạo ảnh đĩa mềm từ các tập tin đã có trên đĩa CD &debian-gnu; chính "
"thức, trong trường hợp đó cả hai tài sản Type (kiểu) và Creator (bộ tạo) đã "
"được đặt cho đúng. Chỉ cần thiết theo những bước <command>Creator-Changer</"
"command> (thay đổi bộ tạo) này nếu bạn đã tải các tập tin ảnh xuống một máy "
@@ -1718,12 +1718,12 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
msgstr ""
-"Đối vơi một trình phục vụ &debian;, chúng tôi khuyến khích <classname>tftpd-"
+"Đối vơi một trình phục vụ &debian-gnu;, chúng tôi khuyến khích <classname>tftpd-"
"hpa</classname>. Nó được tạo bởi cùng một tác giả với bộ nạp khởi động "
"<classname>syslinux</classname> thì ít nhất có thể gây ra vấn đề. Một sự "
"chọn tốt khác là <classname>atftpd</classname>."
@@ -1788,13 +1788,13 @@ msgstr "Thiết lập trình phục vụ DHCP"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
"Một trình phục vụ DHCP phần mềm tự do là <command>dhcpd</command> ISC. Đối "
-"với &debian;, gói <classname>dhcp3-server</classname> khuyến khích. Đây là "
+"với &debian-gnu;, gói <classname>dhcp3-server</classname> khuyến khích. Đây là "
"một tập tin cấu hình mẫu cho nó (xem <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
@@ -1976,13 +1976,13 @@ msgstr "Thiết lập trình phục vụ BOOTP"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"Có hai trình phục vụ BOOTP sẵn sàng cho GNU/Linux. Trình thứ nhất là "
"<command>bootpd</command> CMU. Trình thứ hai thật là một trình phục vụ DHCP: "
-"<command>dhcpd</command> ISC. Trong &debian; hai trình này nằm trong "
+"<command>dhcpd</command> ISC. Trong &debian-gnu; hai trình này nằm trong "
"gói<classname>bootp</classname> và <classname>dhcp3-server</classname> riêng "
"từng cái."
@@ -1991,7 +1991,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -2022,7 +2022,7 @@ msgid ""
msgstr ""
"Để sử dụng <command>bootpd</command> CMU, trước tiên bạn cần phải bỏ ghi chú "
"(hay thêm) dòng tương ứng trong trong tập tin cấu hình <filename>/etc/inetd."
-"conf</filename>. Dưới hệ điều hành &debian;, bạn có khả năng chạy lệnh "
+"conf</filename>. Dưới hệ điều hành &debian-gnu;, bạn có khả năng chạy lệnh "
"<userinput>update-inetd --enable bootps</userinput>, rồi <userinput>/etc/"
"init.d/inetd reload</userinput> để làm như thế. Trong trường hợp trình phục "
"vụ BOOTP của bạn không chạy Debian được, dòng đó nên hình như: "
@@ -2114,14 +2114,14 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
"configuration examples in this section accordingly."
msgstr ""
"Trong quá khứ, máy phục vụ TFTP đã dùng <filename>/tftpboot</filename> như "
-"là thư mục từ đó cần phục vụ ảnh. Tuy nhiên, các gói &debian; có thể sử dụng "
+"là thư mục từ đó cần phục vụ ảnh. Tuy nhiên, các gói &debian-gnu; có thể sử dụng "
"thư mục khác để tuân theo <ulink url=\"&url-fhs-home;\">Tiêu Chuẩn Phân Cấp "
"Hệ Thống Tập Tin</ulink> (FHS). Chẳng hạn, <classname>tftpd-hpa</classname> "
"theo mặc định sử dụng thư mục <filename>/var/lib/tftpboot</filename>. Có lẽ "
@@ -2393,13 +2393,13 @@ msgstr ""
#~ msgid ""
#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "a &debian-gnu; server, the <classname>atftpd</classname> and <classname>tftpd-"
#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
#~ "classname>."
#~ msgstr ""
#~ "Để sử dụng phương pháp khởi động TFTP của môi trường thực hiện tiền khởi "
#~ "động (PXE), bạn cần có sẵn sàng trình phục vụ TFTP có hỗ trợ khả năng "
-#~ "<userinput>tsize</userinput>. Trên máy phục vụ &debian;, hai "
+#~ "<userinput>tsize</userinput>. Trên máy phục vụ &debian-gnu;, hai "
#~ "gói<classname>atftpd</classname> và <classname>tftpd-hpa</classname> là "
#~ "thích hợp: khuyên bạn dùng <classname>tftpd-hpa</classname>."
diff --git a/po/vi/installation-howto.po b/po/vi/installation-howto.po
index 0c605cc0b..44e95db38 100644
--- a/po/vi/installation-howto.po
+++ b/po/vi/installation-howto.po
@@ -26,14 +26,14 @@ msgstr "Cài đặt thế nào"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
"useful, we will link to more detailed explanations in other parts of this "
"document."
msgstr ""
-"Tài liệu này diễn tả cách cài đặt &debian; &releasename; dành cho &arch-"
+"Tài liệu này diễn tả cách cài đặt &debian-gnu; &releasename; dành cho &arch-"
"title; (kiến trúc <quote>&architecture;</quote>) bằng &d-i; mới. Nó là sự "
"giải thích nhanh của tiến trình cài đặt mà nên chứa tất cả thông tin cần "
"thiết để cài đặt trong phần lớn trường hợp. Khi thông tin thêm có thể là hữu "
diff --git a/po/vi/partitioning.po b/po/vi/partitioning.po
index 136b23d69..9fdcd9d98 100644
--- a/po/vi/partitioning.po
+++ b/po/vi/partitioning.po
@@ -123,13 +123,13 @@ msgstr "Cây thư mục"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"&debian; tùy theo <ulink url=\"&url-fhs-home;\">Tiêu Chuẩn Phân Cấp Hệ Thống "
+"&debian-gnu; tùy theo <ulink url=\"&url-fhs-home;\">Tiêu Chuẩn Phân Cấp Hệ Thống "
"Tập Tin</ulink> khi đặt tên của tập tin và thư mục. Tiêu chuẩn này cho người "
"dùng và chương trình phần mềm có khả năng dự đoán vị trí của tập tin và thư "
"mục. Thư mục cấp gốc được đại diện đơn giản bằng dấu xuyệc <filename>/</"
@@ -1126,14 +1126,14 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"Linux hạn chế số phân vùng trên mỗi đĩa thành 15 phân vùng trên đĩa kiểu "
"SCSI (3 phân vùng chính có thể dùng, 12 phân vùng hợp lý) và 63 phân vùng "
"trên đĩa IDE (3 phân vùng chính có thể dùng, 60 phân vùng hợp lý). Tuy "
-"nhiên, hệ thống &debian; chuẩn cung cấp chỉ 20 thiết bị cho phân vùng, vì "
+"nhiên, hệ thống &debian-gnu; chuẩn cung cấp chỉ 20 thiết bị cho phân vùng, vì "
"vậy bạn không thể cài đặt trên hơn 20 phân vùng nếu bạn chưa tự tạo một "
"thiết bị dành cho mỗi phân vùng đó."
@@ -1500,7 +1500,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1509,7 +1509,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"Cốt để phần vững OpenFirmware khởi động tự động &debian;, phân vùng tải và "
+"Cốt để phần vững OpenFirmware khởi động tự động &debian-gnu;, phân vùng tải và "
"khởi động hệ điều hành nên nằm trước các phân vùng khởi động khác trên đĩa, "
"nhất là phân vùng khởi động kiểu MacOS. Phân vùng tải và khởi động hệ điều "
"hành nên là phân vùng thứ nhất bạn tạo. Tuy nhiên nếu bạn thêm một phân vùng "
diff --git a/po/vi/post-install.po b/po/vi/post-install.po
index 6f3d56fbc..7891c4e76 100644
--- a/po/vi/post-install.po
+++ b/po/vi/post-install.po
@@ -32,16 +32,16 @@ msgstr "Tắt hệ thống"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"Để tắt hệ thống &debian; đang chạy, bạn <emphasis>không</emphasis> nên khởi "
+"Để tắt hệ thống &debian-gnu; đang chạy, bạn <emphasis>không</emphasis> nên khởi "
"động lại bằng cái nút đặt lại trên mặt hoặc về sau máy tính, hoặc đơn giản "
-"tắt điện. Hệ thống &debian; nên được tắt bằng cách được điều khiển, không thì "
+"tắt điện. Hệ thống &debian-gnu; nên được tắt bằng cách được điều khiển, không thì "
"tập tin có thể bị mất và/hoặc đĩa bị hỏng. Nếu bạn chạy môi trường ở trên (v."
"d. GNOME, KDE, Xfce), thường có tùy chọn <quote>Đăng xuất</quote> nằm trong "
"trình đơn ứng dụng mà cho bạn có khả năng tắt (hoặc khởi động lại) hệ thống."
@@ -455,7 +455,7 @@ msgstr "Cấu hình thư điện tử mặc định"
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
"that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
@@ -463,7 +463,7 @@ msgid ""
msgstr ""
"Thậm chí nếu bạn định sử dụng chương trình thư điện tử đồ họa, quan trọng là "
"một MTA/MDA truyền thống cũng được cài đặt và thiết lập đúng trên hệ thống "
-"&debian;. Lý do là những tiện ích khác nhau chạy trên hệ thống<footnote> <para> "
+"&debian-gnu;. Lý do là những tiện ích khác nhau chạy trên hệ thống<footnote> <para> "
"Chẳng hạn, <command>cron</command>, <command>quota</command>, "
"<command>logcheck</command>, <command>aide</command>, &hellip; </para> </"
"footnote>cũng có khả năng gửi thông báo quan trọng qua thư điện tử, để báo "
diff --git a/po/vi/preface.po b/po/vi/preface.po
index ff9f8ce82..f7c60a3d8 100644
--- a/po/vi/preface.po
+++ b/po/vi/preface.po
@@ -19,22 +19,22 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "Cài đặt &release; &debian; trên &architecture;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "Cài đặt &release; &debian-gnu; trên &architecture;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"Chúng tôi rất vui thích thấy biết rằng bạn chọn thử sử dụng Debian; chúng "
"tôi chắc chắn là bạn sẽ tìm thấy bản phát hành GNU/&arch-kernel; của Debian là độc "
-"nhất. &debian; tập hợp phần mềm có chất lượng cao từ trên khắp thế giới, hợp "
+"nhất. &debian-gnu; tập hợp phần mềm có chất lượng cao từ trên khắp thế giới, hợp "
"nhất nó vào một toàn bộ mạch lạc. Chúng tôi cho rằng bạn sẽ tìm biết kết quả "
"này thật sự là lớn hơn tổng các phần."
diff --git a/po/vi/preparing.po b/po/vi/preparing.po
index 9976fe823..f7e8a983b 100644
--- a/po/vi/preparing.po
+++ b/po/vi/preparing.po
@@ -19,8 +19,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "Trước khi cài đặt &debian;"
+msgid "Before Installing &debian-gnu;"
+msgstr "Trước khi cài đặt &debian-gnu;"
#. Tag: para
#: preparing.xml:6
@@ -70,7 +70,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -80,7 +80,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"Dưới &debian;, rất có thể là hệ điều hành có thể được sửa chữa, thay vào bị "
+"Dưới &debian-gnu;, rất có thể là hệ điều hành có thể được sửa chữa, thay vào bị "
"thay thế, trong trường hợp gặp gì sai. Tiến trình nâng cấp không bao giờ cần "
"thiết bạn cài đặt lại hoàn toàn: bạn luôn luôn có khả năng nâng cấp « tại chỗ "
"». Hơn nữa, hậu hết chương trình luôn luôn tương thích với mỗi bản phát hành "
@@ -204,11 +204,11 @@ msgstr ""
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
"Cài đặt một <firstterm>bộ nạp khởi động</firstterm> có khả năng khởi chạy "
-"&debian; và/hay hệ thống đã có."
+"&debian-gnu; và/hay hệ thống đã có."
#. Tag: para
#: preparing.xml:134
@@ -284,7 +284,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"Một tùy chọn quan trọng trong khi cài đặt là có nên cài đặt môi trường làm "
@@ -292,7 +292,7 @@ msgstr ""
"họa có sẵn. Không cài đặt công việc <quote>Môi trường làm việc</quote> thì "
"chỉ có hệ thống cơ bản được điều khiển bằng dòng lệnh. Việc cài đặt công "
"việc Môi trường làm việc là tùy chọn, vì nó chiếm vùng hơi lớn trên đĩa, và "
-"vì nhiều hệ thống &debian; là máy phục vụ không thật cần chạy giao diện "
+"vì nhiều hệ thống &debian-gnu; là máy phục vụ không thật cần chạy giao diện "
"người dùng đồ họa (GUI) để hoạt động."
#. Tag: para
@@ -322,7 +322,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -332,7 +332,7 @@ msgstr ""
"Trước hết, hãy kiểm tra xem bạn đã sao lưu mọi tập tin hiện thời nằm trên hệ "
"thống. Nếu đây là lần đầu tiên hệ điều hành nào không sở hữu đã được cài đặt "
"vào máy tính đó, rất có thể là bạn sẽ cần phải phân vùng lại đĩa cứng để "
-"nhường chỗ cho hệ thống &debian;. Mỗi lần phân vùng đĩa cứng, cũng rủi ro "
+"nhường chỗ cho hệ thống &debian-gnu;. Mỗi lần phân vùng đĩa cứng, cũng rủi ro "
"mất toàn bộ dữ liệu, bất chấp chương trình nào được dùng để làm như thế. "
"Những chương trình được dùng trong tiến trình cài đặt này là hơi tin cậy, "
"phần lớn chúng đã được dùng trong mấy năm, nhưng mà chúng cũng là hơi mạnh "
@@ -1144,7 +1144,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1154,7 +1154,7 @@ msgid ""
"least 200MB for <filename>/var</filename>, and a lot more if you install a "
"graphical desktop environment."
msgstr ""
-"Sức chứa trên đĩa cần thiết để thao tác mịn hệ thống &debian; chính nó cũng "
+"Sức chứa trên đĩa cần thiết để thao tác mịn hệ thống &debian-gnu; chính nó cũng "
"được tính trong những số lượng khuyến dự này. Chẳng hạn, phân vùng "
"<filename>/var</filename> chứa rất nhiều thông tin về tình trạng đặc trưng "
"cho Debian, thêm vào nội dung chuẩn như các tập tin ghi lưu. Các tập tin "
@@ -1276,7 +1276,7 @@ msgstr ""
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1288,7 +1288,7 @@ msgid ""
"installation tapes or CDs."
msgstr ""
"Còn nếu máy tính của bạn chỉ có một đĩa cứng, và bạn muốn thay thế hoàn toàn "
-"hệ điều hành đã tồn tại bằng &debian;, bạn cũng có thể đợi phân vùng nó làm "
+"hệ điều hành đã tồn tại bằng &debian-gnu;, bạn cũng có thể đợi phân vùng nó làm "
"phần của tiến trình cài đặt (<xref linkend=\"di-partition\"/>), sau khi bạn "
"đã khởi động hệ thống cài đặt. Tuy nhiên, thủ tục này chỉ có tác động nếu "
"bạn định khởi động hệ thống cài đặt từ băng, đĩa CD-ROM hay các tập tin nằm "
@@ -1339,7 +1339,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1347,7 +1347,7 @@ msgstr ""
"trước khi khởi chạy tiến trình cài đặt, để tạo sức chứa có khả năng phân "
"vùng dành cho Debian. Nếu một số phân vùng sẽ bị hệ điều hành khác sở hữu, "
"bạn nên tạo các phân vùng riêng đó bằng chương trình phân vùng của HĐH đó. "
-"Khuyên bạn <emphasis>không</emphasis> cố gắng tạo phân vùng cho &debian; "
+"Khuyên bạn <emphasis>không</emphasis> cố gắng tạo phân vùng cho &debian-gnu; "
"bằng công cụ của HĐH khác: chỉ tạo những phân vùng cần thiết cho HĐH khác "
"đó, rồi sử dụng công cụ Debian để tạo phân vùng Debian."
@@ -1379,7 +1379,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the Linux "
+"In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a Linux placeholder partition to come <emphasis>before</"
@@ -1388,7 +1388,7 @@ msgid ""
"placeholder with the Linux partition tools later during the actual install, "
"and replace it with Linux partitions."
msgstr ""
-"Để OpenFirmware khởi động tự động &debian;, các phân vùng &arch-parttype; nên nằm "
+"Để OpenFirmware khởi động tự động &debian-gnu;, các phân vùng &arch-parttype; nên nằm "
"trước các phân vùng HĐH khác trên đĩa, đặc biệt là phân vùng MacOS. Bạn nên "
"nhớ lại thứ tự này trong khi phân vùng sẵn: bạn nên tạo một phân vùng giữ "
"chỗ &arch-parttype; để nằm <emphasis>trước</emphasis> các phân vùng khởi động được "
@@ -1434,7 +1434,7 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
"Dùng công cụ phân vùng của HĐH gốc để tạo các phân vùng dành cho nó. Để lại "
"hoặc một phân vùng giữ chỗ hoặc sức chứa còn rảnh dành cho Debian."
@@ -1771,11 +1771,11 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"Hãy nhớ để tạo một phân vùng giữ chỗ dành cho GNU/Linux, tốt hơn có vị trí "
"thứ nhất trong bố trí đĩa. Kiểu phân vùng không quan trọng, vì nó sẽ bị xoá "
-"bỏ và thay thế sau này trong tiến trình cài đặt &debian;."
+"bỏ và thay thế sau này trong tiến trình cài đặt &debian-gnu;."
#. Tag: para
#: preparing.xml:1107
@@ -1838,7 +1838,7 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"Tiết đoạn này sẽ hướng dẫn bạn qua tiến trình thiết lập phần cứng cài đặt "
@@ -1847,7 +1847,7 @@ msgstr ""
"<quote>Phần vững</quote> (firmware) là phần mềm lõi được dùng bởi phần cứng, "
"đặc biệt trong tiến trình tải và khởi động hệ điều hành (sau khi mới mở "
"điện). Bên dưới cũng diễn tả một số vấn đề phần cứng đã biết có tác động sự "
-"đáng tin cậy của &debian; trên máy tính của bạn."
+"đáng tin cậy của &debian-gnu; trên máy tính của bạn."
#. Tag: title
#: preparing.xml:1163
@@ -2603,7 +2603,7 @@ msgstr "Thiết lập BIOS"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2612,7 +2612,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"Để cài đặt &debian; trên máy kiểu &arch-title; hay zSeries, trước tiên bạn "
+"Để cài đặt &debian-gnu; trên máy kiểu &arch-title; hay zSeries, trước tiên bạn "
"cần phải khởi động hạt nhân vào hệ thống. Cơ chế khởi động của nền tảng này "
"là hơi khác, đặc biệt với hệ thống kiểu PC: không có sẵn sàng thiết bị đĩa "
"mềm nào cả. Bạn sẽ cũng thấy biết một sự khác lớn thêm: bình thường (nếu "
@@ -2748,12 +2748,12 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
"Máy phục vụ cài đặt cần phải sao chép cấu trúc thư mục chính xác từ máy nhân "
-"bản &debian; nào, nhưng cần thiết chỉ những tập tin S390 và những tập tin "
+"bản &debian-gnu; nào, nhưng cần thiết chỉ những tập tin S390 và những tập tin "
"không phụ thuộc vào kiến trúc. Bạn cũng có khả năng sao chép nội dung của "
"các đĩa CD cài đặt vào cây thư mục như vậy."
diff --git a/po/vi/random-bits.po b/po/vi/random-bits.po
index ab2d4ed6b..cab7e59fa 100644
--- a/po/vi/random-bits.po
+++ b/po/vi/random-bits.po
@@ -844,26 +844,26 @@ msgstr ""
#: random-bits.xml:358
#, no-c-format
#. Tag: title
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "Cài đặt &debian; từ hệ thống UNIX/Linux"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "Cài đặt &debian-gnu; từ hệ thống UNIX/Linux"
#: random-bits.xml:360
#, no-c-format
#. Tag: para
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
-"Phần này diễn tả phương pháp cài đặt &debian; từ một hệ thống UNIX hay Linux "
+"Phần này diễn tả phương pháp cài đặt &debian-gnu; từ một hệ thống UNIX hay Linux "
"đã có, không cần dùng trình cài đặt dựa vào trình đơn như được diễn tả trong "
"phần sổ tay còn lại. Tài liệu <quote>cài đặt chéo</quote> Thế Nào này đã "
-"được yêu cầu bởi người dùng chuyển đổi sang &debian; từ hệ thống Red Hat, "
+"được yêu cầu bởi người dùng chuyển đổi sang &debian-gnu; từ hệ thống Red Hat, "
"Mandrake, và SUSE. Trong phần này giả sử là bạn quen với cách nhập lệnh *nix "
"và cách duyệt qua hệ thống tập tin. Trong phần này, dấu đồng <prompt>$</"
"prompt> đại diện lệnh cần nhập vào hệ thống hiện thời của người dùng, còn "
@@ -875,13 +875,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"Một khi bạn cấu hình hệ thống Debian mới một cách thích hợp, bạn có khả năng "
"nâng cấp các dữ liệu người dùng tồn tại (nếu có) lên nó, rồi tiếp tục làm "
-"việc như bình thường. Vì vậy, tiến trình cài đặt &debian; này <quote>không "
+"việc như bình thường. Vì vậy, tiến trình cài đặt &debian-gnu; này <quote>không "
"có thời gian chết</quote>. Nó cũng là phương pháp thông minh để quản lý phần "
"cứng thường không hợp tác với vật chứa khác nhau kiểu khởi động hay cài đặt."
@@ -1091,11 +1091,11 @@ msgstr ""
#, no-c-format
#. Tag: para
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"Nếu bạn có đĩa CD &debian; &releasename; được gắn kết vào <filename>/cdrom</"
+"Nếu bạn có đĩa CD &debian-gnu; &releasename; được gắn kết vào <filename>/cdrom</"
"filename>, bạn có khả năng thay thế địa chỉ Mạng kiểu HTTP bằng địa chỉ kiểu "
"tập tin: <userinput>file:/cdrom/debian/</userinput>"
@@ -1691,12 +1691,12 @@ msgstr "Thiết lập bộ nạp khởi động"
#, no-c-format
#. Tag: para
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"Để làm cho hệ thống &debian; có khả năng khởi động, bạn hãy thiết lập bộ tải "
+"Để làm cho hệ thống &debian-gnu; có khả năng khởi động, bạn hãy thiết lập bộ tải "
"khởi động để tải hạt nhân đã cài đặt cùng với phân vùng gốc mới. Ghi chú "
"rằng <command>debootstrap</command> không cài đặt bộ nạp khởi động, dù bạn "
"có khả năng sử dụng lệnh <userinput>aptitude</userinput> bên trong chroot "
@@ -1931,19 +1931,19 @@ msgstr "# aptitude clean"
#: random-bits.xml:875
#, no-c-format
#. Tag: title
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "Cài đặt &debian; qua IP đường song song (PLIP)"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "Cài đặt &debian-gnu; qua IP đường song song (PLIP)"
#: random-bits.xml:877
#, no-c-format
#. Tag: para
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
-"Phần này diễn tả phương pháp cài đặt &debian; vào máy tính không có thẻ "
+"Phần này diễn tả phương pháp cài đặt &debian-gnu; vào máy tính không có thẻ "
"Ethernet, chỉ có máy tính cổng ra từ xa được gắn nối bằng cáp Null-Modem (bộ "
"điều giải rỗng, cũng được gọi như là cáp Null-Printer, máy in rỗng). Máy "
"tính cổng ra nên được kết nối đến mạng chứa máy nhân bản Debian (v.d. có kết "
@@ -2219,8 +2219,8 @@ msgstr ""
#: random-bits.xml:1046
#, no-c-format
#. Tag: title
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "Cài đặt &debian; dùng PPP qua Ethernet (PPPoE)"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "Cài đặt &debian-gnu; dùng PPP qua Ethernet (PPPoE)"
#: random-bits.xml:1048
#, no-c-format
diff --git a/po/vi/using-d-i.po b/po/vi/using-d-i.po
index 36ce602c8..ee13ef40c 100644
--- a/po/vi/using-d-i.po
+++ b/po/vi/using-d-i.po
@@ -603,10 +603,10 @@ msgstr "base-installer"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
+"operate under &debian-gnu; when rebooted."
msgstr ""
"Thành phần này cài đặt bộ gói cơ bản nhất cho máy tính khả năng hoạt động "
-"được dưới &debian; khi được khởi động lại."
+"được dưới &debian-gnu; khi được khởi động lại."
# Name: don't translate / Tên: đừng dịch
#. Tag: term
@@ -834,12 +834,12 @@ msgstr "Kiểm tra bộ nhớ có sẵn / chế độ thiếu bộ nhớ"
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"Một của những hành động thứ nhất của &d-i; là việc kiểm tra số lượng bộ nhớ "
"có sẵn. Nếu không có đủ bộ nhớ có sẵn, thành phần này sẽ sửa đổi tiến trình "
-"cài đặt để (mong muốn) cho bạn khả năng cài đặt &debian; trên máy tính của "
+"cài đặt để (mong muốn) cho bạn khả năng cài đặt &debian-gnu; trên máy tính của "
"mình."
#. Tag: para
@@ -3664,7 +3664,7 @@ msgstr "Cấu hình apt"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -3680,7 +3680,7 @@ msgid ""
"<command>aptitude</command> is now the recommended utility for package "
"management."
msgstr ""
-"Một của những công cụ dùng để cài đặt gói vào hệ thống &debian; là một "
+"Một của những công cụ dùng để cài đặt gói vào hệ thống &debian-gnu; là một "
"chương trình tên <command>apt-get</command>, thuộc về gói <classname>apt</"
"classname><footnote> <para> Ghi chú rằng chương trình thật cài đặt các gói "
"có tên <command>dpkg</command>. Tuy nhiên, chương trình này là công cụ chạy "
@@ -4817,7 +4817,7 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"Máy PowerMac mới hơn (ở giữa năm 1998 và sau) sử dụng <command>yaboot</"
"command> là bộ nạp khởi động. Trình cài đặt sẽ thiết lập tự động "
@@ -4825,7 +4825,7 @@ msgstr ""
"<quote>bootstrap</quote> với kiểu <emphasis>Apple_Bootstrap</emphasis> được "
"tạo trước trong thành phần phân vùng. Nếu bước này chạy xong thành công, lúc "
"đó đĩa nên có khả năng khởi động và OpenFirmware sẽ được đặt để khởi động "
-"&debian;."
+"&debian-gnu;."
#. Tag: title
#: using-d-i.xml:2964
@@ -5036,13 +5036,13 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
"Sau một sự nhắc cuối cùng, hệ thống sẽ bị dừng chạy vì chức năng khởi động "
"lại không phải được hỗ trợ trên kiến trúc &arch-title;. Vậy bạn cần phải IPL "
-"&debian; từ DASD bạn đã chọn cho hệ thống tập tin gốc trong những bước đầu "
+"&debian-gnu; từ DASD bạn đã chọn cho hệ thống tập tin gốc trong những bước đầu "
"của tiến trình cài đặt."
#. Tag: title
diff --git a/po/vi/welcome.po b/po/vi/welcome.po
index bd11e1fd1..6ba71f564 100644
--- a/po/vi/welcome.po
+++ b/po/vi/welcome.po
@@ -26,12 +26,12 @@ msgstr "Chào mừng bạn dùng Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"Chương này cung cấp tổng quan của Dự Án Debian và &debian;. Nếu bạn quen với "
-"lịch sử của Dự Án Debian và bản phát hành &debian;, bạn cũng nhảy được tới "
+"Chương này cung cấp tổng quan của Dự Án Debian và &debian-gnu;. Nếu bạn quen với "
+"lịch sử của Dự Án Debian và bản phát hành &debian-gnu;, bạn cũng nhảy được tới "
"chương kế tiếp."
#. Tag: title
@@ -554,13 +554,13 @@ msgstr "Lấy Debian"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"Để tìm thông tin về cách tải &debian; xuống Mạng hoặc từ họ có thể mua đĩa "
+"Để tìm thông tin về cách tải &debian-gnu; xuống Mạng hoặc từ họ có thể mua đĩa "
"CD Debian chính thức, xem trang bản phát hành <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. Danh sách các máy nhân bản Debian "
"<ulink url=\"&url-debian-mirrors;\">list of Debian mirrors</ulink> chứa bộ "
@@ -591,14 +591,14 @@ msgstr "Lấy phiên bản mới nhất của tài liệu này"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"Tài liệu này đang được sửa đổi liên miên. Bạn hãy kiểm tra xem trang bản "
"phát hành &release; Debian <ulink url=\"&url-release-area;\">Debian "
"&release; pages</ulink> tìm tin tức nào về bản phát hành &release; của hệ "
-"thống &debian;. Phiên bản đã cập nhật của sổ tay cài đặt này cũng sẵn sàng "
+"thống &debian-gnu;. Phiên bản đã cập nhật của sổ tay cài đặt này cũng sẵn sàng "
"từ trang Sổ Tay Cài Đặt chính thức <ulink url=\"&url-install-manual;"
"\">official Install Manual pages</ulink>."
@@ -642,11 +642,11 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"Nói chung, sổ tay này được sắp xếp bằng thứ tự tuyến tính, dẫn bạn qua tiến "
-"trình cài đặt từ đầu đến cuối. Đây là những bước cài đặt &debian;, và tiết "
+"trình cài đặt từ đầu đến cuối. Đây là những bước cài đặt &debian-gnu;, và tiết "
"đoạn tài liệu tương ứng với mỗi bước:"
#. Tag: para
@@ -795,7 +795,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -805,7 +805,7 @@ msgstr ""
"Chắc chắn là bạn đã đọc một số giấy phép được phát hành cùng với hậu hết "
"phần mềm buôn bán &mdash; chúng thường nói là bạn có quyền dùng chỉ một bản "
"sao của phần mềm đó trên một máy tính riêng lẻ. Giấy phép của hệ thống này "
-"là rất khác với đó. Chúng tôi mời bạn cài đặt một bản sao &debian; vào mọi "
+"là rất khác với đó. Chúng tôi mời bạn cài đặt một bản sao &debian-gnu; vào mọi "
"máy tính trong trường học hay chỗ làm của bạn. Cho các người bạn mượn vật "
"chứa phần mềm cài đặt, cũng giúp đỡ họ cài đặt nó vào các máy tính nhé ! Bạn "
"ngay cả có quyền tạo vài nghìn bản sao và <emphasis>bán</emphasis> chúng "
diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index c111ef6cd..43794762e 100644
--- a/po/zh_CN/bookinfo.po
+++ b/po/zh_CN/bookinfo.po
@@ -14,20 +14,20 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "&debian; 安装手册"
+msgid "&debian-gnu; Installation Guide"
+msgstr "&debian-gnu; 安装手册"
#. Tag: para
#: bookinfo.xml:8
#, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
-"本文是 &debian; &release; 系统(代号 <quote>&releasename;</quote>)在 &arch-"
+"本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quote>)在 &arch-"
"title; (<quote>&architecture;</quote>) 硬件架构下的安装教程。还包括关于如何构"
"建您的新 Debian 系统,以及指向更多信息的链接。"
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index cab747403..5cafc3e03 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -509,9 +509,9 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
-"程序运行后,会先询问一些预备问题,接着系统就准备开始启动 &debian; 安装程序"
+"程序运行后,会先询问一些预备问题,接着系统就准备开始启动 &debian-gnu; 安装程序"
"了。"
#. Tag: title
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index 2c2428812..a15d4d181 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.po
@@ -175,11 +175,11 @@ msgstr "NewWorld PowerMacs"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"在 G4 机器和 iBooks 上,您可以按住 <keycap>option</keycap> 键,得到一个图形界"
-"面,每个可以启动的系统对应一个按钮,&debian; 将是一个企鹅图标的按钮。"
+"面,每个可以启动的系统对应一个按钮,&debian-gnu; 将是一个企鹅图标的按钮。"
#. Tag: para
#: boot-new.xml:104
@@ -210,15 +210,15 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
-"重置 G3 或 G4 硬件上的 OpenFirmware 将导致默认启动 &debian;(假设您正确分区,"
-"并将 Apple_Bootstrap 分区放在首位)。如果您将 &debian; 放在 SCSI 磁盘,而 "
+"重置 G3 或 G4 硬件上的 OpenFirmware 将导致默认启动 &debian-gnu;(假设您正确分区,"
+"并将 Apple_Bootstrap 分区放在首位)。如果您将 &debian-gnu; 放在 SCSI 磁盘,而 "
"MacOS 位于 IDE 磁盘,这也许不工作,而您不得不进入 OpenFirmware 并设置 "
"<envar>boot-device</envar> 变量,<command>ybin</command> 通常会自动完成。"
@@ -226,13 +226,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"在首次启动 &debian; 之后,您可以添加您希望的额外选项(如双启动选项)到 "
+"在首次启动 &debian-gnu; 之后,您可以添加您希望的额外选项(如双启动选项)到 "
"<filename>/etc/yaboot.conf</filename> 并运行 <command>ybin</command> 以更新修"
"改过的设置。请参阅 <ulink url=\"&url-powerpc-yaboot-faq;\">yaboot HOWTO</"
"ulink> 了解更多信息。"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index b9977c279..fd7a3d2ee 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -43,12 +43,12 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"Debian 不会超出 Linux 内核与 GNU 工具集所支持的硬件范围之外。因此,任何被移植"
"了 Linux 内核、libc、<command>gcc</command> 等,并拥有对应的 Debian 移植版的"
"硬件体系或平台都可以运行 Debian。请参考移植页面 <ulink url=\"&url-ports;\"></"
-"ulink> 以了解更多已被 &debian; 测试过的 &arch-title; 体系。"
+"ulink> 以了解更多已被 &debian-gnu; 测试过的 &arch-title; 体系。"
#. Tag: para
#: hardware.xml:32
@@ -463,7 +463,7 @@ msgstr ""
#: hardware.xml:188
#, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -472,7 +472,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"此为第一个 &arch-title; 体系的 &debian; 官方发布版。我们认为它已经达到了可发"
+"此为第一个 &arch-title; 体系的 &debian-gnu; 官方发布版。我们认为它已经达到了可发"
"布的质量要求。但是,由于它没有像其他体系那样得到足够的曝光(经过用户测试),您"
"可能会遇到一些 bug。请使用我们的 <ulink url=\"&url-bts;\">Bug 跟踪系统</"
"ulink> 来报告问题,并注明该 bug 是在 &arch-title; 平台上产生的。当然,您也可"
@@ -860,10 +860,10 @@ msgstr "使用 115200 bps 的 Cobalt 机器。"
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
-"对于 &debian; &release; 来说,只有 PMac (Power-Macintosh 或 PowerMac) 和 "
+"对于 &debian-gnu; &release; 来说,只有 PMac (Power-Macintosh 或 PowerMac) 和 "
"PreP 子体系获得支持。"
#. Tag: title
@@ -1944,10 +1944,10 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
-"有些无线网卡不被正式的 &arch-kernel; 内核支持,虽然可以在 &debian; 下工作,但是却不能"
+"有些无线网卡不被正式的 &arch-kernel; 内核支持,虽然可以在 &debian-gnu; 下工作,但是却不能"
"在安装过程中使用。"
#. Tag: para
@@ -1966,14 +1966,14 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
"(after the reboot) and configure your network manually."
msgstr ""
"如果您在安装过程中使用无线网络遇到问题,并且手头也没有其他的网卡可以使用,仍"
-"然可以使用完整的 CD-ROM 或 DVD 映像来安装 &debian;。选择不配置网络选项,然后"
+"然可以使用完整的 CD-ROM 或 DVD 映像来安装 &debian-gnu;。选择不配置网络选项,然后"
"只安装存在于 CD/DVD 上的软件包。在安装完成(重新启动之后)安装驱动程序和固件,"
"并手动配置网络。"
@@ -2088,13 +2088,13 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
"对于盲文点触设备的支持取决于 <classname>brltty</classname> 的支持。大多数设备"
"可以在 <classname>brltty</classname> 下面工作,它们通过串口、USB 或蓝牙连接。"
"支持盲文设备的详细情况可以查阅 <ulink url=\"&url-brltty;"
-"\"><classname>brltty</classname> website</ulink>。&debian; &release; 使用的 "
+"\"><classname>brltty</classname> website</ulink>。&debian-gnu; &release; 使用的 "
"<classname>brltty</classname> 版本是 &brlttyver; 。"
#. Tag: title
@@ -2113,13 +2113,13 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
"对于硬件语音合成设备的支持取决于 <classname>speakup</classname> 的支持。"
"<classname>speakup</classname> 只支持板卡集成和外部串口设备(支持非 USB 或 "
"serial-to-USB 适配器)。支持硬件语音合成设备的详细情况可以查阅 <ulink url="
-"\"&url-speakup;\"><classname>speakup</classname> website</ulink>。&debian; "
+"\"&url-speakup;\"><classname>speakup</classname> website</ulink>。&debian-gnu; "
"&release; 使用的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
@@ -2202,14 +2202,14 @@ msgstr "除了需要设备驱动程序,有些硬件还要在使用之前加载
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
-"根据 &debian; 项目的标准,大多数情况下这些固件属于 non-free,不能被包含在主发"
-"行版或安装系统里面。如果设备驱动程序被包含到发行版里面,并且 &debian; 可以合"
+"根据 &debian-gnu; 项目的标准,大多数情况下这些固件属于 non-free,不能被包含在主发"
+"行版或安装系统里面。如果设备驱动程序被包含到发行版里面,并且 &debian-gnu; 可以合"
"法地发布固件,它通常被单独地放置在仓库的 non-free 区里面。"
#. Tag: para
@@ -2217,13 +2217,13 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
"installation."
msgstr ""
-"然而,这并不意味着该硬件不能在安装时使用。从 &debian; 5.0 开始,&d-i; 支持从"
+"然而,这并不意味着该硬件不能在安装时使用。从 &debian-gnu; 5.0 开始,&d-i; 支持从"
"可移动的介质,比如软盘或 USB 盘,加载固件或包含固件的软件包。参阅 <xref "
"linkend=\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信"
"息。"
@@ -2609,12 +2609,12 @@ msgstr "Un*x 或 GNU 系统"
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
-"如果您正在运行其它的类 Unix 系统,也可以用它来安装 &debian; 而无须本手册剩余"
+"如果您正在运行其它的类 Unix 系统,也可以用它来安装 &debian-gnu; 而无须本手册剩余"
"部分讲述的 &d-i; 使用方法。这类安装方法可能对那些因为硬件不支持或机器停产的用"
"户有用。如果您对此技术感兴趣,请直接跳到 <xref linkend=\"linux-upgrade\"/>。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index c425f1f03..6ecf4e634 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -20,14 +20,14 @@ msgstr "获取系统安装介质"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "官方的 &debian; 光盘套装"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "官方的 &debian-gnu; 光盘套装"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -40,7 +40,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"目前安装 &debian; 最容易的方法是使用官方的 Debian CD-ROM 套件。您可以从一个销"
+"目前安装 &debian-gnu; 最容易的方法是使用官方的 Debian CD-ROM 套件。您可以从一个销"
"售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</ulink>)。如"
"果您有快速的网络连接和光盘刻录机的话,也可以从 Debian 镜像站点下载 CD-ROM 映"
"像然后自行刻录光盘(具体参见 <ulink url=\"&url-debian-cd;\">Debian CD 页</"
@@ -561,11 +561,11 @@ msgstr "写磁盘映像:使用<command>Disk Copy</command>"
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
-"假如您是使用官方 &debian; 光盘上的软盘映像文件,那么 Type 和 Creator 已经设置"
+"假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件,那么 Type 和 Creator 已经设置"
"正确。以下 <command>Creator-Changer</command> 步骤只针对从 Debian 镜像下载映"
"像文件的情况。"
@@ -1577,12 +1577,12 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
msgstr ""
-"对于 &debian; 服务器,我们推荐使用 <classname>tftpd-hpa</classname>。它由 "
+"对于 &debian-gnu; 服务器,我们推荐使用 <classname>tftpd-hpa</classname>。它由 "
"<classname>syslinux</classname> bootloader 的同一作者开发,因此不会导致很多问"
"题。另一个好的选择是 <classname>atftpd</classname>。"
@@ -1643,12 +1643,12 @@ msgstr "设置 DHCP 服务器"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
msgstr ""
-"一个 DHCP 服务器自由软件是 ISC <command>dhcpd</command>。对于 &debian;,推荐"
+"一个 DHCP 服务器自由软件是 ISC <command>dhcpd</command>。对于 &debian-gnu;,推荐"
"使用 <classname>dhcp3-server</classname> 软件包。这里是它的一个简单的配置示例"
"文件(参阅 <filename>/etc/dhcp3/dhcpd.conf</filename>):"
@@ -1810,13 +1810,13 @@ msgstr "架设 BOOTP 服务器"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"在 GNU/Linux 下面可以使用两种 BOOTP 服务器。首先是 CMU <command>bootpd</"
"command>,另外一种实际上是 DHCP 服务器:ISC <command>dhcpd</command>。"
-"&debian; 中它们分别被包含在 <classname>bootp</classname> 和 <classname>dhcp3-"
+"&debian-gnu; 中它们分别被包含在 <classname>bootp</classname> 和 <classname>dhcp3-"
"server</classname> 软件包。"
#. Tag: para
@@ -1824,7 +1824,7 @@ msgstr ""
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -1854,7 +1854,7 @@ msgid ""
"userinput> variable is the machine's MAC address. </phrase>"
msgstr ""
"为了使用 CMU <command>bootpd</command>,您必须首先将 <filename>/etc/inetd."
-"conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian; 里,您可"
+"conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian-gnu; 里,您可"
"以运行 <userinput>update-inetd --enable bootps</userinput>,然后执行 "
"<userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP "
"服务器不是运行在 Debian 上,这行看起来应该像这样: "
@@ -1937,14 +1937,14 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
"configuration examples in this section accordingly."
msgstr ""
"因为历史原因,TFTP 服务器使用 <filename>/tftpboot</filename> 作为映像文件目"
-"录。然而,&debian; 软件包遵守 <ulink url=\"&url-fhs-home;\">Filesystem "
+"录。然而,&debian-gnu; 软件包遵守 <ulink url=\"&url-fhs-home;\">Filesystem "
"Hierarchy Standard</ulink> 使用其他的目录。例如,<classname>tftpd-hpa</"
"classname> 默认使用 <filename>/var/lib/tftpboot</filename>。您或许要适当地调"
"整一下配置文件示例。"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 78d8554cb..36dcf1824 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -21,7 +21,7 @@ msgstr "安装指南"
#: installation-howto.xml:7
#, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
@@ -29,7 +29,7 @@ msgid ""
"document."
msgstr ""
"本文介绍了如何在 &arch-title; (<quote>&architecture;</quote>) 架构的计算机"
-"上,使用新版的 &d-i; 安装 &debian; &releasename;。这是一次对安装过程走马观花"
+"上,使用新版的 &d-i; 安装 &debian-gnu; &releasename;。这是一次对安装过程走马观花"
"式的简介,它应该囊括了大多数情况下您所需的信息。当需要更多信息时,我们会链接"
"到更详尽的本文其他部分的说明文档。"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index cd409f9e6..63a0bb3df 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -108,13 +108,13 @@ msgstr "目录树"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"&debian; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem "
+"&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem "
"Hierarchy Standard)</ulink> 安排文件以及文件命名。该标准让用户和软件程序预知"
"文件以及目录的位置。根目录只是简单表现为 <filename>/</filename>。在根层次,所"
"有的 Debian 系统包括这些目录:"
@@ -1042,13 +1042,13 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"对于 SCSI 来说,Linux 限制每个驱动器最多有 15 个分区(3 个可用的主分区,12 个"
"逻辑分区)。对于 IDE 来说可以有 63 个分区(3 个可用的主分区,60 个逻辑分区)。但"
-"是对于普通的 &debian; 版本,系统只支持 20 个分区设备,因此您不能安装超过 20 "
+"是对于普通的 &debian-gnu; 版本,系统只支持 20 个分区设备,因此您不能安装超过 20 "
"个的分区,除非您首先为这些分区手工创建了设备文件。"
#. Tag: para
@@ -1379,7 +1379,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1388,7 +1388,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"为了确保 OpenFirmware 能够自动引导 &debian; 启动分区应该先于其它磁盘上的引导"
+"为了确保 OpenFirmware 能够自动引导 &debian-gnu; 启动分区应该先于其它磁盘上的引导"
"分区,特别是 MacOS 引导分区。启动分区应该是您第一个创建的分区。但是,如果您在"
"其它情况下后加入启动分区,您可以使用 <command>mac-fdisk</command> 的 "
"<userinput>r</userinput> 命令来重新调整分区布局。这样启动分区就可以在随后时间"
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index f207d7b0f..a48de17fa 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -27,15 +27,15 @@ msgstr "关闭系统"
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
msgstr ""
-"关闭一个运行着的 &debian; 系统,不要使用计算机前面或后面的 reset 开关重启,或者"
-"直接关闭计算机。&debian; 应该使用可控的过程关闭,否则会造成文件丢失或/和磁盘损"
+"关闭一个运行着的 &debian-gnu; 系统,不要使用计算机前面或后面的 reset 开关重启,或者"
+"直接关闭计算机。&debian-gnu; 应该使用可控的过程关闭,否则会造成文件丢失或/和磁盘损"
"坏。假如您运行了桌面环境,通常会有一个 <quote>log out</quote> 选项位于应用程"
"序菜单让您关闭(或者重启)系统。"
@@ -415,13 +415,13 @@ msgstr "默认的 E-Mail 配置"
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
"that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
"to inform the system administrator of (potential) problems or changes."
msgstr ""
-"即使您打算使用图形界面的邮件程序,安装传统的 MTA/MDA 并正确架设在您的 &debian; "
+"即使您打算使用图形界面的邮件程序,安装传统的 MTA/MDA 并正确架设在您的 &debian-gnu; "
"系统上也是很重要的。其原因是很多运行在系统中的工具<footnote> <para> 例如:"
"<command>cron</command>、<command>quota</command>、<command>logcheck</"
"command>、<command>aide</command>,&hellip; </para> </footnote> 会通过邮件发"
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index 29907b799..a09402ff3 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.po
@@ -14,21 +14,21 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "在 &architecture; 上安装 &debian; &release;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "在 &architecture; 上安装 &debian-gnu; &release;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"我们非常高兴地看到您决定试用 Debian,并确信您将发现 Debian 的 GNU/&arch-kernel; 发行"
-"版是独一无二的。&debian; 将带给您来自世界各地的高质量的自由软件,并将它们整合"
+"版是独一无二的。&debian-gnu; 将带给您来自世界各地的高质量的自由软件,并将它们整合"
"成一个紧密的整体。您会发现整合后的结果一定会大于将各部分简单地相加。"
#. Tag: para
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 93e8649c0..18ef26bae 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -14,8 +14,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "开始安装 &debian; 之前"
+msgid "Before Installing &debian-gnu;"
+msgstr "开始安装 &debian-gnu; 之前"
#. Tag: para
#: preparing.xml:6
@@ -62,7 +62,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -72,7 +72,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"在 &debian; 里,如果操作系统遇到出错的情况,您大多时候都能把它修复而不用重新"
+"在 &debian-gnu; 里,如果操作系统遇到出错的情况,您大多时候都能把它修复而不用重新"
"安装。升级不再需要进行大规模的安装操作,您可以就地升级它,而这些程序也总能和"
"新版的操作系统和平共处。如果一个程序的新版本需要其他程序的更新版本来支持它,"
"Debian 软件包管理系统会自动帮您确定所有必须的软件,并把它们安装上。关键是,"
@@ -184,10 +184,10 @@ msgstr "等待自动下载、安装和设置<firstterm>基本系统</firstterm>
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
-"安装 <firstterm>boot loader</firstterm>,它负责启动 &debian; 和(或)已有的其他"
+"安装 <firstterm>boot loader</firstterm>,它负责启动 &debian-gnu; 和(或)已有的其他"
"系统。"
#. Tag: para
@@ -261,13 +261,13 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
"安装过程中一个重要的选项是要不要安装图形桌面环境,它由 X Window System 和一个"
"图形桌面环境组成。如果没有选择<quote>桌面环境</quote>任务,就只有一个相对基本"
"的、命令行驱动的系统。把安装桌面环境任务作为选项,是因为它需要大量的磁盘空"
-"间,而且由于许多 &debian; 系统是作为服务器,并不需要图形用户界面来完成它们的"
+"间,而且由于许多 &debian-gnu; 系统是作为服务器,并不需要图形用户界面来完成它们的"
"工作。"
#. Tag: para
@@ -296,7 +296,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -1083,7 +1083,7 @@ msgstr ""
#: preparing.xml:721
#, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1093,7 +1093,7 @@ msgid ""
"least 200MB for <filename>/var</filename>, and a lot more if you install a "
"graphical desktop environment."
msgstr ""
-"在推荐的系统需求中已经包含流畅运行 &debian; 所需的磁盘空间。尤其是 "
+"在推荐的系统需求中已经包含流畅运行 &debian-gnu; 所需的磁盘空间。尤其是 "
"<filename>/var</filename> 分区里装有许多 Debian 的特定状态信息和类似日志文件"
"这样的常规内容。<command>dpkg</command> 所用的文件(含有所有已安装软件包的信"
"息)很容易就会消耗掉 40MB。另外,<command>apt-get</command> 会在安装前将下载的"
@@ -1206,7 +1206,7 @@ msgstr ""
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1217,7 +1217,7 @@ msgid ""
"some alternate means of reviving your machine like the original system's "
"installation tapes or CDs."
msgstr ""
-"若是您的机器只有一块硬盘,而且您愿意把原来的操作系统全盘替换成 &debian;,那么"
+"若是您的机器只有一块硬盘,而且您愿意把原来的操作系统全盘替换成 &debian-gnu;,那么"
"可以在启动安装系统后,待到安装时再进行分区(<xref linkend=\"di-partition\"/"
">)。但是,只有当您使用存储于磁带、CD-ROM 或者联网的机器上的安装系统,并从它们"
"启动安装程序时,上面的话才适用于您的情形。试想一下:假如您用放在硬盘上的文件"
@@ -1261,7 +1261,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1298,7 +1298,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the Linux "
+"In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a Linux placeholder partition to come <emphasis>before</"
@@ -1307,7 +1307,7 @@ msgid ""
"placeholder with the Linux partition tools later during the actual install, "
"and replace it with Linux partitions."
msgstr ""
-"为了能让 OpemFirmware 自动启动 &debian; Linux 分区必须被安置在其它分区之前,"
+"为了能让 OpemFirmware 自动启动 &debian-gnu; Linux 分区必须被安置在其它分区之前,"
"特别是 MacOS 的启动分区。在事先分区时,这一点您必须牢记在心。即,您必须在其"
"它 可引导分区 <emphasis>之前</emphasis> 为 Linux 预留一个分区。(专门留给 "
"Apple 的硬盘驱动程序的那些小分区并不是可引导的。) 您可以在真正安装时,用 "
@@ -1348,9 +1348,9 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
-"使用原有系统里的分区工具来新建属于原来系统的分区。为 &debian; 或者预留一个分"
+"使用原有系统里的分区工具来新建属于原来系统的分区。为 &debian-gnu; 或者预留一个分"
"区,或者腾出一块空闲空间。"
#. Tag: para
@@ -1663,10 +1663,10 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"记住要为 GNU/Linux 创建一个占位用的是分区,最好是磁盘布局中的第一个。它的类型"
-"无关紧要,在后面的 &debian; 安装程序中,它会被删除并替换。"
+"无关紧要,在后面的 &debian-gnu; 安装程序中,它会被删除并替换。"
#. Tag: para
#: preparing.xml:1107
@@ -1723,14 +1723,14 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"在本节中,我们将讨论安装之前有关硬件设置的一些问题。如果这些问题的确存在的"
"话,您就需要在安装 Debian 前先做一些准备工作了。一般来说,准备工作包括:检查"
"或者修改为您的系统中固件(firmware)的设定。所谓<quote>固件</quote>就是硬件运行"
"所需的核心软件。它在系统引导过程(即开机之后)中起到了至关重要的作用。我们同时"
-"也会着重提出一些硬件问题,您系统上这些硬件问题在将会影响到 &debian; 的可靠"
+"也会着重提出一些硬件问题,您系统上这些硬件问题在将会影响到 &debian-gnu; 的可靠"
"性。"
#. Tag: title
@@ -2439,7 +2439,7 @@ msgstr "BIOS 设置"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2448,7 +2448,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"为了安装 &debian; 到 &arch-title; 或者 zSeries 机器上,您首先要将内核引导进系"
+"为了安装 &debian-gnu; 到 &arch-title; 或者 zSeries 机器上,您首先要将内核引导进系"
"统。在此平台上的启动机制与其他类型,特别是类 PC 的系统,有着本质上的不同:它"
"根本就没有软盘驱动器。您还会注意到此平台上的另外一个显著差异:大多数(如果不是"
"全部)的时间,您将借助于其他客户机上的 telnet 这样的软件或者一个浏览器,通过远"
@@ -2573,11 +2573,11 @@ msgstr ""
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
-"安装服务器需要从任意 &debian; 镜像复制精确的目录结构,当然只需 s390 和一些独"
+"安装服务器需要从任意 &debian-gnu; 镜像复制精确的目录结构,当然只需 s390 和一些独"
"立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
#. Tag: emphasis
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 44ea98156..40f274110 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -815,26 +815,26 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "通过 Unix/Linux 系统来安装 &debian;"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
-"本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian;,而非使用本手册后面"
+"本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;,而非使用本手册后面"
"要谈到的由菜单驱动的安装软件。这篇<quote>交叉安装(cross-install)</quote> "
"HOWTO 是应用户的要求而撰写的。他们原来是 Redhat、Mandrake 和 SUSE 的用户,现"
-"转而使用 &debian;。在本节中,我们假设您对于输入 *nix 命令以及在文件系统中穿梭"
+"转而使用 &debian-gnu;。在本节中,我们假设您对于输入 *nix 命令以及在文件系统中穿梭"
"移动并不生疏。同时,在本节中,<prompt>$</prompt> 标志着这个命令是在用户当前使"
"用的系统中输入的,而 <prompt>#</prompt> 则表示这个命令是在 Debian chroot 环境"
"中输入的。"
@@ -845,13 +845,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"一旦您根据自己的要求配置好了新的 Debian 系统,就可以将您原来系统中的用户数据"
"(如果有的话)悉数迁移到 Debian 里去。然后就能继续爽了。一言以蔽之,这是一次"
-"<quote>不停机</quote>的 &debian; 安装。同时,这也是处理那些因为硬件原因不能通"
+"<quote>不停机</quote>的 &debian-gnu; 安装。同时,这也是处理那些因为硬件原因不能通"
"过任何引导或者安装介质完成安装的权宜之计。"
#. Tag: para
@@ -1045,11 +1045,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"如果您已经把一张 &releasename; 版本的 &debian; CD 挂载到 <filename>/cdrom</"
+"如果您已经把一张 &releasename; 版本的 &debian-gnu; CD 挂载到 <filename>/cdrom</"
"filename>,那么也可以把 http URL 替换成 file URL,即:<userinput>file:/cdrom/"
"debian/</userinput>"
@@ -1607,12 +1607,12 @@ msgstr "Boot Loader 的设置"
#: random-bits.xml:765
#, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"要让您的 &debian; 系统能够启动,还要创建 boot loader,好让它能加载安装的内核"
+"要让您的 &debian-gnu; 系统能够启动,还要创建 boot loader,好让它能加载安装的内核"
"并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot loader,"
"因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
@@ -1825,20 +1825,20 @@ msgstr "# aptitude clean"
#. Tag: title
#: random-bits.xml:875
#, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian;"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
msgstr ""
"本节将说明在没有以太网卡的情况下,如何通过一条 Null-Modem 线(也称为 Null-"
-"Printer 线),连接到远端网关计算机来安装 &debian;。充当网关的计算机应该连接到"
+"Printer 线),连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连接到"
"具有 Debian 镜像的网络(例如,互联网)。"
#. Tag: para
@@ -2095,8 +2095,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian;"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
#. Tag: para
#: random-bits.xml:1048
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index fc4f3f6ee..de30a54ab 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -519,8 +519,8 @@ msgstr "base-installer"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
-msgstr "安装一些基本的包,让计算机重启后能在 &debian; 下运行。"
+"operate under &debian-gnu; when rebooted."
+msgstr "安装一些基本的包,让计算机重启后能在 &debian-gnu; 下运行。"
#. Tag: term
#: using-d-i.xml:324
@@ -718,11 +718,11 @@ msgstr "检测可用内存/小内存模式"
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"&d-i; 首先要做的一件事是检测有效的内存。如果内存有限,该组件将修改后续的安装"
-"进程,使您可以将 &debian; 安装到您的系统上。"
+"进程,使您可以将 &debian-gnu; 安装到您的系统上。"
#. Tag: para
#: using-d-i.xml:458
@@ -3291,7 +3291,7 @@ msgstr "配置 apt"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -3307,7 +3307,7 @@ msgid ""
"<command>aptitude</command> is now the recommended utility for package "
"management."
msgstr ""
-"在 &debian; 系统上,<command>apt-get</command> 是一个人们用来安装软件包的程"
+"在 &debian-gnu; 系统上,<command>apt-get</command> 是一个人们用来安装软件包的程"
"序,它被包含在 <classname>apt</classname> 软件包中<footnote> <para> 其实,真"
"正用来安装软件包的程序是 <command>dpkg</command>。但这是一个比较底层的工具。"
"<command>apt-get</command> 是一个高级工具,它可以在适当的时候调用 "
@@ -4335,13 +4335,13 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"新的(1998 年以后)的 PowerMacs 使用 <command>yaboot</command> 作为它们的 boot "
"loader。安装程序自动配置 <command>yaboot</command>,您只需一个 820k 的小分"
"区,命名为 <quote>bootstrap</quote>,类型为 <emphasis>Apple_Bootstrap</"
"emphasis> 这由分区组件创建。如果这步完全成功,硬盘就可以启动,OpenFireware 将"
-"设为启动 &debian;。"
+"设为启动 &debian-gnu;。"
#. Tag: title
#: using-d-i.xml:2964
@@ -4536,12 +4536,12 @@ msgstr ""
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
"最后一个提示信息后,由于重启不被 &arch-title; 支持,系统将关机。您需要 DASD "
-"上的 IPL &debian;,它在安装步骤第一步里被选做根文件系统。"
+"上的 IPL &debian-gnu;,它在安装步骤第一步里被选做根文件系统。"
#. Tag: title
#: using-d-i.xml:3122
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 727cf6ca8..e0cd96fe3 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -21,12 +21,12 @@ msgstr "欢迎使用 Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"本章将简要介绍 Debian 计划和 &debian;。如果您已经对 Debian 计划的历史和 "
-"&debian; 发行版有一定的了解,请略过本章。"
+"本章将简要介绍 Debian 计划和 &debian-gnu;。如果您已经对 Debian 计划的历史和 "
+"&debian-gnu; 发行版有一定的了解,请略过本章。"
#. Tag: title
#: welcome.xml:19
@@ -510,13 +510,13 @@ msgstr "获得 Debian"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"关于如何从因特网上下载 &debian; 或者购买官方 Debian 光盘的信息,请参阅 "
+"关于如何从因特网上下载 &debian-gnu; 或者购买官方 Debian 光盘的信息,请参阅 "
"<ulink url=\"&url-debian-distrib;\">发行网页</ulink>。<ulink url=\"&url-"
"debian-mirrors;\">Debian 镜像列表</ulink> 包含完整的 Debian 官方镜像,您可以"
"很容易找到最近的一个。"
@@ -544,12 +544,12 @@ msgstr "获得本文档最新版本"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"本文档会不断地修订。请查阅 <ulink url=\"&url-release-area;\"> Debian "
-"&release; 页面</ulink> 以了解最近的关于 &release; 版 &debian; 系统的的信息。"
+"&release; 页面</ulink> 以了解最近的关于 &release; 版 &debian-gnu; 系统的的信息。"
"更新的安装手册也可以从 <ulink url=\"&url-install-manual;\">官方安装手册页</"
"ulink>得到。"
@@ -589,11 +589,11 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"基本上,本手册是以单线方式组织,文章内容将沿着安装进程由始至终进行。以下是安"
-"装 &debian; 的步骤,以及每步相关的章节:"
+"装 &debian-gnu; 的步骤,以及每步相关的章节:"
#. Tag: para
#: welcome.xml:416
@@ -728,7 +728,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
@@ -736,7 +736,7 @@ msgid ""
"Debian being based on <emphasis>free software</emphasis>."
msgstr ""
"我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算"
-"机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian; 拷贝用到您"
+"机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian-gnu; 拷贝用到您"
"的学校或商业机构的每台计算机上。将安装介质借给朋友,并帮助他们安装到他们的计"
"算机上!您甚至可以制作上千份拷贝,然后 <emphasis>出售</emphasis> 它们 "
"&mdash; 尽管有一些限制。您安装和使用系统的自由权利因为 Debian 是基于 "
diff --git a/po/zh_TW/bookinfo.po b/po/zh_TW/bookinfo.po
index 6118a5e16..567dfa5a9 100644
--- a/po/zh_TW/bookinfo.po
+++ b/po/zh_TW/bookinfo.po
@@ -14,21 +14,21 @@ msgstr ""
#. Tag: title
#: bookinfo.xml:5
#, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "&debian; 安裝手冊"
+msgid "&debian-gnu; Installation Guide"
+msgstr "&debian-gnu; 安裝手冊"
#. Tag: para
#: bookinfo.xml:8
#, fuzzy, no-c-format
msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
"system (codename <quote>&releasename;</quote>), for the &arch-title; "
"(<quote>&architecture;</quote>) architecture. It also contains pointers to "
"more information and information on how to make the most of your new Debian "
"system."
msgstr ""
"本文件包含了在 &arch-title; (<quote>&architecture;</quote>) 硬體架構下 "
-"&debian; &release; 系統的安裝指引。文章內容還包括建立最適合您的 Debian 系統的"
+"&debian-gnu; &release; 系統的安裝指引。文章內容還包括建立最適合您的 Debian 系統的"
"資訊,以及其他相關資料的超鏈結。"
#. Tag: para
diff --git a/po/zh_TW/boot-installer.po b/po/zh_TW/boot-installer.po
index 1f8b0e258..8ea6bdc0c 100644
--- a/po/zh_TW/boot-installer.po
+++ b/po/zh_TW/boot-installer.po
@@ -440,7 +440,7 @@ msgstr ""
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
msgstr ""
#. Tag: title
@@ -4025,18 +4025,18 @@ msgstr ""
#~ msgid ""
#~ "GNU/Linux is the only operating system on Alpha that can be booted from "
-#~ "both console types, but &debian; &release; only supports booting on SRM-"
+#~ "both console types, but &debian-gnu; &release; only supports booting on SRM-"
#~ "based systems. If you have an Alpha for which no version of SRM is "
#~ "available, if you will be dual-booting the system with Windows NT, or if "
#~ "your boot device requires ARC console support for BIOS initialization, "
-#~ "you will not be able to use the &debian; &release; installer. You can "
-#~ "still run &debian; &release; on such systems by using other install "
+#~ "you will not be able to use the &debian-gnu; &release; installer. You can "
+#~ "still run &debian-gnu; &release; on such systems by using other install "
#~ "media; for instance, you can install Debian woody with MILO and upgrade."
#~ msgstr ""
-#~ "由於 GNU/Linux 是唯一能夠透過兩種控制台格式開機的系統,但是 &debian; "
+#~ "由於 GNU/Linux 是唯一能夠透過兩種控制台格式開機的系統,但是 &debian-gnu; "
#~ "$release只支援從以 SRM 為基礎的系統開機。如果您的 Alpha 沒有任何版本的 "
#~ "SRM,如果您希望和 Windows NT 做雙重開機,或是您個開機設備需要 ARC 控制台支"
-#~ "援 BIOS 的初始化,您無法使用 &debian; &release; 安裝程式。所有其他的 Unix "
+#~ "援 BIOS 的初始化,您無法使用 &debian-gnu; &release; 安裝程式。所有其他的 Unix "
#~ "型作業系統 (Tru64 Unix,FreeBSD,OpenBSD,以及 NetBSD) 和 OpenVMS 只能從 "
#~ "SRM 上面開機,而 Windows NT 只能從 ARC 上面開機。"
@@ -4253,24 +4253,24 @@ msgstr ""
#~ "firmware. Also, once SRM is installed, it is possible to run ARC/"
#~ "AlphaBIOS from a floppy disk (using the <command>arc</command> command). "
#~ "For the reasons mentioned above, we recommend switching to SRM before "
-#~ "installing &debian;."
+#~ "installing &debian-gnu;."
#~ msgstr ""
#~ "大部分 AlphaServers 以及目前所有的伺服器以及工作站產品韌體中都同時含有 "
#~ "SRM 和 AlphaBIOS 。對於具有不同試用主機板的 <quote>half-flash</quote> 機器"
#~ "來說。可以透過重寫韌體切換到另外一個版本。一旦 SRM 安裝完畢,從軟碟上運行 "
#~ "ARC/AlphaBIOS 也是可能的 (使用 <command>arc</command>)。基於上述理由,我們"
-#~ "建議在安裝 &debian; 之前切換至 SRM。"
+#~ "建議在安裝 &debian-gnu; 之前切換至 SRM。"
#~ msgid ""
#~ "As on other architectures, you should install the newest available "
#~ "revision of the firmware<footnote> <para> Except on Jensen, where Linux "
#~ "is not supported on firmware versions newer than 1.7 &mdash; see <ulink "
#~ "url=\"&url-jensen-howto;\"></ulink> for more information. </para> </"
-#~ "footnote> before installing &debian;. For Alpha, firmware updates can be "
+#~ "footnote> before installing &debian-gnu;. For Alpha, firmware updates can be "
#~ "obtained from <ulink url=\"&url-alpha-firmware;\">Alpha Firmware Updates</"
#~ "ulink>."
#~ msgstr ""
-#~ "和其他的架構一樣,您也應該在安裝 &debian; 之前安裝最新的韌體版本。但 "
+#~ "和其他的架構一樣,您也應該在安裝 &debian-gnu; 之前安裝最新的韌體版本。但 "
#~ "<footnote><para> 不包括 Jensen 1.7 以上的韌體版本,其不支援 Linux &mdash; "
#~ "請參閱 <ulink url=\"&url-jensen-howto;\"></ulink> 以取得更多的資訊。</"
#~ "para> </footnote>。對於 Alpha 來說,韌體升級可以從 <ulink url=\"&url-"
diff --git a/po/zh_TW/boot-new.po b/po/zh_TW/boot-new.po
index 8eb2841ab..c74d617ac 100644
--- a/po/zh_TW/boot-new.po
+++ b/po/zh_TW/boot-new.po
@@ -158,11 +158,11 @@ msgstr "NewWorld PowerMacs"
#, no-c-format
msgid ""
"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
"be a button with a small penguin icon."
msgstr ""
"在 G4 機器和 iBooks 上,您可以按住 <keycap>option</keycap> 鍵,進入一個圖形介"
-"面,每個可以啟動的系統會對應到一個圖示,&debian; 將是一個企鵝的圖示。"
+"面,每個可以啟動的系統會對應到一個圖示,&debian-gnu; 將是一個企鵝的圖示。"
#. Tag: para
#: boot-new.xml:104
@@ -193,15 +193,15 @@ msgstr ""
#: boot-new.xml:118
#, no-c-format
msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
"by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
"disk this may not work and you will have to enter OpenFirmware and set the "
"<envar>boot-device</envar> variable, <command>ybin</command> normally does "
"this automatically."
msgstr ""
-"重設 G3 或 G4 硬體上的 OpenFirmware 將導致預設啟動 &debian; (假設您正確分割"
-"區, 並將 Apple_Bootstrap 分割區放在首位)。如果您將 &debian; 放在 SCSI 磁碟,"
+"重設 G3 或 G4 硬體上的 OpenFirmware 將導致預設啟動 &debian-gnu; (假設您正確分割"
+"區, 並將 Apple_Bootstrap 分割區放在首位)。如果您將 &debian-gnu; 放在 SCSI 磁碟,"
"而 MacOS 位於 IDE 磁碟,這也許不會運作,而您不得不進入 OpenFirmware 並設定 "
"<envar>boot-device</envar> 變數,<command>ybin</command> 通常會自動完成這個動"
"作。"
@@ -210,13 +210,13 @@ msgstr ""
#: boot-new.xml:127
#, no-c-format
msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
"options you desire (such as dual boot options) to <filename>/etc/yaboot."
"conf</filename> and run <command>ybin</command> to update your boot "
"partition with the changed configuration. Please read the <ulink url=\"&url-"
"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
msgstr ""
-"在首次啟動 &debian; 之後,您可以添加額外選項 (如雙啟動選項) 到 <filename>/"
+"在首次啟動 &debian-gnu; 之後,您可以添加額外選項 (如雙啟動選項) 到 <filename>/"
"etc/yaboot.conf</filename> 並執行 <command>ybin</command> 以更新修改過的設"
"定。請參閱 <ulink url=\"&url-powerpc-yaboot-faq;\">yaboot HOWTO</ulink> 以了"
"解更多資訊。"
diff --git a/po/zh_TW/hardware.po b/po/zh_TW/hardware.po
index 64b0e2690..123073ff5 100644
--- a/po/zh_TW/hardware.po
+++ b/po/zh_TW/hardware.po
@@ -43,12 +43,12 @@ msgid ""
"to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
"ported, and for which a Debian port exists, can run Debian. Please refer to "
"the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
msgstr ""
"Debian 不會超出 Linux 核心與 GNU 工具集所支援的硬體範圍之外。因此,任何移植"
"了 Linux 核心、libc、<command>gcc</command>,以及針對 Debian 移植的硬體架構或"
"平台都可以運行 Debian。請參考移植網頁 <ulink url=\"&url-ports;\"></ulink> 以"
-"瞭解更多已被 &debian; 測試過的 &arch-title; 架構。"
+"瞭解更多已被 &debian-gnu; 測試過的 &arch-title; 架構。"
#. Tag: para
#: hardware.xml:32
@@ -460,7 +460,7 @@ msgstr ""
#: hardware.xml:188
#, fuzzy, no-c-format
msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
"architecture. We feel that it has proven itself sufficiently to be released. "
"However, because it has not had the exposure (and hence testing by users) "
"that some other architectures have had, you may encounter a few bugs. Use "
@@ -469,7 +469,7 @@ msgid ""
"platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
"\">debian-&arch-listname; mailing list</ulink> as well."
msgstr ""
-"此為第一個 &arch-title; 架構的 &debian; 官方發佈版。我們認為它已經到達可發佈"
+"此為第一個 &arch-title; 架構的 &debian-gnu; 官方發佈版。我們認為它已經到達可發佈"
"的品質要求。但是,由於它沒有像其他架構那樣得到足夠的曝光(經過使用者測試),您"
"可能會遇到一些臭蟲。請使用我們的 <ulink url=\"&url-bts;\">臭蟲追蹤系統</"
"ulink>來報告問題,並註明該臭蟲是在 &arch-title; 平台上產生的。您也可以透過 "
@@ -816,7 +816,7 @@ msgstr ""
#: hardware.xml:566
#, no-c-format
msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
"subarchitectures are supported."
msgstr ""
@@ -1870,7 +1870,7 @@ msgstr ""
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
"installation."
msgstr ""
@@ -1888,7 +1888,7 @@ msgstr ""
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
"full CD-ROM or DVD image. Select the option to not configure a network and "
"install using only the packages available from the CD/DVD. You can then "
"install the driver and firmware you need after the installation is completed "
@@ -1989,7 +1989,7 @@ msgid ""
"in <classname>brltty</classname>. Most displays work under "
"<classname>brltty</classname>, connected via either a serial port, USB or "
"bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
"&release; ships with <classname>brltty</classname> version &brlttyver;."
msgstr ""
@@ -2009,7 +2009,7 @@ msgid ""
"devices connected to a serial port (no USB or serial-to-USB adapters are "
"supported). Details on supported hardware speech synthesis devices can be "
"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
@@ -2093,9 +2093,9 @@ msgstr ""
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
"the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
"often be available as a separate package from the non-free section of the "
"archive."
msgstr ""
@@ -2105,7 +2105,7 @@ msgstr ""
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
"files or packages containing firmware from a removable medium, such as a "
"floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
"detailed information on how to load firmware files or packages during the "
@@ -2489,12 +2489,12 @@ msgstr "Un*x 或 GNU 系統"
#, fuzzy, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
msgstr ""
-"如果您正在使用其它的類 Unix 系統,也可以用它來安裝 &debian; 而無須本手冊其他"
+"如果您正在使用其它的類 Unix 系統,也可以用它來安裝 &debian-gnu; 而無須本手冊其他"
"部分所描述的 &d-i; 使用方法。這類安裝方法可能對那些因為硬體不支援或機器停產的"
"使用者有用。如果您對此技術感興趣,請直接跳到 <xref linkend=\"linux-upgrade\"/"
">。"
diff --git a/po/zh_TW/install-methods.po b/po/zh_TW/install-methods.po
index b92018cb0..4ebd66e63 100644
--- a/po/zh_TW/install-methods.po
+++ b/po/zh_TW/install-methods.po
@@ -20,14 +20,14 @@ msgstr "取得系統安裝媒介"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "&debian; 官方光碟套件"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "&debian-gnu; 官方光碟套件"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
"Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
"vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
"from a Debian mirror and make your own set, if you have a fast network "
@@ -40,7 +40,7 @@ msgid ""
"above. You may also consider using the DVD version, which saves a lot of "
"space on your shelf and you avoid the CD shuffling marathon."
msgstr ""
-"目前安裝 &debian; 最容易的方法是使用一個官方的 Debian光碟套件。您可以向零售商"
+"目前安裝 &debian-gnu; 最容易的方法是使用一個官方的 Debian光碟套件。您可以向零售商"
"購買 (參閱 <ulink url=\"&url-debian-cd-vendors;\">光碟零售商</ulink>)。如果您"
"有快速的網路連接和光碟燒錄機的話,也可以從 Debian 鏡像站下載光碟映像檔然後自"
"行燒錄光碟 (具體參閱 <ulink url=\"&url-debian-cd;\">Debian 光碟網頁</"
@@ -546,11 +546,11 @@ msgstr "寫入磁碟映像檔:使用<command>Disk Copy</command>"
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
"The following <command>Creator-Changer</command> steps are only necessary if "
"you downloaded the image files from a Debian mirror."
msgstr ""
-"假如您是使用官方 &debian;光碟上的軟碟映像檔文件,那麼 Type 和 Creator 已經設"
+"假如您是使用官方 &debian-gnu;光碟上的軟碟映像檔文件,那麼 Type 和 Creator 已經設"
"置正確。 以下 <command>Creator-Changer</command> 步驟只針對從 Debian 鏡像站下"
"載映像檔的情況。"
@@ -1610,7 +1610,7 @@ msgstr ""
#: install-methods.xml:1124
#, no-c-format
msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
"written by the same author as the <classname>syslinux</classname> bootloader "
"and is therefore least likely to cause issues. A good alternative is "
"<classname>atftpd</classname>."
@@ -1670,7 +1670,7 @@ msgstr "設置 DHCP 伺服器"
#: install-methods.xml:1175
#, no-c-format
msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
"the <classname>dhcp3-server</classname> package is recommended. Here is a "
"sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
"filename>):"
@@ -1700,7 +1700,7 @@ msgid ""
" fixed-address 192.168.1.90;\n"
"}"
msgstr ""
-"ISC <command>dhcpd</command> 是一種自由軟體 DHCP 伺服器。在 &debian; 裡,它被"
+"ISC <command>dhcpd</command> 是一種自由軟體 DHCP 伺服器。在 &debian-gnu; 裡,它被"
"包含在 <classname>dhcp</classname> 軟體套件中。這裡有它的一個設定檔的範例(通"
"常是 <filename>/etc/dhcpd.conf</filename>):<informalexample><screen>\n"
"option domain-name \"example.com\";\n"
@@ -1842,13 +1842,13 @@ msgstr "設置 BOOTP 伺服器"
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
"<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
"<classname>bootp</classname> and <classname>dhcp3-server</classname> "
"packages respectively."
msgstr ""
"在 GNU/Linux 下面有兩種 BOOTP 伺服器。他們是 CMU <command>bootpd</command> 和"
"另外一種實際上是 DHCP 伺服器的程式 ISC <command>dhcpd</command>,他們被包含"
-"在 &debian; 的 <classname>bootp</classname> 和 <classname>dhcp</classname> 軟"
+"在 &debian-gnu; 的 <classname>bootp</classname> 和 <classname>dhcp</classname> 軟"
"體套件中。"
#. Tag: para
@@ -1856,7 +1856,7 @@ msgstr ""
#, fuzzy, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
"run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
"does not run Debian, the line in question should look like: "
@@ -1886,7 +1886,7 @@ msgid ""
"userinput> variable is the machine's MAC address. </phrase>"
msgstr ""
"要使用 CMU <command>bootpd</command>,您必須先將 <filename>/etc/inetd.conf</"
-"filename> 中相關的註釋標記去掉 (或者加入一些新行)。在 &debian; 裡,您可以執"
+"filename> 中相關的註釋標記去掉 (或者加入一些新行)。在 &debian-gnu; 裡,您可以執"
"行 <userinput>update-inetd --enable bootps</userinput>,然後執行 <userinput>/"
"etc/init.d/inetd reload</userinput> 來完成此工作。在其它系統中,這行設定應該"
"看起來像這樣:<informalexample><screen>\n"
@@ -1958,7 +1958,7 @@ msgstr ""
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
"to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
"uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
@@ -2214,12 +2214,12 @@ msgstr ""
#~ msgid ""
#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "a &debian-gnu; server, the <classname>atftpd</classname> and <classname>tftpd-"
#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
#~ "classname>."
#~ msgstr ""
#~ "如果想用 TFTP 的 Pre-boot Execution Environment (PXE) 方式啟動,您將需要一"
-#~ "台支援 <userinput>tsize</userinput> 的 TFTP 伺服器。在 &debian; 伺服器上,"
+#~ "台支援 <userinput>tsize</userinput> 的 TFTP 伺服器。在 &debian-gnu; 伺服器上,"
#~ "<classname>atftpd</classname> 和 <classname>tftpd-hpa</classname>套件符合"
#~ "此要求,我們建議使用 <classname>tftpd-hpa</classname>。"
diff --git a/po/zh_TW/installation-howto.po b/po/zh_TW/installation-howto.po
index 0f0dfcb27..7c018a4c0 100644
--- a/po/zh_TW/installation-howto.po
+++ b/po/zh_TW/installation-howto.po
@@ -21,7 +21,7 @@ msgstr "安裝 Howto"
#: installation-howto.xml:7
#, fuzzy, no-c-format
msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
"title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
"walkthrough of the installation process which should contain all the "
"information you will need for most installs. When more information can be "
@@ -29,9 +29,9 @@ msgid ""
"document."
msgstr ""
"本文介紹了如何在 &arch-title; (<quote>&architecture;</quote>)架構的電腦上,使"
-"用新版 &d-i; 來安裝 &debian; &releasename;。我們簡要說明安裝過程,但會囊括了"
+"用新版 &d-i; 來安裝 &debian-gnu; &releasename;。我們簡要說明安裝過程,但會囊括了"
"大多數情況下您進行安裝所需的訊息。當有必要取得更多訊息時,我們會有較詳盡的說"
-"明文件 <link linkend=\"debian_installation_guide\">&debian;安裝指南</link>。"
+"明文件 <link linkend=\"debian_installation_guide\">&debian-gnu;安裝指南</link>。"
#. Tag: title
#: installation-howto.xml:19
diff --git a/po/zh_TW/partitioning.po b/po/zh_TW/partitioning.po
index 61aa13306..7113932df 100644
--- a/po/zh_TW/partitioning.po
+++ b/po/zh_TW/partitioning.po
@@ -108,13 +108,13 @@ msgstr "目錄樹"
#: partitioning.xml:68
#, no-c-format
msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
"Standard</ulink> for directory and file naming. This standard allows users "
"and software programs to predict the location of files and directories. The "
"root level directory is represented simply by the slash <filename>/</"
"filename>. At the root level, all Debian systems include these directories:"
msgstr ""
-"&debian; 依照 <ulink url=\"&url-fhs-home;\">檔案系統層次標準 (Filesystem "
+"&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">檔案系統層次標準 (Filesystem "
"Hierarchy Standard)</ulink> 為目錄以及檔案命名。這個標準允許使用者以及軟體程"
"式預測檔案及目錄的位置。根層次目錄只是簡單表現為 <filename>/</filename>。在根"
"層次,所有的 Debian 系統包括這些目錄:"
@@ -1040,13 +1040,13 @@ msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
"usable primary partitions, 12 logical partitions), and 63 partitions on an "
"IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
"not install on partitions higher than 20 unless you first manually create "
"devices for those partitions."
msgstr ""
"對於 SCSI 來說,Linux 限制每個磁碟最多有 15 個分割區( 3 個可用的主分割區,12 "
"個邏輯分割區)。對於 IDE 來說可以有 63 個分割區( 3 個可用的主分割區, 60 個邏"
-"輯分割區)。但是通常 &debian; 系統只支持 20 個分割區裝置,因此您不能安裝超過 "
+"輯分割區)。但是通常 &debian-gnu; 系統只支持 20 個分割區裝置,因此您不能安裝超過 "
"20 個的分割區,除非您先為這些分割區手動建立裝置檔案。"
#. Tag: para
@@ -1378,7 +1378,7 @@ msgstr ""
#: partitioning.xml:850
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
"partition should appear before other boot partitions on the disk, especially "
"MacOS boot partitions. The bootstrap partition should be the first one you "
"create. However, if you add a bootstrap partition later, you can use "
@@ -1387,7 +1387,7 @@ msgid ""
"(which is always partition 1). It's the logical map order, not the physical "
"address order, that counts."
msgstr ""
-"為了確保 OpenFirmware 能夠自動啟動 &debian;,開機磁區必須位於硬碟上其他開機磁"
+"為了確保 OpenFirmware 能夠自動啟動 &debian-gnu;,開機磁區必須位於硬碟上其他開機磁"
"區之前,特別是 MacOS 開機磁區。開機分割區應該是您第一個建立的分割區。但是,如"
"果您在之後新加入開機磁區,您可以使用 <command>mac-fdisk</command> 的 "
"<userinput>r</userinput> 命令來重新調整分割區順序,如此一來開機磁區就可以在此"
diff --git a/po/zh_TW/post-install.po b/po/zh_TW/post-install.po
index a39b478d7..126bdd95e 100644
--- a/po/zh_TW/post-install.po
+++ b/po/zh_TW/post-install.po
@@ -27,9 +27,9 @@ msgstr ""
#: post-install.xml:15
#, no-c-format
msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
"switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
"lost and/or disk damage might occur. If you run a desktop environment, there "
"is usually an option to <quote>log out</quote> available from the "
"application menu that allows you to shutdown (or reboot) the system."
@@ -381,7 +381,7 @@ msgstr ""
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
"that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
diff --git a/po/zh_TW/preface.po b/po/zh_TW/preface.po
index 8ab07bf3f..692d216ec 100644
--- a/po/zh_TW/preface.po
+++ b/po/zh_TW/preface.po
@@ -14,21 +14,21 @@ msgstr ""
#. Tag: title
#: preface.xml:5
#, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "在 &architecture; 架構上安裝 &debian; &release;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "在 &architecture; 架構上安裝 &debian-gnu; &release;"
#. Tag: para
#: preface.xml:6
#, no-c-format
msgid ""
"We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
"together high-quality free software from around the world, integrating it "
"into a coherent whole. We believe that you will find that the result is "
"truly more than the sum of the parts."
msgstr ""
"我們非常高興您決定嘗試 Debian,並確信您將發現 Debian 的 GNU/&arch-kernel; 發行套件是"
-"獨一無二的。&debian; 集合了來自世界各地的高品質自由軟體,並將它們緊密的整合在"
+"獨一無二的。&debian-gnu; 集合了來自世界各地的高品質自由軟體,並將它們緊密的整合在"
"一起。您會發現整合後的效果比單純的程式集合還要更好。"
#. Tag: para
diff --git a/po/zh_TW/preparing.po b/po/zh_TW/preparing.po
index 705db2f50..2912ca814 100644
--- a/po/zh_TW/preparing.po
+++ b/po/zh_TW/preparing.po
@@ -14,8 +14,8 @@ msgstr ""
#. Tag: title
#: preparing.xml:5
#, no-c-format
-msgid "Before Installing &debian;"
-msgstr "安裝 &debian; 之前"
+msgid "Before Installing &debian-gnu;"
+msgstr "安裝 &debian-gnu; 之前"
#. Tag: para
#: preparing.xml:6
@@ -62,7 +62,7 @@ msgstr ""
#: preparing.xml:35
#, no-c-format
msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
"than replaced if things go wrong. Upgrades never require a wholesale "
"installation; you can always upgrade in-place. And the programs are almost "
"always compatible with successive OS releases. If a new program version "
@@ -72,7 +72,7 @@ msgid ""
"installation, so think of it as your very last option. The installer is "
"<emphasis>not</emphasis> designed to re-install over an existing system."
msgstr ""
-"在 &debian; 裡,如果作業系統遇到錯誤,大多數的時候您都能把它修復而不用重新安"
+"在 &debian-gnu; 裡,如果作業系統遇到錯誤,大多數的時候您都能把它修復而不用重新安"
"裝。在這裡,升級不再需要進行大規模的安裝動作,您可以就地升級它,而這些程式也"
"總能和新版的作業系統和平共處。如果一個程式的新版本需要其他程式的更新來支援"
"它,Debian 軟體套件管理系統會自動幫您把所有必須的軟體一併安裝上。關鍵是,"
@@ -184,10 +184,10 @@ msgstr "等待自動化的下載、安裝和設置<firstterm>基本系統</first
#: preparing.xml:128
#, no-c-format
msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
"or your existing system."
msgstr ""
-"安裝<firstterm>boot loader</firstterm>,它負責開機 &debian; 和 (或) 已有的其"
+"安裝<firstterm>boot loader</firstterm>,它負責開機 &debian-gnu; 和 (或) 已有的其"
"他系統。"
#. Tag: para
@@ -255,7 +255,7 @@ msgid ""
"the <quote>Desktop environment</quote> task, you will only have a relatively "
"basic, command line driven system. Installing the Desktop environment task "
"is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
"for a graphical user interface to do their job."
msgstr ""
@@ -284,7 +284,7 @@ msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
"run a risk of losing everything on the disk, no matter what program you use "
"to do it. The programs used in installation are quite reliable and most have "
"seen years of use; but they are also quite powerful and a false move can "
@@ -1061,7 +1061,7 @@ msgstr ""
#: preparing.xml:721
#, fuzzy, no-c-format
msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
"is taken into account in these recommended system requirements. Notably, the "
"<filename>/var</filename> partition contains a lot of state information "
"specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1186,7 +1186,7 @@ msgstr ""
#, fuzzy, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
"partition as part of the installation process (<xref linkend=\"di-partition"
"\"/>), after you have booted the installation system. However this only "
"works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1197,7 +1197,7 @@ msgid ""
"some alternate means of reviving your machine like the original system's "
"installation tapes or CDs."
msgstr ""
-"若是您的機器只有一顆硬碟,而且您願意把原來的作業系統全部替換成 &debian;,那麼"
+"若是您的機器只有一顆硬碟,而且您願意把原來的作業系統全部替換成 &debian-gnu;,那麼"
"您可以在開機安裝系統後,等待安裝時再進行分割 (<xref linkend=\"partman\"/>)。 "
"但是,只有當您使用儲存於磁帶、光碟機或者網際網路上的機器的安裝系統,並從它們"
"開機安裝程式時,前述才適用於您的情形。試想一下:假如您用放在硬碟上的檔案開"
@@ -1242,7 +1242,7 @@ msgid ""
"of the partitions will be owned by other operating systems, you should "
"create those partitions using native operating system partitioning programs. "
"We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
"should just create the native operating system's partitions you will want to "
"retain."
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
#: preparing.xml:862
#, no-c-format
msgid ""
-"In order for OpenFirmware to automatically boot &debian; the Linux "
+"In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
"partitions should appear before all other partitions on the disk, especially "
"MacOS boot partitions. This should be kept in mind when pre-partitioning; "
"you should create a Linux placeholder partition to come <emphasis>before</"
@@ -1288,7 +1288,7 @@ msgid ""
"placeholder with the Linux partition tools later during the actual install, "
"and replace it with Linux partitions."
msgstr ""
-"為了能讓 OpemFirmware 自動開機,&debian; Linux 分割區必須被安置在其它分割區之"
+"為了能讓 OpemFirmware 自動開機,&debian-gnu; Linux 分割區必須被安置在其它分割區之"
"前,特別是 MacOS 的開機分割區。在分割之前時,這一點您必須牢記在心。也就是說,"
"您必須在其它可開機分割區<emphasis>之前</emphasis>為 Linux 預留一個分割區。(專"
"門留給 Apple 的硬碟驅動程式的那些小分割區並不是可開機的。) 您可以在真正安裝"
@@ -1330,9 +1330,9 @@ msgstr ""
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
msgstr ""
-"使用原有系統裡的分割區工具來建立屬於原來系統的分割區。為 &debian; 預留一個分"
+"使用原有系統裡的分割區工具來建立屬於原來系統的分割區。為 &debian-gnu; 預留一個分"
"割區,或者騰出一塊空間。"
#. Tag: para
@@ -1648,10 +1648,10 @@ msgstr ""
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
"positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
msgstr ""
"記得要建立一個給 GNU/Linux 佔用的分割區,最好是磁碟分割中的第一個分割區。它的"
-"類型無關緊要,在後面的 &debian; 安裝程式中,它會被刪除並替換。"
+"類型無關緊要,在後面的 &debian-gnu; 安裝程式中,它會被刪除並替換。"
#. Tag: para
#: preparing.xml:1107
@@ -1709,14 +1709,14 @@ msgid ""
"involves checking and possibly changing firmware settings for your system. "
"The <quote>firmware</quote> is the core software used by the hardware; it is "
"most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
"also highlighted."
msgstr ""
"在本節中,我們將討論安裝之前有關硬體設定的一些問題。如果這些問題的確存在,您"
"就需要在安裝 Debian 前先做一些準備工作了。一般來說,準備工作包括:檢查韌體"
"(firmware)以及為您的系統修改韌體中的設定。所謂<quote>韌體</quote>就是硬體運行"
"所需的核心軟體。它在系統開機過程中有至關重要的作用。我們同時也會著於重提出一"
-"些硬體問題,您系統上這些硬體問題在將會影響到 &debian; 的可靠性。"
+"些硬體問題,您系統上這些硬體問題在將會影響到 &debian-gnu; 的可靠性。"
#. Tag: title
#: preparing.xml:1163
@@ -2430,7 +2430,7 @@ msgstr "BIOS 設置"
#: preparing.xml:1646
#, no-c-format
msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
"first boot a kernel into the system. The boot mechanism of this platform is "
"inherently different to other ones, especially from PC-like systems: there "
"are no floppy devices available at all. You will notice another big "
@@ -2439,7 +2439,7 @@ msgid ""
"telnet, or a browser. This is due to that special system architecture where "
"the 3215/3270 console is line-based instead of character-based."
msgstr ""
-"為了安裝 &debian; 到 &arch-title; 或者 zSeries 機器上,您首先要將核心載入系"
+"為了安裝 &debian-gnu; 到 &arch-title; 或者 zSeries 機器上,您首先要將核心載入系"
"統。在此平台上的開機機制與其他類型,特別是類 PC 的系統,有著本質上的不同:它"
"根本就沒有軟碟機。您還會注意到此平台上的另外一個顯著差異:大多數 (如果不是全"
"部) 的時間,您將借助於一些客戶端連線軟體如 telnet 或者一個瀏覽器, 透過遙控的"
@@ -2564,11 +2564,11 @@ msgstr ""
#, fuzzy, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
"required. You can also copy the contents of all installation CDs into such a "
"directory tree."
msgstr ""
-"安裝伺服器需要從任意 &debian; 鏡像複製精確的目錄結構,當然只需複製 s390 相關"
+"安裝伺服器需要從任意 &debian-gnu; 鏡像複製精確的目錄結構,當然只需複製 s390 相關"
"和一些獨立於架構的檔案。您也可以複製所有的安裝光碟片到這樣的目錄樹中。"
#. Tag: emphasis
@@ -2974,14 +2974,14 @@ msgstr ""
#~ "system load, you have only a very basic command line driven system. The "
#~ "graphical interface which displays windows on your monitor will not be "
#~ "installed unless you select it with <classname>tasksel</classname>. It's "
-#~ "optional because many &debian; systems are servers which don't really "
+#~ "optional because many &debian-gnu; systems are servers which don't really "
#~ "have any need for a graphical user interface to do their job."
#~ msgstr ""
#~ "當 <classname>debian-installer</classname> 程式執行結束、系統首次載入之"
#~ "前,您只有一個非常簡單的命令列系統。除非您在最後一個步驟裡用 "
#~ "<classname>tasksel</classname> 或 <classname>aptitude</classname> 選擇安裝"
#~ "了能在您的顯示器上顯示視窗的圖形界面,否則它將不會被自動安裝。因為許多 "
-#~ "&debian; 系統是被用作伺服器,它們的工作根本不需要任何圖形化的使用者界面,"
+#~ "&debian-gnu; 系統是被用作伺服器,它們的工作根本不需要任何圖形化的使用者界面,"
#~ "所以它在這裡只是一個選項。"
#~ msgid "<entry>RAM</entry>"
diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po
index cdabc8acc..47098e3a8 100644
--- a/po/zh_TW/random-bits.po
+++ b/po/zh_TW/random-bits.po
@@ -793,26 +793,26 @@ msgstr ""
#. Tag: title
#: random-bits.xml:358
#, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "透過 Unix/Linux 系統來安裝 &debian;"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
#. Tag: para
#: random-bits.xml:360
#, no-c-format
msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
"system, without using the menu-driven installer as explained in the rest of "
"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
"section some familiarity with entering *nix commands and navigating the file "
"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
"to be entered in the user's current system, while <prompt>#</prompt> refers "
"to a command entered in the Debian chroot."
msgstr ""
-"本節說明了如何透過現有的 Unix 或 Linux 系統來安裝 &debian;,而非使用本手冊後"
+"本節說明了如何透過現有的 Unix 或 Linux 系統來安裝 &debian-gnu;,而非使用本手冊後"
"面要談到的基於 ncurses,由選單驅動的安裝軟體。這篇<quote>交叉安裝(cross-"
"install)</quote> HOWTO 是應使用者的要求而撰寫的。他們原來是 Redhat、Mandrake "
-"和 SUSE 的使用者,現轉而使用 &debian;。在本節中,我們假設您對於輸入 *nix 指令"
+"和 SUSE 的使用者,現轉而使用 &debian-gnu;。在本節中,我們假設您對於輸入 *nix 指令"
"以及在檔案系統中穿梭移動並不生疏。同時,在本節中,<prompt>$</prompt> 符號表示"
"這個指令是在使用者當前使用的系統中輸入的,而 <prompt>#</prompt> 則表示這個指"
"令是在 Debian chroot 環境中輸入的。"
@@ -823,13 +823,13 @@ msgstr ""
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
"migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
"clever way for dealing with hardware that otherwise doesn't play friendly "
"with various boot or installation media."
msgstr ""
"您一旦根據自己的需求設定好了新的 Debian 系統,就可以將您的原來系統中的使用者"
"資料(如果有的話)全部遷移到 Debian 裡去。然後就能繼續爽了。一言以蔽之,這是一"
-"次<quote>不關機</quote>的 &debian; 安裝。同時,這也是處理那些因為硬體原因不能"
+"次<quote>不關機</quote>的 &debian-gnu; 安裝。同時,這也是處理那些因為硬體原因不能"
"透過任何開機或者安裝媒介完成安裝的權宜之計。"
#. Tag: para
@@ -1015,11 +1015,11 @@ msgstr ""
#: random-bits.xml:503
#, no-c-format
msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
"filename>, you could substitute a file URL instead of the http URL: "
"<userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"如果您已經把一張 &releasename; 版本的 &debian; CD 掛載在 <filename>/cdrom</"
+"如果您已經把一張 &releasename; 版本的 &debian-gnu; CD 掛載在 <filename>/cdrom</"
"filename>,那麼也可以把 http URL 替換成 file URL,即:<userinput>file:/cdrom/"
"debian/</userinput>"
@@ -1513,12 +1513,12 @@ msgstr "Boot Loader 的設定"
#: random-bits.xml:765
#, fuzzy, no-c-format
msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
"installed kernel with your new root partition. Note that "
"<command>debootstrap</command> does not install a boot loader, though you "
"can use <command>aptitude</command> inside your Debian chroot to do so."
msgstr ""
-"要讓您的 &debian; 系統能夠啟動,還要設定您的 boot loader,好讓它能已安裝的核"
+"要讓您的 &debian-gnu; 系統能夠啟動,還要設定您的 boot loader,好讓它能已安裝的核"
"心並用上新的根分割區。注意 debootstrap 不會安裝 boot loader, 因此您要在 "
"Debian 的 chroot 中使用 apt-get 完成。"
@@ -1703,14 +1703,14 @@ msgstr ""
#. Tag: title
#: random-bits.xml:875
#, fuzzy, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "透過 Unix/Linux 系統來安裝 &debian;"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
#. Tag: para
#: random-bits.xml:877
#, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
"Ethernet card, but with just a remote gateway computer attached via a Null-"
"Modem cable (also called Null-Printer cable). The gateway computer should be "
"connected to a network that has a Debian mirror on it (e.g. to the Internet)."
@@ -1920,8 +1920,8 @@ msgstr ""
#. Tag: title
#: random-bits.xml:1046
#, fuzzy, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "透過 Unix/Linux 系統來安裝 &debian;"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
#. Tag: para
#: random-bits.xml:1048
diff --git a/po/zh_TW/using-d-i.po b/po/zh_TW/using-d-i.po
index 8567a0846..a621fab3b 100644
--- a/po/zh_TW/using-d-i.po
+++ b/po/zh_TW/using-d-i.po
@@ -532,8 +532,8 @@ msgstr "base-installer"
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
-msgstr "安裝一些基本的套件,讓電腦重起後能在 &debian; 下運行。"
+"operate under &debian-gnu; when rebooted."
+msgstr "安裝一些基本的套件,讓電腦重起後能在 &debian-gnu; 下運行。"
#. Tag: term
#: using-d-i.xml:324
@@ -727,11 +727,11 @@ msgstr "檢測有效的記憶體"
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
"available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
"your system."
msgstr ""
"&d-i; 首先要做的一件事是檢測有效的記憶體。如果記憶體有限,該元件將修改後續的"
-"安裝進程,使您可以將 &debian; 安裝到您的系統上。"
+"安裝進程,使您可以將 &debian-gnu; 安裝到您的系統上。"
#. Tag: para
#: using-d-i.xml:458
@@ -3125,7 +3125,7 @@ msgstr "設定網路"
#: using-d-i.xml:2236
#, no-c-format
msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
"called <command>apt-get</command>, from the <classname>apt</classname> "
"package<footnote> <para> Note that the program which actually installs the "
"packages is called <command>dpkg</command>. However, this program is more of "
@@ -4069,13 +4069,13 @@ msgid ""
"<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
"created back in the partitioning component. If this step completes "
"successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
msgstr ""
"新的 (1998 年以後)的 PowerMacs 使用 <command>yaboot</command> 作為它們的 "
"boot loader。安裝程式會自動設定 <command>yaboot</command>,您只需一個 820k 的"
"小分割區,命名為 <quote>bootstrap</quote>,類型為 <emphasis>Apple_Bootstrap</"
"emphasis> 這由分割區元件建立。如果這步完全成功,硬碟就可以啟動,OpenFireware "
-"將設為啟動 &debian;。"
+"將設為啟動 &debian-gnu;。"
#. Tag: title
#: using-d-i.xml:2964
@@ -4262,7 +4262,7 @@ msgstr ""
#, fuzzy, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
"you selected for the root filesystem during the first steps of the "
"installation."
msgstr ""
diff --git a/po/zh_TW/welcome.po b/po/zh_TW/welcome.po
index 113ed1b6a..708256468 100644
--- a/po/zh_TW/welcome.po
+++ b/po/zh_TW/welcome.po
@@ -21,12 +21,12 @@ msgstr "歡迎使用 Debian"
#: welcome.xml:5
#, no-c-format
msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
"distribution, feel free to skip to the next chapter."
msgstr ""
-"本章將簡要介紹 Debian 計畫和 &debian;。如果您已經對 Debian 計畫的歷史和 "
-"&debian; 發行套件有一定的瞭解,您可略過本章。"
+"本章將簡要介紹 Debian 計畫和 &debian-gnu;。如果您已經對 Debian 計畫的歷史和 "
+"&debian-gnu; 發行套件有一定的瞭解,您可略過本章。"
#. Tag: title
#: welcome.xml:19
@@ -522,13 +522,13 @@ msgstr "取得 Debian"
#: welcome.xml:348
#, no-c-format
msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
"official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
"distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
"mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
"Debian mirrors, so you can easily find the nearest one."
msgstr ""
-"關於如何從網際網路上下載 &debian; 或者從何購買官方 Debian光碟的資訊,請參閱 "
+"關於如何從網際網路上下載 &debian-gnu; 或者從何購買官方 Debian光碟的資訊,請參閱 "
"<ulink url=\"&url-debian-distrib;\">發行網頁</ulink>。<ulink url=\"&url-"
"debian-mirrors;\">Debian 鏡像列表</ulink>包含完整的 Debian 官方鏡像站,您可以"
"很容易找到最近的一個。"
@@ -556,12 +556,12 @@ msgstr "取得本文件最新版本"
msgid ""
"This document is constantly being revised. Be sure to check the <ulink url="
"\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
"versions of this installation manual are also available from the <ulink url="
"\"&url-install-manual;\">official Install Manual pages</ulink>."
msgstr ""
"本文件會不斷地修訂。請查閱 <ulink url=\"&url-release-area;\">Debian "
-"&release; 網頁</ulink> 以瞭解最新的 &release; 版 &debian; 系統相關資訊。更新"
+"&release; 網頁</ulink> 以瞭解最新的 &release; 版 &debian-gnu; 系統相關資訊。更新"
"的安裝手冊也可以從<ulink url=\"&url-install-manual;\">官方安裝手冊網頁</"
"ulink>取得。"
@@ -601,11 +601,11 @@ msgstr ""
msgid ""
"In general, this manual is arranged in a linear fashion, walking you through "
"the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
"each step:"
msgstr ""
"基本上,本手冊內容以線性鋪陳,從開始安裝帶領您到安裝結束。以下是安裝 "
-"&debian; 的步驟,以及每步驟相關的章節:"
+"&debian-gnu; 的步驟,以及每步驟相關的章節:"
#. Tag: para
#: welcome.xml:416
@@ -752,7 +752,7 @@ msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
"school or place of business. Lend your installation media to your friends "
"and help them install it on their computers! You can even make thousands of "
"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "