Update PO files from english POT files

14 files changed, 690 insertions, 705 deletions

diff --git a/esperanto/po/cdimage.eo.po b/esperanto/po/cdimage.eo.po
index d36b3e96399..4aa59359e4c 100644
--- a/esperanto/po/cdimage.eo.po
+++ b/esperanto/po/cdimage.eo.po
@@ -9,20 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
-#: ../../english/CD/CD-keys.data:13
-msgid "      Key fingerprint"
-msgstr "      Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
 #. note: only change the sep(arator) if it's not good for your charset
 #: ../../english/template/debian/cdimage.wml:10
 msgid "·"
@@ -70,7 +56,6 @@ msgstr "<void id=\"dc_rsyncmirrors\" />Speguloj de rsync"
 
 #: ../../english/template/debian/cdimage.wml:43
 #, fuzzy
-#| msgid "<void id=\"dc_misc\" />Misc"
 msgid "<void id=\"dc_verify\" />Verify"
 msgstr "<void id=\"dc_verify\" />Kontroli"
 
@@ -121,3 +106,17 @@ msgid ""
 msgstr ""
 "<a href=\"/MailingLists/disclaimer\">Publika retpoŝta dissendolisto</a> por "
 "KD/DVD en la angla lingvo:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
+msgid "      Key fingerprint"
+msgstr "      Key fingerprint"
+
+#: ../../english/devel/debian-installer/images.data:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/esperanto/po/consultants.eo.po b/esperanto/po/consultants.eo.po
index 657f6e8c2fa..9b01e2a286a 100644
--- a/esperanto/po/consultants.eo.po
+++ b/esperanto/po/consultants.eo.po
@@ -9,6 +9,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Listo de konsilistoj"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Reen al la <a href=\"./\">paĝo de konsilistoj pri Debian</a>."
+
 #: ../../english/consultants/consultant.defs:6
 msgid "Name:"
 msgstr "Nomo:"
@@ -64,11 +72,3 @@ msgid ""
 msgstr ""
 "Estas <total_consultant> konsultistoj pri Debian listitaj en <total_country> "
 "landoj worldwide."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Listo de konsilistoj"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Reen al la <a href=\"./\">paĝo de konsilistoj pri Debian</a>."
diff --git a/esperanto/po/countries.eo.po b/esperanto/po/countries.eo.po
index 2761a706481..897d3123a73 100644
--- a/esperanto/po/countries.eo.po
+++ b/esperanto/po/countries.eo.po
@@ -11,7 +11,6 @@ msgstr ""
 
 #: ../../english/template/debian/countries.wml:111
 #, fuzzy
-#| msgid "United States"
 msgid "United Arab Emirates"
 msgstr "Usono"
 
@@ -221,212 +220,216 @@ msgid "Kenya"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:267
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:270
 msgid "Korea"
 msgstr "Koreio"
 
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
 msgid "Kuwait"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
 msgid "Kazakhstan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
 msgid "Sri Lanka"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
 msgid "Lithuania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
 msgid "Luxembourg"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
 msgid "Latvia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
 msgid "Morocco"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
 msgid "Montenegro"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
 msgid "Madagascar"
 msgstr "Madagaskaro"
 
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
 msgid "Macedonia, Republic of"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
 msgid "Malta"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
 msgid "Malaysia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
 msgid "Nicaragua"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
 msgid "Netherlands"
 msgstr "Nederlando"
 
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
 msgid "Norway"
 msgstr "Norvegio"
 
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
 msgid "New Zealand"
 msgstr "Novzelando"
 
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
 #, fuzzy
 msgid "Panama"
 msgstr "Kanado"
 
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
 msgid "Peru"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
 msgid "Philippines"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
 msgid "Pakistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
 msgid "Poland"
 msgstr "Polando"
 
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
 msgid "Portugal"
 msgstr "Portugalio"
 
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
 msgid "Réunion"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
 msgid "Romania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
 msgid "Serbia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
 msgid "Russia"
 msgstr "Rusio"
 
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
 msgid "Saudi Arabia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
 msgid "Sweden"
 msgstr "Svedio"
 
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
 msgid "Singapore"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
 msgid "Slovenia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
 msgid "Slovakia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
 msgid "El Salvador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
 msgid "Thailand"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
 msgid "Tajikistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Tunisia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Turkey"
 msgstr "Turkio"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Taiwan"
 msgstr "Tajvano"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 #, fuzzy
 msgid "Ukraine"
 msgstr "Francio"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "United States"
 msgstr "Usono"
 
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
 msgid "Uruguay"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
 msgid "Uzbekistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
 msgid "Venezuela"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
 msgid "Vietnam"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
 msgid "Vanuatu"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
 msgid "South Africa"
 msgstr "Sudafriko"
 
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
 msgid "Zimbabwe"
 msgstr "Zimbabvo"
 
