Galician: Updated from template

Also fixed minor issues

15 files changed, 574 insertions, 572 deletions

diff --git a/galician/po/bugs.gl.po b/galician/po/bugs.gl.po
index b846efd6447..efdc04d68c5 100644
--- a/galician/po/bugs.gl.po
+++ b/galician/po/bugs.gl.po
@@ -2,15 +2,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2012-12-06 17:53+0100\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2022-05-13 09:42+0200\n"
 "Last-Translator: Jorge Barreiro <yortx.barry@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: ../../english/Bugs/pkgreport-opts.inc:17
 msgid "in package"
@@ -108,7 +109,7 @@ msgstr "Repetir xuntanza"
 
 #: ../../english/Bugs/pkgreport-opts.inc:138
 msgid "Reverse Bugs"
-msgstr "informes de fallos inversos"
+msgstr "Informes de fallos inversos"
 
 #: ../../english/Bugs/pkgreport-opts.inc:139
 msgid "Reverse Pending"
diff --git a/galician/po/cdimage.gl.po b/galician/po/cdimage.gl.po
index bf1cf878984..148592cdfe7 100644
--- a/galician/po/cdimage.gl.po
+++ b/galician/po/cdimage.gl.po
@@ -18,11 +18,11 @@ msgstr ""
 msgid "      Key fingerprint"
 msgstr "      Pegada dixital da chave"
 
-#: ../../english/devel/debian-installer/images.data:87
+#: ../../english/devel/debian-installer/images.data:90
 msgid "ISO images"
 msgstr "Imaxes ISO"
 
-#: ../../english/devel/debian-installer/images.data:88
+#: ../../english/devel/debian-installer/images.data:91
 msgid "Jigdo files"
 msgstr "Ficheiros «Jigdo»"
 
diff --git a/galician/po/consultants.gl.po b/galician/po/consultants.gl.po
index ef46baa5eda..7918ed7b7d0 100644
--- a/galician/po/consultants.gl.po
+++ b/galician/po/consultants.gl.po
@@ -2,15 +2,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2014-03-16 20:52+0100\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2022-05-13 09:42+0200\n"
 "Last-Translator: Jorge Barreiro <yortx.barry@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: ../../english/consultants/consultant.defs:6
 msgid "Name:"
@@ -54,7 +55,7 @@ msgstr "Puntuacións:"
 
 #: ../../english/consultants/consultant.defs:55
 msgid "Additional Information"
-msgstr "Información adicional:"
+msgstr "Información adicional"
 
 #: ../../english/consultants/consultant.defs:58
 msgid "Willing to Relocate"
diff --git a/galician/po/countries.gl.po b/galician/po/countries.gl.po
index 713e8af742c..3fef4ab3ba0 100644
--- a/galician/po/countries.gl.po
+++ b/galician/po/countries.gl.po
@@ -262,178 +262,182 @@ msgid "Morocco"
 msgstr "Marrocos"
 
 #: ../../english/template/debian/countries.wml:297
+msgid "Monaco"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:300
 msgid "Moldova"
 msgstr "Moldavia"
 
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
 msgid "Macedonia, Republic of"
 msgstr "Macedonia, República de"
 
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
 msgid "Mexico"
 msgstr "México"
 
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
 msgid "Malaysia"
 msgstr "Malasia"
 
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
 msgid "New Zealand"
 msgstr "Nova Celandia"
 
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
 msgid "Peru"
 msgstr "Perú"
 
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
 msgid "Pakistan"
 msgstr "Paquistán"
 
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
 msgid "Réunion"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
 msgid "Romania"
 msgstr "Romanía"
 
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
 msgid "El Salvador"
 msgstr "O Salvador"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Tajikistan"
 msgstr "Taxiquistán"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Tunisia"
 msgstr "Tunicia"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 msgid "Turkey"
 msgstr "Turquía"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
 msgid "Ukraine"
 msgstr "Ucraína"
 
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
 msgid "United States"
 msgstr "Estados Unidos de América"
 
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
 msgid "Uzbekistan"
 msgstr "Uzbequistán"
 
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
 msgid "Vanuatu"
 msgstr "Vanuatú"
 
-#: ../../english/template/debian/countries.wml:423
+#: ../../english/template/debian/countries.wml:426
 msgid "South Africa"
 msgstr "África do Sur"
 
-#: ../../english/template/debian/countries.wml:426
+#: ../../english/template/debian/countries.wml:429
 msgid "Zimbabwe"
 msgstr "Zimbabue"
 
diff --git a/galician/po/doc.gl.po b/galician/po/doc.gl.po
index 8cd7bcd8399..bfa3aaee29a 100644
--- a/galician/po/doc.gl.po
+++ b/galician/po/doc.gl.po
@@ -197,8 +197,8 @@ msgstr "texto plano"
 #: ../../english/doc/manuals.defs:147 ../../english/doc/manuals.defs:157
 #: ../../english/doc/manuals.defs:165
 msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
+"The latest <get-var srctype /> source is available through the <a "
+"href=\"https://packages.debian.org/git\">Git</a> repository."
 msgstr ""
 "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
 "href=\"https://packages.debian.org/git\">Git</a>."
@@ -229,52 +229,17 @@ msgstr "HTML"
 msgid "PDF"
 msgstr "PDF"
 
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "CD de Sarge co instalador e unha selección de paquetes"
-
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live Cd con Knoppix"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "un non oficial de Woody e tres de Potato rev0"
 
 #~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ "  comprehensive source of information on using Debian for desktops,\n"
-#~ "  intranet and internet servers, and development.  It also contains\n"
-#~ "  background information on the project and extensive coverage of\n"
-#~ "  Debian's unique package management system."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
 #~ msgstr ""
-#~ "Tanto principiantes como usuarios avanzados descubrirán que este libro é "
-#~ "unha fonte de información exhaustiva sobre o uso de Debian para "
-#~ "escritorios, servidores de internet e intranet e desenvolvemento. Tamén "
-#~ "contén información básica do proxecto e unha cobertura extensa do sistema "
-#~ "de xestión de paquetes de Debian."
-
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "Debian GNU/Linux 3.1r0a «sarge» oficial en DVD (i386)"
+#~ "Dúas edicións: Unha sen CD, outra co CD oficial (i386, contrib e fontes)"
 
-#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ "  operating system, explaining their usage and pitfalls, and\n"
-#~ "  illustrating the thinking behind each of the approaches. The goal is\n"
-#~ "  not to be a reference book, but to give the reader enough insight\n"
-#~ "  into the workings of the project and operating system to learn and\n"
-#~ "  embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ "  non-intuitive solutions that have evolved as part of the Debian\n"
-#~ "  system over the past decade. While targeted at the well-versed\n"
-#~ "  UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ "  resource alongside a standard Linux reference to bootstrap one's\n"
-#~ "  Linux experience in Debian's bottom-up philosophy."
-#~ msgstr ""
-#~ "Este libro introduce os conceptos e técnicas do sistema operativo Debian, "
-#~ "explicando o seu uso e erros comúns e ilustrando a motivación detrás de "
-#~ "cada unha destas aproximacións. O obxectivo non é ser un libro de "
-#~ "referencia, senón dar ao lector un coñecemento suficiente acerca da forma "
-#~ "de funcionar do proxecto e do sistema operativo para aprender e adoptar "
-#~ "as sofisticadas e elegantes, e as veces pouco intuitivas a primeira "
-#~ "vista, solucións que evolucionaron como parte do sistema Debian ao longo "
-#~ "da pasada década. Inda que está destinado a administradores UNIX/Linux "
-#~ "experimentados, este libro tamén pode servir como un recurso excelente "
-#~ "xunto con unha referencia estándar de Linux para comezar a experiencia "
-#~ "propia en Linux ca filosofía de abaixo a arriba de Debian. "
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "dúas edicións: unha sen DVD, a outra con dous DVDs (i386)"
 
 #~ msgid ""
 #~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
@@ -291,21 +256,69 @@ msgstr "PDF"
 #~ "«copyleft» e as fontes están dispoñíbeis."
 
 #~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ "  installation and configuration of Debian GNU/Linux.\n"
