diff options
| -rw-r--r-- | contributors.pl | 30 | ||||
| -rwxr-xr-x | control-center | 15 | ||||
| -rwxr-xr-x | credits2po | 18 |
3 files changed, 46 insertions, 17 deletions
diff --git a/contributors.pl b/contributors.pl index a1124657..c8411a3e 100644 --- a/contributors.pl +++ b/contributors.pl @@ -8,19 +8,31 @@ use lib qw(/usr/lib/libDrakX); use common; { - N("Per Oyvind Karlsen") => N("massive packages rebuilding and cleaning, Norwegian Bokmaal (nb) translation, i18n work, games"), + N("Packagers") => "", + N("Per Oyvind Karlsen") => N("massive packages rebuilding and cleaning"), N("Guillaume Rousse") => N("cowsay introduction"), - N("Olivier Thauvin") => N("figlet introduction, Distriblint (checking rpm in the distro)"), - N("Marcel Pol") => N("mono introduction, updated abiword"), - N("Ben Reser") => N("updated nc with debian patches, fixed some perl packages, dnotify startup script, urpmc, hddtemp, wipe, etc..."), + N("Olivier Thauvin") => N("figlet introduction"), + N("Marcel Pol") => N("mono introduction"), + N("Ben Reser") => N("updated nc with debian patches"), N("Thomas Backlund") => N("\"deep and broad\" kernel work (many new patches before integration in official kernel)"), N("Svetoslav Slavtchev") => N("kernel work (audio- and video-related patches)"), N("Danny Tholen") => N("multimedia kernel"), - N("Buchan Milne") => N("Samba 3.0 (prerelease) that co-exists with Samba 2.2.x, Samba-2.2.x, GIS software (grass, mapserver), cursor_themes collection, misc server-side contributions"), - N("Goetz Waschk") => N("many multimedia packages (xine, mplayer, vlc, vcdimager), gnome-python, rox desktop"), - N("Austin Acton") => N("audio/video/MIDI apps, scientific apps, audio/video production howtos, bluetooth, pyqt & related"), + N("Buchan Milne") => N("Samba 3.0 (prerelease) that co-exists with Samba 2.2.x"), + N("Goetz Waschk") => N("many multimedia packages (xine,totem"), + N("Austin Acton") => N("audio/video/MIDI apps"), N("Spencer Anderson") => N("ATI/gatos/DRM stuff"), N("Andrey Borzenkov") => N("supermount-ng and other kernel work"), N("Oden Eriksson") => N("most web-based packages and many security-related packages"), - N("Warly") => N("bootsplash, databases, drakwizard, various other stuffs."), -} + N("Stefan VanDer Eijk") => N("slbd distro checking"), + N("David Walser") => N("rpmsync script"), + N("Andi Payn") => N("many extra gnome applets and python modules"), + N("Tibor Pittich") => N("leader of the mdk sk-i18n team"), + N("Pascal Terjan") => N("some ruby stuff"), + N("Translators") => "", + N("Per Oyvind Karlsen") => N("Norwegian Bokmål (nb) translator and Coordinator"), + N("Tibor Pittich") => N("leader of the mdk sk-i18n team."), + N("Thomas Backlund") => N("Finnish translator and Coordinator"), + N("Reinout Van Schouwen") => N("Dutch translator and Coordinator"), + N("Testers") => "", + N("And many unnamed and unknown beta testers and bug reporters that helped make sure it all worked right. ") => "", +}
\ No newline at end of file diff --git a/control-center b/control-center index 6c950dd5..8ae4c0ea 100755 --- a/control-center +++ b/control-center @@ -981,8 +981,19 @@ sub about_mdk_cc() { $tree_model->append_set(undef, [ map_index { $::i => $_ } @$row ]); } - foreach my $line (sort(cat_(top(glob("/usr/share/doc/mandrake-release-*/CREDITS"))))) { - $credits_model->append_set(undef, map_index { $::i => $_ } map { translate(common::sprintf_fixutf8($_)) } split(', ', chomp_($line), 2)); + foreach my $line (grep { $_ ne "\n" } cat_(top(glob("/usr/share/doc/mandrake-release-*/CREDITS")))) { + if ($line =~ /^\s*\* (.*)$/) { + my ($contributor, $descr) = split(', ', $1); + chomp($descr); + $descr =~ s/(["@$])/\\$1/g; + $credits_model->append_set(undef, map_index { $::i => $_ } map { join("\n", warp_text(translate(common::sprintf_fixutf8($_)), 30)) } $contributor, $descr); + join('', qq(\tN("$contributor") => ), $descr ? qq(N("$descr"),) : '"",'); + } else { + chomp($line); + $credits_model->append_set(undef, 0 => translate(common::sprintf_fixutf8($line))); + + } + } @@ -15,12 +15,18 @@ use lib qw(/usr/lib/libDrakX); use common; { ), - (map { - my ($contributor, $descr) = split(', ', $_, 2); - chomp($descr); - $descr =~ s/(["@$])/\\$1/g; - qq(\tN("$contributor") => N("$descr"),); - } cat_(glob("/usr/share/doc/mandrake-release-*/CREDITS"))), + (map { + if (/^\s*\* (.*)$/) { + my ($contributor, $descr) = split(', ', $1); + #if (/^\s*\* (.*), (.*)/) { + chomp($descr); + $descr =~ s/(["@$])/\\$1/g; + join('', qq(\tN("$contributor") => ), $descr ? qq(N("$descr"),) : '"",'); + } else { + chomp; + qq(\tN("$_") => "",); + } + } grep { $_ ne "\n" } cat_(glob("/usr/share/doc/mandrake-release-*/CREDITS"))), "}" ) ); |