? brian-patch.diff
? intltool-0.27.2
? intltool-gok-kbd-patch.diff
? intltool-kbd-patch.diff
? intltool-patch-latest.diff
? patch.diff
Index: intltool-merge.in.in
===================================================================
RCS file: /cvs/gnome/intltool/intltool-merge.in.in,v
retrieving revision 1.73
diff -u -r1.73 intltool-merge.in.in
--- intltool-merge.in.in	10 Nov 2003 21:56:23 -0000	1.73
+++ intltool-merge.in.in	11 Nov 2003 01:57:21 -0000
@@ -606,7 +606,7 @@
     my $fh        = shift;
     my $ref       = shift;
     my $depth     = shift || 0;
-    my $language  = shift;
+    my $language  = shift || "";
     my $indent    = 3;
     my $not_cdata = 0;
 
@@ -688,7 +688,7 @@
 
                     if ($MULTIPLE_OUTPUT && $lang ne "$language") {
                         next;
-                    }
+		    }
 
                     print $fh " " x ($depth * $indent), "<", $current_tag, " xml:lang=\"", $lang, "\"";
                     $must_end_tag = $depth;
@@ -855,23 +855,24 @@
 {
     my $source;
 
-	if ($MULTIPLE_OUTPUT) {
+    if ($MULTIPLE_OUTPUT) {
         for my $lang (sort keys %po_files_by_lang) {
-            open OUTPUT, ">$OUTFILE-$lang" or die "Cannot open $OUTFILE-$lang: $!\n";
+	    mkdir $lang;
+            open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
         	my $tree = readXml($FILE);
             print OUTPUT qq{<?xml version="1.0" encoding="UTF-8"?>\n};
         	parseTree(\*OUTPUT, $tree, 0, $lang);
             close OUTPUT;
-            print "CREATED $OUTFILE-$lang\n";
+            print "CREATED $lang/$OUTFILE\n";
         }
-    } else {
-        open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-    	my $tree = readXml($FILE);
-        print OUTPUT qq{<?xml version="1.0" encoding="UTF-8"?>\n};
-    	parseTree(\*OUTPUT, $tree, 0);
-        close OUTPUT;
-        print "CREATED $OUTFILE\n";
-    }
+    } 
+    open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+    my $tree = readXml($FILE);
+    print OUTPUT qq{<?xml version="1.0" encoding="UTF-8"?>\n};
+    my $lang = 0;
+    parseTree(\*OUTPUT, $tree, 0);
+    close OUTPUT;
+    print "CREATED $OUTFILE\n";
 }
 
 sub keys_merge_translations
Index: intltool.m4
===================================================================
RCS file: /cvs/gnome/intltool/intltool.m4,v
retrieving revision 1.57
diff -u -r1.57 intltool.m4
--- intltool.m4	10 Nov 2003 18:12:59 -0000	1.57
+++ intltool.m4	11 Nov 2003 01:57:21 -0000
@@ -56,7 +56,7 @@
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -m -c $(top_builddir)/po/.intltool-merge-cache'
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache'
     INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
