Fix accidental duplication of text-x- in new mime icon strings

29 files changed, 29 insertions, 29 deletions

diff --git a/mimetypes/application/java.desktop b/mimetypes/application/java.desktop
index 71ceb6710..47ee7d916 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 f77fbd15b..25fc86e22 100644
--- a/mimetypes/application/x-awk.desktop
+++ b/mimetypes/application/x-awk.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=AWK 脚本
 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 0eb6fed46..36357be1b 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 b03a052f5..5d7e9e7b1 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 7351c4333..aa13fc9bd 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 b25d42aa5..7b6f0abbf 100644
--- a/mimetypes/application/x-perl-module.desktop
+++ b/mimetypes/application/x-perl-module.desktop
@@ -68,7 +68,7 @@ Comment[vi]=Mô-đun Perl
 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 699544056..a915bfe70 100644
--- a/mimetypes/application/x-perl.desktop
+++ b/mimetypes/application/x-perl.desktop
@@ -69,7 +69,7 @@ Comment[vi]=Chương trình Perl
 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 91a6c1372..649406079 100644
--- a/mimetypes/application/x-php.desktop
+++ b/mimetypes/application/x-php.desktop
@@ -75,7 +75,7 @@ Comment[vi]=Tập lệnh PHP
 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 1e6e6fc21..02761c1c7 100644
--- a/mimetypes/application/x-python.desktop
+++ b/mimetypes/application/x-python.desktop
@@ -83,7 +83,7 @@ Comment[zh_TW]=Python 程式
 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 6c5435fce..8b8fb5790 100644
--- a/mimetypes/application/x-ruby.desktop
+++ b/mimetypes/application/x-ruby.desktop
@@ -75,7 +75,7 @@ Comment[zh_CN]=Ruby 程序
 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 c212e1b77..28502067e 100644
--- a/mimetypes/application/x-shellscript.desktop
+++ b/mimetypes/application/x-shellscript.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Shell 脚本
 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 98c778397..2933bf415 100644
--- a/mimetypes/text/x-adasrc.desktop
+++ b/mimetypes/text/x-adasrc.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=Ada 源文件
 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 b3798025c..f0b141974 100644
--- a/mimetypes/text/x-c++hdr.desktop
+++ b/mimetypes/text/x-c++hdr.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=C++ 头文件
 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 f83d2cf81..06ca0f140 100644
--- a/mimetypes/text/x-c++src.desktop
+++ b/mimetypes/text/x-c++src.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=C++ 源文件
 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 dcbda09ef..1e15f8310 100644
--- a/mimetypes/text/x-chdr.desktop
+++ b/mimetypes/text/x-chdr.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=C 头文件
 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 d30cc060a..81691e41c 100644
--- a/mimetypes/text/x-csrc.desktop
+++ b/mimetypes/text/x-csrc.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=C 源文件
 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 af6b798ca..c582b4dc5 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 0a0233b1d..71aadb9a0 100644
--- a/mimetypes/text/x-java.desktop
+++ b/mimetypes/text/x-java.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Java 源文件
 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 8b0bb4197..a3276743d 100644
--- a/mimetypes/text/x-log.desktop
+++ b/mimetypes/text/x-log.desktop
@@ -82,7 +82,7 @@ Comment[zh_TW]=應用程式日誌檔案
 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 05fbeea79..6ae568cd9 100644
--- a/mimetypes/text/x-makefile.desktop
+++ b/mimetypes/text/x-makefile.desktop
@@ -34,7 +34,7 @@ Comment[xh]=Yenza ifayile
 Comment[zu]=Yenza ifayela
 Type=MimeType
 Patterns=GNUmakefile;Makefile;makefile;Makefile.*;makefile.*
-Icon=text-x-text-x-makefile
+Icon=text-x-makefile
 X-TDE-IsAlso=text/plain
 
 [Property::X-TDE-text]
diff --git a/mimetypes/text/x-moc.desktop b/mimetypes/text/x-moc.desktop
index a3f40d0e8..2e3d56f57 100644
--- a/mimetypes/text/x-moc.desktop
+++ b/mimetypes/text/x-moc.desktop
@@ -81,7 +81,7 @@ Comment[zh_TW]=Qt Meta 目標文件
 Comment[zu]=Ifayela Lento ye-Meta lwe-Qt
 Type=MimeType
 Patterns=*.moc;
-Icon=text-x-text-x-mocsrc
+Icon=text-x-mocsrc
 X-TDE-IsAlso=text/plain
 
 [Property::X-TDE-text]
