Merge branch 'master' into ubuntu-master

diff --git a/po/templates.bg.po b/po/templates.bg.po
index 7699a3aefdac50626ab4d7e4c09a80a570ca37b0..f62b9f2cdcdf8eb26d6f6aa6d51ced3aa0d8ad51 100644 (file)
--- a/po/templates.bg.po
+++ b/po/templates.bg.po
@@ -1,6 +1,5 @@
 # Bulgarian translation of templates.pot
 # This file is put in the public domain.
-# (null) <>, 2010.
 # Damyan Ivanov <dmn@debian.org>, 2010.
 #
 msgid ""
@@ -8,12 +7,13 @@ msgstr ""
 "Project-Id-Version: packages.debian.org\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-14 00:02+0200\n"
-"PO-Revision-Date: 2010-05-26 23:45+0300\n"
+"PO-Revision-Date: 2010-07-13 08:20+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: binary\n"
+"Plural-Forms: \n"
 
 #: templates/config.tmpl:44
 msgid "Debian Web Mailinglist"
@@ -38,11 +38,11 @@ msgstr ""
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
 #: templates/config.tmpl:70
 msgid "."
-msgstr ""
+msgstr ","
 
 #: templates/config.tmpl:71
 msgid ","
-msgstr ""
+msgstr " "
 
 #: templates/config/architectures.tmpl:4
 msgid "Intel x86"
@@ -127,10 +127,9 @@ msgstr ""
 #: templates/config/archive_layout.tmpl:16
 msgid "packages that do not meet the Debian Free Software Guidelines"
 msgstr ""
-"пакеÑ\82и, коиÑ\82о не оÑ\82говаÑ\80Ñ\8fÑ\82 на пÑ\80епоÑ\80Ñ\83ките на Дебиан за свободен софтуер"
+"пакеÑ\82и, коиÑ\82о не оÑ\82говаÑ\80Ñ\8fÑ\82 на пÑ\80епоÑ\80Ñ\8aките на Дебиан за свободен софтуер"
 
 #: templates/config/mirrors.tmpl:94
-#, fuzzy
 msgid ""
 "volatile packages that need major changes during the life of a stable release"
 msgstr ""
@@ -172,7 +171,7 @@ msgstr "Африка"
 
 #: templates/html/download.tmpl:2
 msgid "Package Download Selection -- %s"
-msgstr ""
+msgstr "Изтегляне на пакети – %s"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
 #: templates/html/homepage.tmpl:104 templates/html/index_head.tmpl:9
@@ -549,7 +548,7 @@ msgstr "Пакети в „%s“, %s %s"
 
 #: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
-msgstr "Пакети вв „%s“"
+msgstr "Пакети в „%s“"
 
 #: templates/html/index_head.tmpl:13
 msgid "All Packages"

diff --git a/templates/html/newpkg.tmpl b/templates/html/newpkg.tmpl
index e8c5d3ee0af12d4aee6ac79dccfe699029f6be7e..ba44a442765f46b3ca91c056b4c79c24a1be370f 100644 (file)
--- a/templates/html/newpkg.tmpl
+++ b/templates/html/newpkg.tmpl
@@ -20,7 +20,7 @@
        g(' You can also display this list <a href="%s">sorted by age</a>.', make_url('newpkg','mode=byage'));
    END %]</p>
 <p>[% g('This information is also available as an <a href="newpkg?format=rss">RSS feed</a>') %]
-<a href="newpkg?format=rss"><img src="http://planet.debian.org/rss10.png" alt="[% g('[RSS 1.0 Feed]') %]"></a></p>
+<a href="newpkg?format=rss"><img src="http://planet.debian.org/common/rss10.png" alt="[% g('[RSS 1.0 Feed]') %]"></a></p>
 
 [% FOREACH pkg IN new_packages %]
        [% '<ul>' IF loop.first %]