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, 106 insertions, 291 deletions

diff --git a/slovene/po/templates.sl.po b/slovene/po/templates.sl.po
index a4880d10556..28241db1993 100644
--- a/slovene/po/templates.sl.po
+++ b/slovene/po/templates.sl.po
@@ -741,246 +741,6 @@ msgstr "URL"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Nazaj na ostale <a href=\"./\">novice o 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 "Donacije"
-
-#: ../../english/template/debian/votebar.wml:20
-#, fuzzy
-msgid "Debate"
-msgstr "Debian CD team"
-
-#: ../../english/template/debian/votebar.wml:23
-msgid "Platforms"
-msgstr ""
-
-#: ../../english/template/debian/votebar.wml:26
-#, fuzzy
-msgid "Proposer"
-msgstr "predlagano"
-
-#: ../../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 "V&nbsp;diskusiji"
-
-#: ../../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 "Čakamo&nbsp;na&nbsp;pokrovitelje"
-
-#: ../../english/template/debian/votebar.wml:153
-msgid "In&nbsp;Discussion"
-msgstr "V&nbsp;diskusiji"
-
-#: ../../english/template/debian/votebar.wml:156
-msgid "Voting&nbsp;Open"
-msgstr "V&nbsp;glasovanju"
-
-#: ../../english/template/debian/votebar.wml:159
-msgid "Decided"
-msgstr "Odločeno"
-
-#: ../../english/template/debian/votebar.wml:162
-msgid "Withdrawn"
-msgstr "Umaknjeno"
-
-#: ../../english/template/debian/votebar.wml:165
-msgid "Other"
-msgstr "Drugo"
-
-#: ../../english/template/debian/votebar.wml:169
-msgid "Home&nbsp;Vote&nbsp;Page"
-msgstr "Domača&nbsp;glasovalna&nbsp;stran"
-
-#: ../../english/template/debian/votebar.wml:172
-msgid "How&nbsp;To"
-msgstr "Kako..."
-
-#: ../../english/template/debian/votebar.wml:175
-msgid "Submit&nbsp;a&nbsp;Proposal"
-msgstr "podati&nbsp;predlog"
-
-#: ../../english/template/debian/votebar.wml:178
-msgid "Amend&nbsp;a&nbsp;Proposal"
-msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
-
-#: ../../english/template/debian/votebar.wml:181
-msgid "Follow&nbsp;a&nbsp;Proposal"
-msgstr "spremljati&nbsp;predlog"
-
-#: ../../english/template/debian/votebar.wml:184
-msgid "Read&nbsp;a&nbsp;Result"
-msgstr "prebrati&nbsp;izide"
-
-#: ../../english/template/debian/votebar.wml:187
-msgid "Vote"
-msgstr "glasovati"
-
 #: ../../english/template/debian/weeklynews/footer.wml:4
 #, fuzzy
 msgid ""
@@ -1100,22 +860,67 @@ msgstr ""
 msgid "package info"
 msgstr ""
 
-#~ msgid "Security database references"
-#~ msgstr "Sklici iz varnostnih podatkovnih zbirk"
+#, fuzzy
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_misc\" />razno"
 
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "V slovarju Mitre's CVE "
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Več podatkov"
 
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "V podatkovni zbirki Bugtraq (na SecurityFocusu)"
+#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "V&nbsp;diskusiji"
 
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERTova poročila o ranljivosti, opozorila in poročila o incidentih"
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "nič"
 
-#~ msgid "No other external database security references currently available."
+#~ msgid "pik"
+#~ msgstr "pik"
+
+#~ msgid "download with pik"
+#~ msgstr "prenesi s pikom"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "kupi ???"
+
+#~ msgid "network install"
+#~ msgstr "namestitev z omrežja"
+
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
 #~ msgstr ""
-#~ "Trenutno ni na voljo drugih sklicev iz zunanjih varnostnih podatkovnih "
-#~ "zbirk."
+#~ "Če se želite obrniti na nas, pojdite na <a href=\"m4_HOME/contact"
+#~ "\">kontaktno stran</a> za Debian."
+
+#~ msgid "discussed"
+#~ msgstr "v diskusiji"
+
+#~ msgid "Debian Security"
+#~ msgstr "Varnost v Debianu"
+
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debianovo varnostno opozorilo"
+
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debianova varnostna opozorila"
+
+#~ msgid "Date Reported"
+#~ msgstr "Dan prijave"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Ranljivo"
+
+#~ msgid "Fixed in"
+#~ msgstr "Popravljeno v"
+
+#~ msgid "Source:"
+#~ msgstr "Izvor:"
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arhitekturno neodvisna komponenta"
 
 #~ msgid ""
 #~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
@@ -1124,64 +929,74 @@ msgstr ""
 #~ "MD5 kontrolne vsote naštetih datotek so na voljo v <a href=\"<get-var "
 #~ "url />\">prvotnem opozorilu</a>."
 
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arhitekturno neodvisna komponenta"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Trenutno ni na voljo drugih sklicev iz zunanjih varnostnih podatkovnih "
+#~ "zbirk."
 
-#~ msgid "Source:"
-#~ msgstr "Izvor:"
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERTova poročila o ranljivosti, opozorila in poročila o incidentih"
 
-#~ msgid "Fixed in"
-#~ msgstr "Popravljeno v"
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "V podatkovni zbirki Bugtraq (na SecurityFocusu)"
 
-#~ msgid "Vulnerable"
-#~ msgstr "Ranljivo"
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "V slovarju Mitre's CVE "
 
-#~ msgid "Date Reported"
-#~ msgstr "Dan prijave"
+#~ msgid "Security database references"
+#~ msgstr "Sklici iz varnostnih podatkovnih zbirk"
 
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debianova varnostna opozorila"
+#~ msgid "Vote"
+#~ msgstr "glasovati"
 
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debianovo varnostno opozorilo"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "prebrati&nbsp;izide"
 
-#~ msgid "Debian Security"
-#~ msgstr "Varnost v Debianu"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "spremljati&nbsp;predlog"
 
-#~ msgid "discussed"
-#~ msgstr "v diskusiji"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
 
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Če se želite obrniti na nas, pojdite na <a href=\"m4_HOME/contact"
-#~ "\">kontaktno stran</a> za Debian."
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "podati&nbsp;predlog"
 
-#~ msgid "network install"
-#~ msgstr "namestitev z omrežja"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kako..."
 
-#~ msgid "buy pre-made images"
-#~ msgstr "kupi ???"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Domača&nbsp;glasovalna&nbsp;stran"
 
-#~ msgid "download with pik"
-#~ msgstr "prenesi s pikom"
+#~ msgid "Other"
+#~ msgstr "Drugo"
 
-#~ msgid "pik"
-#~ msgstr "pik"
+#~ msgid "Withdrawn"
+#~ msgstr "Umaknjeno"
 
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "nič"
+#~ msgid "Decided"
+#~ msgstr "Odločeno"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "V&nbsp;glasovanju"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "V&nbsp;diskusiji"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Čakamo&nbsp;na&nbsp;pokrovitelje"
 
 #, fuzzy
-#~ msgid "Discussion"
+#~ msgid "Minimum Discussion"
 #~ msgstr "V&nbsp;diskusiji"
 
 #, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Več podatkov"
+#~ msgid "Proposer"
+#~ msgstr "predlagano"
 
 #, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ msgid "Debate"
+#~ msgstr "Debian CD team"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donacije"