Merge branch 'master' into new-homepage

author: Thomas Lange <lange@debian.org> 2020-09-30 03:48:04 +0200
committer: Thomas Lange <lange@debian.org> 2020-09-30 03:48:04 +0200
commit: c5fc5fae523cf7600d4a8b42a3a8269368f11d79 (patch)
tree: bc3a49dad5ef9dd4a8deb02ea51406a871d1fc15 /armenian
parent: 5b29d71933f373090b3da6f5a3e604078387638f (diff)
parent: c767030cd30f4611e2572d0ffd84944639c65552 (diff)
15 files changed, 556 insertions, 719 deletions
diff --git a/armenian/po/blends.hy.po b/armenian/po/blends.hy.po
index b00934651af..8d7b64b49a7 100644
--- a/armenian/po/blends.hy.po
+++ b/armenian/po/blends.hy.po
@@ -73,6 +73,15 @@ msgid ""
 "Debian to researchers and scientists."
 msgstr ""
 
+#: ../../english/blends/released.data:89
+msgid ""
+"The goal of FreedomBox is to develop, design and promote personal servers "
+"running free software for private, personal communications. Applications "
+"include blogs, wikis, websites, social networks, email, web proxy and a Tor "
+"relay on a device that can replace a wireless router so that data stays with "
+"the users."
+msgstr ""
+
 #: ../../english/blends/unreleased.data:15
 msgid ""
 "The goal of Debian Accessibility is to develop Debian into an operating "
@@ -97,20 +106,11 @@ msgstr ""
 
 #: ../../english/blends/unreleased.data:38
 msgid ""
-"The goal of FreedomBox is to develop, design and promote personal servers "
-"running free software for private, personal communications. Applications "
-"include blogs, wikis, websites, social networks, email, web proxy and a Tor "
-"relay on a device that can replace a wireless router so that data stays with "
-"the users."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:46
-msgid ""
 "The goal of Debian Hamradio is to support the needs of radio amateurs in "
 "Debian by providing logging, data mode and packet mode applications and more."
 msgstr ""
 
-#: ../../english/blends/unreleased.data:55
+#: ../../english/blends/unreleased.data:47
 msgid ""
 "The goal of DebianParl is to provide applications to support the needs of "
 "parliamentarians, politicians and their staffers all around the world."
diff --git a/armenian/po/countries.hy.po b/armenian/po/countries.hy.po
index 07c79ff1dd9..c798984a429 100644
--- a/armenian/po/countries.hy.po
+++ b/armenian/po/countries.hy.po
@@ -221,217 +221,220 @@ msgid "Kenya"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Պակիստան"
+
+#: ../../english/template/debian/countries.wml:270
 msgid "Korea"
 msgstr "Կորեա"
 
-#: ../../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
 #, fuzzy
 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 "Մադագասկար"
 
-#: ../../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
 #, fuzzy
 msgid "Malta"
 msgstr "Մալազիա"
 
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
 msgid "Mexico"
 msgstr "Մեքսիկա"
 
-#: ../../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 ""
 
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
 msgid "Norway"
 msgstr "Նորվեգիա"
 
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
 msgid "New Zealand"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
 msgid "Panama"
 msgstr "Պանամա"
 
-#: ../../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 ""
 
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
 msgid "Portugal"
 msgstr "Պորտուգալիա"
 
-#: ../../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 "Ռուսաստան"
 
-#: ../../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 "Շվեդիա"
 
-#: ../../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
 #, fuzzy
-#| msgid "Pakistan"
 msgid "Tajikistan"
 msgstr "Պակիստան"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 #, fuzzy
 msgid "Tunisia"
 msgstr "Ռուսաստան"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Turkey"
 msgstr "Թուրքիա"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Taiwan"
 msgstr "Տաիվան"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 msgid "Ukraine"
 msgstr "Ուկրաինիա"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "United States"
 msgstr "Միացիալ Նահանգներ"
 
-#: ../../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
 #, fuzzy
-#| msgid "Pakistan"
 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 "Հարավային Աֆրիկա"
 
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
 msgid "Zimbabwe"
 msgstr "Զիմբաբվե"
 
diff --git a/armenian/po/debian-cdd.hy.po b/armenian/po/debian-cdd.hy.po
deleted file mode 100644
index f7f10a07243..00000000000
--- a/armenian/po/debian-cdd.hy.po
+++ /dev/null
@@ -1,113 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2006-08-12 17:27+0200\n"
-"Last-Translator: unknown\n"
-"Language-Team: unknown\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../english/template/debian/debian-cdd.wml:28
-#: ../../english/template/debian/debian-cdd.wml:68
-msgid "Debian-Med"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:31
-#: ../../english/template/debian/debian-cdd.wml:72
-msgid "Debian-Jr"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:34
-#: ../../english/template/debian/debian-cdd.wml:76
-msgid "Debian-Lex"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:36
-msgid ""
-"The list below includes various software projects which are of some interest "
-"to the <get-var cdd-name /> Project. Currently, only a few of them are "
-"available as Debian packages. It is our goal, however, to include all "
-"software in <get-var cdd-name /> which can sensibly add to a high quality "
-"Custom Debian Distribution."
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:41
-msgid ""
-"For a better overview of the project's availability as a Debian package, "
-"each head row has a color code according to this scheme:"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:47
-msgid ""
-"Green: The project is <a href=\"<get-var url />\">available as an official "
-"Debian package</a>"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:54
-msgid ""
-"Yellow: The project is <a href=\"<get-var url />\">available as an "
-"unofficial Debian package</a>"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:61
-msgid ""
-"Red: The project is <a href=\"<get-var url />\">not (yet) available as a "
-"Debian package</a>"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:79
-msgid ""
-"If you discover a project which looks like a good candidate for <get-var cdd-"
-"name /> to you, or if you have prepared an unofficial Debian package, please "
-"do not hesitate to send a description of that project to the <a href=\"<get-"
-"var cdd-list-url />\"><get-var cdd-name /> mailing list</a>."
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:84
-msgid "Official Debian packages"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:88
-msgid "Unofficial Debian packages"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:92
-msgid "Debian packages not available"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:96
-msgid "There are no projects which fall into this category."
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:100
-msgid "No homepage known"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:104
-msgid "License:"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:108
-msgid "Free"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:112
-msgid "Non-Free"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:116
-msgid "Unknown"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:120
-msgid "Official Debian package"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:124
-msgid "Unofficial Debian package"
-msgstr ""
-
-#: ../../english/template/debian/debian-cdd.wml:128
-msgid "Debian package not available"
-msgstr ""
diff --git a/armenian/po/doc.hy.po b/armenian/po/doc.hy.po
index 21d1edafb53..91c260a0311 100644
--- a/armenian/po/doc.hy.po
+++ b/armenian/po/doc.hy.po
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/doc/books.data:32
+#: ../../english/doc/books.data:35
 msgid ""
 "\n"
 "  Debian 9 is the must-have handbook for learning Linux. Start on the\n"
@@ -26,8 +26,8 @@ msgid ""
 "  Project."
 msgstr ""
 
-#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
+#: ../../english/doc/books.data:64 ../../english/doc/books.data:174
+#: ../../english/doc/books.data:229
 msgid ""
 "Written by two Debian developers, this free book\n"
 "  started as a translation of their French best-seller known as Cahier de\n"
@@ -42,7 +42,7 @@ msgid ""
 "  virtualization with Xen, KVM or LXC."
 msgstr ""
 
-#: ../../english/doc/books.data:83
+#: ../../english/doc/books.data:86
 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"
