Update PO files from english POT files

14 files changed, 699 insertions, 686 deletions

diff --git a/arabic/po/cdimage.ar.po b/arabic/po/cdimage.ar.po
index d60aed4faba..89f5297eaad 100644
--- a/arabic/po/cdimage.ar.po
+++ b/arabic/po/cdimage.ar.po
@@ -12,20 +12,6 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
-#: ../../english/CD/CD-keys.data:13
-msgid "      Key fingerprint"
-msgstr "      مفتاح بصمة الأصبع"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
 #. note: only change the sep(arator) if it's not good for your charset
 #: ../../english/template/debian/cdimage.wml:10
 msgid "&middot;"
@@ -122,3 +108,17 @@ msgid ""
 msgstr ""
 "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
 "a> for CDs/DVDs:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
+msgid "      Key fingerprint"
+msgstr "      مفتاح بصمة الأصبع"
+
+#: ../../english/devel/debian-installer/images.data:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/arabic/po/consultants.ar.po b/arabic/po/consultants.ar.po
index 2bcbba29b26..4fd6a79c036 100644
--- a/arabic/po/consultants.ar.po
+++ b/arabic/po/consultants.ar.po
@@ -14,6 +14,14 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "قائمة المستشارين"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "العودة إلى<a href=\"./\">صفحة المستشارين لدبيان</a>."
+
 #: ../../english/consultants/consultant.defs:6
 msgid "Name:"
 msgstr "الاسم:"
@@ -68,11 +76,3 @@ msgid ""
 "worldwide."
 msgstr ""
 "<total_consultant> مستشارو دبيان المُسردون في <total_country> دولة حول العالم."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "قائمة المستشارين"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "العودة إلى<a href=\"./\">صفحة المستشارين لدبيان</a>."
diff --git a/arabic/po/countries.ar.po b/arabic/po/countries.ar.po
index 46e613371b9..b6c60d0c7e8 100644
--- a/arabic/po/countries.ar.po
+++ b/arabic/po/countries.ar.po
@@ -223,209 +223,214 @@ 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
 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
 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
 msgid "Tajikistan"
 msgstr "طاجيكستان"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Tunisia"
 msgstr "تونس"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Turkey"
 msgstr "تركيا"
 
-#: ../../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
 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/arabic/po/distrib.ar.po b/arabic/po/distrib.ar.po
index 892e00e7cb8..00191991e0b 100644
--- a/arabic/po/distrib.ar.po
+++ b/arabic/po/distrib.ar.po
@@ -14,99 +14,68 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../../english/distrib/search_contents-form.inc:9
 #: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
 msgid "Keyword"
 msgstr "كلمة مفتاحية"
 
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "عرض"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "بحث في"
 
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "أي منها"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "أسماء الحزم فقط"
 
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "الحزم التي تحتوي على ملفات أو مجلّدات تسمى هكذا"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "الوصف"
 
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "الحزم التي تحتوي على ملفات أو مجلّدات في أسمائها توجد الكلمات"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "أسماء الحزم المصدرية"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:25
 #: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
 msgid "Distribution"
 msgstr "التوزيعة"
 
-#: ../../english/distrib/search_contents-form.inc:27
 #: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
 msgid "experimental"
 msgstr "تجريبية"
 
-#: ../../english/distrib/search_contents-form.inc:28
 #: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
 msgid "unstable"
 msgstr "غير مستقرة"
 
-#: ../../english/distrib/search_contents-form.inc:29
 #: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
 msgid "testing"
 msgstr "اختبارية"
 
-#: ../../english/distrib/search_contents-form.inc:30
 #: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
 msgid "stable"
 msgstr "مستقرة"
 
-#: ../../english/distrib/search_contents-form.inc:31
 #: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
 #, fuzzy
-#| msgid "stable"
 msgid "oldstable"
 msgstr "مستقرة"
 
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr ""
-
-#: ../../english/distrib/search_contents-form.inc:38
 #: ../../english/distrib/search_packages-form.inc:32
 #: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
 msgid "any"
 msgstr "أي منها"
 
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "بحث"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "تصفير"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "بحث في"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "أسماء الحزم فقط"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "الوصف"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "أسماء الحزم المصدرية"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr ""
-
 #: ../../english/distrib/search_packages-form.inc:34
 msgid "Section"
 msgstr "قِسم"
