Update language templates

6 files changed, 83 insertions, 123 deletions

diff --git a/armenian/po/distrib.hy.po b/armenian/po/distrib.hy.po
index 5e3a2677faa..de9504074ec 100644
--- a/armenian/po/distrib.hy.po
+++ b/armenian/po/distrib.hy.po
@@ -205,14 +205,14 @@ msgstr ""
 msgid "SPARC"
 msgstr ""
 
-#~ msgid "non-US"
-#~ msgstr "ոչ-US"
-
-#~ msgid "yes"
-#~ msgstr "այո"
+#~ msgid "all files in this package"
+#~ msgstr "այս փաթեթի բոլոր ֆայլերը"
 
 #~ msgid "no"
 #~ msgstr "ոչ"
 
-#~ msgid "all files in this package"
-#~ msgstr "այս փաթեթի բոլոր ֆայլերը"
+#~ msgid "yes"
+#~ msgstr "այո"
+
+#~ msgid "non-US"
+#~ msgstr "ոչ-US"
diff --git a/armenian/po/homepage.hy.po b/armenian/po/homepage.hy.po
index 722d80ddc09..0e4d303edc9 100644
--- a/armenian/po/homepage.hy.po
+++ b/armenian/po/homepage.hy.po
@@ -32,11 +32,11 @@ msgid "Screenshot from the Calamares installer"
 msgstr ""
 
 #: ../../english/index.def:33 ../../english/index.def:36
-msgid "Debian is like a Swiss Knife"
+msgid "Debian is like a Swiss Army Knife"
 msgstr ""
 
 #: ../../english/index.def:40
-msgid "People have fun"
+msgid "People have fun with Debian"
 msgstr ""
 
 #: ../../english/index.def:43
diff --git a/armenian/po/organization.hy.po b/armenian/po/organization.hy.po
index d792be720f1..8e7371d4587 100644
--- a/armenian/po/organization.hy.po
+++ b/armenian/po/organization.hy.po
@@ -113,27 +113,27 @@ msgid "Distribution"
 msgstr ""
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:209
+#: ../../english/intro/organization.data:203
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:212
+#: ../../english/intro/organization.data:206
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:211
 msgid "Publicity team"
 msgstr ""
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:284
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:318
+#: ../../english/intro/organization.data:312
 msgid "Support and Infrastructure"
 msgstr ""
 
@@ -237,177 +237,169 @@ msgstr ""
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:214
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:216
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:228
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:233
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:238
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:252
+#: ../../english/intro/organization.data:246
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:255
 msgid ""
 "To send a private message to all the members of the Community Team, use the "
 "GPG key <a href=\"community-team-pubkey.txt"
 "\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
 msgstr ""
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:257
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:270
+#: ../../english/intro/organization.data:264
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:277
+#: ../../english/intro/organization.data:271
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:275
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:290
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:292
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:300
+#: ../../english/intro/organization.data:294
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:296
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:298
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:299
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:302
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:305
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:314
+#: ../../english/intro/organization.data:308
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:315
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:320
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:329
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:335
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:339
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:346
+#: ../../english/intro/organization.data:340
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:350
+#: ../../english/intro/organization.data:344
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:361
-msgid "Consultants Page"
-msgstr ""
-
-#: ../../english/intro/organization.data:366
-msgid "CD Vendors Page"
-msgstr ""
-
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:355
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:372
+#: ../../english/intro/organization.data:358
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:373
+#: ../../english/intro/organization.data:359
 msgid ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need a package installed."
 msgstr ""
 
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:369
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
 "contain per-machine administrator information."
 msgstr ""
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:370
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:385
+#: ../../english/intro/organization.data:371
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:378
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:379
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:381
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:388
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:392
 msgid "Salsa administrators"
 msgstr ""
diff --git a/armenian/po/others.hy.po b/armenian/po/others.hy.po
index 1b149899418..451d910f267 100644
--- a/armenian/po/others.hy.po
+++ b/armenian/po/others.hy.po
@@ -9,46 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/devel/debian-installer/ports-status.defs:10
-msgid "Working"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:20
-msgid "sarge"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:30
-msgid "sarge (broken)"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:40
-msgid "Booting"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:50
-msgid "Building"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:56
-msgid "Not yet"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:59
-msgid "No kernel"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:62
-msgid "No images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:65
-msgid "<void id=\"d-i\" />Unknown"
-msgstr ""
-
-#: ../../english/devel/debian-installer/ports-status.defs:68
-msgid "Unavailable"
-msgstr ""
-
 #: ../../english/devel/join/nm-steps.inc:7
 msgid "New Members Corner"
 msgstr ""
diff --git a/armenian/po/templates.hy.po b/armenian/po/templates.hy.po
index e771ff09746..afe0ea25885 100644
--- a/armenian/po/templates.hy.po
+++ b/armenian/po/templates.hy.po
@@ -153,6 +153,14 @@ msgid "The Debian Blog"
 msgstr ""
 
 #: ../../english/template/debian/common_translation.wml:94
+msgid "Debian Micronews"
+msgstr ""
+
+#: ../../english/template/debian/common_translation.wml:97
+msgid "Debian Planet"
+msgstr ""
+
+#: ../../english/template/debian/common_translation.wml:100
 msgid "Last Updated"
 msgstr ""
 
@@ -199,7 +207,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:91
+#: ../../english/template/debian/footer.wml:89
 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 +216,27 @@ msgid ""
 "\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:94
+#: ../../english/template/debian/footer.wml:92
 msgid "Last Modified"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:97
+#: ../../english/template/debian/footer.wml:95
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:100
+#: ../../english/template/debian/footer.wml:98
 msgid "Copyright"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:103
+#: ../../english/template/debian/footer.wml:101
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:106
+#: ../../english/template/debian/footer.wml:104
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:109
+#: ../../english/template/debian/footer.wml:107
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
diff --git a/armenian/po/vendors.hy.po b/armenian/po/vendors.hy.po
index 2238c62055c..7c6a1b5395a 100644
--- a/armenian/po/vendors.hy.po
+++ b/armenian/po/vendors.hy.po
@@ -68,29 +68,29 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#~ msgid "Vendor Release"
-#~ msgstr "Մատակարարողի "
+#~ msgid "Vendor:"
+#~ msgstr "Մատակարարող՝"
 
-#~ msgid "Architectures:"
-#~ msgstr "Համակառույցները՝"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian-ի հասցեն՝"
 
-#~ msgid "DVD Type:"
-#~ msgstr "DVD տիպը՝"
+#~ msgid "Country:"
+#~ msgstr "Երկիր՝"
 
-#~ msgid "CD Type:"
-#~ msgstr "CD տիպը՝"
+#~ msgid "Ship International:"
+#~ msgstr "Առաքում այլ երկրներ՝"
 
 #~ msgid "email:"
 #~ msgstr "էլ-փոստ՝"
 
-#~ msgid "Ship International:"
-#~ msgstr "Առաքում այլ երկրներ՝"
+#~ msgid "CD Type:"
+#~ msgstr "CD տիպը՝"
 
-#~ msgid "Country:"
-#~ msgstr "Երկիր՝"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD տիպը՝"
 
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Debian-ի հասցեն՝"
+#~ msgid "Architectures:"
+#~ msgstr "Համակառույցները՝"
 
-#~ msgid "Vendor:"
-#~ msgstr "Մատակարարող՝"
+#~ msgid "Vendor Release"
+#~ msgstr "Մատակարարողի "