From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * Massive set of changes to bring in all fixes and enhancements from
 the Enterprise PIM branch * Ensured that the Trinity changes were applied on
 top of those enhancements, and any redundancy removed * Added journal read
 support to the CalDAV resource * Fixed CalDAV resource to use events URL for
 tasks and journals when separate URL checkbox unchecked

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kresources/remote/remote.desktop     | 1 -
 kresources/remote/resourceremote.cpp | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'kresources/remote')

diff --git a/kresources/remote/remote.desktop b/kresources/remote/remote.desktop
index 66a1542af..2ddebc7e4 100644
--- a/kresources/remote/remote.desktop
+++ b/kresources/remote/remote.desktop
@@ -24,7 +24,6 @@ Name[hu]=Távoli fájlban tárolt naptár
 Name[is]=Dagatal í fjarlægri skrá
 Name[it]=Calendario in file remoto
 Name[ja]=リモートファイルのカレンダー
-Name[ka]=კალენდარი გარე ფაილზე
 Name[kk]=Қашықтағы файлдағы күнтізбе
 Name[km]=ប្រតិទិន​នៅ​ក្នុង​ឯកសារ​នៅ​ឆ្ងាយ
 Name[lt]=Kalendorius nutolusioje byloje
diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp
index 2aceaad0c..229dd86bf 100644
--- a/kresources/remote/resourceremote.cpp
+++ b/kresources/remote/resourceremote.cpp
@@ -56,6 +56,8 @@ ResourceRemote::ResourceRemote( const KConfig *config )
 {
   if ( config ) {
     readConfig( config );
+  } else {
+    setResourceName( i18n( "Remote Calendar" ) );
   }
 
   init();
-- 
cgit v1.2.1