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

1 files changed, 98 insertions, 152 deletions

diff --git a/esperanto/po/templates.eo.po b/esperanto/po/templates.eo.po
index 3ea263047d2..f4070fe3c63 100644
--- 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 "·"
-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"
 
-#, 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 "Voting&nbsp;Open"
+#~ msgstr "Voĉdono&nbsp;Malfermita"
 
-#, 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 "In&nbsp;Discussion"
+#~ msgstr "Diskutata"
 
-#~ msgid "discussed"
-#~ msgstr "diskutita"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
 
 #, fuzzy
-#~ msgid "non-free"
-#~ msgstr "neniu"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Diskutata"
 
 #, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Pli da informo"
+#~ msgid "Proposer"
+#~ msgstr "proponita"
 
 #, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Pakoj Koncernataj"
+#~ msgid "Nominations"
+#~ msgstr "Donacoj"
+
+#~ msgid "Debian CD team"
+#~ msgstr "Debiana teamo pri KD"
+
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Elŝuti per Torrent"
+
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Speguloj de rsync"
+
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Spegulado"
+
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Artaĵoj"
+
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Alispeciaj"
+
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Elŝuti"
+
+#~ msgid "Network Install"
+#~ msgstr "Perreta instalado"
+
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Aĉeti KD-jn aŭ DVD-jn"
+
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Elŝuti per HTTP/FTP"
+
+#~ msgid "Download with Jigdo"
+#~ msgstr "Elŝuti per Jigdo"
+
+#~ msgid "<void id=\"dc_faq\" />FAQ"
+#~ msgstr "<void id=\"dc_faq\" />Oftaj demandoj"