Update language templates

8 files changed, 518 insertions, 518 deletions

diff --git a/galician/po/doc.gl.po b/galician/po/doc.gl.po
index eec8a90e460..8cd7bcd8399 100644
--- a/galician/po/doc.gl.po
+++ b/galician/po/doc.gl.po
@@ -229,171 +229,195 @@ 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 ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://packages.debian.org/cvs\">Cvs</a> repository."
+#~ "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 ""
-#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-#~ "href=\"https://packages.debian.org/cvs\">CVS</a>."
+#~ "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)"
 
 #~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://packages.debian.org/subversion\">Subversion</a> repository."
+#~ "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 ""
-#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-#~ "href=\"https://packages.debian.org/subversion\">Subversion</a>."
+#~ "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 ""
-#~ "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."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ "  in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ "  working with text, images, and sound to productivity and networking\n"
+#~ "  issues. Like the software the book describes, the book is copylefted\n"
+#~ "  and its source data is available."
 #~ 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 "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 arquitectura ARM"
+#~ "Unha guía de referencia práctica do sistema Debian GNU/Linux que mostra "
+#~ "en máis de 1.500 <q>receitas</q> como usalo para actividades diarias; "
+#~ "desde traballar con texto, imaxes e son a produtividade e problemas de "
+#~ "rede. Igual que o software que o libro describe, este libro ten "
+#~ "«copyleft» e as fontes están dispoñíbeis."
 
 #~ 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"
-#~ "  It also gives generic information, tools and techniques. The GNU\n"
-#~ "  toolchain is covered in native and cross-compiler form, as are "
-#~ "bootloaders,\n"
-#~ "  kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-#~ "also\n"
-#~ "  includes extensive tutorial information on GNU/Linux basics for "
-#~ "developers\n"
-#~ "  coming from other platforms.\n"
-#~ "  It is not specific to Debian, but the Aleph\n"
-#~ "  ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-#~ "you\n"
-#~ "  will be working from this distribution and preferably have a Debian "
-#~ "based\n"
-#~ "  host machine too."
+#~ "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 ""
-#~ "Este libro é para desenvolvedores que traballan con GNU/Linux en "
-#~ "procesadores ARM. Cobre algúns dispositivos especificamente para "
-#~ "configuracións rápidas (LART, Assabet, Psion5). Tamén dá información, "
-#~ "ferramentas e técnicas xenéricas. A cadea de ferramentas GNU está cuberta "
-#~ "tanto en nativo como en compilación cruzada, así como os cargadores de "
-#~ "arranque, parches do núcleo, discos RAM, particularidades de ARM e outros "
-#~ "recursos de ARM. Tamén inclúe extensiva información titorial acerca do "
-#~ "esencial de GNU/Linux para desenvolvedores que veñen de outras "
-#~ "plataformas. Non é específico de Debian, pero a distribución «Aleph ARM "
-#~ "Linux» está baseada moi de preto en Debian ARM e asúmese que se "
-#~ "traballará en esa distribución e preferiblemente tendo tamén unha máquina "
-#~ "baseada en Debian."
+#~ "«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 "Debian 2.1"
+#~ msgstr "Debian 2.1"
 
 #~ msgid ""
-#~ "The latest <get-var srctype /> source is available through the <a href="
-#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ "  include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ "  publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ "  support included."
 #~ msgstr ""
-#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-#~ "href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+#~ "Inclúe máis de 230 páxinas e tres discos CDROM. Os temas que cobre o "
+#~ "software inclúen Debian Linux, rede, ferramentas de programación, "
+#~ "interfaces gráficas de usuario (GUI), publicación de escritorio, "
+#~ "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 ""
-#~ "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)."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
 #~ 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)."
+#~ "Dúas edicións: Unha sen CD, outra co CD oficial (i386, contrib e fontes)"
 
 #~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
+#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
+#~ "  PC based hardware, including important applications like the X Window\n"
+#~ "  System, window managers and desktop environments (KDE, GNOME) and a\n"
+#~ "  selection of important system services. Unix/Linux basics and\n"
+#~ "  concepts together with system usage and important components (bash,\n"
+#~ "  system services and important commands) are introduced.\n"
+#~ "  There is an explanation of Debian's package format and how to create\n"
+#~ "  packages in this format. It also includes an overview of standard "
+#~ "Linux\n"
+#~ "  applications (networking, software development, LaTeX and office\n"
+#~ "  suites). Strong emphasis is on networking and system\n"
+#~ "  administration issues, like planing and building of a dial-in router "
+#~ "or\n"
+#~ "  a server for Windows based clients (Samba)."
 #~ msgstr ""
