summaryrefslogtreecommitdiffstats
path: root/conduits/docconduit/doc-conflictdialog.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
commit0a282818406cdb3b61baa598dee849d3215c783a (patch)
treed440550c878df50462d8da6f2f9ddcb3d143a2c1 /conduits/docconduit/doc-conflictdialog.cc
parent0880c1c22f15fe822c30f3cc9d4260f02290e3aa (diff)
downloadkpilot-0a282818406cdb3b61baa598dee849d3215c783a.tar.gz
kpilot-0a282818406cdb3b61baa598dee849d3215c783a.zip
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'conduits/docconduit/doc-conflictdialog.cc')
-rw-r--r--conduits/docconduit/doc-conflictdialog.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc
index 8d1e211..32af25f 100644
--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@@ -168,7 +168,7 @@ void ResolutionDialog::slotInfo(int index) {
int ix=cE.index;
if (!syncInfo) return;
docSyncInfo si=(*syncInfo)[ix];
- TQString text=i18n("tqStatus of the database %1:\n\n").tqarg(si.handheldDB);
+ TQString text=i18n("Status of the database %1:\n\n").tqarg(si.handheldDB);
text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmtqStatus));
text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCtqStatus));