Branch: master

38dffa9c 2014-10-24 13:56:42 Timothy Pearson
Fix accidental duplication of text-x- in new mime icon strings
M mimetypes/application/java.desktop
M mimetypes/application/x-awk.desktop
M mimetypes/application/x-jar.desktop
M mimetypes/application/x-java.desktop
M mimetypes/application/x-mswrite.desktop
M mimetypes/application/x-perl-module.desktop
M mimetypes/application/x-perl.desktop
M mimetypes/application/x-php.desktop
M mimetypes/application/x-python.desktop
M mimetypes/application/x-ruby.desktop
M mimetypes/application/x-shellscript.desktop
M mimetypes/text/x-adasrc.desktop
M mimetypes/text/x-c++hdr.desktop
M mimetypes/text/x-c++src.desktop
M mimetypes/text/x-chdr.desktop
M mimetypes/text/x-csrc.desktop
M mimetypes/text/x-hex.desktop
M mimetypes/text/x-java.desktop
M mimetypes/text/x-log.desktop
M mimetypes/text/x-makefile.desktop
M mimetypes/text/x-moc.desktop
M mimetypes/text/x-objchdr.desktop
M mimetypes/text/x-objcsrc.desktop
M mimetypes/text/x-pascal.desktop
M mimetypes/text/x-perl.desktop
M mimetypes/text/x-python.desktop
M mimetypes/text/x-shellscript.desktop
M mimetypes/text/x-tcl.desktop
M tdeioslave/file/file.protocol
diff --git a/mimetypes/application/java.desktop b/mimetypes/application/java.desktop
index 71ceb67..47ee7d9 100644
--- a/mimetypes/application/java.desktop
+++ b/mimetypes/application/java.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/java
-Icon=text-x-text-x-java
+Icon=text-x-java
 Comment=Java Class
 Comment[af]=Java Klas
 Comment[az]=Java Sinifi
diff --git a/mimetypes/application/x-awk.desktop b/mimetypes/application/x-awk.desktop
index f77fbd1..25fc86e 100644
--- a/mimetypes/application/x-awk.desktop
+++ b/mimetypes/application/x-awk.desktop
@@ -82,7 +82,7 @@
 Comment[zh_HK]=AWK ������
 Comment[zh_TW]=AWK ������
 Comment[zu]=Isikripti se-AWK
-Icon=text-x-text-x-script
+Icon=text-x-script
 Type=MimeType
 MimeType=application/x-awk
 Patterns=
diff --git a/mimetypes/application/x-jar.desktop b/mimetypes/application/x-jar.desktop
index 0eb6fed..36357be 100644
--- a/mimetypes/application/x-jar.desktop
+++ b/mimetypes/application/x-jar.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/x-jar
-Icon=text-x-text-x-java
+Icon=text-x-java
 Patterns=*.jar;
 Comment=Java Archive
 Comment[af]=Java Argief
diff --git a/mimetypes/application/x-java.desktop b/mimetypes/application/x-java.desktop
index b03a052..5d7e9e7 100644
--- a/mimetypes/application/x-java.desktop
+++ b/mimetypes/application/x-java.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/x-java
-Icon=text-x-text-x-java
+Icon=text-x-java
 Patterns=*.class;
 Comment=Java Class
 Comment[af]=Java Klas
diff --git a/mimetypes/application/x-mswrite.desktop b/mimetypes/application/x-mswrite.desktop
index 7351c43..aa13fc9 100644
--- a/mimetypes/application/x-mswrite.desktop
+++ b/mimetypes/application/x-mswrite.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=text-x-text-x-generic
+Icon=text-x-generic
 Type=MimeType
 MimeType=application/x-mswrite
 Patterns=
diff --git a/mimetypes/application/x-perl-module.desktop b/mimetypes/application/x-perl-module.desktop
index b25d42a..7b6f0ab 100644
--- a/mimetypes/application/x-perl-module.desktop
+++ b/mimetypes/application/x-perl-module.desktop
@@ -68,7 +68,7 @@
 Comment[zh_CN]=Perl ������
 Comment[zh_HK]=Perl ������
 Comment[zh_TW]=Perl ������
