[Armenian] Update language templates

7 files changed, 327 insertions, 257 deletions

diff --git a/armenian/po/distrib.hy.po b/armenian/po/distrib.hy.po
index de9504074ec..5e3a2677faa 100644
--- a/armenian/po/distrib.hy.po
+++ b/armenian/po/distrib.hy.po
@@ -205,14 +205,14 @@ msgstr ""
 msgid "SPARC"
 msgstr ""
 
-#~ msgid "all files in this package"
-#~ msgstr "այս փաթեթի բոլոր ֆայլերը"
-
-#~ msgid "no"
-#~ msgstr "ոչ"
+#~ msgid "non-US"
+#~ msgstr "ոչ-US"
 
 #~ msgid "yes"
 #~ msgstr "այո"
 
-#~ msgid "non-US"
-#~ msgstr "ոչ-US"
+#~ msgid "no"
+#~ msgstr "ոչ"
+
+#~ msgid "all files in this package"
+#~ msgstr "այս փաթեթի բոլոր ֆայլերը"
diff --git a/armenian/po/doc.hy.po b/armenian/po/doc.hy.po
index d0f16b57d2c..21d1edafb53 100644
--- a/armenian/po/doc.hy.po
+++ b/armenian/po/doc.hy.po
@@ -9,10 +9,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"
@@ -26,8 +26,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"
@@ -42,7 +42,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"
@@ -51,7 +51,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"
@@ -63,7 +63,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 "
@@ -75,7 +75,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 "
@@ -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: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"
@@ -104,18 +104,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 "Իր հետ ունի(CD)՝"
 
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
 msgid "Publisher:"
 msgstr "Հրատարակող՝"
 
@@ -151,50 +155,53 @@ msgstr ""
 msgid "plain text"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:183
+#: ../../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:161 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:185
+#: ../../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:162 ../../english/doc/manuals.defs:170
-#: ../../english/doc/manuals.defs:178 ../../english/doc/manuals.defs:186
+#: ../../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:167
+#: ../../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:175
+#: ../../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:193
+#: ../../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:198
+#: ../../english/doc/manuals.defs:208
 msgid "CVS via web"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:202 ../../english/doc/manuals.defs:206
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
 msgid "Debian package"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:211 ../../english/doc/manuals.defs:215
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
 msgid "Debian package (archived)"
 msgstr ""
 
diff --git a/armenian/po/organization.hy.po b/armenian/po/organization.hy.po
index 8b5f6faa3ad..1066e5a60a5 100644
--- a/armenian/po/organization.hy.po
+++ b/armenian/po/organization.hy.po
@@ -53,329 +53,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:229
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:237
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:240
 msgid "Data Protection team"
 msgstr ""
 
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:244
 msgid "Publicity team"
 msgstr ""
 
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:302
+#: ../../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:158
+#: ../../english/intro/organization.data:173
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:191
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:181
+#: ../../english/intro/organization.data:196
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:184
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:185
+#: ../../english/intro/organization.data:198
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:228
 msgid "Special Configurations"
 msgstr ""
 
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:230
 msgid "Laptops"
 msgstr ""
 
-#: ../../english/intro/organization.data:223
+#: ../../english/intro/organization.data:231
 msgid "Firewalls"
 msgstr ""
 
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:232
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:247
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:241
+#: ../../english/intro/organization.data:249
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:251
+#: ../../english/intro/organization.data:259
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:256
+#: ../../english/intro/organization.data:264
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:260
+#: ../../english/intro/organization.data:269
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:268
+#: ../../english/intro/organization.data:277
 msgid "Anti-harassment"
 msgstr ""
 
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:282
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:289
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:287
+#: ../../english/intro/organization.data:296
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:301
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:305
+#: ../../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:372
+#: ../../english/intro/organization.data:409
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:414
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:385
+#: ../../english/intro/organization.data:422
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:391
+#: ../../english/intro/organization.data:428
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:432
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:433
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:437
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:412
+#: ../../english/intro/organization.data:448
 msgid "Consultants Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:453
 msgid "CD Vendors Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:456
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:423
+#: ../../english/intro/organization.data:459
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:424
+#: ../../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:433
+#: ../../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:434
+#: ../../english/intro/organization.data:470
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:471
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:442
+#: ../../english/intro/organization.data:478
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:443
+#: ../../english/intro/organization.data:479
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:481
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:451
+#: ../../english/intro/organization.data:487
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:454
+#: ../../english/intro/organization.data:490
 msgid "Salsa administrators"
 msgstr ""
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:501
 msgid "Debian for children from 1 to 99"
 msgstr ""
 
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:504
 msgid "Debian for medical practice and research"
 msgstr ""
 
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:507
 msgid "Debian for education"
 msgstr ""
 
