scripted result of msgmerge --previous -F templates.$lc.po...

scripted result of msgmerge --previous -F templates.$lc.po ../../english/po/templates.pot -o templates.$lc.po.new && mv templates.$lc.po.new templates.$lc.po CVS version numbers armenian/po/templates.hy.po: 1.6 -> 1.7 bulgarian/po/templates.bg.po: 1.32 -> 1.33 catalan/po/templates.ca.po: 1.36 -> 1.37 chinese/po/templates.zh.po: 1.17 -> 1.18 croatian/po/templates.hr.po: 1.32 -> 1.33 czech/po/templates.cs.po: 1.15 -> 1.16 danish/po/templates.da.po: 1.43 -> 1.44 dutch/po/templates.nl.po: 1.54 -> 1.55 esperanto/po/templates.eo.po: 1.15 -> 1.16 finnish/po/templates.fi.po: 1.37 -> 1.38 french/po/templates.fr.po: 1.55 -> 1.56 german/po/templates.de.po: 1.65 -> 1.66 greek/po/templates.el.po: 1.16 -> 1.17 hebrew/po/templates.he.po: 1.6 -> 1.7 hungarian/po/templates.hu.po: 1.20 -> 1.21 indonesian/po/templates.id.po: 1.9 -> 1.10 italian/po/templates.it.po: 1.32 -> 1.33 japanese/po/templates.ja.po: 1.27 -> 1.28 korean/po/templates.ko.po: 1.15 -> 1.16 lithuanian/po/templates.lt.po: 1.13 -> 1.14 norwegian/po/templates.no.po: 1.16 -> 1.17 persian/po/templates.fa.po: 1.4 -> 1.5 polish/po/templates.pl.po: 1.35 -> 1.36 portuguese/po/templates.pt.po: 1.46 -> 1.47 romanian/po/templates.ro.po: 1.23 -> 1.24 russian/po/templates.ru.po: 1.36 -> 1.37 slovak/po/templates.sk.po: 1.7 -> 1.8 slovene/po/templates.sl.po: 1.5 -> 1.6 spanish/po/templates.es.po: 1.37 -> 1.38 swedish/po/templates.sv.po: 1.51 -> 1.52 tamil/po/templates.ta.po: 1.4 -> 1.5 turkish/po/templates.tr.po: 1.19 -> 1.20 ukrainian/po/templates.uk.po: 1.13 -> 1.14

scripted result of msgmerge --previous -F templates.$lc.po...
scripted result of msgmerge --previous -F templates.$lc.po ../../english/po/templates.pot -o templates.$lc.po.new && mv templates.$lc.po.new templates.$lc.po CVS version numbers armenian/po/templates.hy.po: 1.6 -> 1.7 bulgarian/po/templates.bg.po: 1.32 -> 1.33 catalan/po/templates.ca.po: 1.36 -> 1.37 chinese/po/templates.zh.po: 1.17 -> 1.18 croatian/po/templates.hr.po: 1.32 -> 1.33 czech/po/templates.cs.po: 1.15 -> 1.16 danish/po/templates.da.po: 1.43 -> 1.44 dutch/po/templates.nl.po: 1.54 -> 1.55 esperanto/po/templates.eo.po: 1.15 -> 1.16 finnish/po/templates.fi.po: 1.37 -> 1.38 french/po/templates.fr.po: 1.55 -> 1.56 german/po/templates.de.po: 1.65 -> 1.66 greek/po/templates.el.po: 1.16 -> 1.17 hebrew/po/templates.he.po: 1.6 -> 1.7 hungarian/po/templates.hu.po: 1.20 -> 1.21 indonesian/po/templates.id.po: 1.9 -> 1.10 italian/po/templates.it.po: 1.32 -> 1.33 japanese/po/templates.ja.po: 1.27 -> 1.28 korean/po/templates.ko.po: 1.15 -> 1.16 lithuanian/po/templates.lt.po: 1.13 -> 1.14 norwegian/po/templates.no.po: 1.16 -> 1.17 persian/po/templates.fa.po: 1.4 -> 1.5 polish/po/templates.pl.po: 1.35 -> 1.36 portuguese/po/templates.pt.po: 1.46 -> 1.47 romanian/po/templates.ro.po: 1.23 -> 1.24 russian/po/templates.ru.po: 1.36 -> 1.37 slovak/po/templates.sk.po: 1.7 -> 1.8 slovene/po/templates.sl.po: 1.5 -> 1.6 spanish/po/templates.es.po: 1.37 -> 1.38 swedish/po/templates.sv.po: 1.51 -> 1.52 tamil/po/templates.ta.po: 1.4 -> 1.5 turkish/po/templates.tr.po: 1.19 -> 1.20 ukrainian/po/templates.uk.po: 1.13 -> 1.14
ff1d7b91 · Josip Rodin · 85a07a0d · ff1d7b91 · ff1d7b91 · ff1d7b91
Commit ff1d7b91 authored Aug 16, 2008 by Josip Rodin
33 changed files
--- a/armenian/po/templates.hy.po
+++ b/armenian/po/templates.hy.po
@@ -15,96 +15,6 @@ msgstr ""
 msgid "More information"
 msgstr ""