-#~ "Use <a href=\"cvs\">SVN</a> para descargar o texto fonte en SGML de <get-"
-#~ "var ddp_pkg_loc />."
+#~ "Este libro cobre todos os pasos da planificación e instalación de Debian "
+#~ "GNU/Linux en hardware baseado en PC compatible, incluíndo importantes "
+#~ "aplicacións como o sistema de xanelas X, xestores de xanelas e ambientes "
+#~ "de escritorio (KDE, GNOME) e unha selección de importantes servizos do "
+#~ "sistema. Introdúcese información básica e conceptos de Unix/Linux, xunto "
+#~ "co uso do sistema e de importantes compoñentes (bash, servizos do sistema "
+#~ "e ordes importantes). Hai unha explicación do formato de paquetes de "
+#~ "Debian e de como crear paquetes en este formato. Tamén inclúe unha visión "
+#~ "xeral das aplicacións estándar de Linux (rede, desenvolvemento de "
+#~ "software, LaTeX e suites ofimáticas). Ponse especial atención en temas de "
+#~ "rede e de administración do sistema, como planificar e construír un "
+#~ "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 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."
+#~ "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 ""
-#~ "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."
+#~ "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"
-#~ "  GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ "  explains in depth the features of the operating system. The first\n"
-#~ "  chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ "  the reader to understand how the system uses basic resources such as\n"
-#~ "  the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ "  Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ "  for their needs. Many figures throughout the book show aspects about\n"
-#~ "  the performance of the system. This book caters for college students\n"
-#~ "  and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ "  Debian Sarge."
-#~ msgstr ""
-#~ "Este libro está dividido en catro partes: Conceptos básicos, xestión de "
-#~ "GNU/Linux, administración do sistema e operacións avanzadas. Cada "
-#~ "capítulo explica en profundidade as características do sistema operativo. "
-#~ "Os primeiros capítulos explican a estrutura de GNU/Linux. Estes capítulos "
-#~ "axudarán ao lector a entender como fai uso o sistema dos recursos básicos "
-#~ "como o procesador e a memoria. Un análise detallado dos sistemas de "
-#~ "ficheiros ext2, ext3 e ReiserFS capacitarán aos usuarios para facer a "
-#~ "escolla correcta segundo as súas necesidades. Moitas cifras ao longo do "
-#~ "libro mostran aspectos sobre a eficiencia do sistema. Este libro servirá "
-#~ "a estudantes e a calquera que queira aprender GNU/Linux en profundidade. "
-#~ "Este libro basease en Debian Sarge."
+#~ "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 ""
-#~ "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 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 ""
-#~ "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 é 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 "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 edición do autor (3 CDs)"
 
 #~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ "  hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ "  comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ "  package installation, setting up X, connecting to Internet, network\n"
-#~ "  maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ "  Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ "  installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ "  administration, kernel setup, sharing with Windows, building servers\n"
+#~ "  and so on.\n"
+#~ "  You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ "  environment very easily with the customized CDs."
 #~ msgstr ""
-#~ "Este libro introduce aos lectores a Debian GNU/Linux con moitos titoriais "
-#~ "prácticos e consellos. Escrito en coreano, este libro cobre todos os "
-#~ "aspectos do sistema Debian GNU/Linux: instalación por primeira vez, "
-#~ "instalación de paquetes, configuración das X, conexión a internet, "
-#~ "mantemento da rede entre outros. Este libro proporciona unha morea de "
-#~ "consellos para configurar Debian para un ambiente en lingua coreana, e "
-#~ "tamén resulta bo para os non iniciados."
+#~ "Este libro cobre temas xerais sobre Debian GNU/Linux: instalación, APT e "
+#~ "dpkg, o intérprete de ordes, o sistema de xanelas X, rede, administración "
+#~ "do sistema, configuración do núcleo, compartir con Windows, construción "
+#~ "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 "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 "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"
@@ -411,192 +435,168 @@ msgstr "PDF"
 #~ "mantedores, o que estimula a xente en Corea a converterse en mantedores "
 #~ "oficiais de Debian."
 
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "un non oficial de Woody e tres de Potato rev0"
+#~ 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 covers general topics about Debian GNU/Linux:\n"
-#~ "  installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ "  administration, kernel setup, sharing with Windows, building servers\n"
-#~ "  and so on.\n"
-#~ "  You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ "  environment very easily with the customized CDs."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ "  hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ "  comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ "  package installation, setting up X, connecting to Internet, network\n"
+#~ "  maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ "  Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
 #~ msgstr ""
