[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kpilot/conduits/vcalconduit
From:       Adriaan de Groot <groot () kde ! org>
Date:       2005-01-06 23:18:13
Message-ID: 20050106231813.C36EA1CB12 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Pilot -> Handheld ; disambiguate question


  M +7 -7      vcal-conduitbase.cc   1.77


--- kdepim/kpilot/conduits/vcalconduit/vcal-conduitbase.cc  #1.76:1.77
@@ -654,11 +654,10 @@ int VCalConduitBase::resolveConflict(KCa
                 // TODO: This is messed up!!!
                 QString query = i18n("The following item was modified "
-                        "both on the Pilot and on your PC:\nPC entry:\n\t");
+                        "both on the Handheld and on your PC:\nPC entry:\n\t");
                 query += e->summary();
-                query += i18n("\nPilot entry:\n\t");
+                query += i18n("\nHandheld entry:\n\t");
                 query += getTitle(de);
-                query += i18n("\n\nShould the Pilot entry overwrite the "
-                        "PC entry? If you select \"No\", the PC entry will "
-                        "overwrite the Pilot entry.");
+                query += i18n("\n\nWhich entry do you want to keep? It will "
+                        "overwrite the other entry.");
 
                 return KMessageBox::No == questionYesNo(
@@ -666,5 +665,6 @@ int VCalConduitBase::resolveConflict(KCa
                         i18n("Conflicting Entries"),
                         QString::null,
-                        0 /* Never timeout */);
+                        0 /* Never timeout */,
+                        i18n("Handheld"), i18n("PC"));
         }
         return getConflictResolution();


[prev in list] [next in list] [prev in thread] [next in thread]