diff options
| -rw-r--r-- | po/ca/welcome.po | 70 | ||||
| -rw-r--r-- | po/cs/welcome.po | 7 | ||||
| -rw-r--r-- | po/da/welcome.po | 72 | ||||
| -rw-r--r-- | po/de/welcome.po | 47 | ||||
| -rw-r--r-- | po/el/welcome.po | 70 | ||||
| -rw-r--r-- | po/es/welcome.po | 74 | ||||
| -rw-r--r-- | po/fr/welcome.po | 70 | ||||
| -rw-r--r-- | po/ja/welcome.po | 72 | ||||
| -rw-r--r-- | po/nl/welcome.po | 74 | ||||
| -rw-r--r-- | po/pt/welcome.po | 64 | ||||
| -rw-r--r-- | po/sv/welcome.po | 74 | ||||
| -rw-r--r-- | po/zh_CN/welcome.po | 68 |
12 files changed, 213 insertions, 549 deletions
diff --git a/po/ca/welcome.po b/po/ca/welcome.po index 793121929..f8e2b2d48 100644 --- a/po/ca/welcome.po +++ b/po/ca/welcome.po @@ -206,10 +206,7 @@ msgstr "Què és GNU/Linux?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." @@ -245,14 +242,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -261,12 +251,12 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux està modelat sobre el sistema operatiu Unix. Des dels seus inicis es " +"GNU/Linux està modelat sobre el sistema operatiu Unix. Des dels seus inicis es " "va dissenyar per ser un sistema multitasca i multiusuari. Aquestes " -"característiques són suficients per fer Linux diferent d'altres sistemes " -"operatius ben coneguts. Però Linux és inclús més diferent del que pugueu " +"característiques són suficients per fer GNU/Linux diferent d'altres sistemes " +"operatius ben coneguts. Però GNU/Linux és inclús més diferent del que pugueu " "imaginar. Contràriament a d'altres sistemes operatius, ningú és propietari " -"de Linux. Molta part del seu desenvolupament el realitzen voluntaris que no " +"de GNU/Linux. Molta part del seu desenvolupament el realitzen voluntaris que no " "cobren per fer-ho." #. Tag: para @@ -284,14 +274,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -302,19 +285,14 @@ msgid "" msgstr "" "El <ulink url=\"&url-gnu;\">projecte GNU</ulink> ha desenvolupat un ampli " "conjunt d'eines de programari lliure per utilitzar amb sistemes operatius " -"Unix™ o similars, com Linux. Aquestes eines permeten als usuaris " +"Unix™ o similars, com GNU/Linux. Aquestes eines permeten als usuaris " "realitzar tasques que van des de les més mundanes (com copiar o suprimir " "fitxers del sistema) fins a les més complexes (com escriure i compilar " "programes o fer edicions sofisticades de documents en diferents formats)." #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " @@ -322,9 +300,9 @@ msgid "" "community that made GNU/Linux possible." msgstr "" "Tot i que molts grups i persones han contribuït en el desenvolupament de " -"Linux, el contribuïdor individual més gran segueix sent la Free Software " +"GNU/Linux, el contribuïdor individual més gran segueix sent la Free Software " "Foundation, que ha creat no només la major part de les eines utilitzades a " -"Linux, sinó també la filosofia i la comunitat que ha fet que Linux sigui " +"GNU/Linux, sinó també la filosofia i la comunitat que ha fet que GNU/Linux sigui " "possible." #. Tag: para @@ -364,13 +342,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -378,8 +350,8 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Els usuaris de Linux tenen una immensa llibertat d'elecció del seu " -"programari. Per exemple, els usuaris de Linux poden triar entre una dotzena " +"Els usuaris de GNU/Linux tenen una immensa llibertat d'elecció del seu " +"programari. Per exemple, els usuaris de GNU/Linux poden triar entre una dotzena " "de programes d'intèrpret d'ordres diferents i bastants escriptoris gràfics. " "Aquesta llibertat d'elecció sovint resulta desconcertant pels usuaris " "d'altres sistemes operatius, els quals no estan acostumats a pensar en " @@ -387,13 +359,7 @@ msgstr "" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -401,11 +367,11 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"També és menys probable que Linux causi una fallada del sistema, és més " +"També és menys probable que GNU/Linux causi una fallada del sistema, és més " "capaç d'executar més d'un programa al mateix temps i és més segur que molts " -"d'altres sistemes operatius. Amb aquests avantatges, Linux és el sistema " +"d'altres sistemes operatius. Amb aquests avantatges, GNU/Linux és el sistema " "operatiu que té un creixement més ràpid en el mercat de servidors. Més " -"recentment, Linux també ha començat a fer-se popular entre els usuaris " +"recentment, GNU/Linux també ha començat a fer-se popular entre els usuaris " "domèstics i de negocis." #. Tag: title diff --git a/po/cs/welcome.po b/po/cs/welcome.po index 389207aa4..0be5f2ce6 100644 --- a/po/cs/welcome.po +++ b/po/cs/welcome.po @@ -191,15 +191,12 @@ msgstr "Co je GNU/Linux?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux je operační systém, což je skupina programů, které vám mimo jiné " +"GNU/Linux je operační systém, což je skupina programů, které vám mimo jiné " "umožňují komunikovat s počítačem a spouštět další programy." #. Tag: para diff --git a/po/da/welcome.po b/po/da/welcome.po index f2412b1c2..5c627a2b5 100644 --- a/po/da/welcome.po +++ b/po/da/welcome.po @@ -196,15 +196,12 @@ msgstr "Hvad er GNU/Linux?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux er et operativsystem: Et antal programmer som lader dig interagere med " +"GNU/Linux er et operativsystem: Et antal programmer som lader dig interagere med " "din computer og køre andre programmer." #. Tag: para @@ -235,14 +232,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -251,12 +241,12 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux har sit udgangspunkt i et Unix-operativsystem. Fra begyndelsen var " -"Linux designet til at være et parallelt arbejdende (multi-tasking) system " -"for flere brugere. Disse fakta er tilstrækkelig til at gøre Linux forskellig " -"fra andre velkendte operativsystemer. Linux er dog endnu mere forskellig end " +"GNU/Linux har sit udgangspunkt i et Unix-operativsystem. Fra begyndelsen var " +"GNU/Linux designet til at være et parallelt arbejdende (multi-tasking) system " +"for flere brugere. Disse fakta er tilstrækkelig til at gøre GNU/Linux forskellig " +"fra andre velkendte operativsystemer. GNU/Linux er dog endnu mere forskellig end " "du først måske tror. I kontrast til andre operativsystemer så ejer ingen " -"Linux. Meget af dets udvikling udføres af frivillige uden betaling." +"GNU/Linux. Meget af dets udvikling udføres af frivillige uden betaling." #. Tag: para #: welcome.xml:152 @@ -273,14 +263,7 @@ msgstr "" # Osäker på "arcane" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -291,7 +274,7 @@ msgid "" msgstr "" "<ulink url=\"&url-gnu;\">GNU-projektet</ulink> har udviklet en omfattende " "samling af frie programværktøjer for brug med Unix™ og Unix-lignende " -"operativsystemer såsom Linux. Disse værktøjer gør, at brugerne kan udføre " +"operativsystemer såsom GNU/Linux. Disse værktøjer gør, at brugerne kan udføre " "opgaver fra de mere trivielle (såsom kopiering eller fjernelse af filer fra " "systemet) til de mere avancerede (såsom skrivning og kompilering af " "programmer eller mere sofistikeret redigering i en række forskellige " @@ -299,22 +282,17 @@ msgstr "" #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " "only most of the tools used in GNU/Linux, but also the philosophy and the " "community that made GNU/Linux possible." msgstr "" -"Selv om mange grupper og individer har bidraget til Linux, så er den største " +"Selv om mange grupper og individer har bidraget til GNU/Linux, så er den største " "enkelte bidragyder fortsat Free Software Foundation, som har skabt ikke bare " -"de fleste værktøjer i Linux, men også filosofien og fællesskabet som gjorde " -"Linux mulig." +"de fleste værktøjer i GNU/Linux, men også filosofien og fællesskabet som gjorde " +"GNU/Linux mulig." #. Tag: para #: welcome.xml:175 @@ -351,13 +329,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -373,13 +345,7 @@ msgstr "" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -387,10 +353,10 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Linux er også mindre tilbøjelig til at bryde ned, kan køre flere programmer " +"GNU/Linux er også mindre tilbøjelig til at bryde ned, kan køre flere programmer " "på samme tid, og mere sikker end andre operativsystemer. Med disse fordele " -"er Linux det hurtigst voksende operativsystem på servermarkedet. På det " -"seneste er Linux også begyndt at blive populært blandt hjemme- og " +"er GNU/Linux det hurtigst voksende operativsystem på servermarkedet. På det " +"seneste er GNU/Linux også begyndt at blive populært blandt hjemme- og " "forretningsbrugere." #. Tag: title diff --git a/po/de/welcome.po b/po/de/welcome.po index 61ec9c5e0..e1ecead88 100644 --- a/po/de/welcome.po +++ b/po/de/welcome.po @@ -1,12 +1,12 @@ # Translation of the Debian installation-guide to German. # -# Holger Wansing <linux@wansing-online.de>, 2006 - 2018, 2019. +# Holger Wansing <linux@wansing-online.de>, 2006 - 2018, 2019, 2021. msgid "" msgstr "" "Project-Id-Version: d-i-manual_welcome\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2021-09-11 23:02+0000\n" -"PO-Revision-Date: 2019-09-28 09:15+0100\n" +"PO-Revision-Date: 2021-09-12 21:35+0100\n" "Last-Translator: Holger Wansing <hwansing@mailbox.org>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -202,7 +202,7 @@ msgstr "Was ist GNU/Linux?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format +#, no-c-format #| msgid "" #| "Linux is an operating system: a series of programs that let you interact " #| "with your computer and run other programs." @@ -210,7 +210,7 @@ msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux ist ein Betriebssystem - eine Reihe von Programmen, die es Ihnen " +"GNU/Linux ist ein Betriebssystem - eine Reihe von Programmen, die es Ihnen " "ermöglichen, mit Ihrem Computer zu interagieren und andere Programme laufen " "zu lassen." @@ -243,7 +243,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format +#, no-c-format #| msgid "" #| "Linux is modelled on the Unix operating system. From the start, Linux was " #| "designed to be a multi-tasking, multi-user system. These facts are enough " @@ -259,11 +259,12 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux hat das Unix-Betriebssystem zum Vorbild. Von Beginn an war Linux als " +"GNU/Linux hat das Unix-Betriebssystem zum Vorbild. Von Beginn an war" +" GNU/Linux als " "Multitasking- und Mehrbenutzer-System vorgesehen. Diese Tatsachen reichen " -"aus, um Linux von anderen sehr bekannten Betriebssystemen abzuheben. Der " +"aus, um GNU/Linux von anderen sehr bekannten Betriebssystemen abzuheben. Der " "Unterschied ist aber sogar noch größer, als Sie sich vielleicht vorstellen. " -"Im Gegensatz zu anderen Betriebssystemen gibt es niemanden, dem Linux " +"Im Gegensatz zu anderen Betriebssystemen gibt es niemanden, dem GNU/Linux " "gehört. Große Teile seiner Entwicklung werden von unbezahlten Freiwilligen " "geleistet." @@ -281,7 +282,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format +#, no-c-format #| msgid "" #| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " #| "comprehensive set of free software tools for use with Unix™ and " @@ -299,7 +300,7 @@ msgid "" msgstr "" "Das <ulink url=\"&url-gnu;\">GNU-Projekt</ulink> hat eine umfassende " "Sammlung von freien Software-Werkzeugen zur Verwendung mit Unix™ und " -"Unix-ähnlichen Betriebssystemen wie Linux entwickelt. Diese Werkzeuge " +"Unix-ähnlichen Betriebssystemen wie GNU/Linux entwickelt. Diese Werkzeuge " "ermöglichen Benutzern, sowohl profane Aufgaben (wie das Kopieren oder " "Löschen von Dateien aus dem System) als auch höhere Aufgaben (wie das " "Schreiben und Kompilieren von Programmen oder das anspruchsvolle Bearbeiten " @@ -307,7 +308,7 @@ msgstr "" #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format +#, no-c-format #| msgid "" #| "While many groups and individuals have contributed to Linux, the largest " #| "single contributor is still the Free Software Foundation, which created " @@ -319,10 +320,13 @@ msgid "" "only most of the tools used in GNU/Linux, but also the philosophy and the " "community that made GNU/Linux possible." msgstr "" -"Während viele Gruppen und Einzelpersonen etwas zu Linux beigetragen haben, " +"Während viele Gruppen und Einzelpersonen etwas zu GNU/Linux beigetragen" +" haben, " "ist der größte einzelne Mitwirkende nach wie vor die Free Software " -"Foundation, die nicht nur die meisten der unter Linux verwendeten Werkzeuge " -"geschaffen hat, sondern auch die Philosophie und die Gemeinschaft, die Linux " +"Foundation, die nicht nur die meisten der unter GNU/Linux verwendeten" +" Werkzeuge " +"geschaffen hat, sondern auch die Philosophie und die Gemeinschaft, die" +" GNU/Linux " "ermöglicht haben." #. Tag: para @@ -362,7 +366,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format +#, no-c-format #| msgid "" #| "Linux users have immense freedom of choice in their software. For " #| "example, Linux users can choose from a dozen different command line " @@ -376,7 +380,7 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Linux-Benutzer haben eine enorme Freiheit bei der Auswahl ihrer Software. " +"GNU/Linux-Benutzer haben eine enorme Freiheit bei der Auswahl ihrer Software. " "Zum Beispiel können sie aus einem Dutzend verschiedener Kommandozeilen-" "Interpretern und einigen grafischen Desktop-Oberflächen auswählen. Diese " "Auswahl ist oftmals verwirrend für Benutzer anderer Betriebssysteme, die es " @@ -385,7 +389,7 @@ msgstr "" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format +#, no-c-format #| msgid "" #| "Linux is also less likely to crash, better able to run more than one " #| "program at the same time, and more secure than many operating systems. " @@ -399,10 +403,13 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Linux ist auch weniger absturzgefährdet, besser dazu geeignet, mehr als ein " +"GNU/Linux ist auch weniger absturzgefährdet, besser dazu geeignet, mehr als" +" ein " "Programm gleichzeitig auszuführen, und sicherer als viele andere " -"Betriebssysteme. Mit diesen Vorteilen ist Linux das am schnellsten wachsende " -"Betriebssystem am Servermarkt. In letzter Zeit wird Linux auch bei Heim- und " +"Betriebssysteme. Mit diesen Vorteilen ist GNU/Linux das am schnellsten" +" wachsende " +"Betriebssystem am Servermarkt. In letzter Zeit wird GNU/Linux auch bei Heim-" +" und " "Businessanwendern immer beliebter." #. Tag: title diff --git a/po/el/welcome.po b/po/el/welcome.po index 0967290c9..70a25d619 100644 --- a/po/el/welcome.po +++ b/po/el/welcome.po @@ -210,15 +210,12 @@ msgstr "Τι είναι το GNU/Linux;" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Το Linux είναι ένα λειτουργικό σύστημα: μια σειρά προγραμμάτων που σας " +"Το GNU/Linux είναι ένα λειτουργικό σύστημα: μια σειρά προγραμμάτων που σας " "επιτρέπουν να αλληλεπιδράσετε με τον υπολογιστή σας και να τρέχετε άλλα " "προγράμματα." @@ -251,14 +248,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -267,11 +257,11 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Το Linux έχει φτιαχτεί με πρότυπο το λειτουργικό σύστημα Unix. Από την " -"αρχή, το Linux σχεδιάστηκε για να είναι ένα multi-tasking, πολυχρηστικό " -"σύστημα. Αυτά είναι αρκετά για να κάνουν το Linux διαφορετικό από άλλα " -"γνωστά λειτουργικά συστήματα. Όμως, το Linux είναι διαφορετικό περισσότερο " -"από όσο φαντάζεστε. Σε αντίθεση με άλλα λειτουργικά συστήματα, το Linux δεν " +"Το GNU/Linux έχει φτιαχτεί με πρότυπο το λειτουργικό σύστημα Unix. Από την " +"αρχή, το GNU/Linux σχεδιάστηκε για να είναι ένα multi-tasking, πολυχρηστικό " +"σύστημα. Αυτά είναι αρκετά για να κάνουν το GNU/Linux διαφορετικό από άλλα " +"γνωστά λειτουργικά συστήματα. Όμως, το GNU/Linux είναι διαφορετικό περισσότερο " +"από όσο φαντάζεστε. Σε αντίθεση με άλλα λειτουργικά συστήματα, το GNU/Linux δεν " "ανήκει σε κανέναν. Μεγάλο μέρος της ανάπτυξής του γίνεται από άμισθους " "εθελοντές." @@ -290,14 +280,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -308,7 +291,7 @@ msgid "" msgstr "" "Το <ulink url=\"&url-gnu;\">Σχέδιο GNU</ulink> έχει αναπτύξει ένα περιεκτικό " "σύνολο από εργαλεία ελεύθερου λογισμικού που μπορούν να χρησιμοποιηθούν από " -"Unix™ ή τύπου-Unix λειτουργικά συστήματα όπως το Linux. Αυτά τα " +"Unix™ ή τύπου-Unix λειτουργικά συστήματα όπως το GNU/Linux. Αυτά τα " "εργαλεία επιτρέπουν στους χρήστες να εκτελούν μια διάφορα καθήκοντα που " "ποικίλουν από τα πιο πεζά (όπως η αντιγραφή ή η διαγραφή αρχείων από το " "σύστημα) στα πιο πολύπλοκα (όπως το γράψιμο και η μεταγλώτισση προγραμμάτων " @@ -316,12 +299,7 @@ msgstr "" #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " @@ -329,9 +307,9 @@ msgid "" "community that made GNU/Linux possible." msgstr "" "Αν και είναι πολλές οι ομάδες και τα μεμονωμένα άτομα που έχουν συνεισφέρει " -"στο Linux, η μεγαλύτερη συνεισφορά προέρχεται ακόμα από το Free Software " +"στο GNU/Linux, η μεγαλύτερη συνεισφορά προέρχεται ακόμα από το Free Software " "Foundation, που δημιούργησε όχι μόνο τα περισσότερα από τα εργαλεία που " -"χρησιμοποιούνται στο Linux, αλλά επίσης τη φιλοσοφία και την κοινότητα που " +"χρησιμοποιούνται στο GNU/Linux, αλλά επίσης τη φιλοσοφία και την κοινότητα που " "έκανε εφικτή την ύπαρξη του." #. Tag: para @@ -372,13 +350,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -386,7 +358,7 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Οι χρήστες του Linux έχουν τεράστια ελευθερία επιλογής για το λογισμικό " +"Οι χρήστες του GNU/Linux έχουν τεράστια ελευθερία επιλογής για το λογισμικό " "τους. Για παράδειγμα, μπορούν να διαλέξουν από μια δωδεκάδα διαφορετικών " "κελυφών εντολών και αρκετά γραφικά περιβάλλοντα γραφείου. Αυτή η επιλογή " "μοιάζει μαγική στους χρήστες άλλων λειτουργικών συστημάτων, που δεν έχουν " @@ -395,13 +367,7 @@ msgstr "" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -409,9 +375,9 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Το Linux έχει επίσης λιγότερες πιθανότητες κολλήματος, μεγαλύτερη ικανότητα " +"Το GNU/Linux έχει επίσης λιγότερες πιθανότητες κολλήματος, μεγαλύτερη ικανότητα " "ταυτόχρονης εκτέλεσης περισσότερων από ένα προγράμματα, και είναι πιο " -"ασφαλές από πολλά λειτουργικά συστήματα. Με τα πλεονεκτήματα αυτά, το Linux " +"ασφαλές από πολλά λειτουργικά συστήματα. Με τα πλεονεκτήματα αυτά, το GNU/Linux " "είναι το ταχύτερα διαδεδομένο λειτουργικό σύστημα στην αγορά των server " "συστημάτων. Πρόσφατα, το Linux έχει αρχίσει να γίνεται δημοφιλές και μεταξύ " "των χρηστών στο σπίτι και τις επιχειρήσεις." diff --git a/po/es/welcome.po b/po/es/welcome.po index e75e4370d..94064f8eb 100644 --- a/po/es/welcome.po +++ b/po/es/welcome.po @@ -240,15 +240,12 @@ msgstr "¿Qué es GNU/Linux?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux es un sistema operativo: un conjunto de programas que le permiten " +"GNU/Linux es un sistema operativo: un conjunto de programas que le permiten " "interactuar con su ordenador y ejecutar otros programas." #. Tag: para @@ -280,14 +277,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -296,11 +286,11 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux está modelado como un sistema operativo tipo Unix. Desde sus " -"comienzos, Linux se diseñó para que fuera un sistema multi tarea y multi " -"usuario. Estos hechos son suficientes para diferenciar a Linux de otros " -"sistemas operativos más conocidos. Sin embargo, Linux es más diferente de lo " -"que pueda imaginar. Nadie es dueño de Linux, a diferencia de otros sistemas " +"GNU/Linux está modelado como un sistema operativo tipo Unix. Desde sus " +"comienzos, GNU/Linux se diseñó para que fuera un sistema multi tarea y multi " +"usuario. Estos hechos son suficientes para diferenciar a GNU/Linux de otros " +"sistemas operativos más conocidos. Sin embargo, GNU/Linux es más diferente de lo " +"que pueda imaginar. Nadie es dueño de GNU/Linux, a diferencia de otros sistemas " "operativos. Gran parte de su desarrollo lo realizan voluntarios de forma " "altruista." @@ -319,14 +309,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -337,7 +320,7 @@ msgid "" msgstr "" "El <ulink url=\"&url-gnu;\">proyecto GNU</ulink> ha desarrollado un conjunto " "de herramientas de software libre para ser utilizados por Unix™ y " -"sistemas operativos tipo Unix como Linux. Estas herramientas permiten a los " +"sistemas operativos tipo Unix como GNU/Linux. Estas herramientas permiten a los " "usuarios desarrollar tareas que van desde las mundanas (como copiar o " "eliminar ficheros del sistema) a las arcanas (como escribir y compilar " "programas o hacer edición sofisticada en una gran variedad de formatos de " @@ -345,22 +328,17 @@ msgstr "" #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " "only most of the tools used in GNU/Linux, but also the philosophy and the " "community that made GNU/Linux possible." msgstr "" -"Aunque hay muchos grupos e individuos que han contribuido a Linux, la Free " +"Aunque hay muchos grupos e individuos que han contribuido a GNU/Linux, la Free " "Software Foundation ha sido quien más ha contribuido. No sólo creó la mayor " "parte de las herramientas que se utilizan en Linux sino también la filosofía " -"y comunidad que hizo que Linux fuera posible." +"y comunidad que hizo que GNU/Linux fuera posible." #. Tag: para #: welcome.xml:175 @@ -399,13 +377,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -413,8 +385,8 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Los usuarios de Linux tienen una gran libertad al elegir sus programas. Por " -"ejemplo, un usuario de Linux puede elegir entre docenas de distintos " +"Los usuarios de GNU/Linux tienen una gran libertad al elegir sus programas. Por " +"ejemplo, un usuario de GNU/Linux puede elegir entre docenas de distintos " "intérpretes de línea de órdenes y entre distintos entornos de escritorio. " "Tantas opciones confunden a veces a los usuarios de otros sistemas " "operativos que no están acostumbrados a poder modificar el intérprete de " @@ -422,13 +394,7 @@ msgstr "" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -436,11 +402,11 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Es menos probable que un sistema Linux se colapse, además tiene mejor " +"Es menos probable que un sistema GNU/Linux se colapse, además tiene mejor " "capacidad para ejecutar múltiples programas al mismo tiempo y es más seguro " -"que muchos otros sistemas operativos. Debido a estas ventajas, Linux es el " +"que muchos otros sistemas operativos. Debido a estas ventajas, GNU/Linux es el " "sistema operativo que ha experimentado mayor crecimiento en el mercado de " -"los servidores. Últimamente, Linux está empezando a ser popular entre los " +"los servidores. Últimamente, GNU/Linux está empezando a ser popular entre los " "usuarios domésticos y en empresas." #. Tag: title diff --git a/po/fr/welcome.po b/po/fr/welcome.po index abbce63fc..9e75305a5 100644 --- a/po/fr/welcome.po +++ b/po/fr/welcome.po @@ -202,15 +202,12 @@ msgstr "Qu'est-ce que GNU/Linux ?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux est un système d'exploitation, c'est-à-dire, un ensemble de programmes " +"GNU/Linux est un système d'exploitation, c'est-à-dire, un ensemble de programmes " "qui permet d'agir sur la machine et de lancer d'autres programmes." #. Tag: para @@ -242,14 +239,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -258,11 +248,11 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux est fondé sur le système d'exploitation Unix. Dès le début, il fut " +"GNU/Linux est fondé sur le système d'exploitation Unix. Dès le début, il fut " "conçu comme un système multitâche et multiutilisateur. Ces caractéristiques " -"suffisent à distinguer Linux d'autres systèmes bien connus. Cependant, Linux " +"suffisent à distinguer GNU/Linux d'autres systèmes bien connus. Cependant, GNU/Linux " "est encore plus différent que vous ne pouvez l'imaginer. Personne ne possède " -"Linux, contrairement à d'autres systèmes. L'essentiel de son développement " +"GNU/Linux, contrairement à d'autres systèmes. L'essentiel de son développement " "est fait par des volontaires non payés." #. Tag: para @@ -280,14 +270,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -298,29 +281,24 @@ msgid "" msgstr "" "Le <ulink url=\"&url-gnu;\">projet GNU</ulink> a développé un ensemble " "complet d'outils libres destinés à Unix™ et aux systèmes " -"d'exploitation de type Unix, tel que Linux. Ces outils permettent aux " +"d'exploitation de type Unix, tel que GNU/Linux. Ces outils permettent aux " "utilisateurs d'accomplir aussi bien les tâches les plus simples (copier ou " "effacer un fichier) que les plus complexes (écrire et compiler des " "programmes, éditer de façon sophistiquée dans un grand nombre de formats)." #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " "only most of the tools used in GNU/Linux, but also the philosophy and the " "community that made GNU/Linux possible." msgstr "" -"Beaucoup de groupes et d'individus ont contribué à Linux mais le plus " +"Beaucoup de groupes et d'individus ont contribué à GNU/Linux mais le plus " "important d'entre eux est la <quote>Free Software Foundation</quote> qui a " -"non seulement créé la plupart des outils utilisés par Linux mais aussi la " -"philosophie et la communauté qui ont rendu Linux possible." +"non seulement créé la plupart des outils utilisés par GNU/Linux mais aussi la " +"philosophie et la communauté qui ont rendu GNU/Linux possible." #. Tag: para #: welcome.xml:175 @@ -359,13 +337,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -373,7 +345,7 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Les utilisateurs de Linux n'ont que l'embarras du choix pour les logiciels. " +"Les utilisateurs de GNU/Linux n'ont que l'embarras du choix pour les logiciels. " "Ils peuvent par exemple hésiter entre une douzaine d'interpréteurs de " "commandes, plusieurs interfaces graphiques. Cette possibilité de choix " "étonne souvent les utilisateurs d'autres systèmes d'exploitation, qui ne " @@ -382,13 +354,7 @@ msgstr "" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -396,10 +362,10 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Linux <quote>plante</quote> moins, peut plus facilement exécuter plus d'un " +"GNU/Linux <quote>plante</quote> moins, peut plus facilement exécuter plus d'un " "programme à la fois, est plus sûr que beaucoup de systèmes d'exploitation. " -"Ces avantages font de Linux le système d'exploitation dont la demande a la " -"plus forte croissance sur le marché des serveurs. Plus récemment, Linux a " +"Ces avantages font de GNU/Linux le système d'exploitation dont la demande a la " +"plus forte croissance sur le marché des serveurs. Plus récemment, GNU/Linux a " "aussi commencé à gagner en popularité parmi les utilisateurs, qu'ils soient " "en entreprise ou chez eux." diff --git a/po/ja/welcome.po b/po/ja/welcome.po index a15ebdf0b..e05a424b0 100644 --- a/po/ja/welcome.po +++ b/po/ja/welcome.po @@ -194,15 +194,12 @@ msgstr "GNU/Linux とは?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux はオペレーティングシステム (あなたとコンピュータの間に立ち、他のプログ" +"GNU/Linux はオペレーティングシステム (あなたとコンピュータの間に立ち、他のプログ" "ラムを実行させる一連のプログラム) です。" #. Tag: para @@ -232,14 +229,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -248,11 +238,11 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux は Unix オペレーティングシステムを手本にしています。当初から、Linux は" +"GNU/Linux は Unix オペレーティングシステムを手本にしています。当初から、GNU/Linux は" "マルチタスク、マルチユーザシステムとして設計されました。この事実により、" "Linux は他の有名なオペレーティングシステムに対し、充分差別化できています。し" -"かし、Linux はあなたが想像するよりもさらに異なっています。他のオペレーティン" -"グシステムとは対照的に、誰も Linux を所有しません。その開発の多くは無償のボラ" +"かし、GNU/Linux はあなたが想像するよりもさらに異なっています。他のオペレーティン" +"グシステムとは対照的に、誰も GNU/Linux を所有しません。その開発の多くは無償のボラ" "ンティアによって行われます。" #. Tag: para @@ -269,14 +259,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -285,7 +268,7 @@ msgid "" "from the system) to the arcane (such as writing and compiling programs or " "doing sophisticated editing in a variety of document formats)." msgstr "" -"<ulink url=\"&url-gnu;\">GNU プロジェクト</ulink>は、Unix™ や、Linux な" +"<ulink url=\"&url-gnu;\">GNU プロジェクト</ulink>は、Unix™ や、GNU/Linux な" "どの Unix ライクなオペレーティングシステムと共に使うための一連のフリーソフト" "ウェアツールを開発してきました。これらのツールは、ファイルのコピー・削除と" "いった日常的な作業から、プログラムの作成・コンパイルや様々なドキュメント" @@ -293,21 +276,16 @@ msgstr "" #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " "only most of the tools used in GNU/Linux, but also the philosophy and the " "community that made GNU/Linux possible." msgstr "" -"多くのグループや個人が Linux に寄与する中で、最大の単独貢献者はいまだに " -"(Linux の中で使用されるほとんどのツールだけでなく 哲学も作成した) フリーソフ" -"トウェア財団と、Linux を可能にしたコミュニティーです。" +"多くのグループや個人が GNU/Linux に寄与する中で、最大の単独貢献者はいまだに " +"(GNU/Linux の中で使用されるほとんどのツールだけでなく 哲学も作成した) フリーソフ" +"トウェア財団と、GNU/Linux を可能にしたコミュニティーです。" #. Tag: para #: welcome.xml:175 @@ -344,13 +322,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -358,21 +330,15 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Linux ユーザは、それらのソフトウェアの大きな選択の自由を持っています。例え" -"ば、Linuxユーザは、1 ダースの異なるコマンドラインシェルや数種のグラフィカルデ" +"GNU/Linux ユーザは、それらのソフトウェアの大きな選択の自由を持っています。例え" +"ば、GNU/Linux ユーザは、1 ダースの異なるコマンドラインシェルや数種のグラフィカルデ" "スクトップの中から選ぶことができます。この選択できるということが、しばしばコ" "マンドラインやデスクトップを変更できるという考えに慣れていない、他のオペレー" "ティングシステムのユーザを当惑させています。" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -380,10 +346,10 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Linux はまた、ほとんどクラッシュせず、複数のプログラムを同時に実行するのに優" -"秀で、多くのオペレーティングシステムより安全です。これらの利点により、Linux " +"GNU/Linux はまた、ほとんどクラッシュせず、複数のプログラムを同時に実行するのに優" +"秀で、多くのオペレーティングシステムより安全です。これらの利点により、GNU/Linux " "はサーバ市場で最も急成長しているオペレーティングシステムです。さらに最近、" -"Linuxは、ホーム・ビジネスユーザにも人気が出始めました。" +"GNU/Linuxは、ホーム・ビジネスユーザにも人気が出始めました。" #. Tag: title #: welcome.xml:221 diff --git a/po/nl/welcome.po b/po/nl/welcome.po index a010e6d24..b1c86d2fc 100644 --- a/po/nl/welcome.po +++ b/po/nl/welcome.po @@ -206,15 +206,12 @@ msgstr "Wat is GNU/Linux?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux is een besturingssysteem, een reeks programma's die u in staat stellen " +"GNU/Linux is een besturingssysteem, een reeks programma's die u in staat stellen " "om te gaan met uw computer en er andere programma's op uit te voeren." #. Tag: para @@ -246,14 +243,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -262,12 +252,12 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux is gemaakt naar het model van het Unix-besturingssysteem. Vanaf het " -"begin werd Linux ontworpen als een systeem voor multitasking en met meerdere " -"gebruikers. Alleen al deze elementen maken Linux anders dan andere " -"welbekende besturingssystemen. Linux verschilt zelfs nog meer dan u " +"GNU/Linux is gemaakt naar het model van het Unix-besturingssysteem. Vanaf het " +"begin werd GNU/Linux ontworpen als een systeem voor multitasking en met meerdere " +"gebruikers. Alleen al deze elementen maken GNU/Linux anders dan andere " +"welbekende besturingssystemen. GNU/Linux verschilt zelfs nog meer dan u " "misschien wel denkt. In tegenstelling tot andere besturingssystemen is " -"niemand eigenaar van Linux. Veel van zijn ontwikkeling gebeurt door " +"niemand eigenaar van GNU/Linux. Veel van zijn ontwikkeling gebeurt door " "onbetaalde vrijwilligers." #. Tag: para @@ -284,14 +274,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -302,7 +285,7 @@ msgid "" msgstr "" "Het <ulink url=\"&url-gnu;\">GNU-project</ulink> heeft een omvattend geheel " "van vrije-softwaregereedschappen ontwikkeld om te worden gebruikt met " -"Unix™ en Unix-achtige besturingssystemen, zoals Linux. Deze " +"Unix™ en Unix-achtige besturingssystemen, zoals GNU/Linux. Deze " "gereedschappen laten gebruikers toe taken uit te voeren, gaande van " "eenvoudige taken (zoals bestanden kopiëren en van het systeem verwijderen) " "tot zeer complexe (zoals het schrijven en compileren van programma's of het " @@ -311,23 +294,18 @@ msgstr "" #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " "only most of the tools used in GNU/Linux, but also the philosophy and the " "community that made GNU/Linux possible." msgstr "" -"Hoewel veel groepen en individuen bijgedragen hebben tot Linux, blijft de " +"Hoewel veel groepen en individuen bijgedragen hebben tot GNU/Linux, blijft de " "Free Software Foundation nog steeds de entiteit met de grootste inbreng, " "omdat ze niet enkel het grootste deel van de gereedschappen maakte die in " -"Linux gebruikt worden, maar ook de filosofie en de gemeenschap creëerde die " -"Linux mogelijk maakten." +"GNU/Linux gebruikt worden, maar ook de filosofie en de gemeenschap creëerde die " +"GNU/Linux mogelijk maakten." #. Tag: para #: welcome.xml:175 @@ -367,13 +345,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -381,7 +353,7 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Gebruikers van Linux hebben een immense keuzevrijheid wat software betreft. " +"Gebruikers van GNU/Linux hebben een immense keuzevrijheid wat software betreft. " "Linuxgebruikers hebben bijvoorbeeld de keuze uit een dozijn verschillende " "shells voor de commandoregel en verschillende grafische " "bureaubladomgevingen. Gebruikers van andere besturingssystemen zijn vaak " @@ -391,13 +363,7 @@ msgstr "" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -405,10 +371,10 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Linux is ook minder crashgevoelig, is beter in staat om tegelijk meer dan " +"GNU/Linux is ook minder crashgevoelig, is beter in staat om tegelijk meer dan " "één programma uit te voeren en veiliger dan veel besturingssystemen. Omwille " -"van deze voordelen is Linux het snelst groeiende besturingssysteem in het " -"serversergment. En meer recent is Linux ook populairder geworden voor " +"van deze voordelen is GNU/Linux het snelst groeiende besturingssysteem in het " +"serversergment. En meer recent is GNU/Linux ook populairder geworden voor " "computergebruik thuis en op het werk." #. Tag: title diff --git a/po/pt/welcome.po b/po/pt/welcome.po index 7e165660d..f696964df 100644 --- a/po/pt/welcome.po +++ b/po/pt/welcome.po @@ -199,15 +199,12 @@ msgstr "O que é GNU/Linux?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux é um sistema operativo: uma série de programas que o deixam interagir " +"GNU/Linux é um sistema operativo: uma série de programas que o deixam interagir " "com o seu computador e correr outros programas." #. Tag: para @@ -238,14 +235,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -254,12 +244,12 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux tem como modelo o sistema operativo Unix. Desde o inicio, Linux foi " +"GNU/Linux tem como modelo o sistema operativo Unix. Desde o inicio, GNU/Linux foi " "desenhado para ser um sistema multi-tarefa, multi-utilizador. Estes factos " -"são suficientes para tornar Linux diferente de outros sistemas operativos " -"bem conhecidos. No entanto, Linux é muito diferente do que você possa " +"são suficientes para tornar GNU/Linux diferente de outros sistemas operativos " +"bem conhecidos. No entanto, GNU/Linux é muito diferente do que você possa " "imaginar. Em contraste com outros sistemas operativos, ninguém é dono de " -"Linux. Muito do seu desenvolvimento é feito por voluntários não pagos." +"GNU/Linux. Muito do seu desenvolvimento é feito por voluntários não pagos." #. Tag: para #: welcome.xml:152 @@ -275,14 +265,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -293,7 +276,7 @@ msgid "" msgstr "" "O <ulink url=\"&url-gnu;\">Projeto GNU</ulink> desenvolveu um extenso " "conjunto de ferramentas de software livre para utilizar com Unix™ e " -"sistemas operativos do tipo Unix tais como o Linux. Estas ferramentas " +"sistemas operativos do tipo Unix tais como o GNU/Linux. Estas ferramentas " "permitem aos utilizadores executar tarefas que vão desde o mundano (como " "copiar ou remover ficheiros do sistema) ao arcano (como escrever e compilar " "programas ou editar de forma sofisticada numa variedade de formatos de " @@ -301,12 +284,7 @@ msgstr "" #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " @@ -354,13 +332,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -377,13 +349,7 @@ msgstr "" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -391,10 +357,10 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"É também menos provável que Linux bloqueie, que corra melhor mais de um " +"É também menos provável que GNU/Linux bloqueie, que corra melhor mais de um " "programa ao mesmo tempo, e seja mais seguro que muitos sistemas operativos. " -"Com estas vantagens, Linux é o sistema operativo que mais rapidamente cresce " -"no mercado de servidores. Mais recentemente, Linux passou a ser popular " +"Com estas vantagens, GNU/Linux é o sistema operativo que mais rapidamente cresce " +"no mercado de servidores. Mais recentemente, GNU/Linux passou a ser popular " "entre os utilizadores domésticos e empresariais." #. Tag: title diff --git a/po/sv/welcome.po b/po/sv/welcome.po index c223bb690..e92a88368 100644 --- a/po/sv/welcome.po +++ b/po/sv/welcome.po @@ -198,15 +198,12 @@ msgstr "Vad är GNU/Linux?" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux är ett operativsystem: ett antal program som låter dig interagera med " +"GNU/Linux är ett operativsystem: ett antal program som låter dig interagera med " "din dator och köra andra program." #. Tag: para @@ -237,14 +234,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -253,11 +243,11 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux är modellerad efter ett Unix-operativsystem. Från början var Linux " +"GNU/Linux är modellerad efter ett Unix-operativsystem. Från början var GNU/Linux " "designad att vara ett parallellbearbetande fleranvändarsystem. Dessa fakta " -"är tillräckliga att göra Linux olikt från andra välkända operativsystem. " -"Dock är Linux ännu mer olik än du kanske tror. I kontrast till andra " -"operativsystem äger ingen Linux. Mycket av dess utveckling är gjord av " +"är tillräckliga att göra GNU/Linux olikt från andra välkända operativsystem. " +"Dock är GNU/Linux ännu mer olik än du kanske tror. I kontrast till andra " +"operativsystem äger ingen GNU/Linux. Mycket av dess utveckling är gjord av " "obetalda frivilliga." #. Tag: para @@ -275,14 +265,7 @@ msgstr "" # Osäker på "arcane" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -293,29 +276,24 @@ msgid "" msgstr "" "<ulink url=\"&url-gnu;\">GNU-projektet</ulink> har utvecklat en omfattande " "samling av fria programverktyg för att användas med Unix™ och Unix-" -"liknande operativsystem såsom Linux. Dessa verktyg ger användarna " +"liknande operativsystem såsom GNU/Linux. Dessa verktyg ger användarna " "möjligheten att utföra vardagliga uppgifter (såsom kopiering och borttagning " "av filer från systemet) till det mystiska (såsom skriva och bygga program " "eller göra sofistikerad redigering i ett antal olika dokumentformat)." #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " "only most of the tools used in GNU/Linux, but also the philosophy and the " "community that made GNU/Linux possible." msgstr "" -"Även om många grupper och individer har bidragit till Linux är den största " +"Även om många grupper och individer har bidragit till GNU/Linux är den största " "enskilda bidragsgivaren fortfarande Free Software Foundation som har skapat " -"inte bara de flesta av verktygen som används i Linux men även filosofin och " -"gemenskapen som gjorde Linux möjlig." +"inte bara de flesta av verktygen som används i GNU/Linux men även filosofin och " +"gemenskapen som gjorde GNU/Linux möjlig." #. Tag: para #: welcome.xml:175 @@ -353,13 +331,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -367,21 +339,15 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Linux-användare har ofantlig frihet att välja sin programvara. Till exempel " -"kan Linux-användare välja från ett dussintal olika kommandoradsskal och " +"GNU/Linux-användare har ofantlig frihet att välja sin programvara. Till exempel " +"kan GNU/Linux-användare välja från ett dussintal olika kommandoradsskal och " "flertalet grafiska skrivbordsmiljöer. Det här urvalet är ofta förvillande " "för användare av andra operativsystem som inte är vana att tänka att " "kommandoraden eller skrivbordsmiljön faktiskt är något de kan ändra." #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -389,10 +355,10 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Linux är också mindre benägen att krascha, bättre på att köra fler än ett " +"GNU/Linux är också mindre benägen att krascha, bättre på att köra fler än ett " "program samtidigt och säkrare än många andra operativsystem. Med dessa " -"fördelar är Linux det snabbast växande operativsystemet på servermarknaden. " -"På senare tid har också Linux börjat bli populärt hos hem- och " +"fördelar är GNU/Linux det snabbast växande operativsystemet på servermarknaden. " +"På senare tid har också GNU/Linux börjat bli populärt hos hem- och " "företagsanvändare." #. Tag: title diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po index 8754197fb..53ccca65d 100644 --- a/po/zh_CN/welcome.po +++ b/po/zh_CN/welcome.po @@ -183,15 +183,12 @@ msgstr "什么是 GNU/Linux？" #. Tag: para #: welcome.xml:124 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is an operating system: a series of programs that let you interact " -#| "with your computer and run other programs." +#, no-c-format msgid "" "GNU/Linux is an operating system: a series of programs that let you interact " "with your computer and run other programs." msgstr "" -"Linux 是一种计算机操作系统：一系列能让您与计算机进行交互操作并运行其它程序的" +"GNU/Linux 是一种计算机操作系统：一系列能让您与计算机进行交互操作并运行其它程序的" "程序。" #. Tag: para @@ -218,14 +215,7 @@ msgstr "" #. Tag: para #: welcome.xml:143 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is modelled on the Unix operating system. From the start, Linux was " -#| "designed to be a multi-tasking, multi-user system. These facts are enough " -#| "to make Linux different from other well-known operating systems. However, " -#| "Linux is even more different than you might imagine. In contrast to other " -#| "operating systems, nobody owns Linux. Much of its development is done by " -#| "unpaid volunteers." +#, no-c-format msgid "" "GNU/Linux is modelled on the Unix operating system. From the start, GNU/" "Linux was designed to be a multi-tasking, multi-user system. These facts are " @@ -234,10 +224,10 @@ msgid "" "contrast to other operating systems, nobody owns GNU/Linux. Much of its " "development is done by unpaid volunteers." msgstr "" -"Linux 是以 Unix 操作系统为原型创造的。自从诞生之日起，它就被设计成一种多任" -"务、多用户的系统。这些特点使 Linux 完全不同于其它著名的操作系统。事实上，" -"Linux 比您所能想象到更加特别。与其它操作系统绝然相反的是，没人真正拥有 " -"Linux，其大部分开发工作都是由无偿的志愿者完成的。" +"GNU/Linux 是以 Unix 操作系统为原型创造的。自从诞生之日起，它就被设计成一种多任" +"务、多用户的系统。这些特点使 GNU/Linux 完全不同于其它著名的操作系统。事实上，" +"GNU/Linux 比您所能想象到更加特别。与其它操作系统绝然相反的是，没人真正拥有 " +"GNU/Linux，其大部分开发工作都是由无偿的志愿者完成的。" #. Tag: para #: welcome.xml:152 @@ -252,14 +242,7 @@ msgstr "" #. Tag: para #: welcome.xml:158 -#, fuzzy, no-c-format -#| msgid "" -#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " -#| "comprehensive set of free software tools for use with Unix™ and " -#| "Unix-like operating systems such as Linux. These tools enable users to " -#| "perform tasks ranging from the mundane (such as copying or removing files " -#| "from the system) to the arcane (such as writing and compiling programs or " -#| "doing sophisticated editing in a variety of document formats)." +#, no-c-format msgid "" "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a " "comprehensive set of free software tools for use with Unix™ and Unix-" @@ -269,26 +252,21 @@ msgid "" "doing sophisticated editing in a variety of document formats)." msgstr "" "<ulink url=\"&url-gnu;\">GNU 工程</ulink> 开发了大量用于 Unix™ 的自由软" -"件工具和类 Unix 操作系统，例如 Linux。这些工具使用户能执行从日常俗事(例如在系" +"件工具和类 Unix 操作系统，例如 GNU/Linux。这些工具使用户能执行从日常俗事(例如在系" "统中复制和删除文件)到神秘操作(例如书写和编译程序或对多种文档格式进行熟练的编" "辑工作)的各种任务。" #. Tag: para #: welcome.xml:168 -#, fuzzy, no-c-format -#| msgid "" -#| "While many groups and individuals have contributed to Linux, the largest " -#| "single contributor is still the Free Software Foundation, which created " -#| "not only most of the tools used in Linux, but also the philosophy and the " -#| "community that made Linux possible." +#, no-c-format msgid "" "While many groups and individuals have contributed to GNU/Linux, the largest " "single contributor is still the Free Software Foundation, which created not " "only most of the tools used in GNU/Linux, but also the philosophy and the " "community that made GNU/Linux possible." msgstr "" -"虽然有许多组织和个人都对 Linux 的发展作出了帮助，但是自由软件基金会依然是最大" -"的单个贡献者。他不仅仅创造了绝大部分在 Linux 中使用的工具，还为 Linux 的存在" +"虽然有许多组织和个人都对 GNU/Linux 的发展作出了帮助，但是自由软件基金会依然是最大" +"的单个贡献者。他不仅仅创造了绝大部分在 GNU/Linux 中使用的工具，还为 GNU/Linux 的存在" "提供了理论和社会基础。" #. Tag: para @@ -326,13 +304,7 @@ msgstr "" #. Tag: para #: welcome.xml:194 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux users have immense freedom of choice in their software. For " -#| "example, Linux users can choose from a dozen different command line " -#| "shells and several graphical desktops. This selection is often " -#| "bewildering to users of other operating systems, who are not used to " -#| "thinking of the command line or desktop as something that they can change." +#, no-c-format msgid "" "GNU/Linux users have immense freedom of choice in their software. For " "example, Linux users can choose from a dozen different command line shells " @@ -340,19 +312,13 @@ msgid "" "of other operating systems, who are not used to thinking of the command line " "or desktop as something that they can change." msgstr "" -"Linux 用户在挑选软件方面有着极大的自由。例如，Linux 用户可以选择几十种不同的" +"GNU/Linux 用户在挑选软件方面有着极大的自由。例如，GNU/Linux 用户可以选择几十种不同的" "命令行外壳和多种图形桌面。这通常让其它操作系统的用户手足无措，他们甚至从来没" "想过命令行和桌面其实是可以更换的。" #. Tag: para #: welcome.xml:203 -#, fuzzy, no-c-format -#| msgid "" -#| "Linux is also less likely to crash, better able to run more than one " -#| "program at the same time, and more secure than many operating systems. " -#| "With these advantages, Linux is the fastest growing operating system in " -#| "the server market. More recently, Linux has begun to be popular among " -#| "home and business users as well." +#, no-c-format msgid "" "GNU/Linux is also less likely to crash, better able to run more than one " "program at the same time, and more secure than many operating systems. With " @@ -360,8 +326,8 @@ msgid "" "server market. More recently, GNU/Linux has begun to be popular among home " "and business users as well." msgstr "" -"Linux 很少会崩溃、适合在同一时间运行多个程序，而且比大多数操作系统更为安全。" -"有了这些优势，Linux 成为在服务器市场上增长最快的操作系统。近来，它还开始在家" +"GNU/Linux 很少会崩溃、适合在同一时间运行多个程序，而且比大多数操作系统更为安全。" +"有了这些优势，GNU/Linux 成为在服务器市场上增长最快的操作系统。近来，它还开始在家" "庭和商业用户中变得越来越流行。" #. Tag: title |