-#~ "  Windows users will gain a gentle introduction to this exciting\n"
-#~ "  computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ "  publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ "  euro (as of 2008)."
 #~ msgstr ""
-#~ "«Learning Debian GNU/Linux» guía ao novo usuario de Linux a través da "
-#~ "instalación e configuración de Debian GNU/Linux. Os usuarios de Windows "
-#~ "obterán unha amable introdución a este excitante mundo da computación "
-#~ "guiados por Bill McCarty en <q>Learning Debian GNU/Linux (Aprendendo "
-#~ "Debian GNU/Linux)</q>."
+#~ "Está dispoñíbel unha <a href=\"http://www.lob.de/cgi-bin/work/"
+#~ "outputexpert?mode=viewone&amp;titnr=254925022\">\n"
+#~ "  publicación </a> alternativa en Lehmanns Fachbuchhandlung e custa "
+#~ "29.95\n"
+#~ "  euros (en 2008)."
+
+#~ msgid ""
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ "  comprehensive source of information on using Debian for desktops,\n"
+#~ "  intranet and internet servers, and development.  It also contains\n"
+#~ "  background information on the project and extensive coverage of\n"
+#~ "  Debian's unique package management system."
+#~ msgstr ""
+#~ "Tanto principiantes como usuarios avanzados descubrirán que este libro é "
+#~ "unha fonte de información exhaustiva sobre o uso de Debian para "
+#~ "escritorios, servidores de internet e intranet e desenvolvemento. Tamén "
+#~ "contén información básica do proxecto e unha cobertura extensa do sistema "
+#~ "de xestión de paquetes de Debian."
+
+#~ msgid ""
+#~ "CVS sources working copy: set <code>CVSROOT</code>\n"
+#~ "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+#~ "  and check out the <kbd>boot-floppies/documentation</kbd> module."
+#~ msgstr ""
+#~ "Copia de traballo das fontes en CVS: poña <code>CVSROOT</code>\n"
+#~ "  a <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+#~ " e obteña o módulo <kbd>boot-floppies/documentation</kbd>."
+
+#~ msgid "CVS via web"
+#~ msgstr "CVS vía web"
+
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
 
 #~ msgid "Debian 2.1"
 #~ msgstr "Debian 2.1"
 
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 arquitectura ARM"
+
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 edición do autor (3 CDs)"
+
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Instalador de Debian GNU/Linux 3.1 Sarge (un só CD)"
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ "     CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, edición do autor (DVD + CD)"
+
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) en DVD"
+
 #~ msgid ""
 #~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
 #~ "  include Debian Linux, networking, programming tools, GUI, desktop\n"
@@ -319,20 +332,24 @@ msgstr "PDF"
 #~ "negocios, cousas simpáticas e multimedia. Inclúe 30 días de asistencia "
 #~ "gratuíta por correo electrónico."
 
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
-
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "dúas edicións: unha sen DVD, a outra con dous DVDs (i386)"
-
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) en DVD"
-
 #~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ "  installation and configuration of Debian GNU/Linux.\n"
+#~ "  Windows users will gain a gentle introduction to this exciting\n"
+#~ "  computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
 #~ msgstr ""
-#~ "Dúas edicións: Unha sen CD, outra co CD oficial (i386, contrib e fontes)"
+#~ "«Learning Debian GNU/Linux» guía ao novo usuario de Linux a través da "
+#~ "instalación e configuración de Debian GNU/Linux. Os usuarios de Windows "
+#~ "obterán unha amable introdución a este excitante mundo da computación "
+#~ "guiados por Bill McCarty en <q>Learning Debian GNU/Linux (Aprendendo "
+#~ "Debian GNU/Linux)</q>."
+
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live Cd con Knoppix"
+
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "CD de Sarge co instalador e unha selección de paquetes"
 
 #~ msgid ""
 #~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -364,43 +381,38 @@ msgstr "PDF"
 #~ "encamiñador «dial-in» ou un servidor para clientes baseados en Windows "
 #~ "(Samba)."
 
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Instalador de Debian GNU/Linux 3.1 Sarge (un só CD)"
-
 #~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ "  and intermediate skill users; installation via various ways,\n"
-#~ "  desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ "  to install Debian GNU/Linux and set up network services like web,\n"
+#~ "  database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ "  using GNU/Linux and Debian's powerful package management system."
 #~ msgstr ""
-#~ "Este libro é do estilo dun dicionario e cobre varios consellos para "
-#~ "usuarios principiantes e de nivel intermedio, a instalación mediante "
-#~ "diferentes medios, a personalización do escritorio, resolución de "
-#~ "problemas e unha proveitosa lista de receitas, entre outras cousas."
+#~ "O primeiro libro Persa sobre Debian GNU/Linux. Este libro axúdao a "
+#~ "instalar Debian GNU/Linux e a configurar servizos de rede como webs, "
+#~ "bases de datos, devasas, correos electrónicos, ftp entre outros. Tamén "
+#~ "lle axuda a comezar usando GNU/Linux e o potente sistema de xestión de "
+#~ "paquetes de Debian."
 
 #~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ "     CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, edición do autor (DVD + CD)"
+#~ "The latest <get-var srctype /> source is available through the <a "
+#~ "href=\"https://packages.debian.org/cvs\">Cvs</a> repository."
+#~ msgstr ""
+#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+#~ "href=\"https://packages.debian.org/cvs\">CVS</a>."
 
 #~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ "  supported as a standard bible of Debian in Japan.\n"
-#~ "  This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ "  as installation, desktop environments, system administration, and\n"
-#~ "  server configuration. Furthermore, this book also includes commercial\n"
-#~ "  font package that decorates your desktop. This book might be useful\n"
-#~ "  for all Debian users from beginners to advanced users."
+#~ "The latest <get-var srctype /> source is available through the <a "
+#~ "href=\"https://packages.debian.org/subversion\">Subversion</a> repository."
 #~ msgstr ""
-#~ "Este é o último libro para Sarge da serie que foi declarada a biblia de "
-#~ "Debian en Xapón. Este libro cobre todos os aspectos do uso de Debian GNU/"
-#~ "Linux 3.1 Sarge, como a instalación, ambientes de escritorio, sistemas de "
-#~ "administración e configuración de servidores. Ademais, este libro tamén "
-#~ "inclúe un paquete de tipografías comerciais que decora o seu escritorio. "
-#~ "Este libro pode ser útil para todos os usuarios de Debian, desde os "
-#~ "principiantes aos usuarios avanzados."
+#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+#~ "href=\"https://packages.debian.org/subversion\">Subversion</a>."
 
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 edición do autor (3 CDs)"
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a "
+#~ "href=\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+#~ "href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
 
 #~ msgid ""
 #~ "This book covers general topics about Debian GNU/Linux:\n"
@@ -416,9 +428,6 @@ msgstr "PDF"
 #~ "de servidores e demais. Poderá instalar e comezar a usar o ambiente en "
 #~ "xaponés de Debian GNU/Linux de forma doada cos CDs personalizados."
 
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "un non oficial de Woody e tres de Potato rev0"
-
 #~ msgid ""
 #~ "This book gives a brief guide to installation of Debian\n"
 #~ "  GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
@@ -435,9 +444,6 @@ msgstr "PDF"
 #~ "mantedores, o que estimula a xente en Corea a converterse en mantedores "
 #~ "oficiais de Debian."
 
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Tres CDs oficiais de Potato r3 e un CD non oficial de Woody"
-
 #~ msgid ""
 #~ "This book introduces readers to Debian GNU/Linux with many\n"
 #~ "  hands-on tutorials and tips. Written in Korean, this book covers\n"
@@ -456,20 +462,40 @@ msgstr "PDF"
 #~ "consellos para configurar Debian para un ambiente en lingua coreana, e "
 #~ "tamén resulta bo para os non iniciados."
 
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ msgid ""
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ "  operating system, explaining their usage and pitfalls, and\n"
+#~ "  illustrating the thinking behind each of the approaches. The goal is\n"
+#~ "  not to be a reference book, but to give the reader enough insight\n"
+#~ "  into the workings of the project and operating system to learn and\n"
+#~ "  embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ "  non-intuitive solutions that have evolved as part of the Debian\n"
+#~ "  system over the past decade. While targeted at the well-versed\n"
+#~ "  UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ "  resource alongside a standard Linux reference to bootstrap one's\n"
+#~ "  Linux experience in Debian's bottom-up philosophy."
+#~ msgstr ""
+#~ "Este libro introduce os conceptos e técnicas do sistema operativo Debian, "
+#~ "explicando o seu uso e erros comúns e ilustrando a motivación detrás de "
+#~ "cada unha destas aproximacións. O obxectivo non é ser un libro de "
+#~ "referencia, senón dar ao lector un coñecemento suficiente acerca da forma "
+#~ "de funcionar do proxecto e do sistema operativo para aprender e adoptar "
+#~ "as sofisticadas e elegantes, e as veces pouco intuitivas a primeira "
+#~ "vista, solucións que evolucionaron como parte do sistema Debian ao longo "
+#~ "da pasada década. Inda que está destinado a administradores UNIX/Linux "
+#~ "experimentados, este libro tamén pode servir como un recurso excelente "
+#~ "xunto con unha referencia estándar de Linux para comezar a experiencia "
+#~ "propia en Linux ca filosofía de abaixo a arriba de Debian. "
 
 #~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ "  to install Debian GNU/Linux and set up network services like web,\n"
-#~ "  database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ "  using GNU/Linux and Debian's powerful package management system."
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ "  and intermediate skill users; installation via various ways,\n"
+#~ "  desktop customize, troubleshooting, profitable knowhow and so on."
 #~ msgstr ""
-#~ "O primeiro libro Persa sobre Debian GNU/Linux. Este libro axúdao a "
-#~ "instalar Debian GNU/Linux e a configurar servizos de rede como webs, "
-#~ "bases de datos, devasas, correos electrónicos, ftp entre outros. Tamén "
-#~ "lle axuda a comezar usando GNU/Linux e o potente sistema de xestión de "
-#~ "paquetes de Debian."
+#~ "Este libro é do estilo dun dicionario e cobre varios consellos para "
+#~ "usuarios principiantes e de nivel intermedio, a instalación mediante "
+#~ "diferentes medios, a personalización do escritorio, resolución de "
+#~ "problemas e unha proveitosa lista de receitas, entre outras cousas."
 
 #~ msgid ""
 #~ "This book is divided into four parts: Basic concepts, Management of\n"
@@ -499,48 +525,6 @@ msgstr "PDF"
 #~ "Este libro basease en Debian Sarge."
 
 #~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
-#~ msgstr ""
-#~ "Este é o libro ideal para aprender como crear plataformas IT básicas e "
-#~ "complexas usando tan só software libre. Dentro atopará unha ampla "
-#~ "variedade de procedementos revisados e axustados para encaixar na boas "
-#~ "prácticas da implementación de infraestrutura tecnolóxica. Esta guía "
-#~ "exhaustiva e doada de ler levarao da man para acadar obxectivos "
-#~ "específicos co sistema operativo Debian GNU/Linux."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Use <a href=\"cvs\">SVN</a> para descargar o texto fonte en SGML de <get-"
-#~ "var ddp_pkg_loc />."
-
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ "  publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ "  euro (as of 2008)."
-#~ msgstr ""
-#~ "Está dispoñíbel unha <a href=\"http://www.lob.de/cgi-bin/work/"
-#~ "outputexpert?mode=viewone&amp;titnr=254925022\">\n"
-#~ "  publicación </a> alternativa en Lehmanns Fachbuchhandlung e custa "
-#~ "29.95\n"
-#~ "  euros (en 2008)."
-
-#~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-#~ msgstr ""
-#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-#~ "href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
-
-#~ msgid ""
 #~ "This book is for developers working with GNU/Linux on ARM processors.\n"
 #~ "  It covers some devices specifically for quick set-up (LART, Assabet, "
 #~ "Psion5).\n"
@@ -572,31 +556,47 @@ msgstr "PDF"
 #~ "traballará en esa distribución e preferiblemente tendo tamén unha máquina "
 #~ "baseada en Debian."
 
-#~ msgid "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 arquitectura ARM"
-
-#~ msgid "CVS via web"
-#~ msgstr "CVS vía web"
-
 #~ msgid ""
-#~ "CVS sources working copy: set <code>CVSROOT</code>\n"
-#~ "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-#~ "  and check out the <kbd>boot-floppies/documentation</kbd> module."
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ "  supported as a standard bible of Debian in Japan.\n"
+#~ "  This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ "  as installation, desktop environments, system administration, and\n"
+#~ "  server configuration. Furthermore, this book also includes commercial\n"
+#~ "  font package that decorates your desktop. This book might be useful\n"
+#~ "  for all Debian users from beginners to advanced users."
 #~ msgstr ""
-#~ "Copia de traballo das fontes en CVS: poña <code>CVSROOT</code>\n"
-#~ "  a <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-#~ " e obteña o módulo <kbd>boot-floppies/documentation</kbd>."
+#~ "Este é o último libro para Sarge da serie que foi declarada a biblia de "
+#~ "Debian en Xapón. Este libro cobre todos os aspectos do uso de Debian GNU/"
+#~ "Linux 3.1 Sarge, como a instalación, ambientes de escritorio, sistemas de "
+#~ "administración e configuración de servidores. Ademais, este libro tamén "
+#~ "inclúe un paquete de tipografías comerciais que decora o seu escritorio. "
+#~ "Este libro pode ser útil para todos os usuarios de Debian, desde os "
+#~ "principiantes aos usuarios avanzados."
 
 #~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://packages.debian.org/subversion\">Subversion</a> repository."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
 #~ msgstr ""
-#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-#~ "href=\"https://packages.debian.org/subversion\">Subversion</a>."
+#~ "Este é o libro ideal para aprender como crear plataformas IT básicas e "
+#~ "complexas usando tan só software libre. Dentro atopará unha ampla "
+#~ "variedade de procedementos revisados e axustados para encaixar na boas "
+#~ "prácticas da implementación de infraestrutura tecnolóxica. Esta guía "
+#~ "exhaustiva e doada de ler levarao da man para acadar obxectivos "
+#~ "específicos co sistema operativo Debian GNU/Linux."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Tres CDs oficiais de Potato r3 e un CD non oficial de Woody"
 
 #~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://packages.debian.org/cvs\">Cvs</a> repository."
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
 #~ msgstr ""
-#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-#~ "href=\"https://packages.debian.org/cvs\">CVS</a>."
+#~ "Use <a href=\"cvs\">SVN</a> para descargar o texto fonte en SGML de <get-"
+#~ "var ddp_pkg_loc />."
+
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "Debian GNU/Linux 3.1r0a «sarge» oficial en DVD (i386)"
diff --git a/galician/po/homepage.gl.po b/galician/po/homepage.gl.po
index 0e4d303edc9..23a74b5ffe3 100644
--- a/galician/po/homepage.gl.po
+++ b/galician/po/homepage.gl.po
@@ -16,11 +16,11 @@ msgid "DebConf19 Group Photo"
 msgstr ""
 
 #: ../../english/index.def:19
-msgid "Mini DebConf Hamburg 2018"
+msgid "Mini DebConf Regensburg 2021"
 msgstr ""
 
 #: ../../english/index.def:22
-msgid "Group photo of the MiniDebConf in Hamburg 2018"
+msgid "Group photo of the MiniDebConf in Regensburg 2021"
 msgstr ""
 
 #: ../../english/index.def:26
diff --git a/galician/po/legal.gl.po b/galician/po/legal.gl.po
index a394b207b36..d047548b8c1 100644
--- a/galician/po/legal.gl.po
+++ b/galician/po/legal.gl.po
@@ -72,11 +72,11 @@ msgstr "Resumo orixinal"
 
 #: ../../english/template/debian/legal.wml:76
 msgid ""
-"The original summary by <summary-author/> can be found in the <a href="
-"\"<summary-url/>\">list archives</a>."
+"The original summary by <summary-author/> can be found in the <a "
+"href=\"<summary-url/>\">list archives</a>."
 msgstr ""
-"O resumo orixinal feito por <summary-author/> pode atoparse nos <a href="
-"\"<summary-url/>\">arquivos da lista</a>."
+"O resumo orixinal feito por <summary-author/> pode atoparse nos <a "
+"href=\"<summary-url/>\">arquivos da lista</a>."
 
 #: ../../english/template/debian/legal.wml:77
 msgid "This summary was prepared by <summary-author/>."
diff --git a/galician/po/newsevents.gl.po b/galician/po/newsevents.gl.po
index cddcf374865..0ece325697c 100644
--- a/galician/po/newsevents.gl.po
+++ b/galician/po/newsevents.gl.po
@@ -173,11 +173,11 @@ msgstr ""
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:70
 msgid ""
-"There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
-"\">hints on how to interpret</a> these numbers."
+"There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-"
+"Stats\">hints on how to interpret</a> these numbers."
 msgstr ""
-"Tamén hai algúns <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
-"\">consellos para interpretar</a> estes números."
+"Tamén hai algúns <a href=\"https://wiki.debian.org/ProjectNews/RC-"
+"Stats\">consellos para interpretar</a> estes números."
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:91
 msgid ""
@@ -186,16 +186,16 @@ msgid ""
 "on how to interpret</a> these numbers."
 msgstr ""
 "Tamén hai <a href=\"<get-var url />\">estatísticas máis detalladas</a>, así "
-"como algúns <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
-"\">consellos para interpretar</a> estes números."
+"como algúns <a href=\"https://wiki.debian.org/ProjectNews/RC-"
+"Stats\">consellos para interpretar</a> estes números."
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:115
 msgid ""
-"<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned"
-"\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/"
-"wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit "
-"the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which "
-"need your help</a>."
+"<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/"
+"orphaned\"><get-var orphaned /> packages are orphaned</a> and <a "
+"href=\"m4_DEVEL/wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: "
+"please visit the complete list of <a href=\"m4_DEVEL/wnpp/"
+"help_requested\">packages which need your help</a>."
 msgstr ""
 "<a href=\"<get-var link />\">Actualmente hai</a> <a href=\"m4_DEVEL/wnpp/"
 "orphaned\"><get-var orphaned /> paquetes orfos</a> e <a href=\"m4_DEVEL/wnpp/"
@@ -207,10 +207,10 @@ msgstr ""
 msgid ""
 "Please help us create this newsletter. We still need more volunteer writers "
 "to watch the Debian community and report about what is going on. Please see "
-"the <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute"
-"\">contributing page</a> to find out how to help. We're looking forward to "
-"receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org"
-"\">debian-publicity@lists.debian.org</a>."
+"the <a href=\"https://wiki.debian.org/ProjectNews/"
+"HowToContribute\">contributing page</a> to find out how to help. We're "
+"looking forward to receiving your mail at <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">debian-publicity@lists.debian.org</a>."
 msgstr ""
 "Axúdenos a crear este boletín de novas. Aínda precisamos máis escritores "
 "voluntarios para observar a comunidade Debian e informar sobre o que "
@@ -225,8 +225,8 @@ msgid ""
 "advisories of the last weeks. If you need to be kept up to date about "
 "security advisories released by the Debian Security Team, please subscribe "
 "to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
-"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
-"\"<get-var url-stable-announce />\">stable updates list</a>) for "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a "
+"href=\"<get-var url-stable-announce />\">stable updates list</a>) for "
 "announcements."
 msgstr ""
 "Teña en conta que esta é unha selección dos avisos de seguridade máis "
@@ -243,19 +243,19 @@ msgid ""
 "advisories of the last weeks. If you need to be kept up to date about "
 "security advisories released by the Debian Security Team, please subscribe "
 "to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
-"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
-"\"<get-var url-stable-announce />\">stable updates list</a> or <a href="
-"\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-"
-"stable /></q>, the oldstable distribution) for announcements."
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a "
+"href=\"<get-var url-stable-announce />\">stable updates list</a> or <a "
+"href=\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-"
+"var old-stable /></q>, the oldstable distribution) for announcements."
 msgstr ""
 "Teña en conta que esta é unha selección dos avisos de seguridade máis "
 "importantes das últimas semanas. Se precisa estar ao día dos avisos de "
 "seguridade publicados polo equipo de seguridade de Debian, subscríbase á <a "
 "href=\"<get-var url-dsa />\"> lista de correo de seguridade</a> (e á  <a "
 "href=\"<get-var url-bpo />lista independente de «backports»</a> e á <get-var "
-"url-stable-announce />lista de actualizacións de «stable»</a> ou á <a href="
-"\"<get-var url-volatile-announce />\">lista de «volatile»</a> para <q><get-"
-"var old-stable /></q>) para recibir avisos."
+"url-stable-announce />lista de actualizacións de «stable»</a> ou á <a "
+"href=\"<get-var url-volatile-announce />\">lista de «volatile»</a> para "
+"<q><get-var old-stable /></q>) para recibir avisos."
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:198
 msgid ""
@@ -336,9 +336,9 @@ msgstr ""
 "sobre charlas  na <a href=\"<get-var events-section />\">sección de eventos</"
 "a> do sitio web de Debian, ou subscribíndose a unha das nosas listas de "
 "correos de eventos para diferentes rexións: <a href=\"<get-var events-ml-eu /"
-">\">Europa</a>, <a href=\"<get-var events-ml-nl />\">Holanda</a>, <a href="
-"\"<get-var events-ml-ha />\">América Latina</a>, <a href=\"<get-var events-"
-"ml-na />\">América do Norte</a>."
+">\">Europa</a>, <a href=\"<get-var events-ml-nl />\">Holanda</a>, <a "
+"href=\"<get-var events-ml-ha />\">América Latina</a>, <a href=\"<get-var "
+"events-ml-na />\">América do Norte</a>."
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:313
 msgid ""
@@ -356,27 +356,27 @@ msgstr ""
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:335
 msgid ""
-"<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />"
-"\">accepted</a> as Debian Developers"
+"<get-var dd-num /> applicants have been <a href=\"<get-var dd-url /"
+">\">accepted</a> as Debian Developers"
 msgstr ""
-"<get-var dd-num /> candidatos foron <a href=\"<get-var dd-url />"
-"\">aceptados</a> como desenvolvedores de Debian"
+"<get-var dd-num /> candidatos foron <a href=\"<get-var dd-url /"
+">\">aceptados</a> como desenvolvedores de Debian"
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:342
 msgid ""
-"<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />"
-"\">accepted</a> as Debian Maintainers"
+"<get-var dm-num /> applicants have been <a href=\"<get-var dm-url /"
+">\">accepted</a> as Debian Maintainers"
 msgstr ""
-"<get-var dm-num /> candidatos foron <a href=\"<get-var dm-url />"
-"\">aceptados</a> como mantedores de Debian"
+"<get-var dm-num /> candidatos foron <a href=\"<get-var dm-url /"
+">\">aceptados</a> como mantedores de Debian"
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:349
 msgid ""
-"<get-var uploader-num /> people have <a href=\"<get-var uploader-url />"
-"\">started to maintain packages</a>"
+"<get-var uploader-num /> people have <a href=\"<get-var uploader-url /"
+">\">started to maintain packages</a>"
 msgstr ""
-"<get-var uploader-num /> persoas <a href=\"<get-var uploader-url />"
-"\">comezaron a manter paquetes</a>"
+"<get-var uploader-num /> persoas <a href=\"<get-var uploader-url /"
+">\">comezaron a manter paquetes</a>"
 
 #: ../../english/template/debian/projectnews/boilerplates.wml:394
 msgid ""
@@ -493,8 +493,8 @@ msgid ""
 "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
 "dwn@debian.org\">%s</a>."
 msgstr ""
-"<void id=\"singular\" />As novas semanais de Debian edítanas <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+"<void id=\"singular\" />As novas semanais de Debian edítanas <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
 
 #. Two or more editors
 #: ../../english/template/debian/weeklynews/footer.wml:20
@@ -517,41 +517,41 @@ msgstr ""
 #. Two or more editors
 #: ../../english/template/debian/weeklynews/footer.wml:30
 msgid ""