diff --git a/esperanto/po/distrib.eo.po b/esperanto/po/distrib.eo.po
index b729e720719..12992034142 100644
--- a/esperanto/po/distrib.eo.po
+++ b/esperanto/po/distrib.eo.po
@@ -9,97 +9,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/distrib/search_contents-form.inc:9
 #: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
 msgid "Keyword"
 msgstr "Ŝlosilvorto"
 
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Montri"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "vojojn kiuj finiĝas per la ŝlosilvorto"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pakojn kiuj enhavas dosierojn kun nomoj ĉi tiaj"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pakojn kiuj enhavas dosierojn kies nomoj enhavas la ŝlosilvorto"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:25
 #: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
 msgid "Distribution"
 msgstr "Distribuo"
 
-#: ../../english/distrib/search_contents-form.inc:27
 #: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
 msgid "experimental"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:28
 #: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
 msgid "unstable"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:29
 #: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
 msgid "testing"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:30
 #: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
 msgid "stable"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:31
 #: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
 msgid "oldstable"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr ""
-
-#: ../../english/distrib/search_contents-form.inc:38
 #: ../../english/distrib/search_packages-form.inc:32
 #: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
 msgid "any"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Serĉi"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Rekomenci"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr ""
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr ""
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr ""
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr ""
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr ""
-
 #: ../../english/distrib/search_packages-form.inc:34
 msgid "Section"
 msgstr ""
@@ -116,6 +86,36 @@ msgstr ""
 msgid "non-free"
 msgstr ""
 
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Serĉi"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Rekomenci"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Montri"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "vojojn kiuj finiĝas per la ŝlosilvorto"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pakojn kiuj enhavas dosierojn kun nomoj ĉi tiaj"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pakojn kiuj enhavas dosierojn kies nomoj enhavas la ŝlosilvorto"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr ""
+
 #: ../../english/releases/arches.data:8
 msgid "Alpha"
 msgstr ""
