Update PO templates for Persian

CVS version numbers

persian/po/blends.fa.po: INITIAL -> 1.1 
persian/po/bugs.fa.po: 1.7 -> 1.8 
persian/po/cdimage.fa.po: 1.7 -> 1.8 
persian/po/countries.fa.po: 1.7 -> 1.8 
persian/po/distrib.fa.po: 1.7 -> 1.8 
persian/po/doc.fa.po: 1.6 -> 1.7 
persian/po/langs.fa.po: 1.4 -> 1.5 
persian/po/legal.fa.po: 1.4 -> 1.5 
persian/po/mailinglists.fa.po: 1.4 -> 1.5 
persian/po/organization.fa.po: 1.5 -> 1.6 
persian/po/others.fa.po: 1.11 -> 1.12 
persian/po/ports.fa.po: 1.5 -> 1.6 
persian/po/security.fa.po: 1.4 -> 1.5 
persian/po/stats.fa.po: 1.2 -> 1.3 
persian/po/templates.fa.po: 1.17 -> 1.18 
persian/po/vendors.fa.po: 1.6 -> 1.7

16 files changed, 681 insertions, 535 deletions

diff --git a/persian/po/blends.fa.po b/persian/po/blends.fa.po
new file mode 100644
index 00000000000..4ca17d293f6
--- /dev/null
+++ b/persian/po/blends.fa.po
@@ -0,0 +1,125 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../english/blends/blend.defs:15
+msgid "Metapackages"
+msgstr ""
+
+#: ../../english/blends/blend.defs:18
+msgid "Downloads"
+msgstr ""
+
+#: ../../english/blends/blend.defs:21
+msgid "Derivatives"
+msgstr ""
+
+#: ../../english/blends/released.data:15
+msgid ""
+"The goal of DebiChem is to make Debian a good platform for chemists in their "
+"day-to-day work."
+msgstr ""
+
+#: ../../english/blends/released.data:22
+msgid "Debian Games"
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
+"The goal of Debian Games is to provide games in Debian from arcade and "
+"aventure to simulation and strategy."
+msgstr ""
+
+#: ../../english/blends/released.data:31
+msgid ""
+"The goal of Debian Edu is to provide a Debian OS system suitable for "
+"educational use and in schools."
+msgstr ""
+
+#: ../../english/blends/released.data:39
+msgid ""
+"The goal of Debian GIS is to develop Debian into the best distribution for "
+"Geographical Information System applications and users."
+msgstr ""
+
+#: ../../english/blends/released.data:49
+msgid ""
+"The goal of Debian Junior is to make Debian an OS that children will enjoy "
+"using."
+msgstr ""
+
+#: ../../english/blends/released.data:57
+msgid ""
+"The goal of Debian Med is a complete free and open system for all tasks in "
+"medical care and research. To achieve this goal Debian Med integrates "
+"related free and open source software for medical imaging, bioinformatics, "
+"clinic IT infrastructure, and others within the Debian OS."
+msgstr ""
+
+#: ../../english/blends/released.data:65
+msgid ""
+"The goal of Debian Multimedia is to make Debian a good platform for audio "
+"and multimedia work."
+msgstr ""
+
+#: ../../english/blends/released.data:73
+msgid ""
+"The goal of Debian Science is to provide a better experience when using "
+"Debian to researchers and scientists."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:14
+msgid "Debian Accessibility"
+msgstr ""
+
+#: ../../english/blends/unreleased.data:15
+msgid ""
+"The goal of Debian Accessibility is to develop Debian into an operating "
+"system that is particularly well suited for the requirements of people with "
+"disabilities."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:23
+msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:31
+msgid ""
+"The goal of Debian Design is to provide applications for designers. This "
+"includes graphic design, web design and multimedia design."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:38
+msgid ""
+"The goal of Debian EzGo is to provide culture-based open and free technology "
+"with native language support and appropriate user friendly, lightweight and "
+"fast desktop environment for low powerful/cost hardwares to empower human "
+"capacity building and technology development  in many areas and regions, "
+"like Africa, Afghanistan, Indonesia, Vietnam  using Debian."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:46
+msgid ""
+"The goal of FreedomBox is to develop, design and promote personal servers "
+"running free software for private, personal communications. Applications "
+"include blogs, wikis, websites, social networks, email, web proxy and a Tor "
+"relay on a device that can replace a wireless router so that data stays with "
+"the users."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:54
+msgid ""
+"The goal of Debian Hamradio is to support the needs of radio amateurs in "
+"Debian by providing logging, data mode and packet mode applications and more."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:63
+msgid ""
+"The goal of DebianParl is to provide applications to support the needs of "
+"parliamentarians, politicians and their staffers all around the world."
+msgstr ""
diff --git a/persian/po/bugs.fa.po b/persian/po/bugs.fa.po
index d1cc0b81b3e..6ec60efd843 100644
--- a/persian/po/bugs.fa.po
+++ b/persian/po/bugs.fa.po
@@ -160,152 +160,152 @@ msgstr "بایگانی شده"
 msgid "Archived and Unarchived"
 msgstr "بایگانی شده و بایگانی نشده"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "کنارگذاری برچسب:"
-
-#~ msgid "Include tag:"
-#~ msgstr "شامل برچسب:"
+#~ msgid "Flags:"
+#~ msgstr "پرچم‌ها"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "اشکالات حل نشده"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "اشکالات ادغام شده را فقط یک بار نمایش بده"
 
-#~ msgid "wontfix"
-#~ msgstr "حل نخواهد شد"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ترتیب بدون توجه به وضعیت یا درجه شدت"
 
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "عدم نمایش فهرست محتویات در سرایند"
 
-#~ msgid "unreproducible"
-#~ msgstr "غیر قابل تولید مجدد"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "عدم نمایش آمارها در زیرنویس‌ها"
 
-#~ msgid "security"
-#~ msgstr "امنیت"
+#~ msgid "proposed-updates"
+#~ msgstr "به روز رسانی‌های پیشنهادی"
 
-#~ msgid "patch"
-#~ msgstr "وصله"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "به روز رسانی‌های پیشنهادی آزمایشی"
 
-#~ msgid "moreinfo"
-#~ msgstr "اطلاعات بیشتر"
+#~ msgid "Package version:"
+#~ msgstr "نسخه بسته:"
 
-#~ msgid "l10n"
-#~ msgstr "محلی‌سازی"
+#~ msgid "Distribution:"
+#~ msgstr "توزیع:"
 
-#~ msgid "help"
-#~ msgstr "کمک"
+#~ msgid "bugs"
+#~ msgstr "اشکالات"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream"
+#~ msgid "open"
+#~ msgstr "باز"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "حل شده در تجربی"
+#~ msgid "forwarded"
+#~ msgstr "فرستاده شده"
 
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "در جریان"
 
-#~ msgid "confirmed"
-#~ msgstr "تايید شده"
+#~ msgid "fixed"
+#~ msgstr "حل شده"
 
-#~ msgid "sid"
-#~ msgstr "سید"
+#~ msgid "done"
+#~ msgstr "انجام شده"
 
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "Include status:"
+#~ msgstr "شامل وضعیت:"
 
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "کنارگذاری وضعیت:"
 
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "بحرانی"
 
-#~ msgid "etch"
-#~ msgstr "اچ"
+#~ msgid "grave"
+#~ msgstr "خطرناک"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "جدی"
 
-#~ msgid "woody"
-#~ msgstr "وودی"
+#~ msgid "important"
+#~ msgstr "مهم"
 
-#~ msgid "potato"
-#~ msgstr "پوتاتو"
+#~ msgid "minor"
+#~ msgstr "جزئی"
 
-#~ msgid "Exclude severity:"
-#~ msgstr "کنارگذاری درجه شدت:"
+#~ msgid "wishlist"
+#~ msgstr "فهرست خواسته‌ها"
 
 #~ msgid "Include severity:"
 #~ msgstr "شامل درجه شدت:"
 
-#~ msgid "wishlist"
-#~ msgstr "فهرست خواسته‌ها"
+#~ msgid "Exclude severity:"
+#~ msgstr "کنارگذاری درجه شدت:"
 
-#~ msgid "minor"
-#~ msgstr "جزئی"
+#~ msgid "potato"
+#~ msgstr "پوتاتو"
 
-#~ msgid "important"
-#~ msgstr "مهم"
+#~ msgid "woody"
+#~ msgstr "وودی"
 
-#~ msgid "serious"
-#~ msgstr "جدی"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "grave"
-#~ msgstr "خطرناک"
+#~ msgid "etch"
+#~ msgstr "اچ"
 
-#~ msgid "critical"
-#~ msgstr "بحرانی"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
 
-#~ msgid "Exclude status:"
-#~ msgstr "کنارگذاری وضعیت:"
+#~ msgid "lenny"
+#~ msgstr "lenny"
 
-#~ msgid "Include status:"
-#~ msgstr "شامل وضعیت:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
 
-#~ msgid "done"
-#~ msgstr "انجام شده"
+#~ msgid "sid"
+#~ msgstr "سید"
 
-#~ msgid "fixed"
-#~ msgstr "حل شده"
+#~ msgid "confirmed"
+#~ msgstr "تايید شده"
 
-#~ msgid "pending"
-#~ msgstr "در جریان"
+#~ msgid "d-i"
+#~ msgstr "d-i"
 
-#~ msgid "forwarded"
-#~ msgstr "فرستاده شده"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "حل شده در تجربی"
 
-#~ msgid "open"
-#~ msgstr "باز"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream"
 
-#~ msgid "bugs"
-#~ msgstr "اشکالات"
+#~ msgid "help"
+#~ msgstr "کمک"
 
-#~ msgid "Distribution:"
-#~ msgstr "توزیع:"
+#~ msgid "l10n"
+#~ msgstr "محلی‌سازی"
 
-#~ msgid "Package version:"
-#~ msgstr "نسخه بسته:"
+#~ msgid "moreinfo"
+#~ msgstr "اطلاعات بیشتر"
 
-#~ msgid "testing-proposed-updates"
-#~ msgstr "به روز رسانی‌های پیشنهادی آزمایشی"
+#~ msgid "patch"
+#~ msgstr "وصله"
 
-#~ msgid "proposed-updates"
-#~ msgstr "به روز رسانی‌های پیشنهادی"
+#~ msgid "security"
+#~ msgstr "امنیت"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "عدم نمایش آمارها در زیرنویس‌ها"
+#~ msgid "unreproducible"
+#~ msgstr "غیر قابل تولید مجدد"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "عدم نمایش فهرست محتویات در سرایند"
+#~ msgid "upstream"
+#~ msgstr "upstream"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ترتیب بدون توجه به وضعیت یا درجه شدت"
+#~ msgid "wontfix"
+#~ msgstr "حل نخواهد شد"
 
-#~ msgid "display merged bugs only once"
-#~ msgstr "اشکالات ادغام شده را فقط یک بار نمایش بده"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "active bugs"
-#~ msgstr "اشکالات حل نشده"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "Flags:"
-#~ msgstr "پرچم‌ها"
+#~ msgid "Include tag:"
+#~ msgstr "شامل برچسب:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "کنارگذاری برچسب:"
diff --git a/persian/po/cdimage.fa.po b/persian/po/cdimage.fa.po
index 167206f0117..4141fa4fc75 100644
--- a/persian/po/cdimage.fa.po
+++ b/persian/po/cdimage.fa.po
@@ -7,7 +7,7 @@ msgstr ""
 "Language-Team: Debian-l1-n-persian <debian-l1-n-persian@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Persian\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
diff --git a/persian/po/countries.fa.po b/persian/po/countries.fa.po
index 4eb22e057a8..d151de8f728 100644
--- a/persian/po/countries.fa.po
+++ b/persian/po/countries.fa.po
@@ -337,96 +337,100 @@ msgid "Portugal"
 msgstr "پرتغال"
 
 #: ../../english/template/debian/countries.wml:351
+msgid "Réunion"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:354
 msgid "Romania"
 msgstr "رومانی"
 
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
 msgid "Serbia"
 msgstr "صربستان"
 
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
 msgid "Russia"
 msgstr "روسیه"
 
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
 msgid "Saudi Arabia"
 msgstr "عربستان سعودی"
 
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
 msgid "Sweden"
 msgstr "سوئد"
 
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
 msgid "Singapore"
 msgstr "سنگاپور"
 
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovenia"
 msgstr "اسلوونی"
 
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
 msgid "Slovakia"
 msgstr "اسلواکی"
 
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
 msgid "El Salvador"
 msgstr "السالوادور"
 
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
 msgid "Thailand"
 msgstr "تایلند"
 
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Tajikistan"
 msgstr "پاکستان"
 
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
 msgid "Tunisia"
 msgstr "تونس"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Turkey"
 msgstr "ترکیه"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Taiwan"
 msgstr "تایوان"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Ukraine"
 msgstr "اکراین"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 msgid "United States"
 msgstr "ایالات متحده"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "Uruguay"
 msgstr "اروگوئه"
 
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
 msgid "Uzbekistan"
 msgstr "ازبکستان"
 
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
 msgid "Venezuela"
 msgstr "ونزوئلا"
 
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
 msgid "Vietnam"
 msgstr "ویتنام"
 
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
 msgid "Vanuatu"
 msgstr "وانواتو"
 
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
 msgid "South Africa"
 msgstr "آفریقای جنوبی"
 
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
 msgid "Zimbabwe"
 msgstr "زیمبابوه"
 
diff --git a/persian/po/distrib.fa.po b/persian/po/distrib.fa.po
index 7253bf9f267..b1c5e016841 100644
--- a/persian/po/distrib.fa.po
+++ b/persian/po/distrib.fa.po
@@ -19,59 +19,49 @@ msgstr ""
 msgid "Keyword"
 msgstr "کلیدواژه"
 
-#: ../../english/distrib/search_contents-form.inc:11
-#: ../../english/distrib/search_packages-form.inc:10
-msgid "Search"
-msgstr "جستجو"
-
-#: ../../english/distrib/search_contents-form.inc:12
-#: ../../english/distrib/search_packages-form.inc:10
-msgid "Reset"
-msgstr "بازنشانی"
-
-#: ../../english/distrib/search_contents-form.inc:14
+#: ../../english/distrib/search_contents-form.inc:13
 msgid "Display"
 msgstr "نمایش"
 
-#: ../../english/distrib/search_contents-form.inc:17
+#: ../../english/distrib/search_contents-form.inc:16
 msgid "paths ending with the keyword"
 msgstr "مسیر های منتهی به کلیدواژه"
 