@@ -123,6 +92,36 @@ msgstr "المساهمات (contrib)"
 msgid "non-free"
 msgstr "غير حُر"
 
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "بحث"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "تصفير"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "عرض"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "أي منها"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "الحزم التي تحتوي على ملفات أو مجلّدات تسمى هكذا"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "الحزم التي تحتوي على ملفات أو مجلّدات في أسمائها توجد الكلمات"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr ""
+
 #: ../../english/releases/arches.data:8
 msgid "Alpha"
 msgstr ""
diff --git a/arabic/po/doc.ar.po b/arabic/po/doc.ar.po
index ea578ae6ec6..3969951b7b7 100644
--- a/arabic/po/doc.ar.po
+++ b/arabic/po/doc.ar.po
@@ -13,103 +13,12 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-"  Debian 9 is the must-have handbook for learning Linux. Start on the\n"
-"  beginners level and learn how to deploy the system with graphical\n"
-"  interface and terminal.\n"
-"  This book provides the basic knowledge to grow and become a 'junior'\n"
-"  systems administrator. Start off with exploring the GNOME desktop\n"
-"  interface and adjust it to your personal needs. Overcome your fear of\n"
-"  using the Linux terminal and learn the most essential commands in\n"
-"  administering Debian. Expand your knowledge of system services (systemd)\n"
-"  and learn how to adapt them. Get more out of the software in Debian and\n"
-"  outside of Debian. Manage your home-network with network-manager, etc.\n"
-"  10 percent of the profits on this book will be donated to the Debian\n"
-"  Project."
-msgstr ""
-
-#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-msgid ""
-"Written by two Debian developers, this free book\n"
-"  started as a translation of their French best-seller known as Cahier de\n"
-"  l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
-"  teaches the essentials to anyone who wants to become an effective and\n"
-"  independent Debian GNU/Linux administrator.\n"
-"  It covers all the topics that a competent Linux administrator should\n"
-"  master, from the installation and the update of the system, up to the\n"
-"  creation of packages and the compilation of the kernel, but also\n"
-"  monitoring, backup and migration, without forgetting advanced topics\n"
-"  like SELinux setup to secure services, automated installations, or\n"
-"  virtualization with Xen, KVM or LXC."
-msgstr ""
-
-#: ../../english/doc/books.data:83
-msgid ""
-"The aim of this freely available, up-to-date, book is to get you up to\n"
-"  speed with Debian (including both the current stable release and the\n"
-"  current unstable distribution). It is comprehensive with basic support\n"
-"  for the user who installs and maintains the system themselves (whether\n"
-"  in the home, office, club, or school)."
-msgstr ""
-
-#: ../../english/doc/books.data:105
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-"  covers all aspects of the administration of Debian from the installation\n"
-"  to the configuration of network services.\n"
-"  Written by two Debian developers, this book can be of interest to many\n"
-"  people: the beginner wishing to discover Debian, the advanced user "
-"looking\n"
-"  for tips to enhance his mastership of the Debian tools and the\n"
-"  administrator who wants to build a reliable network with Debian."
-msgstr ""
-
-#: ../../english/doc/books.data:125
-msgid ""
-"The book covers topics ranging from concepts of package\n"
-"  management over the available tools and how they're used to concrete "
-"problems\n"
-"  which may occur in real life and how they can be solved. The book is "
-"written\n"
-"  in German, an English translation is planned. Format: e-book (Online, "
-"HTML,\n"
-"  PDF, ePub, Mobi), printed book planned.\n"
-msgstr ""
-
-#: ../../english/doc/books.data:146
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment.  It shows the full potential of "
-"the distribution (in its current version 8) and provides a practical manual "
-"for all users who want to learn more about Debian and its range of services."
-msgstr ""
-
-#: ../../english/doc/books.data:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-"  This book teaches you how to build and configure Debian 8.x server system\n"
-"  security hardening using Kali Linux and Debian simultaneously.\n"
-"  DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-"  From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-"  how to enhance Debian's security by applying the method of penetration\n"
-"  testing.\n"
-"  This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-"  MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-"  intrusion detection system."
-msgstr ""
-
 #: ../../english/doc/books.def:38
 msgid "Author:"
 msgstr "المؤلف:"
 
 #: ../../english/doc/books.def:41
 #, fuzzy
-#| msgid "Debian package"
 msgid "Debian Release:"
 msgstr "حزمة دبيان"
 
