From 40b9ce1e1bab65959881f33e2db09be53b6de172 Mon Sep 17 00:00:00 2001
From: Pradeepto Bhattacharya <pradeepto@kde.org>
Date: Fri, 4 Jul 2008 05:44:46 +0000
Subject: [PATCH] SVN_SILENT Merged revisions 826182-826266,826268-826312 via
 svnmerge from
 svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim

........
  r826182 | anagl | 2008-06-30 04:23:02 +0530 (Mon, 30 Jun 2008) | 3 lines

  Desktop validation fixes: remove deprecated entries for Encoding.
........
  r826312 | winterz | 2008-06-30 17:37:35 +0530 (Mon, 30 Jun 2008) | 4 lines

  backport SVN commit 825608 by winterz:

  Fix (hopefully, because I have no way to test) all-day events imported from OpenGroupware
........

svn path=/branches/kdepim/enterprise/kdepim/; revision=827904
---
 KMail.desktop                   | 1 -
 application_octetstream.desktop | 1 -
 dcopimap.desktop                | 1 -
 dcopmail.desktop                | 1 -
 kmail_config_accounts.desktop   | 1 -
 kmail_config_appearance.desktop | 1 -
 kmail_config_composer.desktop   | 1 -
 kmail_config_identity.desktop   | 1 -
 kmail_config_misc.desktop       | 1 -
 kmail_config_security.desktop   | 1 -
 kmail_view.desktop              | 1 -
 11 files changed, 11 deletions(-)

diff --git a/KMail.desktop b/KMail.desktop
index 61b793713..556c94098 100644
--- a/KMail.desktop
+++ b/KMail.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KMail
 Name[eo]=Retpoŝto
 Name[hi]=के-मेल
diff --git a/application_octetstream.desktop b/application_octetstream.desktop
index 21578ae04..ec2bbf1ec 100644
--- a/application_octetstream.desktop
+++ b/application_octetstream.desktop
@@ -1,5 +1,4 @@
 [Misc]
-Encoding=UTF-8
 Name=Application Octetstream
 Name[af]=Application/Octet-stream
 Name[ca]=Aplicació Octetstream
diff --git a/dcopimap.desktop b/dcopimap.desktop
index 267dc44e0..0e6afdeba 100644
--- a/dcopimap.desktop
+++ b/dcopimap.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=ServiceType
 X-KDE-ServiceType=DCOP/ResourceBackend/IMAP
 Comment=Mail program with a DCOP interface
diff --git a/dcopmail.desktop b/dcopmail.desktop
index 579751189..26aaaa569 100644
--- a/dcopmail.desktop
+++ b/dcopmail.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=ServiceType
 X-KDE-ServiceType=DCOP/Mailer
 Comment=Mail program with a DCOP interface
diff --git a/kmail_config_accounts.desktop b/kmail_config_accounts.desktop
index 2fe42c76d..c2e58a03e 100644
--- a/kmail_config_accounts.desktop
+++ b/kmail_config_accounts.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=network
 Type=Service
 ServiceTypes=KCModule
diff --git a/kmail_config_appearance.desktop b/kmail_config_appearance.desktop
index 3c9804ba8..3008ea543 100644
--- a/kmail_config_appearance.desktop
+++ b/kmail_config_appearance.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=looknfeel
 Type=Service
 ServiceTypes=KCModule
diff --git a/kmail_config_composer.desktop b/kmail_config_composer.desktop
index 3e32aba06..33ffb0c4e 100644
--- a/kmail_config_composer.desktop
+++ b/kmail_config_composer.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=edit
 Type=Service
 ServiceTypes=KCModule
diff --git a/kmail_config_identity.desktop b/kmail_config_identity.desktop
index 39b9f2a7a..fe985db67 100644
--- a/kmail_config_identity.desktop
+++ b/kmail_config_identity.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=identity
 Type=Service
 ServiceTypes=KCModule
diff --git a/kmail_config_misc.desktop b/kmail_config_misc.desktop
index baed5d77c..7c1d946fd 100644
--- a/kmail_config_misc.desktop
+++ b/kmail_config_misc.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=misc
 Type=Service
 ServiceTypes=KCModule
diff --git a/kmail_config_security.desktop b/kmail_config_security.desktop
index 84a5ff3c7..4d1a2a402 100644
--- a/kmail_config_security.desktop
+++ b/kmail_config_security.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=encrypted
 Type=Service
 ServiceTypes=KCModule
diff --git a/kmail_view.desktop b/kmail_view.desktop
index eb2c9262e..8110b86ea 100644
--- a/kmail_view.desktop
+++ b/kmail_view.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KMail
 Name[eo]=Retpoŝto
 Name[hi]=के-मेल