-#: ../../english/distrib/search_contents-form.inc:20
+#: ../../english/distrib/search_contents-form.inc:19
 msgid "packages that contain files named like this"
 msgstr "بسته‌هایی که شامل پرونده‌هایی با این نام باشند"
 
-#: ../../english/distrib/search_contents-form.inc:23
+#: ../../english/distrib/search_contents-form.inc:22
 msgid "packages that contain files whose names contain the keyword"
 msgstr "بسته‌هایی که فایل های داخل آن شامل این کلیدواژه باشد"
 
 #: ../../english/distrib/search_contents-form.inc:25
-#: ../../english/distrib/search_packages-form.inc:23
+#: ../../english/distrib/search_packages-form.inc:25
 msgid "Distribution"
 msgstr "توزیع"
 
 #: ../../english/distrib/search_contents-form.inc:27
-#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_packages-form.inc:27
 msgid "experimental"
 msgstr "تجربی"
 
 #: ../../english/distrib/search_contents-form.inc:28
-#: ../../english/distrib/search_packages-form.inc:26
+#: ../../english/distrib/search_packages-form.inc:28
 msgid "unstable"
 msgstr "ناپایدار"
 
 #: ../../english/distrib/search_contents-form.inc:29
-#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_packages-form.inc:29
 msgid "testing"
 msgstr "آزمایشی"
 
 #: ../../english/distrib/search_contents-form.inc:30
-#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_packages-form.inc:30
 msgid "stable"
 msgstr "پایدار"
 
 #: ../../english/distrib/search_contents-form.inc:31
-#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_packages-form.inc:31
 msgid "oldstable"
 msgstr "پایدار قدیمی"
 
@@ -80,11 +70,21 @@ msgid "Architecture"
 msgstr "معماری"
 
 #: ../../english/distrib/search_contents-form.inc:38
-#: ../../english/distrib/search_packages-form.inc:30
-#: ../../english/distrib/search_packages-form.inc:37
+#: ../../english/distrib/search_packages-form.inc:32
+#: ../../english/distrib/search_packages-form.inc:39
 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 "جستجو در"
@@ -101,23 +101,23 @@ msgstr "توضیحات"
 msgid "Source package names"
 msgstr "نام بسته‌های کد منبع"
 
-#: ../../english/distrib/search_packages-form.inc:20
+#: ../../english/distrib/search_packages-form.inc:21
 msgid "Only show exact matches"
 msgstr "تنها موارد کاملا منطبق را نشان بده"
 
-#: ../../english/distrib/search_packages-form.inc:32
+#: ../../english/distrib/search_packages-form.inc:34
 msgid "Section"
 msgstr "بخش"
 
-#: ../../english/distrib/search_packages-form.inc:34
+#: ../../english/distrib/search_packages-form.inc:36
 msgid "main"
 msgstr "اصلی"
 
-#: ../../english/distrib/search_packages-form.inc:35
+#: ../../english/distrib/search_packages-form.inc:37
 msgid "contrib"
 msgstr "وابسته"
 
-#: ../../english/distrib/search_packages-form.inc:36
+#: ../../english/distrib/search_packages-form.inc:38
 msgid "non-free"
 msgstr "غیر آزاد"
 
@@ -140,11 +140,15 @@ msgid "64-bit ARM (AArch64)"
 msgstr "64-bit PC (amd64)"
 
 #: ../../english/releases/arches.data:12
-msgid "EABI ARM"
+#, fuzzy
+#| msgid "EABI ARM"
+msgid "EABI ARM (armel)"
 msgstr "EABI ARM"
 
 #: ../../english/releases/arches.data:13
-msgid "Hard Float ABI ARM"
+#, fuzzy
+#| msgid "Hard Float ABI ARM"
+msgid "Hard Float ABI ARM (armhf)"
 msgstr "Hard Float ABI ARM"
 
 #: ../../english/releases/arches.data:14
@@ -180,52 +184,58 @@ msgid "MIPS (big endian)"
 msgstr "MIPS (big endian)"
 
 #: ../../english/releases/arches.data:22
-msgid "MIPS (little endian)"
+#, fuzzy
+#| msgid "MIPS (little endian)"
+msgid "64-bit MIPS (little endian)"
 msgstr "MIPS (little endian)"
 
 #: ../../english/releases/arches.data:23
+msgid "MIPS (little endian)"
+msgstr "MIPS (little endian)"
+
+#: ../../english/releases/arches.data:24
 msgid "PowerPC"
 msgstr "پاورپی‌سی"
 
-#: ../../english/releases/arches.data:24
+#: ../../english/releases/arches.data:25
 msgid "POWER Processors"
 msgstr ""
 
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:26
 msgid "IBM S/390"
 msgstr "آی‌بی‌ام S/390"
 
-#: ../../english/releases/arches.data:26
+#: ../../english/releases/arches.data:27
 msgid "IBM System z"
 msgstr "IBM System z"
 
-#: ../../english/releases/arches.data:27
+#: ../../english/releases/arches.data:28
 msgid "SPARC"
 msgstr "اسپارک"
 
-#~ msgid "Hurd (i386)"
-#~ msgstr "هرد (i386)"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "بسته‌هایی که شامل پرونده‌ها یا شاخه‌هایی با این نام باشند"
 
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "all files in this package"
+#~ msgstr "تمام پرونده‌های موجود در این بسته"
 
-#~ msgid "Search case sensitive"
-#~ msgstr "جستجو در حالت حساس به حروف کوچک و بزرگ"
+#~ msgid "Case sensitive"
+#~ msgstr "حساس به حروف کوچک و بزرگ"
 
-#~ msgid "Allow searching on subwords"
-#~ msgstr "جستجو در زیرواژه‌ها"
+#~ msgid "no"
+#~ msgstr "نه"
 
 #~ msgid "yes"
 #~ msgstr "بله"
 
-#~ msgid "no"
-#~ msgstr "نه"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "جستجو در زیرواژه‌ها"
 
-#~ msgid "Case sensitive"
-#~ msgstr "حساس به حروف کوچک و بزرگ"
+#~ msgid "Search case sensitive"
+#~ msgstr "جستجو در حالت حساس به حروف کوچک و بزرگ"
 
-#~ msgid "all files in this package"
-#~ msgstr "تمام پرونده‌های موجود در این بسته"
+#~ msgid "non-US"
+#~ msgstr "non-US"
 
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "بسته‌هایی که شامل پرونده‌ها یا شاخه‌هایی با این نام باشند"
+#~ msgid "Hurd (i386)"
+#~ msgstr "هرد (i386)"
diff --git a/persian/po/doc.fa.po b/persian/po/doc.fa.po
index 7c8131567ce..780f2c2ed2f 100644
--- a/persian/po/doc.fa.po
+++ b/persian/po/doc.fa.po
@@ -7,7 +7,7 @@ msgstr ""
 "Language-Team: Debian-l10n-persian <Debian-l10n-persian@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Persian\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
@@ -370,7 +370,7 @@ msgstr "آخرین نسخه:"
 msgid "(version <get-var version />)"
 msgstr "(نسخه‌ی <get-var version />)"
 
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:37
 msgid "plain text"
 msgstr "متن خالص"
 
@@ -430,20 +430,20 @@ msgstr "بسته‌ی دبیان"
 msgid "Debian package (archived)"
 msgstr "بسته‌ٔ دبیان (بایگانی شده)"
 
-#: ../../english/releases/arches.data:34
+#: ../../english/releases/arches.data:35
 msgid "HTML"
 msgstr "HTML"
 
