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.4 -> 1.5 
bulgarian/po/templates.bg.po: 1.30 -> 1.31 
catalan/po/templates.ca.po: 1.34 -> 1.35 
chinese/po/templates.zh.po: 1.15 -> 1.16 
croatian/po/templates.hr.po: 1.30 -> 1.31 
czech/po/templates.cs.po: 1.13 -> 1.14 
danish/po/templates.da.po: 1.41 -> 1.42 
dutch/po/templates.nl.po: 1.52 -> 1.53 
esperanto/po/templates.eo.po: 1.13 -> 1.14 
finnish/po/templates.fi.po: 1.35 -> 1.36 
french/po/templates.fr.po: 1.53 -> 1.54 
german/po/templates.de.po: 1.63 -> 1.64 
greek/po/templates.el.po: 1.14 -> 1.15 
hebrew/po/templates.he.po: 1.4 -> 1.5 
hungarian/po/templates.hu.po: 1.18 -> 1.19 
indonesian/po/templates.id.po: 1.7 -> 1.8 
italian/po/templates.it.po: 1.30 -> 1.31 
japanese/po/templates.ja.po: 1.25 -> 1.26 
korean/po/templates.ko.po: 1.13 -> 1.14 
lithuanian/po/templates.lt.po: 1.11 -> 1.12 
norwegian/po/templates.no.po: 1.14 -> 1.15 
persian/po/templates.fa.po: 1.2 -> 1.3 
polish/po/templates.pl.po: 1.33 -> 1.34 
portuguese/po/templates.pt.po: 1.44 -> 1.45 
romanian/po/templates.ro.po: 1.21 -> 1.22 
russian/po/templates.ru.po: 1.34 -> 1.35 
slovak/po/templates.sk.po: 1.5 -> 1.6 
slovene/po/templates.sl.po: 1.3 -> 1.4 
spanish/po/templates.es.po: 1.35 -> 1.36 
swedish/po/templates.sv.po: 1.49 -> 1.50 
tamil/po/templates.ta.po: 1.2 -> 1.3 
turkish/po/templates.tr.po: 1.17 -> 1.18 
ukrainian/po/templates.uk.po: 1.11 -> 1.12

1 files changed, 71 insertions, 262 deletions

diff --git a/esperanto/po/templates.eo.po b/esperanto/po/templates.eo.po
index 5a7ce3c0aa8..e1f8b2293cd 100644
--- a/esperanto/po/templates.eo.po
+++ b/esperanto/po/templates.eo.po
@@ -737,245 +737,6 @@ msgstr ""
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
 