@@ -214,6 +123,96 @@ msgstr "حزمة دبيان"
 msgid "Debian package (archived)"
 msgstr ""
 
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+"  Debian 9 is the must-have handbook for learning Linux. Start on the\n"
+"  beginners level and learn how to deploy the system with graphical\n"
+"  interface and terminal.\n"
+"  This book provides the basic knowledge to grow and become a 'junior'\n"
+"  systems administrator. Start off with exploring the GNOME desktop\n"
+"  interface and adjust it to your personal needs. Overcome your fear of\n"
+"  using the Linux terminal and learn the most essential commands in\n"
+"  administering Debian. Expand your knowledge of system services (systemd)\n"
+"  and learn how to adapt them. Get more out of the software in Debian and\n"
+"  outside of Debian. Manage your home-network with network-manager, etc.\n"
+"  10 percent of the profits on this book will be donated to the Debian\n"
+"  Project."
+msgstr ""
+
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+msgid ""
+"Written by two Debian developers, this free book\n"
+"  started as a translation of their French best-seller known as Cahier de\n"
+"  l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
+"  teaches the essentials to anyone who wants to become an effective and\n"
+"  independent Debian GNU/Linux administrator.\n"
+"  It covers all the topics that a competent Linux administrator should\n"
+"  master, from the installation and the update of the system, up to the\n"
+"  creation of packages and the compilation of the kernel, but also\n"
+"  monitoring, backup and migration, without forgetting advanced topics\n"
+"  like SELinux setup to secure services, automated installations, or\n"
+"  virtualization with Xen, KVM or LXC."
+msgstr ""
+
+#: ../../english/doc/books.data:83
+msgid ""
+"The aim of this freely available, up-to-date, book is to get you up to\n"
+"  speed with Debian (including both the current stable release and the\n"
+"  current unstable distribution). It is comprehensive with basic support\n"
+"  for the user who installs and maintains the system themselves (whether\n"
+"  in the home, office, club, or school)."
+msgstr ""
+
+#: ../../english/doc/books.data:105
+msgid ""
+"The first French book about Debian is already in its fifth edition. It\n"
+"  covers all aspects of the administration of Debian from the installation\n"
+"  to the configuration of network services.\n"
+"  Written by two Debian developers, this book can be of interest to many\n"
+"  people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
+"  for tips to enhance his mastership of the Debian tools and the\n"
+"  administrator who wants to build a reliable network with Debian."
+msgstr ""
+
+#: ../../english/doc/books.data:125
+msgid ""
+"The book covers topics ranging from concepts of package\n"
+"  management over the available tools and how they're used to concrete "
+"problems\n"
+"  which may occur in real life and how they can be solved. The book is "
+"written\n"
+"  in German, an English translation is planned. Format: e-book (Online, "
+"HTML,\n"
+"  PDF, ePub, Mobi), printed book planned.\n"
+msgstr ""
+
+#: ../../english/doc/books.data:146
+msgid ""
+"This book teaches you how to install and configure the system and also how "
+"to use Debian in a professional environment.  It shows the full potential of "
+"the distribution (in its current version 8) and provides a practical manual "
+"for all users who want to learn more about Debian and its range of services."
+msgstr ""
+
+#: ../../english/doc/books.data:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+"  This book teaches you how to build and configure Debian 8.x server system\n"
+"  security hardening using Kali Linux and Debian simultaneously.\n"
+"  DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+"  From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+"  how to enhance Debian's security by applying the method of penetration\n"
+"  testing.\n"
+"  This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+"  MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+"  intrusion detection system."
+msgstr ""
+
 #: ../../english/releases/arches.data:36
 msgid "HTML"
 msgstr "HTML"
diff --git a/arabic/po/newsevents.ar.po b/arabic/po/newsevents.ar.po
index 1d726033670..9cdb328cef7 100644
--- a/arabic/po/newsevents.ar.po
+++ b/arabic/po/newsevents.ar.po
@@ -14,66 +14,6 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr ""
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr ""
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr ""
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "العنوان:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "المؤلف:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "اللغة:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "التاريخ:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "الحدث:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "الشرائح:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "المصدر"
-
-#: ../../english/events/talks.defs:32
-msgid "PDF"
-msgstr "PDF"
-
-#: ../../english/events/talks.defs:35
-msgid "HTML"
-msgstr "HTML"
-
-#: ../../english/events/talks.defs:38
-msgid "MagicPoint"
-msgstr ""
-
-#: ../../english/events/talks.defs:41
-msgid "Abstract"
-msgstr ""
-
 #: ../../english/template/debian/events_common.wml:8
 msgid "Upcoming Attractions"
 msgstr "الحفلات القادمة"