diff --git a/esperanto/po/doc.eo.po b/esperanto/po/doc.eo.po
index 12c26cafaf6..72ad6b3c7cc 100644
--- a/esperanto/po/doc.eo.po
+++ b/esperanto/po/doc.eo.po
@@ -9,96 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-"  Debian 9 is the must-have handbook for learning Linux. Start on the\n"
-"  beginners level and learn how to deploy the system with graphical\n"
-"  interface and terminal.\n"
-"  This book provides the basic knowledge to grow and become a 'junior'\n"
-"  systems administrator. Start off with exploring the GNOME desktop\n"
-"  interface and adjust it to your personal needs. Overcome your fear of\n"
-"  using the Linux terminal and learn the most essential commands in\n"
-"  administering Debian. Expand your knowledge of system services (systemd)\n"
-"  and learn how to adapt them. Get more out of the software in Debian and\n"
-"  outside of Debian. Manage your home-network with network-manager, etc.\n"
-"  10 percent of the profits on this book will be donated to the Debian\n"
-"  Project."
-msgstr ""
-
-#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-msgid ""
-"Written by two Debian developers, this free book\n"
-"  started as a translation of their French best-seller known as Cahier de\n"
-"  l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
-"  teaches the essentials to anyone who wants to become an effective and\n"
-"  independent Debian GNU/Linux administrator.\n"
-"  It covers all the topics that a competent Linux administrator should\n"
-"  master, from the installation and the update of the system, up to the\n"
-"  creation of packages and the compilation of the kernel, but also\n"
-"  monitoring, backup and migration, without forgetting advanced topics\n"
-"  like SELinux setup to secure services, automated installations, or\n"
-"  virtualization with Xen, KVM or LXC."
-msgstr ""
-
-#: ../../english/doc/books.data:83
-msgid ""
-"The aim of this freely available, up-to-date, book is to get you up to\n"
-"  speed with Debian (including both the current stable release and the\n"
-"  current unstable distribution). It is comprehensive with basic support\n"
-"  for the user who installs and maintains the system themselves (whether\n"
-"  in the home, office, club, or school)."
-msgstr ""
-
-#: ../../english/doc/books.data:105
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-"  covers all aspects of the administration of Debian from the installation\n"
-"  to the configuration of network services.\n"
-"  Written by two Debian developers, this book can be of interest to many\n"
-"  people: the beginner wishing to discover Debian, the advanced user "
-"looking\n"
-"  for tips to enhance his mastership of the Debian tools and the\n"
-"  administrator who wants to build a reliable network with Debian."
-msgstr ""
-
-#: ../../english/doc/books.data:125
-msgid ""
-"The book covers topics ranging from concepts of package\n"
-"  management over the available tools and how they're used to concrete "
-"problems\n"
-"  which may occur in real life and how they can be solved. The book is "
-"written\n"
-"  in German, an English translation is planned. Format: e-book (Online, "
-"HTML,\n"
-"  PDF, ePub, Mobi), printed book planned.\n"
-msgstr ""
-
-#: ../../english/doc/books.data:146
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment.  It shows the full potential of "
-"the distribution (in its current version 8) and provides a practical manual "
-"for all users who want to learn more about Debian and its range of services."
-msgstr ""
-
-#: ../../english/doc/books.data:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-"  This book teaches you how to build and configure Debian 8.x server system\n"
-"  security hardening using Kali Linux and Debian simultaneously.\n"
-"  DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-"  From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-"  how to enhance Debian's security by applying the method of penetration\n"
-"  testing.\n"
-"  This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-"  MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-"  intrusion detection system."
-msgstr ""
-
 #: ../../english/doc/books.def:38
 msgid "Author:"
 msgstr ""