-"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
 msgstr ""
 "<void id=\"plural\" />Este número das novas semanais de Debian foi editado "
 "por <a href=\"mailto:dwn@debian.org\">%s</a>."
 
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Para recibir este boletín quincenal no seu correo, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscríbase á lista de correo debian-"
-#~ "news</a>."
-
 #~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
 #~ msgstr "Volver á <a href=\"./\">páxina de oradores de Debian</a>."
 
+#~ msgid "Email:"
+#~ msgstr "Correo electrónico:"
+
+#~ msgid "Languages:"
+#~ msgstr "Idiomas:"
+
 #~ msgid "List of Speakers"
 #~ msgstr "Lista de oradores"
 
-#~ msgid "Topics:"
-#~ msgstr "Temas:"
-
 #~ msgid "Location:"
 #~ msgstr "Localización:"
 
-#~ msgid "Languages:"
-#~ msgstr "Idiomas:"
+#~ msgid "Name:"
+#~ msgstr "Nome:"
 
 #~ msgid "Previous Talks:"
 #~ msgstr "Charlas anteriores:"
 
-#~ msgid "Email:"
-#~ msgstr "Correo electrónico:"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Para recibir este boletín quincenal no seu correo, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscríbase á lista de correo debian-"
+#~ "news</a>."
 
-#~ msgid "Name:"
-#~ msgstr "Nome:"
+#~ msgid "Topics:"
+#~ msgstr "Temas:"
diff --git a/galician/po/organization.gl.po b/galician/po/organization.gl.po
index 6c14144ea40..f62257ed38b 100644
--- a/galician/po/organization.gl.po
+++ b/galician/po/organization.gl.po
@@ -120,33 +120,33 @@ msgid "Officers"
 msgstr "Dirixentes"
 
 #: ../../english/intro/organization.data:71
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:107
 msgid "Distribution"
 msgstr "Distribución"
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:203
+#: ../../english/intro/organization.data:204
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:206
+#: ../../english/intro/organization.data:207
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:212
 #, fuzzy
 msgid "Publicity team"
 msgstr "Publicidade"
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:284
+#: ../../english/intro/organization.data:279
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:312
+#: ../../english/intro/organization.data:302
 msgid "Support and Infrastructure"
 msgstr "Asistencia e infraestrutura"
 
@@ -158,43 +158,43 @@ msgstr "Líder"
 msgid "Technical Committee"
 msgstr "Comité técnico"
 
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:102
 msgid "Secretary"
 msgstr "Secretaría"
 
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:110
 msgid "Development Projects"
 msgstr "Proxectos de desenvolvemento"
 
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:111
 msgid "FTP Archives"
 msgstr "Arquivos FTP"
 
-#: ../../english/intro/organization.data:114
+#: ../../english/intro/organization.data:113
 msgid "FTP Masters"
 msgstr "Xestores do FTP"
 
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:119
 msgid "FTP Assistants"
 msgstr "Asistentes do FTP"
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
 msgid "FTP Wizards"
 msgstr "Magos do FTP"
 
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:129
 msgid "Backports"
 msgstr "Backports"
 
-#: ../../english/intro/organization.data:132
+#: ../../english/intro/organization.data:131
 msgid "Backports Team"
 msgstr "Equipo de backports"
 
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
 msgid "Release Management"
 msgstr "Xestión das publicacións"
 
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
 msgid "Release Team"
 msgstr "Equipo de publicación"
 
@@ -224,161 +224,157 @@ msgstr "Imaxes de CD"
 msgid "Production"
 msgstr "Produción"
 
-#: ../../english/intro/organization.data:161
+#: ../../english/intro/organization.data:162
 msgid "Testing"
 msgstr "Probas"
 
-#: ../../english/intro/organization.data:163
+#: ../../english/intro/organization.data:164
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:168
 msgid "Autobuilding infrastructure"
 msgstr "Infraestrutura de construción automática"
 
-#: ../../english/intro/organization.data:169
+#: ../../english/intro/organization.data:170
 msgid "Wanna-build team"
 msgstr "Equipo de peticións de construción"
 
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:177
 msgid "Buildd administration"
 msgstr "Administración de buildd"
 
-#: ../../english/intro/organization.data:193
+#: ../../english/intro/organization.data:194
 msgid "Documentation"
 msgstr "Documentación"
 
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:199
 msgid "Work-Needing and Prospective Packages list"
 msgstr "Lista de paquetes que precisan traballo e por crear"
 
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:215
 msgid "Press Contact"
 msgstr "Contacto coa prensa"
 
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:217
 msgid "Web Pages"
 msgstr "Páxinas web"
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:225
 msgid "Planet Debian"
 msgstr "Planeta Debian"
 
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:230
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:238
+#: ../../english/intro/organization.data:235
 msgid "Debian Women Project"
 msgstr "Proxecto muller Debian"
 
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:255
+#: ../../english/intro/organization.data:250
 msgid ""
 "To send a private message to all the members of the Community Team, use the "
-"GPG key <a href=\"community-team-pubkey.txt"
-"\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
+"GPG key <a href=\"community-team-pubkey."
+"txt\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
 msgstr ""
 
-#: ../../english/intro/organization.data:257
+#: ../../english/intro/organization.data:252
 msgid "Events"
 msgstr "Eventos"
 
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:259
 #, fuzzy
 msgid "DebConf Committee"
 msgstr "Comité técnico"
 
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:266
 msgid "Partner Program"
 msgstr "Programa de socios"
 
-#: ../../english/intro/organization.data:275
+#: ../../english/intro/organization.data:270
 msgid "Hardware Donations Coordination"
 msgstr "Coordinador das doazóns de hardware"
 
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:285
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:287
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:288
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:290
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:291
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:299
-msgid "SchoolForge"
-msgstr ""
-
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:292
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:295
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:298
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:305
 msgid "Bug Tracking System"
 msgstr "Sistema de seguimento dos informes de fallos"
 
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:310
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Administración das listas de correo o dos seus arquivos"
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:318
 msgid "New Members Front Desk"
 msgstr "Recepción de novos membros"
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:327
 msgid "Debian Account Managers"
 msgstr "Xestores de contas de Debian"
 
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:333
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:334
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Mantedores dos chaveiros (PGP e GPG)"
 
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:338
 msgid "Security Team"
 msgstr "Equipo de seguridade"
 
-#: ../../english/intro/organization.data:355
+#: ../../english/intro/organization.data:350
 msgid "Policy"
 msgstr "Políticas"
 
-#: ../../english/intro/organization.data:358
+#: ../../english/intro/organization.data:353
 msgid "System Administration"
 msgstr "Administración de sistemas"
 
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:354
 msgid ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need a package installed."
@@ -387,43 +383,43 @@ msgstr ""
 "de Debian, incluídos problemas cos contrasinais ou se precisa que se instale "
 "un paquete."
 
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:363
 msgid ""
-"If you have hardware problems with Debian machines, please see <a href="
-"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
-"contain per-machine administrator information."
+"If you have hardware problems with Debian machines, please see <a "
+"href=\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it "
+"should contain per-machine administrator information."
 msgstr ""
-"Se ten problemas co hardware de máquinas Debian, consulte a páxina <a href="
-"\"https://db.debian.org/machines.cgi\">máquinas Debian</a>. Debería conter "
-"información dos administradores de cada máquina."
+"Se ten problemas co hardware de máquinas Debian, consulte a páxina <a "
+"href=\"https://db.debian.org/machines.cgi\">máquinas Debian</a>. Debería "
+"conter información dos administradores de cada máquina."
 
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:364
 msgid "LDAP Developer Directory Administrator"
 msgstr "Administrador do directorio LDAP de desenvolvedores"
 
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:365
 msgid "Mirrors"
 msgstr "Réplicas"
 
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:368
 msgid "DNS Maintainer"
 msgstr "Mantedor do DNS"
 
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:369
 msgid "Package Tracking System"
 msgstr "Sistema de seguimento de paquetes"
 
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:371
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:376
 #, fuzzy
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr "Peticións de uso da<a href=\"m4_HOME/trademark\">marca</a>"
 
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:380
 #, fuzzy
 msgid "Salsa administrators"
 msgstr "Administradores de alioth"
@@ -431,14 +427,20 @@ msgstr "Administradores de alioth"
 #~ msgid "Alioth administrators"
 #~ msgstr "Administradores de alioth"
 