@@ -132,6 +72,118 @@ msgstr ""
 msgid "<get-var url /> (dead link)"
 msgstr "<get-var url /> (رابط ميت)"
 
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+msgid ""
+"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+"لاستلام هذه الرسال الإخبارية الأسبوعية، <a href=\"https://lists.debian.org/"
+"debian-news/\">سجّل في القائمة البريدية debian-news </a>."
+
+#: ../../english/template/debian/projectnews/footer.wml:10
+#: ../../english/template/debian/weeklynews/footer.wml:10
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "<a href=\"../../\">النشرات السابقة</a> لهذه القائمة البريدية متوفرة."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />أخبار دبيان الأسبوعية يحررها <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">%s</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />حرر هذه النشرة من أخبار دبيان <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\\\"plural\" />حرر هذه النشرة من أخبار دبيان <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+
+#. One translator only
+#. One translator only
+#: ../../english/template/debian/projectnews/footer.wml:35
+#: ../../english/template/debian/weeklynews/footer.wml:35
+msgid "<void id=\"singular\" />It was translated by %s."
+msgstr "<void id=\"singular\" />ترجمها %s."
+
+#. Two ore more translators
+#. Two ore more translators
+#: ../../english/template/debian/projectnews/footer.wml:40
+#: ../../english/template/debian/weeklynews/footer.wml:40
+msgid "<void id=\"plural\" />It was translated by %s."
+msgstr "<void id=\"plural\" />ترجمها %s."
+
+#. One female translator only
+#. One female translator only
+#: ../../english/template/debian/projectnews/footer.wml:45
+#: ../../english/template/debian/weeklynews/footer.wml:45
+msgid "<void id=\"singularfemale\" />It was translated by %s."
+msgstr "<void id=\"singularfemale\" />ترجمتها %s."
+
+#. Two ore more female translators
+#. Two ore more female translators
+#: ../../english/template/debian/projectnews/footer.wml:50
+#: ../../english/template/debian/weeklynews/footer.wml:50
+msgid "<void id=\"pluralfemale\" />It was translated by %s."
+msgstr "<void id=\"pluralfemale\" />ترجمتها %s."
+
+#: ../../english/template/debian/weeklynews/footer.wml:6
+msgid ""
+"To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
+"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:15
+msgid ""
+"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:20
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
+msgid ""
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:30
+msgid ""
+"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+
 #: ../../english/template/debian/projectnews/boilerplates.wml:35
 msgid ""
 "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -313,120 +365,64 @@ msgid ""
 "the following topics:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/footer.wml:6
-#, fuzzy
-#| msgid ""
-#| "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
-#| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#| "list</a>."
-msgid ""
-"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
 msgstr ""
-"لاستلام هذه الرسال الإخبارية الأسبوعية، <a href=\"https://lists.debian.org/"
-"debian-news/\">سجّل في القائمة البريدية debian-news </a>."
 
-#: ../../english/template/debian/projectnews/footer.wml:10
-#: ../../english/template/debian/weeklynews/footer.wml:10
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr "<a href=\"../../\">النشرات السابقة</a> لهذه القائمة البريدية متوفرة."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "العنوان:"
 
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />أخبار دبيان الأسبوعية يحررها <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "المؤلف:"
 
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-msgid ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "اللغة:"
 
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-msgid ""
-"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />حرر هذه النشرة من أخبار دبيان <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "التاريخ:"
 
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-msgid ""
-"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\\\"plural\" />حرر هذه النشرة من أخبار دبيان <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "الحدث:"
 
-#. One translator only
-#. One translator only
-#: ../../english/template/debian/projectnews/footer.wml:35
-#: ../../english/template/debian/weeklynews/footer.wml:35
-msgid "<void id=\"singular\" />It was translated by %s."
-msgstr "<void id=\"singular\" />ترجمها %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "الشرائح:"
 
-#. Two ore more translators
-#. Two ore more translators
-#: ../../english/template/debian/projectnews/footer.wml:40
-#: ../../english/template/debian/weeklynews/footer.wml:40
-msgid "<void id=\"plural\" />It was translated by %s."
-msgstr "<void id=\"plural\" />ترجمها %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "المصدر"
 