-#~ "Este libro cobre temas xerais sobre Debian GNU/Linux: instalación, APT e "
-#~ "dpkg, o intérprete de ordes, o sistema de xanelas X, rede, administración "
-#~ "do sistema, configuración do núcleo, compartir con Windows, construción "
-#~ "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."
+#~ "Este libro introduce aos lectores a Debian GNU/Linux con moitos titoriais "
+#~ "prácticos e consellos. Escrito en coreano, este libro cobre todos os "
+#~ "aspectos do sistema Debian GNU/Linux: instalación por primeira vez, "
+#~ "instalación de paquetes, configuración das X, conexión a internet, "
+#~ "mantemento da rede entre outros. Este libro proporciona unha morea de "
+#~ "consellos para configurar Debian para un ambiente en lingua coreana, e "
+#~ "tamén resulta bo para os non iniciados."
 
-#~ 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.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
 
 #~ 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 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 é 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."
+#~ "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)"
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ "  GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ "  explains in depth the features of the operating system. The first\n"
+#~ "  chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ "  the reader to understand how the system uses basic resources such as\n"
+#~ "  the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ "  Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ "  for their needs. Many figures throughout the book show aspects about\n"
+#~ "  the performance of the system. This book caters for college students\n"
+#~ "  and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ "  Debian Sarge."
+#~ msgstr ""
+#~ "Este libro está dividido en catro partes: Conceptos básicos, xestión de "
+#~ "GNU/Linux, administración do sistema e operacións avanzadas. Cada "
+#~ "capítulo explica en profundidade as características do sistema operativo. "
+#~ "Os primeiros capítulos explican a estrutura de GNU/Linux. Estes capítulos "
+#~ "axudarán ao lector a entender como fai uso o sistema dos recursos básicos "
+#~ "como o procesador e a memoria. Un análise detallado dos sistemas de "
+#~ "ficheiros ext2, ext3 e ReiserFS capacitarán aos usuarios para facer a "
+#~ "escolla correcta segundo as súas necesidades. Moitas cifras ao longo do "
+#~ "libro mostran aspectos sobre a eficiencia do sistema. Este libro servirá "
+#~ "a estudantes e a calquera que queira aprender GNU/Linux en profundidade. "
+#~ "Este libro basease en Debian Sarge."
 
 #~ 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."
+#~ "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 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 "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Instalador de Debian GNU/Linux 3.1 Sarge (un só CD)"
+#~ "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 ""
-#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
-#~ "  PC based hardware, including important applications like the X Window\n"
-#~ "  System, window managers and desktop environments (KDE, GNOME) and a\n"
-#~ "  selection of important system services. Unix/Linux basics and\n"
-#~ "  concepts together with system usage and important components (bash,\n"
-#~ "  system services and important commands) are introduced.\n"
-#~ "  There is an explanation of Debian's package format and how to create\n"
-#~ "  packages in this format. It also includes an overview of standard "
-#~ "Linux\n"
-#~ "  applications (networking, software development, LaTeX and office\n"
-#~ "  suites). Strong emphasis is on networking and system\n"
-#~ "  administration issues, like planing and building of a dial-in router "
-#~ "or\n"
-#~ "  a server for Windows based clients (Samba)."
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
 #~ msgstr ""
-#~ "Este libro cobre todos os pasos da planificación e instalación de Debian "
-#~ "GNU/Linux en hardware baseado en PC compatible, incluíndo importantes "
-#~ "aplicacións como o sistema de xanelas X, xestores de xanelas e ambientes "
-#~ "de escritorio (KDE, GNOME) e unha selección de importantes servizos do "
-#~ "sistema. Introdúcese información básica e conceptos de Unix/Linux, xunto "
-#~ "co uso do sistema e de importantes compoñentes (bash, servizos do sistema "
-#~ "e ordes importantes). Hai unha explicación do formato de paquetes de "
-#~ "Debian e de como crear paquetes en este formato. Tamén inclúe unha visión "
-#~ "xeral das aplicacións estándar de Linux (rede, desenvolvemento de "
-#~ "software, LaTeX e suites ofimáticas). Ponse especial atención en temas de "
-#~ "rede e de administración do sistema, como planificar e construír un "
-#~ "encamiñador «dial-in» ou un servidor para clientes baseados en Windows "
-#~ "(Samba)."
+#~ "Use <a href=\"cvs\">SVN</a> para descargar o texto fonte en SGML de <get-"
+#~ "var ddp_pkg_loc />."
 
 #~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "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 ""