-#~ msgid "Testing Security Team"
-#~ msgstr "Equipo de seguridade en testing"
+#~ msgid "Anti-harassment"
+#~ msgstr "Anti-acoso"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "Proxecto de auditoría de seguridade"
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
 
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Actual líder do proxecto Debian"
+#~ msgid "Bits from Debian"
+#~ msgstr "Novas breves de Debian"
+
+#~ msgid "CD Vendors Page"
+#~ msgstr "Páxina de vendedores de CDs"
+
+#~ msgid "Consultants Page"
+#~ msgstr "Páxina de asesores técnicos"
 
 #~ msgid "DebConf chairs"
 #~ msgstr "Presidencias DebConf"
@@ -446,31 +448,16 @@ msgstr "Administradores de alioth"
 #~ msgid "Debian Maintainer (DM) Keyring Maintainers"
 #~ msgstr "Mantedores do chaveiro de mantedores de Debian (DM)"
 
-#~ msgid "Bits from Debian"
-#~ msgstr "Novas breves de Debian"
-
-#~ msgid "Publicity"
-#~ msgstr "Publicidade"
-
-#~ msgid "Auditor"
-#~ msgstr "Auditor"
-
-#~ msgid "Live System Team"
-#~ msgstr "Equipo do sistema Live"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
 
 #, fuzzy
 #~| msgid "Debian for education"
 #~ msgid "Debian for astronomy"
 #~ msgstr "Debian para a educación"
 
-#~ msgid "Debian for science and related research"
-#~ msgstr "Debian para investigación científica e relacionada"
-
-#~ msgid "Debian for people with disabilities"
-#~ msgstr "Debian para persoas con discapacidades"
-
-#~ msgid "Debian in legal offices"
-#~ msgstr "Debian en oficinas legais"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian para nenos de 1 a 99"
 
 #~ msgid "Debian for education"
 #~ msgstr "Debian para a educación"
@@ -478,20 +465,14 @@ msgstr "Administradores de alioth"
 #~ msgid "Debian for medical practice and research"
 #~ msgstr "Debian para práctica e investigación médica"
 
-#~ msgid "Debian for children from 1 to 99"
-#~ msgstr "Debian para nenos de 1 a 99"
-
-#~ msgid "Individual Packages"
-#~ msgstr "Paquetes individuais"
-
-#~ msgid "Debian Pure Blends"
-#~ msgstr "Debian Pure Blends"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian para persoas con discapacidades"
 
-#~ msgid "Anti-harassment"
-#~ msgstr "Anti-acoso"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian para investigación científica e relacionada"
 
-#~ msgid "User support"
-#~ msgstr "Asistencia ao usuario"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian en oficinas legais"
 
 #~ msgid "Embedded systems"
 #~ msgstr "Sistemas embebidos"
@@ -499,17 +480,32 @@ msgstr "Administradores de alioth"
 #~ msgid "Firewalls"
 #~ msgstr "Devasas"
 
+#~ msgid "Individual Packages"
+#~ msgstr "Paquetes individuais"
+
 #~ msgid "Laptops"
 #~ msgstr "Portátiles"
 
-#~ msgid "Special Configurations"
-#~ msgstr "Configuracións especiais"
+#~ msgid "Live System Team"
+#~ msgstr "Equipo do sistema Live"
 
 #~ msgid "Ports"
 #~ msgstr "Adaptacións"
 
-#~ msgid "CD Vendors Page"
-#~ msgstr "Páxina de vendedores de CDs"
+#~ msgid "Publicity"
+#~ msgstr "Publicidade"
 
-#~ msgid "Consultants Page"
-#~ msgstr "Páxina de asesores técnicos"
+#~ msgid "Security Audit Project"
+#~ msgstr "Proxecto de auditoría de seguridade"
+
+#~ msgid "Special Configurations"
+#~ msgstr "Configuracións especiais"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "Equipo de seguridade en testing"
+
+#~ msgid "User support"
+#~ msgstr "Asistencia ao usuario"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Actual líder do proxecto Debian"
diff --git a/galician/po/others.gl.po b/galician/po/others.gl.po
index 076ebb5364e..84059302956 100644
--- a/galician/po/others.gl.po
+++ b/galician/po/others.gl.po
@@ -252,86 +252,86 @@ msgstr "Está implicado nalgún outro grupo de mulleres na tecnoloxía? Cales?"
 msgid "A bit more about you..."
 msgstr "Algo máis acerca de vostede..."
 
-#~ msgid "Wanted:"
-#~ msgstr "Requirido:"
+#~ msgid "<void id=\"d-i\" />Unknown"
+#~ msgstr "<void id=\"d-i\" />Descoñecido"
 
-#~ msgid "Who:"
-#~ msgstr "Quen:"
+#~ msgid "??"
+#~ msgstr "??"
+
+#~ msgid "ALL"
+#~ msgstr "Todo"
 
 #~ msgid "Architecture:"
 #~ msgstr "Arquitectura:"
 
-#~ msgid "Specifications:"
-#~ msgstr "Especificacións:"
-
-#~ msgid "Where:"
-#~ msgstr "Onde:"
+#~ msgid "BAD"
+#~ msgstr "Mal"
 
-#~ msgid "URL"
-#~ msgstr "URL"
+#~ msgid "BAD?"
+#~ msgstr "Mal?"
 
-#~ msgid "Version"
-#~ msgstr "Versión"
+#~ msgid "Booting"
+#~ msgstr "Arrancando"
 
-#~ msgid "Status"
-#~ msgstr "Estado"
+#~ msgid "Building"
+#~ msgstr "Construíndo"
 
-#~ msgid "Package"
-#~ msgstr "Paquete"
+#~ msgid "Download"
+#~ msgstr "Descargar"
 
-#~ msgid "ALL"
-#~ msgstr "Todo"
+#~ msgid "No images"
+#~ msgstr "Sen imaxes"
 
-#~ msgid "Unknown"
-#~ msgstr "Descoñecido"
+#~ msgid "No kernel"
+#~ msgstr "Sen núcleo"
 
-#~ msgid "??"
-#~ msgstr "??"
+#~ msgid "Not yet"
+#~ msgstr "Aínda non"
 
-#~ msgid "BAD?"
-#~ msgstr "Mal?"
+#~ msgid "OK"
+#~ msgstr "Ben"
 
 #~ msgid "OK?"
 #~ msgstr "Ben?"
 
-#~ msgid "BAD"
-#~ msgstr "Mal"
-
-#~ msgid "OK"
-#~ msgstr "Ben"
-
 #~ msgid "Old banner ads"
 #~ msgstr "Anuncios vellos"
 
-#~ msgid "Download"
-#~ msgstr "Descargar"
+#~ msgid "Package"
+#~ msgstr "Paquete"
+
+#~ msgid "Specifications:"
+#~ msgstr "Especificacións:"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "URL"
+#~ msgstr "URL"
 
 #~ msgid "Unavailable"
 #~ msgstr "Non dispoñíbel"
 
-#~ msgid "<void id=\"d-i\" />Unknown"
-#~ msgstr "<void id=\"d-i\" />Descoñecido"
-
-#~ msgid "No images"
-#~ msgstr "Sen imaxes"
+#~ msgid "Unknown"
+#~ msgstr "Descoñecido"
 
-#~ msgid "No kernel"
-#~ msgstr "Sen núcleo"
+#~ msgid "Version"
+#~ msgstr "Versión"
 
-#~ msgid "Not yet"
-#~ msgstr "Aínda non"
+#~ msgid "Wanted:"
+#~ msgstr "Requirido:"
 
-#~ msgid "Building"
-#~ msgstr "Construíndo"
+#~ msgid "Where:"
+#~ msgstr "Onde:"
 
-#~ msgid "Booting"
-#~ msgstr "Arrancando"
+#~ msgid "Who:"
+#~ msgstr "Quen:"
 
-#~ msgid "sarge (broken)"
-#~ msgstr "sarge (rotas)"
+#~ msgid "Working"
+#~ msgstr "Funcionando"
 
 #~ msgid "sarge"
 #~ msgstr "sarge"
 