-#: ../../english/template/debian/cdimage.wml:8
-msgid "&middot;"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:11
-msgid "<void id=\"dc_faq\" />FAQ"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:14
-msgid "Download with Jigdo"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:17
-msgid "Download via HTTP/FTP"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:20
-msgid "Buy CDs or DVDs"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:23
-msgid "Network Install"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:26
-msgid "<void id=\"dc_download\" />Download"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:29
-msgid "<void id=\"dc_misc\" />Misc"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:32
-msgid "<void id=\"dc_artwork\" />Artwork"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:35
-msgid "<void id=\"dc_mirroring\" />Mirroring"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:38
-msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:41
-msgid "<void id=\"dc_torrent\" />Download with Torrent"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:44
-msgid "<void id=\"dc_relinfo\" />Image Release Info"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:47
-msgid "Debian CD team"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:50
-msgid "debian_on_cd"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:53
-msgid "<void id=\"faq-bottom\" />faq"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:56
-msgid "jigdo"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:59
-msgid "http_ftp"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:62
-msgid "buy"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:65
-msgid "net_install"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:68
-msgid "<void id=\"misc-bottom\" />misc"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:71
-msgid ""
-"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
-"a> for CDs/DVDs:"
-msgstr ""
-
 #: ../../english/template/debian/common_translation.wml:4
 msgid "Yes"
 msgstr ""

--- a/bulgarian/po/templates.bg.po
+++ b/bulgarian/po/templates.bg.po
--- a/catalan/po/templates.ca.po
+++ b/catalan/po/templates.ca.po
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -15,99 +15,6 @@ msgstr ""
 msgid "More information"
 msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"

-#: ../../english/template/debian/cdimage.wml:8
-msgid "&middot;"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:11
-msgid "<void id=\"dc_faq\" />FAQ"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:14
-#, fuzzy
-msgid "Download with Jigdo"
-msgstr "用 jigdo 下載"
-
-#: ../../english/template/debian/cdimage.wml:17
-#, fuzzy
-msgid "Download via HTTP/FTP"
-msgstr "透過 http/ftp 下載"
-
-#: ../../english/template/debian/cdimage.wml:20
-msgid "Buy CDs or DVDs"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:23
-#, fuzzy
-msgid "Network Install"
-msgstr "網絡安裝"
-
-#: ../../english/template/debian/cdimage.wml:26
-msgid "<void id=\"dc_download\" />Download"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:29
-msgid "<void id=\"dc_misc\" />Misc"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:32
-msgid "<void id=\"dc_artwork\" />Artwork"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:35
-msgid "<void id=\"dc_mirroring\" />Mirroring"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:38
-msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:41
-msgid "<void id=\"dc_torrent\" />Download with Torrent"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:44
-msgid "<void id=\"dc_relinfo\" />Image Release Info"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:47
-msgid "Debian CD team"
-msgstr "<span lang=\"en\">Debian </span>光碟小組"
-
-#: ../../english/template/debian/cdimage.wml:50
-msgid "debian_on_cd"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:53
-msgid "<void id=\"faq-bottom\" />faq"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:56
-msgid "jigdo"
-msgstr "jigdo"
-
-#: ../../english/template/debian/cdimage.wml:59
-msgid "http_ftp"
-msgstr "http_ftp"
-
-#: ../../english/template/debian/cdimage.wml:62
-msgid "buy"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:65
-msgid "net_install"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:68
-msgid "<void id=\"misc-bottom\" />misc"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:71
-msgid ""
-"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
-"a> for CDs/DVDs:"
-msgstr ""
-
 #: ../../english/template/debian/common_translation.wml:4
 msgid "Yes"
 msgstr "是"