@@ -205,6 +115,96 @@ msgstr ""
 msgid "Debian package (archived)"
 msgstr ""
 
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+"  Debian 9 is the must-have handbook for learning Linux. Start on the\n"
+"  beginners level and learn how to deploy the system with graphical\n"
+"  interface and terminal.\n"
+"  This book provides the basic knowledge to grow and become a 'junior'\n"
+"  systems administrator. Start off with exploring the GNOME desktop\n"
+"  interface and adjust it to your personal needs. Overcome your fear of\n"
+"  using the Linux terminal and learn the most essential commands in\n"
+"  administering Debian. Expand your knowledge of system services (systemd)\n"
+"  and learn how to adapt them. Get more out of the software in Debian and\n"
+"  outside of Debian. Manage your home-network with network-manager, etc.\n"
+"  10 percent of the profits on this book will be donated to the Debian\n"
+"  Project."
+msgstr ""
+
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+msgid ""
+"Written by two Debian developers, this free book\n"
+"  started as a translation of their French best-seller known as Cahier de\n"
+"  l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
+"  teaches the essentials to anyone who wants to become an effective and\n"
+"  independent Debian GNU/Linux administrator.\n"
+"  It covers all the topics that a competent Linux administrator should\n"
+"  master, from the installation and the update of the system, up to the\n"
+"  creation of packages and the compilation of the kernel, but also\n"
+"  monitoring, backup and migration, without forgetting advanced topics\n"
+"  like SELinux setup to secure services, automated installations, or\n"
+"  virtualization with Xen, KVM or LXC."
+msgstr ""
+
+#: ../../english/doc/books.data:83
+msgid ""
+"The aim of this freely available, up-to-date, book is to get you up to\n"
+"  speed with Debian (including both the current stable release and the\n"
+"  current unstable distribution). It is comprehensive with basic support\n"
+"  for the user who installs and maintains the system themselves (whether\n"
+"  in the home, office, club, or school)."
+msgstr ""
+
+#: ../../english/doc/books.data:105
+msgid ""
+"The first French book about Debian is already in its fifth edition. It\n"
+"  covers all aspects of the administration of Debian from the installation\n"
+"  to the configuration of network services.\n"
+"  Written by two Debian developers, this book can be of interest to many\n"
+"  people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
+"  for tips to enhance his mastership of the Debian tools and the\n"
+"  administrator who wants to build a reliable network with Debian."
+msgstr ""
+
+#: ../../english/doc/books.data:125
+msgid ""
+"The book covers topics ranging from concepts of package\n"
+"  management over the available tools and how they're used to concrete "
+"problems\n"
+"  which may occur in real life and how they can be solved. The book is "
+"written\n"
+"  in German, an English translation is planned. Format: e-book (Online, "
+"HTML,\n"
+"  PDF, ePub, Mobi), printed book planned.\n"
+msgstr ""
+
+#: ../../english/doc/books.data:146
+msgid ""
+"This book teaches you how to install and configure the system and also how "
+"to use Debian in a professional environment.  It shows the full potential of "
+"the distribution (in its current version 8) and provides a practical manual "
+"for all users who want to learn more about Debian and its range of services."
+msgstr ""
+
+#: ../../english/doc/books.data:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+"  This book teaches you how to build and configure Debian 8.x server system\n"
+"  security hardening using Kali Linux and Debian simultaneously.\n"
+"  DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+"  From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+"  how to enhance Debian's security by applying the method of penetration\n"
+"  testing.\n"
+"  This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+"  MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+"  intrusion detection system."
+msgstr ""
+
 #: ../../english/releases/arches.data:36
 msgid "HTML"
 msgstr ""
diff --git a/esperanto/po/newsevents.eo.po b/esperanto/po/newsevents.eo.po
index dfce0e5aa49..ef8a44017af 100644
--- a/esperanto/po/newsevents.eo.po
+++ b/esperanto/po/newsevents.eo.po
@@ -9,68 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-#, fuzzy
-#| msgid "Latest News"
-msgid "Debian Latest News"
-msgstr "Lastaj Novaĵoj"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr ""
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr ""
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr ""
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr ""
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr ""
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr ""
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr ""
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr ""
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr ""
-
-#: ../../english/events/talks.defs:32
-msgid "PDF"
-msgstr ""
-
-#: ../../english/events/talks.defs:35
-msgid "HTML"
-msgstr ""
-
-#: ../../english/events/talks.defs:38
-msgid "MagicPoint"
-msgstr ""
-
-#: ../../english/events/talks.defs:41
-msgid "Abstract"
-msgstr ""
-
 #: ../../english/template/debian/events_common.wml:8
 msgid "Upcoming Attractions"
 msgstr "Venontaj Aferoj"
