Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/intltool/ChangeLog,v
retrieving revision 1.347
diff -u -r1.347 ChangeLog
--- ChangeLog	6 Dec 2003 13:22:57 -0000	1.347
+++ ChangeLog	7 Dec 2003 11:26:48 -0000
@@ -1,3 +1,8 @@
+2003-12-07  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* intltoolize-merge.in.in: Don't strip square bracketed strings
+	inside default elements for GConf schema files.
+
 2003-12-06  Malcolm Tredinnick <malcolm@commsecure.com.au>
 
 	* intltoolize.in: Install OrigTree.pm in the distribution tree.
Index: intltool-merge.in.in
===================================================================
RCS file: /cvs/gnome/intltool/intltool-merge.in.in,v
retrieving revision 1.82
diff -u -r1.82 intltool-merge.in.in
--- intltool-merge.in.in	6 Dec 2003 13:22:58 -0000	1.82
+++ intltool-merge.in.in	7 Dec 2003 11:26:51 -0000
@@ -1003,8 +1003,6 @@
 	my $short_string = $9 ? $9 : '';
 	my $long_string = $12 ? $12 : '';
 
-	$c_default_block =~ s/default>\[.*?\]/default>/s;
-        
 	print OUTPUT "$locale_start_spaces$c_default_block";
 
         $default_string =~ s/\s+/ /g;
Index: tests/cases/schemasmerge1.po
===================================================================
RCS file: /cvs/gnome/intltool/tests/cases/schemasmerge1.po,v
retrieving revision 1.1
diff -u -r1.1 schemasmerge1.po
--- tests/cases/schemasmerge1.po	3 Oct 2002 14:15:16 -0000	1.1
+++ tests/cases/schemasmerge1.po	7 Dec 2003 11:26:51 -0000
@@ -17,9 +17,7 @@
 msgstr ""
 
 #: extract11.schemas.in.h:2
-msgid ""
-"[default value for /schemas/apps/clock_applet/prefs/hour_format The "
-"translation should only include the localized default eg. 12 or 24 ]24"
+msgid "24"
 msgstr "12"
 
 #: extract11.schemas.in.h:3
Index: tests/cases/schemasmerge2.po
===================================================================
RCS file: /cvs/gnome/intltool/tests/cases/schemasmerge2.po,v
retrieving revision 1.1
diff -u -r1.1 schemasmerge2.po
--- tests/cases/schemasmerge2.po	3 Oct 2002 14:15:16 -0000	1.1
+++ tests/cases/schemasmerge2.po	7 Dec 2003 11:26:51 -0000
@@ -17,9 +17,7 @@
 msgstr "24"
 
 #: extract11.schemas.in.h:2
-msgid ""
-"[default value for /schemas/apps/clock_applet/prefs/hour_format The "
-"translation should only include the localized default eg. 12 or 24 ]24"
+msgid "24"
 msgstr ""
 
 #: extract11.schemas.in.h:3
Index: tests/cases/test.schemas.in
===================================================================
RCS file: /cvs/gnome/intltool/tests/cases/test.schemas.in,v
retrieving revision 1.2
diff -u -r1.2 test.schemas.in
--- tests/cases/test.schemas.in	16 Oct 2002 14:13:46 -0000	1.2
+++ tests/cases/test.schemas.in	7 Dec 2003 11:26:51 -0000
@@ -7,9 +7,7 @@
         <owner>clock-applet</owner>
         <type>int</type>
         <locale name="C">
-          <default>[default value for /schemas/apps/clock_applet/prefs/hour_format  
-                    The translation should only include the localized default
-                    eg. 12 or 24 ]24</default>
+          <default>24</default>
           <short>Hour format</short>
           <long>Sets the hour format, may be either 12 or 24</long>
         </locale>
Index: tests/results/test.schemas.in.h
===================================================================
RCS file: /cvs/gnome/intltool/tests/results/test.schemas.in.h,v
retrieving revision 1.2
diff -u -r1.2 test.schemas.in.h
--- tests/results/test.schemas.in.h	3 Oct 2002 14:21:31 -0000	1.2
+++ tests/results/test.schemas.in.h	7 Dec 2003 11:26:51 -0000
@@ -1,7 +1,7 @@
 char *s = N_("12");
+char *s = N_("24");
 char *s = N_("Display seconds in time");
 char *s = N_("Hour format");
 char *s = N_("Puh long.");
 char *s = N_("Sets the hour format, may be either 12 or 24");
 char *s = N_("Something random..even has >");
-char *s = N_("[default value for /schemas/apps/clock_applet/prefs/hour_format The translation should only include the localized default eg. 12 or 24 ]24");
