Merge branch 'master' of salsa.debian.org:installer-team/installation-guide

1 files changed, 75 insertions, 77 deletions

diff --git a/po/ca/welcome.po b/po/ca/welcome.po
index c6095d6fe..75fe6ce0f 100644
--- a/po/ca/welcome.po
+++ b/po/ca/welcome.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-07-07 09:56+0000\n"
+"POT-Creation-Date: 2018-08-31 23:21+0000\n"
 "PO-Revision-Date: 2017-06-17 05:54+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: \n"
@@ -162,22 +162,6 @@ msgstr ""
 #: welcome.xml:89
 #, no-c-format
 msgid ""
-"The <ulink url=\"&url-lsb-org;\">Linux Standard Base</ulink> (LSB) is a "
-"project aimed at standardizing the basic GNU/Linux system, which will enable "
-"third-party software and hardware developers to easily design programs and "
-"device drivers for Linux-in-general, rather than for a specific GNU/Linux "
-"distribution."
-msgstr ""
-"La <ulink url=\"&url-lsb-org;\">Base Estàndard del Linux</ulink> és un "
-"projecte enfocat a estandarditzar el sistema bàsic GNU/Linux, que permetrà "
-"als desenvolupadors de programari i maquinari de terceres parts dissenyar "
-"fàcilment programes i controladors de dispositius per a Linux en general, en "
-"comptes de fer-ho per a una distribució específica de GNU/Linux."
-
-#. Tag: para
-#: welcome.xml:99
-#, no-c-format
-msgid ""
 "The <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> "
 "(FHS) is an effort to standardize the layout of the Linux file system. The "
 "FHS will allow software developers to concentrate their efforts on designing "
@@ -192,7 +176,7 @@ msgstr ""
 "GNU/Linux."
 
 #. Tag: para
-#: welcome.xml:109
+#: welcome.xml:99
 #, no-c-format
 msgid ""
 "<ulink url=\"&url-debian-jr;\">Debian Jr.</ulink> is an internal project, "
@@ -203,7 +187,7 @@ msgstr ""
 "joves."
 
 #. Tag: para
-#: welcome.xml:118
+#: welcome.xml:108
 #, no-c-format
 msgid ""
 "For more general information about Debian, see the <ulink url=\"&url-debian-"
@@ -213,13 +197,13 @@ msgstr ""
 "debian-faq;\">PMF de Debian</ulink>."
 
 #. Tag: title
-#: welcome.xml:133
+#: welcome.xml:123
 #, no-c-format
 msgid "What is GNU/Linux?"
 msgstr "Què és GNU/Linux?"
 
 #. Tag: para
-#: welcome.xml:134
+#: welcome.xml:124
 #, no-c-format
 msgid ""
 "Linux is an operating system: a series of programs that let you interact "
@@ -229,7 +213,7 @@ msgstr ""
 "interactuar amb el vostre ordinador i executar altres programes."
 
 #. Tag: para
-#: welcome.xml:139
+#: welcome.xml:129
 #, no-c-format
 msgid ""
 "An operating system consists of various fundamental programs which are "
@@ -255,7 +239,7 @@ msgstr ""
 "a anomenar <quote>Linux</quote>."
 
 #. Tag: para
-#: welcome.xml:153
+#: welcome.xml:143
 #, no-c-format
 msgid ""
 "Linux is modelled on the Unix operating system. From the start, Linux was "
@@ -274,7 +258,7 @@ msgstr ""
 "cobren per fer-ho."
 
 #. Tag: para
-#: welcome.xml:162
+#: welcome.xml:152
 #, no-c-format
 msgid ""
 "Development of what later became GNU/Linux began in 1984, when the <ulink "
@@ -287,7 +271,7 @@ msgstr ""
 "GNU."
 
 #. Tag: para
-#: welcome.xml:168
+#: welcome.xml:158
 #, no-c-format
 msgid ""
 "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a "
