branches/KDE/4.3/kdepimlibs/kcal (merge)

SVN commit 1005103 by tmcguire:

Backport r1004647 by tmcguire from trunk to the 4.3 branch:

SVN_MERGE
Merged revisions 1001354 via svnmerge from 
svn+ssh://tmcguire@xxxxxxxxxxx/home/kde/branches/kdepim/enterprise4/kdepimlibs

................
  r1001354 | winterz | 2009-07-23 01:47:36 +0200 (Thu, 23 Jul 2009) | 20 lines
  
  Merged revisions 1001350 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1001350 | winterz | 2009-07-22 19:34:04 -0400 (Wed, 22 Jul 2009) | 14 lines
    
    A better fix for dealing with invalid attendee status strings in Kolab.
    If the status is not one of the 5 valid strings, then make the internal
    setting Attendee::None.
    
    Once the internal setting Attendee::None is written back to the server, it 
will
    become needs-action.
    
    In no case is an invalid status string written back to the server.
    
    hopefully fixes kolab/issue3766
    MERGE: e4,trunk
    DO_NOT_BACKPORT: 4.3 (new i18n string)
  ........
................



 M  +3 -0      attendee.cpp  


--- branches/KDE/4.3/kdepimlibs/kcal/attendee.cpp #1005102:1005103
@@ -153,6 +153,9 @@
   case InProcess:
     return i18nc( "@item to-do in process of being completed", "In Process" );
     break;
+  case None:
+    return i18nc( "@item event or to-do status unknown", "Unknown" );
+    break;
   }
 }