split translation of groups to ease i18n job

2 files changed, 71 insertions, 72 deletions

diff --git a/rpmdrake b/rpmdrake
index 52b7f2af..23d89e06 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -78,97 +78,95 @@ You will not be able to perform modifications on the system,
 but you may still browse the existing database."), yesno => 1, text => { yes => N("Ok"), no => N("Cancel") }) or myexit(0));
 
 
-#- /usr/share/rpmlint/TagsCheck.py
+#- /usr/share/rpmlint/TagsCheck.py (duplicates are normal, so that we are not too far away from .py)
 my @valid_groups = (
                     N_("Accessibility"),
-                    N_("System/Servers"),
-                    N_("System/Kernel and hardware"),
-                    N_("System/Libraries"),
-                    N_("System/XFree86"),
-                    N_("System/Fonts/Console"),
-                    N_("System/Fonts/True type"),
-                    N_("System/Fonts/Type1"),
-                    N_("System/Fonts/X11 bitmap"),
-                    N_("System/Base"),
-                    N_("System/Configuration/Hardware"),
-                    N_("System/Configuration/Packaging"),
-                    N_("System/Configuration/Networking"),
-                    N_("System/Configuration/Printing"),
-                    N_("System/Configuration/Boot and Init"),
-                    N_("System/Configuration/Other"),
-                    N_("System/Internationalization"),
-                    N_("Development/Kernel"),
-                    N_("Development/Databases"),
-                    N_("Development/Perl"),
-                    N_("Development/Python"),
-                    N_("Development/C"),
-                    N_("Development/C++"),
-                    N_("Development/Java"),
-                    N_("Development/GNOME and GTK+"),
-                    N_("Development/KDE and Qt"),
-                    N_("Development/Other"),
-                    N_("Sciences/Astronomy"),
-                    N_("Sciences/Biology"),
-                    N_("Sciences/Chemistry"),
-                    N_("Sciences/Computer science"),
-                    N_("Sciences/Geosciences"),
-                    N_("Sciences/Mathematics"),
-                    N_("Sciences/Physics"),
-                    N_("Sciences/Other"),
+                    N_("System"), N_("Servers"),
+                    N_("System"), N_("Kernel and hardware"),
+                    N_("System"), N_("Libraries"),
+                    N_("System"), N_("XFree86"),
+                    N_("System"), N_("Fonts"), N_("Console"),
+                    N_("System"), N_("Fonts"), N_("True type"),
+                    N_("System"), N_("Fonts"), N_("Type1"),
+                    N_("System"), N_("Fonts"), N_("X11 bitmap"),
+                    N_("System"), N_("Base"),
+                    N_("System"), N_("Configuration"), N_("Hardware"),
+                    N_("System"), N_("Configuration"), N_("Packaging"),
+                    N_("System"), N_("Configuration"), N_("Networking"),
+                    N_("System"), N_("Configuration"), N_("Printing"),
+                    N_("System"), N_("Configuration"), N_("Boot and Init"),
+                    N_("System"), N_("Configuration"), N_("Other"),
+                    N_("System"), N_("Internationalization"),
+                    N_("Development"), N_("Kernel"),
+                    N_("Development"), N_("Databases"),
+                    N_("Development"), N_("Perl"),
+                    N_("Development"), N_("Python"),
+                    N_("Development"), N_("C"),
+                    N_("Development"), N_("C++"),
+                    N_("Development"), N_("Java"),
+                    N_("Development"), N_("GNOME and GTK+"),
+                    N_("Development"), N_("KDE and Qt"),
+                    N_("Development"), N_("Other"),
+                    N_("Sciences"), N_("Astronomy"),
+                    N_("Sciences"), N_("Biology"),
+                    N_("Sciences"), N_("Chemistry"),
+                    N_("Sciences"), N_("Computer science"),
+                    N_("Sciences"), N_("Geosciences"),
+                    N_("Sciences"), N_("Mathematics"),
+                    N_("Sciences"), N_("Physics"),
+                    N_("Sciences"), N_("Other"),
                     N_("Communications"),
                     N_("Databases"),
                     N_("Editors"),
                     N_("Emulators"),
-                    N_("Games/Adventure"),
-                    N_("Games/Arcade"),
-                    N_("Games/Boards"),
-                    N_("Games/Cards"),
-                    N_("Games/Puzzles"),
-                    N_("Games/Sports"),
-                    N_("Games/Strategy"),
-                    N_("Games/Other"),
+                    N_("Games"), N_("Adventure"),
+                    N_("Games"), N_("Arcade"),
+                    N_("Games"), N_("Boards"),
+                    N_("Games"), N_("Cards"),
+                    N_("Games"), N_("Puzzles"),
+                    N_("Games"), N_("Sports"),
+                    N_("Games"), N_("Strategy"),
+                    N_("Games"), N_("Other"),
                     N_("Toys"),
-                    N_("Archiving/Compression"),
-                    N_("Archiving/Cd burning"),
-                    N_("Archiving/Backup"),
-                    N_("Archiving/Other"),
+                    N_("Archiving"), N_("Compression"),
+                    N_("Archiving"), N_("Cd burning"),
+                    N_("Archiving"), N_("Backup"),
+                    N_("Archiving"), N_("Other"),
                     N_("Monitoring"),
                     N_("Sound"),
                     N_("Graphics"),
                     N_("Video"),
-                    N_("Networking/File transfer"),
-                    N_("Networking/IRC"),
-                    N_("Networking/Instant messaging"),
-                    N_("Networking/Chat"),
-                    N_("Networking/News"),
-                    N_("Networking/Mail"),
-                    N_("Networking/WWW"),
-                    N_("Networking/Remote access"),
-                    N_("Networking/Other"),
+                    N_("Networking"), N_("File transfer"),
+                    N_("Networking"), N_("IRC"),
+                    N_("Networking"), N_("Instant messaging"),
+                    N_("Networking"), N_("Chat"),
+                    N_("Networking"), N_("News"),
+                    N_("Networking"), N_("Mail"),
+                    N_("Networking"), N_("WWW"),
+                    N_("Networking"), N_("Remote access"),
+                    N_("Networking"), N_("Other"),
                     N_("Office"),
                     N_("Publishing"),
                     N_("Terminals"),
                     N_("Shells"),
                     N_("File tools"),
                     N_("Text tools"),
-                    N_("Graphical desktop/GNOME"),
-                    N_("Graphical desktop/Icewm"),
-                    N_("Graphical desktop/FVWM based"),
-                    N_("Graphical desktop/KDE"),
-                    N_("Graphical desktop/Sawfish"),
-                    N_("Graphical desktop/WindowMaker"),
-                    N_("Graphical desktop/Enlightenment"),
-                    N_("Graphical desktop/Other"),
-                    N_("Books/Howtos"),
-                    N_("Books/Faqs"),
-                    N_("Books/Computer books"),
-                    N_("Books/Litterature"),
-                    N_("Books/Other"));
+                    N_("Graphical desktop"), N_("GNOME"),
+                    N_("Graphical desktop"), N_("Icewm"),
+                    N_("Graphical desktop"), N_("FVWM based"),
+                    N_("Graphical desktop"), N_("KDE"),
+                    N_("Graphical desktop"), N_("Sawfish"),
+                    N_("Graphical desktop"), N_("WindowMaker"),
+                    N_("Graphical desktop"), N_("Enlightenment"),
+                    N_("Graphical desktop"), N_("Other"),
+                    N_("Books"), N_("Howtos"),
+                    N_("Books"), N_("Faqs"),
+                    N_("Books"), N_("Computer books"),
+                    N_("Books"), N_("Litterature"),
+                    N_("Books"), N_("Other"));
 
 sub ctreefy {
-    my $grp = translate($_[0]);
-    $grp =~ s,/,|,g;
-    $grp
+    join('|', map { translate($_) } split m|/|, $_[0]);
 }
 
 sub beautify_description {
diff --git a/rpmdrake.spec b/rpmdrake.spec
index fe198916..6ff47b04 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -105,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
   packages, and for needing to remove some
 - fix sorting of translated stuff in the treeview (will need
   drakxtools > 9.2-0.7mdk to work properly though)
+- split translation of groups to ease i18n job
 
 * Fri Jun  6 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-23mdk
 - rpmdrake: at install time, when some local files are impossible