@@ -775,56 +682,51 @@ msgstr ""
 "\">Joey Hess</a> 負責編輯。"

 #, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "捐款"
+#~ msgid "No requests for adoption"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"

 #, fuzzy
-#~ msgid "Debate"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+#~ msgid "No Requested packages"
+#~ msgstr "受影響的軟件"

 #, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "討論中"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "有待贊助"
+#~ msgid "License Information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"

-#~ msgid "In&nbsp;Discussion"
+#, fuzzy
+#~ msgid "Discussion"
 #~ msgstr "討論中"

-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "接受投票中"
-
-#~ msgid "Decided"
-#~ msgstr "已決定"
-
-#~ msgid "Other"
-#~ msgstr "其他"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "投票主頁"
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "無"

-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "提出議案"
+#~ msgid "buy pre-made images"
+#~ msgstr "購買預製映像"

-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "修正議案"
+#~ msgid "download with pik"
+#~ msgstr "用 pik 下載"

-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "跟隨議案的進展"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
+#~ "絡:]。"

-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "查看結果"
+#~ msgid "Vulnerable"
+#~ msgstr "可被襲擊"

-#~ msgid "Vote"
-#~ msgstr "投票"
+#~ msgid "Fixed in"
+#~ msgstr "修改於"

 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
 #~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
+#~ "負責編輯。"

 #~ msgid ""
 #~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
@@ -834,48 +736,74 @@ msgstr ""
 #~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"

 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
 #~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
-#~ "負責編輯。"
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"

-#~ msgid "Fixed in"
-#~ msgstr "修改於"
+#~ msgid "Vote"
+#~ msgstr "投票"

-#~ msgid "Vulnerable"
-#~ msgstr "可被襲擊"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "查看結果"

-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
-#~ "絡:]。"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "跟隨議案的進展"

-#~ msgid "download with pik"
-#~ msgstr "用 pik 下載"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "修正議案"

-#~ msgid "buy pre-made images"
-#~ msgstr "購買預製映像"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "提出議案"

-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "無"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "投票主頁"
+
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid "Decided"
+#~ msgstr "已決定"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "接受投票中"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "討論中"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "有待贊助"

 #, fuzzy
-#~ msgid "Discussion"
+#~ msgid "Minimum Discussion"
 #~ msgstr "討論中"

 #, fuzzy
-#~ msgid "License Information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "Debate"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"

 #, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "受影響的軟件"
+#~ msgid "Nominations"
+#~ msgstr "捐款"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"

 #, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
+
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
+
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
--- a/croatian/po/templates.hr.po
+++ b/croatian/po/templates.hr.po
--- a/czech/po/templates.cs.po
+++ b/czech/po/templates.cs.po
@@ -20,96 +20,6 @@ msgstr ""
 msgid "More information"
 msgstr "Vce informac"