@@ -305,7 +289,7 @@ msgstr ""
 "programes o fer edicions sofisticades de documents en diferents formats)."
 
 #. Tag: para
-#: welcome.xml:178
+#: welcome.xml:168
 #, no-c-format
 msgid ""
 "While many groups and individuals have contributed to Linux, the largest "
@@ -320,7 +304,7 @@ msgstr ""
 "possible."
 
 #. Tag: para
-#: welcome.xml:185
+#: welcome.xml:175
 #, no-c-format
 msgid ""
 "The <ulink url=\"&url-kernel-org;\">Linux kernel</ulink> first appeared in "
@@ -337,7 +321,7 @@ msgstr ""
 "ulink>, de Linux International."
 
 #. Tag: para
-#: welcome.xml:194
+#: welcome.xml:184
 #, no-c-format
 msgid ""
 "Linus Torvalds continues to coordinate the work of several hundred "
@@ -355,7 +339,7 @@ msgstr ""
 "faq;\">PMF de la llista de correu del nucli Linux</ulink>."
 
 #. Tag: para
-#: welcome.xml:204
+#: welcome.xml:194
 #, no-c-format
 msgid ""
 "Linux users have immense freedom of choice in their software. For example, "
@@ -372,7 +356,7 @@ msgstr ""
 "l'intèrpret d'ordres o en l'escriptori com quelcom que poden canviar."
 
 #. Tag: para
-#: welcome.xml:213
+#: welcome.xml:203
 #, no-c-format
 msgid ""
 "Linux is also less likely to crash, better able to run more than one program "
@@ -389,13 +373,13 @@ msgstr ""
 "domèstics i de negocis."
 
 #. Tag: title
-#: welcome.xml:231
+#: welcome.xml:221
 #, no-c-format
 msgid "What is &debian; GNU/Linux?"
 msgstr "Què és &debian; GNU/Linux?"
 
 #. Tag: para
-#: welcome.xml:232
+#: welcome.xml:222
 #, no-c-format
 msgid ""
 "The combination of &debian;'s philosophy and methodology and the GNU tools, "
@@ -421,7 +405,7 @@ msgstr ""
 "seguiment d'errors permet que aquests es localitzin i depurin ràpidament."
 
 #. Tag: para
-#: welcome.xml:246
+#: welcome.xml:236
 #, no-c-format
 msgid ""
 "&debian;'s attention to detail allows us to produce a high-quality, stable, "
@@ -436,7 +420,7 @@ msgstr ""
 "qualitat."
 
 #. Tag: para
-#: welcome.xml:253
+#: welcome.xml:243
 #, no-c-format
 msgid ""
 "&debian; is especially popular among advanced users because of its technical "
@@ -450,7 +434,7 @@ msgstr ""
 "característiques al Linux que actualment són quotidianes."
 
 #. Tag: para
-#: welcome.xml:260
+#: welcome.xml:250
 #, no-c-format
 msgid ""
 "For example, &debian; was the first Linux distribution to include a package "
@@ -464,7 +448,7 @@ msgstr ""
 "actualitzar sense necessitar la reinstal·lació completa."
 
 #. Tag: para
-#: welcome.xml:267
+#: welcome.xml:257
 #, no-c-format
 msgid ""
 "&debian; continues to be a leader in Linux development. Its development "
@@ -478,7 +462,7 @@ msgstr ""
 "tasques complexes com generar i mantenir un sistema operatiu complet."
 
 #. Tag: para
-#: welcome.xml:274
+#: welcome.xml:264
 #, no-c-format
 msgid ""
 "The feature that most distinguishes &debian; from other Linux distributions "
@@ -499,7 +483,7 @@ msgstr ""
 "que té."
 
 #. Tag: para
-#: welcome.xml:285
+#: welcome.xml:275
 #, no-c-format
 msgid ""
 "To protect your system against <quote>Trojan horses</quote> and other "
@@ -521,7 +505,7 @@ msgstr ""
 "d'Internet."
 
 #. Tag: para
