From 029d6084e699568256c53a8270cb36ad4f66b935 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 27 Aug 2011 21:38:57 +0000 Subject: Fix a number of accidental tqStatus string conversions git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kitchensync/src/calendardiffalgo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kitchensync/src/calendardiffalgo.cpp') diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp index 3c9ef292d..f3ee5dda8 100644 --- a/kitchensync/src/calendardiffalgo.cpp +++ b/kitchensync/src/calendardiffalgo.cpp @@ -140,7 +140,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri conflictField( i18n( "Summary" ), left->summary(), right->summary() ); if ( left->status() != right->status() ) - conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() ); + conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() ); if ( left->secrecy() != right->secrecy() ) conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) ); -- cgit v1.2.1