@@ -128,6 +66,141 @@ msgstr "Reen al la <a href=\"m4_HOME/\">Debiana Projekta hejmpaĝo</a>."
 msgid "<get-var url /> (dead link)"
 msgstr ""
 
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+msgid ""
+"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+" <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
+"<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
+"novaĵleteron ĉiusemajne en via poŝtkesto."
+
+#: ../../english/template/debian/projectnews/footer.wml:10
+#: ../../english/template/debian/weeklynews/footer.wml:10
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
+"haveblaj."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+#, fuzzy
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+#, fuzzy
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+#, fuzzy
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+#, fuzzy
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. One translator only
+#. One translator only
+#: ../../english/template/debian/projectnews/footer.wml:35
+#: ../../english/template/debian/weeklynews/footer.wml:35
+msgid "<void id=\"singular\" />It was translated by %s."
+msgstr ""
+
+#. Two ore more translators
+#. Two ore more translators
+#: ../../english/template/debian/projectnews/footer.wml:40
+#: ../../english/template/debian/weeklynews/footer.wml:40
+msgid "<void id=\"plural\" />It was translated by %s."
+msgstr ""
+
+#. One female translator only
+#. One female translator only
+#: ../../english/template/debian/projectnews/footer.wml:45
+#: ../../english/template/debian/weeklynews/footer.wml:45
+msgid "<void id=\"singularfemale\" />It was translated by %s."
+msgstr ""
+
+#. Two ore more female translators
+#. Two ore more female translators
+#: ../../english/template/debian/projectnews/footer.wml:50
+#: ../../english/template/debian/weeklynews/footer.wml:50
+msgid "<void id=\"pluralfemale\" />It was translated by %s."
+msgstr ""
+
+#: ../../english/template/debian/weeklynews/footer.wml:6
+#, fuzzy
+msgid ""
+"To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
+"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+" <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
+"<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
+"novaĵleteron ĉiusemajne en via poŝtkesto."
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:15
+#, fuzzy
+msgid ""
+"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:20
+#, fuzzy
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
+#, fuzzy
+msgid ""
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:30
+#, fuzzy
+msgid ""
+"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
 #: ../../english/template/debian/projectnews/boilerplates.wml:35
 msgid ""
 "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -309,140 +382,66 @@ msgid ""
 "the following topics:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/footer.wml:6
-#, fuzzy
-msgid ""
-"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
 msgstr ""
-" <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
-"<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
-"novaĵleteron ĉiusemajne en via poŝtkesto."
 
-#: ../../english/template/debian/projectnews/footer.wml:10
-#: ../../english/template/debian/weeklynews/footer.wml:10
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
 msgstr ""
-"<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
-"haveblaj."
 
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
 msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
 
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
 msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
 
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
 msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
 
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
 msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
 
-#. One translator only
-#. One translator only
-#: ../../english/template/debian/projectnews/footer.wml:35
-#: ../../english/template/debian/weeklynews/footer.wml:35
-msgid "<void id=\"singular\" />It was translated by %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
 msgstr ""
 
-#. Two ore more translators
-#. Two ore more translators
-#: ../../english/template/debian/projectnews/footer.wml:40
-#: ../../english/template/debian/weeklynews/footer.wml:40
-msgid "<void id=\"plural\" />It was translated by %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
 msgstr ""
 
-#. One female translator only
-#. One female translator only
-#: ../../english/template/debian/projectnews/footer.wml:45
-#: ../../english/template/debian/weeklynews/footer.wml:45
-msgid "<void id=\"singularfemale\" />It was translated by %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
 msgstr ""
 
-#. Two ore more female translators
-#. Two ore more female translators
-#: ../../english/template/debian/projectnews/footer.wml:50
-#: ../../english/template/debian/weeklynews/footer.wml:50
-msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
 msgstr ""
 
-#: ../../english/template/debian/weeklynews/footer.wml:6
-#, fuzzy
-msgid ""
-"To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
-"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
 msgstr ""
-" <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
-"<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
-"novaĵleteron ĉiusemajne en via poŝtkesto."
 
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:15
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
 msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
 
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:20
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
 msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
 
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:25
+#: ../../english/News/news.rdf.in:19
 #, fuzzy
-msgid ""
-"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
+msgid "Debian Latest News"
+msgstr "Lastaj Novaĵoj"
 
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:30
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
 msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
 
 #, fuzzy
 #~ msgid ""
diff --git a/esperanto/po/organization.eo.po b/esperanto/po/organization.eo.po
index 80b50a02123..6f92ae6cc9e 100644
--- a/esperanto/po/organization.eo.po
+++ b/esperanto/po/organization.eo.po
@@ -42,11 +42,11 @@ msgid "manager"
 msgstr ""
 
 #: ../../english/intro/organization.data:34
-msgid "SRM"
+msgid "Stable Release Manager"
 msgstr ""
 
 #: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
+msgid "SRM"
 msgstr ""
 
 #: ../../english/intro/organization.data:36