diff --git a/mimetypes/text/x-objchdr.desktop b/mimetypes/text/x-objchdr.desktop
index 459d43e5f..5efb55809 100644
--- a/mimetypes/text/x-objchdr.desktop
+++ b/mimetypes/text/x-objchdr.desktop
@@ -66,7 +66,7 @@ Comment[vi]=Tập tin phần đầu Objective-C
 Comment[zh_CN]=Objective-C 头文件
 Comment[zh_HK]=Objective-C 標頭檔
 Comment[zh_TW]=Objective-C 標頭檔
-Icon=text-x-text-x-hsrc
+Icon=text-x-hsrc
 Type=MimeType
 MimeType=text/x-objchdr
 #Patterns=*.h;
diff --git a/mimetypes/text/x-objcsrc.desktop b/mimetypes/text/x-objcsrc.desktop
index 469d6f90d..f39028c5e 100644
--- a/mimetypes/text/x-objcsrc.desktop
+++ b/mimetypes/text/x-objcsrc.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Objective-C 源文件
 Comment[zh_HK]=Objective-C 源代碼
 Comment[zh_TW]=Objective-C 原始碼
 Comment[zu]=Ifayela lemvelaphi Lenhloso ka-C
-Icon=text-x-text-x-csrc
+Icon=text-x-csrc
 Type=MimeType
 MimeType=text/x-objcsrc
 Patterns=*.m;
diff --git a/mimetypes/text/x-pascal.desktop b/mimetypes/text/x-pascal.desktop
index 0e86d7093..f2929410b 100644
--- a/mimetypes/text/x-pascal.desktop
+++ b/mimetypes/text/x-pascal.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Pascal 源文件
 Comment[zh_HK]=Pascal 源代碼
 Comment[zh_TW]=Pascal 源碼
 Comment[zu]=Ifayela Lemvelaphi ye-Pascal
-Icon=text-x-text-x-src_p
+Icon=text-x-src_p
 Type=MimeType
 MimeType=text/x-pascal
 Patterns=*.p;*.pas;*.pp;*.dpr;*.DPR;*.PP;*.PAS;*.P
diff --git a/mimetypes/text/x-perl.desktop b/mimetypes/text/x-perl.desktop
index 479f31df3..6e04e24d3 100644
--- a/mimetypes/text/x-perl.desktop
+++ b/mimetypes/text/x-perl.desktop
@@ -69,7 +69,7 @@ Comment[vi]=Chương trình Perl
 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=text/x-perl
 Patterns=*.pl;*.PL;*.perl;*.PERL;*.Perl
diff --git a/mimetypes/text/x-python.desktop b/mimetypes/text/x-python.desktop
index 443f00535..2055bd2e2 100644
--- a/mimetypes/text/x-python.desktop
+++ b/mimetypes/text/x-python.desktop
@@ -83,7 +83,7 @@ Comment[zh_TW]=Python 程式
 Comment[zu]=Uhlelo lwamafayela lwe-Python
 Type=MimeType
 MimeType=text/x-python
-Icon=text-x-text-x-src_py
+Icon=text-x-src_py
 # alias of application/x-python
 X-TDE-IsAlso=application/x-python
 
diff --git a/mimetypes/text/x-shellscript.desktop b/mimetypes/text/x-shellscript.desktop
index 1e7914777..c93d38b71 100644
--- a/mimetypes/text/x-shellscript.desktop
+++ b/mimetypes/text/x-shellscript.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Shell 脚本
 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=text/x-shellscript
 Patterns=*.sh;*.csh
diff --git a/mimetypes/text/x-tcl.desktop b/mimetypes/text/x-tcl.desktop
index 8aaf247bb..99779a83a 100644
--- a/mimetypes/text/x-tcl.desktop
+++ b/mimetypes/text/x-tcl.desktop
@@ -85,7 +85,7 @@ Comment[zu]=Ifayela le-Tcl
 Type=MimeType
 MimeType=text/x-tcl
 Patterns=*.tcl;*.tk;
-Icon=text-x-text-x-src
+Icon=text-x-src
 X-TDE-IsAlso=text/plain
 
 [Property::X-TDE-text]
diff --git a/tdeioslave/file/file.protocol b/tdeioslave/file/file.protocol
index 0b8a1769b..a60a713a8 100644
--- a/tdeioslave/file/file.protocol
+++ b/tdeioslave/file/file.protocol
@@ -13,4 +13,4 @@ moving=true
 maxInstances=4
 DocPath=tdeioslave/file/index.html
 Class=:local
-Icon=text-x-text-x-generic-new
+Icon=text-x-generic-new