Index: gtksourceview/language-specs/ada.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/ada.lang,v
retrieving revision 1.8
diff -u -p -r1.8 ada.lang
--- gtksourceview/language-specs/ada.lang	30 Dec 2005 17:18:53 -0000	1.8
+++ gtksourceview/language-specs/ada.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Ada" version="1.0" _section="Sources" mimetypes="text/x-ada;text/x-adasrc">
+<language _name="Ada" version="1.0" _section="Sources" mimetypes="text/x-adasrc">
 	
 	<line-comment _name = "Line Comment" style= "Comment">
 		<start-regex>--</start-regex>
Index: gtksourceview/language-specs/c.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/c.lang,v
retrieving revision 1.10
diff -u -p -r1.10 c.lang
--- gtksourceview/language-specs/c.lang	19 Apr 2004 02:02:56 -0000	1.10
+++ gtksourceview/language-specs/c.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="C" version="1.0" _section="Sources" mimetypes="text/x-c;text/x-chdr;text/x-csrc">
+<language _name="C" version="1.0" _section="Sources" mimetypes="text/x-csrc;text/x-chdr">
 	
 	<escape-char>\</escape-char>
 
Index: gtksourceview/language-specs/cpp.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/cpp.lang,v
retrieving revision 1.8
diff -u -p -r1.8 cpp.lang
--- gtksourceview/language-specs/cpp.lang	7 Oct 2004 11:24:07 -0000	1.8
+++ gtksourceview/language-specs/cpp.lang	23 Aug 2006 14:18:17 -0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language _name="C++" version="1.0" _section="Sources" 
-           mimetypes="text/x-c++;text/x-cpp;text/x-c-header;text/x-c++src;text/x-c++hdr">
+           mimetypes="text/x-c++src;text/x-c++hdr">
 	
 	<escape-char>\</escape-char>
 
Index: gtksourceview/language-specs/csharp.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/csharp.lang,v
retrieving revision 1.5
diff -u -p -r1.5 csharp.lang
--- gtksourceview/language-specs/csharp.lang	3 Aug 2005 17:04:10 -0000	1.5
+++ gtksourceview/language-specs/csharp.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="C#" version="1.0" _section="Sources" mimetypes="text/x-csharpsrc;text/x-csharp">
+<language _name="C#" version="1.0" _section="Sources" mimetypes="text/x-csharp">
 	
 	<escape-char>\</escape-char>
 
Index: gtksourceview/language-specs/desktop.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/desktop.lang,v
retrieving revision 1.6
diff -u -p -r1.6 desktop.lang
--- gtksourceview/language-specs/desktop.lang	9 Apr 2006 13:53:36 -0000	1.6
+++ gtksourceview/language-specs/desktop.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name=".desktop" version="1.0" _section="Others" mimetypes="application/x-gnome-app-info;application/x-desktop">
+<language _name=".desktop" version="1.0" _section="Others" mimetypes="application/x-desktop;application/x-gnome-app-info">
 
 	<line-comment _name = "Line Comment" style= "Comment">
 		<start-regex>#</start-regex>
Index: gtksourceview/language-specs/diff.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/diff.lang,v
retrieving revision 1.4
diff -u -p -r1.4 diff.lang
--- gtksourceview/language-specs/diff.lang	26 May 2003 14:50:09 -0000	1.4
+++ gtksourceview/language-specs/diff.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Diff" version="1.0" _section="Others" mimetypes="text/x-diff;text/x-patch">
+<language _name="Diff" version="1.0" _section="Others" mimetypes="text/x-patch">
 
 	<pattern-item _name="Removed line" style="Others 3">
 	        <regex>^(&lt;|-)[^\n]*\n</regex>
Index: gtksourceview/language-specs/javascript.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/javascript.lang,v
retrieving revision 1.3
diff -u -p -r1.3 javascript.lang
--- gtksourceview/language-specs/javascript.lang	18 Oct 2005 14:52:48 -0000	1.3
+++ gtksourceview/language-specs/javascript.lang	23 Aug 2006 14:18:17 -0000
@@ -11,7 +11,7 @@
 	
 	Submitted by Scott Martin (scott@coffeeblack.org)
 -->
-<language _name="JavaScript" version="1.0" _section="Scripts" mimetypes="text/x-javascript;text/javascript;text/x-js;application/x-javascript">
+<language _name="JavaScript" version="1.0" _section="Scripts" mimetypes="application/x-javascript">
 	
 	<escape-char>\</escape-char>
 	