-#. One female translator only
-#. One female translator only
-#: ../../english/template/debian/projectnews/footer.wml:45
-#: ../../english/template/debian/weeklynews/footer.wml:45
-msgid "<void id=\"singularfemale\" />It was translated by %s."
-msgstr "<void id=\"singularfemale\" />ترجمتها %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
 
-#. Two ore more female translators
-#. Two ore more female translators
-#: ../../english/template/debian/projectnews/footer.wml:50
-#: ../../english/template/debian/weeklynews/footer.wml:50
-msgid "<void id=\"pluralfemale\" />It was translated by %s."
-msgstr "<void id=\"pluralfemale\" />ترجمتها %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
 
-#: ../../english/template/debian/weeklynews/footer.wml:6
-msgid ""
-"To receive this newsletter weekly in your mailbox, <a href=\"https://lists."
-"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
 msgstr ""
 
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:15
-msgid ""
-"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
 msgstr ""
 
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:20
-msgid ""
-"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
 msgstr ""
 
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:25
-msgid ""
-"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
 msgstr ""
 
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:30
-msgid ""
-"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
 msgstr ""
 
 #~ msgid "Topics:"
diff --git a/arabic/po/organization.ar.po b/arabic/po/organization.ar.po
index 173cc7f5ecc..fb56057d39a 100644
--- a/arabic/po/organization.ar.po
+++ b/arabic/po/organization.ar.po
@@ -51,11 +51,11 @@ msgid "manager"
 msgstr "مدير"
 
 #: ../../english/intro/organization.data:34
-msgid "SRM"
+msgid "Stable Release Manager"
 msgstr ""
 
 #: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
+msgid "SRM"
 msgstr ""
 
 #: ../../english/intro/organization.data:36
@@ -65,7 +65,6 @@ msgstr ""
 #. we only use the chair tag once, for techctte, I wonder why it's here.
 #: ../../english/intro/organization.data:38
 #, fuzzy
-#| msgid "chairman"
 msgid "chair"
 msgstr "رئيس المجلس"
 
@@ -86,29 +85,28 @@ msgid "role"
 msgstr ""
 
 #: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
 msgid "Officers"
 msgstr "أعضاء"
 
 #: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
 msgid "Distribution"
 msgstr "توزيعة"
 
 #: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
 #, fuzzy
-#| msgid "Publicity"
 msgid "Publicity team"
 msgstr "الدعاية والإعلان"
 
@@ -122,136 +120,131 @@ msgstr ""
 msgid "Support and Infrastructure"
 msgstr "دعم فني وبنية تحتية"
 
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
 msgid "Leader"
 msgstr "قائد"
 
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
 msgid "Technical Committee"
 msgstr "اللجنة التقنية"
 
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
 msgid "Secretary"
 msgstr "أمين عام"
 
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
 msgid "Development Projects"
 msgstr "مشاريع التطوير"
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
 msgid "FTP Archives"
 msgstr "أرشيف FTP "
 
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
 msgid "FTP Masters"
 msgstr ""
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
 msgid "FTP Assistants"
 msgstr "مساعد FTP"
 
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
 msgid "Release Management"
 msgstr "إدارة الإصدارات"
 
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
 msgid "Quality Assurance"
 msgstr "ضمان الجودة"
 
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
 msgid "Installation System Team"
 msgstr "فريق نظام التثبيت"
 
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
 msgid "Release Notes"
 msgstr "ملاحظات الإصدارة"
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
 msgid "CD Images"
 msgstr "ملفات قرص مدمج"
 
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
 msgid "Production"
 msgstr "الإنتاج"
 
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
 msgid "Testing"
 msgstr "اختبار"
 
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
 msgid "Documentation"
 msgstr "التوثيق"
 
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
 msgid "Work-Needing and Prospective Packages list"
 msgstr "قائمة الحزم التي هي بحاجة إلى مزيد من العمل والمتوقعة"
 
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
 msgid "Ports"
 msgstr "تحويلات"
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
 msgid "Special Configurations"
 msgstr "إعدادات خاصة"
 
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
 msgid "Laptops"
 msgstr "الحواسب المحمولة"
 
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
 msgid "Firewalls"
 msgstr "الجدران النارية"
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
 msgid "Embedded systems"
 msgstr "الأجهزة المدمجة"
 
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
 msgid "Press Contact"
 msgstr "جهة الإتصال الصحفي"
 
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
 msgid "Web Pages"
 msgstr "صفحات الإنترنت"
 