-#: ../../english/template/debian/cdimage.wml:8
-msgid "&middot;"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:11
-msgid "<void id=\"dc_faq\" />FAQ"
-msgstr "<void id=\"dc_faq\" />FAQ"
-
-#: ../../english/template/debian/cdimage.wml:14
-msgid "Download with Jigdo"
-msgstr "Staen pes Jigdo"
-
-#: ../../english/template/debian/cdimage.wml:17
-msgid "Download via HTTP/FTP"
-msgstr "Staen pes HTTP/FTP"
-
-#: ../../english/template/debian/cdimage.wml:20
-msgid "Buy CDs or DVDs"
-msgstr "Kupte si CD nebo DVD"
-
-#: ../../english/template/debian/cdimage.wml:23
-msgid "Network Install"
-msgstr "Sov instalace"
-
-#: ../../english/template/debian/cdimage.wml:26
-msgid "<void id=\"dc_download\" />Download"
-msgstr "<void id=\"dc_download\" />Staen"
-
-#: ../../english/template/debian/cdimage.wml:29
-msgid "<void id=\"dc_misc\" />Misc"
-msgstr "<void id=\"dc_misc\" />Rzn"
-
-#: ../../english/template/debian/cdimage.wml:32
-msgid "<void id=\"dc_artwork\" />Artwork"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:35
-msgid "<void id=\"dc_mirroring\" />Mirroring"
-msgstr "<void id=\"dc_mirroring\" />Zrcadlen"
-
-#: ../../english/template/debian/cdimage.wml:38
-msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:41
-msgid "<void id=\"dc_torrent\" />Download with Torrent"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:44
-msgid "<void id=\"dc_relinfo\" />Image Release Info"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:47
-msgid "Debian CD team"
-msgstr "Tm Debian CD"
-
-#: ../../english/template/debian/cdimage.wml:50
-msgid "debian_on_cd"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:53
-msgid "<void id=\"faq-bottom\" />faq"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:56
-msgid "jigdo"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:59
-msgid "http_ftp"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:62
-msgid "buy"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:65
-msgid "net_install"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:68
-msgid "<void id=\"misc-bottom\" />misc"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:71
-msgid ""
-"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
-"a> for CDs/DVDs:"
-msgstr ""
-
 #: ../../english/template/debian/common_translation.wml:4
 msgid "Yes"
 msgstr "Ano"
@@ -791,17 +701,8 @@ msgstr ""
 "<void id=\"plural\" />Toto vydn Debian tdenku vydali <a href=\"mailto:"
 "dwn@debian.org\">%s</a>."

-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Time Line"
-#~ msgstr "asov osa"
-
-#~ msgid "Nominations"
-#~ msgstr "Nominace"
-
-#~ msgid "Debate"
-#~ msgstr "Debata"
+#~ msgid "License Information"
+#~ msgstr "Licenn informace"

 #~ msgid ""
 #~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
@@ -810,5 +711,41 @@ msgstr ""
 #~ "Pokud ns chcete kontaktovat, podvejte se nejprve na <a href=\"m4_HOME/"
 #~ "contact\">kontaktn strnku</a>."

-#~ msgid "License Information"
-#~ msgstr "Licenn informace"
+#~ msgid "Debate"
+#~ msgstr "Debata"
+
+#~ msgid "Nominations"
+#~ msgstr "Nominace"
+
+#~ msgid "Time Line"
+#~ msgstr "asov osa"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Debian CD team"
+#~ msgstr "Tm Debian CD"
+
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Zrcadlen"
+
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Rzn"
+
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Staen"
+
+#~ msgid "Network Install"
+#~ msgstr "Sov instalace"
+
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Kupte si CD nebo DVD"
+
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Staen pes HTTP/FTP"
+
+#~ msgid "Download with Jigdo"
+#~ msgstr "Staen pes Jigdo"
+
+#~ msgid "<void id=\"dc_faq\" />FAQ"
+#~ msgstr "<void id=\"dc_faq\" />FAQ"
--- a/danish/po/templates.da.po
+++ b/danish/po/templates.da.po
--- a/dutch/po/templates.nl.po
+++ b/dutch/po/templates.nl.po
--- a/esperanto/po/templates.eo.po
+++ b/esperanto/po/templates.eo.po
@@ -15,96 +15,6 @@ msgstr ""
 msgid "More information"
 msgstr "Pli da informo"

