Merge commit 'origin/master' into debian-master

diff --git a/INSTALL b/INSTALL
index 1ebdbb73e9e93a6b57040d7de250a556941fceb9..641cee2d1280d3d008167bb0aca353de15a4cd6e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -32,3 +32,6 @@ case, you might have to adjust some of the steps.
 7) Include ./conf/apache.conf in apache's configuration, e.g. by symlinking it from
    /etc/apache2/sites-available/ and then using a2ensite
 8) Run ./bin/daily
+9) Setup ./bin/daily to be run regulary. In ./conf/crontab you can find an example crontab
+   to do this. Actually preferable is to trigger the script by archive updates, but you
+   will know best if and how to implement that in your setup.

diff --git a/TODO b/TODO
index 0c456401a0adf0917e6ee36da048af2db57459b3..6e1279dd1cd3aeb443d529d352e55942beb6cd12 100644 (file)
--- a/TODO
+++ b/TODO
@@ -50,23 +50,23 @@ General:
   anymore, so search further is futile. Maybe the backend could even add a
   marker, ignored by read_entry_all, but understood by read_entry_small, that
   indicates end of $res2 and start of $res3
-- Debtags: print friendly names instead of raw names?
 - Store in db \1-separated, and split on that, instead of the more fragile
   '/, /' split
 - Fields we don't handle in any way currently:
   Conflicts
-  Suggests
   Replaces
   Enhances
   Origin    -- not needed
   Bugs      -- not needed
   Task
   Python-Version(s) -- not needed
-  X-Vcs-.*  -- should be supported(?)
+
+Cron:
+- Verify Release files
+- refactorize 100syncarchive* so that there is not so much copied code
 
 Missing pieces from old code:
- - DDTP support (but without a working DDTP I will not invest any time
-   in that)
+ - gettext support in templates
  - search_packages result parser?
    reportbug in sarge is completly broken in this regard anyway AFAICT
    reportbug in etch works as long as there is the exact hit but

diff --git a/conf/.gitignore b/conf/.gitignore
index ea111097a8a9b1aee050490cef1d475849e69573..135b043fae7829a51f8c95edaf405ac70b6d27f0 100644 (file)
--- a/conf/.gitignore
+++ b/conf/.gitignore
@@ -1,3 +1,4 @@
 apache.conf
 ttreerc
 maintainer
+crontab

diff --git a/conf/crontab.sed.in b/conf/crontab.sed.in
new file mode 100644 (file)
index 0000000..183eb2a
--- /dev/null
+++ b/conf/crontab.sed.in
@@ -0,0 +1,4 @@
+# Example crontab
+55 22 * * *     %TOPDIR%/bin/daily
+@reboot         rm -f %TOPDIR%/files/cron.lock
+@reboot         rm -f %TOPDIR%/files/changelogs.lock
\ No newline at end of file

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 7054bb90c1ff7904c9ae6483d0894b090fb38f38..1be7d441cc90e25c6da65a0b855a2916d809e8ff 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -75,6 +75,7 @@ sub do_search_contents {
                &searchfile(\@results, reverse($_)."/", \$nres, $reverses);
                last if $Packages::Search::too_many_hits;
            }
