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

1 files changed, 237 insertions, 239 deletions

diff --git a/esperanto/po/templates.eo.po b/esperanto/po/templates.eo.po
index 05bcf1701b4..5a7ce3c0aa8 100644
--- a/esperanto/po/templates.eo.po
+++ b/esperanto/po/templates.eo.po
@@ -64,46 +64,42 @@ 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_pik\" />Pseudo Image Kit"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:47
 msgid "<void id=\"dc_relinfo\" />Image Release Info"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:50
+#: ../../english/template/debian/cdimage.wml:47
 msgid "Debian CD team"
 msgstr "Debiana teamo pri KD"
 
-#: ../../english/template/debian/cdimage.wml:53
+#: ../../english/template/debian/cdimage.wml:50
 msgid "debian_on_cd"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:56
+#: ../../english/template/debian/cdimage.wml:53
 msgid "<void id=\"faq-bottom\" />faq"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:59
+#: ../../english/template/debian/cdimage.wml:56
 msgid "jigdo"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:62
+#: ../../english/template/debian/cdimage.wml:59
 msgid "http_ftp"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:65
+#: ../../english/template/debian/cdimage.wml:62
 msgid "buy"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:68
+#: ../../english/template/debian/cdimage.wml:65
 msgid "net_install"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:71
+#: ../../english/template/debian/cdimage.wml:68
 msgid "<void id=\"misc-bottom\" />misc"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:74
+#: ../../english/template/debian/cdimage.wml:71
 msgid ""
 "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
 "a> for CDs/DVDs:"
@@ -180,7 +176,7 @@ msgid "Support"
 msgstr "Ĝenerala helpo"
 
 #: ../../english/template/debian/common_translation.wml:52
-#: ../../english/template/debian/links.tags.wml:37
+#: ../../english/template/debian/links.tags.wml:43
 msgid "Developers'&nbsp;Corner"
 msgstr "Angulo&nbsp;de&nbsp;Disvolvigantoj"
 
@@ -217,7 +213,7 @@ msgid "Miscellaneous"
 msgstr "Aliaj Kategorioj"
 
 #: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
 msgid "Getting Debian"
 msgstr "Akiri Debianon"
 
@@ -324,12 +320,10 @@ msgid ""
 "www@lists.debian.org\">debian-www@lists.debian.org</a>.  For other contact "
 "information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>."
 msgstr ""
-"Se vi volas sciigi nin pri problemo en tiu ĉi retejo, bonvolu sendi retpoŝtan"
-"mesaĝon en la angla al <a href=\"mailto:debian-"
-"www@lists.debian.org\">debian-www@lists.debian.org</a>.  Pli da informoj pri "
-"kiel kontakti nin troviĝas en la Debiana <a href=\"m4_HOME/contact\">"
-"paĝo pri kontakto</a>."
-
+"Se vi volas sciigi nin pri problemo en tiu ĉi retejo, bonvolu sendi "
+"retpoŝtanmesaĝon en la angla al <a href=\"mailto:debian-www@lists.debian.org"
+"\">debian-www@lists.debian.org</a>.  Pli da informoj pri kiel kontakti nin "
+"troviĝas en la Debiana <a href=\"m4_HOME/contact\">paĝo pri kontakto</a>."
 
 #: ../../english/template/debian/footer.wml:13
 msgid "Last Modified"
@@ -346,130 +340,25 @@ msgstr ""
 "a>"
 
 #: ../../english/template/debian/footer.wml:22
+#, fuzzy
+#| msgid ""
+#| "Debian is a registered trademark of Software in the Public Interest, Inc."
 msgid ""
-"Debian is a registered trademark of Software in the Public Interest, Inc."
+"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
+"Software in the Public Interest, Inc."
 msgstr ""
-"Debian estas registrita komerca marko de Software in the Public Interest, Inc."
+"Debian estas registrita komerca marko de Software in the Public Interest, "
+"Inc."
 
-#: ../../english/template/debian/languages.wml:174
-#: ../../english/template/debian/languages.wml:200
+#: ../../english/template/debian/languages.wml:183
+#: ../../english/template/debian/languages.wml:209
 msgid "This page is also available in the following languages:"
 msgstr "Tiu ĉi paĝo estas ankaŭ havebla en la jenaj lingvoj"
 
-#: ../../english/template/debian/languages.wml:224
+#: ../../english/template/debian/languages.wml:233
 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 dokumentan lingvon</a>"
 