-#~ "Dúas edicións: Unha sen CD, outra co CD oficial (i386, contrib e fontes)"
-
-#~ 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 without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "dúas edicións: unha sen DVD, a outra con dous DVDs (i386)"
-
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ "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 ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ "  include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ "  publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ "  support included."
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
 #~ msgstr ""
-#~ "Inclúe máis de 230 páxinas e tres discos CDROM. Os temas que cobre o "
-#~ "software inclúen Debian Linux, rede, ferramentas de programación, "
-#~ "interfaces gráficas de usuario (GUI), publicación de escritorio, "
-#~ "negocios, cousas simpáticas e multimedia. Inclúe 30 días de asistencia "
-#~ "gratuíta por correo electrónico."
-
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+#~ "href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
 
 #~ 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>."
+#~ "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"
+#~ "  It also gives generic information, tools and techniques. The GNU\n"
+#~ "  toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ "  kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ "  includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ "  coming from other platforms.\n"
+#~ "  It is not specific to Debian, but the Aleph\n"
+#~ "  ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ "  will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ "  host machine too."
 #~ 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>."
+#~ "Este libro é para desenvolvedores que traballan con GNU/Linux en "
+#~ "procesadores ARM. Cobre algúns dispositivos especificamente para "
+#~ "configuracións rápidas (LART, Assabet, Psion5). Tamén dá información, "
+#~ "ferramentas e técnicas xenéricas. A cadea de ferramentas GNU está cuberta "
+#~ "tanto en nativo como en compilación cruzada, así como os cargadores de "
+#~ "arranque, parches do núcleo, discos RAM, particularidades de ARM e outros "
+#~ "recursos de ARM. Tamén inclúe extensiva información titorial acerca do "
+#~ "esencial de GNU/Linux para desenvolvedores que veñen de outras "
+#~ "plataformas. Non é específico de Debian, pero a distribución «Aleph ARM "
+#~ "Linux» está baseada moi de preto en Debian ARM e asúmese que se "
+#~ "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 ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ "  in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ "  working with text, images, and sound to productivity and networking\n"
-#~ "  issues. Like the software the book describes, the book is copylefted\n"
-#~ "  and its source data is available."
+#~ "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 ""
-#~ "Unha guía de referencia práctica do sistema Debian GNU/Linux que mostra "
-#~ "en máis de 1.500 <q>receitas</q> como usalo para actividades diarias; "
-#~ "desde traballar con texto, imaxes e son a produtividade e problemas de "
-#~ "rede. Igual que o software que o libro describe, este libro ten "
-#~ "«copyleft» e as fontes están dispoñíbeis."
+#~ "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 ""
-#~ "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."
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://packages.debian.org/subversion\">Subversion</a> repository."
 #~ 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 "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "Debian GNU/Linux 3.1r0a «sarge» oficial en DVD (i386)"
+#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+#~ "href=\"https://packages.debian.org/subversion\">Subversion</a>."
 
 #~ 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."
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://packages.debian.org/cvs\">Cvs</a> repository."
 #~ 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 "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"
+#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+#~ "href=\"https://packages.debian.org/cvs\">CVS</a>."
diff --git a/galician/po/homepage.gl.po b/galician/po/homepage.gl.po
index 722d80ddc09..0e4d303edc9 100644
--- a/galician/po/homepage.gl.po
+++ b/galician/po/homepage.gl.po
@@ -32,11 +32,11 @@ msgid "Screenshot from the Calamares installer"
 msgstr ""
 
 #: ../../english/index.def:33 ../../english/index.def:36
-msgid "Debian is like a Swiss Knife"
+msgid "Debian is like a Swiss Army Knife"
 msgstr ""
 
 #: ../../english/index.def:40
-msgid "People have fun"
+msgid "People have fun with Debian"
 msgstr ""
 
 #: ../../english/index.def:43
diff --git a/galician/po/newsevents.gl.po b/galician/po/newsevents.gl.po
index 6b1c03abd44..cddcf374865 100644
--- a/galician/po/newsevents.gl.po
+++ b/galician/po/newsevents.gl.po
@@ -523,35 +523,35 @@ msgstr ""
 "<void id=\"plural\" />Este número das novas semanais de Debian foi editado "
 "por <a href=\"mailto:dwn@debian.org\">%s</a>."
 