+           while (<FILENAMES>) {};
            close FILENAMES or warn "fgrep error: $!\n";
        } else {
 

diff --git a/lib/Packages/I18N/LanguageNames.pm b/lib/Packages/I18N/LanguageNames.pm
index 8798f493af370241c224452e323fc239a31cbf02..65ab7f957e1e5e8b9380b21ead389f704f9ad884 100644 (file)
--- a/lib/Packages/I18N/LanguageNames.pm
+++ b/lib/Packages/I18N/LanguageNames.pm
@@ -18,19 +18,26 @@ my %ctrans = (
        da    => N_("Danish"),
        nl    => N_("Dutch"),
        en    => N_("English"),
+       fa    => N_("Persian"),
        fr    => N_("French"),
        de    => N_("German"),
+       hy    => N_("Armenian"),
        it    => N_("Italian"),
        ja    => N_("Japanese"),
        ko    => N_("Korean"),
        es    => N_("Spanish"),
+       pt    => N_("Portuguese"),
        pt_BR => N_("Portuguese (Brasilia)"),
        pt_PT => N_("Portuguese (Portugal)"),
        zh    => N_("Chinese"),
+       zh_CN => N_("Chinese (China)"),
+       zh_HK => N_("Chinese (Hong Kong)"),
+       zh_TW => N_("Chinese (Taiwan)"),
+       sv    => N_("Swedish"),
        sv_SE => N_("Swedish"),
        pl    => N_("Polish"),
        'no'  => N_("Norwegian"),
-       tr    => N_("Turkish"),
+       'tr'    => N_("Turkish"),
        ru    => N_("Russian"),
        cs    => N_("Czech"),
        eo    => N_("Esperanto"),
@@ -38,7 +45,7 @@ my %ctrans = (
        ro    => N_("Romanian"),
        sk    => N_("Slovak"),
        el    => N_("Greek"),
-       ca    => N_("Catalan"),
+       ca    => N_("Catalan"),
        lt    => N_("Lithuanian"),
        sl    => N_("Slovene"),
        bg    => N_("Bulgarian"),

diff --git a/lib/Packages/I18N/Languages.pm b/lib/Packages/I18N/Languages.pm
index f13ac2f2ba71f2cb8b8547d6be036aba491e7770..ae63ee787ef9403a44f36e2e00f329365fad1e0e 100644 (file)
--- a/lib/Packages/I18N/Languages.pm
+++ b/lib/Packages/I18N/Languages.pm
@@ -14,25 +14,28 @@ our @EXPORT = qw( langcmp get_transliteration get_selfname );
 my %langs = (
             english    => "en",
             arabic     => "ar",
+            armenian   => "hy",
             bulgarian  => "bg",
             catalan    => "ca",
+            chinese    => "zh",
+            croatian   => "hr",
             czech      => "cs",
             danish     => "da",
+            dutch      => "nl",
             german     => "de",
             greek      => "el",
             esperanto  => "eo",
             spanish    => "es",
             finnish    => "fi",
             french     => "fr",
-            croatian   => "hr",
             hungarian  => "hu",
             indonesian => "id",
             italian    => "it",
             japanese   => "ja",
             korean     => "ko",
             lithuanian => "lt",
-            dutch      => "nl",
             norwegian  => "no",
+            persian    => "fa",
             polish     => "pl",
             portuguese => "pt",
             romanian   => "ro",
@@ -41,7 +44,6 @@ my %langs = (
             slovene    => "sl",
             slovak     => "sk",
             turkish    => "tr",
-            chinese    => "zh",
             );
 
 # language directory name => native name of the language
@@ -50,35 +52,42 @@ my %selflang = (
                ar     => 'عربية',
                bg     => 'Български',
                ca     => 'català',
-               zh     => '中文',
-               hr     => 'hrvatski',
                cs     => 'česky',
                da     => 'dansk',
-               nl     => 'Nederlands',
+               de     => 'Deutsch',
+               el     => 'Ελληνικά',
                en     => 'English',
                eo     => 'Esperanto',
+               es     => 'español',
+               fa     => 'فارسی',
                fi     => 'suomi',
                fr     => 'français',
-               de     => 'Deutsch',
-               el     => 'Ελληνικά',
                hu     => 'magyar',
+               hr     => 'hrvatski',
+               hy     => 'Հայերեն',
                id     => 'Indonesia',
                it     => 'Italiano',
                ja     => '日本語',
                ko     => '한국어',
                lt     => 'Lietuvių',
+               nl     => 'Nederlands',
                "no"   => 'norsk (bokmål)',
                pl     => 'polski',
+               pt     => 'Português (pt)',
                pt_PT  => 'Português (pt)',
                pt_BR  => 'Português (br)',
                ro     => 'română',
                ru     => 'Русский',
-               es     => 'español',
-               sk     => 'slovak', #FIXME
+               sk     => 'slovensky',
+               sv     => 'svenska',
                sv_SE  => 'svenska',
                sl     => 'slovenščina',
                tr     => 'Türkçe',
-               uk     => 'ukrainian', #FIXME
+               uk     => 'українська',
+               zh     => '中文',
+               zh_CN  => '簡體中文',
+               zh_HK  => '正體中文',
+               zh_TW  => '正體中文',
                );
 
 # language directory name => Latin transliteration of the language name
@@ -88,11 +97,17 @@ my %selflang = (
 my %translit = (
                ar => "Arabiya",
                bg => "Bəlgarski",
-               zh => "Zhongzu", # Not printed due to Chinese-specific code; kept for sort order
                el => "Ellinika",
+               fa => "Farsi",
+               hy => "hayeren",
                ja => "Nihongo",
                ko => "Hangul", # Not sure. "Hanguk-Mal" (=Spoken Korean)?
                ru => "Russkij",
+               uk => "ukrajins'ka",
+               zh => "Zhongzu", # Not printed due to Chinese-specific code; kept for sort order
+               zh_CN => "Simplified Chinese",
+               zh_HK => "Traditional Chinese",
+               zh_TW => "Traditional Chinese",
                );
 
 # second transliteration table, used for languages starting with a latin

diff --git a/lib/Packages/Sections.pm b/lib/Packages/Sections.pm
index 2e4fd11781270a34cbfc3e474e370c4210ede4c0..a586c17e79787e3067c4a715b81bd76248ac577c 100644 (file)
--- a/lib/Packages/Sections.pm
+++ b/lib/Packages/Sections.pm
@@ -69,6 +69,8 @@ our %sections_descs = (
                                             N_("The famous typesetting software and related programs.") ],
                      text              => [ N_("Text Processing"),
                                             N_("Utilities to format and print text documents.") ],
+                     translations      => [ N_("Translations"),
+                                            N_("Translation packages and language support meta packages.") ],
                      utils             => [ N_("Utilities"),
                                             N_("Utilities for file/disk manipulation, backup and archive tools, system monitoring, input systems, etc.") ],
                      virtual   => [ N_("Virtual packages"),

diff --git a/po/langs.de.po b/po/langs.de.po
index 39df928413ea050aaa94daa12df1c612baba868e..a367702fd67b24ed62a441d4297446d25a4820ea 100644 (file)
--- a/po/langs.de.po
+++ b/po/langs.de.po
@@ -1,42 +1,55 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: packages.git 2cd81017ac27717adcda738074294c4f5cd9e4cd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 18:04+0100\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"POT-Creation-Date: 2007-09-18 20:42+0200\n"
+"PO-Revision-Date: 2007-09-18 19:56+0200\n"
+"Last-Translator: Frank Lichtenheld <djpig@debian.org>\n"
+"Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Packages/I18N/LanguageNames.pm:17
+#: lib/Packages/I18N/LanguageNames.pm:15
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:18
+#: lib/Packages/I18N/LanguageNames.pm:16
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:19
+#: lib/Packages/I18N/LanguageNames.pm:17
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:20
+#: lib/Packages/I18N/LanguageNames.pm:18
 msgid "Danish"
-msgstr "Dänisch"
+msgstr "Dänisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:21
+#: lib/Packages/I18N/LanguageNames.pm:19
 msgid "Dutch"
-msgstr "Holländisch"
+msgstr "Holländisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:22
+#: lib/Packages/I18N/LanguageNames.pm:20
 msgid "English"
 msgstr "Englisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:23
+#: lib/Packages/I18N/LanguageNames.pm:21
+msgid "Persian"
+msgstr "Persisch"
+
+#: lib/Packages/I18N/LanguageNames.pm:22
 msgid "French"
-msgstr "Französisch"
+msgstr "Französisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:24
+#: lib/Packages/I18N/LanguageNames.pm:23
 msgid "German"
 msgstr "Deutsch"
 
+#: lib/Packages/I18N/LanguageNames.pm:24
+msgid "Armenian"
+msgstr "Armenisch"
+
 #: lib/Packages/I18N/LanguageNames.pm:25
 msgid "Italian"
 msgstr "Italienisch"
@@ -54,75 +67,95 @@ msgid "Spanish"
 msgstr "Spanisch"
 
 #: lib/Packages/I18N/LanguageNames.pm:29
+msgid "Portuguese"
+msgstr "Portugiesisch"
+
+#: lib/Packages/I18N/LanguageNames.pm:30
 msgid "Portuguese (Brasilia)"
 msgstr "Portugiesisch (Brasilien)"
 
-#: lib/Packages/I18N/LanguageNames.pm:30
+#: lib/Packages/I18N/LanguageNames.pm:31
 msgid "Portuguese (Portugal)"
 msgstr "Portugiesisch (Portugal)"
 
-#: lib/Packages/I18N/LanguageNames.pm:31
+#: lib/Packages/I18N/LanguageNames.pm:32
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:32
+#: lib/Packages/I18N/LanguageNames.pm:33
+#, fuzzy
+msgid "Chinese (China)"
+msgstr "Chinesisch"
+
+#: lib/Packages/I18N/LanguageNames.pm:34
+msgid "Chinese (Hong Kong)"
+msgstr ""
+
+#: lib/Packages/I18N/LanguageNames.pm:35
+#, fuzzy
+msgid "Chinese (Taiwan)"
+msgstr "Chinesisch"
+
+#: lib/Packages/I18N/LanguageNames.pm:36 lib/Packages/I18N/LanguageNames.pm:37
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:33
+#: lib/Packages/I18N/LanguageNames.pm:38
 msgid "Polish"
 msgstr "Polnisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:34
+#: lib/Packages/I18N/LanguageNames.pm:39
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:37
+#: lib/Packages/I18N/LanguageNames.pm:40
+msgid "Turkish"
+msgstr "Türkisch"
+
+#: lib/Packages/I18N/LanguageNames.pm:41
+msgid "Russian"
+msgstr "Russisch"
+
+#: lib/Packages/I18N/LanguageNames.pm:42
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:38
+#: lib/Packages/I18N/LanguageNames.pm:43
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: lib/Packages/I18N/LanguageNames.pm:39
+#: lib/Packages/I18N/LanguageNames.pm:44
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:40
+#: lib/Packages/I18N/LanguageNames.pm:45
 msgid "Romanian"
-msgstr "Rumänisch"
+msgstr "Rumänisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:41
+#: lib/Packages/I18N/LanguageNames.pm:46
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:42
+#: lib/Packages/I18N/LanguageNames.pm:47
 msgid "Greek"
 msgstr "Griechisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:43
+#: lib/Packages/I18N/LanguageNames.pm:48
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:44
+#: lib/Packages/I18N/LanguageNames.pm:49
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:45
+#: lib/Packages/I18N/LanguageNames.pm:50
 msgid "Slovene"
 msgstr "Slowenisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:46
+#: lib/Packages/I18N/LanguageNames.pm:51
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: lib/Packages/I18N/LanguageNames.pm:47
+#: lib/Packages/I18N/LanguageNames.pm:52
 msgid "Ukrainian"
 msgstr "Ukrainisch"
-
-#~ msgid "Russian"
-#~ msgstr "Russisch"
-
-#~ msgid "Turkish"
-#~ msgstr "Türkisch"

diff --git a/po/langs.pot b/po/langs.pot
index 83a5c27125de20b11cf142c84324f235c6841b0f..acd09a8540270f91c62c3060966e3dca0fbc7476 100644 (file)
--- a/po/langs.pot
+++ b/po/langs.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 18:04+0100\n"
+"POT-Creation-Date: 2007-09-18 20:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,38 +15,46 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ./lib/Packages/I18N/LanguageNames.pm:17
+#: ./lib/Packages/I18N/LanguageNames.pm:15
 msgid "Arabic"
 msgstr ""
 
-#: ./lib/Packages/I18N/LanguageNames.pm:18
+#: ./lib/Packages/I18N/LanguageNames.pm:16
 msgid "Finnish"
 msgstr ""
 
-#: ./lib/Packages/I18N/LanguageNames.pm:19
+#: ./lib/Packages/I18N/LanguageNames.pm:17
 msgid "Croatian"
 msgstr ""
 
-#: ./lib/Packages/I18N/LanguageNames.pm:20
+#: ./lib/Packages/I18N/LanguageNames.pm:18
 msgid "Danish"
 msgstr ""
 
-#: ./lib/Packages/I18N/LanguageNames.pm:21
+#: ./lib/Packages/I18N/LanguageNames.pm:19
 msgid "Dutch"
 msgstr ""
 
-#: ./lib/Packages/I18N/LanguageNames.pm:22
+#: ./lib/Packages/I18N/LanguageNames.pm:20
 msgid "English"
 msgstr ""
 
-#: ./lib/Packages/I18N/LanguageNames.pm:23
+#: ./lib/Packages/I18N/LanguageNames.pm:21
+msgid "Persian"
+msgstr ""
+
+#: ./lib/Packages/I18N/LanguageNames.pm:22
 msgid "French"
 msgstr ""
 
-#: ./lib/Packages/I18N/LanguageNames.pm:24
+#: ./lib/Packages/I18N/LanguageNames.pm:23
 msgid "German"
 msgstr ""
 
+#: ./lib/Packages/I18N/LanguageNames.pm:24
+msgid "Armenian"
+msgstr ""
+
 #: ./lib/Packages/I18N/LanguageNames.pm:25
 msgid "Italian"
 msgstr ""
@@ -64,69 +72,94 @@ msgid "Spanish"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:29
-msgid "Portuguese (Brasilia)"
+msgid "Portuguese"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:30
-msgid "Portuguese (Portugal)"
+msgid "Portuguese (Brasilia)"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:31
-msgid "Chinese"
+msgid "Portuguese (Portugal)"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:32
-msgid "Swedish"
+msgid "Chinese"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:33
-msgid "Polish"
+msgid "Chinese (China)"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:34
-msgid "Norwegian"
+msgid "Chinese (Hong Kong)"
+msgstr ""
+
+#: ./lib/Packages/I18N/LanguageNames.pm:35
+msgid "Chinese (Taiwan)"
 msgstr ""
 
+#: ./lib/Packages/I18N/LanguageNames.pm:36
 #: ./lib/Packages/I18N/LanguageNames.pm:37
-msgid "Czech"
+msgid "Swedish"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:38
-msgid "Esperanto"
+msgid "Polish"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:39
-msgid "Hungarian"
+msgid "Norwegian"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:40
-msgid "Romanian"
+msgid "Turkish"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:41
-msgid "Slovak"
+msgid "Russian"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:42
-msgid "Greek"
+msgid "Czech"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:43
-msgid "Catalan"
+msgid "Esperanto"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:44
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:45
-msgid "Slovene"
+msgid "Romanian"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:46
-msgid "Bulgarian"
+msgid "Slovak"
 msgstr ""
 
 #: ./lib/Packages/I18N/LanguageNames.pm:47
+msgid "Greek"
+msgstr ""
+
+#: ./lib/Packages/I18N/LanguageNames.pm:48
+msgid "Catalan"
+msgstr ""
+
+#: ./lib/Packages/I18N/LanguageNames.pm:49
+msgid "Lithuanian"
+msgstr ""
+
+#: ./lib/Packages/I18N/LanguageNames.pm:50
+msgid "Slovene"
+msgstr ""
+
+#: ./lib/Packages/I18N/LanguageNames.pm:51
+msgid "Bulgarian"
+msgstr ""
+
+#: ./lib/Packages/I18N/LanguageNames.pm:52
 msgid "Ukrainian"
 msgstr ""

diff --git a/po/sections.de.po b/po/sections.de.po
index 14e2ab5725f11a55e9a06442086f12fd98a35006..062c486228eb2291ff2b22ca2d76cddd1fb826ed 100644 (file)
--- a/po/sections.de.po
+++ b/po/sections.de.po
@@ -1,11 +1,15 @@
+# Copyright (C) 2007 Frank Lichtenheld
+#
 msgid ""
 msgstr ""
+"Project-Id-Version: packages.git 2cd81017ac27717adcda738074294c4f5cd9e4cd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 18:04+0100\n"
-"Last-Translator: Frank Lichtenheld <frank@lichtenheld.de>\n"
+"POT-Creation-Date: 2007-09-18 20:42+0200\n"
+"PO-Revision-Date: 2007-09-18 19:48+0200\n"
+"Last-Translator: Frank Lichtenheld <djpig@debian.org>\n"
 "Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: lib/Packages/Sections.pm:12
@@ -24,7 +28,7 @@ msgstr "Basisprogramme"
 
 #: lib/Packages/Sections.pm:15
 msgid "Basic needed utilities of every Debian system."
-msgstr ""
+msgstr "Allgemeine, von jedem Debian-System benötigte Programme"
 
 #: lib/Packages/Sections.pm:16
 msgid "Communication Programs"
@@ -54,7 +58,7 @@ msgid ""
 "Debian, and software needed to browse documentation (man, info, etc)."
 msgstr ""
 "FAQs, HOWTOs und andere Dokumente, die versuchen, alles in Bezug auf Debian "
-"zu erklären, sowie Software, die nötig ist, um die Dokumentation zu nutzen "
+"zu erklären, sowie Software, die nötig ist, um die Dokumentation zu nutzen "
 "(man, info, usw.)"
 
 #: lib/Packages/Sections.pm:22
@@ -79,7 +83,7 @@ msgstr "Embedded Software"
 
 #: lib/Packages/Sections.pm:27
 msgid "Software suitable for use in embedded applications."
-msgstr "Software, die für die Benutzung in Embedded-Systemen geeignet ist."
+msgstr "Software, die für die Benutzung in Embedded-Systemen geeignet ist."
 
 #: lib/Packages/Sections.pm:28
 msgid "Games"
@@ -88,7 +92,7 @@ msgstr "Spiele"
 #: lib/Packages/Sections.pm:29
 msgid "Programs to spend a nice time with after all this setting up."
 msgstr ""
-"Programme, mit denen man eine schöne Zeit verbringen kann nach dem ganzen "
+"Programme, mit denen man eine schöne Zeit verbringen kann nach dem ganzen "
 "Einrichten."
 
 #: lib/Packages/Sections.pm:30
@@ -100,7 +104,7 @@ msgid ""
 "The GNOME desktop environment, a powerful, easy to use set of integrated "
 "applications."
 msgstr ""
-"Die GNOME-Desktop-Umgebung, eine mächtige, leicht zu benutzende Sammlung von "
+"Die GNOME-Desktop-Umgebung, eine mächtige, leicht zu benutzende Sammlung von "
 "integrierten Anwendungen."
 
 #: lib/Packages/Sections.pm:32
@@ -109,7 +113,7 @@ msgstr "Grafik"
 
 #: lib/Packages/Sections.pm:33
 msgid "Editors, viewers, converters... Everything to become an artist."
-msgstr "Editoren, Viewer, Konverter... Alles um ein Künstler zu werden."
+msgstr "Editoren, Viewer, Konverter... Alles um ein Künstler zu werden."
 
 #: lib/Packages/Sections.pm:34
 msgid "Ham Radio"
@@ -117,7 +121,7 @@ msgstr "Amateurfunk"
 
 #: lib/Packages/Sections.pm:35
 msgid "Software for ham radio."
-msgstr "Software für Amateurfunker."
+msgstr "Software für Amateurfunker."
 
 #: lib/Packages/Sections.pm:36
 msgid "Interpreters"
@@ -126,7 +130,7 @@ msgstr "Interpreter"
 #: lib/Packages/Sections.pm:37
 msgid "All kind of interpreters for interpreted languages. Macro processors."
 msgstr ""
-"Alle Sorten von Interpretern für interpretierte Programmiersprachen. "
+"Alle Sorten von Interpretern für interpretierte Programmiersprachen. "
 "Makroprozessoren."
 
 #: lib/Packages/Sections.pm:38
@@ -138,7 +142,7 @@ msgid ""
 "The K Desktop Environment, a powerful, easy to use set of integrated "
 "applications."
 msgstr ""
-"Die K-Desktop-Umgebung, eine mächtige, leicht zu benutzende Sammlung von "
+"Die K-Desktop-Umgebung, eine mächtige, leicht zu benutzende Sammlung von "
 "integrierten Anwendungen."
 
 #: lib/Packages/Sections.pm:40
@@ -158,7 +162,7 @@ msgstr "Bibliotheksentwicklung"
 #: lib/Packages/Sections.pm:43
 msgid "Libraries necessary for developers to write programs that use them."
 msgstr ""
-"Bibliotheken, die von Entwicklern benötigt werden, um Programme zu "
+"Bibliotheken, die von Entwicklern benötigt werden, um Programme zu "
 "entwicklen, die sie benutzen."
 
 #: lib/Packages/Sections.pm:44
@@ -204,57 +208,43 @@ msgid "Software to access Usenet, to set up news servers, etc."
 msgstr "Software, um auf das Usenet zuzugreifen, News-Server aufzusetzen, usw."
 
 #: lib/Packages/Sections.pm:54
-msgid "Software restricted in the U.S."
-msgstr "Software, die Beschränkungen in den USA unterliegt"
-
-#: lib/Packages/Sections.pm:55
-msgid ""
-"These packages probably may not be used in or distributed from the U.S. due "
-"to software patents. You should check the regulations in your country before "
-"using this software."
-msgstr ""
-"Diese Pakete dürfen wahrscheinlich nicht in den USA verwendet werden oder "
-"nicht ausgeführt werden aufgrund von Software-Patenten. Sie sollten die "
-"Vorschriften in Ihrem Land überprüfen bevor Sie diese Software verwenden."
-
-#: lib/Packages/Sections.pm:56
 msgid "Old Libraries"
 msgstr "Alte Bibliotheken"
 
-#: lib/Packages/Sections.pm:57
+#: lib/Packages/Sections.pm:55
 msgid ""
 "Old versions of libraries, kept for backward compatibility with old "
 "applications."
 msgstr ""
-"Alte Versionen von Bibliotheken, die zur Erhaltung der Abwärtskompatibilität "
+"Alte Versionen von Bibliotheken, die zur Erhaltung der Abwärtskompatibilität "
 "mit alten Anwendungen bereitgestellt werden."
 
-#: lib/Packages/Sections.pm:58
+#: lib/Packages/Sections.pm:56
 msgid "Other OS's and file systems"
 msgstr "Andere Betriebs- und Dateisysteme"
 
-#: lib/Packages/Sections.pm:59
+#: lib/Packages/Sections.pm:57
 msgid ""
 "Software to run programs compiled for other operating system, and to use "
 "their filesystems."
 msgstr ""
-"Software, um Programme zu benutzen, die für andere Betriebssysteme "
+"Software, um Programme zu benutzen, die für andere Betriebssysteme "
 "kompiliert wurden und um die Dateisysteme anderer Betriebssysteme zu "
 "benutzen."
 
-#: lib/Packages/Sections.pm:60
+#: lib/Packages/Sections.pm:58
 msgid "Perl"
 msgstr "Perl"
 
-#: lib/Packages/Sections.pm:61
+#: lib/Packages/Sections.pm:59
 msgid "Everything about Perl, an interpreted scripting language."
 msgstr "Alles zu Perl, einer interpretierten Skriptsprache."
 
-#: lib/Packages/Sections.pm:62
+#: lib/Packages/Sections.pm:60
 msgid "Python"
 msgstr "Python"
 
-#: lib/Packages/Sections.pm:63
+#: lib/Packages/Sections.pm:61
 msgid ""
 "Everything about Python, an interpreted, interactive object oriented "
 "language."
@@ -262,48 +252,56 @@ msgstr ""
 "Alles zu Python, einer interpretierten, interaktiven, objekt-orientierten "
 "Programmiersprache."
 
-#: lib/Packages/Sections.pm:64
+#: lib/Packages/Sections.pm:62
 msgid "Science"
 msgstr "Wissenschaft"
 
-#: lib/Packages/Sections.pm:65
+#: lib/Packages/Sections.pm:63
 msgid "Basic tools for scientific work"
 msgstr "Programme zum wissenschaftlichen Arbeiten"
 
-#: lib/Packages/Sections.pm:66
+#: lib/Packages/Sections.pm:64
 msgid "Shells"
 msgstr "Shells"
 
-#: lib/Packages/Sections.pm:67
+#: lib/Packages/Sections.pm:65
 msgid "Command shells. Friendly user interfaces for beginners."
-msgstr "Kommandoshells. Benutzerfreundliche Schnittstellen für Anfänger."
+msgstr "Kommandoshells. Benutzerfreundliche Schnittstellen für Anfänger."
 
-#: lib/Packages/Sections.pm:68
+#: lib/Packages/Sections.pm:66
 msgid "Sound"
 msgstr "Sound"
 
-#: lib/Packages/Sections.pm:69
+#: lib/Packages/Sections.pm:67
 msgid ""
 "Utilities to deal with sound: mixers, players, recorders, CD players, etc."
 msgstr ""
 "Programme um mit Sound zu arbeiten: Mixer, Player, Recorder, CD-Player, usw."
 
-#: lib/Packages/Sections.pm:70
+#: lib/Packages/Sections.pm:68
 msgid "TeX"
 msgstr "TeX"
 
-#: lib/Packages/Sections.pm:71
+#: lib/Packages/Sections.pm:69
 msgid "The famous typesetting software and related programs."
-msgstr "Die berühmte Schriftsatz-Software und verwandte Programme."
+msgstr "Die berühmte Schriftsatz-Software und verwandte Programme."
 
-#: lib/Packages/Sections.pm:72
+#: lib/Packages/Sections.pm:70
 msgid "Text Processing"
 msgstr "Textverarbeitung"
 
-#: lib/Packages/Sections.pm:73
+#: lib/Packages/Sections.pm:71
 msgid "Utilities to format and print text documents."
 msgstr "Programme, um Textdokumente zu formatieren und zu drucken."
 
+#: lib/Packages/Sections.pm:72
+msgid "Translations"
+msgstr ""
+
+#: lib/Packages/Sections.pm:73
+msgid "Translation packages and language support meta packages."
+msgstr ""
+
 #: lib/Packages/Sections.pm:74
 msgid "Utilities"
 msgstr "Hilfsprogramme"
@@ -334,14 +332,14 @@ msgstr "Web-Server, Browser, Proxies, Download-Tools, usw."
 
 #: lib/Packages/Sections.pm:80
 msgid "X Window System software"
-msgstr "»X Window System«-Software"
+msgstr "»X Window System«-Software"
 
 #: lib/Packages/Sections.pm:81
 msgid ""
 "X servers, libraries, fonts, window managers, terminal emulators and many "
 "related applications."
 msgstr ""
-"X-Server, Bibliotheken, Zeichensätze, Windowmanager, Terminal-Emulatoren und "
+"X-Server, Bibliotheken, Zeichensätze, Windowmanager, Terminal-Emulatoren und "
 "viele verwandte Anwendungen."
 
 #: lib/Packages/Sections.pm:82
@@ -355,11 +353,3 @@ msgid ""
 msgstr ""
 "Spezielle Pakete zum Erzeugen von angepassten Debian-Installer-Varianten. "
 "Installieren Sie sie nicht in einem normalen System!"
-
-#~ msgid ""
-#~ "Basic needed utilities of every Debian system (you needn't install this, "
-#~ "they're provided only for upgrading purposes)."
-#~ msgstr ""
-#~ "Allgemeine, von jedem Debian-System benötigte Programme (Sie brauchen "
-#~ "diese im Allgemeinen nicht selbst installieren, sie werden vor allem zu "
-#~ "Aktualisierungszwecken bereitgestellt)."

diff --git a/po/sections.pot b/po/sections.pot
index 71e2f02a28990afd144a721f4fbda86086039d58..27bfecbb53545b94b52215afd736002df02ffc0b 100644 (file)
--- a/po/sections.pot
+++ b/po/sections.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 18:04+0100\n"
+"POT-Creation-Date: 2007-09-18 19:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -194,95 +194,92 @@ msgid "Software to access Usenet, to set up news servers, etc."
 msgstr ""
 
 #: ./lib/Packages/Sections.pm:54
-msgid "Software restricted in the U.S."
-msgstr ""
-
-#: ./lib/Packages/Sections.pm:55
-msgid ""
-"These packages probably may not be used in or distributed from the U.S. due "
-"to software patents. You should check the regulations in your country before "
-"using this software."
-msgstr ""
-
-#: ./lib/Packages/Sections.pm:56
 msgid "Old Libraries"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:57
+#: ./lib/Packages/Sections.pm:55
 msgid ""
 "Old versions of libraries, kept for backward compatibility with old "
 "applications."
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:58
+#: ./lib/Packages/Sections.pm:56
 msgid "Other OS's and file systems"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:59
+#: ./lib/Packages/Sections.pm:57
 msgid ""
 "Software to run programs compiled for other operating system, and to use "
 "their filesystems."
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:60
+#: ./lib/Packages/Sections.pm:58
 msgid "Perl"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:61
+#: ./lib/Packages/Sections.pm:59
 msgid "Everything about Perl, an interpreted scripting language."
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:62
+#: ./lib/Packages/Sections.pm:60
 msgid "Python"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:63
+#: ./lib/Packages/Sections.pm:61
 msgid ""
 "Everything about Python, an interpreted, interactive object oriented "
 "language."
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:64
+#: ./lib/Packages/Sections.pm:62
 msgid "Science"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:65
+#: ./lib/Packages/Sections.pm:63
 msgid "Basic tools for scientific work"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:66
+#: ./lib/Packages/Sections.pm:64
 msgid "Shells"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:67
+#: ./lib/Packages/Sections.pm:65
 msgid "Command shells. Friendly user interfaces for beginners."
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:68
+#: ./lib/Packages/Sections.pm:66
 msgid "Sound"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:69
+#: ./lib/Packages/Sections.pm:67
 msgid ""
 "Utilities to deal with sound: mixers, players, recorders, CD players, etc."
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:70
+#: ./lib/Packages/Sections.pm:68
 msgid "TeX"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:71
+#: ./lib/Packages/Sections.pm:69
 msgid "The famous typesetting software and related programs."
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:72
+#: ./lib/Packages/Sections.pm:70
 msgid "Text Processing"
 msgstr ""
 
-#: ./lib/Packages/Sections.pm:73
+#: ./lib/Packages/Sections.pm:71
 msgid "Utilities to format and print text documents."
 msgstr ""
 
+#: ./lib/Packages/Sections.pm:72
+msgid "Translations"
+msgstr ""
+
+#: ./lib/Packages/Sections.pm:73
+msgid "Translation packages and language support meta packages."
+msgstr ""
+
 #: ./lib/Packages/Sections.pm:74
 msgid "Utilities"
 msgstr ""

diff --git a/templates/html/messages.tmpl b/templates/html/messages.tmpl
index 3d8b6a680c2fc98068cca2513de0fadf91721466..7c9c6117700d817f0467fd22be9e784b630a9191 100644 (file)
--- a/templates/html/messages.tmpl
+++ b/templates/html/messages.tmpl
@@ -1,31 +1,31 @@
 <!-- messages.tmpl -->
 [%- FOREACH error IN errors %]
 [%- '<div class="perror">' IF loop.first %]
- <p>[% error %]</p>
+ <p>[% error | html %]</p>
 [% '</div>' IF loop.last -%]
 [% END -%]
 [%- FOREACH debug IN debugs %]
 [%- '<div class="pdebug"><h2>Debugging:</h2><pre>' IF loop.first -%]
-[% debug %]
+[% debug | html %]
 [% '</pre></div>' IF loop.last -%]
 [% END -%]
 [%- FOREACH hint IN hints %]
 [%- '<div class="phints">' IF loop.first %]
- <p>[% hint %]</p>
+ <p>[% hint | html %]</p>
 [% '</div>' IF loop.last -%]
 [% END -%]
 [%- FOREACH msg IN msgs %]
 [%- '<div class="pmsgs">' IF loop.first %]
- <p>[% msg %]</p>
+ <p>[% msg | html %]</p>
 [% '</div>' IF loop.last -%]
 [% END -%]
 [%- FOREACH note IN notes %]
 [%- '<div class="pnotes">' IF loop.first %]
 [%- IF note.1 %]
- <h2>[% note.0 %]</h2>
- <p>[% note.1 %]</p>
+ <h2>[% note.0 | html %]</h2>
+ <p>[% note.1 | html %]</p>
 [% ELSE %]
- <p>[% note.0 %]</p>
+ <p>[% note.0 | html %]</p>
 [% END -%]
 [% '</div>' IF loop.last -%]
 [% END -%]