diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-27 21:38:57 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-27 21:38:57 +0000 |
| commit | e0ec84b82a609a73cc82c6727e9a9e54769d60f6 (patch) | |
| tree | 2abbc716dfc905c36d65c97427918f87465c9c49 /src/directorymergewindow.cpp | |
| parent | f3d0a7eac1fc44142913a85ff4fde90d53e94e06 (diff) | |
| download | kdiff3-e0ec84b82a609a73cc82c6727e9a9e54769d60f6.tar.gz kdiff3-e0ec84b82a609a73cc82c6727e9a9e54769d60f6.zip | |
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
Diffstat (limited to 'src/directorymergewindow.cpp')
| -rw-r--r-- | src/directorymergewindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index 2a993cf..05959ee 100644 --- 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")); |