-Icon=text-x-text-x-perl
+Icon=text-x-perl
 Type=MimeType
 MimeType=application/x-perl-module
 Patterns=*.pm;*.PM;
diff --git a/mimetypes/application/x-perl.desktop b/mimetypes/application/x-perl.desktop
index 6995440..a915bfe 100644
--- a/mimetypes/application/x-perl.desktop
+++ b/mimetypes/application/x-perl.desktop
@@ -69,7 +69,7 @@
 Comment[zh_CN]=Perl ������
 Comment[zh_HK]=Perl ������
 Comment[zh_TW]=PERL ������
-Icon=text-x-text-x-perl
+Icon=text-x-perl
 Type=MimeType
 MimeType=application/x-perl
 Patterns=*.pl;*.PL;*.perl;*.PERL;*.Perl
diff --git a/mimetypes/application/x-php.desktop b/mimetypes/application/x-php.desktop
index 91a6c13..6494060 100644
--- a/mimetypes/application/x-php.desktop
+++ b/mimetypes/application/x-php.desktop
@@ -75,7 +75,7 @@
 Comment[wa]=Sicripe PHP
 Comment[zh_CN]=PHP ������
 
-Icon=text-x-text-x-php
+Icon=text-x-php
 Type=MimeType
 MimeType=application/x-php
 Patterns=*.php;*.PHP;*.php3;*.PHP3;*.php4;*.PHP4
diff --git a/mimetypes/application/x-python.desktop b/mimetypes/application/x-python.desktop
index 1e6e6fc..02761c1 100644
--- a/mimetypes/application/x-python.desktop
+++ b/mimetypes/application/x-python.desktop
@@ -83,7 +83,7 @@
 Comment[zu]=Uhlelo lwamafayela lwe-Python
 Type=MimeType
 MimeType=application/x-python
-Icon=text-x-text-x-src_py
+Icon=text-x-src_py
 Patterns=*.py;
 X-TDE-IsAlso=application/x-executable-script
 
diff --git a/mimetypes/application/x-ruby.desktop b/mimetypes/application/x-ruby.desktop
index 6c5435f..8b8fb57 100644
--- a/mimetypes/application/x-ruby.desktop
+++ b/mimetypes/application/x-ruby.desktop
@@ -75,7 +75,7 @@
 Comment[zh_HK]=Ruby ������
 Comment[zh_TW]=Ruby ������
 # A source_rb icon is missing...
-Icon=text-x-text-x-src
+Icon=text-x-src
 Type=MimeType
 MimeType=application/x-ruby
 Patterns=*.rb;*.RB;*.ruby;*.RUBY
diff --git a/mimetypes/application/x-shellscript.desktop b/mimetypes/application/x-shellscript.desktop
index c212e1b..2850206 100644
--- a/mimetypes/application/x-shellscript.desktop
+++ b/mimetypes/application/x-shellscript.desktop
@@ -80,7 +80,7 @@
 Comment[zh_HK]=Shell ������
 Comment[zh_TW]=Shell ������
 Comment[zu]=Isikripti Segobolondo
-Icon=text-x-text-x-script
+Icon=text-x-script
 Type=MimeType
 MimeType=application/x-shellscript
 Patterns=*.sh;*.csh
diff --git a/mimetypes/text/x-adasrc.desktop b/mimetypes/text/x-adasrc.desktop
index 98c7783..2933bf4 100644
--- a/mimetypes/text/x-adasrc.desktop
+++ b/mimetypes/text/x-adasrc.desktop
@@ -82,7 +82,7 @@
 Comment[zh_HK]=Ada ���������
 Comment[zh_TW]=Ada ���������
 Comment[zu]=Ifayela Lemvelaphi le-Ada
-Icon=text-x-text-x-csrcpp
+Icon=text-x-csrcpp
 Type=MimeType
 MimeType=text/x-adasrc
 Patterns=*.adb;*.ads;
diff --git a/mimetypes/text/x-c++hdr.desktop b/mimetypes/text/x-c++hdr.desktop
index b379802..f0b1419 100644
--- a/mimetypes/text/x-c++hdr.desktop
+++ b/mimetypes/text/x-c++hdr.desktop
@@ -81,7 +81,7 @@
 Comment[zh_HK]=C++ ���������
 Comment[zh_TW]=C++ ���������
 Comment[zu]=Ifayela Lenhloko le-C++