@@ -51,7 +51,7 @@ msgid ""
 "  in the home, office, club, or school)."
 msgstr ""
 
-#: ../../english/doc/books.data:105
+#: ../../english/doc/books.data:108
 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"
@@ -63,7 +63,7 @@ msgid ""
 "  administrator who wants to build a reliable network with Debian."
 msgstr ""
 
-#: ../../english/doc/books.data:125
+#: ../../english/doc/books.data:128
 msgid ""
 "The book covers topics ranging from concepts of package\n"
 "  management over the available tools and how they're used to concrete "
@@ -75,7 +75,7 @@ msgid ""
 "  PDF, ePub, Mobi), printed book planned.\n"
 msgstr ""
 
-#: ../../english/doc/books.data:146
+#: ../../english/doc/books.data:149
 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 "
@@ -83,7 +83,7 @@ msgid ""
 "for all users who want to learn more about Debian and its range of services."
 msgstr ""
 
-#: ../../english/doc/books.data:200
+#: ../../english/doc/books.data:203
 msgid ""
 "Written by two penetration researcher - Annihilator, Firstblood.\n"
 "  This book teaches you how to build and configure Debian 8.x server system\n"
@@ -143,65 +143,40 @@ msgstr ""
 msgid "Availability:"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:97
+#: ../../english/doc/manuals.defs:85
 msgid "Latest version:"
 msgstr "Վերջին տարբերակը՝"
 
-#: ../../english/doc/manuals.defs:113
+#: ../../english/doc/manuals.defs:101
 msgid "(version <get-var version />)"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:131 ../../english/releases/arches.data:38
 msgid "plain text"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
+#: ../../english/doc/manuals.defs:147 ../../english/doc/manuals.defs:157
+#: ../../english/doc/manuals.defs:165
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
 "\"https://packages.debian.org/git\">Git</a> repository."
 msgstr ""
 
-#: ../../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
+#: ../../english/doc/manuals.defs:149 ../../english/doc/manuals.defs:159
+#: ../../english/doc/manuals.defs:167
 msgid "Web interface: "
 msgstr ""
 
-#: ../../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
+#: ../../english/doc/manuals.defs:150 ../../english/doc/manuals.defs:160
+#: ../../english/doc/manuals.defs:168
 msgid "VCS interface: "
 msgstr ""
 
-#: ../../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: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: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:208
-msgid "CVS via web"
-msgstr ""
-
-#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+#: ../../english/doc/manuals.defs:175 ../../english/doc/manuals.defs:179
 msgid "Debian package"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+#: ../../english/doc/manuals.defs:184 ../../english/doc/manuals.defs:188
 msgid "Debian package (archived)"
 msgstr ""
 
diff --git a/armenian/po/l10n.hy.po b/armenian/po/l10n.hy.po
index 4773afce626..c86fe9dba46 100644
--- a/armenian/po/l10n.hy.po
+++ b/armenian/po/l10n.hy.po
@@ -11,84 +11,84 @@ msgstr ""
 
 #: ../../english/international/l10n/dtc.def:10
 msgid "File"
-msgstr ""
+msgstr "Նիշք"
 
 #: ../../english/international/l10n/dtc.def:14
 msgid "Package"
-msgstr ""
+msgstr "Փաթեթ"
 
 #: ../../english/international/l10n/dtc.def:18
 msgid "Score"
-msgstr ""
+msgstr "Միավոր"
 
 #: ../../english/international/l10n/dtc.def:22
 msgid "Translator"
-msgstr ""
+msgstr "Թարգմանիչ"
 
 #: ../../english/international/l10n/dtc.def:26
 msgid "Team"
-msgstr ""
+msgstr "Թիմ"
 
 #: ../../english/international/l10n/dtc.def:30
 msgid "Date"
-msgstr ""
+msgstr "Ամսաթիվ"
 
 #: ../../english/international/l10n/dtc.def:34
 msgid "Status"
-msgstr ""
+msgstr "Կարգավիճակ"
 
 #: ../../english/international/l10n/dtc.def:38
 msgid "Strings"
-msgstr ""
+msgstr "Տող"
 
 #: ../../english/international/l10n/dtc.def:42
 msgid "Bug"
-msgstr ""
+msgstr "Վրիպակ"
 
 #: ../../english/international/l10n/dtc.def:49
 msgid "<get-var lang />, as spoken in <get-var country />"
-msgstr ""
+msgstr "get-var lang />, as spoken in <get-var country />"
 
 #: ../../english/international/l10n/dtc.def:54
 msgid "Unknown language"
-msgstr ""
+msgstr "Անհայտ լեզու"
 
 #: ../../english/international/l10n/dtc.def:64
 msgid "This page was generated with data collected on: <get-var date />."
-msgstr ""
+msgstr "Այս էջը գեներացվել է հետևյալ ամսաթվով՝ <get-var date />."
 
 #: ../../english/international/l10n/dtc.def:69
 msgid "Before working on these files, make sure they are up to date!"
-msgstr ""
+msgstr "Մինչ նշված նիշքերի հետ աշխատելը համոզվեք որ դրանք թարմացված են:"
 
 #: ../../english/international/l10n/dtc.def:79
 msgid "Section: <get-var name />"
-msgstr ""
+msgstr "Section: <get-var name />"
 
 #: ../../english/international/l10n/menu.def:10
 msgid "L10n"
-msgstr ""
+msgstr "L10n"
 
 #: ../../english/international/l10n/menu.def:14
 msgid "Language list"
-msgstr ""
+msgstr "Լեզուների ցանկ"
 
 #: ../../english/international/l10n/menu.def:18
 msgid "Ranking"
-msgstr ""
+msgstr "Աստիճան"
 
 #: ../../english/international/l10n/menu.def:22
 msgid "Hints"
-msgstr ""
+msgstr "Ակնարկներ"
 
 #: ../../english/international/l10n/menu.def:26
 msgid "Errors"
-msgstr ""
+msgstr "Սխալներ"
 
 #: ../../english/international/l10n/menu.def:30
 msgid "POT files"
-msgstr ""
+msgstr "POT նիշքեր"
 
 #: ../../english/international/l10n/menu.def:34
 msgid "Hints for translators"
-msgstr ""
+msgstr "Ակնկարկ թարգմանիչների մասին"
diff --git a/armenian/po/langs.hy.po b/armenian/po/langs.hy.po
index 9dd9658fb9e..6480f7a09f6 100644
--- a/armenian/po/langs.hy.po
+++ b/armenian/po/langs.hy.po
@@ -15,7 +15,7 @@ msgstr "Արաբերեն"
 
 #: ../../english/template/debian/language_names.wml:9
 msgid "Armenian"
-msgstr ""
+msgstr "Հայերեն"
 
 #: ../../english/template/debian/language_names.wml:10
 msgid "Finnish"
@@ -23,15 +23,15 @@ msgstr "Ֆիներեն"
 
 #: ../../english/template/debian/language_names.wml:11
 msgid "Croatian"
-msgstr ""
+msgstr "Խորվաթերեն"
 
 #: ../../english/template/debian/language_names.wml:12
 msgid "Danish"
-msgstr ""
+msgstr "Դանիերեն"
 
 #: ../../english/template/debian/language_names.wml:13
 msgid "Dutch"
-msgstr ""
+msgstr "Հոլանդերեն"
 
 #: ../../english/template/debian/language_names.wml:14
 msgid "English"
@@ -43,7 +43,7 @@ msgstr "Ֆրանսերեն"
 
 #: ../../english/template/debian/language_names.wml:16
 msgid "Galician"