-#: ../../english/releases/arches.data:35
+#: ../../english/releases/arches.data:36
 msgid "PDF"
 msgstr "PDF"
 
-#~ msgid "Language:"
-#~ msgstr "زبان:"
-
 #~ msgid ""
 #~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
 #~ "ddp_pkg_loc />."
 #~ msgstr ""
 #~ "از <a href=\"cvs\">SVN</a>  برای دریافت منبع SGML متن برای <get-var "
 #~ "ddp_pkg_loc /> استفاده کنید."
+
+#~ msgid "Language:"
+#~ msgstr "زبان:"
diff --git a/persian/po/langs.fa.po b/persian/po/langs.fa.po
index a9a4ed456e4..89b5391b25d 100644
--- a/persian/po/langs.fa.po
+++ b/persian/po/langs.fa.po
@@ -7,7 +7,7 @@ msgstr ""
 "Language-Team: Debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Persian\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
diff --git a/persian/po/legal.fa.po b/persian/po/legal.fa.po
index 951db6bcefd..58bac145fe9 100644
--- a/persian/po/legal.fa.po
+++ b/persian/po/legal.fa.po
@@ -7,7 +7,7 @@ msgstr ""
 "Language-Team: debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Persian\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
diff --git a/persian/po/mailinglists.fa.po b/persian/po/mailinglists.fa.po
index b6ee7706a9b..4044e9f9595 100644
--- a/persian/po/mailinglists.fa.po
+++ b/persian/po/mailinglists.fa.po
@@ -128,9 +128,9 @@ msgstr "باز"
 msgid "closed"
 msgstr "بسته"
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
-
 #~ msgid "Please select which lists you want to unsubscribe from:"
 #~ msgstr ""
 #~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
diff --git a/persian/po/organization.fa.po b/persian/po/organization.fa.po
index b9d3a3fde19..a2cd64435fe 100644
--- a/persian/po/organization.fa.po
+++ b/persian/po/organization.fa.po
@@ -7,381 +7,385 @@ msgstr ""
 "Language-Team: debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Persian\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../english/intro/organization.data:13
+#: ../../english/intro/organization.data:15
 msgid "delegation mail"
 msgstr ""
 
-#: ../../english/intro/organization.data:14
+#: ../../english/intro/organization.data:16
 msgid "appointment mail"
 msgstr ""
 
 #. One male delegate
-#: ../../english/intro/organization.data:16
+#: ../../english/intro/organization.data:18
 msgid "<void id=\"male\"/>delegate"
 msgstr ""
 
 #. One female delegate
-#: ../../english/intro/organization.data:18
+#: ../../english/intro/organization.data:20
 msgid "<void id=\"female\"/>delegate"
 msgstr ""
 
-#: ../../english/intro/organization.data:21
 #: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:25
 msgid "current"
 msgstr ""
 
-#: ../../english/intro/organization.data:25
 #: ../../english/intro/organization.data:27
+#: ../../english/intro/organization.data:29
 msgid "member"
 msgstr "اعضاء"
 
-#: ../../english/intro/organization.data:30
+#: ../../english/intro/organization.data:32
 msgid "manager"
 msgstr "مدیر"
 
-#: ../../english/intro/organization.data:32
+#: ../../english/intro/organization.data:34
 msgid "SRM"
 msgstr "SRM"
 
-#: ../../english/intro/organization.data:32
+#: ../../english/intro/organization.data:34
 msgid "Stable Release Manager"
 msgstr "مدیر انتشار نسخه پایدار"
 
-#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:36
 msgid "wizard"
 msgstr "wizard"
 
-#: ../../english/intro/organization.data:37
+#: ../../english/intro/organization.data:39
 msgid "chairman"
 msgstr ""
 
-#: ../../english/intro/organization.data:40
+#: ../../english/intro/organization.data:42
 msgid "assistant"
 msgstr "دستیار"
 
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:44
 msgid "secretary"
 msgstr "منشی"
 
-#: ../../english/intro/organization.data:51
-#: ../../english/intro/organization.data:60
+#: ../../english/intro/organization.data:53
+#: ../../english/intro/organization.data:62
 msgid "Officers"
 msgstr ""
 
-#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:54
+#: ../../english/intro/organization.data:79
 msgid "Distribution"
 msgstr ""
 
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:55
+#: ../../english/intro/organization.data:223
 msgid "Publicity"
 msgstr ""
 
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:243
+#: ../../english/intro/organization.data:56
+#: ../../english/intro/organization.data:245
 msgid "Support and Infrastructure"
 msgstr ""
 
 #. formerly Custom Debian Distributions (CCDs); see https://blends.alioth.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:56
+#: ../../english/intro/organization.data:58
 msgid "Debian Pure Blends"
 msgstr ""
 
-#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:65
 msgid "Leader"
 msgstr "رهبر"
 
-#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:67
 msgid "Technical Committee"
 msgstr "شورای فنی"
 
-#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:74
 msgid "Secretary"
 msgstr "منشی"
 
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:82
 msgid "Development Projects"
 msgstr "پروژه توسعه"
 
-#: ../../english/intro/organization.data:81
+#: ../../english/intro/organization.data:83
 msgid "FTP Archives"
 msgstr "بایگانی FTP"
 
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:85
 #, fuzzy
 #| msgid "FTP Master"
 msgid "FTP Masters"
 msgstr "مدیر FTP"
 
-#: ../../english/intro/organization.data:87
+#: ../../english/intro/organization.data:89
 msgid "FTP Assistants"
 msgstr "دستیار FTP"
 
-#: ../../english/intro/organization.data:95
+#: ../../english/intro/organization.data:98
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:102
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:104
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:108
 msgid "Individual Packages"
 msgstr ""
 
-#: ../../english/intro/organization.data:106
+#: ../../english/intro/organization.data:109
 msgid "Release Management"
 msgstr "مدیریت انتشار"
 
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:111
 msgid "Release Team"
 msgstr "تیم انتشار"
 
-#: ../../english/intro/organization.data:121
+#: ../../english/intro/organization.data:124
 msgid "Quality Assurance"
 msgstr "کنترل کیفیت"
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:125
 msgid "Installation System Team"
 msgstr "تیم سیستم نصب"
 
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:126
 msgid "Release Notes"
 msgstr "نکته های انتشار"
 
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:128
 msgid "CD Images"
 msgstr "CD Images"
 
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:130
 msgid "Production"
 msgstr "محصول"
 
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:138
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:140
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:142
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:150
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:169
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:171
+#: ../../english/intro/organization.data:174
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:177
 msgid "Live System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:178
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:210
+#: ../../english/intro/organization.data:213
 msgid "Special Configurations"
 msgstr "تنظیمات خاص"
 
-#: ../../english/intro/organization.data:213
+#: ../../english/intro/organization.data:216
 msgid "Laptops"
 msgstr "لپ تاپ ها"
 
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:217
 msgid "Firewalls"
 msgstr "فایروال ها"
 
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:218
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:223
+#: ../../english/intro/organization.data:226
+msgid "Publicity team"
+msgstr ""
+
+#: ../../english/intro/organization.data:231
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:233
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
 msgid "Events"
 msgstr "رویدادها"
 
-#: ../../english/intro/organization.data:237
-msgid "Bits from Debian"
-msgstr ""
-
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:248
 msgid "User support"
 msgstr "پشتیبانی کاربران"
 
