aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamyan Ivanov <dmn>2012-01-08 20:16:32 +0000
committerDamyan Ivanov <dmn>2012-01-08 20:16:32 +0000
commita53db02947be07101689d93fa6640936f29b9ad6 (patch)
tree17f779c8f8442500ea775467532aaa3ee5bc6f36
parent50aa5336949260cd39e3d4bef17cb7655a6621f5 (diff)
remove &nbsp; usege from main page TOC
update .pot files and unfuzzy translations &nbsp; may prevent some of the items from wrapping, causing text overlap on narrow browser windows or portable devices CVS version numbers arabic/po/templates.ar.po: 1.21 -> 1.22 armenian/po/templates.hy.po: 1.10 -> 1.11 bulgarian/po/templates.bg.po: 1.56 -> 1.57 catalan/po/templates.ca.po: 1.43 -> 1.44 chinese/po/templates.zh.po: 1.26 -> 1.27 croatian/po/templates.hr.po: 1.37 -> 1.38 czech/po/templates.cs.po: 1.25 -> 1.26 danish/po/templates.da.po: 1.56 -> 1.57 dutch/po/templates.nl.po: 1.67 -> 1.68 english/po/bugs.pot: 1.16 -> 1.17 english/po/countries.pot: 1.29 -> 1.30 english/po/distrib.pot: 1.14 -> 1.15 english/po/doc.pot: 1.13 -> 1.14 english/po/l10n.pot: 1.4 -> 1.5 english/po/newsevents.pot: 1.5 -> 1.6 english/po/organization.pot: 1.58 -> 1.59 english/po/ports.pot: 1.13 -> 1.14 english/po/security.pot: 1.9 -> 1.10 english/po/templates.pot: 1.67 -> 1.68 english/template/debian/common_translation.wml: 1.163 -> 1.164 english/template/debian/links.tags.wml: 1.131 -> 1.132 esperanto/po/templates.eo.po: 1.20 -> 1.21 finnish/po/templates.fi.po: 1.46 -> 1.47 french/po/templates.fr.po: 1.70 -> 1.71 german/po/templates.de.po: 1.82 -> 1.83 greek/po/templates.el.po: 1.22 -> 1.23 hebrew/po/templates.he.po: 1.12 -> 1.13 hungarian/po/templates.hu.po: 1.27 -> 1.28 indonesian/po/templates.id.po: 1.14 -> 1.15 italian/po/templates.it.po: 1.48 -> 1.49 japanese/po/templates.ja.po: 1.36 -> 1.37 korean/po/templates.ko.po: 1.20 -> 1.21 lithuanian/po/templates.lt.po: 1.21 -> 1.22 norwegian/po/templates.nb.po: 1.4 -> 1.5 persian/po/templates.fa.po: 1.14 -> 1.15 polish/po/templates.pl.po: 1.44 -> 1.45 portuguese/po/templates.pt.po: 1.58 -> 1.59 romanian/po/templates.ro.po: 1.28 -> 1.29 russian/po/templates.ru.po: 1.48 -> 1.49 slovak/po/templates.sk.po: 1.19 -> 1.20 slovene/po/templates.sl.po: 1.9 -> 1.10 spanish/po/templates.es.po: 1.48 -> 1.49 swedish/po/templates.sv.po: 1.60 -> 1.61 tamil/po/templates.ta.po: 1.10 -> 1.11 turkish/po/templates.tr.po: 1.23 -> 1.24 ukrainian/po/templates.uk.po: 1.17 -> 1.18 vietnamese/po/templates.vi.po: 1.1 -> 1.2
-rw-r--r--arabic/po/templates.ar.po58
-rw-r--r--armenian/po/templates.hy.po28
-rw-r--r--bulgarian/po/templates.bg.po28
-rw-r--r--catalan/po/templates.ca.po54
-rw-r--r--chinese/po/templates.zh.po34
-rw-r--r--croatian/po/templates.hr.po56
-rw-r--r--czech/po/templates.cs.po54
-rw-r--r--danish/po/templates.da.po38
-rw-r--r--dutch/po/templates.nl.po46
-rw-r--r--english/po/bugs.pot74
-rw-r--r--english/po/countries.pot202
-rw-r--r--english/po/distrib.pot23
-rw-r--r--english/po/doc.pot16
-rw-r--r--english/po/l10n.pot42
-rw-r--r--english/po/newsevents.pot2
-rw-r--r--english/po/organization.pot110
-rw-r--r--english/po/ports.pot13
-rw-r--r--english/po/security.pot8
-rw-r--r--english/po/templates.pot42
-rw-r--r--english/template/debian/common_translation.wml6
-rw-r--r--english/template/debian/links.tags.wml24
-rw-r--r--esperanto/po/templates.eo.po57
-rw-r--r--finnish/po/templates.fi.po38
-rw-r--r--french/po/templates.fr.po54
-rw-r--r--german/po/templates.de.po36
-rw-r--r--greek/po/templates.el.po34
-rw-r--r--hebrew/po/templates.he.po36
-rw-r--r--hungarian/po/templates.hu.po40
-rw-r--r--indonesian/po/templates.id.po56
-rw-r--r--italian/po/templates.it.po54
-rw-r--r--japanese/po/templates.ja.po28
-rw-r--r--korean/po/templates.ko.po34
-rw-r--r--lithuanian/po/templates.lt.po57
-rw-r--r--norwegian/po/templates.nb.po38
-rw-r--r--persian/po/templates.fa.po28
-rw-r--r--polish/po/templates.pl.po56
-rw-r--r--portuguese/po/templates.pt.po54
-rw-r--r--romanian/po/templates.ro.po40
-rw-r--r--russian/po/templates.ru.po56
-rw-r--r--slovak/po/templates.sk.po50
-rw-r--r--slovene/po/templates.sl.po46
-rw-r--r--spanish/po/templates.es.po56
-rw-r--r--swedish/po/templates.sv.po38
-rw-r--r--tamil/po/templates.ta.po58
-rw-r--r--turkish/po/templates.tr.po58
-rw-r--r--ukrainian/po/templates.uk.po58
-rw-r--r--vietnamese/po/templates.vi.po28
47 files changed, 1068 insertions, 1078 deletions
diff --git a/arabic/po/templates.ar.po b/arabic/po/templates.ar.po
index 9ae4ecccad1..eb6e7bf89fe 100644
--- a/arabic/po/templates.ar.po
+++ b/arabic/po/templates.ar.po
@@ -62,8 +62,8 @@ msgid "About Debian"
msgstr "حول ديبيان"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "أتصل&nbsp;بنا"
+msgid "Contact Us"
+msgstr "أتصل بنا"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -87,16 +87,16 @@ msgstr "دعم"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "ركن&nbsp;المطورين"
+msgid "Developers' Corner"
+msgstr "ركن المطورين"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "وثائق"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "معلومات&nbsp;أمنية"
+msgid "Security Information"
+msgstr "معلومات أمنية"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -213,8 +213,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "كيفيّة تعيين <a href=m4_HOME/intro/cn>لغة المستند الافتراضيّة</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "ديبيان&nbsp;الدوليّة"
+msgid "Debian International"
+msgstr "ديبيان الدوليّة"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -225,8 +225,8 @@ msgid "Debian Weekly News"
msgstr "أخبار ديبيان الأسبوعية"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "أخبار&nbsp;أسبوعية"
+msgid "Weekly News"
+msgstr "أخبار أسبوعية"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
@@ -236,17 +236,17 @@ msgstr "مشروع ديبيان"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "أخبار&nbsp;أسبوعية"
+#| msgid "Weekly News"
+msgid "Project News"
+msgstr "أخبار أسبوعية"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "معلومات&nbsp;الإصدارات"
+msgid "Release Info"
+msgstr "معلومات الإصدارات"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "حزم&nbsp;ديبيان"
+msgid "Debian Packages"
+msgstr "حزم ديبيان"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -257,20 +257,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "ديبيان&nbsp;على&nbsp;قرص مدمج"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "كُتب&nbsp;ديبيان"
+msgid "Debian Books"
+msgstr "كُتب ديبيان"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "أرشيف&nbsp;القوائم&nbsp;البريدية"
+msgid "Mailing List Archives"
+msgstr "أرشيف القوائم البريدية"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "القوائم&nbsp;البريدية"
+msgid "Mailing Lists"
+msgstr "القوائم البريدية"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "العقد&nbsp;الاجتماعي"
+msgid "Social Contract"
+msgstr "العقد الاجتماعي"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -329,8 +329,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "أرشيف القوائم البريديّة المتفرّقة"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "البرمجيات&nbsp;الحرة"
+msgid "Free Software"
+msgstr "البرمجيات الحرة"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -349,8 +349,8 @@ msgid "Ports/Architectures"
msgstr "Ports/البُنى"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "دليل&nbsp;التثبيت"
+msgid "Installation manual"
+msgstr "دليل التثبيت"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/armenian/po/templates.hy.po b/armenian/po/templates.hy.po
index 1c9c3e0a6a5..4e1add3f914 100644
--- a/armenian/po/templates.hy.po
+++ b/armenian/po/templates.hy.po
@@ -52,7 +52,7 @@ msgid "About Debian"
msgstr ""
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr ""
#: ../../english/template/debian/common_translation.wml:37
@@ -77,7 +77,7 @@ msgstr ""
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr ""
#: ../../english/template/debian/common_translation.wml:55
@@ -85,7 +85,7 @@ msgid "Documentation"
msgstr ""
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr ""
#: ../../english/template/debian/common_translation.wml:61
@@ -195,7 +195,7 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr ""
#: ../../english/template/debian/links.tags.wml:7
@@ -207,7 +207,7 @@ msgid "Debian Weekly News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:16
@@ -215,15 +215,15 @@ msgid "Debian Project News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr ""
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr ""
#: ../../english/template/debian/links.tags.wml:28
@@ -235,19 +235,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr ""
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr ""
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr ""
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr ""
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr ""
#: ../../english/template/debian/links.tags.wml:49
@@ -307,7 +307,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr ""
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr ""
#: ../../english/template/debian/links.tags.wml:98
@@ -327,7 +327,7 @@ msgid "Ports/Architectures"
msgstr ""
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr ""
#: ../../english/template/debian/links.tags.wml:113
diff --git a/bulgarian/po/templates.bg.po b/bulgarian/po/templates.bg.po
index 6ca51ae589b..01d6f4e1194 100644
--- a/bulgarian/po/templates.bg.po
+++ b/bulgarian/po/templates.bg.po
@@ -66,7 +66,7 @@ msgid "About Debian"
msgstr "За Дебиан"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Контакти"
#: ../../english/template/debian/common_translation.wml:37
@@ -91,7 +91,7 @@ msgstr "Поддръжка"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Разработка"
#: ../../english/template/debian/common_translation.wml:55
@@ -99,7 +99,7 @@ msgid "Documentation"
msgstr "Документация"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "За сигурността"
#: ../../english/template/debian/common_translation.wml:61
@@ -221,7 +221,7 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Настройване на <a href=m4_HOME/intro/cn>езика по подразбиране</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr "Дебиан Интернационал"
#: ../../english/template/debian/links.tags.wml:7
@@ -233,7 +233,7 @@ msgid "Debian Weekly News"
msgstr "Седмични новини за Дебиан"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "Седмични новини"
#: ../../english/template/debian/links.tags.wml:16
@@ -241,15 +241,15 @@ msgid "Debian Project News"
msgstr "Новини за проекта Дебиан"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "Новини за проекта"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Издания"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Пакети"
#: ../../english/template/debian/links.tags.wml:28
@@ -261,19 +261,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Дебиан на компактдиск"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Книги за Дебиан"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "Архиви на пощенските списъци"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Пощенски списъци"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "Обществен договор"
#: ../../english/template/debian/links.tags.wml:49
@@ -342,7 +342,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Архиви на други пощенски списъци"
#: ../../english/template/debian/links.tags.wml:98
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr "Свободен софтуер "
#: ../../english/template/debian/links.tags.wml:104
@@ -362,7 +362,7 @@ msgid "Ports/Architectures"
msgstr "Портове и Архитектури"
#: ../../english/template/debian/links.tags.wml:116
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "Ръководство за инсталиране"
#: ../../english/template/debian/links.tags.wml:119
diff --git a/catalan/po/templates.ca.po b/catalan/po/templates.ca.po
index 193973197af..cd4b535c3df 100644
--- a/catalan/po/templates.ca.po
+++ b/catalan/po/templates.ca.po
@@ -63,8 +63,8 @@ msgid "About Debian"
msgstr "Quant a Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Contacteu&nbsp;amb&nbsp;nosaltres"
+msgid "Contact Us"
+msgstr "Contacteu amb nosaltres"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -88,16 +88,16 @@ msgstr "Suport"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Racó&nbsp;del&nbsp;desenvolupador"
+msgid "Developers' Corner"
+msgstr "Racó del desenvolupador"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Documentació"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Informació&nbsp;sobre&nbsp;seguretat"
+msgid "Security Information"
+msgstr "Informació sobre seguretat"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -227,7 +227,7 @@ msgstr ""
"a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr "Debian internacionalment"
#: ../../english/template/debian/links.tags.wml:7
@@ -239,24 +239,24 @@ msgid "Debian Weekly News"
msgstr "Notícies setmanals de Debian"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Notícies&nbsp;setmanals"
+msgid "Weekly News"
+msgstr "Notícies setmanals"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Notícies del projecte Debian"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Notícies&nbsp;del&nbsp;projecte"
+msgid "Project News"
+msgstr "Notícies del projecte"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Info&nbsp;sobre&nbsp;versions"
+msgid "Release Info"
+msgstr "Info sobre versions"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Paquets&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Paquets Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -267,20 +267,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;en&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Llibres&nbsp;sobre&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Llibres sobre Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Arxius&nbsp;de&nbsp;llistes&nbsp;de&nbsp;correu"
+msgid "Mailing List Archives"
+msgstr "Arxius de llistes de correu"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Llistes&nbsp;de&nbsp;correu"
+msgid "Mailing Lists"
+msgstr "Llistes de correu"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Contracte&nbsp;social"
+msgid "Social Contract"
+msgstr "Contracte social"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -343,8 +343,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arxius de llistes de correu variades"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Programari&nbsp;lliure"
+msgid "Free Software"
+msgstr "Programari lliure"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -363,8 +363,8 @@ msgid "Ports/Architectures"
msgstr "Ports/Arquitectures"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Manual&nbsp;d'instal·lació"
+msgid "Installation manual"
+msgstr "Manual d'instal·lació"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 41365b50224..319a860388c 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -58,7 +58,7 @@ msgid "About Debian"
msgstr "關於 Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "聯繫方法"
#: ../../english/template/debian/common_translation.wml:37
@@ -83,7 +83,7 @@ msgstr "[CN:支持:][HKTW:支援:]"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "開發者天地"
#: ../../english/template/debian/common_translation.wml:55
@@ -91,7 +91,7 @@ msgid "Documentation"
msgstr "說明[CN:文檔:][HKTW:文件:]"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "安全情報"
#: ../../english/template/debian/common_translation.wml:61
@@ -210,8 +210,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "<a href=m4_HOME/intro/cn>如何設置[CN:缺省:][HKTW:預設:]語言</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;國際化"
+msgid "Debian International"
+msgstr "Debian 國際化"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -222,7 +222,7 @@ msgid "Debian Weekly News"
msgstr "Debian 每週快訊"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "每週快訊"
#: ../../english/template/debian/links.tags.wml:16
@@ -230,16 +230,16 @@ msgid "Debian Project News"
msgstr "Debian 計劃新聞"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "計劃快訊"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "發行[CN:信息:][HKTW:情報:]"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Debian&nbsp;[CN:軟件包:][HKTW:套件:]"
+msgid "Debian Packages"
+msgstr "Debian [CN:軟件包:][HKTW:套件:]"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -250,19 +250,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;[CN:光盤:][HKTW:光碟:]"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Debian&nbsp;書籍"
+msgid "Debian Books"
+msgstr "Debian 書籍"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "郵件列表"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "社群契約"
#: ../../english/template/debian/links.tags.wml:49
@@ -326,7 +326,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "其他[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr "自由軟件"
#: ../../english/template/debian/links.tags.wml:101
@@ -346,7 +346,7 @@ msgid "Ports/Architectures"
msgstr "移植平台/體系架構"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "安裝說明"
#: ../../english/template/debian/links.tags.wml:116
diff --git a/croatian/po/templates.hr.po b/croatian/po/templates.hr.po
index b8ca7c305d6..d43ac601677 100644
--- a/croatian/po/templates.hr.po
+++ b/croatian/po/templates.hr.po
@@ -55,8 +55,8 @@ msgid "About Debian"
msgstr "O Debianu"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Kontaktirajte&nbsp;nas"
+msgid "Contact Us"
+msgstr "Kontaktirajte nas"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -80,16 +80,16 @@ msgstr "Podrška"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Kutak&nbsp;za&nbsp;razvijatelje"
+msgid "Developers' Corner"
+msgstr "Kutak za razvijatelje"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Dokumentacija"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Sigurnosne&nbsp;informacije"
+msgid "Security Information"
+msgstr "Sigurnosne informacije"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -209,8 +209,8 @@ msgstr ""
"Kako postaviti <a href=m4_HOME/intro/cn>predodređeni jezik dokumenata</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;međunarodno"
+msgid "Debian International"
+msgstr "Debian međunarodno"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -221,24 +221,24 @@ msgid "Debian Weekly News"
msgstr "Tjedne Debian vijesti"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Tjedne&nbsp;vijesti"
+msgid "Weekly News"
+msgstr "Tjedne vijesti"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Debian Project News"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Project&nbsp;News"
+msgid "Project News"
+msgstr "Project News"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informacije&nbsp;o&nbsp;izdanjima"
+msgid "Release Info"
+msgstr "Informacije o izdanjima"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Debian&nbsp;paketi"
+msgid "Debian Packages"
+msgstr "Debian paketi"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -249,20 +249,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;na&nbsp;CD-u"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Knjige&nbsp;o&nbsp;Debianu"
+msgid "Debian Books"
+msgstr "Knjige o Debianu"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Arhive&nbsp;mailing&nbsp;lista"
+msgid "Mailing List Archives"
+msgstr "Arhive mailing lista"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Mailing&nbsp;liste"
+msgid "Mailing Lists"
+msgstr "Mailing liste"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Društveni&nbsp;ugovor"
+msgid "Social Contract"
+msgstr "Društveni ugovor"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -321,8 +321,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arhive raznih mailing lista"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "Slobodni&nbsp;softver"
+msgid "Free Software"
+msgstr "Slobodni softver"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -341,8 +341,8 @@ msgid "Ports/Architectures"
msgstr "Portovi/Arhitekture"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "Upute&nbsp;za&nbsp;instalaciju"
+msgid "Installation manual"
+msgstr "Upute za instalaciju"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/czech/po/templates.cs.po b/czech/po/templates.cs.po
index 36b03d162e3..5307f2866f0 100644
--- a/czech/po/templates.cs.po
+++ b/czech/po/templates.cs.po
@@ -61,8 +61,8 @@ msgid "About Debian"
msgstr "O&nbsp;Debianu"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Napište&nbsp;nám"
+msgid "Contact Us"
+msgstr "Napište nám"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -86,16 +86,16 @@ msgstr "Podpora"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Vývojářský&nbsp;koutek"
+msgid "Developers' Corner"
+msgstr "Vývojářský koutek"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Dokumentace"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Bezpečnostní&nbsp;informace"
+msgid "Security Information"
+msgstr "Bezpečnostní informace"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -215,8 +215,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Jak nastavit <a href=m4_HOME/intro/cn>výchozí jazyk</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;a&nbsp;jazyky"
+msgid "Debian International"
+msgstr "Debian a jazyky"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -227,7 +227,7 @@ msgid "Debian Weekly News"
msgstr "Týdeník Debianu"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "Týdeník"
#: ../../english/template/debian/links.tags.wml:16
@@ -235,16 +235,16 @@ msgid "Debian Project News"
msgstr "Novinky projektu Debian"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Novinky&nbsp;projektu"
+msgid "Project News"
+msgstr "Novinky projektu"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informace&nbsp;k&nbsp;verzím"
+msgid "Release Info"
+msgstr "Informace k verzím"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Balíčky&nbsp;Debianu"
+msgid "Debian Packages"
+msgstr "Balíčky Debianu"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -255,20 +255,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;na&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Knihy&nbsp;o&nbsp;Debianu"
+msgid "Debian Books"
+msgstr "Knihy o Debianu"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Archivy&nbsp;poštovních&nbsp;konferencí"
+msgid "Mailing List Archives"
+msgstr "Archivy poštovních konferencí"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Poštovní&nbsp;konference"
+msgid "Mailing Lists"
+msgstr "Poštovní konference"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Společenská&nbsp;smlouva"
+msgid "Social Contract"
+msgstr "Společenská smlouva"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -331,8 +331,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Archivy ostatních poštovních konferencí"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Svobodný&nbsp;software"
+msgid "Free Software"
+msgstr "Svobodný software"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -351,8 +351,8 @@ msgid "Ports/Architectures"
msgstr "Porty/architektury"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Instalační&nbsp;příručka"
+msgid "Installation manual"
+msgstr "Instalační příručka"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/danish/po/templates.da.po b/danish/po/templates.da.po
index 976d2affda8..65a78db7ad0 100644
--- a/danish/po/templates.da.po
+++ b/danish/po/templates.da.po
@@ -62,8 +62,8 @@ msgid "About Debian"
msgstr "Om Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Kontakt&nbsp;os"
+msgid "Contact Us"
+msgstr "Kontakt os"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -87,7 +87,7 @@ msgstr "Support"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Udviklerhjørnet"
#: ../../english/template/debian/common_translation.wml:55
@@ -95,7 +95,7 @@ msgid "Documentation"
msgstr "Dokumentation"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Sikkerhedsoplysninger"
#: ../../english/template/debian/common_translation.wml:61
@@ -220,8 +220,8 @@ msgstr ""
"a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;internationalt"
+msgid "Debian International"
+msgstr "Debian internationalt"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -232,23 +232,23 @@ msgid "Debian Weekly News"
msgstr "Debian Weekly News"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Ugentlige&nbsp;nyheder"
+msgid "Weekly News"
+msgstr "Ugentlige nyheder"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Debians projektnyheder"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "Projektnyheder"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Udgivelsesoplysninger"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Debian-pakker"
#: ../../english/template/debian/links.tags.wml:28
@@ -260,20 +260,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;på&nbsp;cd"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Debian-bøger"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "Postlistearkiv"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Postlister"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Social&nbsp;kontrakt"
+msgid "Social Contract"
+msgstr "Social kontrakt"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -340,8 +340,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arkiver for forskellige postlister"
#: ../../english/template/debian/links.tags.wml:98
-msgid "Free&nbsp;Software"
-msgstr "Fri&nbsp;software"
+msgid "Free Software"
+msgstr "Fri software"
#: ../../english/template/debian/links.tags.wml:104
msgid "Development"
@@ -360,7 +360,7 @@ msgid "Ports/Architectures"
msgstr "Tilpasninger/arkitekturer"
#: ../../english/template/debian/links.tags.wml:116
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "Installationsvejledning"
#: ../../english/template/debian/links.tags.wml:119
diff --git a/dutch/po/templates.nl.po b/dutch/po/templates.nl.po
index a258185ef14..f44367479ce 100644
--- a/dutch/po/templates.nl.po
+++ b/dutch/po/templates.nl.po
@@ -70,8 +70,8 @@ msgid "About Debian"
msgstr "Over Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Neem&nbsp;contact&nbsp;op"
+msgid "Contact Us"
+msgstr "Neem contact op"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -95,7 +95,7 @@ msgstr "Ondersteuning"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Ontwikkeling"
#: ../../english/template/debian/common_translation.wml:55
@@ -103,8 +103,8 @@ msgid "Documentation"
msgstr "Documentatie"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Informatie&nbsp;over&nbsp;beveiliging"
+msgid "Security Information"
+msgstr "Informatie over beveiliging"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -230,8 +230,8 @@ msgstr ""
"De <a href=m4_HOME/intro/cn>standaard taal voor webpagina’s</a> instellen"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;Internationaal"
+msgid "Debian International"
+msgstr "Debian Internationaal"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -242,24 +242,24 @@ msgid "Debian Weekly News"
msgstr "Wekelijkse Debian Nieuws"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Wekelijks&nbsp;Nieuws"
+msgid "Weekly News"
+msgstr "Wekelijks Nieuws"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Debian Projectnieuws"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "Projectnieuws"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Release-informatie"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Debian&nbsp;Pakketten"
+msgid "Debian Packages"
+msgstr "Debian Pakketten"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -270,20 +270,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;op&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Debian&nbsp;Boeken"
+msgid "Debian Books"
+msgstr "Debian Boeken"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Mailinglijst&nbsp;Archieven"
+msgid "Mailing List Archives"
+msgstr "Mailinglijst Archieven"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Mailinglijsten"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Sociaal&nbsp;Contract"
+msgid "Social Contract"
+msgstr "Sociaal Contract"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -350,8 +350,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Archieven van overige mailinglijsten"
#: ../../english/template/debian/links.tags.wml:98
-msgid "Free&nbsp;Software"
-msgstr "Vrije&nbsp;Software"
+msgid "Free Software"
+msgstr "Vrije Software"
#: ../../english/template/debian/links.tags.wml:104
msgid "Development"
@@ -370,7 +370,7 @@ msgid "Ports/Architectures"
msgstr "Ports/Architecturen"
#: ../../english/template/debian/links.tags.wml:116
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "Installatiehandleiding"
#: ../../english/template/debian/links.tags.wml:119
diff --git a/english/po/bugs.pot b/english/po/bugs.pot
index cda6fa03d6e..b0ce821c7ac 100644
--- a/english/po/bugs.pot
+++ b/english/po/bugs.pot
@@ -3,121 +3,121 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/Bugs/pkgreport-opts.inc:18
+#: ../../english/Bugs/pkgreport-opts.inc:17
msgid "in package"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:21
-#: ../../english/Bugs/pkgreport-opts.inc:61
-#: ../../english/Bugs/pkgreport-opts.inc:95
+#: ../../english/Bugs/pkgreport-opts.inc:20
+#: ../../english/Bugs/pkgreport-opts.inc:60
+#: ../../english/Bugs/pkgreport-opts.inc:94
msgid "tagged"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:24
-#: ../../english/Bugs/pkgreport-opts.inc:64
-#: ../../english/Bugs/pkgreport-opts.inc:98
+#: ../../english/Bugs/pkgreport-opts.inc:23
+#: ../../english/Bugs/pkgreport-opts.inc:63
+#: ../../english/Bugs/pkgreport-opts.inc:97
msgid "with severity"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:27
+#: ../../english/Bugs/pkgreport-opts.inc:26
msgid "in source package"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:30
+#: ../../english/Bugs/pkgreport-opts.inc:29
msgid "in packages maintained by"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:33
+#: ../../english/Bugs/pkgreport-opts.inc:32
msgid "submitted by"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:36
+#: ../../english/Bugs/pkgreport-opts.inc:35
msgid "owned by"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:39
+#: ../../english/Bugs/pkgreport-opts.inc:38
msgid "with status"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:42
+#: ../../english/Bugs/pkgreport-opts.inc:41
msgid "with mail from"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:45
+#: ../../english/Bugs/pkgreport-opts.inc:44
msgid "newest bugs"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:58
-#: ../../english/Bugs/pkgreport-opts.inc:92
+#: ../../english/Bugs/pkgreport-opts.inc:57
+#: ../../english/Bugs/pkgreport-opts.inc:91
msgid "with subject containing"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:67
-#: ../../english/Bugs/pkgreport-opts.inc:101
+#: ../../english/Bugs/pkgreport-opts.inc:66
+#: ../../english/Bugs/pkgreport-opts.inc:100
msgid "with pending state"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:70
-#: ../../english/Bugs/pkgreport-opts.inc:104
+#: ../../english/Bugs/pkgreport-opts.inc:69
+#: ../../english/Bugs/pkgreport-opts.inc:103
msgid "with submitter containing"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:73
-#: ../../english/Bugs/pkgreport-opts.inc:107
+#: ../../english/Bugs/pkgreport-opts.inc:72
+#: ../../english/Bugs/pkgreport-opts.inc:106
msgid "with forwarded containing"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:76
-#: ../../english/Bugs/pkgreport-opts.inc:110
+#: ../../english/Bugs/pkgreport-opts.inc:75
+#: ../../english/Bugs/pkgreport-opts.inc:109
msgid "with owner containing"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:79
-#: ../../english/Bugs/pkgreport-opts.inc:113
+#: ../../english/Bugs/pkgreport-opts.inc:78
+#: ../../english/Bugs/pkgreport-opts.inc:112
msgid "with package"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:123
+#: ../../english/Bugs/pkgreport-opts.inc:122
msgid "normal"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:126
+#: ../../english/Bugs/pkgreport-opts.inc:125
msgid "oldview"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:129
+#: ../../english/Bugs/pkgreport-opts.inc:128
msgid "raw"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:132
+#: ../../english/Bugs/pkgreport-opts.inc:131
msgid "age"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:138
+#: ../../english/Bugs/pkgreport-opts.inc:137
msgid "Repeat Merged"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:139
+#: ../../english/Bugs/pkgreport-opts.inc:138
msgid "Reverse Bugs"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:140
+#: ../../english/Bugs/pkgreport-opts.inc:139
msgid "Reverse Pending"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:141
+#: ../../english/Bugs/pkgreport-opts.inc:140
msgid "Reverse Severity"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:144
+#: ../../english/Bugs/pkgreport-opts.inc:143
msgid "Unarchived"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:147
+#: ../../english/Bugs/pkgreport-opts.inc:146
msgid "Archived"
msgstr ""
-#: ../../english/Bugs/pkgreport-opts.inc:150
+#: ../../english/Bugs/pkgreport-opts.inc:149
msgid "Archived and Unarchived"
msgstr ""
diff --git a/english/po/countries.pot b/english/po/countries.pot
index 29c35d20928..1b7355fe9fd 100644
--- a/english/po/countries.pot
+++ b/english/po/countries.pot
@@ -3,407 +3,407 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:110
msgid "United Arab Emirates"
msgstr ""
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:113
msgid "Albania"
msgstr ""
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:116
msgid "Armenia"
msgstr ""
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:119
msgid "Argentina"
msgstr ""
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:122
msgid "Austria"
msgstr ""
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:125
msgid "Australia"
msgstr ""
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:128
msgid "Bosnia and Herzegovina"
msgstr ""
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:131
msgid "Bangladesh"
msgstr ""
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:134
msgid "Belgium"
msgstr ""
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:137
msgid "Bulgaria"
msgstr ""
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:140
msgid "Brazil"
msgstr ""
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:143
msgid "Bahamas"
msgstr ""
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:146
msgid "Belarus"
msgstr ""
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:149
msgid "Canada"
msgstr ""
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:152
msgid "Switzerland"
msgstr ""
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:155
msgid "Chile"
msgstr ""
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:158
msgid "China"
msgstr ""
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:161
msgid "Colombia"
msgstr ""
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:164
msgid "Costa Rica"
msgstr ""
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:167
msgid "Czech Republic"
msgstr ""
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:170
msgid "Germany"
msgstr ""
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:173
msgid "Denmark"
msgstr ""
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:176
msgid "Dominican Republic"
msgstr ""
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:179
msgid "Algeria"
msgstr ""
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:182
msgid "Ecuador"
msgstr ""
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:185
msgid "Estonia"
msgstr ""
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:188
msgid "Egypt"
msgstr ""
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:191
msgid "Spain"
msgstr ""
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:194
msgid "Ethiopia"
msgstr ""
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:197
msgid "Finland"
msgstr ""
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:200
msgid "Faroe Islands"
msgstr ""
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:203
msgid "France"
msgstr ""
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:206
msgid "Great Britain"
msgstr ""
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:209
msgid "Grenada"
msgstr ""
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:212
msgid "Georgia"
msgstr ""
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:215
msgid "Greenland"
msgstr ""
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:218
msgid "Greece"
msgstr ""
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:221
msgid "Guatemala"
msgstr ""
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:224
msgid "Hong Kong"
msgstr ""
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:227
msgid "Honduras"
msgstr ""
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:230
msgid "Croatia"
msgstr ""
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:233
msgid "Hungary"
msgstr ""
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:236
msgid "Indonesia"
msgstr ""
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:239
msgid "Iran"
msgstr ""
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:242
msgid "Ireland"
msgstr ""
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:245
msgid "Israel"
msgstr ""
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:248
msgid "India"
msgstr ""
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:251
msgid "Iceland"
msgstr ""
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:254
msgid "Italy"
msgstr ""
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:257
msgid "Jordan"
msgstr ""
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:260
msgid "Japan"
msgstr ""
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:263
msgid "Kenya"
msgstr ""
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:266
msgid "Korea"
msgstr ""
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:269
msgid "Kuwait"
msgstr ""
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:272
msgid "Kazakhstan"
msgstr ""
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:275
msgid "Sri Lanka"
msgstr ""
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:278
msgid "Lithuania"
msgstr ""
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:281
msgid "Luxembourg"
msgstr ""
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:284
msgid "Latvia"
msgstr ""
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:287
msgid "Morocco"
msgstr ""
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:290
msgid "Moldova"
msgstr ""
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:293
msgid "Montenegro"
msgstr ""
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:296
msgid "Madagascar"
msgstr ""
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:299
msgid "Macedonia, Republic of"
msgstr ""
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:302
msgid "Mongolia"
msgstr ""
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:305
msgid "Malta"
msgstr ""
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:308
msgid "Mexico"
msgstr ""
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:311
msgid "Malaysia"
msgstr ""
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:314
msgid "New Caledonia"
msgstr ""
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:317
msgid "Nicaragua"
msgstr ""
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:320
msgid "Netherlands"
msgstr ""
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:323
msgid "Norway"
msgstr ""
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:326
msgid "New Zealand"
msgstr ""
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:329
msgid "Panama"
msgstr ""
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:332
msgid "Peru"
msgstr ""
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:335
msgid "French Polynesia"
msgstr ""
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:338
msgid "Philippines"
msgstr ""
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:341
msgid "Pakistan"
msgstr ""
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:344
msgid "Poland"
msgstr ""
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:347
msgid "Portugal"
msgstr ""
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:350
msgid "Romania"
msgstr ""
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:353
msgid "Serbia"
msgstr ""
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:356
msgid "Russia"
msgstr ""
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:359
msgid "Saudi Arabia"
msgstr ""
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:362
msgid "Sweden"
msgstr ""
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:365
msgid "Singapore"
msgstr ""
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:368
msgid "Slovenia"
msgstr ""
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:371
msgid "Slovakia"
msgstr ""
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:374
msgid "El Salvador"
msgstr ""
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:377
msgid "Thailand"
msgstr ""
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:380
msgid "Tunisia"
msgstr ""
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:383
msgid "Turkey"
msgstr ""
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:386
msgid "Taiwan"
msgstr ""
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:389
msgid "Ukraine"
msgstr ""
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:392
msgid "United Kingdom"
msgstr ""
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:395
msgid "United States"
msgstr ""
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:398
msgid "Uruguay"
msgstr ""
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:401
msgid "Uzbekistan"
msgstr ""
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:404
msgid "Venezuela"
msgstr ""
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:407
msgid "Vietnam"
msgstr ""
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:410
msgid "South Africa"
msgstr ""
diff --git a/english/po/distrib.pot b/english/po/distrib.pot
index 8b541583fbc..877de02a68b 100644
--- a/english/po/distrib.pot
+++ b/english/po/distrib.pot
@@ -144,38 +144,43 @@ msgid "ARM"
msgstr ""
#: ../../english/distrib/search_contents-form.inc:44
-msgid "HP PA/RISC"
+#: ../../english/releases/arches.data:11
+msgid "EABI ARM"
msgstr ""
#: ../../english/distrib/search_contents-form.inc:45
-msgid "Intel IA-64"
+msgid "HP PA/RISC"
msgstr ""
#: ../../english/distrib/search_contents-form.inc:46
+msgid "Intel IA-64"
+msgstr ""
+
+#: ../../english/distrib/search_contents-form.inc:47
#: ../../english/releases/arches.data:19
msgid "MIPS (big endian)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:47
+#: ../../english/distrib/search_contents-form.inc:48
#: ../../english/releases/arches.data:20
msgid "MIPS (little endian)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:48
+#: ../../english/distrib/search_contents-form.inc:49
#: ../../english/releases/arches.data:22
msgid "IBM S/390"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:49
+#: ../../english/distrib/search_contents-form.inc:50
msgid "kFreeBSD (AMD64)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:50
+#: ../../english/distrib/search_contents-form.inc:51
msgid "kFreeBSD (Intel x86)"
msgstr ""
#. TODO: Hurd should be listed as a separate distribution
-#: ../../english/distrib/search_contents-form.inc:52
+#: ../../english/distrib/search_contents-form.inc:53
msgid "Hurd (i386)"
msgstr ""
@@ -183,10 +188,6 @@ msgstr ""
msgid "64-bit PC (amd64)"
msgstr ""
-#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
-msgstr ""
-
#: ../../english/releases/arches.data:12
msgid "HP PA-RISC"
msgstr ""
diff --git a/english/po/doc.pot b/english/po/doc.pot
index 09f50822791..31f49d0e096 100644
--- a/english/po/doc.pot
+++ b/english/po/doc.pot
@@ -27,31 +27,31 @@ msgstr ""
msgid "Publisher:"
msgstr ""
-#: ../../english/doc/manuals.defs:29
+#: ../../english/doc/manuals.defs:26
msgid "Authors:"
msgstr ""
-#: ../../english/doc/manuals.defs:36
+#: ../../english/doc/manuals.defs:33
msgid "Editors:"
msgstr ""
-#: ../../english/doc/manuals.defs:43
+#: ../../english/doc/manuals.defs:40
msgid "Maintainer:"
msgstr ""
-#: ../../english/doc/manuals.defs:50
+#: ../../english/doc/manuals.defs:47
msgid "Status:"
msgstr ""
-#: ../../english/doc/manuals.defs:57
+#: ../../english/doc/manuals.defs:54
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:88
+#: ../../english/doc/manuals.defs:86
msgid "Latest version:"
msgstr ""
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:101
msgid "(version <get-var version />)"
msgstr ""
@@ -60,7 +60,7 @@ msgid "plain text"
msgstr ""
#. The ddp_pkg_loc variable contains
-#. <a href="http://svn.debian.org/wsvn/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
+#. <a href="http://anonscm.debian.org/viewvc/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
#: ../../english/doc/manuals.defs:151
msgid "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var ddp_pkg_loc />."
msgstr ""
diff --git a/english/po/l10n.pot b/english/po/l10n.pot
index db0ce35780d..d71197c763b 100644
--- a/english/po/l10n.pot
+++ b/english/po/l10n.pot
@@ -3,87 +3,87 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/international/l10n/dtc.def:11
+#: ../../english/international/l10n/dtc.def:10
msgid "File"
msgstr ""
-#: ../../english/international/l10n/dtc.def:15
+#: ../../english/international/l10n/dtc.def:14
msgid "Package"
msgstr ""
-#: ../../english/international/l10n/dtc.def:19
+#: ../../english/international/l10n/dtc.def:18
msgid "Score"
msgstr ""
-#: ../../english/international/l10n/dtc.def:23
+#: ../../english/international/l10n/dtc.def:22
msgid "Translator"
msgstr ""
-#: ../../english/international/l10n/dtc.def:27
+#: ../../english/international/l10n/dtc.def:26
msgid "Team"
msgstr ""
-#: ../../english/international/l10n/dtc.def:31
+#: ../../english/international/l10n/dtc.def:30
msgid "Date"
msgstr ""
-#: ../../english/international/l10n/dtc.def:35
+#: ../../english/international/l10n/dtc.def:34
msgid "Status"
msgstr ""
-#: ../../english/international/l10n/dtc.def:39
+#: ../../english/international/l10n/dtc.def:38
msgid "Strings"
msgstr ""
-#: ../../english/international/l10n/dtc.def:43
+#: ../../english/international/l10n/dtc.def:42
msgid "Bug"
msgstr ""
-#: ../../english/international/l10n/dtc.def:50
+#: ../../english/international/l10n/dtc.def:49
msgid "<get-var lang />, as spoken in <get-var country />"
msgstr ""
-#: ../../english/international/l10n/dtc.def:55
+#: ../../english/international/l10n/dtc.def:54
msgid "Unknown language"
msgstr ""
-#: ../../english/international/l10n/dtc.def:65
+#: ../../english/international/l10n/dtc.def:64
msgid "This page was generated with data collected on: <get-var date />."
msgstr ""
-#: ../../english/international/l10n/dtc.def:70
+#: ../../english/international/l10n/dtc.def:69
msgid "Before working on these files, make sure they are up to date!"
msgstr ""
-#: ../../english/international/l10n/dtc.def:80
+#: ../../english/international/l10n/dtc.def:79
msgid "Section: <get-var name />"
msgstr ""
-#: ../../english/international/l10n/menu.def:9
+#: ../../english/international/l10n/menu.def:10
msgid "L10n"
msgstr ""
-#: ../../english/international/l10n/menu.def:13
+#: ../../english/international/l10n/menu.def:14
msgid "Language list"
msgstr ""
-#: ../../english/international/l10n/menu.def:17
+#: ../../english/international/l10n/menu.def:18
msgid "Ranking"
msgstr ""
-#: ../../english/international/l10n/menu.def:21
+#: ../../english/international/l10n/menu.def:22
msgid "Hints"
msgstr ""
-#: ../../english/international/l10n/menu.def:25
+#: ../../english/international/l10n/menu.def:26
msgid "Errors"
msgstr ""
-#: ../../english/international/l10n/menu.def:29
+#: ../../english/international/l10n/menu.def:30
msgid "POT files"
msgstr ""
-#: ../../english/international/l10n/menu.def:33
+#: ../../english/international/l10n/menu.def:34
msgid "Hints for translators"
msgstr ""
diff --git a/english/po/newsevents.pot b/english/po/newsevents.pot
index 16789f81142..6dcf238d2ff 100644
--- a/english/po/newsevents.pot
+++ b/english/po/newsevents.pot
@@ -226,7 +226,7 @@ msgstr ""
msgid "Debian Latest News"
msgstr ""
-#: ../../english/News/weekly/dwn-to-rdf.pl:142
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
msgid "The newsletter for the Debian community"
msgstr ""
diff --git a/english/po/organization.pot b/english/po/organization.pot
index 212fc2cb2e9..8be694586c5 100644
--- a/english/po/organization.pot
+++ b/english/po/organization.pot
@@ -52,12 +52,12 @@ msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:47
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:237
msgid "Publicity"
msgstr ""
#: ../../english/intro/organization.data:48
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:260
msgid "Support and Infrastructure"
msgstr ""
@@ -115,215 +115,215 @@ msgstr ""
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:116
+#: ../../english/intro/organization.data:117
msgid "Volatile Team"
msgstr ""
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:124
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:125
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:126
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:128
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:130
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:138
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:140
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:142
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr ""
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:177
msgid "Alpha (Not active: was not released with squeeze)"
msgstr ""
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:227
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:230
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:231
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:232
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:240
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:246
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:250
+#: ../../english/intro/organization.data:251
msgid "Events"
msgstr ""
-#: ../../english/intro/organization.data:262
+#: ../../english/intro/organization.data:263
msgid "User support"
msgstr ""
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:330
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:336
+#: ../../english/intro/organization.data:337
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:345
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:350
+#: ../../english/intro/organization.data:351
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:354
+#: ../../english/intro/organization.data:355
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:357
+#: ../../english/intro/organization.data:358
msgid "Security Team"
msgstr ""
-#: ../../english/intro/organization.data:373
+#: ../../english/intro/organization.data:371
msgid "Testing Security Team"
msgstr ""
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:380
msgid "Security Audit Project"
msgstr ""
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:385
msgid "Web Pages"
msgstr ""
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:394
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:398
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:403
+#: ../../english/intro/organization.data:401
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:405
msgid "Policy"
msgstr ""
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:411
msgid "System Administration"
msgstr ""
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:412
msgid "This is the address to use when encountering problems on one of Debian's machines, including password problems or you need a package installed."
msgstr ""
-#: ../../english/intro/organization.data:421
+#: ../../english/intro/organization.data:419
msgid "If you have hardware problems with Debian machines, please see <a href=\"http://db.debian.org/machines.cgi\">Debian Machines</a> page, it should contain per-machine administrator information."
msgstr ""
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:420
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:423
+#: ../../english/intro/organization.data:421
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:427
+#: ../../english/intro/organization.data:425
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:426
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:428
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:434
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:437
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:443
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:451
+#: ../../english/intro/organization.data:450
msgid "DebConf chairs"
msgstr ""
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:461
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:464
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:467
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:474
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:478
msgid "Debian for people with disabilities"
msgstr ""
diff --git a/english/po/ports.pot b/english/po/ports.pot
index fb79e183ce3..91f62ad0a50 100644
--- a/english/po/ports.pot
+++ b/english/po/ports.pot
@@ -79,11 +79,6 @@ msgstr ""
msgid "Debian for Beowulf"
msgstr ""
-#: ../../english/ports/freebsd/menu.inc:6
-#: ../../english/ports/kfreebsd-gnu/menu.inc:6
-msgid "Main"
-msgstr ""
-
#: ../../english/ports/hppa/menu.inc:6
msgid "Debian for PA-RISC"
msgstr ""
@@ -96,6 +91,10 @@ msgstr ""
msgid "Debian for IA-64"
msgstr ""
+#: ../../english/ports/kfreebsd-gnu/menu.inc:6
+msgid "Main"
+msgstr ""
+
#: ../../english/ports/kfreebsd-gnu/menu.inc:9
msgid "Debian GNU/FreeBSD"
msgstr ""
@@ -136,10 +135,6 @@ msgstr ""
msgid "Debian for Sparc"
msgstr ""
-#: ../../english/ports/sparc64/menu.inc:6
-msgid "Debian for Sparc64"
-msgstr ""
-
#: ../../english/misc/laptops/menu.inc:8
msgid "Debian for Laptops"
msgstr ""
diff --git a/english/po/security.pot b/english/po/security.pot
index 489444e0031..02f229750e9 100644
--- a/english/po/security.pot
+++ b/english/po/security.pot
@@ -89,19 +89,19 @@ msgstr ""
msgid "Debian Security Advisories"
msgstr ""
-#: ../../english/security/make-ref-table.pl:61
+#: ../../english/security/make-ref-table.pl:81
msgid "Mitre CVE dictionary"
msgstr ""
-#: ../../english/security/make-ref-table.pl:64
+#: ../../english/security/make-ref-table.pl:84
msgid "Securityfocus Bugtraq database"
msgstr ""
-#: ../../english/security/make-ref-table.pl:68
+#: ../../english/security/make-ref-table.pl:88
msgid "CERT Advisories"
msgstr ""
-#: ../../english/security/make-ref-table.pl:72
+#: ../../english/security/make-ref-table.pl:92
msgid "US-CERT vulnerabilities Notes"
msgstr ""
diff --git a/english/po/templates.pot b/english/po/templates.pot
index 40bd46ac308..064425ec485 100644
--- a/english/po/templates.pot
+++ b/english/po/templates.pot
@@ -4,7 +4,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/template/debian/basic.wml:19
-#: ../../english/template/debian/navbar.wml:12
+#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
msgstr ""
@@ -50,7 +50,7 @@ msgid "About Debian"
msgstr ""
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr ""
#: ../../english/template/debian/common_translation.wml:37
@@ -75,7 +75,7 @@ msgstr ""
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr ""
#: ../../english/template/debian/common_translation.wml:55
@@ -83,7 +83,7 @@ msgid "Documentation"
msgstr ""
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr ""
#: ../../english/template/debian/common_translation.wml:61
@@ -180,17 +180,17 @@ msgstr ""
msgid "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of Software in the Public Interest, Inc."
msgstr ""
-#: ../../english/template/debian/languages.wml:193
-#: ../../english/template/debian/languages.wml:229
+#: ../../english/template/debian/languages.wml:194
+#: ../../english/template/debian/languages.wml:230
msgid "This page is also available in the following languages:"
msgstr ""
-#: ../../english/template/debian/languages.wml:262
+#: ../../english/template/debian/languages.wml:263
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr ""
#: ../../english/template/debian/links.tags.wml:7
@@ -202,7 +202,7 @@ msgid "Debian Weekly News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:16
@@ -210,15 +210,15 @@ msgid "Debian Project News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr ""
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr ""
#: ../../english/template/debian/links.tags.wml:28
@@ -230,19 +230,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr ""
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr ""
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr ""
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr ""
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr ""
#: ../../english/template/debian/links.tags.wml:49
@@ -310,7 +310,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr ""
#: ../../english/template/debian/links.tags.wml:98
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr ""
#: ../../english/template/debian/links.tags.wml:104
@@ -330,7 +330,7 @@ msgid "Ports/Architectures"
msgstr ""
#: ../../english/template/debian/links.tags.wml:116
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr ""
#: ../../english/template/debian/links.tags.wml:119
@@ -369,11 +369,7 @@ msgstr ""
msgid "Debian Developer's Packages Overview"
msgstr ""
-#: ../../english/template/debian/mirrors.wml:8
-msgid "Select a server near you"
-msgstr ""
-
-#: ../../english/template/debian/navbar.wml:11
+#: ../../english/template/debian/navbar.wml:10
msgid "Debian Home"
msgstr ""
diff --git a/english/template/debian/common_translation.wml b/english/template/debian/common_translation.wml
index 89b3eea76b6..428509015d8 100644
--- a/english/template/debian/common_translation.wml
+++ b/english/template/debian/common_translation.wml
@@ -31,7 +31,7 @@
<gettext>About Debian</gettext>
</define-tag>
<define-tag contactus whitespace=delete>
- <gettext>Contact&nbsp;Us</gettext>
+ <gettext>Contact Us</gettext>
</define-tag>
<define-tag donations whitespace=delete>
<gettext>Donations</gettext>
@@ -49,13 +49,13 @@
<gettext>Support</gettext>
</define-tag>
<define-tag develcorner whitespace=delete>
- <gettext>Developers'&nbsp;Corner</gettext>
+ <gettext>Developers' Corner</gettext>
</define-tag>
<define-tag documentation whitespace=delete>
<gettext>Documentation</gettext>
</define-tag>
<define-tag security whitespace=delete>
- <gettext>Security&nbsp;Information</gettext>
+ <gettext>Security Information</gettext>
</define-tag>
<define-tag search whitespace=delete>
<gettext>Search</gettext>
diff --git a/english/template/debian/links.tags.wml b/english/template/debian/links.tags.wml
index aab0166a238..9bb44198ef4 100644
--- a/english/template/debian/links.tags.wml
+++ b/english/template/debian/links.tags.wml
@@ -1,7 +1,7 @@
#use wml::debian::common_tags
<define-tag debinternational whitespace=delete>
- <gettext>Debian&nbsp;International</gettext>
+ <gettext>Debian International</gettext>
</define-tag>
<define-tag partners whitespace=delete>
<gettext>Partners</gettext>
@@ -10,19 +10,19 @@
<gettext>Debian Weekly News</gettext>
</define-tag>
<define-tag weeklynews whitespace=delete>
- <gettext>Weekly&nbsp;News</gettext>
+ <gettext>Weekly News</gettext>
</define-tag>
<define-tag debianprojectnews whitespace=delete>
<gettext>Debian Project News</gettext>
</define-tag>
<define-tag projectnews whitespace=delete>
- <gettext>Project&nbsp;News</gettext>
+ <gettext>Project News</gettext>
</define-tag>
<define-tag releaseinfo whitespace=delete>
- <gettext>Release&nbsp;Info</gettext>
+ <gettext>Release Info</gettext>
</define-tag>
<define-tag debianpackages whitespace=delete>
- <gettext>Debian&nbsp;Packages</gettext>
+ <gettext>Debian Packages</gettext>
</define-tag>
<define-tag download whitespace=delete>
<gettext>Download</gettext>
@@ -31,19 +31,19 @@
<gettext>Debian&nbsp;on&nbsp;CD</gettext>
</define-tag>
<define-tag debianbooks whitespace=delete>
- <gettext>Debian&nbsp;Books</gettext>
+ <gettext>Debian Books</gettext>
</define-tag>
<define-tag mailarchives whitespace=delete>
- <gettext>Mailing&nbsp;List&nbsp;Archives</gettext>
+ <gettext>Mailing List Archives</gettext>
</define-tag>
<define-tag mailinglists whitespace=delete>
- <gettext>Mailing&nbsp;Lists</gettext>
+ <gettext>Mailing Lists</gettext>
</define-tag>
<define-tag develcorner whitespace=delete>
- <gettext>Developers'&nbsp;Corner</gettext>
+ <gettext>Developers' Corner</gettext>
</define-tag>
<define-tag socialcontract whitespace=delete>
- <gettext>Social&nbsp;Contract</gettext>
+ <gettext>Social Contract</gettext>
</define-tag>
<define-tag visitsponsor whitespace=delete>
<gettext>Visit the site sponsor</gettext>
@@ -95,7 +95,7 @@
<gettext>Archives for miscellaneous mailing lists</gettext>
</define-tag>
<define-tag freesoftware whitespace=delete>
- <gettext>Free&nbsp;Software</gettext>
+ <gettext>Free Software</gettext>
</define-tag>
<define-tag gettingdebian whitespace=delete>
<gettext>Getting Debian</gettext>
@@ -113,7 +113,7 @@
<gettext>Ports/Architectures</gettext>
</define-tag>
<define-tag installationmanual whitespace=delete>
- <gettext>Installation&nbsp;manual</gettext>
+ <gettext>Installation manual</gettext>
</define-tag>
<define-tag cdvendors whitespace=delete>
<gettext>CD vendors</gettext>
diff --git a/esperanto/po/templates.eo.po b/esperanto/po/templates.eo.po
index 05a1594359d..3b1a1a35a4e 100644
--- a/esperanto/po/templates.eo.po
+++ b/esperanto/po/templates.eo.po
@@ -63,8 +63,8 @@ msgid "About Debian"
msgstr "Pri Debiano"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Kontaktu&nbsp;Nin"
+msgid "Contact Us"
+msgstr "Kontaktu Nin"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -88,16 +88,16 @@ msgstr "Ĝenerala helpo"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Angulo&nbsp;de&nbsp;disvolvantoj"
+msgid "Developers' Corner"
+msgstr "Angulo de disvolvantoj"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Dokumentaro"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Sekureca&nbsp;Informo"
+msgid "Security Information"
+msgstr "Sekureca Informo"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -222,8 +222,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Kiel elekti <a href=m4_HOME/intro/cn>la ĉefan dokumentan lingvon</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Internacia&nbsp;Debian"
+msgid "Debian International"
+msgstr "Internacia Debian"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -234,8 +234,8 @@ msgid "Debian Weekly News"
msgstr "Ĉiusemajnaj novaĵoj de Debian"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Ĉiusemajnaj&nbsp;novaĵoj"
+msgid "Weekly News"
+msgstr "Ĉiusemajnaj novaĵoj"
#: ../../english/template/debian/links.tags.wml:16
#| msgid "Debian Project"
@@ -243,17 +243,16 @@ msgid "Debian Project News"
msgstr "Novaĵo de la projekto Debian"
#: ../../english/template/debian/links.tags.wml:19
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "Ĉiusemajnaj&nbsp;Novaĵoj&nbsp;pri&nbsp;la&nbsp;projekto"
+msgid "Project News"
+msgstr "Ĉiusemajnaj Novaĵoj pri la projekto"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informo&nbsp;pri&nbsp;livero"
+msgid "Release Info"
+msgstr "Informo pri livero"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Pakoj&nbsp;de&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Pakoj de Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -264,20 +263,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;en&nbsp;KD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Libroj&nbsp;pri&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Libroj pri Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Retpoŝtlistaj&nbsp;Arĥivoj"
+msgid "Mailing List Archives"
+msgstr "Retpoŝtlistaj Arĥivoj"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Retpoŝtaj&nbsp;Listoj"
+msgid "Mailing Lists"
+msgstr "Retpoŝtaj Listoj"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Socia&nbsp;kontrakto"
+msgid "Social Contract"
+msgstr "Socia kontrakto"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -340,8 +339,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arĥivoj de la dissendolistoj de aliaj aferoj"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Libera&nbsp;programaro"
+msgid "Free Software"
+msgstr "Libera programaro"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -360,8 +359,8 @@ msgid "Ports/Architectures"
msgstr "Portadoj/Arĥitekturoj"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Manlibro&nbsp;pri&nbsp;instalado"
+msgid "Installation manual"
+msgstr "Manlibro pri instalado"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/finnish/po/templates.fi.po b/finnish/po/templates.fi.po
index bf01f1503c9..54b051d1d10 100644
--- a/finnish/po/templates.fi.po
+++ b/finnish/po/templates.fi.po
@@ -61,8 +61,8 @@ msgid "About Debian"
msgstr "Tietoa Debianista"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Ota&nbsp;yhteyttä"
+msgid "Contact Us"
+msgstr "Ota yhteyttä"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -86,15 +86,15 @@ msgstr "Tuki"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Kehittäjien&nbsp;nurkkaus"
+msgid "Developers' Corner"
+msgstr "Kehittäjien nurkkaus"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Käyttöohjeet"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Tietoturvallisuudesta"
#: ../../english/template/debian/common_translation.wml:61
@@ -215,8 +215,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Oletuskielen <a href=m4_HOME/intro/cn>asettamisohjeet</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Kansainvälinen&nbsp;Debian"
+msgid "Debian International"
+msgstr "Kansainvälinen Debian"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -227,7 +227,7 @@ msgid "Debian Weekly News"
msgstr "Debianin viikkokatsaus"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "Viikkokatsaus"
#: ../../english/template/debian/links.tags.wml:16
@@ -235,15 +235,15 @@ msgid "Debian Project News"
msgstr "Debianin projektikatsaus"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "Projektikatsaus"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Julkaisutiedot"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Debian-paketit"
#: ../../english/template/debian/links.tags.wml:28
@@ -255,19 +255,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;CD:llä"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Debian-kirjallisuutta"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Postilistojen&nbsp;arkistot"
+msgid "Mailing List Archives"
+msgstr "Postilistojen arkistot"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Postilistat"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "Yhteisösopimus"
#: ../../english/template/debian/links.tags.wml:49
@@ -331,8 +331,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Muiden postilistojen arkistot"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Vapaa&nbsp;ohjelmisto"
+msgid "Free Software"
+msgstr "Vapaa ohjelmisto"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -351,7 +351,7 @@ msgid "Ports/Architectures"
msgstr "Siirrokset/arkkitehtuurit"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "Asennusopas"
#: ../../english/template/debian/links.tags.wml:116
diff --git a/french/po/templates.fr.po b/french/po/templates.fr.po
index 874dadd5daa..cba0d227519 100644
--- a/french/po/templates.fr.po
+++ b/french/po/templates.fr.po
@@ -77,8 +77,8 @@ msgid "About Debian"
msgstr "À propos de Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Nous&nbsp;contacter"
+msgid "Contact Us"
+msgstr "Nous contacter"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -102,16 +102,16 @@ msgstr "Assistance"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Le&nbsp;coin&nbsp;du&nbsp;développeur"
+msgid "Developers' Corner"
+msgstr "Le coin du développeur"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Documentation"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Informations&nbsp;sur&nbsp;la&nbsp;sécurité"
+msgid "Security Information"
+msgstr "Informations sur la sécurité"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -239,8 +239,8 @@ msgstr ""
"document</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;et&nbsp;l'international"
+msgid "Debian International"
+msgstr "Debian et l'international"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -251,24 +251,24 @@ msgid "Debian Weekly News"
msgstr "Nouvelles hebdomadaires Debian"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Nouvelles&nbsp;hebdomadaires"
+msgid "Weekly News"
+msgstr "Nouvelles hebdomadaires"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Nouvelles du projet Debian"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "Nouvelles du projet"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Dernière&nbsp;version"
+msgid "Release Info"
+msgstr "Dernière version"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Paquets&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Paquets Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -279,20 +279,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;sur&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Livres&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Livres Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Archives&nbsp;des&nbsp;listes&nbsp;de&nbsp;diffusion"
+msgid "Mailing List Archives"
+msgstr "Archives des listes de diffusion"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Listes&nbsp;de&nbsp;diffusion"
+msgid "Mailing Lists"
+msgstr "Listes de diffusion"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Notre&nbsp;contrat&nbsp;social"
+msgid "Social Contract"
+msgstr "Notre contrat social"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -359,8 +359,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Archives des listes de diffusion de la section «&nbsp;divers&nbsp;»"
#: ../../english/template/debian/links.tags.wml:98
-msgid "Free&nbsp;Software"
-msgstr "Logiciel&nbsp;libre"
+msgid "Free Software"
+msgstr "Logiciel libre"
#: ../../english/template/debian/links.tags.wml:104
msgid "Development"
@@ -379,8 +379,8 @@ msgid "Ports/Architectures"
msgstr "Portages/Architectures"
#: ../../english/template/debian/links.tags.wml:116
-msgid "Installation&nbsp;manual"
-msgstr "Manuel&nbsp;d'installation"
+msgid "Installation manual"
+msgstr "Manuel d'installation"
#: ../../english/template/debian/links.tags.wml:119
msgid "CD vendors"
diff --git a/german/po/templates.de.po b/german/po/templates.de.po
index a335b8d179a..83ce653dad4 100644
--- a/german/po/templates.de.po
+++ b/german/po/templates.de.po
@@ -68,7 +68,7 @@ msgid "About Debian"
msgstr "Über Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Kontakte"
#: ../../english/template/debian/common_translation.wml:37
@@ -93,7 +93,7 @@ msgstr "Unterstützung"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Entwickler-Ecke"
#: ../../english/template/debian/common_translation.wml:55
@@ -101,7 +101,7 @@ msgid "Documentation"
msgstr "Dokumentation"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Sicherheitsinformationen"
#: ../../english/template/debian/common_translation.wml:61
@@ -227,8 +227,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Wie stellt man <a href=m4_HOME/intro/cn>die Standardsprache</a> ein"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;International"
+msgid "Debian International"
+msgstr "Debian International"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -239,23 +239,23 @@ msgid "Debian Weekly News"
msgstr "Debian Weekly News"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Wöchentliche&nbsp;Nachrichten"
+msgid "Weekly News"
+msgstr "Wöchentliche Nachrichten"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Nachrichten des Debian-Projekts"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "Projekt-Nachrichten"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Release-Informationen"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Debian-Softwarepakete"
#: ../../english/template/debian/links.tags.wml:28
@@ -267,19 +267,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;auf&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Debian-Bücher"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Archiv&nbsp;der&nbsp;Mailinglisten"
+msgid "Mailing List Archives"
+msgstr "Archiv der Mailinglisten"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Mailinglisten"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "Gesellschaftsvertrag"
#: ../../english/template/debian/links.tags.wml:49
@@ -343,8 +343,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Archive für sonstige Mailinglisten"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Freie&nbsp;Software"
+msgid "Free Software"
+msgstr "Freie Software"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -363,7 +363,7 @@ msgid "Ports/Architectures"
msgstr "Portierungen/Architekturen"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "Installationsanleitung"
#: ../../english/template/debian/links.tags.wml:116
diff --git a/greek/po/templates.el.po b/greek/po/templates.el.po
index dff5a3b17bc..6479218d7af 100644
--- a/greek/po/templates.el.po
+++ b/greek/po/templates.el.po
@@ -55,7 +55,7 @@ msgid "About Debian"
msgstr "Σχετικά με το Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Επικοινωνήστε μαzί μας"
#: ../../english/template/debian/common_translation.wml:37
@@ -80,7 +80,7 @@ msgstr "Υποστήριξη"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Η γωνία του προγραμματιστή"
#: ../../english/template/debian/common_translation.wml:55
@@ -88,7 +88,7 @@ msgid "Documentation"
msgstr "Τεκμηρίωση"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Πληροφορίες σχετικά με την ασφάλεια"
#: ../../english/template/debian/common_translation.wml:61
@@ -214,7 +214,7 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Πως να <a href=m4_HOME/intro/cn>ορίσετε την προκαθορισμένη γλώσσα</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr "Το Debian Διεθνώς"
#: ../../english/template/debian/links.tags.wml:7
@@ -226,7 +226,7 @@ msgid "Debian Weekly News"
msgstr "Εβδομαδιαία Νέα του Debian"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "Εβδομαδιαία νέα"
#: ../../english/template/debian/links.tags.wml:16
@@ -237,16 +237,16 @@ msgstr "Κωδικό όνομα Debian"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
+#| msgid "Weekly News"
+msgid "Project News"
msgstr "Εβδομαδιαία νέα"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Πληροφορίες έκδοσης"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Πακέτα του Debian"
#: ../../english/template/debian/links.tags.wml:28
@@ -258,19 +258,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian σε CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Βιβλία Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "Αρχειοθήκη συνδρομητικών καταλόγων"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Συνδρομητικοί κατάλογοι"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "Κοινωνικό συμβόλαιο"
#: ../../english/template/debian/links.tags.wml:49
@@ -330,8 +330,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Αρχειοθήκη απο τον γενικό συνδρομητικό κατάλογο"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "Ελεύθερο&nbsp;Λογισμικό"
+msgid "Free Software"
+msgstr "Ελεύθερο Λογισμικό"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -350,8 +350,8 @@ msgid "Ports/Architectures"
msgstr "Αρχιτεκτονικές"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "Οδηγίες&nbsp;εγκατάστασης"
+msgid "Installation manual"
+msgstr "Οδηγίες εγκατάστασης"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/hebrew/po/templates.he.po b/hebrew/po/templates.he.po
index 9f61be770bc..fa2c1bbe4e8 100644
--- a/hebrew/po/templates.he.po
+++ b/hebrew/po/templates.he.po
@@ -51,8 +51,8 @@ msgid "About Debian"
msgstr "אודות דביאן"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "צור&nbsp; קשר"
+msgid "Contact Us"
+msgstr "צור קשר"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -76,7 +76,7 @@ msgstr "תמיכה"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "רוצה לתרום ?"
#: ../../english/template/debian/common_translation.wml:55
@@ -84,8 +84,8 @@ msgid "Documentation"
msgstr "תיעוד"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "הודעות אבטחה&nbsp;"
+msgid "Security Information"
+msgstr "הודעות אבטחה "
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -187,7 +187,7 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "הוראות כיצד לקבוע <a href=m4_HOME/intro/cn>את שפת ברירת המחדל</a> של דף זה."
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr "דביאן ברחבי העולם"
#: ../../english/template/debian/links.tags.wml:7
@@ -199,23 +199,23 @@ msgid "Debian Weekly News"
msgstr "חדשות דביאן שבועיות"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "שבועיות&nbsp;חדשות "
+msgid "Weekly News"
+msgstr "שבועיות חדשות "
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "חדשות פרויקט דביאן"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "חדשות הפרויקט"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "מידע על הפצות"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "חבילות דביאן"
#: ../../english/template/debian/links.tags.wml:28
@@ -227,20 +227,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "דביאן על תקליטורים"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "ספרים על דביאן"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "ארכיון רשימות תפוצה"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "רשימות תפוצה"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "חוזה חברתי&nbsp;"
+msgid "Social Contract"
+msgstr "חוזה חברתי"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -299,7 +299,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "ארכיונים של רשימות תפוצה שונות"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr "תוכנה חופשית"
#: ../../english/template/debian/links.tags.wml:98
@@ -319,7 +319,7 @@ msgid "Ports/Architectures"
msgstr "ארכיטקטורות חומרה"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "מדריך התקנה"
#: ../../english/template/debian/links.tags.wml:113
diff --git a/hungarian/po/templates.hu.po b/hungarian/po/templates.hu.po
index 55d16ea03ef..5875572c825 100644
--- a/hungarian/po/templates.hu.po
+++ b/hungarian/po/templates.hu.po
@@ -56,7 +56,7 @@ msgid "About Debian"
msgstr "Ismertető a Debianról"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Kapcsolatfelvétel"
#: ../../english/template/debian/common_translation.wml:37
@@ -81,7 +81,7 @@ msgstr "Terméktámogatás"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Fejlesztők oldala"
#: ../../english/template/debian/common_translation.wml:55
@@ -89,7 +89,7 @@ msgid "Documentation"
msgstr "Dokumentáció"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Biztonság"
#: ../../english/template/debian/common_translation.wml:61
@@ -207,7 +207,7 @@ msgstr ""
"Hogyan állítsd be <a href=m4_HOME/intro/cn>az alapértelmezett nyelvet?</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr ""
#: ../../english/template/debian/links.tags.wml:7
@@ -219,8 +219,8 @@ msgid "Debian Weekly News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Heti&nbsp;hírek"
+msgid "Weekly News"
+msgstr "Heti hírek"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
@@ -230,16 +230,16 @@ msgstr "Debian projekt"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "Heti&nbsp;hírek"
+#| msgid "Weekly News"
+msgid "Project News"
+msgstr "Heti hírek"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Verziók"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Debian-csomagok"
#: ../../english/template/debian/links.tags.wml:28
@@ -251,20 +251,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian CD-n"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Könyvek&nbsp;a&nbsp;Debianról"
+msgid "Debian Books"
+msgstr "Könyvek a Debianról"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "Levelezőlista-archívumok"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Levelezőlisták"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Társadalmi&nbsp;szerződés"
+msgid "Social Contract"
+msgstr "Társadalmi szerződés"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -327,7 +327,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Egyéb levelezőlisták archívumai"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr "Szabad szoftver"
#: ../../english/template/debian/links.tags.wml:101
@@ -347,8 +347,8 @@ msgid "Ports/Architectures"
msgstr "Portolás/Architektúrák"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Telepítési&nbsp;útmutató"
+msgid "Installation manual"
+msgstr "Telepítési útmutató"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/indonesian/po/templates.id.po b/indonesian/po/templates.id.po
index e98d809a6b4..db8ab335118 100644
--- a/indonesian/po/templates.id.po
+++ b/indonesian/po/templates.id.po
@@ -56,8 +56,8 @@ msgid "About Debian"
msgstr "Tentang Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Kontak&nbsp;kami"
+msgid "Contact Us"
+msgstr "Kontak kami"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -81,15 +81,15 @@ msgstr ""
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Pojok&nbsp;Developer"
+msgid "Developers' Corner"
+msgstr "Pojok Developer"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Dokumentasi"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Keamanan"
#: ../../english/template/debian/common_translation.wml:61
@@ -205,8 +205,8 @@ msgstr ""
"browser anda</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;Internasional"
+msgid "Debian International"
+msgstr "Debian Internasional"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -217,8 +217,8 @@ msgid "Debian Weekly News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Berita&nbsp;Mingguan"
+msgid "Weekly News"
+msgstr "Berita Mingguan"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
@@ -228,17 +228,17 @@ msgstr "Proyek Debian"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "Berita&nbsp;Mingguan"
+#| msgid "Weekly News"
+msgid "Project News"
+msgstr "Berita Mingguan"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informasi&nbsp;Tentang&nbsp;Debian&nbsp;Rilis"
+msgid "Release Info"
+msgstr "Informasi Tentang Debian Rilis"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Paket-paket&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Paket-paket Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -249,20 +249,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "CD&nbsp;Debian"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Buku-buku&nbsp;Tentang&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Buku-buku Tentang Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Arsip&nbsp;Milis"
+msgid "Mailing List Archives"
+msgstr "Arsip Milis"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Daftar&nbsp;Milis"
+msgid "Mailing Lists"
+msgstr "Daftar Milis"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Kontrak&nbsp;Sosial"
+msgid "Social Contract"
+msgstr "Kontrak Sosial"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -322,8 +322,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arsip milis debian-misc"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "Perangkat&nbsp;Lunak&nbsp;Free"
+msgid "Free Software"
+msgstr "Perangkat Lunak Free"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -342,8 +342,8 @@ msgid "Ports/Architectures"
msgstr ""
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "Petunjuk&nbsp;Instalasi"
+msgid "Installation manual"
+msgstr "Petunjuk Instalasi"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/italian/po/templates.it.po b/italian/po/templates.it.po
index 41e6c803b02..928c55f3175 100644
--- a/italian/po/templates.it.po
+++ b/italian/po/templates.it.po
@@ -69,7 +69,7 @@ msgid "About Debian"
msgstr "Informazioni su Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Contattaci"
#: ../../english/template/debian/common_translation.wml:37
@@ -94,16 +94,16 @@ msgstr "Supporto"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Angolo&nbsp;degli&nbsp;sviluppatori"
+msgid "Developers' Corner"
+msgstr "Angolo degli sviluppatori"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Documentazione"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Informazioni&nbsp;sulla&nbsp;sicurezza"
+msgid "Security Information"
+msgstr "Informazioni sulla sicurezza"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -234,8 +234,8 @@ msgstr ""
"documenti</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;diventa&nbsp;Internazionale"
+msgid "Debian International"
+msgstr "Debian diventa Internazionale"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -246,24 +246,24 @@ msgid "Debian Weekly News"
msgstr "Notizie settimanali Debian"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Notizie&nbsp;settimanali"
+msgid "Weekly News"
+msgstr "Notizie settimanali"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Debian Project News"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Notizie&nbsp;dal&nbsp;progetto"
+msgid "Project News"
+msgstr "Notizie dal progetto"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informazioni&nbsp;sulle&nbsp;Versioni"
+msgid "Release Info"
+msgstr "Informazioni sulle Versioni"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Pacchetti&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Pacchetti Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -274,20 +274,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;su&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Libri&nbsp;su&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Libri su Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Archivi&nbsp;delle&nbsp;liste&nbsp;di&nbsp;messaggi"
+msgid "Mailing List Archives"
+msgstr "Archivi delle liste di messaggi"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Liste&nbsp;di&nbsp;messaggi"
+msgid "Mailing Lists"
+msgstr "Liste di messaggi"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Il&nbsp;nostro&nbsp;contratto&nbsp;sociale"
+msgid "Social Contract"
+msgstr "Il nostro contratto sociale"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -354,8 +354,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Archivi delle liste di messaggi varie"
#: ../../english/template/debian/links.tags.wml:98
-msgid "Free&nbsp;Software"
-msgstr "Software&nbsp;libero"
+msgid "Free Software"
+msgstr "Software libero"
#: ../../english/template/debian/links.tags.wml:104
msgid "Development"
@@ -374,8 +374,8 @@ msgid "Ports/Architectures"
msgstr "Port/Architetture"
#: ../../english/template/debian/links.tags.wml:116
-msgid "Installation&nbsp;manual"
-msgstr "Manuale&nbsp;d'installazione"
+msgid "Installation manual"
+msgstr "Manuale d'installazione"
#: ../../english/template/debian/links.tags.wml:119
msgid "CD vendors"
diff --git a/japanese/po/templates.ja.po b/japanese/po/templates.ja.po
index ffbb001910b..04561458172 100644
--- a/japanese/po/templates.ja.po
+++ b/japanese/po/templates.ja.po
@@ -63,7 +63,7 @@ msgid "About Debian"
msgstr "Debian について"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "私たちとコンタクトを取る"
#: ../../english/template/debian/common_translation.wml:37
@@ -88,7 +88,7 @@ msgstr "サポート"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "開発者のコーナー"
#: ../../english/template/debian/common_translation.wml:55
@@ -96,7 +96,7 @@ msgid "Documentation"
msgstr "文書"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "セキュリティ情報"
#: ../../english/template/debian/common_translation.wml:61
@@ -216,7 +216,7 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "<a href=m4_HOME/intro/cn>デフォルトの言語を設定するには</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr "Debian の国際化に向けて"
#: ../../english/template/debian/links.tags.wml:7
@@ -228,7 +228,7 @@ msgid "Debian Weekly News"
msgstr "Debian ウィークリーニュース"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "ウィークリーニュース"
#: ../../english/template/debian/links.tags.wml:16
@@ -236,15 +236,15 @@ msgid "Debian Project News"
msgstr "Debian プロジェクトニュース"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "プロジェクトニュース"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "リリース情報"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Debian パッケージ"
#: ../../english/template/debian/links.tags.wml:28
@@ -256,19 +256,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian の CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Debian に関する書籍"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "メーリングリストアーカイブ"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "メーリングリスト"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "私たちの社会契約"
#: ../../english/template/debian/links.tags.wml:49
@@ -332,7 +332,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "その他のメーリングリスト群のアーカイブ"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr "フリーソフトウェア"
#: ../../english/template/debian/links.tags.wml:101
@@ -352,7 +352,7 @@ msgid "Ports/Architectures"
msgstr "移植/アーキテクチャ"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "インストール手順"
#: ../../english/template/debian/links.tags.wml:116
diff --git a/korean/po/templates.ko.po b/korean/po/templates.ko.po
index f37813cc428..1ddb06faee6 100644
--- a/korean/po/templates.ko.po
+++ b/korean/po/templates.ko.po
@@ -58,7 +58,7 @@ msgid "About Debian"
msgstr "데비안에 대해서"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "우리에게 연락하기"
#: ../../english/template/debian/common_translation.wml:37
@@ -83,7 +83,7 @@ msgstr "지원"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "개발자 코너"
#: ../../english/template/debian/common_translation.wml:55
@@ -91,7 +91,7 @@ msgid "Documentation"
msgstr "문서"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "보안 정보"
#: ../../english/template/debian/common_translation.wml:61
@@ -207,7 +207,7 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "<a href=m4_HOME/intro/cn>원하는 언어로 보려면 어떻게 해야 하는가?</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr "데비안의 국제화"
#: ../../english/template/debian/links.tags.wml:7
@@ -219,7 +219,7 @@ msgid "Debian Weekly News"
msgstr "데비안 주간 뉴스"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "주간 뉴스"
#: ../../english/template/debian/links.tags.wml:16
@@ -230,16 +230,16 @@ msgstr "데비안 프로젝트"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
+#| msgid "Weekly News"
+msgid "Project News"
msgstr "주간 뉴스"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "릴리스 정보"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "데비안 패키지"
#: ../../english/template/debian/links.tags.wml:28
@@ -251,19 +251,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "데비안 CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "데비안 관련 서적"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "메일링 리스트 모음"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "메일링리스트"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "우리의 약속"
#: ../../english/template/debian/links.tags.wml:49
@@ -323,8 +323,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "기타 메일링 리스트 모음"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "자유&nbsp;소프트웨어"
+msgid "Free Software"
+msgstr "자유 소프트웨어"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -343,8 +343,8 @@ msgid "Ports/Architectures"
msgstr ""
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "설치&nbsp;설명서"
+msgid "Installation manual"
+msgstr "설치 설명서"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/lithuanian/po/templates.lt.po b/lithuanian/po/templates.lt.po
index 4e1185c919c..3d1f04a908a 100644
--- a/lithuanian/po/templates.lt.po
+++ b/lithuanian/po/templates.lt.po
@@ -51,8 +51,8 @@ msgid "About Debian"
msgstr "Apie Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Susisiekite&nbsp;su mumis"
+msgid "Contact Us"
+msgstr "Susisiekite su mumis"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -76,16 +76,16 @@ msgstr "Techninė pagalba"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Plėtotojų&nbsp;kampelis"
+msgid "Developers' Corner"
+msgstr "Plėtotojų kampelis"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Dokumentacija"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Saugumo&nbsp;informacija"
+msgid "Security Information"
+msgstr "Saugumo informacija"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -187,8 +187,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Kaip nustatyti <a href=m4_HOME/intro/cn>standartinę dokumento kalbą</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;Pasaulyje"
+msgid "Debian International"
+msgstr "Debian Pasaulyje"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -199,8 +199,8 @@ msgid "Debian Weekly News"
msgstr "Savaitinės Debian Naujienos"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Savaitinės&nbsp;naujienos"
+msgid "Weekly News"
+msgstr "Savaitinės naujienos"
#: ../../english/template/debian/links.tags.wml:16
#| msgid "Debian Project"
@@ -208,17 +208,16 @@ msgid "Debian Project News"
msgstr "Debian Projekto Naujienos"
#: ../../english/template/debian/links.tags.wml:19
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "Projekto&nbsp;naujienos"
+msgid "Project News"
+msgstr "Projekto naujienos"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Leidimo&nbsp;informacija"
+msgid "Release Info"
+msgstr "Leidimo informacija"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Debian&nbsp;paketai"
+msgid "Debian Packages"
+msgstr "Debian paketai"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -229,20 +228,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;kompaktiniame&nbsp;diske"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Knygos&nbsp;apie&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Knygos apie Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Pašto&nbsp;konferencijų&nbsp;archyvai"
+msgid "Mailing List Archives"
+msgstr "Pašto konferencijų archyvai"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Pašto&nbsp;konferencijos"
+msgid "Mailing Lists"
+msgstr "Pašto konferencijos"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Visuomeninė&nbsp;sutartis"
+msgid "Social Contract"
+msgstr "Visuomeninė sutartis"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -301,8 +300,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Kitų pašto konferencijų archyvai"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "Laisva&nbsp;programinė&nbsp;įranga"
+msgid "Free Software"
+msgstr "Laisva programinė įranga"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -321,8 +320,8 @@ msgid "Ports/Architectures"
msgstr "Migracija/Architektūros"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "Įdiegimo&nbsp;instrukcija"
+msgid "Installation manual"
+msgstr "Įdiegimo instrukcija"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/norwegian/po/templates.nb.po b/norwegian/po/templates.nb.po
index 47ccce3da41..3435689afe3 100644
--- a/norwegian/po/templates.nb.po
+++ b/norwegian/po/templates.nb.po
@@ -56,7 +56,7 @@ msgid "About Debian"
msgstr "Om Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Ta kontakt med oss"
#: ../../english/template/debian/common_translation.wml:37
@@ -81,7 +81,7 @@ msgstr "Brukerstøtte"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Utviklerhjørnet"
#: ../../english/template/debian/common_translation.wml:55
@@ -89,7 +89,7 @@ msgid "Documentation"
msgstr "Dokumentasjon"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Sikkerhetsinformasjon"
#: ../../english/template/debian/common_translation.wml:61
@@ -216,8 +216,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Slik velger du <a href=m4_HOME/intro/cn>standard språk</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;internasjonal"
+msgid "Debian International"
+msgstr "Debian internasjonal"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -228,23 +228,23 @@ msgid "Debian Weekly News"
msgstr "Debians Ukentlige Nyheter"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Ukentlige&nbsp;nyheter"
+msgid "Weekly News"
+msgstr "Ukentlige nyheter"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Debianprosjektnyheter"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "Prosjektnyheter"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informasjon&nbsp;om&nbsp;utgaver"
+msgid "Release Info"
+msgstr "Informasjon om utgaver"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Debianpakker"
#: ../../english/template/debian/links.tags.wml:28
@@ -256,20 +256,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;på&nbsp;CD-ROM"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Debianbøker"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "Postlistearkiver"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Postlister"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Sosial&nbsp;kontrakt"
+msgid "Social Contract"
+msgstr "Sosial kontrakt"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -332,8 +332,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arkiv av diverse postlister"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Fri&nbsp;programvare"
+msgid "Free Software"
+msgstr "Fri programvare"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -352,7 +352,7 @@ msgid "Ports/Architectures"
msgstr "Arkitekturtilpasninger"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "Installasjonshåndbok"
#: ../../english/template/debian/links.tags.wml:116
diff --git a/persian/po/templates.fa.po b/persian/po/templates.fa.po
index 5866fd5e278..3c378e08109 100644
--- a/persian/po/templates.fa.po
+++ b/persian/po/templates.fa.po
@@ -54,7 +54,7 @@ msgid "About Debian"
msgstr "درباره دبیان"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "تماس با ما"
#: ../../english/template/debian/common_translation.wml:37
@@ -79,7 +79,7 @@ msgstr "پشتیبانی"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "خلوت توسعه دهندگان"
#: ../../english/template/debian/common_translation.wml:55
@@ -87,7 +87,7 @@ msgid "Documentation"
msgstr "مستندات"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "اطلاعات امنیت"
#: ../../english/template/debian/common_translation.wml:61
@@ -198,7 +198,7 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "نحوه تنظیم <a href=m4_HOME/intro/cn>زبان پیش فرض اسناد</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr "دبیان بین المللی"
#: ../../english/template/debian/links.tags.wml:7
@@ -210,7 +210,7 @@ msgid "Debian Weekly News"
msgstr "اخبار هفتگی دبیان"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "اخبار هفتگی"
#: ../../english/template/debian/links.tags.wml:16
@@ -218,15 +218,15 @@ msgid "Debian Project News"
msgstr "اخبار پروژه دبیان"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr "اخبار پروژه"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "اطلاعات انتشار"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "بسته های دبیان"
#: ../../english/template/debian/links.tags.wml:28
@@ -238,19 +238,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "دبیان روی CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "کتاب های دبیان "
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "بایگانی لیست های پستی"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "لیست های پستی"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "قرارداد اجتماعی"
#: ../../english/template/debian/links.tags.wml:49
@@ -314,7 +314,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "بایگانی ها برای لیست های پستی گوناگون"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr "نرم افزار آزاد"
#: ../../english/template/debian/links.tags.wml:101
@@ -334,7 +334,7 @@ msgid "Ports/Architectures"
msgstr "معماری ها /پورت ها"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "راهنمای نصب"
#: ../../english/template/debian/links.tags.wml:116
diff --git a/polish/po/templates.pl.po b/polish/po/templates.pl.po
index dfb39cbb7f2..81e01887806 100644
--- a/polish/po/templates.pl.po
+++ b/polish/po/templates.pl.po
@@ -64,8 +64,8 @@ msgid "About Debian"
msgstr "O&nbsp;Debianie"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Skontaktuj&nbsp;się&nbsp;z&nbsp;nami"
+msgid "Contact Us"
+msgstr "Skontaktuj się z nami"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -89,15 +89,15 @@ msgstr "Pomoc"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Kącik&nbsp;deweloperów"
+msgid "Developers' Corner"
+msgstr "Kącik deweloperów"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Dokumentacja"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Bezpieczeństwo"
#: ../../english/template/debian/common_translation.wml:61
@@ -222,8 +222,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Jak ustawić <a href=m4_HOME/intro/cn>domyślny język dokumentu</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Różne&nbsp;języki&nbsp;w&nbsp;Debianie"
+msgid "Debian International"
+msgstr "Różne języki w Debianie"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -231,27 +231,27 @@ msgstr "Partnerzy"
#: ../../english/template/debian/links.tags.wml:10
msgid "Debian Weekly News"
-msgstr "Cotygodniowe&nbsp;wiadomości&nbsp;Debiana"
+msgstr "Cotygodniowe wiadomości Debiana"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Wiadomości&nbsp;cotygodniowe"
+msgid "Weekly News"
+msgstr "Wiadomości cotygodniowe"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Wiadomości Projektu Debian"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Wiadomości&nbsp;Projektu"
+msgid "Project News"
+msgstr "Wiadomości Projektu"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informacje&nbsp;o&nbsp;wydaniach"
+msgid "Release Info"
+msgstr "Informacje o wydaniach"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Pakiety&nbsp;Debiana"
+msgid "Debian Packages"
+msgstr "Pakiety Debiana"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -262,20 +262,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;na&nbsp;płytach&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Książki&nbsp;o&nbsp;Debianie"
+msgid "Debian Books"
+msgstr "Książki o Debianie"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Archiwa&nbsp;List&nbsp;Dyskusyjnych"
+msgid "Mailing List Archives"
+msgstr "Archiwa List Dyskusyjnych"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Listy&nbsp;Dyskusyjne"
+msgid "Mailing Lists"
+msgstr "Listy Dyskusyjne"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Umowa&nbsp;Społeczna"
+msgid "Social Contract"
+msgstr "Umowa Społeczna"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -338,8 +338,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Archiwa pozostałych list dyskusyjnych"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Wolne&nbsp;oprogramowanie"
+msgid "Free Software"
+msgstr "Wolne oprogramowanie"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -358,8 +358,8 @@ msgid "Ports/Architectures"
msgstr "Adaptacje/Architektury"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Podręcznik&nbsp;instalacji"
+msgid "Installation manual"
+msgstr "Podręcznik instalacji"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/portuguese/po/templates.pt.po b/portuguese/po/templates.pt.po
index 7d193e8fd1e..8ca3ef46e92 100644
--- a/portuguese/po/templates.pt.po
+++ b/portuguese/po/templates.pt.po
@@ -72,7 +72,7 @@ msgid "About Debian"
msgstr "Sobre o Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Contate-nos"
#: ../../english/template/debian/common_translation.wml:37
@@ -97,16 +97,16 @@ msgstr "Suporte"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Canto&nbsp;dos&nbsp;Desenvolvedores"
+msgid "Developers' Corner"
+msgstr "Canto dos Desenvolvedores"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Documentação"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Informações&nbsp;sobre&nbsp;Segurança"
+msgid "Security Information"
+msgstr "Informações sobre Segurança"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -232,8 +232,8 @@ msgstr ""
"Como configurar <a href=m4_HOME/intro/cn>o idioma padrão dos documentos</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;Internacional"
+msgid "Debian International"
+msgstr "Debian Internacional"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -244,24 +244,24 @@ msgid "Debian Weekly News"
msgstr "Notícias Semanais Debian (Debian Weekly News)"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Notícias&nbsp;Semanais"
+msgid "Weekly News"
+msgstr "Notícias Semanais"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Notícias do Projeto Debian"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Notícias&nbsp;do&nbsp;Projeto"
+msgid "Project News"
+msgstr "Notícias do Projeto"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informações&nbsp;sobre&nbsp;Versões"
+msgid "Release Info"
+msgstr "Informações sobre Versões"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Pacotes&nbsp;no&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Pacotes no Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -272,20 +272,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;em&nbsp;CDs"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Livros&nbsp;sobre&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Livros sobre Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Arquivos&nbsp;das&nbsp;Listas&nbsp;de&nbsp;Discussão"
+msgid "Mailing List Archives"
+msgstr "Arquivos das Listas de Discussão"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Listas&nbsp;de&nbsp;Discussão"
+msgid "Mailing Lists"
+msgstr "Listas de Discussão"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Contrato&nbsp;Social"
+msgid "Social Contract"
+msgstr "Contrato Social"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -348,8 +348,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arquivos das listas de discussão variadas"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Software&nbsp;Livre"
+msgid "Free Software"
+msgstr "Software Livre"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -368,8 +368,8 @@ msgid "Ports/Architectures"
msgstr "Portes/Arquiteturas"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Manual&nbsp;de&nbsp;Instalação"
+msgid "Installation manual"
+msgstr "Manual de Instalação"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/romanian/po/templates.ro.po b/romanian/po/templates.ro.po
index a671c9c67b2..30d57e93db1 100644
--- a/romanian/po/templates.ro.po
+++ b/romanian/po/templates.ro.po
@@ -56,7 +56,7 @@ msgid "About Debian"
msgstr "Despre Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Contacta&#355;i-ne"
#: ../../english/template/debian/common_translation.wml:37
@@ -81,7 +81,7 @@ msgstr "Suport"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Col&#355;ul programatorilor"
#: ../../english/template/debian/common_translation.wml:55
@@ -89,8 +89,8 @@ msgid "Documentation"
msgstr "Documenta&#355;ie"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Informa&#355;ii&nbsp;securitate"
+msgid "Security Information"
+msgstr "Informa&#355;ii securitate"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -211,7 +211,7 @@ msgstr ""
"a documentului</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr "Debian Interna&#355;ional"
#: ../../english/template/debian/links.tags.wml:7
@@ -223,8 +223,8 @@ msgid "Debian Weekly News"
msgstr "Debian, &#350;tiri s&#259;pt&#259;m&#238;nale"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "&#350;tiri&nbsp;s&#259;pt&#259;m&#238;nale"
+msgid "Weekly News"
+msgstr "&#350;tiri s&#259;pt&#259;m&#238;nale"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
@@ -234,16 +234,16 @@ msgstr "Proiectul Debian"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "&#350;tiri&nbsp;s&#259;pt&#259;m&#238;nale"
+#| msgid "Weekly News"
+msgid "Project News"
+msgstr "&#350;tiri s&#259;pt&#259;m&#238;nale"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Informa&#355;ii lansare"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Pachete Debian"
#: ../../english/template/debian/links.tags.wml:28
@@ -255,19 +255,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Citi&#355;i rezultatul"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "C&#259;r&#355;i Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Arhive&nbsp;liste&nbsp;discu&#355;ii"
+msgid "Mailing List Archives"
+msgstr "Arhive liste discu&#355;ii"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Liste de discu&#355;ii"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr "Contractul social"
#: ../../english/template/debian/links.tags.wml:49
@@ -328,7 +328,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arhivele pentru listele de discu&#355;ii &#8222;diverse&#8221;"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr "Programe libere"
#: ../../english/template/debian/links.tags.wml:98
@@ -348,8 +348,8 @@ msgid "Ports/Architectures"
msgstr "Port&#259;ri/Arhitecturi"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "Manuale&nbsp;de&nbsp;instalare"
+msgid "Installation manual"
+msgstr "Manuale de instalare"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/russian/po/templates.ru.po b/russian/po/templates.ru.po
index a9d34d4a7ff..e9eb547bbd5 100644
--- a/russian/po/templates.ru.po
+++ b/russian/po/templates.ru.po
@@ -67,8 +67,8 @@ msgid "About Debian"
msgstr "О Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Как&nbsp;с&nbsp;нами&nbsp;связаться"
+msgid "Contact Us"
+msgstr "Как с нами связаться"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -92,16 +92,16 @@ msgstr "Поддержка"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Уголок&nbsp;разработчика"
+msgid "Developers' Corner"
+msgstr "Уголок разработчика"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Документация"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Информация&nbsp;о&nbsp;безопасности"
+msgid "Security Information"
+msgstr "Информация о безопасности"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -231,8 +231,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Как установить <a href=m4_HOME/intro/cn>язык по умолчанию</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Международный&nbsp;Debian"
+msgid "Debian International"
+msgstr "Международный Debian"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -243,24 +243,24 @@ msgid "Debian Weekly News"
msgstr "Еженедельные новости Debian"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Еженедельные&nbsp;новости"
+msgid "Weekly News"
+msgstr "Еженедельные новости"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Новости проекта Debian"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Новости&nbsp;проекта"
+msgid "Project News"
+msgstr "Новости проекта"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Информация&nbsp;о&nbsp;выпусках"
+msgid "Release Info"
+msgstr "Информация о выпусках"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Пакеты&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Пакеты Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -271,20 +271,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;на&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Книги&nbsp;о&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Книги о Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Архивы&nbsp;списков&nbsp;рассылки"
+msgid "Mailing List Archives"
+msgstr "Архивы списков рассылки"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Списки&nbsp;рассылки"
+msgid "Mailing Lists"
+msgstr "Списки рассылки"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Общественный&nbsp;договор"
+msgid "Social Contract"
+msgstr "Общественный договор"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -347,8 +347,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Архивы других списков рассылки"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Свободное&nbsp;ПО"
+msgid "Free Software"
+msgstr "Свободное ПО"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -367,8 +367,8 @@ msgid "Ports/Architectures"
msgstr "Перенос на другие архитектуры"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Инструкции&nbsp;по&nbsp;установке"
+msgid "Installation manual"
+msgstr "Инструкции по установке"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/slovak/po/templates.sk.po b/slovak/po/templates.sk.po
index 19e8bbe316d..c3a55281aa8 100644
--- a/slovak/po/templates.sk.po
+++ b/slovak/po/templates.sk.po
@@ -57,8 +57,8 @@ msgid "About Debian"
msgstr "O&nbsp;Debiane"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Napíšte&nbsp;nám"
+msgid "Contact Us"
+msgstr "Napíšte nám"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -82,7 +82,7 @@ msgstr "Podpora"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Pre vývojárov"
#: ../../english/template/debian/common_translation.wml:55
@@ -90,8 +90,8 @@ msgid "Documentation"
msgstr "Dokumentácia"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Bezpečnostné&nbsp;správy"
+msgid "Security Information"
+msgstr "Bezpečnostné správy"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -201,8 +201,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Ako nastaviť <a href=m4_HOME/intro/cn>implicitný jazyk</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;a&nbsp;jazyky"
+msgid "Debian International"
+msgstr "Debian a jazyky"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -213,7 +213,7 @@ msgid "Debian Weekly News"
msgstr "Týždenník Debianu"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "Týždenník"
#: ../../english/template/debian/links.tags.wml:16
@@ -221,16 +221,16 @@ msgid "Debian Project News"
msgstr "Novinky projektu Debian"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Novinky&nbsp;projektu"
+msgid "Project News"
+msgstr "Novinky projektu"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Informácie&nbsp;o&nbsp;vydaniach"
+msgid "Release Info"
+msgstr "Informácie o vydaniach"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Balíky&nbsp;Debianu"
+msgid "Debian Packages"
+msgstr "Balíky Debianu"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -241,20 +241,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;na&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Knihy&nbsp;o&nbsp;Debiane"
+msgid "Debian Books"
+msgstr "Knihy o Debiane"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Archívy&nbsp;konferencií"
+msgid "Mailing List Archives"
+msgstr "Archívy konferencií"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Konferencie"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Spoločenská&nbsp;zmluva"
+msgid "Social Contract"
+msgstr "Spoločenská zmluva"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -317,8 +317,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Archívy ostatných konferencií"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Free&nbsp;software"
+msgid "Free Software"
+msgstr "Free software"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -337,8 +337,8 @@ msgid "Ports/Architectures"
msgstr "Porty/architektúry"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Inštalačná&nbsp;príručka"
+msgid "Installation manual"
+msgstr "Inštalačná príručka"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/slovene/po/templates.sl.po b/slovene/po/templates.sl.po
index 85e30a83a2b..3d8207ce5fc 100644
--- a/slovene/po/templates.sl.po
+++ b/slovene/po/templates.sl.po
@@ -56,7 +56,7 @@ msgid "About Debian"
msgstr "O Debianu"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Kontakti"
#: ../../english/template/debian/common_translation.wml:37
@@ -81,15 +81,15 @@ msgstr "Podpora"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Kotiček&nbsp;za&nbsp;razvijalce"
+msgid "Developers' Corner"
+msgstr "Kotiček za razvijalce"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Dokumentacija"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Varnost"
#: ../../english/template/debian/common_translation.wml:61
@@ -203,8 +203,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Kako nastaviti <a href=m4_HOME/intro/cn>privzeti jezik dokumentov</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;International"
+msgid "Debian International"
+msgstr "Debian International"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -215,7 +215,7 @@ msgid "Debian Weekly News"
msgstr "Debianov tednik"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr "Tednik"
#: ../../english/template/debian/links.tags.wml:16
@@ -226,17 +226,17 @@ msgstr "Projekt Debian"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
+#| msgid "Weekly News"
+msgid "Project News"
msgstr "Tednik"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Spremno&nbsp;besedilo"
+msgid "Release Info"
+msgstr "Spremno besedilo"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Debianovi&nbsp;paketi"
+msgid "Debian Packages"
+msgstr "Debianovi paketi"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -247,20 +247,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian na CDju"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Knjige o Debianu"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Poštni&nbsp;seznami&nbsp;in&nbsp;arhiv"
+msgid "Mailing List Archives"
+msgstr "Poštni seznami in arhiv"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Poštni seznami"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Družbeni&nbsp;dogovor"
+msgid "Social Contract"
+msgstr "Družbeni dogovor"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -320,8 +320,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arhiv raznih poštnih seznamov"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "Prosto&nbsp;programje"
+msgid "Free Software"
+msgstr "Prosto programje"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -340,8 +340,8 @@ msgid "Ports/Architectures"
msgstr "Platforme/Arhitekture"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "Navodila&nbsp;za&nbsp;namestitev"
+msgid "Installation manual"
+msgstr "Navodila za namestitev"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/spanish/po/templates.es.po b/spanish/po/templates.es.po
index 65318978761..6b27226dcae 100644
--- a/spanish/po/templates.es.po
+++ b/spanish/po/templates.es.po
@@ -61,8 +61,8 @@ msgid "About Debian"
msgstr "Acerca de Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Contacte&nbsp;con&nbsp;nosotros"
+msgid "Contact Us"
+msgstr "Contacte con nosotros"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -86,16 +86,16 @@ msgstr "Soporte"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Rincón&nbsp;de&nbsp;los&nbsp;desarrolladores"
+msgid "Developers' Corner"
+msgstr "Rincón de los desarrolladores"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Documentación"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Información&nbsp;sobre&nbsp;seguridad"
+msgid "Security Information"
+msgstr "Información sobre seguridad"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -227,8 +227,8 @@ msgstr ""
"documentos</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;es&nbsp;internacional"
+msgid "Debian International"
+msgstr "Debian es internacional"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -239,24 +239,24 @@ msgid "Debian Weekly News"
msgstr "Noticias semanales de Debian"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Noticias&nbsp;semanales"
+msgid "Weekly News"
+msgstr "Noticias semanales"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Noticias del Proyecto Debian"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Noticias&nbsp;del&nbsp;proyecto"
+msgid "Project News"
+msgstr "Noticias del proyecto"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Info&nbsp;sobre&nbsp;versiones"
+msgid "Release Info"
+msgstr "Info sobre versiones"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Paquetes&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Paquetes Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -267,20 +267,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;en&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Libros&nbsp;sobre&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Libros sobre Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Archivos&nbsp;de&nbsp;listas de&nbsp;correo"
+msgid "Mailing List Archives"
+msgstr "Archivos de listas de correo"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Listas&nbsp;de&nbsp;correo"
+msgid "Mailing Lists"
+msgstr "Listas de correo"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Contrato&nbsp;social"
+msgid "Social Contract"
+msgstr "Contrato social"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -343,8 +343,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Archivos de listas de correo variadas"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Software&nbsp;libre"
+msgid "Free Software"
+msgstr "Software libre"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -363,8 +363,8 @@ msgid "Ports/Architectures"
msgstr "Migraciones/Arquitecturas"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
-msgstr "Manual&nbsp;de&nbsp;instalación"
+msgid "Installation manual"
+msgstr "Manual de instalación"
#: ../../english/template/debian/links.tags.wml:116
msgid "CD vendors"
diff --git a/swedish/po/templates.sv.po b/swedish/po/templates.sv.po
index 34e84a7e657..50baea63b59 100644
--- a/swedish/po/templates.sv.po
+++ b/swedish/po/templates.sv.po
@@ -64,7 +64,7 @@ msgid "About Debian"
msgstr "Om Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr "Kontakta oss"
#: ../../english/template/debian/common_translation.wml:37
@@ -89,7 +89,7 @@ msgstr "Support"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr "Utvecklarhörnet"
#: ../../english/template/debian/common_translation.wml:55
@@ -97,7 +97,7 @@ msgid "Documentation"
msgstr "Dokumentation"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr "Säkerhetsinformation"
#: ../../english/template/debian/common_translation.wml:61
@@ -218,8 +218,8 @@ msgstr ""
"Så ställer du in <a href=m4_HOME/intro/cn>standardspråkval för dokument</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;internationellt"
+msgid "Debian International"
+msgstr "Debian internationellt"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -230,23 +230,23 @@ msgid "Debian Weekly News"
msgstr "Debian Weekly News"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Weekly&nbsp;News"
+msgid "Weekly News"
+msgstr "Weekly News"
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Debian Project News"
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
-msgstr "Project&nbsp;News"
+msgid "Project News"
+msgstr "Project News"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr "Versionsfakta"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr "Debianpaket"
#: ../../english/template/debian/links.tags.wml:28
@@ -258,20 +258,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;på&nbsp;cd"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr "Debianböcker"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr "Sändlistearkiv"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr "Sändlistor"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Socialt&nbsp;kontrakt"
+msgid "Social Contract"
+msgstr "Socialt kontrakt"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -334,8 +334,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Arkiv för blandade sändlistor"
#: ../../english/template/debian/links.tags.wml:95
-msgid "Free&nbsp;Software"
-msgstr "Fri&nbsp;programvara"
+msgid "Free Software"
+msgstr "Fri programvara"
#: ../../english/template/debian/links.tags.wml:101
msgid "Development"
@@ -354,7 +354,7 @@ msgid "Ports/Architectures"
msgstr "Anpassningar/arkitekturer"
#: ../../english/template/debian/links.tags.wml:113
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr "Installationsguide"
#: ../../english/template/debian/links.tags.wml:116
diff --git a/tamil/po/templates.ta.po b/tamil/po/templates.ta.po
index c9f24706b95..6f0adf349c4 100644
--- a/tamil/po/templates.ta.po
+++ b/tamil/po/templates.ta.po
@@ -61,8 +61,8 @@ msgid "About Debian"
msgstr "டெபியன் குறித்து"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "தொடர்பு&nbsp;கொள்க"
+msgid "Contact Us"
+msgstr "தொடர்பு கொள்க"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -86,16 +86,16 @@ msgstr "ஆதரவு"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "உருவாக்குவோர்&nbsp;கூடல்"
+msgid "Developers' Corner"
+msgstr "உருவாக்குவோர் கூடல்"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "ஆவணமாக்கம்"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "பாதுகாப்பு&nbsp;விவரம்"
+msgid "Security Information"
+msgstr "பாதுகாப்பு விவரம்"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -212,8 +212,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "ஆவணத்தின் இயலபிருப்பு மொழியினை அமைப்பது <a href=m4_HOME/intro/cn>எப்படி</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "சர்வதேச&nbsp;டெபியன்"
+msgid "Debian International"
+msgstr "சர்வதேச டெபியன்"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -224,8 +224,8 @@ msgid "Debian Weekly News"
msgstr "வாராந்திர டெபியன் செய்திகள்"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "வாராந்திர&nbsp;செய்திகள்"
+msgid "Weekly News"
+msgstr "வாராந்திர செய்திகள்"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
@@ -235,17 +235,17 @@ msgstr "டெபியன் திட்டம்"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "வாராந்திர&nbsp;செய்திகள்"
+#| msgid "Weekly News"
+msgid "Project News"
+msgstr "வாராந்திர செய்திகள்"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "வெளியீட்டுத்&nbsp;தகவல்"
+msgid "Release Info"
+msgstr "வெளியீட்டுத் தகவல்"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "டெபியன்&nbsp;பொதிகள்"
+msgid "Debian Packages"
+msgstr "டெபியன் பொதிகள்"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -256,20 +256,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "வட்டில்&nbsp;டெபியன்"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "டெபியன்&nbsp;புத்தகங்கள்"
+msgid "Debian Books"
+msgstr "டெபியன் புத்தகங்கள்"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "மடலாடற்&nbsp;குழு&nbsp;பெட்டகம்"
+msgid "Mailing List Archives"
+msgstr "மடலாடற் குழு பெட்டகம்"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "மடலாடற்&nbsp;குழுக்கள்"
+msgid "Mailing Lists"
+msgstr "மடலாடற் குழுக்கள்"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "சமூக&nbsp;ஒப்பந்தம்"
+msgid "Social Contract"
+msgstr "சமூக ஒப்பந்தம்"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -328,8 +328,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "ஏனைய மடலாடற் குழுக்களுக்கான பெட்டகங்கள்"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "கட்டற்ற&nbsp;மென்பொருள்"
+msgid "Free Software"
+msgstr "கட்டற்ற மென்பொருள்"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -348,8 +348,8 @@ msgid "Ports/Architectures"
msgstr "துறைகள்/கட்டமைப்புகள்"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "நிறுவல்&nbsp;கையேடு"
+msgid "Installation manual"
+msgstr "நிறுவல் கையேடு"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/turkish/po/templates.tr.po b/turkish/po/templates.tr.po
index a704db30dd1..5c97bcab0d2 100644
--- a/turkish/po/templates.tr.po
+++ b/turkish/po/templates.tr.po
@@ -65,8 +65,8 @@ msgid "About Debian"
msgstr "Debian Hakkında"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Bize&nbsp;ulaşın"
+msgid "Contact Us"
+msgstr "Bize ulaşın"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -90,16 +90,16 @@ msgstr "Destek"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Geliştiriciler&nbsp;Köşesi"
+msgid "Developers' Corner"
+msgstr "Geliştiriciler Köşesi"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Belgeleme"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Güvenlik&nbsp;Bilgisi"
+msgid "Security Information"
+msgstr "Güvenlik Bilgisi"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -219,8 +219,8 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Varsayılan belge <a href=m4_HOME/intro/cn>dili nasıl ayarlanır</a>"
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Debian&nbsp;Uluslararası"
+msgid "Debian International"
+msgstr "Debian Uluslararası"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -231,8 +231,8 @@ msgid "Debian Weekly News"
msgstr "Debian Haftalık Haberler"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Haftalık&nbsp;haberler"
+msgid "Weekly News"
+msgstr "Haftalık haberler"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
@@ -242,17 +242,17 @@ msgstr "Debian Projesi"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "Haftalık&nbsp;haberler"
+#| msgid "Weekly News"
+msgid "Project News"
+msgstr "Haftalık haberler"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Sürüm&nbsp;Bilgisi"
+msgid "Release Info"
+msgstr "Sürüm Bilgisi"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Debian&nbsp;Paketleri"
+msgid "Debian Packages"
+msgstr "Debian Paketleri"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -263,20 +263,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;CD'leri"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Debian&nbsp;Kitapları"
+msgid "Debian Books"
+msgstr "Debian Kitapları"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Liste&nbsp;Arşivleri"
+msgid "Mailing List Archives"
+msgstr "Liste Arşivleri"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Eposta&nbsp;Listeleri"
+msgid "Mailing Lists"
+msgstr "Eposta Listeleri"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Sosyal&nbsp;Sözleşme"
+msgid "Social Contract"
+msgstr "Sosyal Sözleşme"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -335,8 +335,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Diğer liste arşivleri"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "Özgür&nbsp;Yazılım"
+msgid "Free Software"
+msgstr "Özgür Yazılım"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -355,8 +355,8 @@ msgid "Ports/Architectures"
msgstr "Platformlar/Mimariler"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "Kurulum&nbsp;Kılavuzu"
+msgid "Installation manual"
+msgstr "Kurulum Kılavuzu"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/ukrainian/po/templates.uk.po b/ukrainian/po/templates.uk.po
index 6f258bdda19..d1ab0043802 100644
--- a/ukrainian/po/templates.uk.po
+++ b/ukrainian/po/templates.uk.po
@@ -63,8 +63,8 @@ msgid "About Debian"
msgstr "Про Debian"
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
-msgstr "Як&nbsp;з&nbsp;нами&nbsp;зв'язатися"
+msgid "Contact Us"
+msgstr "Як з нами зв'язатися"
#: ../../english/template/debian/common_translation.wml:37
msgid "Donations"
@@ -88,16 +88,16 @@ msgstr "Підтримка"
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
-msgstr "Куток&nbsp;розробника"
+msgid "Developers' Corner"
+msgstr "Куток розробника"
#: ../../english/template/debian/common_translation.wml:55
msgid "Documentation"
msgstr "Документація"
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
-msgstr "Інформація&nbsp;про&nbsp;безпеку"
+msgid "Security Information"
+msgstr "Інформація про безпеку"
#: ../../english/template/debian/common_translation.wml:61
msgid "Search"
@@ -219,8 +219,8 @@ msgstr ""
"Як встановити <a href=m4_HOME/intro/cn>мову документа за замовчанням</a>."
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
-msgstr "Міжнародний&nbsp;Debian"
+msgid "Debian International"
+msgstr "Міжнародний Debian"
#: ../../english/template/debian/links.tags.wml:7
msgid "Partners"
@@ -231,8 +231,8 @@ msgid "Debian Weekly News"
msgstr "Щотижневі новини Debian"
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
-msgstr "Щотижневі&nbsp;новини"
+msgid "Weekly News"
+msgstr "Щотижневі новини"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
@@ -242,17 +242,17 @@ msgstr "Проект Debian"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly&nbsp;News"
-msgid "Project&nbsp;News"
-msgstr "Щотижневі&nbsp;новини"
+#| msgid "Weekly News"
+msgid "Project News"
+msgstr "Щотижневі новини"
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
-msgstr "Інформація&nbsp;про&nbsp;випуски"
+msgid "Release Info"
+msgstr "Інформація про випуски"
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
-msgstr "Пакунки&nbsp;Debian"
+msgid "Debian Packages"
+msgstr "Пакунки Debian"
#: ../../english/template/debian/links.tags.wml:28
msgid "Download"
@@ -263,20 +263,20 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr "Debian&nbsp;на&nbsp;CD"
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
-msgstr "Книги&nbsp;про&nbsp;Debian"
+msgid "Debian Books"
+msgstr "Книги про Debian"
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
-msgstr "Архіви&nbsp;списків&nbsp;розсилки"
+msgid "Mailing List Archives"
+msgstr "Архіви списків розсилки"
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
-msgstr "Списки&nbsp;розсилки"
+msgid "Mailing Lists"
+msgstr "Списки розсилки"
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
-msgstr "Суспільний&nbsp;договір"
+msgid "Social Contract"
+msgstr "Суспільний договір"
#: ../../english/template/debian/links.tags.wml:49
msgid "Visit the site sponsor"
@@ -335,8 +335,8 @@ msgid "Archives for miscellaneous mailing lists"
msgstr "Архіви інших списків розсилки"
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
-msgstr "Вільне&nbsp;програмне&nbsp;забезпечення"
+msgid "Free Software"
+msgstr "Вільне програмне забезпечення"
#: ../../english/template/debian/links.tags.wml:98
msgid "Development"
@@ -355,8 +355,8 @@ msgid "Ports/Architectures"
msgstr "Перенесення&nbsp;на&nbsp;інші&nbsp;архітектури"
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
-msgstr "Посібник&nbsp;по&nbsp;встановленню"
+msgid "Installation manual"
+msgstr "Посібник по встановленню"
#: ../../english/template/debian/links.tags.wml:113
msgid "CD vendors"
diff --git a/vietnamese/po/templates.vi.po b/vietnamese/po/templates.vi.po
index 168413e7dc4..1e86264cb70 100644
--- a/vietnamese/po/templates.vi.po
+++ b/vietnamese/po/templates.vi.po
@@ -44,7 +44,7 @@ msgid "About Debian"
msgstr ""
#: ../../english/template/debian/common_translation.wml:34
-msgid "Contact&nbsp;Us"
+msgid "Contact Us"
msgstr ""
#: ../../english/template/debian/common_translation.wml:37
@@ -69,7 +69,7 @@ msgstr ""
#: ../../english/template/debian/common_translation.wml:52
#: ../../english/template/debian/links.tags.wml:43
-msgid "Developers'&nbsp;Corner"
+msgid "Developers' Corner"
msgstr ""
#: ../../english/template/debian/common_translation.wml:55
@@ -77,7 +77,7 @@ msgid "Documentation"
msgstr ""
#: ../../english/template/debian/common_translation.wml:58
-msgid "Security&nbsp;Information"
+msgid "Security Information"
msgstr ""
#: ../../english/template/debian/common_translation.wml:61
@@ -180,7 +180,7 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian&nbsp;International"
+msgid "Debian International"
msgstr ""
#: ../../english/template/debian/links.tags.wml:7
@@ -192,7 +192,7 @@ msgid "Debian Weekly News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:13
-msgid "Weekly&nbsp;News"
+msgid "Weekly News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:16
@@ -200,15 +200,15 @@ msgid "Debian Project News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:19
-msgid "Project&nbsp;News"
+msgid "Project News"
msgstr ""
#: ../../english/template/debian/links.tags.wml:22
-msgid "Release&nbsp;Info"
+msgid "Release Info"
msgstr ""
#: ../../english/template/debian/links.tags.wml:25
-msgid "Debian&nbsp;Packages"
+msgid "Debian Packages"
msgstr ""
#: ../../english/template/debian/links.tags.wml:28
@@ -220,19 +220,19 @@ msgid "Debian&nbsp;on&nbsp;CD"
msgstr ""
#: ../../english/template/debian/links.tags.wml:34
-msgid "Debian&nbsp;Books"
+msgid "Debian Books"
msgstr ""
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing&nbsp;List&nbsp;Archives"
+msgid "Mailing List Archives"
msgstr ""
#: ../../english/template/debian/links.tags.wml:40
-msgid "Mailing&nbsp;Lists"
+msgid "Mailing Lists"
msgstr ""
#: ../../english/template/debian/links.tags.wml:46
-msgid "Social&nbsp;Contract"
+msgid "Social Contract"
msgstr ""
#: ../../english/template/debian/links.tags.wml:49
@@ -292,7 +292,7 @@ msgid "Archives for miscellaneous mailing lists"
msgstr ""
#: ../../english/template/debian/links.tags.wml:92
-msgid "Free&nbsp;Software"
+msgid "Free Software"
msgstr ""
#: ../../english/template/debian/links.tags.wml:98
@@ -312,7 +312,7 @@ msgid "Ports/Architectures"
msgstr ""
#: ../../english/template/debian/links.tags.wml:110
-msgid "Installation&nbsp;manual"
+msgid "Installation manual"
msgstr ""
#: ../../english/template/debian/links.tags.wml:113

© 2014-2024 Faster IT GmbH | imprint | privacy policy