Fix a number of accidental tqStatus string conversions

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
13 years ago · e0ec84b82a
parent f3d0a7eac1
commit e0ec84b82a
1 changed files with 1 additions and 1 deletions
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@ -299,7 +299,7 @@ DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOp
   addColumn("B");
   addColumn("C");
   addColumn(i18n("Operation"));
-   addColumn(i18n("tqStatus"));
+   addColumn(i18n("Status"));
   addColumn(i18n("Unsolved"));
   addColumn(i18n("Solved"));
   addColumn(i18n("Nonwhite"));