-msgstr ""
+msgstr "Գալիսերեն"
 
 #: ../../english/template/debian/language_names.wml:17
 msgid "German"
@@ -59,7 +59,7 @@ msgstr "Ճապոներեն"
 
 #: ../../english/template/debian/language_names.wml:20
 msgid "Korean"
-msgstr ""
+msgstr "Կորեերեն"
 
 #: ../../english/template/debian/language_names.wml:21
 msgid "Spanish"
@@ -67,11 +67,11 @@ msgstr "Իսպաներեն"
 
 #: ../../english/template/debian/language_names.wml:22
 msgid "Portuguese"
-msgstr ""
+msgstr "Պորտուգալերեն"
 
 #: ../../english/template/debian/language_names.wml:23
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Պորտուգալերեն (Բրազիլական)"
 
 #: ../../english/template/debian/language_names.wml:24
 msgid "Chinese"
@@ -87,7 +87,7 @@ msgstr "Չինարեն (Հոն Կոնգ)"
 
 #: ../../english/template/debian/language_names.wml:27
 msgid "Chinese (Taiwan)"
-msgstr ""
+msgstr "Չինարեն (Թայվան)"
 
 #: ../../english/template/debian/language_names.wml:28
 #, fuzzy
@@ -105,11 +105,11 @@ msgstr "Շվեդերեն"
 
 #: ../../english/template/debian/language_names.wml:31
 msgid "Polish"
-msgstr ""
+msgstr "Լեհերեն"
 
 #: ../../english/template/debian/language_names.wml:32
 msgid "Norwegian"
-msgstr ""
+msgstr "Նորվեգերեն"
 
 #: ../../english/template/debian/language_names.wml:33
 msgid "Turkish"
@@ -121,7 +121,7 @@ msgstr "Ռուսերեն"
 
 #: ../../english/template/debian/language_names.wml:35
 msgid "Czech"
-msgstr ""
+msgstr "Չեխերեն"
 
 #: ../../english/template/debian/language_names.wml:36
 msgid "Esperanto"
@@ -133,39 +133,39 @@ msgstr "Հունգարեն"
 
 #: ../../english/template/debian/language_names.wml:38
 msgid "Romanian"
-msgstr ""
+msgstr "Ռումիներեն"
 
 #: ../../english/template/debian/language_names.wml:39
 msgid "Slovak"
-msgstr ""
+msgstr "Սլովակերեն"
 
 #: ../../english/template/debian/language_names.wml:40
 msgid "Greek"
-msgstr ""
+msgstr "Հունարեն"
 
 #: ../../english/template/debian/language_names.wml:41
 msgid "Catalan"
-msgstr ""
+msgstr "Կատալեներեն"
 
 #: ../../english/template/debian/language_names.wml:42
 msgid "Indonesian"
-msgstr ""
+msgstr "Ինդոնեզերեն"
 
 #: ../../english/template/debian/language_names.wml:43
 msgid "Lithuanian"
-msgstr ""
+msgstr "Լիտվերեն"
 
 #: ../../english/template/debian/language_names.wml:44
 msgid "Slovene"
-msgstr ""
+msgstr "Սլովեներեն"
 
 #: ../../english/template/debian/language_names.wml:45
 msgid "Bulgarian"
-msgstr ""
+msgstr "Բուլղարերեն"
 
 #: ../../english/template/debian/language_names.wml:46
 msgid "Tamil"
-msgstr ""
+msgstr "Թամիլերեն"
 
 #. for now, the following are only needed if you intend to translate intl/l10n
 #: ../../english/template/debian/language_names.wml:48
@@ -174,15 +174,15 @@ msgstr "Աֆրիկերեն"
 
 #: ../../english/template/debian/language_names.wml:49
 msgid "Albanian"
-msgstr ""
+msgstr "Ալբաներեն"
 
 #: ../../english/template/debian/language_names.wml:50
 msgid "Asturian"
-msgstr ""
+msgstr "Աստուրերեն"
 
 #: ../../english/template/debian/language_names.wml:51
 msgid "Amharic"
-msgstr ""
+msgstr "Ամհարերեն"
 
 #: ../../english/template/debian/language_names.wml:52
 msgid "Azerbaijani"
@@ -190,7 +190,7 @@ msgstr "Ադրբեջաներեն"
 
 #: ../../english/template/debian/language_names.wml:53
 msgid "Basque"
-msgstr ""
+msgstr "Բասկերեն"
 
 #: ../../english/template/debian/language_names.wml:54
 msgid "Belarusian"
@@ -198,19 +198,19 @@ msgstr "Բելառուսերեն"
 
 #: ../../english/template/debian/language_names.wml:55
 msgid "Bengali"
-msgstr ""
+msgstr "Բենգալերեն"
 
 #: ../../english/template/debian/language_names.wml:56
 msgid "Bosnian"
-msgstr ""
+msgstr "Բոսներեն"
 
 #: ../../english/template/debian/language_names.wml:57
 msgid "Breton"
-msgstr ""
+msgstr "Բրետոներեն"
 
 #: ../../english/template/debian/language_names.wml:58
 msgid "Cornish"
-msgstr ""
+msgstr "Կոռներեն"
 
 #: ../../english/template/debian/language_names.wml:59
 msgid "Estonian"
@@ -218,19 +218,19 @@ msgstr "Էստոներեն"
 
 #: ../../english/template/debian/language_names.wml:60
 msgid "Faeroese"
-msgstr ""
+msgstr "Ֆարյորերեն"
 
 #: ../../english/template/debian/language_names.wml:61
 msgid "Gaelic (Scots)"
-msgstr ""
+msgstr "Գելական շոտլանդերեն"
 
 #: ../../english/template/debian/language_names.wml:62
 msgid "Georgian"
-msgstr ""
+msgstr "Վրացերեն"
 
 #: ../../english/template/debian/language_names.wml:63
 msgid "Hebrew"
-msgstr ""
+msgstr "Եբրայերեն"
 
 #: ../../english/template/debian/language_names.wml:64
 msgid "Hindi"
@@ -238,19 +238,19 @@ msgstr "Հնդկերեն"
 
 #: ../../english/template/debian/language_names.wml:65
 msgid "Icelandic"
-msgstr ""
+msgstr "Իսլանդերեն"
 
 #: ../../english/template/debian/language_names.wml:66
 msgid "Interlingua"
-msgstr ""
+msgstr "Ինտերլինգվա"
 
 #: ../../english/template/debian/language_names.wml:67
 msgid "Irish"
-msgstr ""
+msgstr "Իռլանդերեն"
 
 #: ../../english/template/debian/language_names.wml:68
 msgid "Kalaallisut"
-msgstr ""
+msgstr "Գրենլանդերեն"
 
 #: ../../english/template/debian/language_names.wml:69
 msgid "Kannada"
@@ -262,31 +262,31 @@ msgstr "Քռդերեն"
 
 #: ../../english/template/debian/language_names.wml:71
 msgid "Latvian"
-msgstr ""
+msgstr "Լատվիերեն"
 
 #: ../../english/template/debian/language_names.wml:72
 msgid "Macedonian"
-msgstr ""
+msgstr "Մակեդոներեն"
 
 #: ../../english/template/debian/language_names.wml:73
 msgid "Malay"
-msgstr ""
+msgstr "Մալայերեն"
 
 #: ../../english/template/debian/language_names.wml:74
 msgid "Malayalam"
-msgstr ""
+msgstr "Մալայալամ"
 
 #: ../../english/template/debian/language_names.wml:75
 msgid "Maltese"
-msgstr ""
+msgstr "Մալթերեն"
 
 #: ../../english/template/debian/language_names.wml:76
 msgid "Manx"
-msgstr ""
+msgstr "Մանսկերեն"
 
 #: ../../english/template/debian/language_names.wml:77
 msgid "Maori"
-msgstr ""
+msgstr "Մաորի"
 
 #: ../../english/template/debian/language_names.wml:78
 msgid "Mongolian"
@@ -294,15 +294,15 @@ msgstr "Մոնղոլերեն"
 
 #: ../../english/template/debian/language_names.wml:80
 msgid "Norwegian Bokm&aring;l"
-msgstr ""
+msgstr "Նորվեգերեն Bokm&aring;l"
 
 #: ../../english/template/debian/language_names.wml:82
 msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "Նոր Նորվեգերեն"
 
 #: ../../english/template/debian/language_names.wml:83
 msgid "Occitan (post 1500)"
-msgstr ""
+msgstr "Օքսիտաներեն (post 1500)"
 
 #: ../../english/template/debian/language_names.wml:84
 msgid "Persian"
@@ -314,7 +314,7 @@ msgstr "Սերբերեն"
 
 #: ../../english/template/debian/language_names.wml:86
 msgid "Slovenian"
-msgstr ""
+msgstr "Սլովեներեն"
 
 #: ../../english/template/debian/language_names.wml:87
 msgid "Tajik"
@@ -322,15 +322,15 @@ msgstr "Տաջիկերեն"
 
 #: ../../english/template/debian/language_names.wml:88
 msgid "Thai"
-msgstr ""
+msgstr "Թայերեն"
 
 #: ../../english/template/debian/language_names.wml:89
 msgid "Tonga"
-msgstr ""
+msgstr "Թոնգերեն"
 
 #: ../../english/template/debian/language_names.wml:90
 msgid "Twi"
-msgstr ""
+msgstr "Ական"
 
 #: ../../english/template/debian/language_names.wml:91
 msgid "Ukrainian"
@@ -338,19 +338,19 @@ msgstr "Ուկրաիներեն"
 
 #: ../../english/template/debian/language_names.wml:92
 msgid "Vietnamese"
-msgstr ""
+msgstr "Վիետնամերեն"
 
 #: ../../english/template/debian/language_names.wml:93
 msgid "Welsh"
-msgstr ""
+msgstr "Վալերեն"
 
 #: ../../english/template/debian/language_names.wml:94
 msgid "Xhosa"
-msgstr ""
+msgstr "Կոսա"
 
 #: ../../english/template/debian/language_names.wml:95
 msgid "Yiddish"
-msgstr ""
+msgstr "Իդիշ"
 
 #: ../../english/template/debian/language_names.wml:96
 msgid "Zulu"
diff --git a/armenian/po/organization.hy.po b/armenian/po/organization.hy.po
index 1066e5a60a5..62f62bf429f 100644
--- a/armenian/po/organization.hy.po
+++ b/armenian/po/organization.hy.po
@@ -18,418 +18,420 @@ msgid "appointment mail"
 msgstr ""
 
 #. One male delegate
+#. Pronoun tags with delegate combinations
 #: ../../english/intro/organization.data:18
+#: ../../english/intro/organization.data:22
 msgid "<void id=\"male\"/>delegate"
 msgstr ""
 
 #. One female delegate
 #: ../../english/intro/organization.data:20
+#: ../../english/intro/organization.data:23
 msgid "<void id=\"female\"/>delegate"
 msgstr ""
 
-#: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:22
 #: ../../english/intro/organization.data:25
-msgid "current"
+msgid "<void id=\"he_him\"/>he/him"
+msgstr ""
+
+#: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:26
+msgid "<void id=\"she_her\"/>she/her"
 msgstr ""
 
+#: ../../english/intro/organization.data:24
+msgid "<void id=\"gender_neutral\"/>delegate"
+msgstr ""
+
+#: ../../english/intro/organization.data:24
 #: ../../english/intro/organization.data:27
-#: ../../english/intro/organization.data:29
-msgid "member"
+msgid "<void id=\"they_them\"/>they/them"
 msgstr ""
 
+#: ../../english/intro/organization.data:30
 #: ../../english/intro/organization.data:32
-msgid "manager"
+msgid "current"
 msgstr ""
 
 #: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:36
+msgid "member"
+msgstr ""
+
+#: ../../english/intro/organization.data:39
+msgid "manager"
+msgstr ""
+
+#: ../../english/intro/organization.data:41
 msgid "SRM"
 msgstr ""
 
-#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:41
 msgid "Stable Release Manager"
 msgstr ""
 
-#: ../../english/intro/organization.data:36
+#: ../../english/intro/organization.data:43
 msgid "wizard"
 msgstr ""
 
 #. we only use the chair tag once, for techctte, I wonder why it's here.
-#: ../../english/intro/organization.data:38
+#: ../../english/intro/organization.data:45
 msgid "chair"
 msgstr ""
 
-#: ../../english/intro/organization.data:41
+#: ../../english/intro/organization.data:48
 msgid "assistant"
 msgstr ""
 
-#: ../../english/intro/organization.data:43
+#: ../../english/intro/organization.data:50
 msgid "secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:45
+#: ../../english/intro/organization.data:52
 msgid "representative"
 msgstr ""
 
-#: ../../english/intro/organization.data:47
+#: ../../english/intro/organization.data:54
 msgid "role"
 msgstr ""
 
-#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:62
+msgid ""
+"In the following list, <q>current</q> is used for positions that are\n"
+"transitional (elected or appointed with a certain expiration date)."
+msgstr ""
+
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:82
 msgid "Officers"
 msgstr ""
 
-#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:108
 msgid "Distribution"
 msgstr ""
 
-#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:239
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:242
 msgid "Data Protection team"
 msgstr ""
 
-#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:246
 msgid "Publicity team"
 msgstr ""
 
-#: ../../english/intro/organization.data:70
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:319
 msgid "Membership in other organizations"
 msgstr ""
 
-#: ../../english/intro/organization.data:71
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:78
+#: ../../english/intro/organization.data:347
 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:85
 msgid "Leader"
 msgstr ""
 
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
 msgid "Technical Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:103
 msgid "Secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:111
 msgid "Development Projects"
 msgstr ""
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:112
 msgid "FTP Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:114
 msgid "FTP Masters"
 msgstr ""
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:120
 msgid "FTP Assistants"
 msgstr ""
 
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:130
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:132
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:136
 msgid "Release Management"
 msgstr ""
 
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:138
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:147
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:148
 msgid "Installation System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:149
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:150
 msgid "Release Notes"
 msgstr ""
 
-#: ../../english/intro/organization.data:148
-msgid "CD Images"
+#: ../../english/intro/organization.data:152
+msgid "CD/DVD/USB Images"
 msgstr ""
 
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:154
 msgid "Production"
 msgstr ""
 
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:161
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:163
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:167
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:169
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:176
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:193
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:198
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:200
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:230
 msgid "Special Configurations"
 msgstr ""
 
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:232
 msgid "Laptops"
 msgstr ""
 
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:233
 msgid "Firewalls"
 msgstr ""
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:234
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:249
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:251
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:263
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:268
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:269
+#: ../../english/intro/organization.data:273
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:277
-msgid "Anti-harassment"
+#: ../../english/intro/organization.data:281
+msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:290
+msgid ""
+"To send a private message to all the members of the Community Team, use the "
+"GPG key <a href=\"community-team-pubkey.txt"
+"\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
+msgstr ""
+
+#: ../../english/intro/organization.data:292
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:299
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:306
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:301
+#: ../../english/intro/organization.data:310
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:317
+#: ../../english/intro/organization.data:325
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:319
+#: ../../english/intro/organization.data:327
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:329
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:323
+#: ../../english/intro/organization.data:331
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:325
+#: ../../english/intro/organization.data:333
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:334
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:337
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:332
+#: ../../english/intro/organization.data:340
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:343
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:342
+#: ../../english/intro/organization.data:350
 msgid "User support"
 msgstr ""
 
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:417
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:422
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:431
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:437
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:441
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:442
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:446
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:457
 msgid "Consultants Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:462
 msgid "CD Vendors Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:465
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:459
+#: ../../english/intro/organization.data:468
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:469
 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:469
+#: ../../english/intro/organization.data:479
 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:470
+#: ../../english/intro/organization.data:480
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:481
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:488
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:489
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:491
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:498
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:502
 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/armenian/po/others.hy.po b/armenian/po/others.hy.po
index ee45903ab7d..f27e251aa96 100644
--- a/armenian/po/others.hy.po
+++ b/armenian/po/others.hy.po
@@ -103,6 +103,7 @@ msgstr ""
 #: ../../english/devel/website/tc.data:14
 #: ../../english/devel/website/tc.data:15
 #: ../../english/devel/website/tc.data:16
+#: ../../english/events/merchandise.def:145
 msgid "More information"
 msgstr ""
 
@@ -124,91 +125,107 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: ../../english/events/merchandise.def:10
+#: ../../english/events/merchandise.def:13
 msgid "Products"
 msgstr ""
 
-#: ../../english/events/merchandise.def:13
+#: ../../english/events/merchandise.def:16
 msgid "T-shirts"
 msgstr ""
 
-#: ../../english/events/merchandise.def:16
+#: ../../english/events/merchandise.def:19
 msgid "hats"
 msgstr ""
 
-#: ../../english/events/merchandise.def:19
+#: ../../english/events/merchandise.def:22
 msgid "stickers"
 msgstr ""
 
-#: ../../english/events/merchandise.def:22
+#: ../../english/events/merchandise.def:25
 msgid "mugs"
 msgstr ""
 
-#: ../../english/events/merchandise.def:25
+#: ../../english/events/merchandise.def:28
 msgid "other clothing"
 msgstr ""
 
-#: ../../english/events/merchandise.def:28
+#: ../../english/events/merchandise.def:31
 msgid "polo shirts"
 msgstr ""
 
-#: ../../english/events/merchandise.def:31
+#: ../../english/events/merchandise.def:34
 msgid "frisbees"
 msgstr ""
 
-#: ../../english/events/merchandise.def:34
+#: ../../english/events/merchandise.def:37
 msgid "mouse pads"
 msgstr ""
 
-#: ../../english/events/merchandise.def:37
+#: ../../english/events/merchandise.def:40
 msgid "badges"
 msgstr ""
 
-#: ../../english/events/merchandise.def:40
+#: ../../english/events/merchandise.def:43
 msgid "basketball goals"
 msgstr ""
 
-#: ../../english/events/merchandise.def:44
+#: ../../english/events/merchandise.def:47
 msgid "earrings"
 msgstr ""
 
-#: ../../english/events/merchandise.def:47
+#: ../../english/events/merchandise.def:50
 msgid "suitcases"
 msgstr ""
 
-#: ../../english/events/merchandise.def:50
+#: ../../english/events/merchandise.def:53
 msgid "umbrellas"
 msgstr ""
 
-#: ../../english/events/merchandise.def:53
+#: ../../english/events/merchandise.def:56
 msgid "pillowcases"
 msgstr ""
 
-#: ../../english/events/merchandise.def:56
+#: ../../english/events/merchandise.def:59
 msgid "keychains"
 msgstr ""
 
-#: ../../english/events/merchandise.def:59
+#: ../../english/events/merchandise.def:62
 msgid "Swiss army knives"
 msgstr ""
 
-#: ../../english/events/merchandise.def:62
+#: ../../english/events/merchandise.def:65
 msgid "USB-Sticks"
 msgstr ""
 
-#: ../../english/events/merchandise.def:77
+#: ../../english/events/merchandise.def:80
 msgid "lanyards"
 msgstr ""
 
-#: ../../english/events/merchandise.def:80
+#: ../../english/events/merchandise.def:83
 msgid "others"
 msgstr ""
 
-#: ../../english/events/merchandise.def:101
+#: ../../english/events/merchandise.def:90
+msgid "Available languages:"
+msgstr ""
+
+#: ../../english/events/merchandise.def:107
+msgid "International delivery:"
+msgstr ""
+
+#: ../../english/events/merchandise.def:118
+msgid "within Europe"
+msgstr ""
+
+#: ../../english/events/merchandise.def:122
+msgid "Original country:"
+msgstr ""
+
+#: ../../english/events/merchandise.def:187
 msgid "Donates money to Debian"
 msgstr ""
 
-#: ../../english/events/merchandise.def:106
+#: ../../english/events/merchandise.def:192
 msgid "Money is used to organize local free software events"
 msgstr ""
 
diff --git a/armenian/po/partners.hy.po b/armenian/po/partners.hy.po
index db8c9e99938..e0a331a2a69 100644
--- a/armenian/po/partners.hy.po
+++ b/armenian/po/partners.hy.po
@@ -38,13 +38,31 @@ msgid ""
 "servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:42
+#: ../../english/partners/partners.def:40
+msgid ""
+"<a href=\"https://amperecomputing.com\">Ampere®</a> provides hardware for "
+"arm64/armhf/armel build daemons and other Debian services (current Ampere "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page)."
+msgstr ""
+
+#: ../../english/partners/partners.def:43
+msgid ""
+"Ampere is designing the future of hyperscale cloud and edge computing with "
+"the world’s first cloud native processor. Built for the cloud with a modern "
+"64-bit Arm server-based architecture, Ampere gives customers the freedom to "
+"accelerate the delivery of all cloud computing applications. With industry-"
+"leading cloud performance, power efficiency and scalability, Ampere "
+"processors are tailored for the continued growth of cloud and edge computing."
+msgstr ""
+
+#: ../../english/partners/partners.def:51
 msgid ""
 "<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
 "by providing hosting services and sponsorship for the Debian Conference."
 msgstr ""
 
-#: ../../english/partners/partners.def:46
+#: ../../english/partners/partners.def:55
 msgid ""
 "They are a leading Internet Service Provider (ISP) in the United Kingdom and "
 "provide scalable, powerful and affordable hosting with lots of <q>geek "
@@ -54,7 +72,7 @@ msgid ""
 "are also well known for their expert and friendly support."
 msgstr ""
 
-#: ../../english/partners/partners.def:54
+#: ../../english/partners/partners.def:63
 msgid ""
 "<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
 "supporting the Debian project as a hosting partner for several years. In "
@@ -63,7 +81,7 @@ msgid ""
 "at conova."
 msgstr ""
 
-#: ../../english/partners/partners.def:57
+#: ../../english/partners/partners.def:66
 msgid ""
 "conova operates one of the most modern data centers in all of Europe in "
 "Salzburg, Austria. Their services: customized solutions for housing, "
@@ -72,16 +90,16 @@ msgid ""
 "highest level of supply and security on their 2,000 m² of technical area."
 msgstr ""
 
-#: ../../english/partners/partners.def:64
+#: ../../english/partners/partners.def:73
 msgid ""
 "<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
 "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
+#: ../../english/partners/partners.def:76
 msgid ""
 "From the very beginning credativ has actively supported the Debian project "
 "and will continue to do so in the future. Furthermore many of our "