-#~ msgid "Name:"
-#~ msgstr "Nome:"
+#~ 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 "Email:"
-#~ msgstr "Correo electrónico:"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Volver á <a href=\"./\">páxina de oradores de Debian</a>."
 
-#~ msgid "Previous Talks:"
-#~ msgstr "Charlas anteriores:"
+#~ msgid "List of Speakers"
+#~ msgstr "Lista de oradores"
 
-#~ msgid "Languages:"
-#~ msgstr "Idiomas:"
+#~ msgid "Topics:"
+#~ msgstr "Temas:"
 
 #~ msgid "Location:"
 #~ msgstr "Localización:"
 
-#~ msgid "Topics:"
-#~ msgstr "Temas:"
+#~ msgid "Languages:"
+#~ msgstr "Idiomas:"
 
-#~ msgid "List of Speakers"
-#~ msgstr "Lista de oradores"
+#~ msgid "Previous Talks:"
+#~ msgstr "Charlas anteriores:"
 
-#~ 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 ""
-#~ "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:"
diff --git a/galician/po/organization.gl.po b/galician/po/organization.gl.po
index 9b2dfebee25..6c14144ea40 100644
--- a/galician/po/organization.gl.po
+++ b/galician/po/organization.gl.po
@@ -125,28 +125,28 @@ msgid "Distribution"
 msgstr "Distribución"
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:209
+#: ../../english/intro/organization.data:203
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:212
+#: ../../english/intro/organization.data:206
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:211
 #, fuzzy
 msgid "Publicity team"
 msgstr "Publicidade"
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:284
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:318
+#: ../../english/intro/organization.data:312
 msgid "Support and Infrastructure"
 msgstr "Asistencia e infraestrutura"
 
@@ -252,141 +252,133 @@ msgstr "Documentación"
 msgid "Work-Needing and Prospective Packages list"
 msgstr "Lista de paquetes que precisan traballo e por crear"
 
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:214
 msgid "Press Contact"
 msgstr "Contacto coa prensa"
 
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:216
 msgid "Web Pages"
 msgstr "Páxinas web"
 
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:228
 msgid "Planet Debian"
 msgstr "Planeta Debian"
 
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:233
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:238
 msgid "Debian Women Project"
 msgstr "Proxecto muller Debian"
 
-#: ../../english/intro/organization.data:252
+#: ../../english/intro/organization.data:246
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:255
 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>."
 msgstr ""
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:257
 msgid "Events"
 msgstr "Eventos"
 
-#: ../../english/intro/organization.data:270
+#: ../../english/intro/organization.data:264
 #, fuzzy
 msgid "DebConf Committee"
 msgstr "Comité técnico"
 
-#: ../../english/intro/organization.data:277
+#: ../../english/intro/organization.data:271
 msgid "Partner Program"
 msgstr "Programa de socios"
 
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:275
 msgid "Hardware Donations Coordination"
 msgstr "Coordinador das doazóns de hardware"
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:290
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:292
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:300
+#: ../../english/intro/organization.data:294
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:296
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:298
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:299
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:302
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:305
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:314
+#: ../../english/intro/organization.data:308
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:315
 msgid "Bug Tracking System"
 msgstr "Sistema de seguimento dos informes de fallos"
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:320
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Administración das listas de correo o dos seus arquivos"
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:329
 msgid "New Members Front Desk"
 msgstr "Recepción de novos membros"
 
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:335
 msgid "Debian Account Managers"
 msgstr "Xestores de contas de Debian"
 
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:339
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:346
+#: ../../english/intro/organization.data:340
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Mantedores dos chaveiros (PGP e GPG)"
 
-#: ../../english/intro/organization.data:350
+#: ../../english/intro/organization.data:344
 msgid "Security Team"
 msgstr "Equipo de seguridade"
 
-#: ../../english/intro/organization.data:361
-msgid "Consultants Page"
-msgstr "Páxina de asesores técnicos"
-
-#: ../../english/intro/organization.data:366
-msgid "CD Vendors Page"
-msgstr "Páxina de vendedores de CDs"
-
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:355
 msgid "Policy"
 msgstr "Políticas"
 
-#: ../../english/intro/organization.data:372
+#: ../../english/intro/organization.data:358
 msgid "System Administration"
 msgstr "Administración de sistemas"
 
-#: ../../english/intro/organization.data:373
+#: ../../english/intro/organization.data:359
 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."
@@ -395,7 +387,7 @@ msgstr ""
 "de Debian, incluídos problemas cos contrasinais ou se precisa que se instale "
 "un paquete."
 
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:369
 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 "
@@ -405,113 +397,119 @@ msgstr ""
 "\"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:384
