footer: Update src url to salsa git repo; refresh po files

Here are the commands I used: cd ./english/po/; make pot; cd ../../; for i in albanian/po/ arabic/po/ armenian/po/ bulgarian/po/ catalan/po/ chinese/po/ croatian/po/ czech/po/ danish/po/ dutch/po/ esperanto/po/ finnish/po/ french/po/ galician/po/ german/po/ greek/po/ hebrew/po/ hungarian/po/ indonesian/po/ italian/po/ japanese/po/ korean/po/ lithuanian/po/ norwegian/po/ persian/po/ polish/po/ portuguese/po/ romanian/po/ russian/po/ slovak/po/ slovene/po/ spanish/po/ swedish/po/ tamil/po/ turkish/po/ ukrainian/po/ vietnamese/po/ ; do (cd $i; make update-po ; ) ; done
author: Boyuan Yang <073plan@gmail.com> 2018-06-02 17:23:22 +0800
committer: Boyuan Yang <073plan@gmail.com> 2018-06-02 17:24:50 +0800
commit: 791fde30e7c874cecb5a0220593130a16279c366 (patch)
tree: 1584247cb4ba787a0fd97f48817b5114cdc6de8a /ukrainian/po
parent: 3c508740e4547501e8db1652b165b85a38036086 (diff)
15 files changed, 1023 insertions, 1026 deletions
diff --git a/ukrainian/po/blends.uk.po b/ukrainian/po/blends.uk.po
index 0d295c71514..5ef0be6e93f 100644
--- a/ukrainian/po/blends.uk.po
+++ b/ukrainian/po/blends.uk.po
@@ -29,13 +29,25 @@ msgstr "Похідні"
 
 #: ../../english/blends/released.data:15
 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 ""
+"Мета Debian Astro полягає в розробці операційної системи на базі Debian, що "
+"відповідає вимогам як професійних астрономів, так і астрономів-любителів. "
+"Вона об'єднує велику кількість програмних пакетів, що включають контроль "
+"телескопів, зменшення даних, представлення та інші поля."
+
+#: ../../english/blends/released.data:23
+msgid ""
 "The goal of DebiChem is to make Debian a good platform for chemists in their "
 "day-to-day work."
 msgstr ""
 "Метою DebiChem є зробити Debian гарною платформою для хіміків у їх "
 "повсякденній роботі."
 
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
 msgid ""
 "The goal of Debian Games is to provide games in Debian from arcade and "
 "adventure to simulation and strategy."
@@ -43,7 +55,7 @@ msgstr ""
 "Мета Debian Games полягає у забезпеченні ігор в Debian від аркад та пригод "
 "до імітації та стратегії."
 
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
 msgid ""
 "The goal of Debian Edu is to provide a Debian OS system suitable for "
 "educational use and in schools."
@@ -51,7 +63,7 @@ msgstr ""
 "Метою Debian Edu є зробити систему Debian придатною для використання у "
 "навчанні та в школах."
 
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
 msgid ""
 "The goal of Debian GIS is to develop Debian into the best distribution for "
 "Geographical Information System applications and users."
@@ -59,7 +71,7 @@ msgstr ""
 "Метою Debian GIS є розробка Debian у найкраще розповсюдження для додатків та "
 "користувачів географічної інформаційної системи."
 
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
 msgid ""
 "The goal of Debian Junior is to make Debian an OS that children will enjoy "
 "using."
@@ -67,7 +79,7 @@ msgstr ""
 "Мета Debian Junior - зробити Debian операційною системою, якою зможуть "
 "насолоджуватися діти."
 
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
 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 "
@@ -80,7 +92,7 @@ msgstr ""
 "медичної візуалізації, біоінформатики, ІТ-інфраструктури клініки та ін. в ОС "
 "Debian."
 
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
 msgid ""
 "The goal of Debian Multimedia is to make Debian a good platform for audio "
 "and multimedia work."
@@ -88,7 +100,7 @@ msgstr ""
 "Мета Debian Multimedia - зробити Debian гарною платформою для роботи з аудіо "
 "та мультимедіа."
 
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
 msgid ""
 "The goal of Debian Science is to provide a better experience when using "
 "Debian to researchers and scientists."
@@ -107,25 +119,13 @@ 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 ""
-"Мета Debian Astro полягає в розробці операційної системи на базі Debian, що "
-"відповідає вимогам як професійних астрономів, так і астрономів-любителів. "
-"Вона об'єднує велику кількість програмних пакетів, що включають контроль "
-"телескопів, зменшення даних, представлення та інші поля."
-
-#: ../../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 ""
 "Метою Debian Design є забезпечення додатків для дизайнерів. Це включає "
 "графічний дизайн, веб-дизайн та мультимедійний дизайн."
 
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
 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 "
@@ -140,7 +140,7 @@ msgstr ""
 "розвиток технологій у багатьох областях та регіонах, таких, як Африка, "
 "Афганістан, Індонезія, В'єтнам, використовуючи Debian."
 
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
 msgid ""
 "The goal of FreedomBox is to develop, design and promote personal servers "
 "running free software for private, personal communications. Applications "
@@ -155,7 +155,7 @@ msgstr ""
 "замінити бездротовий маршрутизатор таким чином, щоб дані залишалися з "
 "користувачами."
 
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
 msgid ""
 "The goal of Debian Hamradio is to support the needs of radio amateurs in "
 "Debian by providing logging, data mode and packet mode applications and more."
@@ -163,7 +163,7 @@ msgstr ""
 "Мета Debian Hamradio полягає у підтримці потреб радіолюбителів у Debian, "
 "надаючи програми журналювання, режиму даних, пакетного режиму тощо."
 
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
 msgid ""
 "The goal of DebianParl is to provide applications to support the needs of "
 "parliamentarians, politicians and their staffers all around the world."
diff --git a/ukrainian/po/bugs.uk.po b/ukrainian/po/bugs.uk.po
index 168e489b004..c24a564e03a 100644
--- a/ukrainian/po/bugs.uk.po
+++ b/ukrainian/po/bugs.uk.po
@@ -29,7 +29,6 @@ msgstr "з міткою"
 #: ../../english/Bugs/pkgreport-opts.inc:23
 #: ../../english/Bugs/pkgreport-opts.inc:63
 #: ../../english/Bugs/pkgreport-opts.inc:97
-#| msgid "severities"
 msgid "with severity"
 msgstr "з рівнем важливості"
 
@@ -50,7 +49,6 @@ msgid "owned by"
 msgstr "які належать"
 
 #: ../../english/Bugs/pkgreport-opts.inc:38
-#| msgid "status"
 msgid "with status"
 msgstr "з станом"
 
@@ -105,7 +103,6 @@ msgid "raw"
 msgstr "сирий"
 
 #: ../../english/Bugs/pkgreport-opts.inc:131
-#| msgid "sarge"
 msgid "age"
 msgstr "вік"
 
@@ -122,7 +119,6 @@ msgid "Reverse Pending"
 msgstr "Очікуючі, у зворотньому порядку"
 
 #: ../../english/Bugs/pkgreport-opts.inc:140
-#| msgid "Reverse order of:"
 msgid "Reverse Severity"
 msgstr "В зворотному порядку по важливості"
 
@@ -155,12 +151,10 @@ msgid "unstable"
 msgstr "нестабільний"
 
 #: ../../english/Bugs/pkgreport-opts.inc:152
-#| msgid "archived bugs"
 msgid "Unarchived"
 msgstr "розархівовані"
 
 #: ../../english/Bugs/pkgreport-opts.inc:155
-#| msgid "archived bugs"
 msgid "Archived"
 msgstr "заархівовані"
 
@@ -168,146 +162,146 @@ msgstr "заархівовані"
 msgid "Archived and Unarchived"
 msgstr "Заархівовані та розархівовані"
 
-#~ msgid "Flags:"
-#~ msgstr "Прапорці:"
-
-#~ msgid "active bugs"
-#~ msgstr "активні помилки"
+#~ msgid "Exclude tag:"
+#~ msgstr "Не включаючи мітки:"
 
-#~ msgid "display merged bugs only once"
-#~ msgstr "показувати злиті помилки лише раз"
+#~ msgid "Include tag:"
+#~ msgstr "Включаючи мітки:"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "не впорядковувати по стану чи важливості"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "не показувати зміст в заголовку"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "не показувати статистику в кінці"
+#~ msgid "wontfix"
+#~ msgstr "wontfix"
 
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "upstream"
 
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible"
 
