Branch: master

3e14e7dd 2014-10-24 13:56:43 Timothy Pearson
Fix accidental duplication of text-x- in new mime icon strings
M buildtools/autotools/kdevautoproject.desktop
M buildtools/autotools/kdevtdeautoproject.desktop
M languages/cpp/kdevcppsupport.desktop
M languages/cpp/kdevcsupport.desktop
M mimetypes/x-fortran.desktop
M parts/scripting/kdevscripting.desktop
diff --git a/buildtools/autotools/kdevautoproject.desktop b/buildtools/autotools/kdevautoproject.desktop
index dde9db4..35277c2 100644
--- a/buildtools/autotools/kdevautoproject.desktop
+++ b/buildtools/autotools/kdevautoproject.desktop
@@ -91,7 +91,7 @@
 GenericName[zh_CN]=Automake ������
 GenericName[zh_TW]=Automake ������
 X-TDE-ServiceTypes=TDevelop/Project
-Icon=text-x-text-x-makefile
+Icon=text-x-makefile
 X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/autotools/kdevtdeautoproject.desktop b/buildtools/autotools/kdevtdeautoproject.desktop
index 128eb21..e950772 100644
--- a/buildtools/autotools/kdevtdeautoproject.desktop
+++ b/buildtools/autotools/kdevtdeautoproject.desktop
@@ -86,7 +86,7 @@
 GenericName[zh_CN]=TDE Automake ������
 GenericName[zh_TW]=TDE Automake ������
 X-TDE-ServiceTypes=TDevelop/Project
-Icon=text-x-text-x-makefile
+Icon=text-x-makefile
 X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=kde
diff --git a/languages/cpp/kdevcppsupport.desktop b/languages/cpp/kdevcppsupport.desktop
index cf6b0a8..405990c 100644
--- a/languages/cpp/kdevcppsupport.desktop
+++ b/languages/cpp/kdevcppsupport.desktop
@@ -79,7 +79,7 @@
 GenericName[zh_CN]=C++ ������
 GenericName[zh_TW]=C++ ������
 X-TDE-ServiceTypes=TDevelop/LanguageSupport
-Icon=text-x-text-x-csrcpp
+Icon=text-x-csrcpp
 X-TDE-Library=libkdevcppsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=C++
diff --git a/languages/cpp/kdevcsupport.desktop b/languages/cpp/kdevcsupport.desktop
index e3c042c..30079af 100644
--- a/languages/cpp/kdevcsupport.desktop
+++ b/languages/cpp/kdevcsupport.desktop
@@ -78,7 +78,7 @@
 GenericName[zh_CN]=C ������
 GenericName[zh_TW]=C ������
 X-TDE-ServiceTypes=TDevelop/LanguageSupport
-Icon=text-x-text-x-csrcpp
+Icon=text-x-csrcpp
 X-TDE-Library=libkdevcppsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=C
diff --git a/mimetypes/x-fortran.desktop b/mimetypes/x-fortran.desktop
index 241c501..800cf1c 100644
--- a/mimetypes/x-fortran.desktop
+++ b/mimetypes/x-fortran.desktop
@@ -36,7 +36,7 @@
 Comment[zh_CN]=Fortran ���������
 Comment[zh_TW]=Fortran ���������������
 Hidden=false
-Icon=text-x-text-x-fortran
+Icon=text-x-fortran
 MimeType=text/x-fortran
 Patterns=*.f;*.F;*.f77;*.f90;*.f95;*.for;*.ftn;*.fpp
 Type=MimeType
diff --git a/parts/scripting/kdevscripting.desktop b/parts/scripting/kdevscripting.desktop
index ef5b56e..49b3324 100644
--- a/parts/scripting/kdevscripting.desktop
+++ b/parts/scripting/kdevscripting.desktop
@@ -61,7 +61,7 @@
 Comment[tr]=Betik Yazma eklentisi TDevelop uygulamas��na KScript tabanl�� betik yazmay�� sunar.
 Comment[zh_CN]=������������������ TDevelop ������������������������ KScript ������������
 Comment[zh_TW]=������������������������ TDevelop ������������������ KScript ������������������������
-Icon=text-x-text-x-script
+Icon=text-x-script
 X-TDE-ServiceTypes=TDevelop/Plugin
 
 X-TDevelop-Plugin-Version=1