diff options
80 files changed, 464 insertions, 703 deletions
diff --git a/po/el/boot-installer.po b/po/el/boot-installer.po index 07225ef3d..2db1e2579 100644 --- a/po/el/boot-installer.po +++ b/po/el/boot-installer.po @@ -3827,17 +3827,17 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" "Μερικοί χρήστες πιθανόν να χρειάζονται ειδική υποστήριξη εξαιτίας πχ. μιας " "αδυναμίας στην όραση. <phrase arch=\"alpha;ia64;powerpc;x86\">Τερματικά " "braille USB ανιζνεύονται αυτόματα, αλλά οι περισσότερες άλλες</phrase> " -"<phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">Περισσότερες</phrase> " +"<phrase arch=\"arm;hppa;mips;mipsel;sparc\">Περισσότερες</phrase> " "δυνατότητες προσβασιμότητας θα πρέπει να ενεργοποιηθούν με το χέρι. <phrase " "arch=\"x86\">Σε μηχανήματα που το υποστηρίζουν, το μενού εκκίνησης εκπέμπει " "έναν ήχο όταν είναι έτοιμος κάποιος να πληκτρολογήσει.</phrase> Μερικές " diff --git a/po/el/hardware.po b/po/el/hardware.po index b48a92736..2fb71a4a6 100644 --- a/po/el/hardware.po +++ b/po/el/hardware.po @@ -3261,16 +3261,14 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "Σχεδόν όλoι οι τύποι καρτών δικτύου (NIC) που υποστηρίζονται από τον πυρήνα " "του Linux πρέπει επίσης να υποστηρίζονται από το σύστημα εγκατάστασης. Οι " "οδηγοί από αρθρώματα (modules) συνήθως πρέπει να φορτώνονται αυτόματα. " "<phrase arch=\"x86\">Αυτό αφορά τις περισσότερες κάρτες PCI και PCMCIA.</" "phrase> <phrase arch=\"i386\"> Υποστηρίζονται επίσης πολλές παλιότερες " -"κάρτες ISA.</phrase> <phrase arch=\"m68k\">Δείτε, και πάλι τη σελίδα <ulink " -"url=\"&url-m68k-faq;\"></ulink> για πλήρεις λεπτομέρειες.</phrase>" +"κάρτες ISA.</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/el/install-methods.po b/po/el/install-methods.po index 495248895..0312be7af 100644 --- a/po/el/install-methods.po +++ b/po/el/install-methods.po @@ -1817,11 +1817,9 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">Το πρωτόκολλο Reverse Address Resolution " "Protocol (RARP) είναι ένας τρόπος να πείτε στον client ποια διεύθυνση IP να " @@ -1829,12 +1827,9 @@ msgstr "" "πρωτόκολλο BOOTP. </phrase> <phrase condition=\"supports-bootp\">Το BOOTP " "είναι ένα πρωτόκολλο IP που πληροφορεί έναν υπολογιστή για το ποια είναι η " "διεύθυνση IP του και από πού στο δίκτυο να αποκτήσει μια εικόνα εκκίνησης. </" -"phrase><phrase arch=\"m68k\"> Υπάρχει ακόμα μια εναλλακτική λύση σε " -"συστήματα VMEbus: η διεύθυνση IP μπορεί να δοθεί χειροκίνητα στην μνήμη " -"εκκίνησης ROM. </phrase> Το πρωτόκολλο DHCP (Dynamic Host Configuration " -"Protocol) είναι μια πιο ευέλικτη και συμβατή προς τα πίσω επέκταση του " -"πρωτοκόλλου BOOTP. Κάποια συστήματα μπορούν να ρυθμιστούν μόνο μέσω του " -"πρωτοκόλλου αυτού." +"phrase> Το πρωτόκολλο DHCP (Dynamic Host Configuration Protocol) είναι μια " +"πιο ευέλικτη και συμβατή προς τα πίσω επέκταση του πρωτοκόλλου BOOTP. Κάποια " +"συστήματα μπορούν να ρυθμιστούν μόνο μέσω του πρωτοκόλλου αυτού." #. Tag: para #: install-methods.xml:1177 diff --git a/po/el/partitioning.po b/po/el/partitioning.po index d9a2cba09..96adf9f81 100644 --- a/po/el/partitioning.po +++ b/po/el/partitioning.po @@ -739,18 +739,12 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "Ο κύριος και ο δευτερεύων δίσκος στον δευτερεύοντα ελεγκτή IDE μπορεί να " "ονομάζεται <filename>/dev/hdc</filename> και <filename>/dev/hdd</filename>, " "αντίστοιχα. Νεώτεροι ελεγκτές IDE έχουν στην πραγματικότητα δυο κανάλια που " -"λειτουργούν ουσιαστικά σαν δυο ελεγκτές. <phrase arch=\"m68k\"> τα γράμματα " -"πιθανόν να διαφέρουν από αυτά που εμφανίζονται στο πρόγραμμα pdisk για Mac " -"(με άλλα λόγια αυτό που εμφανίζεται σαν <filename>/dev/hdc</filename> στο " -"pdisk να φαίνεται σαν <filename>/dev/hda</filename> στο Debian). </phrase>" +"λειτουργούν ουσιαστικά σαν δυο ελεγκτές." #. Tag: para #: partitioning.xml:372 diff --git a/po/el/post-install.po b/po/el/post-install.po index 3367e8d42..aa86ed951 100644 --- a/po/el/post-install.po +++ b/po/el/post-install.po @@ -60,16 +60,16 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "Εναλλακτικά μπορείτε να πιέσετε τον συνδυασμό πλήκτρων <keycombo> " "<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> " -"<phrase arch=\"powerpc;m68k\"> ή <keycombo> <keycap>Control</keycap> " +"<phrase arch=\"powerpc\"> ή <keycombo> <keycap>Control</keycap> " "<keycap>Shift</keycap> <keycap>Power</keycap> </keycombo> σε συστήματα " "Macintosh</phrase>. Μια τελευταία επιλογή είναι να μπείτε στο σύστημα σαν " "χρήστης root και να πληκτρολογήσετε μια από τις εντολές <command>poweroff</" diff --git a/po/el/preparing.po b/po/el/preparing.po index 3c75d1be9..0cb13be16 100644 --- a/po/el/preparing.po +++ b/po/el/preparing.po @@ -1302,7 +1302,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1313,7 +1312,6 @@ msgstr "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase>και θέλετε να βάλετε το Linux στον ίδιο δίσκο θα πρέπει " "να επαναδιαμερίσετε τον δίσκο. Το Debian απαιτεί τα δικές του κατατμήσεις. " "Δεν μπορεί να εγκατασταθεί σε κατατμήσεις των Windows ή του MacOS. Μπορεί " @@ -1328,8 +1326,7 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" @@ -1338,10 +1335,9 @@ msgstr "" "υπάρχον λειτουργικό σας σύστημα <phrase arch=\"i386\">, όπως για παράδειγμα " "το fdisk ή το PartitionMagic</phrase><phrase arch=\"powerpc\">, όπως για " "παράδειγμα το Drive Setup, το HD Toolkit, ή το MacTools</phrase><phrase arch=" -"\"m68k\">, όπως για παράδειγμα το HD SC Setup, το HDToolBox, ή το SCSITool</" -"phrase><phrase arch=\"s390\">, όπως για παράδειγμα το VM diskmap</phrase>. " -"Τα εργαλεία διαμέρισης παρέχουν πάντα έναν τρόπο παρουσίασης των κατατμήσεων " -"που υπάρχουν χωρίς να γίνονται οποιεσδήποτε αλλαγές." +"\"s390\">, όπως για παράδειγμα το VM diskmap</phrase>. Τα εργαλεία " +"διαμέρισης παρέχουν πάντα έναν τρόπο παρουσίασης των κατατμήσεων που " +"υπάρχουν χωρίς να γίνονται οποιεσδήποτε αλλαγές." #. Tag: para #: preparing.xml:828 diff --git a/po/el/using-d-i.po b/po/el/using-d-i.po index 3a3becc08..2fa3e315d 100644 --- a/po/el/using-d-i.po +++ b/po/el/using-d-i.po @@ -4834,19 +4834,13 @@ msgstr "Συνεχίστε Χωρίς Φορτωτή Εκκίνησης" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "Αυτή η επιλογή μπορεί να χρησιμοποιηθεί για την ολοκλήρωση της εγκατάστασης " "ακόμα κι όταν δεν πρόκειται να εγκατασταθεί κανένας φορτωτής εκκίνησης, είτε " "επειδή δεν προβλέπεται από την αρχιτεκτονική ή την υποαρχιτεκτονική του " "συστήματος, είτε επειδή δεν θέλετε κανέναν ( π.χ. πρόκειται να " -"χρησιμοποιήσετε κάποιον φορτωτή εκκίνησης που ήδη υπάρχει). <phrase arch=" -"\"m68k\">Αυτή η επιλογή είναι ιδιαίτερα χρήσιμη για συστήματα Macintosh, " -"Atari και Amiga, οπού πρέπει να υποστεί αλλαγές το αρχικό λειτουργικό " -"σύστημα και να χρησιμοποιηθεί για την εκκίνηση του GNU/Linux.</phrase>" +"χρησιμοποιήσετε κάποιον φορτωτή εκκίνησης που ήδη υπάρχει)." #. Tag: para #: using-d-i.xml:2891 @@ -4914,14 +4908,14 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "Στην κατάσταση έμπειρου χρήστη θα έχετε πάντα τη δυνατότητα να επιλέξετε αν " -"το ρολόι είναι ρυθμισμένο σε ώρα UTC ή όχι. <phrase arch=\"m68k;powerpc\">Τα " +"το ρολόι είναι ρυθμισμένο σε ώρα UTC ή όχι. <phrase arch=\"powerpc\">Τα " "ρολόγια των υπολογιστών Macintosh ρυθμίζονται συνήθως στην τοπική ώρα. Αν " "θέλετε να έχετε σύστημα διπλής εκκίνησης, επιλέξτε τοπική ώρα αντί της ώρας " "GMT.</phrase> <phrase arch=\"x86\">. Συστήματα που (επίσης) τρέχουν Dos ή " diff --git a/po/fi/boot-installer.po b/po/fi/boot-installer.po index d4974c3f5..ae6dda984 100644 --- a/po/fi/boot-installer.po +++ b/po/fi/boot-installer.po @@ -3667,17 +3667,17 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" "Jotkut käyttäjät saattavat tarvita tiettyä esteettömyysominaisuutta " "esimerkiksi näkövamman vuoksi. <phrase arch=\"alpha;ia64;powerpc;x86\">USB " "pistekirjoitusnäytöt tunnistetaan automaattisesti, mutta useimmat muut </" -"phrase> <phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">Useimmat</phrase> " +"phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">Useimmat</phrase> " "esteettömyysominaisuudet on erikseen otettava käyttöön. <phrase arch=\"x86" "\">Laitteissa joissa ominaisuus on tuettu antaa käynnistysvalikko äänimerkin " "kun voi alkaa kirjoittamaan.</phrase> Joitakin käynnistysvalitsimia voidaan " diff --git a/po/fi/hardware.po b/po/fi/hardware.po index 093209675..d7a6b2395 100644 --- a/po/fi/hardware.po +++ b/po/fi/hardware.po @@ -3216,16 +3216,13 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "Melkein kaikilla Linux-ytimen tukemilla verkkokortteilla (NIC) pitäisi olla " "tuki myös käynnistyslevyillä. Laiteajuri saattaa olla moduuli, joka " "tavallisesti ladataan automaattisesti. <phrase arch=\"x86\">Joukkoon " "kuuluvat useimmat PCI- ja PCMCIA-kortit. <phrase arch=\"i386\">Myös useat " -"vanhat ISA-kortit ovat tuettuja.</phrase> </phrase> <phrase arch=\"m68k" -"\">Katso taas osoitteesta <ulink url=\"&url-m68k-faq;\"></ulink> kattavat " -"tiedot.</phrase>" +"vanhat ISA-kortit ovat tuettuja.</phrase> </phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/fi/install-methods.po b/po/fi/install-methods.po index caeacf1be..916eeb7d7 100644 --- a/po/fi/install-methods.po +++ b/po/fi/install-methods.po @@ -1738,20 +1738,16 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">Reverse Address Resolution Protocol " "(RARP) on yksi tapa kertoa asiakaskoneelle sen IP-osoite. Toinen tapa on " "BOOTP-protokolla. </phrase> <phrase condition=\"supports-bootp\">BOOTP on IP-" "protokolla, joka kertoo tietokoneelle sen IP-osoitteen ja verkosta löytyvän " -"käynnistysotoksen sijainnin. </phrase> <phrase arch=\"m68k\"> Vielä yksi " -"tapa on käytettävissä VMEbus-järjestelmillä: IP-osoite voidaan tallentaa " -"käynnistys-ROMiin.</phrase> DHCP (Dynamic Host Configuration Protocol) on " -"joustavampi alaspäin yhteensopiva BOOTP:n laajennus. Joissakin " +"käynnistysotoksen sijainnin. </phrase> DHCP (Dynamic Host Configuration " +"Protocol) on joustavampi alaspäin yhteensopiva BOOTP:n laajennus. Joissakin " "järjestelmissä verkkoasetukset voidaan tehdä vain DHCP:llä." #. Tag: para diff --git a/po/fi/partitioning.po b/po/fi/partitioning.po index b7b29d5eb..f5cab4f64 100644 --- a/po/fi/partitioning.po +++ b/po/fi/partitioning.po @@ -692,17 +692,11 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "Toissijaisen ohjaimen isäntä- ja orjalevyt ovat <filename>/dev/hdc</" "filename> ja <filename>/dev/hdd</filename>. Uusissa IDE-ohjaimissa saattaa " -"olla kaksi kanavaa, jotka toimivat kuin kaksi ohjainta. <phrase arch=\"m68k" -"\"> Kirjaimet saattavat olla erilaiset mac-ohjelman pdisk näyttämiin (t.s. " -"se minkä pdisk näyttää nimellä <filename>/dev/hdc</filename> näkyy " -"Debianissa nimellä <filename>/dev/hda</filename> in Debian). </phrase>" +"olla kaksi kanavaa, jotka toimivat kuin kaksi ohjainta." #. Tag: para #: partitioning.xml:372 diff --git a/po/fi/post-install.po b/po/fi/post-install.po index 5fb4b6697..23f62b98d 100644 --- a/po/fi/post-install.po +++ b/po/fi/post-install.po @@ -49,15 +49,15 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "Toinen tapa on näppäillä <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</" -"keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;m68k\"> tai " +"keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc\"> tai " "<keycombo> <keycap>Control</keycap> <keycap>Vaihto</keycap> <keycap>Power</" "keycap> </keycombo> Macintosh-järjestelmissä</phrase>. Viimeinen tapa on " "kirjautua sisään pääkäyttäjänä ja komentaa <command>poweroff</command>, " diff --git a/po/fi/preparing.po b/po/fi/preparing.po index 943ffab91..5fb7fd0d6 100644 --- a/po/fi/preparing.po +++ b/po/fi/preparing.po @@ -1249,7 +1249,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1260,7 +1259,6 @@ msgstr "" "Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </phrase> " "<phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, FreeBSD, " "…) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, …) </" -"phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, …) </" "phrase> ja Linux halutaan asentaa samalle levylle, on levy osioitava " "uudelleen. Debian vaatii omat levyosionsa. Sitä ei voi asentaa Windowsin tai " "MacOS:n osioihin. Debian saattaa pysytä jakamaan joitakin osioita muiden " @@ -1274,16 +1272,14 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" "Tiedot levyllä jo olevista osioita löytyvät käyttöjärjestelmän " "osiointityökalujen avulla<phrase arch=\"x86\">, kuten fdisk tai " "PartitionMagic</phrase><phrase arch=\"powerpc\">, kuten Drive Setup, HD " -"Toolkit, tai MacTools</phrase><phrase arch=\"m68k\">, kuten HD SC Setup, " -"HDToolBox, tai SCSITool</phrase><phrase arch=\"s390\">, kuten VM diskmap</" +"Toolkit, tai MacTools</phrase><phrase arch=\"s390\">, kuten VM diskmap</" "phrase>. Osiointityökaluilla on aina mahdollista katsoa levyllä olevien " "osioiden tiedot tekemättä muutoksia." diff --git a/po/fi/using-d-i.po b/po/fi/using-d-i.po index dd0865196..a919e007c 100644 --- a/po/fi/using-d-i.po +++ b/po/fi/using-d-i.po @@ -4576,18 +4576,12 @@ msgstr "Jatketaan ilman käynnistyslatainta" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "Tällä valinnalla voidaan asennus saattaa loppuun asentamatta mitään " "käynnistyslatainta. Näin voidaan tehdä joko koska arkkitehtuurille/" "arkkitehtuurin muunnokselle ei ole käynnistyslatainta tai sitä ei haluta " -"(esim. käytetään jo asennettua käynnistyslatainta). <phrase arch=\"m68k" -"\">Valinta on erityisen hyödyllinen jos tietokone on Macintosh, Atari tai " -"Amiga, joissa alkuperäinen käyttöjärjestelmä on pidettävä käyttökunnossa " -"koska GNU/Linux käynnistetään sen kautta.</phrase>" +"(esim. käytetään jo asennettua käynnistyslatainta)." #. Tag: para #: using-d-i.xml:2891 @@ -4651,14 +4645,14 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "Expert-asennuksessa päästään aina valitsemaan onko kello maailmanajassa vai " -"paikallisessa ajassa. <phrase arch=\"m68k;powerpc\">Macintosh-järjestelmässä " +"paikallisessa ajassa. <phrase arch=\"powerpc\">Macintosh-järjestelmässä " "laitekello on tavallisesti asetettu paikalliseen aikaan. Käytettäessä " "monikäynnistystä valitaan paikallinen aika.</phrase> <phrase arch=\"x86" "\">Järjestelmät joissa on asennettuna (myös) DOS tai Windows on laitekello " diff --git a/po/hu/boot-installer.po b/po/hu/boot-installer.po index 94d2dbab9..05a4b22e1 100644 --- a/po/hu/boot-installer.po +++ b/po/hu/boot-installer.po @@ -3015,12 +3015,12 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" #. Tag: title diff --git a/po/hu/hardware.po b/po/hu/hardware.po index f168198d0..d88fb7da2 100644 --- a/po/hu/hardware.po +++ b/po/hu/hardware.po @@ -3063,15 +3063,12 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "Minden Linux kernel által támogatott hálózati csatolót a telepítő rendszer " "is támogat; a moduláris meghajtók általában önműködően betöltődnek. <phrase " "arch=\"x86\">Ez a legtöbb PCI és PCMCIA kártyára áll.</phrase> <phrase arch=" -"\"i386\">Több régi ISA kártya is támogatott.</phrase> <phrase arch=\"m68k" -"\">Lásd a <ulink url=\"&url-m68k-faq;\"></ulink> leírást a részletekért.</" -"phrase>" +"\"i386\">Több régi ISA kártya is támogatott.</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/hu/install-methods.po b/po/hu/install-methods.po index 12c5701bc..b508f7209 100644 --- a/po/hu/install-methods.po +++ b/po/hu/install-methods.po @@ -1616,21 +1616,17 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">A fordított címfeloldó protokoll (RARP) " "egy mód az ügyfél számára közölni, milyen IP-címet használjon. Egy másik mód " "a BOOTP protokoll.</phrase> <phrase condition=\"supports-bootp\">A BOOTP egy " "IP protokoll mely megmondja egy gép IP-címét és, hogy hol éri el a hálózaton " -"az indító képet.</phrase> <phrase arch=\"m68k\"> Még egy mód van VMEbus " -"rendszereken: az IP-cím kézzel beállítható az indító ROM területén.</phrase> " -"A DHCP (Dinamikus gazda konfiguráló Protokoll) a BOOTP egy sokkal " -"rugalmasabb, visszafelé-kompatibilis kiterjesztése. Egyes rendszerek csak " -"DHCP módon állíthatók be." +"az indító képet.</phrase> A DHCP (Dinamikus gazda konfiguráló Protokoll) a " +"BOOTP egy sokkal rugalmasabb, visszafelé-kompatibilis kiterjesztése. Egyes " +"rendszerek csak DHCP módon állíthatók be." #. Tag: para #: install-methods.xml:1177 diff --git a/po/hu/partitioning.po b/po/hu/partitioning.po index 90f6fc506..d180a50e6 100644 --- a/po/hu/partitioning.po +++ b/po/hu/partitioning.po @@ -695,17 +695,11 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "A másodlagos vezérlő mester (master) és szolga (slave) lemezei neve " "<filename>/dev/hdc</filename> és <filename>/dev/hdd</filename>. Az újabb IDE " -"vezérlők 2 csatornásak, ezek módjára működnek. <phrase arch=\"m68k\"> A " -"betűk eltérhetnek a pdisk által mutatottól (például, amit talán a pdisk mint " -"<filename>/dev/hdc</filename> mutat, a Debian rendszerben <filename>/dev/" -"hda</filename> lehet). </phrase>" +"vezérlők 2 csatornásak, ezek módjára működnek." #. Tag: para #: partitioning.xml:372 diff --git a/po/hu/post-install.po b/po/hu/post-install.po index b65aaa1c8..9708f8ede 100644 --- a/po/hu/post-install.po +++ b/po/hu/post-install.po @@ -52,16 +52,16 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "Más esetben legtöbbször használhatod a <keycombo> <keycap>Ctrl</keycap> " -"<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;" -"m68k\"> vagy Macintosh rendszereken <keycombo> <keycap>Control</keycap> " +"<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc" +"\"> vagy Macintosh rendszereken <keycombo> <keycap>Control</keycap> " "<keycap>Shift</keycap> <keycap>Power</keycap> </keycombo></phrase> " "billentyűket. Végül rendszergazdaként használhatod a <command>poweroff</" "command>, <command>halt</command> vagy <command>shutdown -h now</command> " diff --git a/po/hu/preparing.po b/po/hu/preparing.po index 8a972dff0..71655b85b 100644 --- a/po/hu/preparing.po +++ b/po/hu/preparing.po @@ -1233,7 +1233,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1243,8 +1242,7 @@ msgstr "" "Ha már van egy másik rendszered is a gépen <phrase arch=\"x86\"> (OpenBSD, " "NetBSD, FreeBSD, Solaris, MacOS, OS/2, Windows 9x/NT/2000/XP/2003/" "Vista…)</phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, …) " -"</phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, …) </" -"phrase> és arra a lemezre akarod tenni a GNU/Linux rendszert is, szükség " +"</phrase> és arra a lemezre akarod tenni a GNU/Linux rendszert is, szükség " "lehet a lemez újraparticionálására. A Debian önálló partíciókat igényel. A " "Windows vagy MacOS partíciótól külön kell választani, ha ezeket " "megtartanánk. Képes megosztani partíciókat egyéb GNU/Linux rendszerekkel, de " @@ -1258,18 +1256,16 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" "A már meglévő rendszerhez tartozó particionáló eszközzel megtudhatók a " "jelenlegi partíciók<phrase arch=\"x86\">, ilyen például az fdisk vagy " "pqmagic</phrase><phrase arch=\"powerpc\">, ilyen például a Drive Setup, HD " -"Toolkit, vagy MacTools</phrase><phrase arch=\"m68k\">, ilyen például a HD SC " -"Setup, HDToolBox, vagy SCSITool</phrase><phrase arch=\"s390\">, ilyen " -"például a VM diskmap</phrase>. A partíciós eszközökkel mindig megnézhetők a " -"létező partíciók módosítás nélkül." +"Toolkit, vagy MacTools</phrase><phrase arch=\"s390\">, ilyen például a VM " +"diskmap</phrase>. A partíciós eszközökkel mindig megnézhetők a létező " +"partíciók módosítás nélkül." #. Tag: para #: preparing.xml:828 diff --git a/po/hu/using-d-i.po b/po/hu/using-d-i.po index 64643a476..53428f194 100644 --- a/po/hu/using-d-i.po +++ b/po/hu/using-d-i.po @@ -4428,17 +4428,11 @@ msgstr "Folytatás boot betöltő nélkül" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "E lehetőség használható a telepítés befejezésére boot betöltő nélkül, vagy " "mert az architektúra/al-architektúra nem ad ilyet, vagy mert nem kívánatos " -"(például egy már telepített boot betöltőt használsz). <phrase arch=\"m68k" -"\">E lehetőség különösen hasznos olyan Macintoshokhoz, Atari, és Amiga " -"rendszerekhez, ahol valamiért elkerülhetetlen az eredeti az eredeti rendszer " -"megtartása és használata a GNU/Linux indításához.</phrase>" +"(például egy már telepített boot betöltőt használsz)." #. Tag: para #: using-d-i.xml:2891 @@ -4502,14 +4496,14 @@ msgstr "" #, fuzzy, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "Szakértő módban mindig ki lehet választani, hogy az óra az UTC szerint van-e " -"beállítva vagy sem. <phrase arch=\"m68k;powerpc\">A Macintosh rendszerek sem " +"beállítva vagy sem. <phrase arch=\"powerpc\">A Macintosh rendszerek sem " "tudnak helyi időt számolni. Ha ezt is fennhagynád, válassz helyi időt a GMT " "helyett.</phrase> <phrase arch=\"x86\">A Dos vagy Windows rendszerek sem " "tudnak helyi időt számolni. Ha egy ilyen rendszert is fennhagynál, válassz " diff --git a/po/ja/boot-installer.po b/po/ja/boot-installer.po index 5ff679690..85e016ae8 100644 --- a/po/ja/boot-installer.po +++ b/po/ja/boot-installer.po @@ -3584,22 +3584,22 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" "あるユーザにとっては、目が不自由であるといった理由により、特有の支援が必要な" "ことがあります。<phrase arch=\"alpha;ia64;powerpc;x86\">USB 点字ディスプレイ" "は自動認識します。しかしその他多くの</phrase><phrase arch=\"arm;hppa;mips;" -"mipsel;m68k;sparc\">多くの</phrase>アクセシビリティ機能は手動で有効にする必要" -"があります。<phrase arch=\"x86\">サポートするマシンでは、キーストロークを受け" -"る準備ができるとブートメニューがビープ音を放ちます。</phrase><phrase arch=" -"\"x86\">その後、</phrase>アクセシビリティ機能を有効にするために、ブートパラ" -"メータを付加できます。ほとんどのアーキテクチャでは、キーボードを QWERTY キー" -"ボードとして認識することに注意してください。" +"mipsel;sparc\">多くの</phrase>アクセシビリティ機能は手動で有効にする必要があ" +"ります。<phrase arch=\"x86\">サポートするマシンでは、キーストロークを受ける準" +"備ができるとブートメニューがビープ音を放ちます。</phrase><phrase arch=\"x86" +"\">その後、</phrase>アクセシビリティ機能を有効にするために、ブートパラメータ" +"を付加できます。ほとんどのアーキテクチャでは、キーボードを QWERTY キーボード" +"として認識することに注意してください。" #. Tag: title #: boot-installer.xml:2765 diff --git a/po/ja/hardware.po b/po/ja/hardware.po index d7ae49af7..84d635f44 100644 --- a/po/ja/hardware.po +++ b/po/ja/hardware.po @@ -3241,16 +3241,13 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "Linux カーネルがサポートしているネットワークインターフェースカード (NIC) な" "ら、ほとんどインストールシステムでもサポートしています。ドライバモジュール" "は、通常自動的に読み込まれます。<phrase arch=\"x86\">これには、 ほとんどの " "PCI カードと PCMCIA カードが含まれます。</phrase> <phrase arch=\"i386\">多く" -"の古い ISA カードが、きちんとサポートされています。</phrase> <phrase arch=" -"\"m68k\">完全な詳細は、もう一度 <ulink url=\"&url-m68k-faq;\"></ulink> をご覧" -"ください。</phrase>" +"の古い ISA カードが、きちんとサポートされています。</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po index a740d2807..0c617115a 100644 --- a/po/ja/install-methods.po +++ b/po/ja/install-methods.po @@ -1734,22 +1734,18 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">Reverse Address Resolution Protocol " "(RARP) は、 どの IP を用いるべきかをクライアントに伝える方法のひとつです。 同" "種の方法には BOOTP プロトコルがあります。</phrase> <phrase condition=" "\"supports-bootp\">BOOTP は IP プロトコルのひとつです。 クライアントに対し" "て、使うべき IP アドレスと、 ブートイメージをネットワークのどこから取得するか" -"を伝えます。</phrase> <phrase arch=\"m68k\">VMEbus システムではまた違った選択" -"肢も存在します。 IP アドレスはブート ROM から手動で設定できます。</phrase> " -"DHCP (Dynamic Host Configuration Protocol) は、 BOOTP との後方互換性を保ちつ" -"つ、より柔軟に拡張させたものです。 システムによっては DHCP でしか設定できない" -"こともあります。" +"を伝えます。</phrase> DHCP (Dynamic Host Configuration Protocol) は、 BOOTP " +"との後方互換性を保ちつつ、より柔軟に拡張させたものです。 システムによっては " +"DHCP でしか設定できないこともあります。" #. Tag: para #: install-methods.xml:1177 diff --git a/po/ja/partitioning.po b/po/ja/partitioning.po index d81e04d14..f82dae717 100644 --- a/po/ja/partitioning.po +++ b/po/ja/partitioning.po @@ -711,18 +711,12 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "IDE セカンダリーコントローラのマスターディスクおよびスレーブディスクは、それ" "ぞれ <filename>/dev/hdc</filename>、<filename>/dev/hdd</filename> と名付けら" "れる。最近の IDE コントローラは 2 つのチャンネルを持ち、事実上 2 つのコント" -"ローラがあるかのように動作します。<phrase arch=\"m68k\"> これらの文字は、Mac " -"のプログラム pdisk が表示するものとは異なっています (例えば pdisk 上で " -"<filename>/dev/hdc</filename> と表示されるものが Debian 上では <filename>/" -"dev/hda</filename> と表示されます)。</phrase>" +"ローラがあるかのように動作します。" #. Tag: para #: partitioning.xml:372 diff --git a/po/ja/post-install.po b/po/ja/post-install.po index 99a724f3e..85157c295 100644 --- a/po/ja/post-install.po +++ b/po/ja/post-install.po @@ -47,16 +47,16 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "もう一つの方法として、<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> " -"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;m68k\">、Macintosh シ" -"ステムでは <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc\">、Macintosh システ" +"ムでは <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " "<keycap>Power</keycap> </keycombo> </phrase> のキーを同時に押す方法が使えま" "す。このキーの組合せが効かない場合や、コマンドを打つ方が好みなら、システムを" "再起動するには <command>reboot</command> と打ち込んでください。最後の選択肢と" diff --git a/po/ja/preparing.po b/po/ja/preparing.po index c19821bae..4ac1deccd 100644 --- a/po/ja/preparing.po +++ b/po/ja/preparing.po @@ -1232,7 +1232,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1243,7 +1242,6 @@ msgstr "" "Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </phrase> " "<phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, FreeBSD, " "…) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, …) </" -"phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, …) </" "phrase> が入っていて、同じディスクに Linux も入れたい場合には、ディスクのパー" "ティション分割をやり直す必要があります。Linux は Windows や MacOS のパーティ" "ションにはインストールできません。他の Linux システムとはパーティションを共有" @@ -1257,14 +1255,12 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" "現在のパーティションの設定は、<phrase arch=\"x86\">fdisk や PartitionMagic</" "phrase><phrase arch=\"powerpc\">Drive Setup, HD Toolkit, MacTools</" -"phrase><phrase arch=\"m68k\">HD SC Setup, HDToolBox, SCSITool</" "phrase><phrase arch=\"s390\">VM diskmap</phrase>のような、現在の OS に対応し" "たパーティション分割ツールを使えばわかります。パーティション分割ツールには、" "必ず既存のパーティションを (変更せずに) 表示する機能が付いています。" diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po index a4beff09e..397c89c6b 100644 --- a/po/ja/using-d-i.po +++ b/po/ja/using-d-i.po @@ -4484,17 +4484,12 @@ msgstr "ブートローダなしで継続" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "このオプションは、アーキテクチャ/サブアーキテクチャにブートローダがない、ある" "いはインストールする気がない (例えば、既存のブートローダを使用するつもりであ" "るとか) 時に、ブートローダをインストールしていなくても、インストールを完了す" -"るのに利用できます。<phrase arch=\"m68k\">GNU/Linux を起動するために、オリジ" -"ナルの OS を維持しなければならないような、Macintosh, Atari, Amiga といったシ" -"ステムでは、このオプションが特に役に立ちます。</phrase>" +"るのに利用できます。" #. Tag: para #: using-d-i.xml:2891 @@ -4559,18 +4554,18 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "エキスパートモードでは、常に時計を UTC にあわせるかどうかを選択することになり" -"ます。<phrase arch=\"m68k;powerpc\">Macintosh のハードウェア時計は、通常現地" -"時間にあわせてあります。デュアルブートする場合は、UTC ではなく現地時間を選択" -"してください。</phrase> <phrase arch=\"x86\">DOS や Windows を使用するシステ" -"ムは、通常現地時間にあわせてあります。デュアルブートする場合は、UTC ではなく" -"現地時間を選択してください。</phrase>" +"ます。<phrase arch=\"powerpc\">Macintosh のハードウェア時計は、通常現地時間に" +"あわせてあります。デュアルブートする場合は、UTC ではなく現地時間を選択してく" +"ださい。</phrase> <phrase arch=\"x86\">DOS や Windows を使用するシステムは、" +"通常現地時間にあわせてあります。デュアルブートする場合は、UTC ではなく現地時" +"間を選択してください。</phrase>" #. Tag: para #: using-d-i.xml:2942 diff --git a/po/ko/boot-installer.po b/po/ko/boot-installer.po index caf724946..fe75f2a93 100644 --- a/po/ko/boot-installer.po +++ b/po/ko/boot-installer.po @@ -3550,21 +3550,21 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" "시력에 문제가 있거나 따위의 이유로 특별한 기능이 필요한 사용자가 있습니다. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB 점자 디스플레이는 자동으로 검색하" -"지만, 기타 </phrase> <phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">대부분" -"의</phrase> 접근성 기능은 수동으로 켜야 합니다. <phrase arch=\"x86\">접근성 " -"기능을 지원하는 컴퓨터의 경우 키보드 입력을 받을 준비가 되면 부팅 메뉴에서 " -"삑 소리를 냅니다.</phrase> <phrase arch=\"x86\">그 다음에</phrase> 부팅 파라" -"미터를 추가하면 접근성 기능을 켭니다. 대부분 아키텍처에서 부트로더는 키보드" -"를 QWERTY 키보드라고 가정합니다." +"지만, 기타 </phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">대부분의</" +"phrase> 접근성 기능은 수동으로 켜야 합니다. <phrase arch=\"x86\">접근성 기능" +"을 지원하는 컴퓨터의 경우 키보드 입력을 받을 준비가 되면 부팅 메뉴에서 삑 소" +"리를 냅니다.</phrase> <phrase arch=\"x86\">그 다음에</phrase> 부팅 파라미터" +"를 추가하면 접근성 기능을 켭니다. 대부분 아키텍처에서 부트로더는 키보드를 " +"QWERTY 키보드라고 가정합니다." #. Tag: title #: boot-installer.xml:2765 diff --git a/po/ko/hardware.po b/po/ko/hardware.po index f0c057d6e..6ceece21d 100644 --- a/po/ko/hardware.po +++ b/po/ko/hardware.po @@ -3163,14 +3163,12 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "리눅스 커널이 지원하는 네트워크 인터페이스 카드는 모두 설치 시스템에서도 지원" "합니다. (모듈로 된 드라이버는 자동으로 읽어들입니다.) <phrase arch=\"x86" "\">PCI와 PCMCIA카드도 마찬가지로 지원합니다.</phrase> <phrase arch=\"i386\">" -"오래된 ISA 카드도 지원됩니다.</phrase> <phrase arch=\"m68k\">완전한 정보는 " -"<ulink url=\"&url-m68k-faq;\"></ulink> 사이트를 참고하십시오.</phrase>" +"오래된 ISA 카드도 지원됩니다.</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/ko/install-methods.po b/po/ko/install-methods.po index e985643a2..7e39d197d 100644 --- a/po/ko/install-methods.po +++ b/po/ko/install-methods.po @@ -1697,21 +1697,17 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">Reverse Address Resolution Protocol은 " "(RARP) 어떤 클라이언트에게 어떤 IP 주소를 사용해야 하는 지 알려주는 한 방법입" "니다. 또 다른 방법은 BOOP 프로토콜을 사용하는 것입니다. </phrase> <phrase " "condition=\"supports-bootp\">BOOTP는 컴퓨터에게 그 IP 주소 및 네트워크의 어디" "에서 부팅 이미지를 가져와야 하는 지 알려주는 IP 프로토콜입니다. </phrase> " -"<phrase arch=\"m68k\"> VMEbus 시스템에서는 또 다른 방법이 있습니다. 부팅 ROM" -"에 IP 주소를 수동으로 설정할 수 있습니다. </phrase> DHCP는 (Dynamic Host " -"Configuration Protocol) 더 유연하며, BOOTP와 호환되는 확장 기능입니다. 일부 " -"시스템은 DHCP를 이용해야만 설정할 수 있습니다." +"DHCP는 (Dynamic Host Configuration Protocol) 더 유연하며, BOOTP와 호환되는 확" +"장 기능입니다. 일부 시스템은 DHCP를 이용해야만 설정할 수 있습니다." #. Tag: para #: install-methods.xml:1177 diff --git a/po/ko/partitioning.po b/po/ko/partitioning.po index eac1ad27c..c79531c8e 100644 --- a/po/ko/partitioning.po +++ b/po/ko/partitioning.po @@ -689,17 +689,11 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "IDE 부 컨트롤러의 마스터와 슬레이브는 각각 <filename>/dev/hdc</filename>, " "<filename>/dev/hdd</filename>라고 합니다. 최근의 IDE 컨트롤러는 채널도 2개이" -"므로 컨트롤러 2개처럼 동작할 수도 있습니다. <phrase arch=\"m68k\"> pdisk 매킨" -"토시 프로그램에 표시하는 이름과는 글자가 다를 수도 있습니다. 예를 들어 pdisk" -"에서는 <filename>/dev/hdc</filename>인 하드 디스크가 데비안에서는 <filename>/" -"dev/hda</filename>일 수도 있습니다. </phrase>" +"므로 컨트롤러 2개처럼 동작할 수도 있습니다." #. Tag: para #: partitioning.xml:372 diff --git a/po/ko/post-install.po b/po/ko/post-install.po index ee4051714..b05a33a46 100644 --- a/po/ko/post-install.po +++ b/po/ko/post-install.po @@ -54,16 +54,16 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "다른 방법으로 <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> " -"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;m68k\">아니면 매킨토" -"시 시스템에서는 <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc\">아니면 매킨토시 시" +"스템에서는 <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " "<keycap>Power</keycap> </keycombo> </phrase>키 조합을 누를 수도 있습니다. 또 " "다른 방법으로 위의 키 조합이 동작하지 않거나 명령어 사용을 더 좋아한다면, 루" "트(root)로 로그인해서 <command>poweroff</command>, <command>halt</command> 아" diff --git a/po/ko/preparing.po b/po/ko/preparing.po index de0914f07..50b663eae 100644 --- a/po/ko/preparing.po +++ b/po/ko/preparing.po @@ -1221,7 +1221,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1232,7 +1231,6 @@ msgstr "" "윈도우즈 NT/2000/XP, OS/2, 맥오에스, Solaris, FreeBSD, …) </phrase> " "<phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, 윈도우즈 NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, 맥오에스, " "…) </phrase> 같은 디스크에 리눅스도 설치하려면 디스크를 다시 파티션해" "야 합니다. 데비안은 데비안만 사용하는 디스크 파티션이 따로 있어야 합니다. 데" "비안은 윈도우즈나 맥오에스 파티션에 설치할 수 없습니다. 다른 리눅스 시스템과" @@ -1246,14 +1244,12 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" "현재 파티션 상태는 <phrase arch=\"x86\">fdisk나 PartitionMagic같은</" "phrase><phrase arch=\"powerpc\">Drive Setup이나 HD Toolkit이나 MacTools같은</" -"phrase><phrase arch=\"m68k\">HD SC Setup이나 HDToolBox나 SCSITool같은</" "phrase><phrase arch=\"s390\"> VM diskmap같은</phrase> 현재 운영 체제에 들어 " "있는 파티션 도구를 이용해 알아볼 수 있습니다. 파티션 도구에서 파티션을 바꾸" "지 않고도 현재 파티션을 보기만 할 수 있습니다." diff --git a/po/ko/using-d-i.po b/po/ko/using-d-i.po index fb1752d7f..e145f5866 100644 --- a/po/ko/using-d-i.po +++ b/po/ko/using-d-i.po @@ -4403,16 +4403,11 @@ msgstr "부트로더 없이 계속" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "이 옵션은 부트로더를 설치하지 말고 설치를 마칠 때 사용할 수 있습니다. 이렇게 " "하는 경우는 아마도 해당 아키텍처나 서브 아키텍처에 부트로더가 없거나, 부트로" -"더가 필요없는 경우일 (예를 들어 기존 부트로더를 사용) 것입니다. <phrase arch=" -"\"m68k\">이 옵션은 매킨토시, Atari, Amiga 시스템처럼 기존 운영 체제를 유지하" -"면서 기존 운영 체제에서 GNU/리눅스를 부팅하는 경우에 사용합니다.</phrase>" +"더가 필요없는 경우일 (예를 들어 기존 부트로더를 사용) 것입니다." #. Tag: para #: using-d-i.xml:2891 @@ -4476,17 +4471,17 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "전문가 모드에서는 UTC로 맞출 지 여부를 항상 선택할 수 있습니다. <phrase arch=" -"\"m68k;powerpc\">매킨토시 하드웨어 시계는 보통 지역별 시각으로 맞춥니다. 듀" -"얼 부팅을 하려면 UTC가 아니라 지역별 시각을 선택하십시오.</phrase> <phrase " -"arch=\"x86\">DOS나 윈도우즈도 같이 사용하는 시스템은 보통 지역별 시각으로 맞" -"춥니다. 듀얼 부팅을 하려면 UTC가 아니라 지역별 시각으로 맞추십시오.</phrase>" +"\"powerpc\">매킨토시 하드웨어 시계는 보통 지역별 시각으로 맞춥니다. 듀얼 부팅" +"을 하려면 UTC가 아니라 지역별 시각을 선택하십시오.</phrase> <phrase arch=" +"\"x86\">DOS나 윈도우즈도 같이 사용하는 시스템은 보통 지역별 시각으로 맞춥니" +"다. 듀얼 부팅을 하려면 UTC가 아니라 지역별 시각으로 맞추십시오.</phrase>" #. Tag: para #: using-d-i.xml:2942 diff --git a/po/pt/boot-installer.po b/po/pt/boot-installer.po index 045f2361c..13f5fda18 100644 --- a/po/pt/boot-installer.po +++ b/po/pt/boot-installer.po @@ -3721,24 +3721,24 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" "Alguns utilizadores podem necessitar de suporte especifico devido a, por " "exemplo, visão reduzida. <phrase arch=\"alpha;ia64;powerpc;x86\">Os ecrãs " "braille USB são automaticamente detectados, mas a maioria das outras</" -"phrase> <phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">A maioria das</" -"phrase> funcionalidades de acessibilidade têm de ser activadas manualmente. " -"<phrase arch=\"x86\">Em máquinas que o suportem, o menu de arranque emite um " -"apito quando estiver pronto a ser utilizado o teclado.</phrase> Alguns " -"parâmetros de arranque podem <phrase arch=\"z86\">então</phrase> ser " -"acrescentados para activar as funcionalidades de acessibilidade. Note que na " -"maioria das arquitecturas o gestor de arranque interpreta o seu teclado como " -"sendo um teclado QWERTY." +"phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">A maioria das</phrase> " +"funcionalidades de acessibilidade têm de ser activadas manualmente. <phrase " +"arch=\"x86\">Em máquinas que o suportem, o menu de arranque emite um apito " +"quando estiver pronto a ser utilizado o teclado.</phrase> Alguns parâmetros " +"de arranque podem <phrase arch=\"z86\">então</phrase> ser acrescentados para " +"activar as funcionalidades de acessibilidade. Note que na maioria das " +"arquitecturas o gestor de arranque interpreta o seu teclado como sendo um " +"teclado QWERTY." #. Tag: title #: boot-installer.xml:2765 diff --git a/po/pt/boot-new.po b/po/pt/boot-new.po index 113f860aa..9f14e1159 100644 --- a/po/pt/boot-new.po +++ b/po/pt/boot-new.po @@ -879,18 +879,17 @@ msgstr "" #~ "After a welcome screen, you will be prompted to configure your time zone. " #~ "First select whether the hardware clock of your system is set to local " #~ "time or Greenwich Mean Time (GMT or UTC). The time displayed in the " -#~ "dialog may help you decide on the correct option. <phrase arch=\"m68k;" -#~ "powerpc\">Macintosh hardware clocks are normally set to local time. If " -#~ "you want to dual-boot, select local time instead of GMT.</phrase> <phrase " -#~ "arch=\"i386\">Systems that (also) run Dos or Windows are normally set to " -#~ "local time. If you want to dual-boot, select local time instead of GMT.</" -#~ "phrase>" +#~ "dialog may help you decide on the correct option. <phrase arch=\"powerpc" +#~ "\">Macintosh hardware clocks are normally set to local time. If you want " +#~ "to dual-boot, select local time instead of GMT.</phrase> <phrase arch=" +#~ "\"i386\">Systems that (also) run Dos or Windows are normally set to local " +#~ "time. If you want to dual-boot, select local time instead of GMT.</phrase>" #~ msgstr "" #~ "Depois do ecrã de boas vindas, ser-lhe-á pedido para configurar o seu " #~ "fuso horário. Seleccione primeiramente se o relógio de hardware do seu " #~ "sistema está acertado para a hora local ou para o Horário do Meridiano de " #~ "Greenwhich (GMT ou UTC). O horário apresentado pode ajudar a decidir a " -#~ "opção correcta. <phrase arch=\"m68k;powerpc\">Os relógios de hardware do " +#~ "opção correcta. <phrase arch=\"powerpc\">Os relógios de hardware do " #~ "Macintosh estão normalmente acertados pela hora local. Se pretender " #~ "utilizar o duplo arranque, seleccione hora local em vez de GMT.</phrase> " #~ "<phrase arch=\"i386\">Sistemas que (também) correm Dos ou Windows estão " @@ -1099,13 +1098,13 @@ msgstr "" #~ "for the number of your serial port. In Linux, serial ports are counted " #~ "from 0; your first serial port <phrase arch=\"i386\">(i.e., " #~ "<userinput>COM1</userinput>)</phrase> is <filename>/dev/ttyS0</filename> " -#~ "under Linux. <phrase arch=\"powerpc;m68k\">On Macintoshes with serial " -#~ "ports, the modem port is <filename>/dev/ttyS0</filename> and the printer " -#~ "port is <filename>/dev/ttyS1</filename>.</phrase> The next step is to " -#~ "edit <filename>/etc/chatscripts/provider</filename> and insert your " -#~ "provider's phone number, your user-name and password. Please do not " -#~ "delete the <quote>\\q</quote> that precedes the password. It hides the " -#~ "password from appearing in your log files." +#~ "under Linux. <phrase arch=\"powerpc\">On Macintoshes with serial ports, " +#~ "the modem port is <filename>/dev/ttyS0</filename> and the printer port is " +#~ "<filename>/dev/ttyS1</filename>.</phrase> The next step is to edit " +#~ "<filename>/etc/chatscripts/provider</filename> and insert your provider's " +#~ "phone number, your user-name and password. Please do not delete the " +#~ "<quote>\\q</quote> that precedes the password. It hides the password from " +#~ "appearing in your log files." #~ msgstr "" #~ "Edite o <filename>/etc/ppp/peers/provider</filename> e substitua o " #~ "<userinput>/dev/modem</userinput> por <userinput>/dev/" @@ -1113,14 +1112,14 @@ msgstr "" #~ "replaceable> significa o número da sua porta de série. Em Linux, a " #~ "numeração das portas de série começa em 0; a primeira porta de série " #~ "<phrase arch=\"i386\">(i.e., <userinput>COM1</userinput>)</phrase> é " -#~ "<filename>/dev/ttyS0</filename> em Linux. <phrase arch=\"powerpc;m68k" -#~ "\">Em Macintoshes com portas de série, a porta do modem é <filename>/dev/" -#~ "ttyS0</filename> e a porta da impressora é <filename>/dev/ttyS1</" -#~ "filename>.</phrase> O próximo passo é editar o <filename>/etc/chatscripts/" -#~ "provider</filename> e inserir o número de telefone do seu fornecedor, o " -#~ "seu nome de utilizador e password. Por favor não apague o <quote>\\q</" -#~ "quote> que antecede a password. Isto faz com que a sua password não " -#~ "apareça nos ficheiros de registo." +#~ "<filename>/dev/ttyS0</filename> em Linux. <phrase arch=\"powerpc\">Em " +#~ "Macintoshes com portas de série, a porta do modem é <filename>/dev/ttyS0</" +#~ "filename> e a porta da impressora é <filename>/dev/ttyS1</filename>.</" +#~ "phrase> O próximo passo é editar o <filename>/etc/chatscripts/provider</" +#~ "filename> e inserir o número de telefone do seu fornecedor, o seu nome de " +#~ "utilizador e password. Por favor não apague o <quote>\\q</quote> que " +#~ "antecede a password. Isto faz com que a sua password não apareça nos " +#~ "ficheiros de registo." #~ msgid "" #~ "Many providers use PAP or CHAP for login sequence instead of text mode " diff --git a/po/pt/hardware.po b/po/pt/hardware.po index 63ec34f69..c4b318617 100644 --- a/po/pt/hardware.po +++ b/po/pt/hardware.po @@ -3220,15 +3220,13 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "Quase todas as placas de rede (NIC) suportadas pelo kernel Linux deve também " "ser suportadas pelo sistema de instalação; controladores modulares devem ser " "carregados automaticamente. <phrase arch=\"x86\">Isto inclui a maioria das " "placas PCI e PCMCIA.</phrase> <phrase arch=\"i386\">Muitas placas ISA " -"antigas também são suportadas.</phrase> <phrase arch=\"m68k\">Mais uma vez, " -"veja <ulink url=\"&url-m68k-faq;\">para todos os detalhes</ulink>.</phrase>" +"antigas também são suportadas.</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po index fe59ab5a7..d619cb8a4 100644 --- a/po/pt/install-methods.po +++ b/po/pt/install-methods.po @@ -1768,20 +1768,16 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\"> O Reverse Address Resolution Protocol " "(RARP) é uma maneira de informar o cliente qual o IP deve usar. Outra forma " "é utilizar o protocolo BOOTP. </phrase> <phrase condition=\"supports-bootp" "\">BOOTP é um protocolo IP que informa o computador do seu endereço IP e em " -"que local da rede pode obter uma imagem de arranque.</phrase> <phrase arch=" -"\"m68k\"> Ainda assim existe outra alternativa em sistemas VMEbus: o " -"endereço IP pode ser manualmente configurado na ROM de arranque. </phrase> O " -"DHCP (Dynamic Host Configuration Protocol) é mais flexível, compatível com " +"que local da rede pode obter uma imagem de arranque.</phrase> O DHCP " +"(Dynamic Host Configuration Protocol) é mais flexível, compatível com " "extensões anteriores do BOOTP. Alguns sistemas apenas podem ser configurados " "via DHCP." diff --git a/po/pt/partitioning.po b/po/pt/partitioning.po index a55fe4b6a..f5ba0dd08 100644 --- a/po/pt/partitioning.po +++ b/po/pt/partitioning.po @@ -715,18 +715,12 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "Os discos master e slave do controlador IDE secundário poderão ser chamados " "<filename>/dev/hdc</filename> e <filename>/dev/hdd</filename>, " "respectivamente. Controladores IDE mais recentes poderão ter actualmente " -"dois canais, agindo efectivamente como dois controladores. <phrase arch=" -"\"m68k\"> As letras poderão diferir do que é mostrado no programa pdisk do " -"mac (ex. Em Debian, o que é mostrado como <filename>/dev/hdc</filename> no " -"pdisk poderá ser mostrado como <filename>/dev/hda</filename>). </phrase>" +"dois canais, agindo efectivamente como dois controladores." #. Tag: para #: partitioning.xml:372 diff --git a/po/pt/post-install.po b/po/pt/post-install.po index 470d01360..6f620055e 100644 --- a/po/pt/post-install.po +++ b/po/pt/post-install.po @@ -51,16 +51,16 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "Em alternativa pode pressionar a combinação de teclas <keycombo> " "<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> " -"<phrase arch=\"powerpc;m68k\"> ou <keycombo> <keycap>Control</keycap> " +"<phrase arch=\"powerpc\"> ou <keycombo> <keycap>Control</keycap> " "<keycap>Shift</keycap> <keycap>Power</keycap> </keycombo> em sistemas " "Macintosh</phrase>. A última opção é fazer login como root e escrever um dos " "comandos <command>poweroff</command>, <command>halt</command> ou " diff --git a/po/pt/preparing.po b/po/pt/preparing.po index 8a5c98eb4..f8b8781da 100644 --- a/po/pt/preparing.po +++ b/po/pt/preparing.po @@ -1271,7 +1271,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1282,7 +1281,6 @@ msgstr "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> e quiser colocar Linux no mesmo disco, vai necessitar de " "reparticionar o disco. Debian necessita das suas próprias partições no disco " "rígido. Não pode ser instalado em partições Windows ou MacOS. Pode ser " @@ -1297,8 +1295,7 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" @@ -1306,10 +1303,9 @@ msgstr "" "partições utilizando uma ferramenta de particionamento para o seu actual " "sistema operativo, <phrase arch=\"x86\"> tal como o fdisk ou o " "PartitionMagic</phrase><phrase arch=\"powerpc\">, tal como o Drive Setup, HD " -"Toolkit, ou MacTools</phrase><phrase arch=\"m68k\">, tal como HD SC Setup, " -"HDToolBox, ou SCSITool</phrase><phrase arch=\"s390\">, tal como o VM " -"diskmap</phrase>. As ferramentas de particionamento têm sempre uma forma de " -"mostrar as partições actuais sem efectuar alterações." +"Toolkit, ou MacTools</phrase><phrase arch=\"s390\">, tal como o VM diskmap</" +"phrase>. As ferramentas de particionamento têm sempre uma forma de mostrar " +"as partições actuais sem efectuar alterações." #. Tag: para #: preparing.xml:828 diff --git a/po/pt/using-d-i.po b/po/pt/using-d-i.po index af7eb1b1c..85c53d3c6 100644 --- a/po/pt/using-d-i.po +++ b/po/pt/using-d-i.po @@ -4689,18 +4689,12 @@ msgstr "Continuar Sem Gestor de Arranque" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "Esta opção pode ser usada para completar a instalação mesmo que o gestor de " "arranque não tenho sido instalado, ou pelo facto da arch/subarch não ter " "fornecido nenhum, ou porque nenhum ter sido desejado (p. ex. você irá usar o " -"gestor de arranque existente). <phrase arch=\"m68k\"> Esta opção é " -"especialmente útil para sistemas Macintosh, Atari, e Amiga, onde o sistema " -"operativo original terá que ser mantido inalterável e utilizado para " -"arrancar o GNU/Linux.</phrase>" +"gestor de arranque existente)." #. Tag: para #: using-d-i.xml:2891 @@ -4767,14 +4761,14 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "No modo expert poderá sempre poder escolher se o relógio está ou não " -"definido para UTC. <phrase arch=\"m68k;powerpc\">Os relógios de hardware " +"definido para UTC. <phrase arch=\"powerpc\">Os relógios de hardware " "Macintosh estão normalmente definidos para hora local. Se quer utilizar " "'dual-boot', escolha hora local em vez de UTC.</phrase> <phrase arch=\"x86" "\">Sistemas que (também) corram Dos ou Windows estão normalmente definidos " diff --git a/po/ro/using-d-i.po b/po/ro/using-d-i.po index 571bbf178..60d7edd09 100644 --- a/po/ro/using-d-i.po +++ b/po/ro/using-d-i.po @@ -4227,10 +4227,7 @@ msgstr "" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" #. Tag: para @@ -4283,11 +4280,11 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" #. Tag: para diff --git a/po/ru/boot-installer.po b/po/ru/boot-installer.po index a4240bc41..34f95d447 100644 --- a/po/ru/boot-installer.po +++ b/po/ru/boot-installer.po @@ -3702,17 +3702,17 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" "Некоторым пользователя может потребоваться специальная поддержка из-за, " "например, проблем со зрением. <phrase arch=\"alpha;ia64;powerpc;x86\">USB-" "дисплеи Брайля обнаруживаются автоматически, но большинство других </phrase> " -"<phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">Большинство</phrase> " +"<phrase arch=\"arm;hppa;mips;mipsel;sparc\">Большинство</phrase> " "возможностей удобства управления нужно включать вручную. <phrase arch=\"x86" "\">На машинах (если это ими поддерживается) загрузочное меню выдаёт звуковой " "сигнал, когда оно готово принимать команды с клавиатуры.</phrase> Для " diff --git a/po/ru/hardware.po b/po/ru/hardware.po index 52fbd09d4..2c0c9e0a8 100644 --- a/po/ru/hardware.po +++ b/po/ru/hardware.po @@ -3321,15 +3321,13 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "Почти любая сетевая плата (NIC), поддерживаемая ядром Linux, должна " "поддерживаться системой установки; драйверы модулей должны загрузиться " "автоматически. <phrase arch=\"x86\">Это относится к почти всем картам PCI и " "PCMCIA.</phrase> <phrase arch=\"i386\">Также поддерживается много старых " -"карт ISA.</phrase> <phrase arch=\"m68k\">В любом случае, подробней смотрите " -"в <ulink url=\"&url-m68k-faq;\"></ulink>.</phrase>" +"карт ISA.</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po index 99ef535d6..0349988c1 100644 --- a/po/ru/install-methods.po +++ b/po/ru/install-methods.po @@ -1744,21 +1744,18 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">Reverse Address Resolution Protocol " "(RARP) — это один из путей указать клиенту какой адрес IP для него " "предназначен. Другой способ — использовать BOOTP протокол. </phrase> " "<phrase condition=\"supports-bootp\">BOOTP — это IP протокол, который " "информирует компьютер о его IP-адресе и где в сети получить загрузочный " -"образ.</phrase> <phrase arch=\"m68k\"> Другая альтернатива есть на системах " -"VMEbus: IP-адрес можно вручную настроить в boot ROM. </phrase> DHCP (Dynamic " -"Host Configuration Protocol) более гибок и обратно совместим с BOOTP. " -"Некоторые системы могут быть настроены только через DHCP." +"образ.</phrase> DHCP (Dynamic Host Configuration Protocol) более гибок и " +"обратно совместим с BOOTP. Некоторые системы могут быть настроены только " +"через DHCP." #. Tag: para #: install-methods.xml:1177 diff --git a/po/ru/partitioning.po b/po/ru/partitioning.po index 398656722..0ca1cd9d5 100644 --- a/po/ru/partitioning.po +++ b/po/ru/partitioning.po @@ -715,17 +715,12 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "Мастер и подчинённый диски вторичного контроллера называются <filename>/dev/" "hdc</filename> и <filename>/dev/hdd</filename> соответственно. Новые IDE " "контроллеры могут на самом деле иметь два канала, эффективно действуя как " -"два независимых контроллера. <phrase arch=\"m68k\"> Буквы в mac программе " -"pdisk могут быть другими (то есть, <filename>/dev/hdc</filename> в pdisk " -"может быть как <filename>/dev/hda</filename> в Debian). </phrase>" +"два независимых контроллера." #. Tag: para #: partitioning.xml:372 diff --git a/po/ru/post-install.po b/po/ru/post-install.po index 2596ec8f9..821a06e6a 100644 --- a/po/ru/post-install.po +++ b/po/ru/post-install.po @@ -52,16 +52,16 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "Также можно нажать комбинацию клавиш <keycombo> <keycap>Ctrl</keycap> " -"<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;" -"m68k\"> или <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc" +"\"> или <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " "<keycap>Power</keycap> </keycombo> на системах Macintosh</phrase>. Если " "комбинация клавиш не работает или вы предпочитаете вводить команды, то как " "последний вариант можно войти в систему под именем root и выполнить одну из " diff --git a/po/ru/preparing.po b/po/ru/preparing.po index 28e3cf3c0..72d20a08b 100644 --- a/po/ru/preparing.po +++ b/po/ru/preparing.po @@ -1269,7 +1269,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1280,9 +1279,8 @@ msgstr "" "\"> (Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, " "…) </phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, " "Windows NT, FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, " -"OS/390, …) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac " -"OS, …) </phrase> и вы хотите добавить Linux на тот же диск, то вам " -"нужно его переразметить. Для Debian нужно создать отдельные разделы на " +"OS/390, …) </phrase> и вы хотите добавить Linux на тот же диск, то " +"вам нужно его переразметить. Для Debian нужно создать отдельные разделы на " "жёстком диске. Он не может быть установлен на разделы Windows или MacOS. Он " "может совместно использовать некоторые разделы с другими системами Linux, но " "в этом руководстве это не описывается. Как минимум, вам нужно выделить место " @@ -1295,17 +1293,15 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" "Вы можете найти информацию об имеющихся разделах с помощью инструментов " "разметки из имеющейся операционной системы<phrase arch=\"x86\">, например, " "fdisk или PartitionMagic</phrase><phrase arch=\"powerpc\">, например, Drive " -"Setup, HD Toolkit или MacTools</phrase><phrase arch=\"m68k\">, например, HD " -"SC Setup, HDToolBox или SCSITool</phrase><phrase arch=\"s390\">, например, " -"VM diskmap</phrase>. Любая утилита разметки умеет показывать существующие " +"Setup, HD Toolkit или MacTools</phrase><phrase arch=\"s390\">, например, VM " +"diskmap</phrase>. Любая утилита разметки умеет показывать существующие " "разделы без их изменения." #. Tag: para diff --git a/po/ru/using-d-i.po b/po/ru/using-d-i.po index 8e2ad0395..25d99ae7c 100644 --- a/po/ru/using-d-i.po +++ b/po/ru/using-d-i.po @@ -4627,18 +4627,12 @@ msgstr "Продолжение без системного загрузчика" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "Эта опция может быть использована для завершения установки без установки " "системного загрузчика, если для этой архитектуры/субархитектуры его не " "существует или потому что, он вам не нужен (например, чтобы использовать " -"существующий системный загрузчик). <phrase arch=\"m68k\">Эта опция особенно " -"полезна для машин Macintosh, Atari и Amiga, где родная операционная система " -"должна управлять компьютером и использоваться для загрузки GNU/Linux.</" -"phrase>" +"существующий системный загрузчик)." #. Tag: para #: using-d-i.xml:2891 @@ -4704,14 +4698,14 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "В экспертном режиме вы всегда можете выбрать установлены ли часы по Гринвичу " -"или нет. <phrase arch=\"m68k;powerpc\">Аппаратные часы на Macintosh обычно " +"или нет. <phrase arch=\"powerpc\">Аппаратные часы на Macintosh обычно " "показывают местное время. Если хотите использовать мультизагрузку, выберите " "местное время вместо UTC.</phrase> <phrase arch=\"x86\">В системах, которые " "(также) работают под Dos или Windows, часы обычно настроены на местное " diff --git a/po/sv/boot-installer.po b/po/sv/boot-installer.po index 4f17d4a7b..b9a2105f9 100644 --- a/po/sv/boot-installer.po +++ b/po/sv/boot-installer.po @@ -3702,23 +3702,23 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" "Vissa användare kan behöva speciellt stöd på grund av någon typ av nedsatt " "syn. <phrase arch=\"alpha;ia64;powerpc;x86\">USB-punktskriftsskärmar " "upptäcks automatiskt men de flesta andra</phrase> <phrase arch=\"arm;hppa;" -"mips;mipsel;m68k;sparc\">De flesta</phrase> hjälpmedelsfunktioner måste " -"aktiveras manuellt. <phrase arch=\"x86\">På datorer som har stöd för det så " -"skickar uppstartsmenyn ut ett pip när den är redo för att ta emot " -"tangenttryckningar.</phrase> Vissa uppstartsparametrar kan <phrase arch=\"x86" -"\">sedan</phrase> läggas till för att aktivera hjälpmedelsfunktioner. " -"Obserera att på de flesta arkitekturer så tolkar starthanteraren ditt " -"tangentbord som ett QWERTY-tangentbord." +"mips;mipsel;sparc\">De flesta</phrase> hjälpmedelsfunktioner måste aktiveras " +"manuellt. <phrase arch=\"x86\">På datorer som har stöd för det så skickar " +"uppstartsmenyn ut ett pip när den är redo för att ta emot tangenttryckningar." +"</phrase> Vissa uppstartsparametrar kan <phrase arch=\"x86\">sedan</phrase> " +"läggas till för att aktivera hjälpmedelsfunktioner. Obserera att på de " +"flesta arkitekturer så tolkar starthanteraren ditt tangentbord som ett " +"QWERTY-tangentbord." #. Tag: title #: boot-installer.xml:2765 diff --git a/po/sv/hardware.po b/po/sv/hardware.po index b151ffc87..87ba41fc2 100644 --- a/po/sv/hardware.po +++ b/po/sv/hardware.po @@ -3203,15 +3203,13 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "Nästan alla nätverkskort (NIC) som stöds av Linux-kärnan stöds även av " "installationssystemet; modulära drivrutiner ska vanligtvis läsas in " "automatiskt. <phrase arch=\"x86\">Det här inkluderat de flesta PCI- och " "PCMCIA-korten.</phrase> <phrase arch=\"i386\">Många äldre ISA-kort stöds " -"också.</phrase> <phrase arch=\"m68k\">Igen, se <ulink url=\"&url-m68k-faq;" -"\"></ulink> för fullständiga detaljer.</phrase>" +"också.</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/sv/install-methods.po b/po/sv/install-methods.po index 22eb15843..c1b830997 100644 --- a/po/sv/install-methods.po +++ b/po/sv/install-methods.po @@ -1753,21 +1753,17 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">Reverse Address Resolution Protocol " "(RARP) är ett sätt att berätta för din klient vilken IP-adress den själv ska " "använda. Ett annat sätt är att använda BOOTP-protokollet.</phrase> <phrase " "condition=\"supports-bootp\">BOOTP är ett IP-protokoll som informerar en " "dator om dess IP-adress och var på nätverket den kan hämta en " -"uppstartsavbildning.</phrase> <phrase arch=\"m68k\">Ytterligare ett " -"alternativ finns för VMEbus-system: IP-adressen kan manuellt konfigureras i " -"uppstarts-ROM.</phrase> DHCP (Dynamic Host Configuration Protocol) är en mer " -"flexibel, bakåtkompatibel utökning av BOOTP. Vissa system kan endast " +"uppstartsavbildning.</phrase> DHCP (Dynamic Host Configuration Protocol) är " +"en mer flexibel, bakåtkompatibel utökning av BOOTP. Vissa system kan endast " "konfigureras via DHCP." #. Tag: para diff --git a/po/sv/partitioning.po b/po/sv/partitioning.po index e307f15c1..acd213f6c 100644 --- a/po/sv/partitioning.po +++ b/po/sv/partitioning.po @@ -706,17 +706,11 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "Master- och slavdiskar för sekundära styrkortet kan kallas <filename>/dev/" "hdc</filename> och <filename>/dev/hdd</filename>, respektive. Nyare IDE-" -"styrkort kan faktiskt ha två kanaler, och fungera som två styrkort. <phrase " -"arch=\"m68k\"> Bokstäverna kan skilja sig från vad som visas i Mac-" -"programmet pdisk (alltså, vad som visas som <filename>/dev/hdc</filename> i " -"pdisk kan visas som <filename>/dev/hda</filename> i Debian). </phrase>" +"styrkort kan faktiskt ha två kanaler, och fungera som två styrkort." #. Tag: para #: partitioning.xml:372 diff --git a/po/sv/post-install.po b/po/sv/post-install.po index da42fe36b..e9abe2807 100644 --- a/po/sv/post-install.po +++ b/po/sv/post-install.po @@ -50,16 +50,16 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "Alternativt kan du trycka ner tangentkombinationen <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> eller <keycombo> <keycap>Control</keycap> <keycap>Shift</" +"\"powerpc\"> eller <keycombo> <keycap>Control</keycap> <keycap>Shift</" "keycap> <keycap>Power</keycap> </keycombo> på Macintosh-system</phrase>. Ett " "sista alternativ är att logga in som root och skriva ett av följande " "kommandon <command>poweroff</command>, <command>halt</command> eller " diff --git a/po/sv/preparing.po b/po/sv/preparing.po index 9b5ad6fe6..1e0326be3 100644 --- a/po/sv/preparing.po +++ b/po/sv/preparing.po @@ -1261,7 +1261,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1272,7 +1271,6 @@ msgstr "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> och vill ha Linux på samma disk, behöver du antaglien " "partitionera om disken. Debian kräver sina egna hårddiskpartitioner och kan " "inte installeras på Windows- eller MacOS-partitioner. Det kan dela vissa " @@ -1286,8 +1284,7 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" @@ -1295,7 +1292,6 @@ msgstr "" "använda ett partitioneringsverktyg för ditt aktuella operativsystem<phrase " "arch=\"x86\">, såsom fdisk eller PartitionMagic</phrase><phrase arch=" "\"powerpc\">, såsom Drive Setup, HD Toolkit eller MacTools</phrase><phrase " -"arch=\"m68k\">, såsom HD SC Setup, HDToolBox eller SCSITool</phrase><phrase " "arch=\"s390\">, såsom VM diskmap</phrase>. Partitioneringsverktyg " "tillhandahåller alltid ett sätt att visa befintliga partitioner utan att " "göra ändringar." diff --git a/po/sv/using-d-i.po b/po/sv/using-d-i.po index 72b19ed2a..2dcfc1375 100644 --- a/po/sv/using-d-i.po +++ b/po/sv/using-d-i.po @@ -4660,18 +4660,12 @@ msgstr "Fortsätt utan starthanterare" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "Det här alternativet kan användas för att färdigställa installationen även " "om inte starthanterare kommer att installeras, antingen på grund av att " "arkitekturen/underarkitekturen inte erbjuder en eller på grund av att ingen " -"önskas (exempelvis, du vill använda den befintliga starthanteraren). <phrase " -"arch=\"m68k\">Det här alternativet är speciellt användbart för Macintosh, " -"Atari, och Amiga-system, där det ursprungliga operativsystemet måste hållas " -"kvar på burken och användas för att starta upp GNU/Linux.</phrase>" +"önskas (exempelvis, du vill använda den befintliga starthanteraren)." #. Tag: para #: using-d-i.xml:2891 @@ -4738,18 +4732,18 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "I expertläget kan du alltid välja om eller inte klockan är inställd till " -"UTC. <phrase arch=\"m68k;powerpc\">Maskinvaruklockor på Macintosh är " -"vanligtvis inställda till lokal tid. Om du vill använda dubbel-uppstart, " -"välj lokal tid istället för UTC.</phrase> <phrase arch=\"x86\">System som " -"(även) kör Dos eller Windows är vanligtvis inställda till lokal tid. Om du " -"vill använda dubbel uppstart, välj lokal tid istället för UTC.</phrase>" +"UTC. <phrase arch=\"powerpc\">Maskinvaruklockor på Macintosh är vanligtvis " +"inställda till lokal tid. Om du vill använda dubbel-uppstart, välj lokal tid " +"istället för UTC.</phrase> <phrase arch=\"x86\">System som (även) kör Dos " +"eller Windows är vanligtvis inställda till lokal tid. Om du vill använda " +"dubbel uppstart, välj lokal tid istället för UTC.</phrase>" #. Tag: para #: using-d-i.xml:2942 diff --git a/po/vi/boot-installer.po b/po/vi/boot-installer.po index 2010fad37..dc41b75fe 100644 --- a/po/vi/boot-installer.po +++ b/po/vi/boot-installer.po @@ -3722,12 +3722,12 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" #. Tag: title diff --git a/po/vi/hardware.po b/po/vi/hardware.po index a122cd989..70c43f216 100644 --- a/po/vi/hardware.po +++ b/po/vi/hardware.po @@ -3269,15 +3269,13 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "Gần tất cả các thẻ giao thức mạng (NIC) được hỗ trợ bởi hạt nhân Linux nên " "cũng được hỗ trợ bởi hệ thống cài đặt: các trình điều khiển kiểu mô-đun nên " "bình thường được nạp tự động. <phrase arch=\"x86\">Cũng gồm phần lớn thẻ " "kiểu PCI và PCMCIA.</phrase> <phrase arch=\"i386\">Nhiều thẻ kiểu ISA cũ hơn " -"cũng được hỗ trợ.</phrase> <phrase arch=\"m68k\">Lại xem Hỏi Đáp <ulink url=" -"\"&url-m68k-faq;\"></ulink> để tìm chi tiết hoàn toàn.</phrase>" +"cũng được hỗ trợ.</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/vi/install-methods.po b/po/vi/install-methods.po index 113137d81..56505b15e 100644 --- a/po/vi/install-methods.po +++ b/po/vi/install-methods.po @@ -1760,22 +1760,18 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">Giao thức quyết định địa chỉ ngược lại " "(RARP) là một cách báo ứng dụng khách biết địa chỉ IP nào cần dùng để nhận " "diện chính nó. Một cách khác là dùng giao thức BOOTP.</phrase> <phrase " "condition=\"supports-bootp\">BOOTP là một giao thức IP báo máy tính biết địa " "chỉ IP của chính nó và nơi trên mạng có thể lấy ảnh khởi động.</phrase> " -"<phrase arch=\"m68k\">Còn có một cách khác trên hệ thống kiểu VMEbus: địa " -"chỉ IP có thể được tự cấu hình trong bộ nhớ ROM khởi động.</phrase> <phrase " -"condition=\"supports-dhcp\">DHCP (giao thức cấu hình máy động) là một phần " -"mở rộng BOOTP dẻo hơn và có khả năng tương thích ngược. Một số hệ thống " -"riêng chỉ có thể được cấu hình bằng DHCP.</phrase>" +"<phrase condition=\"supports-dhcp\">DHCP (giao thức cấu hình máy động) là " +"một phần mở rộng BOOTP dẻo hơn và có khả năng tương thích ngược. Một số hệ " +"thống riêng chỉ có thể được cấu hình bằng DHCP.</phrase>" #. Tag: para #: install-methods.xml:1177 diff --git a/po/vi/partitioning.po b/po/vi/partitioning.po index 0e436a1fc..401c675f1 100644 --- a/po/vi/partitioning.po +++ b/po/vi/partitioning.po @@ -703,17 +703,12 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "Hai đĩa cái và phụ của bộ điều khiển phụ có tên <filename>/dev/hdc</" "filename> và <filename>/dev/hdd</filename>, riêng từng cái. Bộ điều khiển " "IDE mới hơn thật sự có khả năng có hai kênh, kết quả là hoạt động như hai bộ " -"điều khiển. <phrase arch=\"m68k\"> Những chữ có thể khác biệt với chữ được " -"hiển thị trong chương trình Mac pdisk (tức là pdisk hiển thị <filename>/dev/" -"hdc</filename> còn Debian hiển thị <filename>/dev/hda</filename>). </phrase>" +"điều khiển." #. Tag: para #: partitioning.xml:372 diff --git a/po/vi/post-install.po b/po/vi/post-install.po index 5600aca48..1d8e23172 100644 --- a/po/vi/post-install.po +++ b/po/vi/post-install.po @@ -52,16 +52,16 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "Hoặc bạn có khả năng bấm tổ hợp phím <keycombo> <keycap>Ctrl</keycap> " -"<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;" -"m68k\"> hoặc <keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> " +"<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc" +"\"> hoặc <keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> " "<keycap>điện</keycap> </keycombo> trên máy tính kiểu Macintosh</phrase>. Một " "tùy chọn cuối cùng là việc đăng nhập như là người chủ (root) và gõ một của " "những lệnh này: <command>poweroff</command> (tắt điện), <command>halt</" diff --git a/po/vi/preparing.po b/po/vi/preparing.po index 1ba382a70..df50c9dac 100644 --- a/po/vi/preparing.po +++ b/po/vi/preparing.po @@ -1251,7 +1251,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1262,7 +1261,6 @@ msgstr "" "9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </phrase> " "<phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, FreeBSD, " "…) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, …) </" -"phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, …) </" "phrase> và bạn muốn thêm Linux vào cùng một đĩa, bạn sẽ cần phải phân vùng " "lại đĩa đó. Debian cần thiết một số phân vùng riêng trên đĩa cứng. Không thể " "cài đặt nó vào phân vùng kiểu Windows hay MacOS. Có lẽ nó chia sẻ được phân " @@ -1276,17 +1274,15 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" "Bạn có thể tìm thông tin về thiết lập phân vùng hiện thời của máy tính bằng " "cách sử dụng một công cụ phân vùng cho hệ điều hành đã có<phrase arch=\"x86" "\">, v.d. fdisk hay PartitionMagic</phrase><phrase arch=\"powerpc\">, v.d. " -"Drive Setup, HD Toolkit, hay MacTools</phrase><phrase arch=\"m68k\">, v.d. " -"HD SC Setup, HDToolBox, hay SCSITool</phrase><phrase arch=\"s390\">, v.d. sơ " -"đồ đĩa VM</phrase>. Mọi công cụ phân vùng cung cấp cách hiển thị các phân " +"Drive Setup, HD Toolkit, hay MacTools</phrase><phrase arch=\"s390\">, v.d. " +"sơ đồ đĩa VM</phrase>. Mọi công cụ phân vùng cung cấp cách hiển thị các phân " "vùng đã có, chưa thay đổi gì." #. Tag: para diff --git a/po/vi/using-d-i.po b/po/vi/using-d-i.po index 886284c90..b9fa1d72a 100644 --- a/po/vi/using-d-i.po +++ b/po/vi/using-d-i.po @@ -4616,17 +4616,11 @@ msgstr "Tiếp tục không có bộ nạp khởi động" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "Tùy chọn này có thể được dùng để làm xong tiến trình cài đặt ngay cả khi " "không có bộ nạp khởi động cần cài đặt, hoặc vì kiến trúc/kiến trúc phụ không " -"cung cấp, hoặc vì không muốn nó (v.d. bạn sẽ dùng bộ nạp khởi động đã có). " -"<phrase arch=\"m68k\">Tùy chọn này có ích đặc biệt cho hệ thống kiểu " -"Macintosh, Atari và Amiga, nơi hệ điều hành gốc phải được duy trì trên máy " -"đó và được dùng để khởi động hệ điều hành GNU/Linux.</phrase>" +"cung cấp, hoặc vì không muốn nó (v.d. bạn sẽ dùng bộ nạp khởi động đã có)." #. Tag: para #: using-d-i.xml:2891 @@ -4691,15 +4685,15 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" "Ở chế độ nhà chuyên môn, bạn lúc nào cũng có khả năng chọn nếu đồng hồ của " -"máy tính được đặt thành thời gian thế giới (UTC) không. <phrase arch=\"m68k;" -"powerpc\">Đồng hồ phần cứng của máy Mac thường được đặt thành giờ cục bộ. " +"máy tính được đặt thành thời gian thế giới (UTC) không. <phrase arch=" +"\"powerpc\">Đồng hồ phần cứng của máy Mac thường được đặt thành giờ cục bộ. " "Nếu bạn muốn khởi động đôi, hãy chọn giờ cục bộ hơn là UTC.</phrase> <phrase " "arch=\"x86\">Hệ thống (cũng) chạy DOS hay Windows thường được đặt thành giờ " "cục bộ. Nếu bạn muốn khởi động đôi, hãy chọn giờ cục bộ hơn UTC.</phrase>" diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po index 840061fdc..75dd5f4cc 100644 --- a/po/zh_CN/boot-installer.po +++ b/po/zh_CN/boot-installer.po @@ -3405,16 +3405,16 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" "一些用户，比如有视觉障碍的，可能需要特别的支持。<phrase arch=\"alpha;ia64;" "powerpc;x86\">USB 盲文点显器(braille display) 可以自动被检测到，但多数情况下" -"其他的</phrase> <phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">多数情况下</" +"其他的</phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">多数情况下</" "phrase> 辅助功能不得不使用手动进行设置。<phrase arch=\"x86\">在能支持的机器" "上，接受输入时，引导菜单会发出一声 beep。</phrase> 一些引导参数可以 <phrase " "arch=\"x86\">接着</phrase> 被添加到后面打开辅助功能。需要注意在大多数架构下 " diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po index 451079491..54b90638a 100644 --- a/po/zh_CN/hardware.po +++ b/po/zh_CN/hardware.po @@ -3134,14 +3134,11 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "几乎所有被 Linux 内核支持的网络接口卡(NIC)也全都被安装系统所支持；驱动模块通" "常会自动加载。<phrase arch=\"x86\">这包含大多数 PCI 和 PCMCIA 卡。</phrase> " -"<phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase> <phrase arch=\"m68k" -"\">再次，参阅 <ulink url=\"&url-m68k-faq;\"></ulink> 获得完整的信息。</" -"phrase>" +"<phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase>" #. Tag: para #: hardware.xml:1786 diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po index d3157a62f..d0e690e06 100644 --- a/po/zh_CN/install-methods.po +++ b/po/zh_CN/install-methods.po @@ -1612,19 +1612,16 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol " "(RARP) 是一种告诉您的客户机它自己 IP 地址的方法。另外一种方法是采用 BOOTP 协" "议。</phrase> <phrase condition=\"supports-bootp\">BOOTP 是一种 IP 协议，用来" -"告诉一台计算机它自己 IP 地址以及从网络何处获得启动映像。</phrase> <phrase " -"arch=\"m68k\">在 VMEbus 系统上面的另外一种选择是：IP 地址可以能够在引导 ROM " -"中手工配置。</phrase> DHCP (Dynamic Host Configuration Protocol) 是一个更灵" -"活，向后兼容的 BOOTP 扩展。有些系统只能通过 DHCP 来配置。" +"告诉一台计算机它自己 IP 地址以及从网络何处获得启动映像。</phrase> DHCP " +"(Dynamic Host Configuration Protocol) 是一个更灵活，向后兼容的 BOOTP 扩展。有" +"些系统只能通过 DHCP 来配置。" #. Tag: para #: install-methods.xml:1177 diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po index 2cc753531..d1f1b069b 100644 --- a/po/zh_CN/partitioning.po +++ b/po/zh_CN/partitioning.po @@ -657,16 +657,11 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "第二个控制器的主磁盘和从磁盘会分别被叫做 <filename>/dev/hdc</filename> 和 " "<filename>/dev/hdd</filename>，较新的 IDE 控制器实际上有两个通道，扮演着两个" -"控制器的角色。<phrase arch=\"m68k\"> 字符可能和 mac 程序 pdisk 显示有所不同。" -"(在 pdisk 上的 <filename>/dev/hdc</filename> 可能在 Debian 中显示为 " -"<filename>/dev/hda</filename>)。</phrase>" +"控制器的角色。" #. Tag: para #: partitioning.xml:372 diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po index 677931711..f0d125c35 100644 --- a/po/zh_CN/post-install.po +++ b/po/zh_CN/post-install.po @@ -45,20 +45,20 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" "另外，您可以按下组合键 <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> " -"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;m68k\"> 或 " -"<keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> <keycap>Power</" -"keycap> </keycombo> 于 Macintosh 系统上</phrase>。最后一个选项是用 root 登" -"录，执行 <command>poweroff</command>、<command>halt</command> 或 " -"<command>shutdown -h now</command> 中的一个命令，这在组合键不起作用或者您喜欢" -"敲命令时使用；<command>reboot</command> 可以重启系统。" +"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc\"> 或 <keycombo> " +"<keycap>Control</keycap> <keycap>Shift</keycap> <keycap>Power</keycap> </" +"keycombo> 于 Macintosh 系统上</phrase>。最后一个选项是用 root 登录，执行 " +"<command>poweroff</command>、<command>halt</command> 或 <command>shutdown -h " +"now</command> 中的一个命令，这在组合键不起作用或者您喜欢敲命令时使用；" +"<command>reboot</command> 可以重启系统。" #. Tag: title #: post-install.xml:46 diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po index 3421136dd..5f1f4d6d4 100644 --- a/po/zh_CN/preparing.po +++ b/po/zh_CN/preparing.po @@ -1184,7 +1184,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1195,7 +1194,6 @@ msgstr "" "Windows NT/2000/XP、OS/2、MacOS、Solaris、FreeBSD，…) </phrase> " "<phrase arch=\"alpha\"> (Tru64 (Digital UNIX)、OpenVMS、Windows NT、FreeBSD，" "…) </phrase> <phrase arch=\"s390\"> (VM、z/OS、OS/390，…) </" -"phrase> <phrase arch=\"m68k\"> (Amiga OS、Atari TOS、Mac OS，…) </" "phrase>，同时也希望把 Linux 装在同一块硬盘上，那么您就必须重新对硬盘分区。" "Debian 需要它自己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。" "它可以与其它 Linux 系统共享一些分区，但是我们在这里不会对此进行说明。最起码，" @@ -1208,15 +1206,13 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" "通过当前的操作系统中的分区工具，您可以获知现在的分区状况<phrase arch=\"x86" "\">，如 fdisk 和 PartitionMagic</phrase><phrase arch=\"powerpc\">，如 Drive " -"Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"m68k\">，如 HD SC " -"Setup、HDToolBox 和 SCSITool</phrase><phrase arch=\"s390\">，如 VM diskmap</" +"Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"s390\">，如 VM diskmap</" "phrase>。分区工具总会提供一种办法让您查看现有的分区情况，而不作任何改动。" #. Tag: para diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po index 51bf6e998..166f1fa37 100644 --- a/po/zh_CN/using-d-i.po +++ b/po/zh_CN/using-d-i.po @@ -4153,15 +4153,10 @@ msgstr "不使用 boot loader 继续进行" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "该选项用于完成安装而不安装 boot loader，这种情况要么是体系/子体系不支持，要么" -"是因为不想要(比如，您想使用已经存在的 boot loader)<phrase arch=\"m68k\">这个" -"选项对 Macintosh、Atari 和 Amiga 系统特别有用，因为它们本来的操作系统必须保持" -"在机器上，以用于启动 GNU/Linux。</phrase>" +"是因为不想要(比如，您想使用已经存在的 boot loader)" #. Tag: para #: using-d-i.xml:2891 @@ -4222,13 +4217,13 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" -"在 expert 模式下，您总是可以选择时钟是否设为 UTC。<phrase arch=\"m68k;powerpc" +"在 expert 模式下，您总是可以选择时钟是否设为 UTC。<phrase arch=\"powerpc" "\">Macintosh 硬件时钟一般设为本地时间。如果您需要多重引导，请选择本地时间而不" "是 GMT。</phrase> <phrase arch=\"x86\">(还要)运行 Dos 或 Windows 的系统通常设" "为本地时间。如果您需要多重引导，请选择本地时间而不是 GMT。</phrase>" diff --git a/po/zh_TW/boot-installer.po b/po/zh_TW/boot-installer.po index c12fbb64b..1d596ab8d 100644 --- a/po/zh_TW/boot-installer.po +++ b/po/zh_TW/boot-installer.po @@ -3344,12 +3344,12 @@ msgid "" "Some users may need specific support because of e.g. some visual impairment. " "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected " "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;" -"m68k;sparc\">Most</phrase> accessibility features have to be enabled " -"manually. <phrase arch=\"x86\">On machines that support it, the boot menu " -"emits a beep when it is ready to receive keystrokes.</phrase> Some boot " -"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable " -"accessibility features. Note that on most architectures the boot loader " -"interprets your keyboard as a QWERTY keyboard." +"sparc\">Most</phrase> accessibility features have to be enabled manually. " +"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep " +"when it is ready to receive keystrokes.</phrase> Some boot parameters can " +"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility " +"features. Note that on most architectures the boot loader interprets your " +"keyboard as a QWERTY keyboard." msgstr "" #. Tag: title diff --git a/po/zh_TW/boot-new.po b/po/zh_TW/boot-new.po index edba721f3..86246cf96 100644 --- a/po/zh_TW/boot-new.po +++ b/po/zh_TW/boot-new.po @@ -705,19 +705,18 @@ msgstr "" #~ "After a welcome screen, you will be prompted to configure your time zone. " #~ "First select whether the hardware clock of your system is set to local " #~ "time or Greenwich Mean Time (GMT or UTC). The time displayed in the " -#~ "dialog may help you decide on the correct option. <phrase arch=\"m68k;" -#~ "powerpc\">Macintosh hardware clocks are normally set to local time. If " -#~ "you want to dual-boot, select local time instead of GMT.</phrase> <phrase " -#~ "arch=\"i386\">Systems that (also) run Dos or Windows are normally set to " -#~ "local time. If you want to dual-boot, select local time instead of GMT.</" -#~ "phrase>" +#~ "dialog may help you decide on the correct option. <phrase arch=\"powerpc" +#~ "\">Macintosh hardware clocks are normally set to local time. If you want " +#~ "to dual-boot, select local time instead of GMT.</phrase> <phrase arch=" +#~ "\"i386\">Systems that (also) run Dos or Windows are normally set to local " +#~ "time. If you want to dual-boot, select local time instead of GMT.</phrase>" #~ msgstr "" #~ "歡迎畫面之後，您將看到要求設定時區的提示。首先決定系統硬體時鐘為本地還是格" #~ "林威治時間 (GMT或UTC)。對話框裡面顯示的時間可以幫您做出正確的選擇。 " -#~ "<phrase arch=\"m68k;powerpc\">Macintosh 硬體時鐘通常設為本地時間。如果您想" -#~ "多重開機，請選擇本地時間而非 GMT。</phrase> <phrase arch=\"i386\"> 仍然) " -#~ "運行 Dos 或 Windows 的系統通常設為本地時間。如果您想多重開機，選擇本地時間" -#~ "而非 GMT。</phrase>" +#~ "<phrase arch=\"powerpc\">Macintosh 硬體時鐘通常設為本地時間。如果您想多重" +#~ "開機，請選擇本地時間而非 GMT。</phrase> <phrase arch=\"i386\"> 仍然) 運行 " +#~ "Dos 或 Windows 的系統通常設為本地時間。如果您想多重開機，選擇本地時間而非 " +#~ "GMT。</phrase>" #~ msgid "" #~ "Depending on the location selected at the beginning of the installation " @@ -891,21 +890,21 @@ msgstr "" #~ "for the number of your serial port. In Linux, serial ports are counted " #~ "from 0; your first serial port <phrase arch=\"i386\">(i.e., " #~ "<userinput>COM1</userinput>)</phrase> is <filename>/dev/ttyS0</filename> " -#~ "under Linux. <phrase arch=\"powerpc;m68k\">On Macintoshes with serial " -#~ "ports, the modem port is <filename>/dev/ttyS0</filename> and the printer " -#~ "port is <filename>/dev/ttyS1</filename>.</phrase> The next step is to " -#~ "edit <filename>/etc/chatscripts/provider</filename> and insert your " -#~ "provider's phone number, your user-name and password. Please do not " -#~ "delete the <quote>\\q</quote> that precedes the password. It hides the " -#~ "password from appearing in your log files." +#~ "under Linux. <phrase arch=\"powerpc\">On Macintoshes with serial ports, " +#~ "the modem port is <filename>/dev/ttyS0</filename> and the printer port is " +#~ "<filename>/dev/ttyS1</filename>.</phrase> The next step is to edit " +#~ "<filename>/etc/chatscripts/provider</filename> and insert your provider's " +#~ "phone number, your user-name and password. Please do not delete the " +#~ "<quote>\\q</quote> that precedes the password. It hides the password from " +#~ "appearing in your log files." #~ msgstr "" #~ "編輯 <filename>/etc/ppp/peers/provider</filename> 並替換 <userinput>/dev/" #~ "modem</userinput> 為 <userinput>/dev/ttyS<replaceable>#</" #~ "replaceable></userinput> 其中 <replaceable>#</replaceable> 取決於您的" #~ "數據機序列埠編號。在 Linux 下，序列埠是從0開始，您的第一個序列埠 <phrase " #~ "arch=\"i386\">(如 <userinput>COM1</userinput>)</phrase> 就叫 <filename>/" -#~ "dev/ttyS0</filename>。<phrase arch=\"powerpc;m68k\">如果您在 Macintoshes " -#~ "上，那麼數據機序列埠是 <filename>/dev/ttyS0</filename> 印表機的連接埠是 " +#~ "dev/ttyS0</filename>。<phrase arch=\"powerpc\">如果您在 Macintoshes 上，那" +#~ "麼數據機序列埠是 <filename>/dev/ttyS0</filename> 印表機的連接埠是 " #~ "<filename>/dev/ttyS1</filename>。</phrase>下一步是編輯 <filename>/etc/" #~ "chatscripts/provider</filename> 然後輸入供應商的電話號碼，您的使用者名稱與" #~ "密碼。請勿刪除出現在密碼之前的 <quote>\\q</quote>。這是用來隱藏您的密碼，" diff --git a/po/zh_TW/hardware.po b/po/zh_TW/hardware.po index 60fb142b9..335db9829 100644 --- a/po/zh_TW/hardware.po +++ b/po/zh_TW/hardware.po @@ -3070,8 +3070,7 @@ msgid "" "also be supported by the installation system; modular drivers should " "normally be loaded automatically. <phrase arch=\"x86\">This includes most " "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards " -"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url=" -"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>" +"are supported as well.</phrase>" msgstr "" "任何受 Linux 核心支援的網路介面卡 (NIC) 也全都被開機片支援。您可能需要將網路" "卡驅動程式以模組掛載。同樣的，請參考 <ulink url=\"&url-m68k-faq;\"></ulink> " diff --git a/po/zh_TW/install-methods.po b/po/zh_TW/install-methods.po index a72c9c34e..dbeafe352 100644 --- a/po/zh_TW/install-methods.po +++ b/po/zh_TW/install-methods.po @@ -1657,20 +1657,17 @@ msgid "" "(RARP) is one way to tell your client what IP address to use for itself. " "Another way is to use the BOOTP protocol.</phrase> <phrase condition=" "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP " -"address and where on the network to obtain a boot image.</phrase> <phrase " -"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP " -"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic " -"Host Configuration Protocol) is a more flexible, backwards-compatible " -"extension of BOOTP. Some systems can only be configured via DHCP." +"address and where on the network to obtain a boot image.</phrase> The DHCP " +"(Dynamic Host Configuration Protocol) is a more flexible, backwards-" +"compatible extension of BOOTP. Some systems can only be configured via DHCP." msgstr "" "<phrase condition=\"supports-rarp\">反向位址解析協議 (The Reverse Address " "Resolution Protocol, RARP) 是一種告訴您的客戶它自己 IP 位址的方法。另外一種方" "法是 BOOTP 通訊協定。</phrase> <phrase condition=\"supports-bootp\">BOOTP 是" "一種 IP 通訊協定，用來告訴電腦它自己的 IP 位址以及從網路何處取得啟動映像。</" -"phrase> <phrase arch=\"m68k\">在 VMEbus 系統上面的另外一種選擇是：IP 位址可以" -"在開機 ROM 中手動設定。</phrase> <phrase condition=\"supports-dhcp\">DHCP (動" -"態主機設定協定 Dynamic Host Configuration Protocol) 是一個更靈活，向後相容的 " -"BOOTP 延伸。有一些系統只能透過 DHCP 來配置。</phrase>" +"phrase> <phrase condition=\"supports-dhcp\">DHCP (動態主機設定協定 Dynamic " +"Host Configuration Protocol) 是一個更靈活，向後相容的 BOOTP 延伸。有一些系統" +"只能透過 DHCP 來配置。</phrase>" #. Tag: para #: install-methods.xml:1177 diff --git a/po/zh_TW/partitioning.po b/po/zh_TW/partitioning.po index e85075d9b..0554756ee 100644 --- a/po/zh_TW/partitioning.po +++ b/po/zh_TW/partitioning.po @@ -660,16 +660,11 @@ msgid "" "The master and slave disks of the secondary controller can be called " "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, " "respectively. Newer IDE controllers can actually have two channels, " -"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters " -"may differ from what shows in the mac program pdisk (i.e. what shows up as " -"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</" -"filename> in Debian). </phrase>" +"effectively acting like two controllers." msgstr "" "第二個控制器的主磁碟和從磁碟分別被叫做 <filename>/dev/hdc</filename> 以及 " "<filename>/dev/hdd</filename> ，較新的 IDE 控制器實際上有兩個通道，扮演著兩個" -"控制器的角色。 <phrase arch=\"m68k\"> 字母可能和 mac 程式 pdisk 顯示的不同。" -"(在 pdisk 上的 <filename>/dev/hdc</filename> 可能在 Debian 中顯示為 " -"<filename>/dev/hda</filename>)。 </phrase>" +"控制器的角色。" #. Tag: para #: partitioning.xml:372 diff --git a/po/zh_TW/post-install.po b/po/zh_TW/post-install.po index c505cad6a..dd8a42c43 100644 --- a/po/zh_TW/post-install.po +++ b/po/zh_TW/post-install.po @@ -41,12 +41,12 @@ msgstr "" msgid "" "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=" -"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</" -"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A " -"last option is to log in as root and type one of the commands " -"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h " -"now</command> if either of the key combinations do not work or you prefer to " -"type commands; use <command>reboot</command> to reboot the system." +"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> " +"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last " +"option is to log in as root and type one of the commands <command>poweroff</" +"command>, <command>halt</command> or <command>shutdown -h now</command> if " +"either of the key combinations do not work or you prefer to type commands; " +"use <command>reboot</command> to reboot the system." msgstr "" #. Tag: title diff --git a/po/zh_TW/preparing.po b/po/zh_TW/preparing.po index 3d9591338..b98a2760b 100644 --- a/po/zh_TW/preparing.po +++ b/po/zh_TW/preparing.po @@ -1163,7 +1163,6 @@ msgid "" "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </" "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, " "FreeBSD, …) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, " -"…) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, " "…) </phrase> and want to stick Linux on the same disk, you will need " "to repartition the disk. Debian requires its own hard disk partitions. It " "cannot be installed on Windows or MacOS partitions. It may be able to share " @@ -1174,7 +1173,6 @@ msgstr "" "Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, …) </phrase> " "<phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, FreeBSD, " "…) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, …) </" -"phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, …) </" "phrase> ，同時也希望把 Linux 裝在同一顆硬碟上，那麼您就必須重新對硬碟進行分" "割。Debian 需要它自己專用的硬碟分割區。它不能被安裝在 Windows 或者 MacOS 的分" "割區上。它可以與其它 Linux 系統共享一些分割區，但是我們在這裡不會對此進行說" @@ -1187,16 +1185,15 @@ msgid "" "You can find information about your current partition setup by using a " "partitioning tool for your current operating system<phrase arch=\"x86\">, " "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as " -"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as " -"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as " +"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as " "the VM diskmap</phrase>. Partitioning tools always provide a way to show " "existing partitions without making changes." msgstr "" "您可以透過目前作業系統中的分割工具軟體來獲知您現在的分割區狀況<phrase arch=" "\"i386\">，如 fdisk 和 PartitionMagic</phrase><phrase arch=\"powerpc\">，如 " -"Drive Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"m68k\">，如 HD SC " -"Setup、HDToolBox 和 SCSITool</phrase><phrase arch=\"s390\">，如 VM diskmap</" -"phrase>分割工具軟體總會提供一種辦法讓您查看現有的分割區情況，而不作任何改動。" +"Drive Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"s390\">，如 VM " +"diskmap</phrase>分割工具軟體總會提供一種辦法讓您查看現有的分割區情況，而不作" +"任何改動。" #. Tag: para #: preparing.xml:828 diff --git a/po/zh_TW/using-d-i.po b/po/zh_TW/using-d-i.po index 7f2ab127c..f7e5f09d1 100644 --- a/po/zh_TW/using-d-i.po +++ b/po/zh_TW/using-d-i.po @@ -3921,15 +3921,10 @@ msgstr "不使用 boot-loader 繼續進行" msgid "" "This option can be used to complete the installation even when no boot " "loader is to be installed, either because the arch/subarch doesn't provide " -"one, or because none is desired (e.g. you will use existing boot loader). " -"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, " -"and Amiga systems, where the original operating system must be maintained on " -"the box and used to boot GNU/Linux.</phrase>" +"one, or because none is desired (e.g. you will use existing boot loader)." msgstr "" "該選項用於完成安裝而不安裝 boot-loader，這種情況可能是硬體架構/子架構不支援，" -"或是因為不想要 (例如，您想使用已經存在的 boot-loader)。<phrase arch=\"m68k\">" -"這個選項對 Macintosh，Atari 和 Amiga 系統特別有用，因為它們本來的作業系統必須" -"存在於機器上，以用於啟動 GNU/Linux。</phrase>" +"或是因為不想要 (例如，您想使用已經存在的 boot-loader)。" #. Tag: para #: using-d-i.xml:2891 @@ -3986,11 +3981,11 @@ msgstr "" #, no-c-format msgid "" "In expert mode you will always be able to choose whether or not the clock is " -"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are " -"normally set to local time. If you want to dual-boot, select local time " -"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or " -"Windows are normally set to local time. If you want to dual-boot, select " -"local time instead of UTC.</phrase>" +"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally " +"set to local time. If you want to dual-boot, select local time instead of " +"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows " +"are normally set to local time. If you want to dual-boot, select local time " +"instead of UTC.</phrase>" msgstr "" #. Tag: para |