@@ -277,7 +270,6 @@ msgstr "أحداث"
 
 #: ../../english/intro/organization.data:289
 #, fuzzy
-#| msgid "Technical Committee"
 msgid "DebConf Committee"
 msgstr "اللجنة التقنية"
 
@@ -418,46 +410,35 @@ msgstr "نظام تتبع الحزم"
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
 #, fuzzy
-#| msgid "Alioth administrators"
 msgid "Salsa administrators"
 msgstr "مدراء اولاين"
 
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "ديبيان للأطفال من سنة الى 99 سنوات"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "ديبيان للأطفال من سنة الى 99 سنوات"
 
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "دبيان للأغراض الطبية والبحث الطبي"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "دبيان للأغراض الطبية والبحث الطبي"
 
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "دبيان للتعليم"
+#~ msgid "Debian for education"
+#~ msgstr "دبيان للتعليم"
 
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "دبيان في المكاتب القانونية"
+#~ 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 ""
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "دبيان لدوي الاحتياجات الخاصة"
 
-#: ../../english/intro/organization.data:523
 #, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "دبيان للتعليم"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "دبيان للتعليم"
 
 #~ msgid "Alioth administrators"
 #~ msgstr "مدراء اولاين"
diff --git a/arabic/po/others.ar.po b/arabic/po/others.ar.po
index bbdb1f35808..fa8c3017a70 100644
--- a/arabic/po/others.ar.po
+++ b/arabic/po/others.ar.po
@@ -67,42 +67,6 @@ msgstr "<void id=\"d-i\" />مجهول"
 msgid "Unavailable"
 msgstr "غير متوفر"
 
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "خطوة 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "خطوة 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "خطوة 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "خطوة 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "خطوة 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "خطوة 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "خطوة 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "قائمة متطلبات المتقدمين"
-
 #: ../../english/devel/website/tc.data:11
 msgid ""
 "See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -138,6 +102,34 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "مع &nbsp;``دبيان''"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "بدون &nbsp;``دبيان''"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "Encapsulated PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[يدعمه دبيان]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[يدعمه دبيان غنو/لينكس]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[يدعمه دبيان]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[دبيان] (زر مصغّر)"
+
 #: ../../english/events/merchandise.def:10
 msgid "Products"
 msgstr "المنتجات"
@@ -226,69 +218,6 @@ msgstr ""
 msgid "Money is used to organize local free software events"
 msgstr ""
 
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "مع &nbsp;``دبيان''"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "بدون &nbsp;``دبيان''"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "Encapsulated PostScript"
-
-#: ../../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 ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "هل أنت مطور لدبيان؟"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
 #: ../../english/y2k/l10n.data:6
 msgid "OK"
 msgstr "موافق"
@@ -333,6 +262,77 @@ msgstr "الإصدار"
 msgid "URL"
 msgstr "المسار"
 
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "خطوة 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "خطوة 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "خطوة 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "خطوة 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "خطوة 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "خطوة 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "خطوة 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+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 ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "هل أنت مطور لدبيان؟"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
 #~ msgid "Where:"
 #~ msgstr "أين:"
 
diff --git a/arabic/po/partners.ar.po b/arabic/po/partners.ar.po
index db8c9e99938..644cd23a422 100644
--- a/arabic/po/partners.ar.po
+++ b/arabic/po/partners.ar.po
@@ -78,7 +78,7 @@ msgid ""
 "consulting and services company and since 1999 been offering comprehensive "
 "services and technical support for the implementation and operation of open "
 "source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
 msgstr ""
 
 #: ../../english/partners/partners.def:67
diff --git a/arabic/po/ports.ar.po b/arabic/po/ports.ar.po
index b6505ea9908..e9c29341462 100644
--- a/arabic/po/ports.ar.po
+++ b/arabic/po/ports.ar.po
@@ -18,22 +18,6 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "دبيان لأنظمة Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "دبيان لأنظمة PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "أقراص Hurd مدمجة"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "دبيان لأنظمة IA-64"
-
 #: ../../english/ports/menu.defs:11
 msgid "Contact"
 msgstr "المراسلة"
@@ -98,6 +82,22 @@ msgstr "تزويد"
 msgid "Systems"
 msgstr "أنظمة"
 
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "دبيان لأنظمة Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "دبيان لأنظمة PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "أقراص Hurd مدمجة"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "دبيان لأنظمة IA-64"
+
 #: ../../english/ports/netbsd/menu.inc:6
 msgid "Debian GNU/NetBSD for i386"
 msgstr "دبيان غنو/NetBSD لأنظمة i386"
