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, 153 insertions, 189 deletions

diff --git a/slovene/po/templates.sl.po b/slovene/po/templates.sl.po
index 7f592034dc1..2616f94e387 100644
--- a/slovene/po/templates.sl.po
+++ b/slovene/po/templates.sl.po
@@ -15,105 +15,6 @@ msgstr ""
 msgid "More information"
 msgstr "Več podatkov"
 
-#: ../../english/template/debian/cdimage.wml:8
-msgid "·"
-msgstr "·"
-
-#: ../../english/template/debian/cdimage.wml:11
-#, fuzzy
-msgid "<void id=\"dc_faq\" />FAQ"
-msgstr "<void id=\"dc_faq\" />faq"
-
-#: ../../english/template/debian/cdimage.wml:14
-#, fuzzy
-msgid "Download with Jigdo"
-msgstr "prenesi z jigdom"
-
-#: ../../english/template/debian/cdimage.wml:17
-#, fuzzy
-msgid "Download via HTTP/FTP"
-msgstr "prenesi s 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 "namestitev z omrežja"
-
-#: ../../english/template/debian/cdimage.wml:26
-#, fuzzy
-msgid "<void id=\"dc_download\" />Download"
-msgstr "<void id=\"dc_faq\" />faq"
-
-#: ../../english/template/debian/cdimage.wml:29
-#, fuzzy
-msgid "<void id=\"dc_misc\" />Misc"
-msgstr "<void id=\"dc_misc\" />razno"
-
-#: ../../english/template/debian/cdimage.wml:32
-#, fuzzy
-msgid "<void id=\"dc_artwork\" />Artwork"
-msgstr "<void id=\"dc_faq\" />faq"
-
-#: ../../english/template/debian/cdimage.wml:35
-#, fuzzy
-msgid "<void id=\"dc_mirroring\" />Mirroring"
-msgstr "<void id=\"dc_misc\" />razno"
-
-#: ../../english/template/debian/cdimage.wml:38
-#, fuzzy
-msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-msgstr "<void id=\"dc_misc\" />razno"
-
-#: ../../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 "Debian CD team"
-
-#: ../../english/template/debian/cdimage.wml:50
-msgid "debian_on_cd"
-msgstr "debian_on_cd"
-
-#: ../../english/template/debian/cdimage.wml:53
-msgid "<void id=\"faq-bottom\" />faq"
-msgstr "<void id=\"faq-bottom\" />pogosta vprašanja"
-
-#: ../../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 "buy"
-
-#: ../../english/template/debian/cdimage.wml:65
-msgid "net_install"
-msgstr "net_install"
-
-#: ../../english/template/debian/cdimage.wml:68
-msgid "<void id=\"misc-bottom\" />misc"
-msgstr "<void id=\"misc-bottom\" />razno"
-
-#: ../../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 "Da"
@@ -791,76 +692,74 @@ msgstr ""
 "\">%s</a>."
 
 #, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donacije"
+#~ msgid "No requests for adoption"
+#~ msgstr "Več podatkov"
 
 #, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debian CD team"
+#~ msgid "No Requested packages"
+#~ msgstr "Prizadeti paketi"
 
 #, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "predlagano"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_misc\" />razno"
 
 #, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "V&nbsp;diskusiji"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Čakamo&nbsp;na&nbsp;pokrovitelje"
+#~ msgid "License Information"
+#~ msgstr "Več podatkov"
 
-#~ msgid "In&nbsp;Discussion"
+#, fuzzy
+#~ msgid "Discussion"
 #~ msgstr "V&nbsp;diskusiji"
 
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "V&nbsp;glasovanju"
-
-#~ msgid "Decided"
-#~ msgstr "Odločeno"
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "nič"
 
-#~ msgid "Withdrawn"
-#~ msgstr "Umaknjeno"
+#~ msgid "pik"
+#~ msgstr "pik"
 
-#~ msgid "Other"
-#~ msgstr "Drugo"
+#~ msgid "download with pik"
+#~ msgstr "prenesi s pikom"
 
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Domača&nbsp;glasovalna&nbsp;stran"
+#~ msgid "buy pre-made images"
+#~ msgstr "kupi ???"
 
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kako..."
+#~ msgid "network install"
+#~ msgstr "namestitev z omrežja"
 
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "podati&nbsp;predlog"
+#~ 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 "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
+#~ msgid "discussed"
+#~ msgstr "v diskusiji"
 
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "spremljati&nbsp;predlog"
+#~ msgid "Debian Security"
+#~ msgstr "Varnost v Debianu"
 
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "prebrati&nbsp;izide"
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debianovo varnostno opozorilo"
 
-#~ msgid "Vote"
-#~ msgstr "glasovati"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debianova varnostna opozorila"
 
-#~ msgid "Security database references"
-#~ msgstr "Sklici iz varnostnih podatkovnih zbirk"
+#~ msgid "Date Reported"
+#~ msgstr "Dan prijave"
 
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "V slovarju Mitre's CVE "
+#~ msgid "Vulnerable"
+#~ msgstr "Ranljivo"
 
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "V podatkovni zbirki Bugtraq (na SecurityFocusu)"
+#~ msgid "Fixed in"
+#~ msgstr "Popravljeno v"
 
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERTova poročila o ranljivosti, opozorila in poročila o incidentih"
+#~ msgid "Source:"
+#~ msgstr "Izvor:"
 
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "Trenutno ni na voljo drugih sklicev iz zunanjih varnostnih podatkovnih "
-#~ "zbirk."
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arhitekturno neodvisna komponenta"
 
 #~ msgid ""
 #~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
@@ -869,72 +768,137 @@ 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"
+#~ msgid "Debate"
+#~ msgstr "Debian CD team"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donacije"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />razno"
+
+#~ msgid "net_install"
+#~ msgstr "net_install"
+
+#~ msgid "buy"
+#~ msgstr "buy"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />pogosta vprašanja"
+
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_on_cd"
+
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD team"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
 #~ msgstr "<void id=\"dc_misc\" />razno"
 
 #, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Prizadeti paketi"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_misc\" />razno"
 
 #, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Več podatkov"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_faq\" />faq"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />razno"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_faq\" />faq"
+
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "namestitev z omrežja"
+
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "prenesi s http/ftp"
+
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "prenesi z jigdom"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_faq\" />FAQ"
+#~ msgstr "<void id=\"dc_faq\" />faq"
+
+#~ msgid "&middot;"
+#~ msgstr "&middot;"