-#: ../../english/intro/organization.data:313
+#: ../../english/intro/organization.data:315
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:318
+#: ../../english/intro/organization.data:320
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:328
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:332
+#: ../../english/intro/organization.data:334
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:337
-msgid "Keyring Maintainers (PGP and GPG)"
+#: ../../english/intro/organization.data:339
+msgid ""
+"To send a private message to all DAMs, use the GPG key "
+"57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
 #: ../../english/intro/organization.data:340
-msgid "Debian Maintainer (DM) Keyring Maintainers"
+msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:343
 msgid "Security Team"
 msgstr "تیم امنیت"
 
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:356
 msgid "Web Pages"
 msgstr "صفحات وب"
 
-#: ../../english/intro/organization.data:366
+#: ../../english/intro/organization.data:365
 msgid "Consultants Page"
 msgstr "صفحه مشاوره ها"
 
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:370
 msgid "CD Vendors Page"
 msgstr "صفحه فروشندگان CD"
 
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:373
 msgid "Planet Debian"
 msgstr "سیاره دبیان"
 
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:377
 msgid "Policy"
 msgstr "سیاست"
 
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:382
 msgid "System Administration"
 msgstr "مدیر سیستم"
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:383
 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:394
+#: ../../english/intro/organization.data:393
 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:395
+#: ../../english/intro/organization.data:394
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:395
 msgid "Mirrors"
 msgstr "آینه های دریافت"
 
-#: ../../english/intro/organization.data:401
+#: ../../english/intro/organization.data:400
 msgid "DNS Maintainer"
 msgstr "نگهدارنده DNS"
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:401
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:403
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:409
 msgid "Auditor"
 msgstr ""
 
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:415
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:418
 msgid "Alioth administrators"
 msgstr ""
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:424
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:429
-msgid "DebConf chairs"
-msgstr ""
+#: ../../english/intro/organization.data:431
+#, fuzzy
+#| msgid "Technical Committee"
+msgid "DebConf Committee"
+msgstr "شورای فنی"
 
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:437
 msgid "Anti-harassment"
 msgstr ""
 
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:442
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:452
 msgid "Debian for children from 1 to 99"
 msgstr ""
 
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:455
 msgid "Debian for medical practice and research"
 msgstr ""
 
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:458
 msgid "Debian for education"
 msgstr ""
 
-#: ../../english/intro/organization.data:457
+#: ../../english/intro/organization.data:463
 msgid "Debian in legal offices"
 msgstr ""
 
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:467
 msgid "Debian for people with disabilities"
 msgstr ""
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:471
 msgid "Debian for science and related research"
 msgstr ""
 
-#~ msgid "Volatile Team"
-#~ msgstr "تیم Volatile"
-
-#~ msgid "Vendors"
-#~ msgstr "فروشنده ها"
+#~ msgid "Testing Security Team"
+#~ msgstr "تیم تست امنیت"
 
 #~ msgid "Security Audit Project"
 #~ msgstr "تیم بررسی امنیت"
 
-#~ msgid "Testing Security Team"
-#~ msgstr "تیم تست امنیت"
+#~ msgid "Vendors"
+#~ msgstr "فروشنده ها"
+
+#~ msgid "Volatile Team"
+#~ msgstr "تیم Volatile"
diff --git a/persian/po/others.fa.po b/persian/po/others.fa.po
index e4ba1769228..43ffcd47785 100644
--- a/persian/po/others.fa.po
+++ b/persian/po/others.fa.po
@@ -325,69 +325,82 @@ msgstr "نسخه"
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
-#~ msgid "Name:"
-#~ msgstr "نام:"
+#~ msgid "Wanted:"
+#~ msgstr "خواسته شده:"
 
-#~ msgid "Company:"
-#~ msgstr "شرکت:"
+#~ msgid "Who:"
+#~ msgstr "چه کسی:"
 
-#~ msgid "URL:"
-#~ msgstr "نشانی اینترنتی:"
+#~ msgid "Architecture:"
+#~ msgstr "معماری:"
 
-#~ msgid "or"
-#~ msgstr "یا"
+#~ msgid "Specifications:"
+#~ msgstr "مشخصات:"
 
-#~ msgid "Email:"
-#~ msgstr "پست الکترونیکی:"
+#~ msgid "Where:"
+#~ msgstr "کجا:"
 
-#~ msgid "Rates:"
-#~ msgstr "میزان‌ها:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
 
-#~ msgid "Willing to Relocate"
-#~ msgstr "خواهان جابجایی"
+#~ msgid "Previous Talks:"
+#~ msgstr "صحبت‌های قبلی:"
 
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست "
-#~ "شده‌اند."
+#~ msgid "Languages:"
+#~ msgstr "زبان‌ها:"
 
-#~ msgid "Mailing List Subscription"
-#~ msgstr "عضویت در لیست پستی"
+#~ msgid "Location:"
+#~ msgstr "مکان:"
+
+#~ msgid "Topics:"
+#~ msgstr "سرفصل‌ها:"
+
+#~ msgid "closed"
+#~ msgstr "بسته"
+
+#~ msgid "open"
+#~ msgstr "باز"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "لغو عضویت"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr ""
+#~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
 
 #~ msgid ""
 #~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
 #~ msgstr ""
 #~ "برای کسب اطلاعات از نحوه عضویت توسط پست الکترونیکی صفحه <a href=\"./"
 #~ "#subunsub\">لیست‌های پستی</a> را مطالعه کنید. همچنین <a href=\"unsubscribe"
 #~ "\">فرم لغو عضویت</a> نیز برای لغو عضویت شما از لیست‌های پستی در دسترس است."
 
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "لغو عضویت لیست پستی"
+
 #~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
 #~ msgstr ""
-#~ "توجه داشته باشید که بیشتر لیست‌های پستی دبیان انجمنهای عمومی هستند٬ هر "
-#~ "نامه‌ای که به آن فرستاده می‌شود٬ در بایگانی لیست پستی به صورت عمومی منتشر "
-#~ "می‌شود و توسط موتورهای جستجو طبقه‌بندی می‌گردد. شما برای عضویت در لیست پستی "
-#~ "باید از آدرس پست الکترونیکی استفاده کنید که انتشار آن به صورت عمومی برای "
-#~ "شما اهمیتی نداشته باشد."
+#~ "لطفاً به <a href=\"./#ads\">سیاستهای تبلیغاتی لیست پستی دبیان </a> احترام "
+#~ "بگذارید."
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
+#~ msgid "Clear"
+#~ msgstr "پاک کردن"
 
-#~ msgid "No description given"
-#~ msgstr "توضیحی در دسترس نیست"
+#~ msgid "Subscribe"
+#~ msgstr "عضویت"
 
-#~ msgid "Moderated:"
-#~ msgstr "کنترل شده:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "آدرس پست الکترونیکی شما"
 
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "تنها اعضاء اجازه ارسال پیغام دارند."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "یک نسخه خلاصه شده٬ فقط خواندنی است."
+
+#~ msgid "Subscription:"
+#~ msgstr "عضویت:"
 
 #~ msgid ""
 #~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -395,79 +408,66 @@ msgstr "نشانی اینترنتی"
 #~ "تنها پیغام‌هایی که توسط توسعه‌دهندگان دبیان مشخص شده‌اند در این لیست پذیرفته "
 #~ "می‌شوند."
 