+#: ../../english/intro/organization.data:370
 msgid "LDAP Developer Directory Administrator"
 msgstr "Administrador do directorio LDAP de desenvolvedores"
 
-#: ../../english/intro/organization.data:385
+#: ../../english/intro/organization.data:371
 msgid "Mirrors"
 msgstr "Réplicas"
 
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:378
 msgid "DNS Maintainer"
 msgstr "Mantedor do DNS"
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:379
 msgid "Package Tracking System"
 msgstr "Sistema de seguimento de paquetes"
 
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:381
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:388
 #, 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:406
+#: ../../english/intro/organization.data:392
 #, fuzzy
 msgid "Salsa administrators"
 msgstr "Administradores de alioth"
 
-#~ msgid "Ports"
-#~ msgstr "Adaptacións"
-
-#~ msgid "Special Configurations"
-#~ msgstr "Configuracións especiais"
+#~ msgid "Alioth administrators"
+#~ msgstr "Administradores de alioth"
 
-#~ msgid "Laptops"
-#~ msgstr "Portátiles"
+#~ msgid "Testing Security Team"
+#~ msgstr "Equipo de seguridade en testing"
 
-#~ msgid "Firewalls"
-#~ msgstr "Devasas"
+#~ msgid "Security Audit Project"
+#~ msgstr "Proxecto de auditoría de seguridade"
 
-#~ msgid "Embedded systems"
-#~ msgstr "Sistemas embebidos"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Actual líder do proxecto Debian"
 
-#~ msgid "User support"
-#~ msgstr "Asistencia ao usuario"
+#~ msgid "DebConf chairs"
+#~ msgstr "Presidencias DebConf"
 
-#~ msgid "Anti-harassment"
-#~ msgstr "Anti-acoso"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Mantedores do chaveiro de mantedores de Debian (DM)"
 
-#~ msgid "Debian Pure Blends"
-#~ msgstr "Debian Pure Blends"
+#~ msgid "Bits from Debian"
+#~ msgstr "Novas breves de Debian"
 
-#~ msgid "Individual Packages"
-#~ msgstr "Paquetes individuais"
+#~ msgid "Publicity"
+#~ msgstr "Publicidade"
 
-#~ msgid "Debian for children from 1 to 99"
-#~ msgstr "Debian para nenos de 1 a 99"
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
 
-#~ msgid "Debian for medical practice and research"
-#~ msgstr "Debian para práctica e investigación médica"
+#~ msgid "Live System Team"
+#~ msgstr "Equipo do sistema Live"
 
-#~ msgid "Debian for education"
+#, fuzzy
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
 #~ msgstr "Debian para a educación"
 
-#~ msgid "Debian in legal offices"
-#~ msgstr "Debian en oficinas legais"
+#~ 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 for science and related research"
-#~ msgstr "Debian para investigación científica e relacionada"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian en oficinas legais"
 
-#, fuzzy
-#~| msgid "Debian for education"
-#~ msgid "Debian for astronomy"
+#~ msgid "Debian for education"
 #~ msgstr "Debian para a educación"
 
-#~ msgid "Live System Team"
-#~ msgstr "Equipo do sistema Live"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian para práctica e investigación médica"
 
-#~ msgid "Auditor"
-#~ msgstr "Auditor"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian para nenos de 1 a 99"
 
-#~ msgid "Publicity"
-#~ msgstr "Publicidade"
+#~ msgid "Individual Packages"
+#~ msgstr "Paquetes individuais"
 
-#~ msgid "Bits from Debian"
-#~ msgstr "Novas breves de Debian"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
 
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Mantedores do chaveiro de mantedores de Debian (DM)"
+#~ msgid "Anti-harassment"
+#~ msgstr "Anti-acoso"
 
-#~ msgid "DebConf chairs"
-#~ msgstr "Presidencias DebConf"
+#~ msgid "User support"
+#~ msgstr "Asistencia ao usuario"
 
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Actual líder do proxecto Debian"
+#~ msgid "Embedded systems"
+#~ msgstr "Sistemas embebidos"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "Proxecto de auditoría de seguridade"
+#~ msgid "Firewalls"
+#~ msgstr "Devasas"
 
-#~ msgid "Testing Security Team"
-#~ msgstr "Equipo de seguridade en testing"
+#~ msgid "Laptops"
+#~ msgstr "Portátiles"
 