@@ -75,27 +75,27 @@ msgid "role"
 msgstr ""
 
 #: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
 msgid "Officers"
 msgstr ""
 
 #: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
 msgid "Distribution"
 msgstr ""
 
 #: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
 msgid "Publicity team"
 msgstr ""
 
@@ -109,136 +109,131 @@ msgstr ""
 msgid "Support and Infrastructure"
 msgstr ""
 
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
 msgid "Leader"
 msgstr ""
 
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
 msgid "Technical Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
 msgid "Secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
 msgid "Development Projects"
 msgstr ""
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
 msgid "FTP Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
 msgid "FTP Masters"
 msgstr ""
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
 msgid "FTP Assistants"
 msgstr ""
 
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
 msgid "Release Management"
 msgstr ""
 
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
 msgid "Installation System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
 msgid "Release Notes"
 msgstr ""
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
 msgid "CD Images"
 msgstr ""
 
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
 msgid "Production"
 msgstr ""
 
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
 msgid "Special Configurations"
 msgstr ""
 
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
 msgid "Laptops"
 msgstr ""
 
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
 msgid "Firewalls"
 msgstr ""
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
 msgid "Web Pages"
 msgstr ""
 
@@ -397,39 +392,11 @@ msgstr ""
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
 msgid "Salsa administrators"
 msgstr ""
-
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr ""
diff --git a/esperanto/po/others.eo.po b/esperanto/po/others.eo.po
index c5be2e8b66c..52e028ef32a 100644
--- a/esperanto/po/others.eo.po
+++ b/esperanto/po/others.eo.po
@@ -57,42 +57,6 @@ msgstr ""
 msgid "Unavailable"
 msgstr ""
 
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr ""
-
 #: ../../english/devel/website/tc.data:11
 msgid ""
 "See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -124,6 +88,34 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr ""
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr ""
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr ""
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr ""
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr ""
+
 #: ../../english/events/merchandise.def:10
 msgid "Products"
 msgstr ""
@@ -212,109 +204,117 @@ msgstr ""
 msgid "Money is used to organize local free software events"
 msgstr ""
 
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
 msgstr ""
 
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
 msgstr ""
 
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
 msgstr ""
 
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
 msgstr ""
 
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
 msgstr ""
 
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
 msgstr ""
 
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
 msgstr ""
 
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
 msgstr ""
 
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
 msgstr ""
 
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
 msgstr ""
 
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
 msgstr ""
 
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
 msgstr ""
 
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
 msgstr ""
 
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
 msgstr ""
 
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:18
-msgid "??"
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:30
-msgid "Status"
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:33
-msgid "Version"
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
 msgstr ""
diff --git a/esperanto/po/partners.eo.po b/esperanto/po/partners.eo.po
index db8c9e99938..644cd23a422 100644
--- a/esperanto/po/partners.eo.po
+++ b/esperanto/po/partners.eo.po
@@ -78,7 +78,7 @@ msgid ""
 "consulting and services company and since 1999 been offering comprehensive "
 "services and technical support for the implementation and operation of open "
 "source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
 msgstr ""
 
 #: ../../english/partners/partners.def:67
diff --git a/esperanto/po/ports.eo.po b/esperanto/po/ports.eo.po
index 991177aac13..1c99a8eb8ae 100644
--- a/esperanto/po/ports.eo.po
+++ b/esperanto/po/ports.eo.po
@@ -9,22 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr ""
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr ""
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr ""
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr ""
-
 #: ../../english/ports/menu.defs:11
 msgid "Contact"
 msgstr ""
@@ -89,6 +73,22 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr ""
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr ""
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr ""
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr ""
+
 #: ../../english/ports/netbsd/menu.inc:6
 msgid "Debian GNU/NetBSD for i386"
 msgstr ""
diff --git a/esperanto/po/security.eo.po b/esperanto/po/security.eo.po
index ccf6dcbc314..33ea557ab42 100644
--- a/esperanto/po/security.eo.po
+++ b/esperanto/po/security.eo.po
@@ -9,41 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Sekureco de Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Sekurecaj avertoj de Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr ""
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-#, fuzzy
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Koncernebla"
-
 #: ../../english/template/debian/security.wml:11
 msgid "Source:"
 msgstr ""