Index: gtksourceview/language-specs/perl.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/perl.lang,v
retrieving revision 1.10
diff -u -p -r1.10 perl.lang
--- gtksourceview/language-specs/perl.lang	17 Mar 2006 11:43:22 -0000	1.10
+++ gtksourceview/language-specs/perl.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Perl" version="1.0" _section="Scripts" mimetypes="text/x-perl;application/x-perl">
+<language _name="Perl" version="1.0" _section="Scripts" mimetypes="application/x-perl">
 	
 	<escape-char>\</escape-char>
 
Index: gtksourceview/language-specs/php.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/php.lang,v
retrieving revision 1.5
diff -u -p -r1.5 php.lang
--- gtksourceview/language-specs/php.lang	15 Mar 2006 11:19:32 -0000	1.5
+++ gtksourceview/language-specs/php.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- <!DOCTYPE language SYSTEM "language.dtd"> -->
-<language _name="PHP" version="1.0" _section="Scripts" mimetypes="text/x-php;application/x-php;text/x-php-source;application/x-php-source">
+<language _name="PHP" version="1.0" _section="Scripts" mimetypes="application/x-php">
 
 <!--  FIXME: keywords before a '(' is hightlined as a function call instead of a keyword -->
 
Index: gtksourceview/language-specs/po.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/po.lang,v
retrieving revision 1.6
diff -u -p -r1.6 po.lang
--- gtksourceview/language-specs/po.lang	19 Feb 2004 23:47:34 -0000	1.6
+++ gtksourceview/language-specs/po.lang	23 Aug 2006 14:18:17 -0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language _name="gettext translation" version="1.0" _section="Others" 
-	mimetypes="text/x-po;text/x-pot;text/x-pox;text/x-gettext-translation">
+	mimetypes="text/x-gettext-translation;text/x-gettext-translation-template">
 	
 	<escape-char>\</escape-char>
 
Index: gtksourceview/language-specs/python.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/python.lang,v
retrieving revision 1.8
diff -u -p -r1.8 python.lang
--- gtksourceview/language-specs/python.lang	11 Jan 2006 11:45:50 -0000	1.8
+++ gtksourceview/language-specs/python.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Python" version="1.0" _section="Scripts" mimetypes="text/x-python;application/x-python">
+<language _name="Python" version="1.0" _section="Scripts" mimetypes="text/x-python">
 
 	<escape-char>\</escape-char>
 
Index: gtksourceview/language-specs/ruby.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/ruby.lang,v
retrieving revision 1.4
diff -u -p -r1.4 ruby.lang
--- gtksourceview/language-specs/ruby.lang	6 Apr 2006 14:24:19 -0000	1.4
+++ gtksourceview/language-specs/ruby.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Ruby" version="1.0" _section="Scripts" mimetypes="application/x-ruby;text/x-ruby">
+<language _name="Ruby" version="1.0" _section="Scripts" mimetypes="application/x-ruby">
 
 	<escape-char>\</escape-char>
 
Index: gtksourceview/language-specs/sh.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/sh.lang,v
retrieving revision 1.2
diff -u -p -r1.2 sh.lang
--- gtksourceview/language-specs/sh.lang	7 Jan 2006 15:09:10 -0000	1.2
+++ gtksourceview/language-specs/sh.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="sh" version="1.0" _section="Scripts" mimetypes="text/x-shellscript;application/x-shellscript;text/x-sh">
+<language _name="sh" version="1.0" _section="Scripts" mimetypes="application/x-shellscript">
 <!--
 	Author:   Silian Della Ragione (silian87@gechi.it)
 	Contribs: Paolo Maggi (paolo@gnome.org)
Index: gtksourceview/language-specs/tcl.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/tcl.lang,v
retrieving revision 1.2
diff -u -p -r1.2 tcl.lang
--- gtksourceview/language-specs/tcl.lang	7 Jan 2006 15:09:10 -0000	1.2
+++ gtksourceview/language-specs/tcl.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="Tcl" version="1.0" _section="Scripts" mimetypes="text/x-tcl;application/x-tcl">
+<language _name="Tcl" version="1.0" _section="Scripts" mimetypes="text/x-tcl">
 	
 	<escape-char>\</escape-char>
 
Index: gtksourceview/language-specs/xml.lang
===================================================================
RCS file: /cvs/gnome/gtksourceview/gtksourceview/language-specs/xml.lang,v
retrieving revision 1.11
diff -u -p -r1.11 xml.lang
--- gtksourceview/language-specs/xml.lang	8 Apr 2006 13:07:30 -0000	1.11
+++ gtksourceview/language-specs/xml.lang	23 Aug 2006 14:18:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language _name="XML" version="1.0" _section="Markup" mimetypes="application/xml;text/xml;image/svg+xml;text/rdf;text/xsl">
+<language _name="XML" version="1.0" _section="Markup" mimetypes="application/xml;text/xml">
 	
 	<block-comment _name="Block Comment" style="Comment">
 		<start-regex>&lt;!--</start-regex>