-#: ../../english/template/debian/cdimage.wml:8
-msgid "&middot;"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:11
-msgid "<void id=\"dc_faq\" />FAQ"
-msgstr "<void id=\"dc_faq\" />Oftaj demandoj"
-
-#: ../../english/template/debian/cdimage.wml:14
-msgid "Download with Jigdo"
-msgstr "Elŝuti per Jigdo"
-
-#: ../../english/template/debian/cdimage.wml:17
-msgid "Download via HTTP/FTP"
-msgstr "Elŝuti per HTTP/FTP"
-
-#: ../../english/template/debian/cdimage.wml:20
-msgid "Buy CDs or DVDs"
-msgstr "Aĉeti KD-jn aŭ DVD-jn"
-
-#: ../../english/template/debian/cdimage.wml:23
-msgid "Network Install"
-msgstr "Perreta instalado"
-
-#: ../../english/template/debian/cdimage.wml:26
-msgid "<void id=\"dc_download\" />Download"
-msgstr "<void id=\"dc_download\" />Elŝuti"
-
-#: ../../english/template/debian/cdimage.wml:29
-msgid "<void id=\"dc_misc\" />Misc"
-msgstr "<void id=\"dc_misc\" />Alispeciaj"
-
-#: ../../english/template/debian/cdimage.wml:32
-msgid "<void id=\"dc_artwork\" />Artwork"
-msgstr "<void id=\"dc_artwork\" />Artaĵoj"
-
-#: ../../english/template/debian/cdimage.wml:35
-msgid "<void id=\"dc_mirroring\" />Mirroring"
-msgstr "<void id=\"dc_mirroring\" />Spegulado"
-
-#: ../../english/template/debian/cdimage.wml:38
-msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-msgstr "<void id=\"dc_rsyncmirrors\" />Speguloj de rsync"
-
-#: ../../english/template/debian/cdimage.wml:41
-msgid "<void id=\"dc_torrent\" />Download with Torrent"
-msgstr "<void id=\"dc_torrent\" />Elŝuti per Torrent"
-
-#: ../../english/template/debian/cdimage.wml:44
-msgid "<void id=\"dc_relinfo\" />Image Release Info"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:47
-msgid "Debian CD team"
-msgstr "Debiana teamo pri KD"
-
-#: ../../english/template/debian/cdimage.wml:50
-msgid "debian_on_cd"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:53
-msgid "<void id=\"faq-bottom\" />faq"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:56
-msgid "jigdo"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:59
-msgid "http_ftp"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:62
-msgid "buy"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:65
-msgid "net_install"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:68
-msgid "<void id=\"misc-bottom\" />misc"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:71
-msgid ""
-"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
-"a> for CDs/DVDs:"
-msgstr ""
-
 #: ../../english/template/debian/common_translation.wml:4
 msgid "Yes"
 msgstr "Jes"
@@ -788,96 +698,132 @@ msgstr ""
 "\">Joey Hess</a>."

 #, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donacoj"
+#~ msgid "No Requested packages"
+#~ msgstr "Pakoj Koncernataj"

 #, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "proponita"
+#~ msgid "License Information"
+#~ msgstr "Pli da informo"

 #, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Diskutata"
+#~ msgid "non-free"
+#~ msgstr "neniu"

-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
+#~ msgid "discussed"
+#~ msgstr "diskutita"

-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Diskutata"
+#, fuzzy
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."

-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Voĉdono&nbsp;Malfermita"
+#, fuzzy
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."

-#~ msgid "Decided"
-#~ msgstr "Decidita"
+#~ msgid "Fixed in"
+#~ msgstr "Solvita je"

-#~ msgid "Other"
-#~ msgstr "Alia"
+#~ msgid "Vulnerable"
+#~ msgstr "Koncernebla"

-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (malĝusta ligo)"

-#~ msgid "How&nbsp;To"
-#~ msgstr "Kiel&nbsp;Fari"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Legu la <a href=\"m4_HOME/contact\">debianan kontaktpaĝon</a> por scii "
+#~ "kiel kontakti nin."

-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Sendi&nbsp;Proponon"
+#~ msgid "Vote"
+#~ msgstr "Voĉdono"

-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Modifi&nbsp;Proponon"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Legi&nbsp;Rezulton"

 #~ msgid "Follow&nbsp;a&nbsp;Proposal"
 #~ msgstr "Sekvi&nbsp;Proponon"

-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Legi&nbsp;Rezulton"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Modifi&nbsp;Proponon"

-#~ msgid "Vote"
-#~ msgstr "Voĉdono"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sendi&nbsp;Proponon"

-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Legu la <a href=\"m4_HOME/contact\">debianan kontaktpaĝon</a> por scii "
-#~ "kiel kontakti nin."
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kiel&nbsp;Fari"

-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (malĝusta ligo)"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"

-#~ msgid "Vulnerable"
-#~ msgstr "Koncernebla"
+#~ msgid "Other"
+#~ msgstr "Alia"

-#~ msgid "Fixed in"
-#~ msgstr "Solvita je"
+#~ msgid "Decided"
+#~ msgstr "Decidita"