diff --git a/arabic/po/security.ar.po b/arabic/po/security.ar.po
index 622beb61f5b..0f0df46cf98 100644
--- a/arabic/po/security.ar.po
+++ b/arabic/po/security.ar.po
@@ -17,40 +17,6 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "أمن دبيان"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "تنبيهات دبيان الأمنية"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "س"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "قاموس Mitre CVE"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "قاعدة بيانات Securityfocus Bugtraq"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "بيانات CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "ملاحظات نقاط ضعف US-CERT"
-
 #: ../../english/template/debian/security.wml:11
 msgid "Source:"
 msgstr "المصدر:"
@@ -132,3 +98,37 @@ msgstr "نقاط ضعف CERT، إنذارات وملاحظات الحوادث:"
 #: ../../english/template/debian/securityreferences.wml:88
 msgid "No other external database security references currently available."
 msgstr "لا توجد مراجع أمن قواعد بيانات خارجيّة متوفّرة حاليًا."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "س"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "أمن دبيان"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "تنبيهات دبيان الأمنية"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "قاموس Mitre CVE"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "قاعدة بيانات Securityfocus Bugtraq"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "بيانات CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "ملاحظات نقاط ضعف US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/arabic/po/stats.ar.po b/arabic/po/stats.ar.po
index cc3d5acdcf3..3531fca5a17 100644
--- a/arabic/po/stats.ar.po
+++ b/arabic/po/stats.ar.po
@@ -12,22 +12,6 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr ""
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr ""
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr ""
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr ""
-
 #: ../../stattrans.pl:278 ../../stattrans.pl:494
 msgid "Wrong translation version"
 msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
 msgstr ""
 
 #: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
 msgstr ""
 
 #: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
 msgstr ""
 
 #: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
 msgid "Translation summary for"
 msgstr ""
 
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
 #: ../../stattrans.pl:607
 msgid "Translated"
 msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
 msgid "Up to date"
 msgstr ""
 
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
 #: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
 #: ../../stattrans.pl:611
 msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
 #: ../../stattrans.pl:790
 msgid "Translation Statistics by Page Size"
 msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr ""
diff --git a/arabic/po/templates.ar.po b/arabic/po/templates.ar.po
index 14366a3bfe7..f7c7855b4ee 100644
--- a/arabic/po/templates.ar.po
+++ b/arabic/po/templates.ar.po
@@ -18,14 +18,6 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "موقع دبيان"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "البحث في موقع دبيان."
-
 #: ../../english/template/debian/basic.wml:19
 #: ../../english/template/debian/navbar.wml:11
 msgid "Debian"
@@ -165,7 +157,6 @@ msgstr "مدونة دبيان"
 
 #: ../../english/template/debian/common_translation.wml:94
 #, fuzzy
-#| msgid "Last Modified"
 msgid "Last Updated"
 msgstr "آخر تعديل"
 
@@ -264,6 +255,14 @@ msgstr "هذه الصفحة متوفرة أيضا باللغات التالية
 msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
 msgstr "كيفية تعيين <a href=m4_HOME/intro/cn>لغة المستند المبدئية</a>"
 
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
 #: ../../english/template/debian/links.tags.wml:4
 msgid "Debian International"
 msgstr "دبيان الدولية"
@@ -538,5 +537,13 @@ msgstr "مسار"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "العودة إلى <a href=\"./\">صفحة من يستخدم دبيان ؟</a>."
 
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "موقع دبيان"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "البحث في موقع دبيان."
+
 #~ msgid "Visit the site sponsor"
 #~ msgstr "زيارة راعي الموقع"
diff --git a/arabic/po/vote.ar.po b/arabic/po/vote.ar.po
index f0c9f8b5075..d15d24a376c 100644
--- a/arabic/po/vote.ar.po
+++ b/arabic/po/vote.ar.po
@@ -36,7 +36,6 @@ msgstr "الترشيحات"
 
 #: ../../english/template/debian/votebar.wml:25
 #, fuzzy
-#| msgid "Withdrawn"
 msgid "Withdrawals"
 msgstr "مسحوب"
 
@@ -77,207 +76,234 @@ msgid "Proposal F Proposer"
 msgstr "مقترح الإقتراح F"
 
 #: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "مقترح الإقتراح A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "مقترح الإقتراح A"