@@ -90,7 +108,7 @@ msgid ""
 "href=\"https://www.credativ.com/\">https://www.credativ.com/</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:82
 msgid ""
 "<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
 "hardware and hosting services from their colocation sites via high-speed "
@@ -98,7 +116,7 @@ msgid ""
 "an IBM x360 server. "
 msgstr ""
 
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:86
 msgid ""
 "Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
 "on IT infrastructures, software development and hosting services. DG-i "
@@ -110,7 +128,7 @@ msgid ""
 "infrastructure in their Munich and Dusseldorf data centers."
 msgstr ""
 
-#: ../../english/partners/partners.def:83
+#: ../../english/partners/partners.def:92
 msgid ""
 "<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
 "infrastructure from power issues, and employs a Debian Developer to work on "
@@ -118,7 +136,7 @@ msgid ""
 "networkupstools.org/\">Network UPS Tools</a> and related packages."
 msgstr ""
 
-#: ../../english/partners/partners.def:86
+#: ../../english/partners/partners.def:95
 msgid ""
 "Eaton is a global technology leader in electrical components and systems for "
 "power quality, distribution and control; hydraulics components, systems and "
@@ -129,14 +147,14 @@ msgid ""
 "more than 150 countries, with 2008 sales of $15.4 billion."
 msgstr ""
 
-#: ../../english/partners/partners.def:93
+#: ../../english/partners/partners.def:102
 msgid ""
 "<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
 "delivery network (CDN) services and is helping us deliver packages to users "
 "through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:96
+#: ../../english/partners/partners.def:105
 msgid ""
 "Fastly’s edge cloud platform provides advanced application delivery and "
 "cloud security for the world’s most popular online destinations. Fastly "
@@ -144,14 +162,14 @@ msgid ""
 "month, more than 10 percent of all internet requests."
 msgstr ""
 
-#: ../../english/partners/partners.def:103
+#: ../../english/partners/partners.def:112
 msgid ""
 "Since 2002, Genesi has provided the hardware it designs and develops to the "
 "Debian community. Genesi also employs Debian developers to support their "
 "platforms."
 msgstr ""
 
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:115
 msgid ""
 "Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
 "based computers are designed to bring low cost, energy efficient computing "
@@ -160,20 +178,20 @@ msgid ""
 "powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
 msgstr ""
 
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:122
 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
+#: ../../english/partners/partners.def:125
 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
+#: ../../english/partners/partners.def:132
 msgid ""
 "<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
 "(HPE)</a> provides hardware for port development, Debian mirrors, and other "
@@ -181,14 +199,14 @@ msgid ""
 "\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
-#: ../../english/partners/partners.def:126
+#: ../../english/partners/partners.def:135
 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:134
+#: ../../english/partners/partners.def:143
 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."
@@ -199,7 +217,7 @@ msgid ""
 "50%, enough to accommodate anticipated growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:137
+#: ../../english/partners/partners.def:146
 msgid ""
 "LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
 "customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -207,7 +225,7 @@ msgid ""
 "\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:152
 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 "
@@ -216,7 +234,7 @@ msgid ""
 "Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:155
 msgid ""
 "Loongson processors are a series of MIPS-compatible processors. They have "
 "been widely used in many areas, such as desktop, server, embedded "
@@ -224,7 +242,7 @@ msgid ""
 "<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:152
+#: ../../english/partners/partners.def:161
 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 "
@@ -232,7 +250,7 @@ msgid ""
 "network for experimental and debconf.org machines."
 msgstr ""
 
-#: ../../english/partners/partners.def:156
+#: ../../english/partners/partners.def:165
 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 "
@@ -242,27 +260,27 @@ msgid ""
 "both universities."
 msgstr ""
 
-#: ../../english/partners/partners.def:164
+#: ../../english/partners/partners.def:173
 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:168
+#: ../../english/partners/partners.def:177
 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:175
+#: ../../english/partners/partners.def:184
 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:179
+#: ../../english/partners/partners.def:188
 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 "
@@ -270,14 +288,14 @@ msgid ""
 "department and has been successfully in use for the .at zone."
 msgstr ""
 
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:194
 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:188
+#: ../../english/partners/partners.def:197
 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 "
@@ -286,7 +304,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:195
+#: ../../english/partners/partners.def:204
 msgid ""
 "<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
 "utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -296,35 +314,35 @@ msgid ""
 "\">Planet Debian</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:198
+#: ../../english/partners/partners.def:207
 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:204
+#: ../../english/partners/partners.def:213
 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:207
+#: ../../english/partners/partners.def:216
 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:210
+#: ../../english/partners/partners.def:219
 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:216
+#: ../../english/partners/partners.def:225
 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 "
@@ -334,7 +352,7 @@ msgid ""
 "thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:219
+#: ../../english/partners/partners.def:228
 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-"
@@ -344,7 +362,7 @@ msgid ""
 "course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:225
+#: ../../english/partners/partners.def:234
 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. "
@@ -353,7 +371,7 @@ msgid ""
 "for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:228
+#: ../../english/partners/partners.def:237
 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 "
@@ -361,7 +379,7 @@ msgid ""
 "\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:236
+#: ../../english/partners/partners.def:245
 msgid ""
 "The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
 "provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -371,7 +389,7 @@ msgid ""
 "increasing the amount of snapshot storage provided."
 msgstr ""
 
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:248
 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 "
@@ -382,14 +400,14 @@ msgid ""
 "treatments for human disease."
 msgstr ""
 
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:258
 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:252
+#: ../../english/partners/partners.def:261
 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, "
@@ -398,7 +416,7 @@ msgid ""
 "\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:268
 msgid ""
 "<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
 "port development, Debian mirrors, and other Debian services (current HP "
@@ -408,7 +426,7 @@ msgid ""
 "com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:262
+#: ../../english/partners/partners.def:271
 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, "
@@ -416,7 +434,7 @@ msgid ""
 "solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:269
+#: ../../english/partners/partners.def:278
 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 "
@@ -424,7 +442,7 @@ msgid ""
 "current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:273
+#: ../../english/partners/partners.def:282
 msgid ""
 "Linux Central sells all the latest releases of Linux products such as "
 "commercial software, books, hardware, and versions of major Linux "
@@ -434,14 +452,14 @@ msgid ""
 "contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:280
+#: ../../english/partners/partners.def:289
 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:287
+#: ../../english/partners/partners.def:296
 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 "
@@ -452,7 +470,7 @@ msgid ""
 "copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:294
+#: ../../english/partners/partners.def:303
 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 "
@@ -460,7 +478,7 @@ msgid ""
 "donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:297
+#: ../../english/partners/partners.def:306
 msgid ""
 "Open Source Press specialises on books around Linux and Open Source "
 "Software, written by authors with considerable experience in the fields, and "
@@ -468,7 +486,7 @@ msgid ""
 "Source Press publications are renowned for their quality and depth."
 msgstr ""
 
-#: ../../english/partners/partners.def:305
+#: ../../english/partners/partners.def:314
 msgid ""
 "<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
 "Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -476,13 +494,13 @@ msgid ""
 "virtual servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:308
+#: ../../english/partners/partners.def:317
 msgid ""
 "It hosts a Debian development machine, <a href=\"https://db.debian.org/"
 "machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:316
+#: ../../english/partners/partners.def:325
 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 "
@@ -490,7 +508,7 @@ msgid ""
 "ARM port."
 msgstr ""
 
-#: ../../english/partners/partners.def:319
+#: ../../english/partners/partners.def:328
 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/armenian/po/search.hy.po b/armenian/po/search.hy.po