-#: ../../english/template/debian/legal.wml:16
-#, fuzzy
-msgid "License Information"
-msgstr "Pli da informo"
-
-#: ../../english/template/debian/legal.wml:20
-msgid "DLS Index"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:24
-msgid "DFSG"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:28
-msgid "DFSG FAQ"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:32
-msgid "Debian-Legal Archive"
-msgstr ""
-
-#. title string without version, on the form "dls-xxx - license name: status"
-#: ../../english/template/debian/legal.wml:50
-msgid "%s  &ndash; %s: %s"
-msgstr ""
-
-#. title string with version, on the form "dls-xxx - license name, version: status"
-#: ../../english/template/debian/legal.wml:53
-msgid "%s  &ndash; %s, Version %s: %s"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:60
-msgid "Date published"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:62
-msgid "License"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:65
-msgid "Version"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:67
-msgid "Summary"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:71
-msgid "Justification"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:73
-#, fuzzy
-msgid "Discussion"
-msgstr "Diskutata"
-
-#: ../../english/template/debian/legal.wml:75
-msgid "Original Summary"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:77
-msgid ""
-"The original summary by <summary-author/> can be found in the <a href="
-"\"<summary-url/>\">list archives</a>."
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:78
-msgid "This summary was prepared by <summary-author/>."
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:81
-msgid "License text (translated)"
-msgstr ""
-
-#: ../../english/template/debian/legal.wml:84
-msgid "License text"
-msgstr ""
-
-#: ../../english/template/debian/legal_tags.wml:6
-msgid "free"
-msgstr ""
-
-#: ../../english/template/debian/legal_tags.wml:7
-#, fuzzy
-msgid "non-free"
-msgstr "neniu"
-
-#: ../../english/template/debian/legal_tags.wml:8
-msgid "not redistributable"
-msgstr ""
-
-#. For the use in headlines, see legal/licenses/byclass.wml
-#: ../../english/template/debian/legal_tags.wml:12
-msgid "Free"
-msgstr ""
-
-#: ../../english/template/debian/legal_tags.wml:13
-msgid "Non-Free"
-msgstr ""
-
-#: ../../english/template/debian/legal_tags.wml:14
-msgid "Not Redistributable"
-msgstr ""
-
-#: ../../english/template/debian/legal_tags.wml:27
-msgid ""
-"See the <a href=\"./\">license information</a> page for an overview of the "
-"Debian License Summaries (DLS)."
-msgstr ""
-
 #: ../../english/template/debian/links.tags.wml:4
 msgid "Debian&nbsp;International"
 msgstr "Internacia&nbsp;Debiano"
@@ -487,151 +376,163 @@ msgid "Weekly&nbsp;News"
 msgstr "Ĉiusemajnaj&nbsp;Novaĵoj"
 
 #: ../../english/template/debian/links.tags.wml:16
+#, fuzzy
+#| msgid "Debian Project"
+msgid "Debian Project News"
+msgstr "Projekto Debiano"
+
+#: ../../english/template/debian/links.tags.wml:19
+#, fuzzy
+#| msgid "Weekly&nbsp;News"
+msgid "Project&nbsp;News"
+msgstr "Ĉiusemajnaj&nbsp;Novaĵoj"
+
+#: ../../english/template/debian/links.tags.wml:22
 msgid "Release&nbsp;Info"
 msgstr "Livera&nbsp;Informo"
 
-#: ../../english/template/debian/links.tags.wml:19
+#: ../../english/template/debian/links.tags.wml:25
 msgid "Debian&nbsp;Packages"
 msgstr "Debianaj&nbsp;Pakoj"
 
-#: ../../english/template/debian/links.tags.wml:22
+#: ../../english/template/debian/links.tags.wml:28
 msgid "Download"
 msgstr "Elpreno"
 
-#: ../../english/template/debian/links.tags.wml:25
+#: ../../english/template/debian/links.tags.wml:31
 msgid "Debian&nbsp;on&nbsp;CD"
 msgstr "Debiano&nbsp;en&nbsp;KD"
 
-#: ../../english/template/debian/links.tags.wml:28
+#: ../../english/template/debian/links.tags.wml:34
 msgid "Debian&nbsp;Books"
 msgstr "Libroj&nbsp;pri&nbsp;Debiano"
 
-#: ../../english/template/debian/links.tags.wml:31
+#: ../../english/template/debian/links.tags.wml:37
 msgid "Mailing&nbsp;List&nbsp;Archives"
 msgstr "Retpoŝtlistaj&nbsp;Arĥivoj"
 
-#: ../../english/template/debian/links.tags.wml:34
+#: ../../english/template/debian/links.tags.wml:40
 msgid "Mailing&nbsp;Lists"
 msgstr "Retpoŝtaj&nbsp;Listoj"
 
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:46
 msgid "Social&nbsp;Contract"
 msgstr "Socia&nbsp;Kontrakto"
 
-#: ../../english/template/debian/links.tags.wml:43
+#: ../../english/template/debian/links.tags.wml:49
 msgid "Visit the site sponsor"
 msgstr "Vizitu aŭspicianton"
 
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:52
 msgid "Site map for Debian web pages"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:49