@@ -121,3 +86,38 @@ msgstr ""
 #: ../../english/template/debian/securityreferences.wml:88
 msgid "No other external database security references currently available."
 msgstr ""
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Sekureco de Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Sekurecaj avertoj de Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+#, fuzzy
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Koncernebla"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/esperanto/po/stats.eo.po b/esperanto/po/stats.eo.po
index 0a311fe1955..0bc4754b652 100644
--- a/esperanto/po/stats.eo.po
+++ b/esperanto/po/stats.eo.po
@@ -12,22 +12,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr ""
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr ""
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr ""
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr ""
-
 #: ../../stattrans.pl:278 ../../stattrans.pl:494
 msgid "Wrong translation version"
 msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
 msgstr ""
 
 #: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
 msgstr ""
 
 #: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
 msgstr ""
 
 #: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
 msgid "Translation summary for"
 msgstr ""
 
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
 #: ../../stattrans.pl:607
 msgid "Translated"
 msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
 msgid "Up to date"
 msgstr ""
 
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
 #: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
 #: ../../stattrans.pl:611
 msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
 #: ../../stattrans.pl:790
 msgid "Translation Statistics by Page Size"
 msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr ""
diff --git a/esperanto/po/templates.eo.po b/esperanto/po/templates.eo.po
index 1bb9f7e0318..75f42ba83c5 100644
--- a/esperanto/po/templates.eo.po
+++ b/esperanto/po/templates.eo.po
@@ -9,20 +9,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Project"
-msgid "Debian website"
-msgstr "Projekto Debiano"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
 #: ../../english/template/debian/basic.wml:19
 #: ../../english/template/debian/navbar.wml:11
 #, fuzzy
-#| msgid "Help Debian"
 msgid "Debian"
 msgstr "Helpu Debianon"
 
@@ -44,10 +33,6 @@ msgstr "Projekto Debiano"
 
 #: ../../english/template/debian/common_translation.wml:13
 #, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
 msgid ""
 "Debian is an operating system and a distribution of Free Software. It is "
 "maintained and updated through the work of many users who volunteer their "
@@ -88,7 +73,6 @@ msgstr "Kontaktu Nin"
 
 #: ../../english/template/debian/common_translation.wml:37
 #, fuzzy
-#| msgid "Release Info"
 msgid "Legal Info"
 msgstr "Informo pri livero"
 
@@ -164,13 +148,11 @@ msgstr "Akiri Debian"
 
 #: ../../english/template/debian/common_translation.wml:91
 #, fuzzy
-#| msgid "Debian Books"
 msgid "The Debian Blog"
 msgstr "Libroj pri Debian"
 
 #: ../../english/template/debian/common_translation.wml:94
 #, fuzzy
-#| msgid "Last Modified"
 msgid "Last Updated"
 msgstr "Laste modifita"
 
@@ -221,11 +203,6 @@ msgstr "en livero 2.2"
 #. your language.
 #: ../../english/template/debian/footer.wml:106
 #, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>.  For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
 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."
@@ -277,6 +254,14 @@ msgstr "Tiu ĉi paĝo estas havebla ankaŭ en la jenaj lingvoj"
 msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
 msgstr "Kiel elekti <a href=m4_HOME/intro/cn>la ĉefan dokumentan lingvon</a>"
 
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
 #: ../../english/template/debian/links.tags.wml:4
 msgid "Debian International"
 msgstr "Internacia Debian"
@@ -323,7 +308,6 @@ msgstr "Libroj pri Debian"
 
 #: ../../english/template/debian/links.tags.wml:37
 #, fuzzy
-#| msgid "Help Debian"
 msgid "Debian Wiki"
 msgstr "Helpu Debianon"
 
@@ -357,7 +341,6 @@ msgstr "Datumbazo de disvolvantoj"
 
 #: ../../english/template/debian/links.tags.wml:64
 #, fuzzy