-#~ msgid "Subscription:"
-#~ msgstr "عضویت:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "یک نسخه خلاصه شده٬ فقط خواندنی است."
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "تنها اعضاء اجازه ارسال پیغام دارند."
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "آدرس پست الکترونیکی شما"
+#~ msgid "Moderated:"
+#~ msgstr "کنترل شده:"
 
-#~ msgid "Subscribe"
-#~ msgstr "عضویت"
+#~ msgid "No description given"
+#~ msgstr "توضیحی در دسترس نیست"
 
-#~ msgid "Clear"
-#~ msgstr "پاک کردن"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
 
 #~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
 #~ msgstr ""
-#~ "لطفاً به <a href=\"./#ads\">سیاستهای تبلیغاتی لیست پستی دبیان </a> احترام "
-#~ "بگذارید."
-
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "لغو عضویت لیست پستی"
+#~ "توجه داشته باشید که بیشتر لیست‌های پستی دبیان انجمنهای عمومی هستند٬ هر "
+#~ "نامه‌ای که به آن فرستاده می‌شود٬ در بایگانی لیست پستی به صورت عمومی منتشر "
+#~ "می‌شود و توسط موتورهای جستجو طبقه‌بندی می‌گردد. شما برای عضویت در لیست پستی "
+#~ "باید از آدرس پست الکترونیکی استفاده کنید که انتشار آن به صورت عمومی برای "
+#~ "شما اهمیتی نداشته باشد."
 
 #~ msgid ""
 #~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
 #~ msgstr ""
 #~ "برای کسب اطلاعات از نحوه عضویت توسط پست الکترونیکی صفحه <a href=\"./"
 #~ "#subunsub\">لیست‌های پستی</a> را مطالعه کنید. همچنین <a href=\"unsubscribe"
 #~ "\">فرم لغو عضویت</a> نیز برای لغو عضویت شما از لیست‌های پستی در دسترس است."
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr ""
-#~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "لغو عضویت"
-
-#~ msgid "open"
-#~ msgstr "باز"
-
-#~ msgid "closed"
-#~ msgstr "بسته"
-
-#~ msgid "Topics:"
-#~ msgstr "سرفصل‌ها:"
-
-#~ msgid "Location:"
-#~ msgstr "مکان:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "عضویت در لیست پستی"
 
-#~ msgid "Languages:"
-#~ msgstr "زبان‌ها:"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست "
+#~ "شده‌اند."
 
-#~ msgid "Previous Talks:"
-#~ msgstr "صحبت‌های قبلی:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "خواهان جابجایی"
 
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Rates:"
+#~ msgstr "میزان‌ها:"
 
-#~ msgid "Where:"
-#~ msgstr "کجا:"
+#~ msgid "Email:"
+#~ msgstr "پست الکترونیکی:"
 
-#~ msgid "Specifications:"
-#~ msgstr "مشخصات:"
+#~ msgid "or"
+#~ msgstr "یا"
 
-#~ msgid "Architecture:"
-#~ msgstr "معماری:"
+#~ msgid "URL:"
+#~ msgstr "نشانی اینترنتی:"
 
-#~ msgid "Who:"
-#~ msgstr "چه کسی:"
+#~ msgid "Company:"
+#~ msgstr "شرکت:"
 
-#~ msgid "Wanted:"
-#~ msgstr "خواسته شده:"
+#~ msgid "Name:"
+#~ msgstr "نام:"
diff --git a/persian/po/ports.fa.po b/persian/po/ports.fa.po
index af4bb8b82fd..3d526458f03 100644
--- a/persian/po/ports.fa.po
+++ b/persian/po/ports.fa.po
@@ -7,7 +7,7 @@ msgstr ""
 "Language-Team: debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Persian\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
@@ -117,32 +117,32 @@ msgstr "دبیان برای PowerPC"
 msgid "Debian for Sparc"
 msgstr "دبیان برای Sparc"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "دبیان برای لپ تاپ"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "دبیان برای AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "دبیان برای Sparc64"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "دبیان برای ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "دبیان برای S/390"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "دبیان برای Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "دبیان برای MIPS"
 
-#~ msgid "Main"
-#~ msgstr "اصلی"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "دبیان برای موتورولا 680x0"
 
 #~ msgid "Debian GNU/FreeBSD"
 #~ msgstr "دبیان برای GNU/FreeBSD"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "دبیان برای موتورولا 680x0"
+#~ msgid "Main"
+#~ msgstr "اصلی"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "دبیان برای MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "دبیان برای Beowulf"
 
-#~ msgid "Debian for S/390"
-#~ msgstr "دبیان برای S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "دبیان برای ARM"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "دبیان برای Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "دبیان برای AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "دبیان برای لپ تاپ"
diff --git a/persian/po/security.fa.po b/persian/po/security.fa.po
index 714ad2ddbb2..36363a9bd14 100644
--- a/persian/po/security.fa.po
+++ b/persian/po/security.fa.po
@@ -7,7 +7,7 @@ msgstr ""
 "Language-Team: debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Persian\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
diff --git a/persian/po/stats.fa.po b/persian/po/stats.fa.po
index f26c5295167..5245175364a 100644
--- a/persian/po/stats.fa.po
+++ b/persian/po/stats.fa.po
@@ -8,9 +8,9 @@ msgstr ""
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: fa\n"
+"MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"MIME-Version: 1.0\n"
 
 #: ../../english/template/debian/stats_tags.wml:6
 msgid "Debian web site translation statistics"
@@ -56,180 +56,180 @@ msgstr ""
 msgid "Click to fetch diffstat data"
 msgstr ""
 
-#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
+#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
 msgid "Unified diff"
 msgstr ""
 
-#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
+#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
 msgid "Colored diff"
 msgstr ""
 
-#: ../../stattrans.pl:541
+#: ../../stattrans.pl:541 ../../stattrans.pl:683
+msgid "Created with <transstatslink>"
+msgstr ""
+
+#: ../../stattrans.pl:546
 msgid "Translation summary for"
 msgstr ""
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:700 ../../stattrans.pl:746
-#: ../../stattrans.pl:789
+#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
+#: ../../stattrans.pl:796
 msgid "Not translated"
 msgstr ""
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
+#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
 msgid "Outdated"
 msgstr ""
 
-#: ../../stattrans.pl:544
+#: ../../stattrans.pl:549
 msgid "Translated"
 msgstr ""
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:626 ../../stattrans.pl:698
-#: ../../stattrans.pl:744 ../../stattrans.pl:787
+#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
+#: ../../stattrans.pl:751 ../../stattrans.pl:794
 msgid "Up to date"
 msgstr ""
 
-#: ../../stattrans.pl:545 ../../stattrans.pl:546 ../../stattrans.pl:547
-#: ../../stattrans.pl:548
+#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
+#: ../../stattrans.pl:553
 msgid "files"
 msgstr ""
 
-#: ../../stattrans.pl:551 ../../stattrans.pl:552 ../../stattrans.pl:553
-#: ../../stattrans.pl:554
+#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
+#: ../../stattrans.pl:559
 msgid "bytes"
 msgstr ""
 
-#: ../../stattrans.pl:561
+#: ../../stattrans.pl:566
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
 msgstr ""
 
-#: ../../stattrans.pl:567
+#: ../../stattrans.pl:572
 msgid "Outdated translations"
 msgstr ""
 
-#: ../../stattrans.pl:569 ../../stattrans.pl:625
+#: ../../stattrans.pl:574 ../../stattrans.pl:630
 msgid "File"
 msgstr ""
 