-#: welcome.xml:295
+#: welcome.xml:285
 #, no-c-format
 msgid ""
 "The primary, and best, method of getting support for your &debian; GNU/Linux "
@@ -541,13 +525,13 @@ msgstr ""
 "llistes de correu de Debian</ulink> i emplenar el formulari que hi trobareu."
 
 #. Tag: title
-#: welcome.xml:318
+#: welcome.xml:308
 #, no-c-format
 msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Què és &debian; GNU/kFreeBSD?"
 
 #. Tag: para
-#: welcome.xml:320
+#: welcome.xml:310
 #, no-c-format
 msgid ""
 "&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
@@ -555,7 +539,7 @@ msgstr ""
 "&debian; GNU/kFreeBSD és un sistema &debian; GNU amb el nucli kFreeBSD."
 
 #. Tag: para
-#: welcome.xml:324
+#: welcome.xml:314
 #, no-c-format
 msgid ""
 "This port of &debian; is currently only being developed for the i386 and "
@@ -566,7 +550,7 @@ msgstr ""
 "arquitectures."
 
 #. Tag: para
-#: welcome.xml:329
+#: welcome.xml:319
 #, no-c-format
 msgid ""
 "Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
@@ -577,7 +561,7 @@ msgstr ""
 "en aquesta varietat."
 
 #. Tag: para
-#: welcome.xml:334
+#: welcome.xml:324
 #, no-c-format
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
@@ -589,13 +573,13 @@ msgstr ""
 "correu <email>debian-bsd@lists.debian.org</email>."
 
 #. Tag: title
-#: welcome.xml:353
+#: welcome.xml:343
 #, no-c-format
 msgid "What is &debian; GNU/Hurd?"
 msgstr "Què és &debian; GNU/Hurd?"
 
 #. Tag: para
-#: welcome.xml:355
+#: welcome.xml:345
 #, no-c-format
 msgid ""
 "&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd &mdash; a set "
@@ -606,7 +590,7 @@ msgstr ""
 "s'executen sobre del micronucli GNU Mach."
 
 #. Tag: para
-#: welcome.xml:360
+#: welcome.xml:350
 #, no-c-format
 msgid ""
 "The Hurd is still unfinished, and is unsuitable for day-to-day use, but work "
@@ -620,7 +604,7 @@ msgstr ""
 "adaptacions a d'altres arquitectures."
 
 #. Tag: para
-#: welcome.xml:368
+#: welcome.xml:358
 #, no-c-format
 msgid ""
 "Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
@@ -631,7 +615,7 @@ msgstr ""
 "aquesta varietat."
 
 #. Tag: para
-#: welcome.xml:373
+#: welcome.xml:363
 #, no-c-format
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/hurd/"
@@ -643,13 +627,13 @@ msgstr ""
 "correu <email>debian-hurd@lists.debian.org</email>."
 
 #. Tag: title
-#: welcome.xml:390
+#: welcome.xml:380
 #, no-c-format
 msgid "Getting &debian;"
 msgstr "Obtenció de &debian;"
 
 #. Tag: para
-#: welcome.xml:392
+#: welcome.xml:382
 #, no-c-format
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
@@ -666,7 +650,7 @@ msgstr ""
 "propera."
 
 #. Tag: para
-#: welcome.xml:401
+#: welcome.xml:391
 #, no-c-format
 msgid ""
 "&debian; can be upgraded after installation very easily. The installation "
@@ -679,13 +663,13 @@ msgstr ""
 "instal·lació."
 
 #. Tag: title
-#: welcome.xml:416
+#: welcome.xml:406
 #, no-c-format
 msgid "Getting the Newest Version of This Document"
 msgstr "Obtenció de l'última versió d'aquest document"
 
 #. Tag: para
-#: welcome.xml:418
+#: welcome.xml:408
 #, no-c-format
 msgid ""
 "This document is constantly being revised. Be sure to check the <ulink url="
