[Albanian] Update language templates

7 files changed, 365 insertions, 306 deletions

diff --git a/albanian/po/doc.sq.po b/albanian/po/doc.sq.po
index 891541d02a7..8a55e8765fc 100644
--- a/albanian/po/doc.sq.po
+++ b/albanian/po/doc.sq.po
@@ -3,10 +3,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.data:32
 msgid ""
 "\n"
-"  Debian 8 is the must-have handbook for learning Linux. Start on the\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"
@@ -20,8 +20,8 @@ msgid ""
 "  Project."
 msgstr ""
 
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../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"
@@ -36,7 +36,7 @@ msgid ""
 "  virtualization with Xen, KVM or LXC."
 msgstr ""
 
-#: ../../english/doc/books.data:80
+#: ../../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"
@@ -45,7 +45,7 @@ msgid ""
 "  in the home, office, club, or school)."
 msgstr ""
 
-#: ../../english/doc/books.data:101
+#: ../../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"
@@ -57,7 +57,7 @@ msgid ""
 "  administrator who wants to build a reliable network with Debian."
 msgstr ""
 
-#: ../../english/doc/books.data:120
+#: ../../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 "
@@ -69,7 +69,7 @@ msgid ""
 "  PDF, ePub, Mobi), printed book planned.\n"
 msgstr ""
 
-#: ../../english/doc/books.data:140
+#: ../../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 "
@@ -77,7 +77,7 @@ msgid ""
 "for all users who want to learn more about Debian and its range of services."
 msgstr ""
 
-#: ../../english/doc/books.data:191
+#: ../../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"
@@ -98,18 +98,22 @@ msgid "Author:"
 msgstr ""
 
 #: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr ""
+
+#: ../../english/doc/books.def:44
 msgid "email:"
 msgstr ""
 
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
 msgid "Available at:"
 msgstr ""
 
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
 msgid "CD Included:"
 msgstr ""
 
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
 msgid "Publisher:"
 msgstr ""
 
@@ -133,62 +137,65 @@ msgstr ""
 msgid "Availability:"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
 msgid "Latest version:"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
 msgid "(version <get-var version />)"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
 msgid "plain text"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/git\">Git</a> repository."
 msgstr ""
 
-#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
 msgid "Web interface: "
 msgstr ""
 
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
 msgid "VCS interface: "
 msgstr ""
 
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/cvs\">Cvs</a> repository."
 msgstr ""
 
-#: ../../english/doc/manuals.defs:170
+#: ../../english/doc/manuals.defs:185
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/subversion\">Subversion</a> repository."
 msgstr ""
 
-#: ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:203
 msgid ""
 "CVS sources working copy: set <code>CVSROOT</code>\n"
 "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
 "  and check out the <kbd>boot-floppies/documentation</kbd> module."
 msgstr ""
 
-#: ../../english/doc/manuals.defs:193
+#: ../../english/doc/manuals.defs:208
 msgid "CVS via web"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
 msgid "Debian package"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
 msgid "Debian package (archived)"
 msgstr ""
 
diff --git a/albanian/po/newsevents.sq.po b/albanian/po/newsevents.sq.po
index 6c909cd2915..c8932425456 100644
--- a/albanian/po/newsevents.sq.po
+++ b/albanian/po/newsevents.sq.po
@@ -19,30 +19,6 @@ msgstr ""
 msgid "The newsletter for the Debian community"
 msgstr ""
 
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr ""
-
 #: ../../english/events/talks.defs:9
 msgid "Title:"
 msgstr ""
@@ -391,14 +367,6 @@ msgstr ""
 msgid "<void id=\"pluralfemale\" />It was translated by %s."
 msgstr ""
 
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr ""
-
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr ""
-
 #: ../../english/template/debian/weeklynews/footer.wml:6
 msgid ""
 "To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
diff --git a/albanian/po/organization.sq.po b/albanian/po/organization.sq.po
index 684ebcd2c7d..d5e29a42b88 100644
--- a/albanian/po/organization.sq.po
+++ b/albanian/po/organization.sq.po
@@ -47,329 +47,383 @@ msgstr ""
 msgid "wizard"
 msgstr ""
 
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
 msgid "chair"
 msgstr ""
 
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
 msgid "assistant"
 msgstr ""
 
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
 msgid "secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:77
 msgid "Officers"
 msgstr ""
 
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:101
 msgid "Distribution"
 msgstr ""
 
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:237
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:240
 msgid "Data Protection team"
 msgstr ""
 
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:244
 msgid "Publicity team"
 msgstr ""
 
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
 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:62
+#: ../../english/intro/organization.data:73
 msgid "Debian Pure Blends"
 msgstr ""
 
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:80
 msgid "Leader"
 msgstr ""
 
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:82
 msgid "Technical Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:96
 msgid "Secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:104
 msgid "Development Projects"
 msgstr ""
 
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:105
 msgid "FTP Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:107
 msgid "FTP Masters"
 msgstr ""
 
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:113
 msgid "FTP Assistants"
 msgstr ""
 
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:118
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:122
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:124
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr ""
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:128
 msgid "Release Management"
 msgstr ""
 
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:130
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:143
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:144
 msgid "Installation System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:145
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:146
 msgid "Release Notes"
 msgstr ""
 
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:148
 msgid "CD Images"
 msgstr ""
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:150
 msgid "Production"
 msgstr ""
 
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:158
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:160
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:164
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:166
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:173
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:191
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:196
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:198
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:228
 msgid "Special Configurations"
 msgstr ""
 
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:230
 msgid "Laptops"
 msgstr ""
 
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:231
 msgid "Firewalls"
 msgstr ""
 
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:247
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
 msgid "Anti-harassment"
 msgstr ""
 
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+"      for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+"      Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
 msgid "User support"
 msgstr ""
 
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
 msgid "Consultants Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
 msgid "CD Vendors Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
 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."
 msgstr ""
 
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
 "contain per-machine administrator information."
 msgstr ""
 
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:487
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:490
 msgid "Salsa administrators"
 msgstr ""
 
-#: ../../english/intro/organization.data:467
+#: ../../english/intro/organization.data:501
 msgid "Debian for children from 1 to 99"
 msgstr ""
 
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:504
 msgid "Debian for medical practice and research"
 msgstr ""
 
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:507
 msgid "Debian for education"
 msgstr ""
 
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:512
 msgid "Debian in legal offices"
 msgstr ""
 
-#: ../../english/intro/organization.data:482
+#: ../../english/intro/organization.data:516
 msgid "Debian for people with disabilities"
 msgstr ""
 
-#: ../../english/intro/organization.data:486
+#: ../../english/intro/organization.data:520
 msgid "Debian for science and related research"
 msgstr ""
 
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:523
 msgid "Debian for astronomy"
 msgstr ""
diff --git a/albanian/po/others.sq.po b/albanian/po/others.sq.po
index f486f9cfeb4..4cf5d1d4c14 100644
--- a/albanian/po/others.sq.po
+++ b/albanian/po/others.sq.po
@@ -118,126 +118,126 @@ 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/mirror/submit.inc:7
-msgid "same as the above"
-msgstr ""
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
 msgid "Products"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
 msgid "T-shirts"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
 msgid "hats"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
 msgid "stickers"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
 msgid "mugs"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
 msgid "other clothing"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
 msgid "polo shirts"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
 msgid "frisbees"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
 msgid "mouse pads"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
 msgid "badges"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
 msgid "basketball goals"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
 msgid "earrings"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
 msgid "suitcases"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
 msgid "umbrellas"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
 msgid "pillowcases"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
 msgid "keychains"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
 msgid "Swiss army knives"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
 msgid "USB-Sticks"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
 msgid "lanyards"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
 msgid "others"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
 msgid "Donates money to Debian"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
 msgid "Money is used to organize local free software events"
 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/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
 #: ../../english/women/profiles/profiles.def:24
 msgid "How long have you been using Debian?"
 msgstr ""
diff --git a/albanian/po/partners.sq.po b/albanian/po/partners.sq.po
index 021ae624d61..db8c9e99938 100644
--- a/albanian/po/partners.sq.po
+++ b/albanian/po/partners.sq.po
@@ -162,20 +162,33 @@ msgstr ""
 
 #: ../../english/partners/partners.def:113
 msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
 "<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
 "(HPE)</a> provides hardware for port development, Debian mirrors, and other "
 "Debian services (current HPE hardware donations are listed in the <a href="
 "\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
 msgid ""
 "HPE is one of the largest computer companies in the world, providing a wide "
 "range of products and services, such as servers, storage, networking, "
 "consulting and support, software, and financial services."
 msgstr ""
 
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
 msgid ""
 "<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
 "partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
 "50%, enough to accommodate anticipated growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
 msgid ""
 "LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
 "customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
 "\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
 msgid ""
 "<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
 "lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
 "Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
 msgid ""
 "Loongson processors are a series of MIPS-compatible processors. They have "
 "been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
 "<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
 msgid ""
 "<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
 "provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
 "network for experimental and debconf.org machines."
 msgstr ""
 
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
 msgid ""
 "man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
 "region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
 "both universities."
 msgstr ""
 
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
 msgid ""
 "<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
 "a> provides hosting and administration services to the Debian project."
 msgstr ""
 
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
 msgid ""
 "The Open Source Lab is a focal point for open source development at Oregon "
 "State University and beyond. The OSL provides development, hosting and "
 "assorted other services to the Open Source community."
 msgstr ""
 
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
 msgid ""
 "nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
 "\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
 "disperse locations and support DNSSEC."
 msgstr ""
 
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
 msgid ""
 "ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
 "been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
 "department and has been successfully in use for the .at zone."
 msgstr ""
 
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
 msgid ""
 "<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
 "both the creation and testing of the new debian-installer and the "
 "localization of Debian."
 msgstr ""
 
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
 msgid ""
 "Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
 "universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
 msgid ""
 "<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
 "utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
 "\">Planet Debian</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
 msgid ""
 "StackPath is a platform of secure edge services that enables developers to "
 "protect, accelerate, and innovate cloud properties ranging from websites to "
 "media delivery and IoT services."
 msgstr ""
 
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
 msgid ""
 "<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
 "supporting the Debian community by donating hardware, rackspace and "
 "bandwidth for the Debian server hosting alioth, arch and svn."
 msgstr ""
 
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
 msgid ""
 "Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
 "Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
 "are highly motivated Debian users and some of them also Debian maintainers."
 msgstr ""
 
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
 msgid ""
 "Telegraaf Media Group runs some of the most popular Dutch websites (http://"
 "www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
 "the two biggest newspapers in The Netherlands."
 msgstr ""
 
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
 "high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
 "thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
 "online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
 "course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
 msgid ""
 "<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
 "to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
 "for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
 msgid ""
 "trustsec offers customer support, consulting and training for Debian on the "
 "Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
 "\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
 msgid ""
 "The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
 "provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
 "increasing the amount of snapshot storage provided."
 msgstr ""
 
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
 msgid ""
 "The Wellcome Sanger Institute is one of the world's leading genome centres. "
 "Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
 "treatments for human disease."
 msgstr ""
 
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
 msgid ""
 "<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
 "Novare) provides several machines to Debian, as well as hosting and server "
 "administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
 msgid ""
 "Brainfood is a technology solutions company whose goal is to work to produce "
 "an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
 "\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
 msgid ""
 "<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
 "port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
 "com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
 msgid ""
 "Hewlett-Packard is one of the largest computer companies in the world, "
 "providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
 "solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
 msgid ""
 "<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
 "Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
 "current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
 msgid ""
 "Linux Central sells all the latest releases of Linux products such as "
 "commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
 "contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
 msgid ""
 "<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
 "Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
 "are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
 msgid ""
 "San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
 "a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
 "copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
 msgid ""
 "<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
 "Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
 "donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
 msgid ""
 "Open Source Press specialises on books around Linux and Open Source "
 "Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
 "Source Press publications are renowned for their quality and depth."
 msgstr ""
 
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
 msgid ""
 "<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
 "Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
 "virtual servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
 msgid ""
 "It hosts a Debian development machine, <a href=\"https://db.debian.org/"
 "machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
 msgid ""
 "<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
 "machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
 "ARM port."
 msgstr ""
 
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
 msgid ""
 "Simtec is a leading provider of ARM based computing products. We have a "
 "range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/albanian/po/templates.sq.po b/albanian/po/templates.sq.po
index d8db47dc936..34c72b82e0a 100644
--- a/albanian/po/templates.sq.po
+++ b/albanian/po/templates.sq.po
@@ -146,6 +146,10 @@ msgstr ""
 msgid "The Debian Blog"
 msgstr ""
 
+#: ../../english/template/debian/common_translation.wml:94
+msgid "Last Updated"
+msgstr ""
+
 #: ../../english/template/debian/ddp.wml:6
 msgid ""
 "Please send all comments, criticisms and suggestions about these web pages "
@@ -189,7 +193,7 @@ msgstr ""
 #. 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:107
+#: ../../english/template/debian/footer.wml:106
 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."
@@ -198,27 +202,27 @@ msgid ""
 "\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
 msgid "Last Modified"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
 msgid "Copyright"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:125
+#: ../../english/template/debian/footer.wml:124
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -461,6 +465,15 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
 #. given a manual name and an architecture, join them
 #. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
 #: ../../english/template/debian/release.wml:7
@@ -492,6 +505,6 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr ""
diff --git a/albanian/po/vote.sq.po b/albanian/po/vote.sq.po
index 57703ac0a36..3da99f4cdb7 100644
--- a/albanian/po/vote.sq.po
+++ b/albanian/po/vote.sq.po
@@ -20,237 +20,241 @@ msgid "Nominations"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:25
-msgid "Debate"
+msgid "Withdrawals"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:28
-msgid "Platforms"
+msgid "Debate"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:31
-msgid "Proposer"
+msgid "Platforms"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:34
-msgid "Proposal A Proposer"
+msgid "Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:37
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:40
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:43
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:46
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:49
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:52
-msgid "Seconds"
+msgid "Proposal F Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:55
-msgid "Proposal A Seconds"
+msgid "Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:58
-msgid "Proposal B Seconds"
+msgid "Proposal A Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:61
-msgid "Proposal C Seconds"
+msgid "Proposal B Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:64
-msgid "Proposal D Seconds"
+msgid "Proposal C Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:67
-msgid "Proposal E Seconds"
+msgid "Proposal D Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:70
-msgid "Proposal F Seconds"
+msgid "Proposal E Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:73
-msgid "Opposition"
+msgid "Proposal F Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:76
-msgid "Text"
+msgid "Opposition"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:79
-msgid "Proposal A"
+msgid "Text"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:82
-msgid "Proposal B"
+msgid "Proposal A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:85
-msgid "Proposal C"
+msgid "Proposal B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:88
-msgid "Proposal D"
+msgid "Proposal C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:91
-msgid "Proposal E"
+msgid "Proposal D"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:94
-msgid "Proposal F"
+msgid "Proposal E"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:97
-msgid "Choices"
+msgid "Proposal F"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Proposer"
+msgid "Choices"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Seconds"
+msgid "Amendment Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Text"
+msgid "Amendment Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Proposer A"
+msgid "Amendment Text"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Seconds A"
+msgid "Amendment Proposer A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Text A"
+msgid "Amendment Seconds A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Proposer B"
+msgid "Amendment Text A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Text B"
+msgid "Amendment Seconds B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Proposer C"
+msgid "Amendment Text B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Seconds C"
+msgid "Amendment Proposer C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Text C"
+msgid "Amendment Seconds C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:136
-msgid "Amendments"
+msgid "Amendment Text C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:139
-msgid "Proceedings"
+msgid "Amendments"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:142
-msgid "Majority Requirement"
+msgid "Proceedings"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:145
-msgid "Data and Statistics"
+msgid "Majority Requirement"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:148
-msgid "Quorum"
+msgid "Data and Statistics"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:151
-msgid "Minimum Discussion"
+msgid "Quorum"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:154
-msgid "Ballot"
+msgid "Minimum Discussion"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:157
-msgid "Forum"
+msgid "Ballot"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:160
+msgid "Forum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:163
 msgid "Outcome"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:167
 msgid "Waiting&nbsp;for&nbsp;Sponsors"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:170
 msgid "In&nbsp;Discussion"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:173
 msgid "Voting&nbsp;Open"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:176
 msgid "Decided"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:179
 msgid "Withdrawn"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:182
 msgid "Other"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:186
 msgid "Home&nbsp;Vote&nbsp;Page"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:189
 msgid "How&nbsp;To"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:192
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:195
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:198
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:201
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:204
 msgid "Vote"
 msgstr ""