-#: ../../english/intro/organization.data:476
+#: ../../english/intro/organization.data:512
 msgid "Debian in legal offices"
 msgstr ""
 
-#: ../../english/intro/organization.data:480
+#: ../../english/intro/organization.data:516
 msgid "Debian for people with disabilities"
 msgstr ""
 
-#: ../../english/intro/organization.data:484
+#: ../../english/intro/organization.data:520
 msgid "Debian for science and related research"
 msgstr ""
 
-#: ../../english/intro/organization.data:487
+#: ../../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 b422318707e..ee45903ab7d 100644
--- a/armenian/po/others.hy.po
+++ b/armenian/po/others.hy.po
@@ -124,126 +124,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:10
+#: ../../english/events/merchandise.def:10
 msgid "Products"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:13
+#: ../../english/events/merchandise.def:13
 msgid "T-shirts"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:16
+#: ../../english/events/merchandise.def:16
 msgid "hats"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:19
+#: ../../english/events/merchandise.def:19
 msgid "stickers"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:22
+#: ../../english/events/merchandise.def:22
 msgid "mugs"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:25
+#: ../../english/events/merchandise.def:25
 msgid "other clothing"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:28
+#: ../../english/events/merchandise.def:28
 msgid "polo shirts"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:31
+#: ../../english/events/merchandise.def:31
 msgid "frisbees"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:34
+#: ../../english/events/merchandise.def:34
 msgid "mouse pads"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:37
+#: ../../english/events/merchandise.def:37
 msgid "badges"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:40
+#: ../../english/events/merchandise.def:40
 msgid "basketball goals"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:44
+#: ../../english/events/merchandise.def:44
 msgid "earrings"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:47
+#: ../../english/events/merchandise.def:47
 msgid "suitcases"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:50
+#: ../../english/events/merchandise.def:50
 msgid "umbrellas"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:53
+#: ../../english/events/merchandise.def:53
 msgid "pillowcases"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:56
+#: ../../english/events/merchandise.def:56
 msgid "keychains"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:59
+#: ../../english/events/merchandise.def:59
 msgid "Swiss army knives"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:62
+#: ../../english/events/merchandise.def:62
 msgid "USB-Sticks"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:77
+#: ../../english/events/merchandise.def:77
 msgid "lanyards"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:80
+#: ../../english/events/merchandise.def:80
 msgid "others"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:101
+#: ../../english/events/merchandise.def:101
 msgid "Donates money to Debian"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:105
+#: ../../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/armenian/po/templates.hy.po b/armenian/po/templates.hy.po
index f93658e3b20..8beb58eee39 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: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."
@@ -208,27 +208,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."
@@ -471,8 +471,13 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: ../../english/template/debian/redirect.wml:7
-msgid "This page has been renamed to <url \"%0\">, please update your links."
+#: ../../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
diff --git a/armenian/po/vendors.hy.po b/armenian/po/vendors.hy.po
index 7c6a1b5395a..2238c62055c 100644
--- a/armenian/po/vendors.hy.po
+++ b/armenian/po/vendors.hy.po
@@ -68,29 +68,29 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#~ msgid "Vendor:"
-#~ msgstr "Մատակարարող՝"
+#~ msgid "Vendor Release"
+#~ msgstr "Մատակարարողի "
 
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Debian-ի հասցեն՝"
+#~ msgid "Architectures:"
+#~ msgstr "Համակառույցները՝"
 
-#~ msgid "Country:"
-#~ msgstr "Երկիր՝"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD տիպը՝"
 
-#~ msgid "Ship International:"
-#~ msgstr "Առաքում այլ երկրներ՝"
+#~ msgid "CD Type:"
+#~ msgstr "CD տիպը՝"
 
 #~ msgid "email:"
 #~ msgstr "էլ-փոստ՝"
 
-#~ msgid "CD Type:"
-#~ msgstr "CD տիպը՝"
+#~ msgid "Ship International:"
+#~ msgstr "Առաքում այլ երկրներ՝"
 
-#~ msgid "DVD Type:"
-#~ msgstr "DVD տիպը՝"
+#~ msgid "Country:"
+#~ msgstr "Երկիր՝"
 
-#~ msgid "Architectures:"
-#~ msgstr "Համակառույցները՝"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian-ի հասցեն՝"
 
-#~ msgid "Vendor Release"
-#~ msgstr "Մատակարարողի "
+#~ msgid "Vendor:"
+#~ msgstr "Մատակարարող՝"
diff --git a/armenian/po/vote.hy.po b/armenian/po/vote.hy.po
index a85ceab0bb3..e1ef9c1f20e 100644
--- a/armenian/po/vote.hy.po
+++ b/armenian/po/vote.hy.po
@@ -26,237 +26,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 ""