+#: ../../english/template/debian/links.tags.wml:55
 msgid "Developer Database"
 msgstr "Programista Datbazumo"
 
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
 msgid "Debian Policy Manual"
 msgstr "Manlibro de Debiana Kondutmaniero"
 
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
 msgid "Developers' Reference"
 msgstr "Referencoj de&nbsp;Programistoj"
 
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
 msgid "New Maintainers' Guide"
 msgstr "Nova Gvidilo de konservantoj"
 
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
 msgid "Release Critical Bugs"
 msgstr "Liveraj Gravegaj Cimoj"
 
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
 msgid "Lintian Reports"
 msgstr "Lintianaj Informiloj"
 
-#: ../../english/template/debian/links.tags.wml:68
+#: ../../english/template/debian/links.tags.wml:74
 msgid "Archives for users' mailing lists"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:71
+#: ../../english/template/debian/links.tags.wml:77
 msgid "Archives for developers' mailing lists"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:74
+#: ../../english/template/debian/links.tags.wml:80
 msgid "Archives for i18n/l10n mailing lists"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:77
+#: ../../english/template/debian/links.tags.wml:83
 msgid "Archives for ports' mailing lists"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
 msgid "Archives for mailing lists of the Bug tracking system"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
 msgid "Archives for miscellaneous mailing lists"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
 msgid "Free&nbsp;Software"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:98
 msgid "Development"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
 msgid "Help Debian"
 msgstr "Helpu Debianon"
 
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
 msgid "Bug reports"
 msgstr "Informoj pri Problemoj"
 
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:107
 msgid "Ports/Architectures"
 msgstr "Portadoj/Arhxitekturoj"
 
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
 msgid "Installation&nbsp;manual"
 msgstr "Kiel&nbsp;Instali"
 
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
 msgid "CD vendors"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
 msgid "CD ISO images"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
 msgid "Network install"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
 msgid "Pre-installed"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
 #, fuzzy
 msgid "Debian-Edu project"
 msgstr "Projekto Debiano"
 
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
 msgid "Alioth &ndash; Debian GForge"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
 msgid "Debian Developer's Packages Overview"
 msgstr ""
 
@@ -652,6 +553,91 @@ msgstr "Reen al la <a href=\"m4_HOME/\">Debiana Projekta hejmpaĝo</a>."
 msgid "<get-var url /> (dead link)"
 msgstr ""
 
+#: ../../english/template/debian/projectnews/footer.wml:4
+#, fuzzy
+msgid ""
+"To receive this newsletter bi-weekly in your mailbox, <a href=\"http://lists."
+"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+" <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
+"<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
+"novaĵleteron ĉiusemajne en via poŝtkesto."
+
+#: ../../english/template/debian/projectnews/footer.wml:8
+#: ../../english/template/debian/weeklynews/footer.wml:8
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
+"haveblaj."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:13
+#, fuzzy
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:18
+#, fuzzy
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:23
+#, fuzzy
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:28
+#, fuzzy
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. One translator only
+#. One translator only
+#: ../../english/template/debian/projectnews/footer.wml:33
+#: ../../english/template/debian/weeklynews/footer.wml:33
+msgid "<void id=\"singular\" />It was translated by %s."
+msgstr ""
+
+#. Two ore more translators
+#. Two ore more translators
+#: ../../english/template/debian/projectnews/footer.wml:38
+#: ../../english/template/debian/weeklynews/footer.wml:38
+msgid "<void id=\"plural\" />It was translated by %s."
+msgstr ""
+
+#. One female translator only
+#. One female translator only
+#: ../../english/template/debian/projectnews/footer.wml:43
+#: ../../english/template/debian/weeklynews/footer.wml:43
+msgid "<void id=\"singularfemale\" />It was translated by %s."
+msgstr ""
+
+#. Two ore more female translators
+#. Two ore more female translators
+#: ../../english/template/debian/projectnews/footer.wml:48
+#: ../../english/template/debian/weeklynews/footer.wml:48
+msgid "<void id=\"pluralfemale\" />It was translated by %s."
+msgstr ""
+
 #: ../../english/template/debian/recent_list.wml:7
 msgid "No items for this year."
 msgstr "Estas nenio por ĉi tiu jaro."
@@ -661,11 +647,14 @@ msgid "proposed"
 msgstr "proponita"
 
 #: ../../english/template/debian/recent_list.wml:15
-msgid "discussed"
-msgstr "diskutita"
+#, fuzzy
+msgid "in discussion"
+msgstr "Diskutata"
 
 #: ../../english/template/debian/recent_list.wml:19