-#| msgid "Help Debian"
 msgid "Debian FAQ"
 msgstr "Helpu Debianon"
 
@@ -435,7 +418,6 @@ msgstr "Vendistoj de KD"
 
 #: ../../english/template/debian/links.tags.wml:125
 #, fuzzy
-#| msgid "CD ISO images"
 msgid "CD/USB ISO images"
 msgstr "KD kun bildoj ISO"
 
@@ -559,6 +541,15 @@ msgstr ""
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Reen al la <a href=\"./\">paĝo pri Kiu uzas Debian</a>."
 
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "Projekto Debiano"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
 #~ msgid "Visit the site sponsor"
 #~ msgstr "Viziti aŭspicianton"
 
diff --git a/esperanto/po/vote.eo.po b/esperanto/po/vote.eo.po
index 7407e59ce9c..93cad631190 100644
--- a/esperanto/po/vote.eo.po
+++ b/esperanto/po/vote.eo.po
@@ -68,202 +68,228 @@ msgid "Proposal F Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:55
-msgid "Seconds"
+msgid "Proposal G Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:58
-msgid "Proposal A Seconds"
+msgid "Proposal H Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:61
-msgid "Proposal B Seconds"
+msgid "Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:64
-msgid "Proposal C Seconds"
+msgid "Proposal A Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:67
-msgid "Proposal D Seconds"
+msgid "Proposal B Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:70
-msgid "Proposal E Seconds"
+msgid "Proposal C Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:73
-msgid "Proposal F Seconds"
+msgid "Proposal D Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:76
-msgid "Opposition"
+msgid "Proposal E Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:79
-msgid "Text"
+msgid "Proposal F Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:82
-msgid "Proposal A"
+msgid "Proposal G Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:85
-msgid "Proposal B"
+msgid "Proposal H Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:88
-msgid "Proposal C"
+msgid "Opposition"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:91
-msgid "Proposal D"
+msgid "Text"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:94
-msgid "Proposal E"
+msgid "Proposal A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:97
-msgid "Proposal F"
+msgid "Proposal B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:100
-msgid "Choices"
+msgid "Proposal C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Proposer"
+msgid "Proposal D"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Seconds"
+msgid "Proposal E"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Text"
+msgid "Proposal F"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "proponita"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "proponita"
+
+#: ../../english/template/debian/votebar.wml:118
+msgid "Choices"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:121
+msgid "Amendment Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:124
+msgid "Amendment Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:127
+msgid "Amendment Text"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:130
 msgid "Amendment Proposer A"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
 msgid "Amendment Seconds A"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
 msgid "Amendment Text A"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
 msgid "Amendment Proposer B"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
 msgid "Amendment Seconds B"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
 msgid "Amendment Text B"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
 msgid "Amendment Proposer C"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
 msgid "Amendment Seconds C"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
 msgid "Amendment Text C"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
 msgid "Amendments"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
 msgid "Proceedings"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
 msgid "Majority Requirement"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
 msgid "Data and Statistics"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
 msgid "Quorum"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
 #, fuzzy
 msgid "Minimum Discussion"
 msgstr "Diskutata"
 
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
 msgid "Ballot"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
 msgid "Forum"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
 msgid "Outcome"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
 msgid "Waiting&nbsp;for&nbsp;Sponsors"
 msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
 
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
 msgid "In&nbsp;Discussion"
 msgstr "Diskutata"
 
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
 msgid "Voting&nbsp;Open"
 msgstr "Voĉdono&nbsp;Malfermita"
 
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
 msgid "Decided"
 msgstr "Decidita"
 
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
 msgid "Withdrawn"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
 msgid "Other"
 msgstr "Alia"
 
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
 msgid "Home&nbsp;Vote&nbsp;Page"
 msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
 
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
 msgid "How&nbsp;To"
 msgstr "Kiel&nbsp;Fari"
 
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr "Sendi&nbsp;Proponon"
 
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr "Modifi&nbsp;Proponon"
 
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr "Sekvi&nbsp;Proponon"
 
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr "Legi&nbsp;Rezulton"
 
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
 msgid "Vote"
 msgstr "Voĉdono"