@@ -702,13 +686,13 @@ msgstr ""
 "manual d'instal·lació</ulink>."
 
 #. Tag: title
-#: welcome.xml:436
+#: welcome.xml:426
 #, no-c-format
 msgid "Organization of This Document"
 msgstr "Organització d'aquest document"
 
 #. Tag: para
-#: welcome.xml:438
+#: welcome.xml:428
 #, no-c-format
 msgid ""
 "This document is meant to serve as a manual for first-time &debian; users. "
@@ -722,7 +706,7 @@ msgstr ""
 "coneixements generals sobre com funciona el maquinari de l'ordinador."
 
 #. Tag: para
-#: welcome.xml:445
+#: welcome.xml:435
 #, no-c-format
 msgid ""
 "Expert users may also find interesting reference information in this "
@@ -737,7 +721,7 @@ msgstr ""
 "d'aquest document."
 
 #. Tag: para
-#: welcome.xml:452
+#: welcome.xml:442
 #, no-c-format
 msgid ""
 "In general, this manual is arranged in a linear fashion, walking you through "
@@ -751,7 +735,7 @@ msgstr ""
 "d'aquest document que s'hi corresponen:"
 
 #. Tag: para
-#: welcome.xml:460
+#: welcome.xml:450
 #, no-c-format
 msgid ""
 "Determine whether your hardware meets the requirements for using the "
@@ -761,7 +745,7 @@ msgstr ""
 "sistema d'instal·lació a <xref linkend=\"hardware-req\"/>."
 
 #. Tag: para
-#: welcome.xml:466
+#: welcome.xml:456
 #, no-c-format
 msgid ""
 "Backup your system, perform any necessary planning and hardware "
@@ -776,7 +760,7 @@ msgstr ""
 "hi les particions que utilitzarà &debian;."
 
 #. Tag: para
-#: welcome.xml:474
+#: welcome.xml:464
 #, no-c-format
 msgid ""
 "In <xref linkend=\"install-methods\"/>, you will obtain the necessary "
@@ -786,7 +770,7 @@ msgstr ""
 "necessaris per al vostre mètode d'instal·lació."
 
 #. Tag: para
-#: welcome.xml:480
+#: welcome.xml:470
 #, fuzzy, no-c-format
 #| msgid ""
 #| "describes booting into the installation system. This chapter also "
@@ -802,7 +786,7 @@ msgstr ""
 "en aquest pas."
 
 #. Tag: para
-#: welcome.xml:487
+#: welcome.xml:477
 #, no-c-format
 msgid ""
 "Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
@@ -825,7 +809,7 @@ msgstr ""
 "sistema &debian;)."
 
 #. Tag: para
-#: welcome.xml:500
+#: welcome.xml:490
 #, no-c-format
 msgid ""
 "Boot into your newly installed base system, from <xref linkend=\"boot-new\"/"
@@ -834,7 +818,7 @@ msgstr ""
 "Arrenqueu el nou sistema base instal·lat, a <xref linkend=\"boot-new\"/>."
 
 #. Tag: para
-#: welcome.xml:508
+#: welcome.xml:498
 #, no-c-format
 msgid ""
 "Once you've got your system installed, you can read <xref linkend=\"post-"
@@ -846,7 +830,7 @@ msgstr ""
 "sobre Unix i &debian; i com reemplaçar el vostre nucli."
 
 #. Tag: para
-#: welcome.xml:518
+#: welcome.xml:508
 #, no-c-format
 msgid ""
 "Finally, information about this document and how to contribute to it may be "
@@ -856,13 +840,13 @@ msgstr ""
 "a <xref linkend=\"administrivia\"/>."
 
 #. Tag: title
-#: welcome.xml:528
+#: welcome.xml:518
 #, no-c-format
 msgid "Your Documentation Help is Welcome"
 msgstr "La vostra documentació d'ajuda és benvinguda"
 
 #. Tag: para
-#: welcome.xml:530
+#: welcome.xml:520
 #, no-c-format
 msgid ""
 "Any help, suggestions, and especially, patches, are greatly appreciated. "