-#~ msgid "Alioth administrators"
-#~ msgstr "Administradores de alioth"
+#~ msgid "Special Configurations"
+#~ msgstr "Configuracións especiais"
+
+#~ msgid "Ports"
+#~ msgstr "Adaptacións"
+
+#~ msgid "CD Vendors Page"
+#~ msgstr "Páxina de vendedores de CDs"
+
+#~ msgid "Consultants Page"
+#~ msgstr "Páxina de asesores técnicos"
diff --git a/galician/po/others.gl.po b/galician/po/others.gl.po
index 4e0c96d14ec..076ebb5364e 100644
--- a/galician/po/others.gl.po
+++ b/galician/po/others.gl.po
@@ -12,46 +12,6 @@ msgstr ""
 "X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../english/devel/debian-installer/ports-status.defs:10
-msgid "Working"
-msgstr "Funcionando"
-
-#: ../../english/devel/debian-installer/ports-status.defs:20
-msgid "sarge"
-msgstr "sarge"
-
-#: ../../english/devel/debian-installer/ports-status.defs:30
-msgid "sarge (broken)"
-msgstr "sarge (rotas)"
-
-#: ../../english/devel/debian-installer/ports-status.defs:40
-msgid "Booting"
-msgstr "Arrancando"
-
-#: ../../english/devel/debian-installer/ports-status.defs:50
-msgid "Building"
-msgstr "Construíndo"
-
-#: ../../english/devel/debian-installer/ports-status.defs:56
-msgid "Not yet"
-msgstr "Aínda non"
-
-#: ../../english/devel/debian-installer/ports-status.defs:59
-msgid "No kernel"
-msgstr "Sen núcleo"
-
-#: ../../english/devel/debian-installer/ports-status.defs:62
-msgid "No images"
-msgstr "Sen imaxes"
-
-#: ../../english/devel/debian-installer/ports-status.defs:65
-msgid "<void id=\"d-i\" />Unknown"
-msgstr "<void id=\"d-i\" />Descoñecido"
-
-#: ../../english/devel/debian-installer/ports-status.defs:68
-msgid "Unavailable"
-msgstr "Non dispoñíbel"
-
 #: ../../english/devel/join/nm-steps.inc:7
 msgid "New Members Corner"
 msgstr "O recuncho dos novos membros"
@@ -292,56 +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 "Download"
-#~ msgstr "Descargar"
+#~ msgid "Wanted:"
+#~ msgstr "Requirido:"
 
-#~ msgid "Old banner ads"
-#~ msgstr "Anuncios vellos"
+#~ msgid "Who:"
+#~ msgstr "Quen:"
 
-#~ msgid "OK"
-#~ msgstr "Ben"
+#~ msgid "Architecture:"
+#~ msgstr "Arquitectura:"
 
-#~ msgid "BAD"
-#~ msgstr "Mal"
+#~ msgid "Specifications:"
+#~ msgstr "Especificacións:"
 
-#~ msgid "OK?"
-#~ msgstr "Ben?"
+#~ msgid "Where:"
+#~ msgstr "Onde:"
 
-#~ msgid "BAD?"
-#~ msgstr "Mal?"
+#~ msgid "URL"
+#~ msgstr "URL"
 
-#~ msgid "??"
-#~ msgstr "??"
+#~ msgid "Version"
+#~ msgstr "Versión"
 
-#~ msgid "Unknown"
-#~ msgstr "Descoñecido"
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Package"
+#~ msgstr "Paquete"
 
 #~ msgid "ALL"
 #~ msgstr "Todo"
 
-#~ msgid "Package"
-#~ msgstr "Paquete"
+#~ msgid "Unknown"
+#~ msgstr "Descoñecido"
 
-#~ msgid "Status"
-#~ msgstr "Estado"
+#~ msgid "??"
+#~ msgstr "??"
 
-#~ msgid "Version"
-#~ msgstr "Versión"
+#~ msgid "BAD?"
+#~ msgstr "Mal?"
 
-#~ msgid "URL"
-#~ msgstr "URL"
+#~ msgid "OK?"
+#~ msgstr "Ben?"
 
-#~ msgid "Where:"
-#~ msgstr "Onde:"
+#~ msgid "BAD"
+#~ msgstr "Mal"
 
-#~ msgid "Specifications:"
-#~ msgstr "Especificacións:"
+#~ msgid "OK"
+#~ msgstr "Ben"
 
-#~ msgid "Architecture:"
-#~ msgstr "Arquitectura:"
+#~ msgid "Old banner ads"
+#~ msgstr "Anuncios vellos"
 