deleted file mode 100644
index 3f06c2618eb..00000000000
--- a/armenian/po/search.hy.po
+++ /dev/null
@@ -1,98 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2006-08-12 17:28+0200\n"
-"Last-Translator: Vardan Gevorgyan <vgevorgyan@vtgsoftware.com>\n"
-"Language-Team: Armenian <translation-team-hy@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../english/searchtmpl/search.def:6
-msgid "Search for"
-msgstr "Փնտրել"
-
-#: ../../english/searchtmpl/search.def:10
-msgid "Results per page"
-msgstr "Արդյունքները ըստ էջերի"
-
-#: ../../english/searchtmpl/search.def:14
-msgid "Output format"
-msgstr "Արտածման ֆորմատը"
-
-#: ../../english/searchtmpl/search.def:18
-msgid "Long"
-msgstr "Երկար"
-
-#: ../../english/searchtmpl/search.def:22
-msgid "Short"
-msgstr "Կարճ"
-
-#: ../../english/searchtmpl/search.def:26
-msgid "URL"
-msgstr "URL"
-
-#: ../../english/searchtmpl/search.def:30
-msgid "Default query type"
-msgstr "Հարցման հիմնական տեսակ"
-
-#: ../../english/searchtmpl/search.def:34
-msgid "All Words"
-msgstr "Բոլոր բառերը"
-
-#: ../../english/searchtmpl/search.def:38
-msgid "Any Words"
-msgstr "Ցանկացած բառ"
-
-#: ../../english/searchtmpl/search.def:42
-msgid "Search through"
-msgstr "Փնտրել տվյալ վայրում"
-
-#: ../../english/searchtmpl/search.def:46
-msgid "Entire site"
-msgstr "Ամբողջական կայքում"
-
-#: ../../english/searchtmpl/search.def:50
-msgid "Language"
-msgstr "Լեզու"
-
-#: ../../english/searchtmpl/search.def:54
-msgid "Any"
-msgstr "Յուրաքանչյուր"
-
-#: ../../english/searchtmpl/search.def:58
-msgid "Search results"
-msgstr "Փնտրման արդյունքները"
-
-#: ../../english/searchtmpl/search.def:65
-msgid ""
-"Displaying documents \\$(first)-\\$(last) of total <B>\\$(total)</B> found."
-msgstr "<B>\\$(total)</B> փնտրվածներից ցույց է տրվում \\$(first)-\\$(last)-ը"
-
-#: ../../english/searchtmpl/search.def:69
-msgid ""
-"Sorry, but search returned no results. <P>Some pages may be available in "
-"English only, you may want to try searching again and set the Language to "
-"Any."
-msgstr "Կներեք, բայց փնտրման ընթացքում արդյունք չի հայտնաբերվել։ <P> Որոշ"
-"էջեր կան միայն Անգլերեն լեզվով, դուք պետք է կրկին կատարեք փնտրումը Լեզուն գնելով Ցանկացած։"
-
-#: ../../english/searchtmpl/search.def:73
-msgid "An error occured!"
-msgstr "Սխալ է տեղի ունեցել"
-
-#: ../../english/searchtmpl/search.def:77
-msgid "You should give at least one word to search for."
-msgstr "Դուք պետք է ունենաք գոնե մեկ բառ փնտրելու համար։"
-
-#: ../../english/searchtmpl/search.def:81
-msgid "Powered by"
-msgstr ""
-
-#: ../../english/searchtmpl/search.def:85
-msgid "Next"
-msgstr "Հաջորդ"
-
-#: ../../english/searchtmpl/search.def:89
-msgid "Prev"
-msgstr "Նախորդ"
diff --git a/armenian/po/security.hy.po b/armenian/po/security.hy.po
index 65fb442e11a..83a22172495 100644
--- a/armenian/po/security.hy.po
+++ b/armenian/po/security.hy.po
@@ -65,31 +65,31 @@ msgid ""
 "url />\">revised advisory</a>."
 msgstr ""
 
-#: ../../english/template/debian/security.wml:42
+#: ../../english/template/debian/security.wml:44
 msgid "Debian Security Advisory"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:47
+#: ../../english/template/debian/security.wml:49
 msgid "Date Reported"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:50
+#: ../../english/template/debian/security.wml:52
 msgid "Affected Packages"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:72
+#: ../../english/template/debian/security.wml:74
 msgid "Vulnerable"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:75
+#: ../../english/template/debian/security.wml:77
 msgid "Security database references"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:78
+#: ../../english/template/debian/security.wml:80
 msgid "More information"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:84
+#: ../../english/template/debian/security.wml:86
 msgid "Fixed in"
 msgstr ""
 
diff --git a/armenian/po/stats.hy.po b/armenian/po/stats.hy.po
index c8a22ea2b47..e479bb5f8da 100644
--- a/armenian/po/stats.hy.po
+++ b/armenian/po/stats.hy.po
@@ -28,204 +28,204 @@ msgstr ""
 msgid "There are %d strings to translate."
 msgstr ""
 
-#: ../../stattrans.pl:278 ../../stattrans.pl:494
+#: ../../stattrans.pl:282 ../../stattrans.pl:498
 msgid "Wrong translation version"
 msgstr ""
 
-#: ../../stattrans.pl:280
+#: ../../stattrans.pl:284
 msgid "This translation is too out of date"
 msgstr ""
 
-#: ../../stattrans.pl:282
+#: ../../stattrans.pl:286
 msgid "The original is newer than this translation"
 msgstr ""
 
-#: ../../stattrans.pl:286 ../../stattrans.pl:494
+#: ../../stattrans.pl:290 ../../stattrans.pl:498
 msgid "The original no longer exists"
 msgstr ""
 
-#: ../../stattrans.pl:470
+#: ../../stattrans.pl:474
 msgid "hit count N/A"
 msgstr ""
 
-#: ../../stattrans.pl:470
+#: ../../stattrans.pl:474
 msgid "hits"
 msgstr ""
 
-#: ../../stattrans.pl:488 ../../stattrans.pl:489
+#: ../../stattrans.pl:492 ../../stattrans.pl:493
 msgid "Click to fetch diffstat data"
 msgstr ""
 
-#: ../../stattrans.pl:599 ../../stattrans.pl:739
+#: ../../stattrans.pl:603 ../../stattrans.pl:743
 msgid "Created with <transstatslink>"
 msgstr ""
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:608
 msgid "Translation summary for"
 msgstr ""
 
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
+#: ../../stattrans.pl:611 ../../stattrans.pl:767 ../../stattrans.pl:813
+#: ../../stattrans.pl:856
 msgid "Not translated"
 msgstr ""
 
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+#: ../../stattrans.pl:611 ../../stattrans.pl:766 ../../stattrans.pl:812
 msgid "Outdated"
 msgstr ""
 
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:611
 msgid "Translated"
 msgstr ""
 
-#: ../../stattrans.pl:607 ../../stattrans.pl:687 ../../stattrans.pl:761
-#: ../../stattrans.pl:807 ../../stattrans.pl:850
+#: ../../stattrans.pl:611 ../../stattrans.pl:691 ../../stattrans.pl:765
+#: ../../stattrans.pl:811 ../../stattrans.pl:854
 msgid "Up to date"
 msgstr ""
 
-#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:612 ../../stattrans.pl:613 ../../stattrans.pl:614
+#: ../../stattrans.pl:615
 msgid "files"
 msgstr ""
 
-#: ../../stattrans.pl:614 ../../stattrans.pl:615 ../../stattrans.pl:616
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:618 ../../stattrans.pl:619 ../../stattrans.pl:620
+#: ../../stattrans.pl:621
 msgid "bytes"
 msgstr ""
 