-#~ msgid "Working"
-#~ msgstr "Funcionando"
+#~ msgid "sarge (broken)"
+#~ msgstr "sarge (rotas)"
diff --git a/galician/po/partners.gl.po b/galician/po/partners.gl.po
index 24bc73534e4..c2d72d3c8dc 100644
--- a/galician/po/partners.gl.po
+++ b/galician/po/partners.gl.po
@@ -58,8 +58,8 @@ msgstr ""
 
 #: ../../english/partners/partners.def:51
 msgid ""
-"<a href=\"https://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
-"by providing hosting services and sponsorship for the Debian Conference."
+"<a href=\"https://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support "
+"us by providing hosting services and sponsorship for the Debian Conference."
 msgstr ""
 
 #: ../../english/partners/partners.def:55
@@ -149,8 +149,8 @@ msgstr ""
 msgid ""
 "<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
 "delivery network (CDN) services and is helping us deliver packages to users "
-"through <a href=\"https://deb.debian.org/\">deb.debian.org</a> and <a href="
-"\"http://security.debian.org\">security.debian.org</a>."
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a> and <a "
+"href=\"http://security.debian.org\">security.debian.org</a>."
 msgstr ""
 
 #: ../../english/partners/partners.def:106
@@ -212,8 +212,8 @@ msgstr ""
 msgid ""
 "<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
 "(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"Debian services (current HPE hardware donations are listed in the <a "
+"href=\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
 #: ../../english/partners/partners.def:145
@@ -238,8 +238,8 @@ msgstr ""
 msgid ""
 "LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
 "customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a "
+"href=\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
 #: ../../english/partners/partners.def:162
@@ -320,24 +320,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:214
-msgid ""
-"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
-"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
-"Debian with content delivery network (CDN) services, allowing high "
-"availability of services like <a href=\"https://security-tracker.debian.org/"
-"\">the Security Bug Tracker</a> and <a href=\"https://planet.debian.org/"
-"\">Planet Debian</a>."
-msgstr ""
-
-#: ../../english/partners/partners.def:217
-msgid ""
-"StackPath is a platform of secure edge services that enables developers to "
-"protect, accelerate, and innovate cloud properties ranging from websites to "
-"media delivery and IoT services."
-msgstr ""
-
-#: ../../english/partners/partners.def:223
+#: ../../english/partners/partners.def:213
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
 "high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -347,7 +330,7 @@ msgid ""
 "thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:216
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
 "online shop for server systems and high-quality hosting. They offer rack-"
@@ -357,7 +340,7 @@ msgid ""
 "course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:232
+#: ../../english/partners/partners.def:222
 msgid ""
 "<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
 "to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -366,15 +349,15 @@ msgid ""
 "for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:235
+#: ../../english/partners/partners.def:225
 msgid ""
 "trustsec offers customer support, consulting and training for Debian on the "
 "Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"network security and software development with Java. Please e-mail <a "
+"href=\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:243
+#: ../../english/partners/partners.def:233
 msgid ""
 "The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
 "provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -384,7 +367,7 @@ msgid ""
 "increasing the amount of snapshot storage provided."
 msgstr ""
 
-#: ../../english/partners/partners.def:246
+#: ../../english/partners/partners.def:236
 msgid ""
 "The Wellcome Sanger Institute is one of the world's leading genome centres. "
 "Through its ability to conduct research at scale, it is able to engage in "
@@ -395,23 +378,23 @@ msgid ""
 "treatments for human disease."
 msgstr ""
 
-#: ../../english/partners/partners.def:256
+#: ../../english/partners/partners.def:246
 msgid ""
 "<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
 "Novare) provides several machines to Debian, as well as hosting and server "
 "administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:249
 msgid ""
 "Brainfood is a technology solutions company whose goal is to work to produce "
 "an ideal result for a specific need, whether it's a website or an ongoing, "
 "distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood."
+"com\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:266
+#: ../../english/partners/partners.def:256
 msgid ""
 "<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
 "port development, Debian mirrors, and other Debian services (current HP "
@@ -421,7 +404,7 @@ msgid ""
 "com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:269
+#: ../../english/partners/partners.def:259
 msgid ""
 "Hewlett-Packard is one of the largest computer companies in the world, "
 "providing a wide range of products and services, such as servers, PCs, "
@@ -429,7 +412,7 @@ msgid ""
 "solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:276
+#: ../../english/partners/partners.def:266
 msgid ""
 "<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
 "Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -437,7 +420,7 @@ msgid ""
 "current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:280
+#: ../../english/partners/partners.def:270
 msgid ""
 "Linux Central sells all the latest releases of Linux products such as "
 "commercial software, books, hardware, and versions of major Linux "
@@ -447,14 +430,14 @@ msgid ""
 "contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:277
 msgid ""
 "<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
 "Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
 "are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:294
+#: ../../english/partners/partners.def:284
 msgid ""
 "San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
 "a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -465,7 +448,7 @@ msgid ""
 "copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:301
+#: ../../english/partners/partners.def:291
 msgid ""
 "<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
 "Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -473,7 +456,7 @@ msgid ""
 "donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:304
+#: ../../english/partners/partners.def:294
 msgid ""
 "Open Source Press specialises on books around Linux and Open Source "
 "Software, written by authors with considerable experience in the fields, and "
@@ -481,7 +464,7 @@ msgid ""
 "Source Press publications are renowned for their quality and depth."
 msgstr ""
 
-#: ../../english/partners/partners.def:312
+#: ../../english/partners/partners.def:302
 msgid ""
 "<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
 "Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -489,13 +472,13 @@ msgid ""
 "virtual servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:315
+#: ../../english/partners/partners.def:305
 msgid ""
 "It hosts a Debian development machine, <a href=\"https://db.debian.org/"
 "machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:323
+#: ../../english/partners/partners.def:313
 msgid ""
 "<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
 "machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -503,7 +486,7 @@ msgid ""
 "ARM port."
 msgstr ""
 
-#: ../../english/partners/partners.def:326
+#: ../../english/partners/partners.def:316
 msgid ""
 "Simtec is a leading provider of ARM based computing products. We have a "
 "range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
@@ -514,21 +497,38 @@ msgid ""
 "operating systems."
 msgstr ""
 
-#: ../../english/partners/partners.def:334
+#: ../../english/partners/partners.def:325
+msgid ""
+"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
+"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
+"Debian with content delivery network (CDN) services, allowing high "
+"availability of services like <a href=\"https://security-tracker.debian.org/"
+"\">the Security Bug Tracker</a> and <a href=\"https://planet.debian.org/"
+"\">Planet Debian</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:328
+msgid ""
+"StackPath is a platform of secure edge services that enables developers to "
+"protect, accelerate, and innovate cloud properties ranging from websites to "
+"media delivery and IoT services."
+msgstr ""
+
+#: ../../english/partners/partners.def:336
 msgid ""
 "<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
 "supporting the Debian community by donating hardware, rackspace and "
 "bandwidth for the Debian server hosting alioth, arch and svn."
 msgstr ""
 
-#: ../../english/partners/partners.def:337
+#: ../../english/partners/partners.def:339
 msgid ""
 "Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
 "Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
 "are highly motivated Debian users and some of them also Debian maintainers."
 msgstr ""
 
-#: ../../english/partners/partners.def:340
+#: ../../english/partners/partners.def:342
 msgid ""
 "Telegraaf Media Group runs some of the most popular Dutch websites (http://"
 "www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
diff --git a/galician/po/ports.gl.po b/galician/po/ports.gl.po
index 7741172577f..95b83c163d9 100644
--- a/galician/po/ports.gl.po
+++ b/galician/po/ports.gl.po
@@ -92,22 +92,6 @@ msgstr "Subministro"
 msgid "Systems"
 msgstr "Sistemas"
 
-#: ../../english/ports/netbsd/menu.inc:6
-msgid "Debian GNU/NetBSD for i386"
-msgstr "Debian GNU/NetBSD para i386"
-
-#: ../../english/ports/netbsd/menu.inc:10
-msgid "Debian GNU/NetBSD for Alpha"
-msgstr "Debian GNU/NetBSD para Alpha"
-
-#: ../../english/ports/netbsd/menu.inc:14
-msgid "Why"
-msgstr "Porqué"
-
-#: ../../english/ports/netbsd/menu.inc:18
-msgid "People"
-msgstr "Xente"
-
 #: ../../english/ports/powerpc/menu.inc:6
 msgid "Debian for PowerPC"
 msgstr "Debian para PowerPC"
@@ -116,5 +100,17 @@ msgstr "Debian para PowerPC"
 msgid "Debian for Sparc"
 msgstr "Debian para Sparc"
 
+#~ msgid "Debian GNU/NetBSD for Alpha"
+#~ msgstr "Debian GNU/NetBSD para Alpha"
+
+#~ msgid "Debian GNU/NetBSD for i386"
+#~ msgstr "Debian GNU/NetBSD para i386"
+
 #~ msgid "Debian for Laptops"
 #~ msgstr "Debian para portátiles"
+
+#~ msgid "People"
+#~ msgstr "Xente"
+
+#~ msgid "Why"
+#~ msgstr "Porqué"
diff --git a/galician/po/stats.gl.po b/galician/po/stats.gl.po
index 391025aa35d..a6915fd2a21 100644
--- a/galician/po/stats.gl.po
+++ b/galician/po/stats.gl.po
@@ -232,9 +232,6 @@ msgstr "Páxinas web traducidas (por tamaño)"
 msgid "Translation Statistics by Page Size"
 msgstr "Estatísticas de tradución por tamaño de páxina"
 
-#~ msgid "Unified diff"
-#~ msgstr "«diff» unificado"
-
 #~ msgid "Colored diff"
 #~ msgstr "«diff» coloreado"
 
@@ -245,3 +242,6 @@ msgstr "Estatísticas de tradución por tamaño de páxina"
 
 #~ msgid "Created with"
 #~ msgstr "Creado con"
+
+#~ msgid "Unified diff"
+#~ msgstr "«diff» unificado"
diff --git a/galician/po/templates.gl.po b/galician/po/templates.gl.po
index 99db7cc0d77..e137c48ae76 100644
--- a/galician/po/templates.gl.po
+++ b/galician/po/templates.gl.po
@@ -216,49 +216,36 @@ msgstr "na versión 2.1"
 msgid "in release 2.2"
 msgstr "na versión 2.2"
 
-#. TRANSLATORS: Please make clear in the translation of the following
-#. item that mail sent to the debian-www list *must* be in English. Also,
-#. you can add some information of your own translation mailing list
-#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
-#. your language.
-#: ../../english/template/debian/footer.wml:89
-#, fuzzy
+#: ../../english/template/debian/footer.wml:84
 msgid ""
-"To report a problem with the web site, please e-mail our publicly archived "
-"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
-"debian.org</a> in English.  For other contact information, see the Debian <a "
-"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
-"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
+"See our <a href=\"m4_HOME/contact\">contact page</a> to get in touch. Web "
+"site source code is <a href=\"https://salsa.debian.org/webmaster-team/"
+"webwml\">available</a>."
 msgstr ""
-"Para informar dun problema co sitio web, mande un correo a <a href=\"mailto:"
-"debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. Para obter "
-"outra información de contacto consulte a <a href=\"m4_HOME/contact\">páxina "
-"de contacto de Debian</a>. O código fonte do sitio web está <a href="
-"\"m4_HOME/devel/website/using_cvs\">dispoñíbel</a>."
 
-#: ../../english/template/debian/footer.wml:92
+#: ../../english/template/debian/footer.wml:87
 msgid "Last Modified"
 msgstr "Modificado por última vez"
 
-#: ../../english/template/debian/footer.wml:95
+#: ../../english/template/debian/footer.wml:90
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:98
+#: ../../english/template/debian/footer.wml:93
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../../english/template/debian/footer.wml:101
+#: ../../english/template/debian/footer.wml:96
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> e outras;"
 
-#: ../../english/template/debian/footer.wml:104
+#: ../../english/template/debian/footer.wml:99
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 "Consulte <a href=\"m4_HOME/license\" rel=\"copyright\">os termos da licenza</"
 "a>"
 
-#: ../../english/template/debian/footer.wml:107
+#: ../../english/template/debian/footer.wml:102
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -456,7 +443,9 @@ msgid "Debian-Edu project"
 msgstr "Proxecto Debian-Edu"
 
 #: ../../english/template/debian/links.tags.wml:137
-msgid "Alioth &ndash; Debian GForge"
+#, fuzzy
+#| msgid "Alioth &ndash; Debian GForge"
+msgid "Salsa &ndash; Debian Gitlab"
 msgstr "Alioth &ndash; O «GForge» de Debian"
 
 #: ../../english/template/debian/links.tags.wml:140
@@ -519,7 +508,7 @@ msgstr "Informe"
 msgid "Page redirected to <newpage/>"
 msgstr ""
 
-#: ../../english/template/debian/redirect.wml:12
+#: ../../english/template/debian/redirect.wml:14
 msgid ""
 "This page has been renamed to <url <newpage/>>, please update your links."
 msgstr ""
@@ -540,11 +529,11 @@ msgstr ""
 
 #: ../../english/template/debian/translation-check.wml:43
 msgid ""
-"Warning! This translation is too out of date, please see the <a href=\"$link"
-"\">original</a>."
+"Warning! This translation is too out of date, please see the <a "
+"href=\"$link\">original</a>."
 msgstr ""
-"Aviso! Esta tradución está moi desfasada, consulte o <a href=\"$link"
-"\">orixinal</a>."
+"Aviso! Esta tradución está moi desfasada, consulte o <a "
+"href=\"$link\">orixinal</a>."
 
 #: ../../english/template/debian/translation-check.wml:49
 msgid ""
@@ -563,5 +552,20 @@ msgstr "URL"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Volver á <a href=\"../\">páxina «Quen está a usar Debian?»</a>."
 
+#, fuzzy
+#~ msgid ""
+#~ "To report a problem with the web site, please e-mail our publicly "
+#~ "archived mailing list <a href=\"mailto:debian-www@lists.debian."
+#~ "org\">debian-www@lists.debian.org</a> in English.  For other contact "
+#~ "information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. "
+#~ "Web site source code is <a href=\"https://salsa.debian.org/webmaster-team/"
+#~ "webwml\">available</a>."
+#~ msgstr ""
+#~ "Para informar dun problema co sitio web, mande un correo a <a "
+#~ "href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</"
+#~ "a>. Para obter outra información de contacto consulte a <a href=\"m4_HOME/"
+#~ "contact\">páxina de contacto de Debian</a>. O código fonte do sitio web "
+#~ "está <a href=\"m4_HOME/devel/website/using_cvs\">dispoñíbel</a>."
+
 #~ msgid "Visit the site sponsor"
 #~ msgstr "Visite o sitio do patrocinador"
diff --git a/galician/po/vendors.gl.po b/galician/po/vendors.gl.po
index 7db39ed48e7..52e50d8f906 100644
--- a/galician/po/vendors.gl.po
+++ b/galician/po/vendors.gl.po
@@ -67,29 +67,29 @@ msgstr "fonte"
 msgid "and"
 msgstr "e"
 
-#~ msgid "Vendor:"
-#~ msgstr "Vendedor:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL da páxina de Debian:"
-
 #~ msgid "Allows Contribution to Debian:"
 #~ msgstr "Permite contribucións a Debian:"
 
+#~ msgid "Architectures:"
+#~ msgstr "Arquitecturas:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Tipo de CD:"
+
 #~ msgid "Country:"
 #~ msgstr "País:"
 
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo de DVD"
+
 #~ msgid "Ship International:"
 #~ msgstr "Envíos internacionais:"
 
-#~ msgid "email:"
-#~ msgstr "correo:"
-
-#~ msgid "CD Type:"
-#~ msgstr "Tipo de CD:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL da páxina de Debian:"
 
-#~ msgid "DVD Type:"
-#~ msgstr "Tipo de DVD"
+#~ msgid "Vendor:"
+#~ msgstr "Vendedor:"
 
-#~ msgid "Architectures:"
-#~ msgstr "Arquitecturas:"
+#~ msgid "email:"
+#~ msgstr "correo:"