+
+#: ../../english/template/debian/votebar.wml:61
 msgid "Seconds"
 msgstr "الثواني"
 
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
 msgid "Proposal A Seconds"
 msgstr "ثواني الإقتراح A"
 
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
 msgid "Proposal B Seconds"
 msgstr "ثواني الإقتراح B"
 
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
 msgid "Proposal C Seconds"
 msgstr "ثواني الإقتراح C"
 
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
 msgid "Proposal D Seconds"
 msgstr "ثواني الإقتراح D"
 
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
 msgid "Proposal E Seconds"
 msgstr "ثواني الإقتراح E"
 
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
 msgid "Proposal F Seconds"
 msgstr "ثواني الإقتراح F"
 
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "ثواني الإقتراح A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "ثواني الإقتراح A"
+
+#: ../../english/template/debian/votebar.wml:88
 msgid "Opposition"
 msgstr "المعارضة"
 
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
 msgid "Text"
 msgstr "نص"
 
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
 msgid "Proposal A"
 msgstr "الاقتراح A"
 
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
 msgid "Proposal B"
 msgstr "الاقتراح B"
 
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
 msgid "Proposal C"
 msgstr "الاقتراح C"
 
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
 msgid "Proposal D"
 msgstr "الاقتراح D"
 
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
 msgid "Proposal E"
 msgstr "الاقتراح E"
 
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
 msgid "Proposal F"
 msgstr "الاقتراح F"
 
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "الاقتراح A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "الاقتراح A"
+
+#: ../../english/template/debian/votebar.wml:118
 msgid "Choices"
 msgstr "خيارات"
 
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
 msgid "Amendment Proposer"
 msgstr "مُقترح التعديل"
 
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
 msgid "Amendment Seconds"
 msgstr "ثواني التعديل"
 
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
 msgid "Amendment Text"
 msgstr "نصّ التعديل"
 
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
 msgid "Amendment Proposer A"
 msgstr "مُقترح التعديل أ"
 
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
 msgid "Amendment Seconds A"
 msgstr "التعديلات أ"
 
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
 msgid "Amendment Text A"
 msgstr "نصّ التعديل أ"
 
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
 msgid "Amendment Proposer B"
 msgstr "مُقترح التعديل ب"
 
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
 msgid "Amendment Seconds B"
 msgstr "التعديلات ب"
 
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
 msgid "Amendment Text B"
 msgstr "نصّ التعديل ب"
 
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
 #, fuzzy
-#| msgid "Amendment Proposer A"
 msgid "Amendment Proposer C"
 msgstr "مُقترح التعديل أ"
 
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
 #, fuzzy
-#| msgid "Amendment Seconds A"
 msgid "Amendment Seconds C"
 msgstr "التعديلات أ"
 
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
 #, fuzzy
-#| msgid "Amendment Text A"
 msgid "Amendment Text C"
 msgstr "نصّ التعديل أ"
 
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
 msgid "Amendments"
 msgstr "التعديلات"
 
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
 msgid "Proceedings"
 msgstr "الإجراءات"
 
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
 msgid "Majority Requirement"
 msgstr "مطلب جماعي"
 
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
 msgid "Data and Statistics"
 msgstr "بيانات وإحصائيات"
 
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
 msgid "Quorum"
 msgstr "النِصاب"
 
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
 msgid "Minimum Discussion"
 msgstr "الحدّ الأدنى للمناقشة"
 
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
 msgid "Ballot"
 msgstr "الاقتراع"
 
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
 msgid "Forum"
 msgstr "المنتدى"
 
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
 msgid "Outcome"
 msgstr "الناتج"
 
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
 msgid "Waiting&nbsp;for&nbsp;Sponsors"
 msgstr "انتظار&nbsp;الرّعاة"
 
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
 msgid "In&nbsp;Discussion"
 msgstr "قيد&nbsp;المناقشة"
 
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
 msgid "Voting&nbsp;Open"
 msgstr "التصويت&nbsp;مفتوح"
 
-#: ../../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 "صفحة&nbsp;التصويت&nbsp;الرئيسيّة"
 
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
 msgid "How&nbsp;To"
 msgstr "طريقة&nbsp;عمل"
 
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr "إرسال&nbsp;اقتراح"
 
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr "إصلاح&nbsp;اقتراح"
 
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr "متابعة&nbsp;اقتراح"
 
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr "قراءة&nbsp;نتيجة"
 
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
 msgid "Vote"
 msgstr "تصويت"