-#: ../../stattrans.pl:624
+#: ../../stattrans.pl:628
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
 msgstr ""
 
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:634
 msgid "Outdated translations"
 msgstr ""
 
-#: ../../stattrans.pl:632 ../../stattrans.pl:686
+#: ../../stattrans.pl:636 ../../stattrans.pl:690
 msgid "File"
 msgstr ""
 
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:638
 msgid "Diff"
 msgstr ""
 
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:640
 msgid "Comment"
 msgstr ""
 
-#: ../../stattrans.pl:637
+#: ../../stattrans.pl:641
 msgid "Diffstat"
 msgstr ""
 
-#: ../../stattrans.pl:638
+#: ../../stattrans.pl:642
 msgid "Git command line"
 msgstr ""
 
-#: ../../stattrans.pl:640
+#: ../../stattrans.pl:644
 msgid "Log"
 msgstr ""
 
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:645
 msgid "Translation"
 msgstr ""
 
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:646
 msgid "Maintainer"
 msgstr ""
 
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:648
 msgid "Status"
 msgstr ""
 
-#: ../../stattrans.pl:645
+#: ../../stattrans.pl:649
 msgid "Translator"
 msgstr ""
 
-#: ../../stattrans.pl:646
+#: ../../stattrans.pl:650
 msgid "Date"
 msgstr ""
 
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:657
 msgid "General pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:654
+#: ../../stattrans.pl:658
 msgid "Untranslated general pages"
 msgstr ""
 
-#: ../../stattrans.pl:659
+#: ../../stattrans.pl:663
 msgid "News items not translated"
 msgstr ""
 
-#: ../../stattrans.pl:660
+#: ../../stattrans.pl:664
 msgid "Untranslated news items"
 msgstr ""
 
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:669
 msgid "Consultant/user pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:670
 msgid "Untranslated consultant/user pages"
 msgstr ""
 
-#: ../../stattrans.pl:671
+#: ../../stattrans.pl:675
 msgid "International pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:672
+#: ../../stattrans.pl:676
 msgid "Untranslated international pages"
 msgstr ""
 
-#: ../../stattrans.pl:677
+#: ../../stattrans.pl:681
 msgid "Translated pages (up-to-date)"
 msgstr ""
 
-#: ../../stattrans.pl:684 ../../stattrans.pl:834
+#: ../../stattrans.pl:688 ../../stattrans.pl:838
 msgid "Translated templates (PO files)"
 msgstr ""
 
-#: ../../stattrans.pl:685 ../../stattrans.pl:837
+#: ../../stattrans.pl:689 ../../stattrans.pl:841
 msgid "PO Translation Statistics"
 msgstr ""
 
-#: ../../stattrans.pl:688 ../../stattrans.pl:851
+#: ../../stattrans.pl:692 ../../stattrans.pl:855
 msgid "Fuzzy"
 msgstr ""
 
-#: ../../stattrans.pl:689
+#: ../../stattrans.pl:693
 msgid "Untranslated"
 msgstr ""
 
-#: ../../stattrans.pl:690
+#: ../../stattrans.pl:694
 msgid "Total"
 msgstr ""
 
-#: ../../stattrans.pl:707
+#: ../../stattrans.pl:711
 msgid "Total:"
 msgstr ""
 
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:745
 msgid "Translated web pages"
 msgstr ""
 
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:748
 msgid "Translation Statistics by Page Count"
 msgstr ""
 
-#: ../../stattrans.pl:759 ../../stattrans.pl:805 ../../stattrans.pl:849
+#: ../../stattrans.pl:763 ../../stattrans.pl:809 ../../stattrans.pl:853
 msgid "Language"
 msgstr ""
 
-#: ../../stattrans.pl:760 ../../stattrans.pl:806
+#: ../../stattrans.pl:764 ../../stattrans.pl:810
 msgid "Translations"
 msgstr ""
 
-#: ../../stattrans.pl:787
+#: ../../stattrans.pl:791
 msgid "Translated web pages (by size)"
 msgstr ""
 
-#: ../../stattrans.pl:790
+#: ../../stattrans.pl:794
 msgid "Translation Statistics by Page Size"
 msgstr ""
diff --git a/armenian/po/templates.hy.po b/armenian/po/templates.hy.po
index 8beb58eee39..491d2f72087 100644
--- a/armenian/po/templates.hy.po
+++ b/armenian/po/templates.hy.po
@@ -199,7 +199,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:106
+#: ../../english/template/debian/footer.wml:91
 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."
@@ -208,27 +208,27 @@ msgid ""
 "\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:109
+#: ../../english/template/debian/footer.wml:94
 msgid "Last Modified"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:112
+#: ../../english/template/debian/footer.wml:97
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:115
+#: ../../english/template/debian/footer.wml:100
 msgid "Copyright"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:118
+#: ../../english/template/debian/footer.wml:103
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:121
+#: ../../english/template/debian/footer.wml:106
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:124
+#: ../../english/template/debian/footer.wml:109
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -243,6 +243,14 @@ msgstr ""
 msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
 msgstr ""
 
+#: ../../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 ""
diff --git a/armenian/po/vote.hy.po b/armenian/po/vote.hy.po
index e1ef9c1f20e..b9b28dc9dde 100644
--- a/armenian/po/vote.hy.po
+++ b/armenian/po/vote.hy.po
@@ -66,201 +66,225 @@ 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
-msgid "Amendment Proposer A"
+msgid "Proposal G"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Seconds A"
+msgid "Proposal H"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Text A"
+msgid "Choices"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Proposer B"
+msgid "Amendment Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Seconds B"
+msgid "Amendment Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Text B"
+msgid "Amendment Text"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Proposer C"
+msgid "Amendment Proposer A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Seconds C"
+msgid "Amendment Seconds A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:136
-msgid "Amendment Text C"
+msgid "Amendment Text A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:139
-msgid "Amendments"
+msgid "Amendment Proposer B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:142
-msgid "Proceedings"
+msgid "Amendment Seconds B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:145
-msgid "Majority Requirement"
+msgid "Amendment Text B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:148
-msgid "Data and Statistics"
+msgid "Amendment Proposer C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:151
-msgid "Quorum"
+msgid "Amendment Seconds C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:154
-msgid "Minimum Discussion"
+msgid "Amendment Text C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:157
-msgid "Ballot"
+msgid "Amendments"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:160
-msgid "Forum"
+msgid "Proceedings"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:163
+msgid "Majority Requirement"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:166
+msgid "Data and Statistics"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:169
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:172
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:175
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:178
+msgid "Forum"
+msgstr ""
+
+#: ../../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 ""
 
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
 msgid "In&nbsp;Discussion"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
 msgid "Voting&nbsp;Open"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
 msgid "Decided"
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
 msgid "Home&nbsp;Vote&nbsp;Page"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
 msgid "How&nbsp;To"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
 msgid "Vote"
 msgstr ""
diff --git a/armenian/sitemap.wml b/armenian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/armenian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
+\ No newline at end of file
author	Thomas Lange <lange@debian.org>	2020-09-30 03:48:04 +0200
committer	Thomas Lange <lange@debian.org>	2020-09-30 03:48:04 +0200
commit	c5fc5fae523cf7600d4a8b42a3a8269368f11d79 (patch)
tree	bc3a49dad5ef9dd4a8deb02ea51406a871d1fc15 /armenian
parent	5b29d71933f373090b3da6f5a3e604078387638f (diff)
parent	c767030cd30f4611e2572d0ffd84944639c65552 (diff)