-msgid "voted on"
+#, fuzzy
+#| msgid "voted on"
+msgid "voting open"
 msgstr "vocxdonita je la"
 
 #: ../../english/template/debian/recent_list.wml:23
@@ -875,91 +864,115 @@ msgid "Amendment Text"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:104
-msgid "Amendments"
+msgid "Amendment Proposer A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:107
-msgid "Proceedings"
+msgid "Amendment Seconds A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:110
-msgid "Majority Requirement"
+msgid "Amendment Text A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:113
-msgid "Data and Statistics"
+msgid "Amendment Proposer B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:116
-msgid "Quorum"
+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:122
+#: ../../english/template/debian/votebar.wml:140
 msgid "Ballot"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:125
+#: ../../english/template/debian/votebar.wml:143
 msgid "Forum"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:128
+#: ../../english/template/debian/votebar.wml:146
 msgid "Outcome"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:132
+#: ../../english/template/debian/votebar.wml:150
 msgid "Waiting&nbsp;for&nbsp;Sponsors"
 msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
 
-#: ../../english/template/debian/votebar.wml:135
+#: ../../english/template/debian/votebar.wml:153
 msgid "In&nbsp;Discussion"
 msgstr "Diskutata"
 
-#: ../../english/template/debian/votebar.wml:138
+#: ../../english/template/debian/votebar.wml:156
 msgid "Voting&nbsp;Open"
 msgstr "Voĉdono&nbsp;Malfermita"
 
-#: ../../english/template/debian/votebar.wml:141
+#: ../../english/template/debian/votebar.wml:159
 msgid "Decided"
 msgstr "Decidita"
 
-#: ../../english/template/debian/votebar.wml:144
+#: ../../english/template/debian/votebar.wml:162
 msgid "Withdrawn"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:147
+#: ../../english/template/debian/votebar.wml:165
 msgid "Other"
 msgstr "Alia"
 
-#: ../../english/template/debian/votebar.wml:151
+#: ../../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:154
+#: ../../english/template/debian/votebar.wml:172
 msgid "How&nbsp;To"
 msgstr "Kiel&nbsp;Fari"
 
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr "Sendi&nbsp;Proponon"
 
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr "Modifi&nbsp;Proponon"
 
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr "Sekvi&nbsp;Proponon"
 
-#: ../../english/template/debian/votebar.wml:166
+#: ../../english/template/debian/votebar.wml:184
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr "Legi&nbsp;Rezulton"
 
-#: ../../english/template/debian/votebar.wml:169
+#: ../../english/template/debian/votebar.wml:187
 msgid "Vote"
 msgstr "Voĉdono"
 
@@ -973,12 +986,6 @@ msgstr ""
 "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
 "novaĵleteron ĉiusemajne en via poŝtkesto."
 
-#: ../../english/template/debian/weeklynews/footer.wml:8
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr ""
-"<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
-"haveblaj."
-
 #. One editor name only
 #: ../../english/template/debian/weeklynews/footer.wml:13
 #, fuzzy
@@ -1019,26 +1026,6 @@ msgstr ""
 "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
 "\">Joey Hess</a>."
 
-#. One translator only
-#: ../../english/template/debian/weeklynews/footer.wml:33
-msgid "<void id=\"singular\" />It was translated by %s."
-msgstr ""
-
-#. Two ore more translators
-#: ../../english/template/debian/weeklynews/footer.wml:38
-msgid "<void id=\"plural\" />It was translated by %s."
-msgstr ""
-
-#. One female translator only
-#: ../../english/template/debian/weeklynews/footer.wml:43
-msgid "<void id=\"singularfemale\" />It was translated by %s."
-msgstr ""
-
-#. Two ore more female translators
-#: ../../english/template/debian/weeklynews/footer.wml:48
-msgid "<void id=\"pluralfemale\" />It was translated by %s."
-msgstr ""
-
 #: ../../english/template/debian/wnpp.wml:8
 msgid "No requests for adoption"
 msgstr ""
@@ -1108,13 +1095,21 @@ msgstr ""
 msgid "package info"
 msgstr ""
 
-#, fuzzy
 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
 #~ msgstr ""
-#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ "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)"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Koncernebla"
+
+#~ msgid "Fixed in"
+#~ msgstr "Solvita je"
 
 #, fuzzy
 #~ msgid ""
@@ -1124,18 +1119,21 @@ msgstr ""
 #~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
 #~ "\">Joey Hess</a>."
 
-#~ msgid "Fixed in"
-#~ msgstr "Solvita je"
+#, 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 "Vulnerable"
-#~ msgstr "Koncernebla"
+#~ msgid "discussed"
+#~ msgstr "diskutita"
 
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (malĝusta ligo)"
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "neniu"
 
-#~ 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."
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Pli da informo"