@@ -876,7 +860,7 @@ msgstr ""
 "arquitectures i idiomes pels quals està disponible el document."
 
 #. Tag: para
-#: welcome.xml:537
+#: welcome.xml:527
 #, no-c-format
 msgid ""
 "Source is also available publicly; look in <xref linkend=\"administrivia\"/> "
@@ -892,13 +876,13 @@ msgstr ""
 "problema no s'hagi notificat prèviament)."
 
 #. Tag: title
-#: welcome.xml:553
+#: welcome.xml:543
 #, no-c-format
 msgid "About Copyrights and Software Licenses"
 msgstr "Sobre els drets d'autoria i les llicències del programari"
 
 #. Tag: para
-#: welcome.xml:556
+#: welcome.xml:546
 #, no-c-format
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
@@ -923,7 +907,7 @@ msgstr ""
 "directament &debian; al basar-se en <emphasis>programari lliure</emphasis>."
 
 #. Tag: para
-#: welcome.xml:569
+#: welcome.xml:559
 #, no-c-format
 msgid ""
 "Calling software <emphasis>free</emphasis> doesn't mean that the software "
@@ -943,7 +927,7 @@ msgstr ""
 "sinó que també en pot distribuir el resultant dels canvis."
 
 #. Tag: para
-#: welcome.xml:580
+#: welcome.xml:570
 #, no-c-format
 msgid ""
 "The &debian; project, as a pragmatic concession to its users, does make some "
@@ -965,7 +949,7 @@ msgstr ""
 "PMF</ulink> als <quote>Arxius d'FTP de Debian</quote>."
 
 #. Tag: para
-#: welcome.xml:594
+#: welcome.xml:584
 #, no-c-format
 msgid ""
 "Many of the programs in the system are licensed under the <emphasis>GNU</"
@@ -993,7 +977,7 @@ msgstr ""
 "aquests programes estarà disponible al sistema &debian;."
 
 #. Tag: para
-#: welcome.xml:613
+#: welcome.xml:603
 #, no-c-format
 msgid ""
 "There are several other forms of copyright statements and software licenses "
@@ -1009,7 +993,7 @@ msgstr ""
 "replaceable>/copyright</filename> un cop estigui instal·lat."
 
 #. Tag: para
-#: welcome.xml:623
+#: welcome.xml:613
 #, no-c-format
 msgid ""
 "For more information about licenses and how &debian; determines whether "
@@ -1022,7 +1006,7 @@ msgstr ""
 "lliure de Debian</ulink>."
 
 #. Tag: para
-#: welcome.xml:629
+#: welcome.xml:619
 #, no-c-format
 msgid ""
 "The most important legal notice is that this software comes with "
@@ -1040,3 +1024,17 @@ msgstr ""
 "la possibilitat de modificar-lo per adaptar-lo a les vostres necessitats "
 "&mdash; i gaudir dels beneficis dels canvis fets per d'altres que han "
 "ampliat el programari a la seva manera."
+
+#~ msgid ""
+#~ "The <ulink url=\"&url-lsb-org;\">Linux Standard Base</ulink> (LSB) is a "
+#~ "project aimed at standardizing the basic GNU/Linux system, which will "
+#~ "enable third-party software and hardware developers to easily design "
+#~ "programs and device drivers for Linux-in-general, rather than for a "
+#~ "specific GNU/Linux distribution."
+#~ msgstr ""
+#~ "La <ulink url=\"&url-lsb-org;\">Base Estàndard del Linux</ulink> és un "
+#~ "projecte enfocat a estandarditzar el sistema bàsic GNU/Linux, que "
+#~ "permetrà als desenvolupadors de programari i maquinari de terceres parts "
+#~ "dissenyar fàcilment programes i controladors de dispositius per a Linux "
+#~ "en general, en comptes de fer-ho per a una distribució específica de GNU/"
+#~ "Linux."