3 files changed, 22 insertions, 3 deletions
diff --git a/po/Makefile b/po/Makefile
index b8c3d974..1076b152 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -20,7 +20,8 @@ all: $(MOFILES)
 
 %.mo: %.po
 	if [ -z "`echo $(IGNOREPOMS) | grep $<`" ]; then cat $< "$<"m >> "$<"f; else cp $< "$<"f; fi
-	msgfmt -o $@ "$<"f
+	./clean_po.pl "$<"f > "$<"g
+	msgfmt -o $@ "$<"g
 
 merge: $(PGOAL).pot
 	@for n in $(POFILES); do \
@@ -46,5 +47,5 @@ install:
 	done
 
 clean:
-	@rm -rf *.mo *.pof $(POFILES:%=%t) $(PL_CFILES) $(PGOAL).pot desktopstuff.pot rpmdrake_tmp.pot
+	@rm -rf *.mo *.pof *.pog $(POFILES:%=%t) $(PL_CFILES) $(PGOAL).pot desktopstuff.pot rpmdrake_tmp.pot
 
diff --git a/po/clean_po.pl b/po/clean_po.pl
new file mode 100755
index 00000000..7022dc74
--- /dev/null
+++ b/po/clean_po.pl
@@ -0,0 +1,17 @@
+#!/usr/bin/perl
+
+# we remove old translations (#~ stuff) because some id's may be shared
+# with what's extracted from the compss, and in such case msgfmt will
+# not put the translations in the mo :(
+
+use MDK::Common;
+
+my $line_number = 0;
+my @contents = cat_($ARGV[0]);
+
+foreach (@contents) {
+      $line_number++;
+      /^#, fuzzy/ && $contents[$line_number+1] =~ /^#~/ and next;
+      /^#~/ and next;
+      print;
+}
diff --git a/po/get_from_compssusers.pl b/po/get_from_compssusers.pl
index 35bfa041..ea350a41 100755
--- a/po/get_from_compssusers.pl
+++ b/po/get_from_compssusers.pl
@@ -2,12 +2,13 @@
 
 use MDK::Common;
 
-@miss = qw(Development Server);
+@miss = (qw(Development Server Workstation), 'Graphical Environment');
 
 foreach my $line (cat_("../../../gi/perl-install/share/po/$ARGV[0]")) {
     $line =~ m|^\Q#: ../../share/compssUsers:999| || ($line =~ m|^msgid "([^"]+)"| && grep { $_ eq $1 } @miss) and do {
 	$current = 'inside';
 	print "# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO\n";
+        $line =~ m|^#:| or print "#: ../../share/compssUsers:999\n";
     };
     $current eq 'inside' and print $line;
     $line =~ m|^$| and do {