-#~ msgid "Who:"
-#~ msgstr "Quen:"
+#~ msgid "Download"
+#~ msgstr "Descargar"
 
-#~ msgid "Wanted:"
-#~ msgstr "Requirido:"
+#~ 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 "No kernel"
+#~ msgstr "Sen núcleo"
+
+#~ msgid "Not yet"
+#~ msgstr "Aínda non"
+
+#~ msgid "Building"
+#~ msgstr "Construíndo"
+
+#~ msgid "Booting"
+#~ msgstr "Arrancando"
+
+#~ msgid "sarge (broken)"
+#~ msgstr "sarge (rotas)"
+
+#~ msgid "sarge"
+#~ msgstr "sarge"
+
+#~ msgid "Working"
+#~ msgstr "Funcionando"
diff --git a/galician/po/stats.gl.po b/galician/po/stats.gl.po
index 472321e6a46..391025aa35d 100644
--- a/galician/po/stats.gl.po
+++ b/galician/po/stats.gl.po
@@ -232,16 +232,16 @@ 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 "Created with"
-#~ msgstr "Creado con"
+#~ msgid "Unified diff"
+#~ msgstr "«diff» unificado"
+
+#~ msgid "Colored diff"
+#~ msgstr "«diff» coloreado"
 
 #, fuzzy
 #~| msgid "Colored diff"
 #~ msgid "Commit diff"
 #~ msgstr "«diff» coloreado"
 
-#~ msgid "Colored diff"
-#~ msgstr "«diff» coloreado"
-
-#~ msgid "Unified diff"
-#~ msgstr "«diff» unificado"
+#~ msgid "Created with"
+#~ msgstr "Creado con"
diff --git a/galician/po/templates.gl.po b/galician/po/templates.gl.po
index 9e11d886074..99db7cc0d77 100644
--- a/galician/po/templates.gl.po
+++ b/galician/po/templates.gl.po
@@ -161,6 +161,18 @@ msgstr "A bitácora de Debian"
 
 #: ../../english/template/debian/common_translation.wml:94
 #, fuzzy
+#| msgid "Debian Project News"
+msgid "Debian Micronews"
+msgstr "Novas do proxecto Debian"
+
+#: ../../english/template/debian/common_translation.wml:97
+#, fuzzy
+#| msgid "Debian Project"
+msgid "Debian Planet"
+msgstr "Proxecto Debian"
+
+#: ../../english/template/debian/common_translation.wml:100
+#, fuzzy
 msgid "Last Updated"
 msgstr "Modificado por última vez"
 
@@ -209,7 +221,7 @@ msgstr "na versión 2.2"
 #. 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:91
+#: ../../english/template/debian/footer.wml:89
 #, fuzzy
 msgid ""
 "To report a problem with the web site, please e-mail our publicly archived "
@@ -224,29 +236,29 @@ msgstr ""
 "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:94
+#: ../../english/template/debian/footer.wml:92
 msgid "Last Modified"
 msgstr "Modificado por última vez"
 
-#: ../../english/template/debian/footer.wml:97
+#: ../../english/template/debian/footer.wml:95
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:100
+#: ../../english/template/debian/footer.wml:98
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../../english/template/debian/footer.wml:103
+#: ../../english/template/debian/footer.wml:101
 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:106
+#: ../../english/template/debian/footer.wml:104
 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:109
+#: ../../english/template/debian/footer.wml:107
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
diff --git a/galician/po/vendors.gl.po b/galician/po/vendors.gl.po
index 1d52e582471..7db39ed48e7 100644
--- a/galician/po/vendors.gl.po
+++ b/galician/po/vendors.gl.po
@@ -67,29 +67,29 @@ msgstr "fonte"
 msgid "and"
 msgstr "e"
 
-#~ msgid "Architectures:"
-#~ msgstr "Arquitecturas:"
+#~ msgid "Vendor:"
+#~ msgstr "Vendedor:"
 
-#~ msgid "DVD Type:"
-#~ msgstr "Tipo de DVD"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL da páxina de Debian:"
 
-#~ msgid "CD Type:"
-#~ msgstr "Tipo de CD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permite contribucións a Debian:"
 
-#~ msgid "email:"
-#~ msgstr "correo:"
+#~ msgid "Country:"
+#~ msgstr "País:"
 
 #~ msgid "Ship International:"
 #~ msgstr "Envíos internacionais:"
 
-#~ msgid "Country:"
-#~ msgstr "País:"
+#~ msgid "email:"
+#~ msgstr "correo:"
 
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Permite contribucións a Debian:"
+#~ 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:"