-#: ../../stattrans.pl:571 ../../stattrans.pl:577
+#: ../../stattrans.pl:576 ../../stattrans.pl:582
 msgid "Diff"
 msgstr ""
 
-#: ../../stattrans.pl:573
+#: ../../stattrans.pl:578
 msgid "Comment"
 msgstr ""
 
-#: ../../stattrans.pl:574
+#: ../../stattrans.pl:579
 msgid "Diffstat"
 msgstr ""
 
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:584
 msgid "Log"
 msgstr ""
 
-#: ../../stattrans.pl:580
+#: ../../stattrans.pl:585
 msgid "Translation"
 msgstr ""
 
-#: ../../stattrans.pl:581
+#: ../../stattrans.pl:586
 msgid "Maintainer"
 msgstr ""
 
-#: ../../stattrans.pl:583
+#: ../../stattrans.pl:588
 msgid "Status"
 msgstr ""
 
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:589
 msgid "Translator"
 msgstr ""
 
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:590
 msgid "Date"
 msgstr ""
 
-#: ../../stattrans.pl:592
+#: ../../stattrans.pl:597
 msgid "General pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:593
+#: ../../stattrans.pl:598
 msgid "Untranslated general pages"
 msgstr ""
 
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:603
 msgid "News items not translated"
 msgstr ""
 
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:604
 msgid "Untranslated news items"
 msgstr ""
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:609
 msgid "Consultant/user pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:605
+#: ../../stattrans.pl:610
 msgid "Untranslated consultant/user pages"
 msgstr ""
 
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:615
 msgid "International pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:616
 msgid "Untranslated international pages"
 msgstr ""
 
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:621
 msgid "Translated pages (up-to-date)"
 msgstr ""
 
-#: ../../stattrans.pl:623 ../../stattrans.pl:771
+#: ../../stattrans.pl:628 ../../stattrans.pl:778
 msgid "Translated templates (PO files)"
 msgstr ""
 
-#: ../../stattrans.pl:624 ../../stattrans.pl:774
+#: ../../stattrans.pl:629 ../../stattrans.pl:781
 msgid "PO Translation Statistics"
 msgstr ""
 
-#: ../../stattrans.pl:627 ../../stattrans.pl:788
+#: ../../stattrans.pl:632 ../../stattrans.pl:795
 msgid "Fuzzy"
 msgstr ""
 
-#: ../../stattrans.pl:628
+#: ../../stattrans.pl:633
 msgid "Untranslated"
 msgstr ""
 
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:634
 msgid "Total"
 msgstr ""
 
-#: ../../stattrans.pl:646
+#: ../../stattrans.pl:651
 msgid "Total:"
 msgstr ""
 
-#: ../../stattrans.pl:659 ../../stattrans.pl:813
-msgid "Created with"
-msgstr ""
-
-#: ../../stattrans.pl:678
+#: ../../stattrans.pl:685
 msgid "Translated web pages"
 msgstr ""
 
-#: ../../stattrans.pl:681
+#: ../../stattrans.pl:688
 msgid "Translation Statistics by Page Count"
 msgstr ""
 
-#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
+#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
 msgid "Language"
 msgstr ""
 
-#: ../../stattrans.pl:697 ../../stattrans.pl:743
+#: ../../stattrans.pl:704 ../../stattrans.pl:750
 msgid "Translations"
 msgstr ""
 
-#: ../../stattrans.pl:724
+#: ../../stattrans.pl:731
 msgid "Translated web pages (by size)"
 msgstr ""
 
-#: ../../stattrans.pl:727
+#: ../../stattrans.pl:734
 msgid "Translation Statistics by Page Size"
 msgstr ""
diff --git a/persian/po/templates.fa.po b/persian/po/templates.fa.po
index d5ec6022273..8c5bd340835 100644
--- a/persian/po/templates.fa.po
+++ b/persian/po/templates.fa.po
@@ -69,7 +69,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
 msgstr "بازگشت به <a href=\"m4_HOME/\">صفحه خانگی پروژه دبیان</a>."
 
 #: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:152
+#: ../../english/template/debian/links.tags.wml:149
 msgid "Home"
 msgstr "خانه"
 
@@ -110,48 +110,52 @@ msgid "Support"
 msgstr "پشتیبانی"
 
 #: ../../english/template/debian/common_translation.wml:52
+msgid "Pure Blends"
+msgstr ""
+
+#: ../../english/template/debian/common_translation.wml:55
 #: ../../english/template/debian/links.tags.wml:46
 msgid "Developers' Corner"
 msgstr "خلوت توسعه دهندگان"
 
-#: ../../english/template/debian/common_translation.wml:55
+#: ../../english/template/debian/common_translation.wml:58
 msgid "Documentation"
 msgstr "مستندات"
 
-#: ../../english/template/debian/common_translation.wml:58
+#: ../../english/template/debian/common_translation.wml:61
 msgid "Security Information"
 msgstr "اطلاعات امنیت"
 
-#: ../../english/template/debian/common_translation.wml:61
+#: ../../english/template/debian/common_translation.wml:64
 msgid "Search"
 msgstr "جستجو"
 
-#: ../../english/template/debian/common_translation.wml:64
+#: ../../english/template/debian/common_translation.wml:67
 msgid "none"
 msgstr "هیچکدام"
 
-#: ../../english/template/debian/common_translation.wml:67
+#: ../../english/template/debian/common_translation.wml:70
 msgid "Go"
 msgstr "برو"
 
-#: ../../english/template/debian/common_translation.wml:70
+#: ../../english/template/debian/common_translation.wml:73
 msgid "worldwide"
 msgstr "جهانی"
 
-#: ../../english/template/debian/common_translation.wml:73
+#: ../../english/template/debian/common_translation.wml:76
 msgid "Site map"
 msgstr "نقشهٔ سایت"
 
-#: ../../english/template/debian/common_translation.wml:76
+#: ../../english/template/debian/common_translation.wml:79
 msgid "Miscellaneous"
 msgstr "گوناگون"
 
-#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/common_translation.wml:82
+#: ../../english/template/debian/links.tags.wml:104
 msgid "Getting Debian"
 msgstr "دریافت دبیان"
 
-#: ../../english/template/debian/common_translation.wml:82
+#: ../../english/template/debian/common_translation.wml:85
 #, fuzzy
 #| msgid "Debian Books"
 msgid "The Debian Blog"
@@ -202,7 +206,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:97
+#: ../../english/template/debian/footer.wml:105
 #, fuzzy
 #| msgid ""
 #| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -220,24 +224,24 @@ msgstr ""
 "\">debian-www@lists.debian.org</a> نامه بزنید.  برای دیدن اطلاعات تماس دیگر, "
 "به <a href=\"m4_HOME/contact\">صفحه تماس</a> مراجعه کنید."
 
-#: ../../english/template/debian/footer.wml:100
+#: ../../english/template/debian/footer.wml:108
 msgid "Last Modified"
 msgstr "آخرین تغییرات انجام شده"
 
-#: ../../english/template/debian/footer.wml:103
+#: ../../english/template/debian/footer.wml:111
 msgid "Copyright"
 msgstr "حق انتشار"
 
-#: ../../english/template/debian/footer.wml:106
+#: ../../english/template/debian/footer.wml:114
 msgid "<a href=\"http://www.spi-inc.org/\">SPI</a> and others;"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:109
+#: ../../english/template/debian/footer.wml:117
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 "صفحه <a href=\"m4_HOME/license\" rel=\"copyright\">شرایط مجوز</a> را ببینید."
 
-#: ../../english/template/debian/footer.wml:112
+#: ../../english/template/debian/footer.wml:120
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -321,130 +325,126 @@ msgid "Code of Conduct"
 msgstr ""
 
 #: ../../english/template/debian/links.tags.wml:55
-msgid "Visit the site sponsor"
-msgstr "حامی این سایت را ببینید"
-
-#: ../../english/template/debian/links.tags.wml:58
 msgid "Debian 5.0 - The universal operating system"
 msgstr "دبیان ۵٫۰ - سیستم عامل جهانی"
 
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:58
 msgid "Site map for Debian web pages"
 msgstr "نقشه سایت صفحات وب دبیان"
 
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:61
 msgid "Developer Database"
 msgstr "پایگاه داده توسعه دهندگان"
 
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:64
 #, fuzzy
 #| msgid "Debian Books"
 msgid "Debian FAQ"
 msgstr "کتاب های دبیان "
 
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:67
 msgid "Debian Policy Manual"
 msgstr "راهنمای خط مشی دبیان"
 
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:70
 msgid "Developers' Reference"
 msgstr "مرجع توسعه دهندگان"
 
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:73
 msgid "New Maintainers' Guide"
 msgstr "راهنمای نگه دارندگان جدید"
 
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:76
 msgid "Release Critical Bugs"
 msgstr "اشکالات بحرانی انتشار"
 
-#: ../../english/template/debian/links.tags.wml:82
+#: ../../english/template/debian/links.tags.wml:79
 msgid "Lintian Reports"
 msgstr "گزارش Lintian"
 
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:83
 msgid "Archives for users' mailing lists"
 msgstr "بایگانی ها برای لیست های پستی کاربران"
 
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:86
 msgid "Archives for developers' mailing lists"
 msgstr "بایگانی ها برای لیست های پستی  توسعه دهندگان"
 
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:89
 msgid "Archives for i18n/l10n mailing lists"
 msgstr "بایگانی ها برای لیست های پستی i18n/l10n"
 
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:92
 msgid "Archives for ports' mailing lists"
 msgstr "بایگانی ها برای لیست های پستی  port ها"
 
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:95
 msgid "Archives for mailing lists of the Bug tracking system"
 msgstr "بایگانی ها برای لیست های پستی سیستم دنبال کننده ایرادات"
 
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:98
 msgid "Archives for miscellaneous mailing lists"
 msgstr "بایگانی ها برای لیست های پستی گوناگون"
 
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:101
 msgid "Free Software"
 msgstr "نرم افزار آزاد"
 
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:107
 msgid "Development"
 msgstr "توسعه"
 
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:110
 msgid "Help Debian"
 msgstr "کمک به دبیان"
 
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:113
 msgid "Bug reports"
 msgstr "گزارش‌های خطا"
 
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:116
 msgid "Ports/Architectures"
 msgstr "معماری ها /پورت ها"
 
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:119
 msgid "Installation manual"
 msgstr "راهنمای نصب"
 
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:122
 msgid "CD vendors"
 msgstr "فروشندگان لوح فشرده"
 
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:125
 #, fuzzy
 #| msgid "CD ISO images"
 msgid "CD/USB ISO images"
 msgstr "تصاویر ISO لوح فشرده"
 
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:128
 msgid "Network install"
 msgstr "نصب توسط شبکه"
 
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:131
 msgid "Pre-installed"
 msgstr "از پیش نصب شده"
 
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:134
 msgid "Debian-Edu project"
 msgstr "پروژه Debian-Edu"
 
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:137
 msgid "Alioth &ndash; Debian GForge"
 msgstr "Alioth &ndash; Debian GForge"
 
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:140
 msgid "Quality Assurance"
 msgstr "تضمین کیفیت"
 
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:143
 msgid "Package Tracking System"
 msgstr "سیستم پیگرد بسته"
 
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:146
 msgid "Debian Developer's Packages Overview"
 msgstr "مرور کلی بسته های توسعه دهندگان دبیان"
 
@@ -490,7 +490,7 @@ msgstr "وقایع گذشته"
 msgid "(new revision)"
 msgstr "(بازبینی جدید)"
 
-#: ../../english/template/debian/recent_list.wml:301
+#: ../../english/template/debian/recent_list.wml:303
 msgid "Report"
 msgstr "گزارش"
 
@@ -529,23 +529,26 @@ msgstr "URL"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "بازگشت به  <a href=\"../\">صفحه چه کسی از دبیان استفاده می کند؟</a>."
 
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "آیا در صفحه آرایی سایت مشکلی می بینید؟"
+#~ msgid "Rating:"
+#~ msgstr "درجه بندی:"
 
-#~ msgid "Report it!"
-#~ msgstr "گزارش کنید!"
+#~ msgid "Nobody"
+#~ msgstr "هیچ کس"
 
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "سروری که به شما نزدیک است را انتخاب کنید:"
+#~ msgid "Taken by:"
+#~ msgstr "گرفته شده توسط:"
 
 #~ msgid "More information:"
 #~ msgstr "اطلاعات بیشتر:"
 
-#~ msgid "Taken by:"
-#~ msgstr "گرفته شده توسط:"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "سروری که به شما نزدیک است را انتخاب کنید:"
 
-#~ msgid "Nobody"
-#~ msgstr "هیچ کس"
+#~ msgid "Report it!"
+#~ msgstr "گزارش کنید!"
 
-#~ msgid "Rating:"
-#~ msgstr "درجه بندی:"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "آیا در صفحه آرایی سایت مشکلی می بینید؟"
+
+#~ msgid "Visit the site sponsor"
+#~ msgstr "حامی این سایت را ببینید"
diff --git a/persian/po/vendors.fa.po b/persian/po/vendors.fa.po
index 0ee5ae394e7..1f7f345054e 100644
--- a/persian/po/vendors.fa.po
+++ b/persian/po/vendors.fa.po
@@ -69,29 +69,29 @@ msgstr "منبع"
 msgid "and"
 msgstr "و"
 
-#~ msgid "Architectures:"
-#~ msgstr "معماری:"
+#~ msgid "Vendor:"
+#~ msgstr "فروشنده:"
 
-#~ msgid "DVD Type:"
-#~ msgstr "نوع DVD:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL برای صفحه دبیان:"
 
-#~ msgid "CD Type:"
-#~ msgstr "نوع CD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "اجازه دادن به همکاری با دبیان:"
 
-#~ msgid "email:"
-#~ msgstr "پست الکترونیکی:"
+#~ msgid "Country:"
+#~ msgstr "کشور:"
 
 #~ msgid "Ship International:"
 #~ msgstr "ارسال بین المللی:"
 
-#~ msgid "Country:"
-#~ msgstr "کشور:"
+#~ msgid "email:"
+#~ msgstr "پست الکترونیکی:"
 
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "اجازه دادن به همکاری با دبیان:"
+#~ msgid "CD Type:"
+#~ msgstr "نوع CD:"
 
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL برای صفحه دبیان:"
+#~ msgid "DVD Type:"
+#~ msgstr "نوع DVD:"
 
-#~ msgid "Vendor:"
-#~ msgstr "فروشنده:"
+#~ msgid "Architectures:"
+#~ msgstr "معماری:"