-#~ msgid "Package version:"
-#~ msgstr "Версія пакунка:"
+#~ msgid "security"
+#~ msgstr "security"
 
-#~ msgid "Distribution:"
-#~ msgstr "Дистрибутив:"
+#~ msgid "patch"
+#~ msgstr "patch"
 
-#~ msgid "bugs"
-#~ msgstr "помилки"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
 
-#~ msgid "open"
-#~ msgstr "відкриті"
+#~ msgid "l10n"
+#~ msgstr "l10n"
 
-#~ msgid "forwarded"
-#~ msgstr "переслані"
+#~ msgid "help"
+#~ msgstr "help"
 
-#~ msgid "pending"
-#~ msgstr "в очікуванні"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream"
 
-#~ msgid "fixed"
-#~ msgstr "виправлені"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental"
 
-#~ msgid "done"
-#~ msgstr "закриті"
+#~ msgid "d-i"
+#~ msgstr "d-i"
 
-#~ msgid "Include status:"
-#~ msgstr "Включаючи стан:"
+#~ msgid "confirmed"
+#~ msgstr "confirmed"
 
-#~ msgid "Exclude status:"
-#~ msgstr "Не включаючи стан:"
+#~ msgid "sid"
+#~ msgstr "sid"
 
-#~ msgid "critical"
-#~ msgstr "критична"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
 
-#~ msgid "grave"
-#~ msgstr "дуже серйозна"
+#~ msgid "etch"
+#~ msgstr "etch"
 
-#~ msgid "serious"
-#~ msgstr "серйозна"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "important"
-#~ msgstr "важлива"
+#~ msgid "woody"
+#~ msgstr "woody"
 
-#~ msgid "minor"
-#~ msgstr "незначна"
+#~ msgid "potato"
+#~ msgstr "potato"
 
-#~ msgid "wishlist"
-#~ msgstr "побажання"
+#~ msgid "Exclude severity:"
+#~ msgstr "Не включаючи важливість"
 
 #~ msgid "Include severity:"
 #~ msgstr "Включаючи важливість"
 
-#~ msgid "Exclude severity:"
-#~ msgstr "Не включаючи важливість"
+#~ msgid "wishlist"
+#~ msgstr "побажання"
 
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "незначна"
 
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "важлива"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "серйозна"
 
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "дуже серйозна"
 
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "критична"
 
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Не включаючи стан:"
 
-#~ msgid "confirmed"
-#~ msgstr "confirmed"
+#~ msgid "Include status:"
+#~ msgstr "Включаючи стан:"
 
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "закриті"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental"
+#~ msgid "fixed"
+#~ msgstr "виправлені"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream"
+#~ msgid "pending"
+#~ msgstr "в очікуванні"
 
-#~ msgid "help"
-#~ msgstr "help"
+#~ msgid "forwarded"
+#~ msgstr "переслані"
 
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "open"
+#~ msgstr "відкриті"
 
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "bugs"
+#~ msgstr "помилки"
 
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "Distribution:"
+#~ msgstr "Дистрибутив:"
 
-#~ msgid "security"
-#~ msgstr "security"
+#~ msgid "Package version:"
+#~ msgstr "Версія пакунка:"
 
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
 
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
 
-#~ msgid "wontfix"
-#~ msgstr "wontfix"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "не показувати статистику в кінці"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "не показувати зміст в заголовку"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "не впорядковувати по стану чи важливості"
 
-#~ msgid "Include tag:"
-#~ msgstr "Включаючи мітки:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "показувати злиті помилки лише раз"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "Не включаючи мітки:"
+#~ msgid "active bugs"
+#~ msgstr "активні помилки"
+
+#~ msgid "Flags:"
+#~ msgstr "Прапорці:"
diff --git a/ukrainian/po/consultants.uk.po b/ukrainian/po/consultants.uk.po
index 4c599e6dd95..c00037e3070 100644
--- a/ukrainian/po/consultants.uk.po
+++ b/ukrainian/po/consultants.uk.po
@@ -8,10 +8,11 @@ msgstr ""
 "PO-Revision-Date: 2017-11-14 23:48+0200\n"
 "Last-Translator: Volodymyr Bodenchuk <Bodenchuk@bigmir.net>\n"
 "Language-Team: Ukrainian <ukrainian>\n"
-"Language uk\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language uk\n"
 "X-Generator: Gtranslator 2.91.7\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n "
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
diff --git a/ukrainian/po/distrib.uk.po b/ukrainian/po/distrib.uk.po
index 4d74d6a7708..3f27a8e90e4 100644
--- a/ukrainian/po/distrib.uk.po
+++ b/ukrainian/po/distrib.uk.po
@@ -215,38 +215,38 @@ msgstr ""
 msgid "SPARC"
 msgstr "SPARC"
 
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "пакунки, що містять файли чи директорії з такою назвою"
-
-#~ msgid "all files in this package"
-#~ msgstr "всі файли в цьому пакунку"
+#~ msgid "non-US"
+#~ msgstr "non-US"
 
-#~ msgid "Case sensitive"
-#~ msgstr "Враховувати регістр"
+#~ msgid "Search case sensitive"
+#~ msgstr "Пошук чутливий до регістру"
 
-#~ msgid "no"
-#~ msgstr "ні"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Шукати частини слів"
 
-#~ msgid "yes"
-#~ msgstr "так"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
 
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
 
 #~ msgid "AMD64"
 #~ msgstr "AMD64"
 
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
 
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "yes"
+#~ msgstr "так"
 
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Шукати частини слів"
+#~ msgid "no"
+#~ msgstr "ні"
 
-#~ msgid "Search case sensitive"
-#~ msgstr "Пошук чутливий до регістру"
+#~ msgid "Case sensitive"
+#~ msgstr "Враховувати регістр"
 
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "all files in this package"
+#~ msgstr "всі файли в цьому пакунку"
+
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "пакунки, що містять файли чи директорії з такою назвою"
diff --git a/ukrainian/po/doc.uk.po b/ukrainian/po/doc.uk.po
index d0f9a7338f9..e95302efe52 100644
--- a/ukrainian/po/doc.uk.po
+++ b/ukrainian/po/doc.uk.po
@@ -30,8 +30,8 @@ msgid ""
 "  Project."
 msgstr ""
 
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
 msgid ""
 "Written by two Debian developers, this free book\n"
 "  started as a translation of their French best-seller known as Cahier de\n"
@@ -55,31 +55,7 @@ msgid ""
 "  in the home, office, club, or school)."
 msgstr ""
 
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Архітектура Debian 2.2 ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-"  It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-"  It also gives generic information, tools and techniques. The GNU\n"
-"  toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-"  kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-"  includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-"  coming from other platforms.\n"
-"  It is not specific to Debian, but the Aleph\n"
-"  ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-"  will be working from this distribution and preferably have a Debian based\n"
-"  host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
 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"
@@ -91,7 +67,7 @@ msgid ""
 "  administrator who wants to build a reliable network with Debian."
 msgstr ""
 
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
 msgid ""
 "The book covers topics ranging from concepts of package\n"
 "  management over the available tools and how they're used to concrete "
@@ -103,7 +79,7 @@ msgid ""
 "  PDF, ePub, Mobi), printed book planned.\n"
 msgstr ""
 
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
 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 "
@@ -111,6 +87,22 @@ msgid ""
 "for all users who want to learn more about Debian and its range of services."
 msgstr ""
 
+#: ../../english/doc/books.data:191
+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 "Автор:"
@@ -163,10 +155,10 @@ msgstr "(версія <get-var version />)"
 msgid "plain text"
 msgstr "звичайний текст"
 
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
 msgstr ""
 
 #: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -191,12 +183,6 @@ msgid ""
 "\"https://packages.debian.org/subversion\">Subversion</a> repository."
 msgstr ""
 
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
 #: ../../english/doc/manuals.defs:188
 msgid ""
 "CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -223,3 +209,6 @@ msgstr "HTML"
 #: ../../english/releases/arches.data:36
 msgid "PDF"
 msgstr "PDF"
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Архітектура Debian 2.2 ARM"
diff --git a/ukrainian/po/l10n.uk.po b/ukrainian/po/l10n.uk.po
index 6d8dea355c4..611bb9b88eb 100644
--- a/ukrainian/po/l10n.uk.po
+++ b/ukrainian/po/l10n.uk.po
@@ -99,8 +99,8 @@ msgstr "POT-файли"
 msgid "Hints for translators"
 msgstr "Підказки перекладачам"
 
-#~ msgid "Translated templates"
-#~ msgstr "Перекладені шаблони"
-
 #~ msgid "Original templates"
 #~ msgstr "Оригінальні шаблони"
+
+#~ msgid "Translated templates"
+#~ msgstr "Перекладені шаблони"
diff --git a/ukrainian/po/newsevents.uk.po b/ukrainian/po/newsevents.uk.po
index 6207148aee5..c73c40ac435 100644
--- a/ukrainian/po/newsevents.uk.po
+++ b/ukrainian/po/newsevents.uk.po
@@ -21,7 +21,6 @@ msgid "Debian News"
 msgstr "Новини Debian"
 
 #: ../../english/News/news.rdf.in:19
-#| msgid "Latest News"
 msgid "Debian Latest News"
 msgstr "Останні новини Debian"
 
diff --git a/ukrainian/po/organization.uk.po b/ukrainian/po/organization.uk.po
index eb6e80d1155..6973ed8945e 100644
--- a/ukrainian/po/organization.uk.po
+++ b/ukrainian/po/organization.uk.po
@@ -53,7 +53,6 @@ msgid "SRM"
 msgstr "КСВ"
 
 #: ../../english/intro/organization.data:34
-#| msgid "Release Managers"
 msgid "Stable Release Manager"
 msgstr "Керівник стабільного випуску"
 
@@ -66,7 +65,6 @@ msgid "chairman"
 msgstr "голова"
 
 #: ../../english/intro/organization.data:42
-#| msgid "FTP Assistants"
 msgid "assistant"
 msgstr "помічник"
 
@@ -80,23 +78,22 @@ msgid "Officers"
 msgstr "Керівники"
 
 #: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
 msgid "Distribution"
 msgstr "Дистрибутив"
 
 #: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
 msgid "Communication and Outreach"
 msgstr "Зв'язок та інформаційна підтримка"
 
 #: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
-#| msgid "Publicity"
+#: ../../english/intro/organization.data:232
 msgid "Publicity team"
 msgstr "Команда зв'язків з громадськістю"
 
 #: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
 msgid "Support and Infrastructure"
 msgstr "Підтримка та інфраструктура"
 
@@ -113,188 +110,179 @@ msgstr "Лідер"
 msgid "Technical Committee"
 msgstr "Технічний комітет"
 
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
 msgid "Secretary"
 msgstr "Секретар"
 
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
 msgid "Development Projects"
 msgstr "Проекти розробки"
 
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
 msgid "FTP Archives"
 msgstr "FTP-архіви"
 
-#: ../../english/intro/organization.data:86
-#| msgid "FTP Master"
+#: ../../english/intro/organization.data:93
 msgid "FTP Masters"
 msgstr "FTP-майстри"
 
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
 msgid "FTP Assistants"
 msgstr "FTP-помічники"
 
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
 msgid "FTP Wizards"
 msgstr "FTP-чарівники"
 
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
 msgid "Backports"
 msgstr "Зворотнє перенесення"
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
 msgid "Backports Team"
 msgstr "Команда зворотнього перенесення"
 
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
 msgid "Individual Packages"
 msgstr "Окремі пакунки пакунки"
 
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
 msgid "Release Management"
 msgstr "Керування випуском"
 
-#: ../../english/intro/organization.data:112
-#| msgid "Release Notes"
+#: ../../english/intro/organization.data:117
 msgid "Release Team"
 msgstr "Команда, відповідальна за випуск"
 
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
 msgid "Quality Assurance"
 msgstr "Забезпечення якості"
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
 msgid "Installation System Team"
 msgstr "Команда системи встановлення"
 
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
 msgid "Release Notes"
 msgstr "Інформація про випуск"
 
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
 msgid "CD Images"
 msgstr "Образи компакт-дисків"
 
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
 msgid "Production"
 msgstr "Виробництво"
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
 msgid "Testing"
 msgstr "Тестування"
 
-#: ../../english/intro/organization.data:141
-#| msgid "Support and Infrastructure"
+#: ../../english/intro/organization.data:146
 msgid "Autobuilding infrastructure"
 msgstr "Інфраструктура автоматичного збирання"
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
 msgid "Wanna-build team"
 msgstr "Команда підготовки до збирання"
 
-#: ../../english/intro/organization.data:151
-#| msgid "System Administration"
+#: ../../english/intro/organization.data:156
 msgid "Buildd administration"
 msgstr "Адміністрування збирання"
 
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
 msgid "Documentation"
 msgstr "Документація"
 
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
 msgid "Work-Needing and Prospective Packages list"
 msgstr "Список пакунків що потребують доробки або плануються"
 
-#: ../../english/intro/organization.data:178
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "Команда робочої системи"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
 
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
 msgid "Ports"
 msgstr "Перенесення"
 
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
 msgid "Special Configurations"
 msgstr "Спеціальні конфігурації"
 
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
 msgid "Laptops"
 msgstr "Лептопи"
 
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
 msgid "Firewalls"
 msgstr "Брандмауери"
 
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
 msgid "Embedded systems"
 msgstr "Вбудовані системи"
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
 msgid "Press Contact"
 msgstr "Контакт для преси"
 
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
 msgid "Web Pages"
 msgstr "Веб-сторінки"
 
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
 msgid "Planet Debian"
 msgstr "Планета Debian"
 
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
 msgid "Outreach"
 msgstr "Інформаційна підтримка"
 
-#: ../../english/intro/organization.data:253
-#| msgid "Development Projects"
+#: ../../english/intro/organization.data:258
 msgid "Debian Women Project"
 msgstr "Проект Жінки Debian"
 
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
 msgid "Anti-harassment"
 msgstr "Анти-домагання"
 
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
 msgid "Events"
 msgstr "Події"
 
-#: ../../english/intro/organization.data:273
-#| msgid "Technical Committee"
+#: ../../english/intro/organization.data:278
 msgid "DebConf Committee"
 msgstr "Комітет DebConf"
 
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
 msgid "Partner Program"
 msgstr "Партнерська програма"
 
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
 msgid "Hardware Donations Coordination"
 msgstr "Координація пожертвування обладнання"
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
 msgid "User support"
 msgstr "Підтримка користувачів"
 
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
 msgid "Bug Tracking System"
 msgstr "Система відслідковування помилок"
 
-#: ../../english/intro/organization.data:370
-#| msgid "Mailing Lists Administration"
+#: ../../english/intro/organization.data:375
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Керування списками розсилки та архіви списків розсилки"
 
-#: ../../english/intro/organization.data:378
-#| msgid "New Maintainers Front Desk"
+#: ../../english/intro/organization.data:383
 msgid "New Members Front Desk"
 msgstr "Реєстраційний стіл нових членів"
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
 msgid "Debian Account Managers"
 msgstr "Керівники облікових записів Debian (КОЗД)"
 
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -302,31 +290,31 @@ msgstr ""
 "Щоб надіслати приватне повідомлення усім КОЗД, використовуйте ключ GPG "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Супроводжуючі зв'язок ключів (PGP та GPG)"
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
 msgid "Security Team"
 msgstr "Команда безпеки"
 
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
 msgid "Consultants Page"
 msgstr "Сторінка консультантів"
 
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
 msgid "CD Vendors Page"
 msgstr "Сторінка постачальників компакт-дисків"
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
 msgid "Policy"
 msgstr "Політика"
 
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
 msgid "System Administration"
 msgstr "Системне адміністрування"
 
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
 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."
@@ -335,7 +323,7 @@ msgstr ""
 "машинами Debian, включно з проблемами з паролями, або якщо вам потрібно "
 "встановити пакунок."
 
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
 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 "
@@ -345,112 +333,130 @@ msgstr ""
 "<a href=\"https://db.debian.org/machines.cgi\">Машини Debian</a>, вона "
 "повинна містити інформацію про адміністраторів кожної машини."
 
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
 msgid "LDAP Developer Directory Administrator"
 msgstr "Адміністратор LDAP-каталогу розробників"
 
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
 msgid "Mirrors"
 msgstr "Дзеркала"
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
 msgid "DNS Maintainer"
 msgstr "Супроводжуючий DNS"
 
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
 msgid "Package Tracking System"
 msgstr "Система відслідковування пакунків"
 
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Ревізор"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 "Запити на використання <a name=\"trademark\" href=\"m4_HOME/trademark"
 "\">торгової марки</a>"
 
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Адміністратори Alioth"
+
+#: ../../english/intro/organization.data:457
 msgid "Alioth administrators"
 msgstr "Адміністратори Alioth"
 
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
 msgid "Debian for children from 1 to 99"
 msgstr "Debian для дітей від 1 до 99"
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
 msgid "Debian for medical practice and research"
 msgstr "Debian для медичної практики та досліджень"
 
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
 msgid "Debian for education"
 msgstr "Debian для освіти"
 
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
 msgid "Debian in legal offices"
 msgstr "Debian в адвокатурах"
 
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
 msgid "Debian for people with disabilities"
 msgstr "Debian для людей з обмеженими можливостями"
 
-#: ../../english/intro/organization.data:481
-#| msgid "Debian for medical practice and research"
+#: ../../english/intro/organization.data:489
 msgid "Debian for science and related research"
 msgstr "Debian для науки та суміжних досліджень"
 
-#~ msgid "Publicity"
-#~ msgstr "Зв'язки з громадскістю"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian для освіти"
 
-#~ msgid "Release Assistants"
-#~ msgstr "Помічники керівника випуском"
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Команда безпеки"
 
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Керівник випуском „stable“"
+#~ msgid "Security Audit Project"
+#~ msgstr "Проект перевірки безпеки"
 
-#~ msgid "Vendors"
-#~ msgstr "Постачальники"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Це ще не є офіційний внутрішній проект Debian, але оголошення про "
+#~ "прагнення інтеграції."
 
-#~ msgid "APT Team"
-#~ msgstr "Команда APT"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Мультимедійний дистрибутив Debian"
 
-#~ msgid "Mailing List Archives"
-#~ msgstr "Архіви списків розсилки"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian для підприємств"
 
-#~ msgid "Security Testing Team"
-#~ msgstr "Команда безпеки тестового дистрибутиву"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian для некомерційних організацій"
 
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Координація підписування ключів"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Універсальна операційна система як робочій стіл"
 
 #~ msgid "Accountant"
 #~ msgstr "Рахівник"
 
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Універсальна операційна система як робочій стіл"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Координація підписування ключів"
 
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian для некомерційних організацій"
+#~ msgid "Security Testing Team"
+#~ msgstr "Команда безпеки тестового дистрибутиву"
 
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian для підприємств"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Архіви списків розсилки"
 
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Мультимедійний дистрибутив Debian"
+#~ msgid "APT Team"
+#~ msgstr "Команда APT"
 
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Це ще не є офіційний внутрішній проект Debian, але оголошення про "
-#~ "прагнення інтеграції."
+#~ msgid "Vendors"
+#~ msgstr "Постачальники"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "Проект перевірки безпеки"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Керівник випуском „stable“"
 
-#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "Команда безпеки"
+#~ msgid "Release Assistants"
+#~ msgstr "Помічники керівника випуском"
+
+#~ msgid "Publicity"
+#~ msgstr "Зв'язки з громадскістю"
+
+#~ msgid "Auditor"
+#~ msgstr "Ревізор"
+
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "Команда робочої системи"
diff --git a/ukrainian/po/others.uk.po b/ukrainian/po/others.uk.po
index b775a43cfb5..f4bebbad383 100644
--- a/ukrainian/po/others.uk.po
+++ b/ukrainian/po/others.uk.po
@@ -125,17 +125,14 @@ msgstr ""
 "\">https://www.debian.org/intl/spanish/</a> (доступно лише іспанською)."
 
 #: ../../english/distrib/pre-installed.defs:18
-#| msgid "Phone:"
 msgid "Phone"
 msgstr "Телефон"
 
 #: ../../english/distrib/pre-installed.defs:19
-#| msgid "Fax:"
 msgid "Fax"
 msgstr "Факс"
 
 #: ../../english/distrib/pre-installed.defs:21
-#| msgid "Address:"
 msgid "Address"
 msgstr "Адреса"
 
@@ -228,7 +225,6 @@ msgid "umbrellas"
 msgstr "парасолі"
 
 #: ../../english/misc/merchandise.def:51
-#| msgid "suitcases"
 msgid "pillowcases"
 msgstr "наволочки"
 
diff --git a/ukrainian/po/partners.uk.po b/ukrainian/po/partners.uk.po
index 0190c8de9ea..3c5e0a91b08 100644
--- a/ukrainian/po/partners.uk.po
+++ b/ukrainian/po/partners.uk.po
@@ -3,48 +3,68 @@
 #
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-11-15 00:06+0200\n"
 "Last-Translator: Volodymyr Bodenchuk <Bodenchuk@bigmir.net>\n"
 "Language-Team: Ukrainian <ukrainian>\n"
 "Language: uk\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n "
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"PO-Revision-Date: 2017-11-15 00:06+0200\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
 #: ../../english/partners/partners.def:8
+msgid "Partner of the Month"
+msgstr ""
+
+#: ../../english/partners/partners.def:12
+msgid "Alphabetical List of Partners"
+msgstr ""
+
+#: ../../english/partners/partners.def:16
 msgid "Development Partners"
 msgstr "Партнери по розробці"
 
-#: ../../english/partners/partners.def:12
+#: ../../english/partners/partners.def:20
 msgid "Financial Partners"
 msgstr "Фінансові партнери"
 
-#: ../../english/partners/partners.def:16
+#: ../../english/partners/partners.def:24
 msgid "Service Partners"
 msgstr "Обслуговуючі партнери"
 
-#: ../../english/partners/partners.def:20
+#: ../../english/partners/partners.def:30
 msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
 msgstr ""
 
-#: ../../english/partners/partners.def:23
+#: ../../english/partners/partners.def:33
 msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:41
+msgid ""
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
+msgstr ""
+
+#: ../../english/partners/partners.def:45
+msgid ""
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
+msgstr ""
+
+#: ../../english/partners/partners.def:53
 msgid ""
 "<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
 "supporting the Debian project as a hosting partner for several years. In "
@@ -53,7 +73,7 @@ msgid ""
 "at conova."
 msgstr ""
 
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:56
 msgid ""
 "conova operates one of the most modern data centers in all of Europe in "
 "Salzburg, Austria. Their services: customized solutions for housing, "
@@ -62,115 +82,86 @@ msgid ""
 "highest level of supply and security on their 2,000 m² of technical area."
 msgstr ""
 
-#: ../../english/partners/partners.def:34
-msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
-msgstr ""
-
-#: ../../english/partners/partners.def:37
-msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
-msgstr ""
-
-#: ../../english/partners/partners.def:41
-msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
-msgstr ""
-
-#: ../../english/partners/partners.def:44
-msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
-msgstr ""
-
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
 msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
 msgstr ""
 
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
 msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
 msgstr ""
 
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
 msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
 msgstr ""
 
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
 msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
 msgstr ""
 
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
 msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
 msgstr ""
 
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
 msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
 msgstr ""
 
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
 msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
 msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
 msgstr ""
 
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
 msgid ""
 "Since 2002, Genesi has provided the hardware it designs and develops to the "
 "Debian community. Genesi also employs Debian developers to support their "
 "platforms."
 msgstr ""
 
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
 msgid ""
 "Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
 "based computers are designed to bring low cost, energy efficient computing "
@@ -179,45 +170,41 @@ msgid ""
 "powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
 msgstr ""
 
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
 msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
 msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
 msgstr ""
 
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
 msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
 msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
 msgid ""
 "<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
 "lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -226,7 +213,7 @@ msgid ""
 "Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
 msgid ""
 "Loongson processors are a series of MIPS-compatible processors. They have "
 "been widely used in many areas, such as desktop, server, embedded "
@@ -234,187 +221,226 @@ msgid ""
 "<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
 msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
 msgstr ""
 
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
 msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
 msgstr ""
 
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
 msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
 msgstr ""
 
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
 msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
 msgstr ""
 
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
 msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
 msgstr ""
 
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
 msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
 msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
 msgstr ""
 
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
 msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
 msgstr ""
 
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
 msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
 msgstr ""
 
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
 msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
 msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
 msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
 msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
 msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
 msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
 msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
 msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
 msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
 msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
 msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
 msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
 msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
 msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
 msgstr ""
diff --git a/ukrainian/po/ports.uk.po b/ukrainian/po/ports.uk.po
index e732b5ca673..ff93b7edfb3 100644
--- a/ukrainian/po/ports.uk.po
+++ b/ukrainian/po/ports.uk.po
@@ -121,32 +121,32 @@ msgstr "Debian для PowerPC"
 msgid "Debian for Sparc"
 msgstr "Debian для Sparc"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian для лептопів"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian для AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian для Sparc64"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian для ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian для S/390"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian для Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian для MIPS"
 
-#~ msgid "Main"
-#~ msgstr "Головна сторінка"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian для Motorola 680x0"
 
 #~ msgid "Debian GNU/FreeBSD"
 #~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian для Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Головна сторінка"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian для MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian для Beowulf"
 
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian для S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian для ARM"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian для Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian для AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian для лептопів"
diff --git a/ukrainian/po/stats.uk.po b/ukrainian/po/stats.uk.po
index ac953675b95..b005e7fa8a1 100644
--- a/ukrainian/po/stats.uk.po
+++ b/ukrainian/po/stats.uk.po
@@ -31,79 +31,90 @@ msgstr "Всього %d байт для перекладу."
 msgid "There are %d strings to translate."
 msgstr "Всього %d рядків для перекладу."
 
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Цей переклад надто застарілий"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
 msgid "Wrong translation version"
 msgstr "Невірна версія перекладу"
 
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Цей переклад надто застарілий"
+
+#: ../../stattrans.pl:286
 msgid "The original is newer than this translation"
 msgstr "Оригінал новіший за цей переклад"
 
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
 msgid "The original no longer exists"
 msgstr "Оригінал більше не існує"
 
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
 msgid "hit count N/A"
 msgstr "кількість звернень не відома"
 
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
 msgid "hits"
 msgstr "звернень"
 
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
 msgid "Click to fetch diffstat data"
 msgstr "Натисніть, щоб отримати дані diffstat"
 
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
 msgid "Unified diff"
 msgstr "Уніфікований diff"
 
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
 msgid "Colored diff"
 msgstr "Кольоровий diff"
 
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Кольоровий diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
 msgid "Created with <transstatslink>"
 msgstr "Створено за допомогою <transstatslink>"
 
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
 msgid "Translation summary for"
 msgstr "Підсумок перекладу для"
 
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
 msgid "Not translated"
 msgstr "Не перекладені"
 
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
 msgid "Outdated"
 msgstr "Застарілі"
 
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
 msgid "Translated"
 msgstr "Перекладені"
 
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
 msgid "Up to date"
 msgstr "Актуальні"
 
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
 msgid "files"
 msgstr "файлів"
 
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
 msgid "bytes"
 msgstr "байт"
 
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
@@ -111,130 +122,130 @@ msgstr ""
 "Примітка: цей список сторінок відсортований за популярністю. Наведіть мишку "
 "на назву сторінки, щоб побачити кількість звернень."
 
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
 msgid "Outdated translations"
 msgstr "Застарілі переклади"
 
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
 msgid "File"
 msgstr "Файли"
 
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
 msgid "Diff"
 msgstr "Diff"
 
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
 msgid "Comment"
 msgstr "Коментар"
 
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
 msgid "Diffstat"
 msgstr "Diffstat"
 
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
 msgid "Log"
 msgstr "Журнал"
 
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
 msgid "Translation"
 msgstr "Переклад"
 
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
 msgid "Maintainer"
 msgstr "Супроводжувач"
 
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
 msgid "Status"
 msgstr "Статус"
 
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
 msgid "Translator"
 msgstr "Перекладач"
 
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
 msgid "Date"
 msgstr "Дата"
 
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
 msgid "General pages not translated"
 msgstr "Не перекладені сторінки загального характеру"
 
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
 msgid "Untranslated general pages"
 msgstr "Не перекладені сторінки загального характеру"
 
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
 msgid "News items not translated"
 msgstr "Не перекладені сторінки новин"
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
 msgid "Untranslated news items"
 msgstr "Не перекладені сторінки новин"
 
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
 msgid "Consultant/user pages not translated"
 msgstr "Не перекладені сторінки про консультантів/користувачів"
 
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
 msgid "Untranslated consultant/user pages"
 msgstr "Не перекладені сторінки про консультантів/користувачів"
 
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
 msgid "International pages not translated"
 msgstr "Не перекладені міжнародні сторінки"
 
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
 msgid "Untranslated international pages"
 msgstr "Не перекладені міжнародні сторінки"
 
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
 msgid "Translated pages (up-to-date)"
 msgstr "Перекладені сторінки (актуальні)"
 
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
 msgid "Translated templates (PO files)"
 msgstr "Перекладені шаблони (файли PO)"
 
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
 msgid "PO Translation Statistics"
 msgstr "Статистика перекладу файлів PO"
 
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
 msgid "Fuzzy"
 msgstr "Не точні"
 
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
 msgid "Untranslated"
 msgstr "Не перекладені"
 
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
 msgid "Total"
 msgstr "Всього"
 
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
 msgid "Total:"
 msgstr "Всього:"
 
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
 msgid "Translated web pages"
 msgstr "Перекладені веб-сторінки"
 
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
 msgid "Translation Statistics by Page Count"
 msgstr "Статистика перекладу за кількістю сторінок"
 
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
 msgid "Language"
 msgstr "Мова"
 
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
 msgid "Translations"
 msgstr "Переклади"
 
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
 msgid "Translated web pages (by size)"
 msgstr "Перекладені веб-сторінки (за розміром)"
 
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
 msgid "Translation Statistics by Page Size"
 msgstr "Статистика перекладу за розміром сторінок"
diff --git a/ukrainian/po/templates.uk.po b/ukrainian/po/templates.uk.po
index 01637311ca2..07e304fcabb 100644
--- a/ukrainian/po/templates.uk.po
+++ b/ukrainian/po/templates.uk.po
@@ -17,7 +17,6 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../../english/search.xml.in:7
-#| msgid "Debian Project"
 msgid "Debian website"
 msgstr "Веб-сайт Debian"
 
@@ -27,7 +26,6 @@ msgstr "Пошук веб-сайту Debian."
 
 #: ../../english/template/debian/basic.wml:19
 #: ../../english/template/debian/navbar.wml:11
-#| msgid "Help Debian"
 msgid "Debian"
 msgstr "Debian"
 
@@ -48,10 +46,6 @@ msgid "Debian Project"
 msgstr "Проект Debian"
 
 #: ../../english/template/debian/common_translation.wml:13
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
 msgid ""
 "Debian is an operating system and a distribution of Free Software. It is "
 "maintained and updated through the work of many users who volunteer their "
@@ -160,7 +154,6 @@ msgid "Getting Debian"
 msgstr "Отримання Debian"
 
 #: ../../english/template/debian/common_translation.wml:85
-#| msgid "Debian Books"
 msgid "The Debian Blog"
 msgstr "Блог Debian"
 
@@ -211,17 +204,19 @@ msgstr "у випуску 2.2"
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
 #: ../../english/template/debian/footer.wml:105
+#, fuzzy
 #| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>.  For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
+#| "To report a problem with the web site, e-mail our publicly archived "
+#| "mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-"
+#| "www@lists.debian.org</a>.  For other contact information, see the Debian "
+#| "<a href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a "
+#| "href=\"m4_HOME/devel/website/using_cvs\">available</a>."
 msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>.  For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English.  For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
 msgstr ""
 "Щоб повідомити про проблему із веб-сайтом, надішліть лист на нашу публічну "
 "адресу <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -247,8 +242,6 @@ msgstr ""
 "Дивіться <a href=\"m4_HOME/license\" rel=\"copyright\">умови ліцензії</a>"
 
 #: ../../english/template/debian/footer.wml:120
-#| msgid ""
-#| "Debian is a registered trademark of Software in the Public Interest, Inc."
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -284,12 +277,10 @@ msgid "Weekly News"
 msgstr "Щотижневі новини"
 
 #: ../../english/template/debian/links.tags.wml:16
-#| msgid "Debian Project"
 msgid "Debian Project News"
 msgstr "Новини роекту Debian"
 
 #: ../../english/template/debian/links.tags.wml:19
-#| msgid "Weekly News"
 msgid "Project News"
 msgstr "Новини проекту"
 
@@ -314,7 +305,6 @@ msgid "Debian Books"
 msgstr "Книги Debian"
 
 #: ../../english/template/debian/links.tags.wml:37
-#| msgid "Help Debian"
 msgid "Debian Wiki"
 msgstr "Debian Вікі"
 
@@ -347,7 +337,6 @@ msgid "Developer Database"
 msgstr "База даних розробників"
 
 #: ../../english/template/debian/links.tags.wml:64
-#| msgid "Debian Books"
 msgid "Debian FAQ"
 msgstr "ЧаПи Debian"
 
@@ -456,7 +445,6 @@ msgid "Debian Developer's Packages Overview"
 msgstr "Огляд пакунків для розробників Debian"
 
 #: ../../english/template/debian/navbar.wml:10
-#| msgid "Debian Project"
 msgid "Debian Home"
 msgstr "Домівка Debian"
 
@@ -528,6 +516,10 @@ msgid ""
 msgstr ""
 "<em>Зауваження:</em> Оригінальний документ цього перекладу більше не існує."
 
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
 #: ../../english/template/debian/url.wml:4
 msgid "URL"
 msgstr "URL"
@@ -536,428 +528,428 @@ msgstr "URL"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Повернутися на <a href=\"./\">сторінку користувачів Debian</a>."
 
-#~ msgid "More information"
-#~ msgstr "Додаткова інформація"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Майбутні події"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Відвідайте нашого спонсора"
 
-#~ msgid "link may no longer be valid"
-#~ msgstr "посилання може бути більше не діяти"
+#~ msgid "Select a server near you"
+#~ msgstr "Виберіть найближчий сервер"
 
-#~ msgid "When"
-#~ msgstr "Коли"
+#~ msgid "More information:"
+#~ msgstr "Додаткова інформація:"
 
-#~ msgid "Where"
-#~ msgstr "Де"
+#~ msgid "Taken by:"
+#~ msgstr "Відповідальний:"
 
-#~ msgid "More Info"
-#~ msgstr "Додаткова інформація"
+#~ msgid "Nobody"
+#~ msgstr "Ніхто"
 
-#~ msgid "Debian Involvement"
-#~ msgstr "Участь Debian"
+#~ msgid "Rating:"
+#~ msgstr "Рейтинг:"
 
-#~ msgid "Main Coordinator"
-#~ msgstr "Головний координатор"
+#~ msgid "List of Consultants"
+#~ msgstr "Список консультантів"
 
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Координатор</th><th>проекту</th>"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Повернутися на <a href=\"./\">сторінку консультантів Debian</a>."
 
-#~ msgid "Related Links"
-#~ msgstr "Пов'язані посилання"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
 
-#~ msgid "Latest News"
-#~ msgstr "Останні новини"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Завантажити за допомогою Jigdo"
 
-#~ msgid "Download calendar entry"
-#~ msgstr "Завантажити календарний запис"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Завантажити через HTTP/FTP"
 
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Повернутися до: інших <a href=\"./\">новин Debian</a> || <a href="
-#~ "\"m4_HOME/\">головну сторінку проекту Debian</a>."
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Купити CD або DVD"
 
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (мертве посилання)"
+#~ msgid "Network Install"
+#~ msgstr "Встановлення через мережу"
 
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
-#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Завантажити"
 
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "Також наявні <a href=\"../../\">минулі випуски</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Різне"
 
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Відображення"
 
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ 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 випускають <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-дзеркала"
 
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ 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:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Завантажити через Torrent"
 
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ 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:dwn@debian.org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Команда CD Debian"
 
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Переклав %s."
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian на CD"
 
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Переклали %s."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />FAQ"
 
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Переклала %s."
+#~ msgid "jigdo"
+#~ msgstr "jidgo"
 
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Переклали %s."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
 
-#~ msgid "List of Speakers"
-#~ msgstr "Список доповідачів"
+#~ msgid "buy"
+#~ msgstr "купити"
 
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Повернутися на <a href=\"./\">сторінку доповідачів Debian</a>."
+#~ msgid "net_install"
+#~ msgstr "встановлення через мережу"
 
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
-#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />різне"
 
 #~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
 #~ msgstr ""
-#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "Англомовний <a href=\"/MailingLists/disclaimer\">список розсилки</a> "
+#~ "присвячений CD/DVD:"
 
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Date"
+#~ msgstr "Дата"
 
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Platforms"
+#~ msgstr "Платформи"
 
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Text"
+#~ msgstr "Текст"
 
-#~ msgid "No requests for adoption"
-#~ msgstr "Запитів про „усиновлення“ не поступали"
+#~ msgid "Ballot"
+#~ msgstr "Бюлетень"
 
-#~ msgid "No orphaned packages"
-#~ msgstr "Немає „осиротілих“ пакунків"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Очікує&nbsp;спонсорів"
 
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Немає пакунків, що очікують на „усиновлення“"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Розглядається"
 
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Немає пакунків, по яким ведеться робота"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Голосування&nbsp;відкрите"
 
-#~ msgid "No Requested packages"
-#~ msgstr "Немає запитів на створення пакунків"
+#~ msgid "Decided"
+#~ msgstr "Прийняте"
 
-#~ msgid "No help requested"
-#~ msgstr "Немає запитів про допомогу"
+#~ msgid "Withdrawn"
+#~ msgstr "Відхилене"
 
-#~ msgid "in adoption since today."
-#~ msgstr "„усиновлення“ почалося сьогодні."
+#~ msgid "Other"
+#~ msgstr "Інше"
 
-#~ msgid "in adoption since yesterday."
-#~ msgstr "„усиновлення“ почалося вчора."
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "На&nbsp;сторінку&nbsp;голосувань"
 
-#~ msgid "%s days in adoption."
-#~ msgstr "„усиновлення“ почалося %s днів тому."
+#~ msgid "How&nbsp;To"
+#~ msgstr "Як"
 
-#~ msgid "in preparation since today."
-#~ msgstr "робота почалась сьогодні."
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Внести&nbsp;пропозицію"
 
-#~ msgid "in preparation since yesterday."
-#~ msgstr "робота почалась вчора."
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Внести&nbsp;поправку"
 
-#~ msgid "%s days in preparation."
-#~ msgstr "робота почалась %s днів тому."
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Підтримати&nbsp;пропозицію"
 
-#~ msgid "requested today."
-#~ msgstr "запит отриманий сьогодні."
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Взнати&nbsp;результат"
 
-#~ msgid "requested yesterday."
-#~ msgstr "запит отриманий вчора."
+#~ msgid "Vote"
+#~ msgstr "Проголосувати"
 
-#~ msgid "requested %s days ago."
-#~ msgstr "запит отриманий %s днів тому."
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Дивіться сторінку <a href=\"./\">інформації про ліцензії</a> для огляду "
+#~ "резюме Debian по ліцензіям (Debian License Summaries&nbsp;&mdash; DLS)."
 
-#~ msgid "package info"
-#~ msgstr "інформація про пакунок"
+#~ msgid "Not Redistributable"
+#~ msgstr "З обмеженнями на розповсюдження"
 
-#~ msgid "License Information"
-#~ msgstr "Інформація про ліцензії"
+#~ msgid "Non-Free"
+#~ msgstr "Невільні"
 
-#~ msgid "DLS Index"
-#~ msgstr "Індекс DLS"
+#~ msgid "Free"
+#~ msgstr "Вільні"
 
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "not redistributable"
+#~ msgstr "з обмеженнями на розповсюдження"
 
-#~ msgid "DFSG FAQ"
-#~ msgstr "FAQ по DFSG"
+#~ msgid "non-free"
+#~ msgstr "невільна"
 
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Архів Debian-Legal"
+#~ msgid "free"
+#~ msgstr "вільна"
 
-#~ msgid "%s  &ndash; %s: %s"
-#~ msgstr "%s&nbsp;&mdash; %s: %s"
+#~ msgid "License text"
+#~ msgstr "Текст ліцензії"
 
-#~ msgid "%s  &ndash; %s, Version %s: %s"
-#~ msgstr "%s&nbsp;&mdash; %s, версія %s: %s"
+#~ msgid "License text (translated)"
+#~ msgstr "Текст ліцензії (перекладений)"
 
-#~ msgid "Date published"
-#~ msgstr "Дата публікації"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Підготував це резюме <summary-author/>."
 
-#~ msgid "License"
-#~ msgstr "Ліцензія"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Автор початкового резюме: <summary-author/>. Резюме може бути знайдене в "
+#~ "<a href=\"<summary-url/>\">списку розсилки</a>."
 
-#~ msgid "Version"
-#~ msgstr "Версія"
+#~ msgid "Original Summary"
+#~ msgstr "Початкове резюме"
 
-#~ msgid "Summary"
-#~ msgstr "Резюме"
+#~ msgid "Discussion"
+#~ msgstr "Обговорення"
 
 #~ msgid "Justification"
 #~ msgstr "Обґрунтування"
 
-#~ msgid "Discussion"
-#~ msgstr "Обговорення"
+#~ msgid "Summary"
+#~ msgstr "Резюме"
 
-#~ msgid "Original Summary"
-#~ msgstr "Початкове резюме"
+#~ msgid "Version"
+#~ msgstr "Версія"
 
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Автор початкового резюме: <summary-author/>. Резюме може бути знайдене в "
-#~ "<a href=\"<summary-url/>\">списку розсилки</a>."
+#~ msgid "License"
+#~ msgstr "Ліцензія"
 
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Підготував це резюме <summary-author/>."
+#~ msgid "Date published"
+#~ msgstr "Дата публікації"
 
-#~ msgid "License text (translated)"
-#~ msgstr "Текст ліцензії (перекладений)"
+#~ msgid "%s  &ndash; %s, Version %s: %s"
+#~ msgstr "%s&nbsp;&mdash; %s, версія %s: %s"
 
-#~ msgid "License text"
-#~ msgstr "Текст ліцензії"
+#~ msgid "%s  &ndash; %s: %s"
+#~ msgstr "%s&nbsp;&mdash; %s: %s"
 
-#~ msgid "free"
-#~ msgstr "вільна"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Архів Debian-Legal"
 
-#~ msgid "non-free"
-#~ msgstr "невільна"
+#~ msgid "DFSG FAQ"
+#~ msgstr "FAQ по DFSG"
 
-#~ msgid "not redistributable"
-#~ msgstr "з обмеженнями на розповсюдження"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
 
-#~ msgid "Free"
-#~ msgstr "Вільні"
+#~ msgid "DLS Index"
+#~ msgstr "Індекс DLS"
 
-#~ msgid "Non-Free"
-#~ msgstr "Невільні"
+#~ msgid "License Information"
+#~ msgstr "Інформація про ліцензії"
 
-#~ msgid "Not Redistributable"
-#~ msgstr "З обмеженнями на розповсюдження"
+#~ msgid "package info"
+#~ msgstr "інформація про пакунок"
 
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Дивіться сторінку <a href=\"./\">інформації про ліцензії</a> для огляду "
-#~ "резюме Debian по ліцензіям (Debian License Summaries&nbsp;&mdash; DLS)."
+#~ msgid "requested %s days ago."
+#~ msgstr "запит отриманий %s днів тому."
 
-#~ msgid "Vote"
-#~ msgstr "Проголосувати"
+#~ msgid "requested yesterday."
+#~ msgstr "запит отриманий вчора."
 
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Взнати&nbsp;результат"
+#~ msgid "requested today."
+#~ msgstr "запит отриманий сьогодні."
 
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Підтримати&nbsp;пропозицію"
+#~ msgid "%s days in preparation."
+#~ msgstr "робота почалась %s днів тому."
 
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Внести&nbsp;поправку"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "робота почалась вчора."
 
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Внести&nbsp;пропозицію"
+#~ msgid "in preparation since today."
+#~ msgstr "робота почалась сьогодні."
 
-#~ msgid "How&nbsp;To"
-#~ msgstr "Як"
+#~ msgid "%s days in adoption."
+#~ msgstr "„усиновлення“ почалося %s днів тому."
 
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "На&nbsp;сторінку&nbsp;голосувань"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "„усиновлення“ почалося вчора."
 
-#~ msgid "Other"
-#~ msgstr "Інше"
+#~ msgid "in adoption since today."
+#~ msgstr "„усиновлення“ почалося сьогодні."
 
-#~ msgid "Withdrawn"
-#~ msgstr "Відхилене"
+#~ msgid "No help requested"
+#~ msgstr "Немає запитів про допомогу"
 
-#~ msgid "Decided"
-#~ msgstr "Прийняте"
+#~ msgid "No Requested packages"
+#~ msgstr "Немає запитів на створення пакунків"
 
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Голосування&nbsp;відкрите"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Немає пакунків, по яким ведеться робота"
 
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Розглядається"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Немає пакунків, що очікують на „усиновлення“"
 
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Очікує&nbsp;спонсорів"
+#~ msgid "No orphaned packages"
+#~ msgstr "Немає „осиротілих“ пакунків"
 
-#~ msgid "Ballot"
-#~ msgstr "Бюлетень"
+#~ msgid "No requests for adoption"
+#~ msgstr "Запитів про „усиновлення“ не поступали"
 
-#~ msgid "Text"
-#~ msgstr "Текст"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
 
-#~ msgid "Platforms"
-#~ msgstr "Платформи"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
 
-#~ msgid "Date"
-#~ msgstr "Дата"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 
 #~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 #~ msgstr ""
-#~ "Англомовний <a href=\"/MailingLists/disclaimer\">список розсилки</a> "
-#~ "присвячений CD/DVD:"
+#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />різне"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
+#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
 
-#~ msgid "net_install"
-#~ msgstr "встановлення через мережу"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Повернутися на <a href=\"./\">сторінку доповідачів Debian</a>."
 
-#~ msgid "buy"
-#~ msgstr "купити"
+#~ msgid "List of Speakers"
+#~ msgstr "Список доповідачів"
 
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Переклали %s."
 
-#~ msgid "jigdo"
-#~ msgstr "jidgo"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Переклала %s."
 
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />FAQ"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Переклали %s."
 
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian на CD"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Переклав %s."
 
-#~ msgid "Debian CD team"
-#~ msgstr "Команда CD Debian"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ 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:dwn@debian.org\">%s</a>."
 
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Завантажити через Torrent"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ 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:dwn@debian.org\">%s</a>."
 
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-дзеркала"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ 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 випускають <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Відображення"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Різне"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "Також наявні <a href=\"../../\">минулі випуски</a>."
 
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Завантажити"
+#, fuzzy
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
+#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
 
-#~ msgid "Network Install"
-#~ msgstr "Встановлення через мережу"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (мертве посилання)"
 
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Купити CD або DVD"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Повернутися до: інших <a href=\"./\">новин Debian</a> || <a href="
+#~ "\"m4_HOME/\">головну сторінку проекту Debian</a>."
 
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Завантажити через HTTP/FTP"
+#~ msgid "Download calendar entry"
+#~ msgstr "Завантажити календарний запис"
 
-#~ msgid "Download with Jigdo"
-#~ msgstr "Завантажити за допомогою Jigdo"
+#~ msgid "Latest News"
+#~ msgstr "Останні новини"
 
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Related Links"
+#~ msgstr "Пов'язані посилання"
 
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Повернутися на <a href=\"./\">сторінку консультантів Debian</a>."
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Координатор</th><th>проекту</th>"
 
-#~ msgid "List of Consultants"
-#~ msgstr "Список консультантів"
+#~ msgid "Main Coordinator"
+#~ msgstr "Головний координатор"
 
-#~ msgid "Rating:"
-#~ msgstr "Рейтинг:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Участь Debian"
 
-#~ msgid "Nobody"
-#~ msgstr "Ніхто"
+#~ msgid "More Info"
+#~ msgstr "Додаткова інформація"
 
-#~ msgid "Taken by:"
-#~ msgstr "Відповідальний:"
+#~ msgid "Where"
+#~ msgstr "Де"
 
-#~ msgid "More information:"
-#~ msgstr "Додаткова інформація:"
+#~ msgid "When"
+#~ msgstr "Коли"
 
-#~ msgid "Select a server near you"
-#~ msgstr "Виберіть найближчий сервер"
+#~ msgid "link may no longer be valid"
+#~ msgstr "посилання може бути більше не діяти"
 
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Відвідайте нашого спонсора"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Майбутні події"
+
+#~ msgid "More information"
+#~ msgstr "Додаткова інформація"
diff --git a/ukrainian/po/vendors.uk.po b/ukrainian/po/vendors.uk.po
index d6a0b2d1e19..82d4604ddcb 100644
--- a/ukrainian/po/vendors.uk.po
+++ b/ukrainian/po/vendors.uk.po
@@ -17,12 +17,10 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../../english/CD/vendors/vendors.CD.def:14
-#| msgid "Vendor:"
 msgid "Vendor"
 msgstr "Постачальник"
 
 #: ../../english/CD/vendors/vendors.CD.def:15