-#: ../../english/template/debian/votebar.wml:11
-msgid "Date"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:14
-msgid "Time Line"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:17
-#, fuzzy
-msgid "Nominations"
-msgstr "Donacoj"
-
-#: ../../english/template/debian/votebar.wml:20
-msgid "Debate"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:23
-msgid "Platforms"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:26
-#, fuzzy
-msgid "Proposer"
-msgstr "proponita"
-
-#: ../../english/template/debian/votebar.wml:29
-msgid "Proposal A Proposer"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:32
-msgid "Proposal B Proposer"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:35
-msgid "Proposal C Proposer"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:38
-msgid "Proposal D Proposer"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:41
-msgid "Proposal E Proposer"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:44
-msgid "Proposal F Proposer"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:47
-msgid "Seconds"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:50
-msgid "Proposal A Seconds"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:53
-msgid "Proposal B Seconds"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:56
-msgid "Proposal C Seconds"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:59
-msgid "Proposal D Seconds"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:62
-msgid "Proposal E Seconds"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:65
-msgid "Proposal F Seconds"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:68
-msgid "Opposition"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:71
-msgid "Text"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:74
-msgid "Proposal A"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:77
-msgid "Proposal B"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:80
-msgid "Proposal C"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:83
-msgid "Proposal D"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:86
-msgid "Proposal E"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:89
-msgid "Proposal F"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:92
-msgid "Choices"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:95
-msgid "Amendment Proposer"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:98
-msgid "Amendment Seconds"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:101
-msgid "Amendment Text"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:104
-msgid "Amendment Proposer A"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:107
-msgid "Amendment Seconds A"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:110
-msgid "Amendment Text A"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:113
-msgid "Amendment Proposer B"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:116
-msgid "Amendment Seconds B"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:119
-msgid "Amendment Text B"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:122
-msgid "Amendments"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:125
-msgid "Proceedings"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:128
-msgid "Majority Requirement"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:131
-msgid "Data and Statistics"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:134
-msgid "Quorum"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:137
-#, fuzzy
-msgid "Minimum Discussion"
-msgstr "Diskutata"
-
-#: ../../english/template/debian/votebar.wml:140
-msgid "Ballot"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:143
-msgid "Forum"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:146
-msgid "Outcome"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:150
-msgid "Waiting&nbsp;for&nbsp;Sponsors"
-msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
-
-#: ../../english/template/debian/votebar.wml:153
-msgid "In&nbsp;Discussion"
-msgstr "Diskutata"
-
-#: ../../english/template/debian/votebar.wml:156
-msgid "Voting&nbsp;Open"
-msgstr "Voĉdono&nbsp;Malfermita"
-
-#: ../../english/template/debian/votebar.wml:159
-msgid "Decided"
-msgstr "Decidita"
-
-#: ../../english/template/debian/votebar.wml:162
-msgid "Withdrawn"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:165
-msgid "Other"
-msgstr "Alia"
-
-#: ../../english/template/debian/votebar.wml:169
-msgid "Home&nbsp;Vote&nbsp;Page"
-msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
-
-#: ../../english/template/debian/votebar.wml:172
-msgid "How&nbsp;To"
-msgstr "Kiel&nbsp;Fari"
-
-#: ../../english/template/debian/votebar.wml:175
-msgid "Submit&nbsp;a&nbsp;Proposal"
-msgstr "Sendi&nbsp;Proponon"
-
-#: ../../english/template/debian/votebar.wml:178
-msgid "Amend&nbsp;a&nbsp;Proposal"
-msgstr "Modifi&nbsp;Proponon"
-
-#: ../../english/template/debian/votebar.wml:181
-msgid "Follow&nbsp;a&nbsp;Proposal"
-msgstr "Sekvi&nbsp;Proponon"
-
-#: ../../english/template/debian/votebar.wml:184
-msgid "Read&nbsp;a&nbsp;Result"
-msgstr "Legi&nbsp;Rezulton"
-
-#: ../../english/template/debian/votebar.wml:187
-msgid "Vote"
-msgstr "Voĉdono"
-
 #: ../../english/template/debian/weeklynews/footer.wml:4
 #, fuzzy
 msgid ""
@@ -1095,45 +856,93 @@ msgstr ""
 msgid "package info"
 msgstr ""
 
-#~ 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 "%0 (dead link)"
-#~ msgstr "%0 (malĝusta ligo)"
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Pli da informo"
 
-#~ msgid "Vulnerable"
-#~ msgstr "Koncernebla"
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "neniu"
 
-#~ msgid "Fixed in"
-#~ msgstr "Solvita je"
+#~ msgid "discussed"
+#~ msgstr "diskutita"
 
 #, fuzzy
 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "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>."
 
 #, fuzzy
 #~ 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"
+#~ "\">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 "discussed"
-#~ msgstr "diskutita"
+#~ msgid "Fixed in"
+#~ msgstr "Solvita je"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Koncernebla"
+
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (malĝusta ligo)"
+
+#~ 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 "Vote"
+#~ msgstr "Voĉdono"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Legi&nbsp;Rezulton"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sekvi&nbsp;Proponon"
+
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Modifi&nbsp;Proponon"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sendi&nbsp;Proponon"
+
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kiel&nbsp;Fari"
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
+
+#~ msgid "Other"
+#~ msgstr "Alia"
+
+#~ msgid "Decided"
+#~ msgstr "Decidita"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Voĉdono&nbsp;Malfermita"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Diskutata"
+
+#~ 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 "Nominations"
+#~ msgstr "Donacoj"