-Icon=text-x-text-x-hsrc
+Icon=text-x-hsrc
 Type=MimeType
 MimeType=text/x-c++hdr
 Patterns=*.hh;*.hpp;*.H;
diff --git a/mimetypes/text/x-c++src.desktop b/mimetypes/text/x-c++src.desktop
index f83d2cf..06ca0f1 100644
--- a/mimetypes/text/x-c++src.desktop
+++ b/mimetypes/text/x-c++src.desktop
@@ -81,7 +81,7 @@
 Comment[zh_HK]=C++ ���������
 Comment[zh_TW]=C++ ���������
 Comment[zu]=Ifayela Lemvelaphi le-C++
-Icon=text-x-text-x-csrcpp
+Icon=text-x-csrcpp
 Type=MimeType
 MimeType=text/x-c++src
 Patterns=*.cpp;*.cxx;*.cc;*.C;*.CPP;
diff --git a/mimetypes/text/x-chdr.desktop b/mimetypes/text/x-chdr.desktop
index dcbda09..1e15f83 100644
--- a/mimetypes/text/x-chdr.desktop
+++ b/mimetypes/text/x-chdr.desktop
@@ -81,7 +81,7 @@
 Comment[zh_HK]=C ���������
 Comment[zh_TW]=C ���������
 Comment[zu]=Ifayela Lenhloko le-C
-Icon=text-x-text-x-hsrc
+Icon=text-x-hsrc
 Type=MimeType
 MimeType=text/x-chdr
 Patterns=*.h;
diff --git a/mimetypes/text/x-csrc.desktop b/mimetypes/text/x-csrc.desktop
index d30cc06..81691e4 100644
--- a/mimetypes/text/x-csrc.desktop
+++ b/mimetypes/text/x-csrc.desktop
@@ -81,7 +81,7 @@
 Comment[zh_HK]=C ���������
 Comment[zh_TW]=C ������������
 Comment[zu]=Ifayela Lemvelaphi le-C
-Icon=text-x-text-x-csrc
+Icon=text-x-csrc
 Type=MimeType
 MimeType=text/x-csrc
 Patterns=*.c;
diff --git a/mimetypes/text/x-hex.desktop b/mimetypes/text/x-hex.desktop
index af6b798..c582b4d 100644
--- a/mimetypes/text/x-hex.desktop
+++ b/mimetypes/text/x-hex.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=text-x-text-x-src
+Icon=text-x-src
 Type=MimeType
 MimeType=text/x-hex
 X-TDE-IsAlso=text/plain
diff --git a/mimetypes/text/x-java.desktop b/mimetypes/text/x-java.desktop
index 0a0233b..71aadb9 100644
--- a/mimetypes/text/x-java.desktop
+++ b/mimetypes/text/x-java.desktop
@@ -80,7 +80,7 @@
 Comment[zh_HK]=Java ���������
 Comment[zh_TW]=Java ������������
 Comment[zu]=Ifayela Lemvelaphi ye-Java
-Icon=text-x-text-x-java
+Icon=text-x-java
 Type=MimeType
 MimeType=text/x-java
 Patterns=*.java;
diff --git a/mimetypes/text/x-log.desktop b/mimetypes/text/x-log.desktop
index 8b0bb41..a327674 100644
--- a/mimetypes/text/x-log.desktop
+++ b/mimetypes/text/x-log.desktop
@@ -82,7 +82,7 @@
 Comment[zu]=Ifayela Lokungena Lomyaleli
 Type=MimeType
 Patterns=*.log;
-Icon=text-x-text-x-log
+Icon=text-x-log
 X-TDE-IsAlso=text/plain
 
 [Property::X-TDE-text]
diff --git a/mimetypes/text/x-makefile.desktop b/mimetypes/text/x-makefile.desktop
index 05fbeea..6ae568c 100644
--- a/mimetypes/text/x-makefile.desktop
+++ b/mimetypes/text/x-makefile.desktop
@@ -34,7 +34,7 @@
 Comment[zu]=Yenza ifayela
 Type=MimeType
 ** Diff limit reached (max: 250 lines) **