-#| msgid "Allows Contribution to Debian:"
 msgid "Allows Contributions"
 msgstr "Дозволяє внески"
 
@@ -31,12 +29,10 @@ msgid "CD/DVD/BD/USB"
 msgstr "CD/DVD/BD/USB"
 
 #: ../../english/CD/vendors/vendors.CD.def:17
-#| msgid "Architectures:"
 msgid "Architectures"
 msgstr "Архітектури"
 
 #: ../../english/CD/vendors/vendors.CD.def:18
-#| msgid "Ship International:"
 msgid "Ship International"
 msgstr "Міжнародна доставка"
 
@@ -47,7 +43,6 @@ msgstr "Контакт"
 #. ###################
 #. Vendor home page link, Debian page link
 #: ../../english/CD/vendors/vendors.CD.def:44
-#| msgid "Vendor:"
 msgid "Vendor Home"
 msgstr "Сторінка постачальника"
 
@@ -56,7 +51,6 @@ msgid "page"
 msgstr "сторінка"
 
 #: ../../english/CD/vendors/vendors.CD.def:71
-#| msgid "email:"
 msgid "email"
 msgstr "електронна пошта"
 
@@ -76,74 +70,74 @@ msgstr "джерельні коди"
 msgid "and"
 msgstr "та"
 
-#~ msgid "Official CD"
-#~ msgstr "Офіційні CD"
-
-#~ msgid "Official DVD"
-#~ msgstr "Офіційні DVD"
+#~ msgid "Vendor:"
+#~ msgstr "Постачальник:"
 
-#~ msgid "Development Snapshot"
-#~ msgstr "Знімок для розробиків"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL для сторінки Debian:"
 
-#~ msgid "Vendor Release"
-#~ msgstr "Випуск продавця"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Дозволяє внесок для Debian"
 
-#~ msgid "Multiple Distribution"
-#~ msgstr "Декілька дистрибутивів"
+#~ msgid "Country:"
+#~ msgstr "Країна:"
 
-#~ msgid "non-US included"
-#~ msgstr "з non-US"
+#~ msgid "Ship International:"
+#~ msgstr "Міжнародна доставка:"
 
-#~ msgid "non-free included"
-#~ msgstr "з non-free"
+#~ msgid "email:"
+#~ msgstr "E-mail:"
 
-#~ msgid "contrib included"
-#~ msgstr "з contrib"
+#~ msgid "CD Type:"
+#~ msgstr "Тип CD:"
 
-#~ msgid "vendor additions"
-#~ msgstr "додатки продавця"
+#~ msgid "DVD Type:"
+#~ msgstr "Тип DVD:"
 
-#~ msgid "Custom Release"
-#~ msgstr "Власний випуск"
+#~ msgid "Architectures:"
+#~ msgstr "Архітектури:"
 
-#~ msgid "reseller of $var"
-#~ msgstr "реселлер $var"
+#~ msgid "updated monthly"
+#~ msgstr "оновлення раз на місяць"
 
-#~ msgid "reseller"
-#~ msgstr "реселлер"
+#~ msgid "updated twice weekly"
+#~ msgstr "оновлення два рази на тиждень"
 
 #~ msgid "updated weekly"
 #~ msgstr "щотижневі оновлення"
 
-#~ msgid "updated twice weekly"
-#~ msgstr "оновлення два рази на тиждень"
+#~ msgid "reseller"
+#~ msgstr "реселлер"
 
-#~ msgid "updated monthly"
-#~ msgstr "оновлення раз на місяць"
+#~ msgid "reseller of $var"
+#~ msgstr "реселлер $var"
 
-#~ msgid "Architectures:"
-#~ msgstr "Архітектури:"
+#~ msgid "Custom Release"
+#~ msgstr "Власний випуск"
 
-#~ msgid "DVD Type:"
-#~ msgstr "Тип DVD:"
+#~ msgid "vendor additions"
+#~ msgstr "додатки продавця"
 
-#~ msgid "CD Type:"
-#~ msgstr "Тип CD:"
+#~ msgid "contrib included"
+#~ msgstr "з contrib"
 
-#~ msgid "email:"
-#~ msgstr "E-mail:"
+#~ msgid "non-free included"
+#~ msgstr "з non-free"
 
-#~ msgid "Ship International:"
-#~ msgstr "Міжнародна доставка:"
+#~ msgid "non-US included"
+#~ msgstr "з non-US"
 
-#~ msgid "Country:"
-#~ msgstr "Країна:"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Декілька дистрибутивів"
 
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Дозволяє внесок для Debian"
+#~ msgid "Vendor Release"
+#~ msgstr "Випуск продавця"
 
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL для сторінки Debian:"
+#~ msgid "Development Snapshot"
+#~ msgstr "Знімок для розробиків"
 
-#~ msgid "Vendor:"
-#~ msgstr "Постачальник:"
+#~ msgid "Official DVD"
+#~ msgstr "Офіційні DVD"
+
+#~ msgid "Official CD"
+#~ msgstr "Офіційні CD"
diff --git a/ukrainian/po/wnpp.uk.po b/ukrainian/po/wnpp.uk.po
index c7ff7ac9b49..979508ac1a7 100644
--- a/ukrainian/po/wnpp.uk.po
+++ b/ukrainian/po/wnpp.uk.po
@@ -55,12 +55,10 @@ msgid "%s days in adoption."
 msgstr "„усиновлення“ почалося %s днів тому."
 
 #: ../../english/template/debian/wnpp.wml:46
-#| msgid "%s days in adoption."
 msgid "%s days in adoption, last activity today."
 msgstr "„усиновлення“ почалося %s днів тому, остання активність була сьогодні."
 
 #: ../../english/template/debian/wnpp.wml:50
-#| msgid "in adoption since yesterday."
 msgid "%s days in adoption, last activity yesterday."
 msgstr "„усиновлення“ почалося %s днів тому, остання активність була вчора."
 
@@ -83,50 +81,41 @@ msgid "%s days in preparation."
 msgstr "підготовка почалась %s днів тому."
 
 #: ../../english/template/debian/wnpp.wml:72
-#| msgid "%s days in preparation."
 msgid "%s days in preparation, last activity today."
 msgstr "підготовка почалась %s днів тому, остання активність була сьогодні."
 
 #: ../../english/template/debian/wnpp.wml:76
-#| msgid "in preparation since yesterday."
 msgid "%s days in preparation, last activity yesterday."
 msgstr "підготовка почалась %s днів тому, остання активність була вчора."
 
 #: ../../english/template/debian/wnpp.wml:80
-#| msgid "%s days in preparation."
 msgid "%s days in preparation, last activity %s days ago."
 msgstr ""
 "підготовка почалась %s днів тому, остання активність була %s днів тому."
 
 #. timespans for request for adoption (RFAs)
 #: ../../english/template/debian/wnpp.wml:85
-#| msgid "in adoption since today."
 msgid "adoption requested since today."
 msgstr "запит на „усиновлення“ створений сьогодні."
 
 #: ../../english/template/debian/wnpp.wml:89
-#| msgid "in adoption since yesterday."
 msgid "adoption requested since yesterday."
 msgstr "запит на „усиновлення“ створений вчора."
 
 #: ../../english/template/debian/wnpp.wml:93
-#| msgid "in adoption since today."
 msgid "adoption requested since %s days."
 msgstr "запит на „усиновлення“ створений %s днів тому."
 
 #. timespans for orphaned packages (Os)
 #: ../../english/template/debian/wnpp.wml:98
-#| msgid "in adoption since today."
 msgid "orphaned since today."
 msgstr "„осиротів“ сьогодні."
 
 #: ../../english/template/debian/wnpp.wml:102
-#| msgid "in adoption since yesterday."
 msgid "orphaned since yesterday."
 msgstr "„осиротів“ вчора."
 
 #: ../../english/template/debian/wnpp.wml:106
-#| msgid "in preparation since today."
 msgid "orphaned since %s days."
 msgstr "„осиротів“ %s днів тому."
author	Boyuan Yang <073plan@gmail.com>	2018-06-02 17:23:22 +0800
committer	Boyuan Yang <073plan@gmail.com>	2018-06-02 17:24:50 +0800
commit	791fde30e7c874cecb5a0220593130a16279c366 (patch)
tree	1584247cb4ba787a0fd97f48817b5114cdc6de8a /ukrainian/po
parent	3c508740e4547501e8db1652b165b85a38036086 (diff)