Commit d43c7992 authored by Joachim Eibl's avatar Joachim Eibl

Changes from KDE svn

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@117 c8aa9fed-2811-0410-8543-893ada326672
parent 1412555e
add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
#add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
########### kdiff3 KPart ###############
......@@ -50,7 +50,7 @@ install(TARGETS kdiff3 ${INSTALL_TARGETS_DEFAULT_ARGS})
install( FILES kdiff3part.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part )
install( FILES kdiff3_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3 )
install( FILES kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( PROGRAMS kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
kde4_install_icons( ${ICON_INSTALL_DIR} )
......
......@@ -21,11 +21,11 @@
#include "common.h"
#include <map>
#include <qfont.h>
#include <qcolor.h>
#include <qsize.h>
#include <QColor>
#include <QSize>
#include <qpoint.h>
#include <qstringlist.h>
#include <qtextstream.h>
#include <QStringList>
#include <QTextStream>
ValueMap::ValueMap()
{
......
......@@ -67,7 +67,7 @@ T minMaxLimiter( T d, T minimum, T maximum )
}
#include <map>
#include <qstring.h>
#include <QString>
class QFont;
class QColor;
class QSize;
......
/***************************************************************************
* Copyright (C) 2003-2007 by Joachim Eibl *
* Copyright (C) 2003-2011 by Joachim Eibl *
* joachim.eibl at gmx.de *
* *
* This program is free software; you can redistribute it and/or modify *
......@@ -12,14 +12,14 @@
#include "optiondialog.h"
#include "common.h"
#include <qlayout.h>
#include <qlabel.h>
#include <qapplication.h>
#include <qpushbutton.h>
#include <qdir.h>
#include <qregexp.h>
#include <qtextstream.h>
#include <qeventloop.h>
#include <QLayout>
#include <QLabel>
#include <QApplication>
#include <QPushButton>
#include <QDir>
#include <QRegExp>
#include <QTextStream>
#include <QEventLoop>
#include <QProcess>
#include <QProgressBar>
......@@ -1687,7 +1687,7 @@ void ProgressDialog::recalc( bool bUpdate )
}
#include <qtimer.h>
#include <QTimer>
void ProgressDialog::show()
{
if ( m_progressDelayTimer )
......
......@@ -27,7 +27,7 @@
#include "gnudiff_system.h"
#include <stdio.h>
#include <qstring.h>
#include <QString>
#define TAB_WIDTH 8
......
......@@ -15,7 +15,7 @@
* *
***************************************************************************/
#include <qobject.h>
#include <QObject>
#include <kactioncollection.h>
namespace KDiff3 {
......
......@@ -22,13 +22,13 @@
#include <assert.h>
// include files for QT
#include <qdir.h>
#include <qprinter.h>
#include <qpainter.h>
#include <qsplitter.h>
#include <qlineedit.h>
#include <qcheckbox.h>
#include <qpushbutton.h>
#include <QDir>
#include <QPrinter>
#include <QPainter>
#include <QSplitter>
#include <QLineEdit>
#include <QCheckBox>
#include <QPushButton>
#include <QMenu>
#include <QLabel>
#include <QTextEdit>
......@@ -493,7 +493,7 @@ void KDiff3App::initActions( KActionCollection* ac )
editCopy = KStandardAction::copy(this, SLOT(slotEditCopy()), ac);
editCopy->setStatusTip(i18n("Copies the selected section to the clipboard"));
editPaste = KStandardAction::paste(this, SLOT(slotEditPaste()), ac);
editPaste->setStatusTip(i18n("Pastes the clipboard contents to actual position"));
editPaste->setStatusTip(i18n("Pastes the clipboard contents to current position"));
editSelectAll = KStandardAction::selectAll(this, SLOT(slotEditSelectAll()), ac);
editSelectAll->setStatusTip(i18n("Select everything in current window"));
editFind = KStandardAction::find(this, SLOT(slotEditFind()), ac);
......
[Desktop Entry]
Name=KDiff3
Name[be]=KDiff3
Name[bg]=KDiff3
Name[ca]=KDiff3
Name[ca@valencia]=KDiff3
Name[cs]=KDiff3
Name[da]=KDiff3
Name[de]=KDiff3
Name[el]=KDiff3
Name[en_GB]=KDiff3
Name[es]=KDiff3
Name[et]=KDiff3
Name[fr]=KDiff3
Name[ga]=KDiff3
Name[gl]=KDiff3
Name[hi]=के-डिफ3
Name[hne]=के-डिफ3
Name[hr]=KDiff3
Name[hu]=KDiff3
Name[it]=KDiff3
Name[ja]=KDiff3
Name[km]=KDiff3
Name[ko]=KDiff3
Name[ml]=കെഡിഫ്3
Name[nb]=KDiff3
Name[nds]=KDiff3
Name[nl]=KDiff3
Name[nn]=KDiff3
Name[pl]=KDiff3
Name[pt]=KDiff3
Name[pt_BR]=KDiff3
Name[ro]=KDiff3
Name[sv]=Kdiff3
Name[tr]=KDiff3
Name[uk]=KDiff3
Name[x-test]=xxKDiff3xx
Name[zh_CN]=KDiff3
Name[zh_TW]=KDiff3
GenericName=Diff/Patch Frontend
GenericName[bg]=Интерфейс на Diff/Patch
GenericName[ca]=Frontal de Diff/Patch
GenericName[ca@valencia]=Frontal de Diff/Patch
GenericName[cs]=Rozhraní pro Diff/Patch
GenericName[de]=Graphische Oberfläche zu Diff/Patch
GenericName[da]=Brugerflade til diff/patch
GenericName[de]=Grafische Oberfläche zu Diff/Patch
GenericName[el]=Σύστημα υποστήριξης χρήστη για τα Diff/Patch
GenericName[en_GB]=Diff/Patch Frontend
GenericName[eo]=Fasado por la programoj "diff" kaj "patch"
GenericName[es]=Interfaz para diff/patch
GenericName[et]=Võrdlemise ja liitmise rakendus
GenericName[fr]=Interface utilisateur pour Diff / Patch
GenericName[ga]=Comhéadan Diff/Patch
GenericName[gl]=Interface para Diff e Patch
GenericName[hi]=डिफ/पैच फ्रन्टएण्ड
GenericName[hne]=डिफ/पैच फ्रन्टएन्ड
GenericName[hu]=Diff/Patch Frontend
GenericName[it]=Interfaccia per i comandi diff e patch
GenericName[ja]=Diff/Patch フロントエンド
GenericName[km]=Diff/Patch ខាង​មុខ
GenericName[ko]=Diff/Patch 프론트엔드
GenericName[ml]=ഡിഫ്/പാച്ച് പുരോഭാഗം
GenericName[nb]=Diff-/Patch-grensesnitt
GenericName[nds]=Böversiet för "diff" un "patch"
GenericName[nl]=Diff/Patch-hulpprogramma
GenericName[nn]=Motor for diff- og patch-filer
GenericName[pl]=Interfejs do Diff/Patch
GenericName[pt]=Interface do Diff/Patch
GenericName[pt_BR]=Interface do Diff/Patch
GenericName[pt_BR]=Interface do diff/patch
GenericName[ro]=Interfață Diferențiere/Cîrpire
GenericName[sv]=Jämförelse- och programfixgränssnitt
GenericName[tr]=Diff/Patch Arayüzü
......@@ -29,29 +74,39 @@ GenericName[uk]=Графічна оболонка Diff/Patch
GenericName[x-test]=xxDiff/Patch Frontendxx
GenericName[zh_CN]=Diff/Patch 前端
GenericName[zh_TW]=比較/修補程式前端介面
Exec=kdiff3 %i %m -caption "%c"
Exec=kdiff3 %i -caption "%c"
Icon=kdiff3
Type=Application
DocPath=kdiff3/index.html
X-DocPath=kdiff3/index.html
Comment=A File And Directory Comparison And Merge Tool
Comment[bg]=Инструмент за сравняване и сливане на файлове и директории
Comment[ca]=Una eina de comparació i fusió de fitxer i directori
Comment[ca@valencia]=Una eina de comparació i fusió de fitxer i directori
Comment[cs]=Nástroj pro porovnávání a slučování souborů a adresářů
Comment[da]=Et værktøj til sammenfletning og sammenligning af filer og mapper
Comment[de]=Programm zum Vergleichen und Zusammenführen von Dateien und Ordnern
Comment[el]=Ένα εργαλείο σύγκρισης και συγχώνευσης αρχείων και καταλόγων
Comment[en_GB]=A File And Directory Comparison And Merge Tool
Comment[es]=Una herramienta para comparar y fusionar archivos y directorios
Comment[et]=Failide ja kataloogide võrdlemise ja liitmise tööriist
Comment[fr]=Un outil de comparaison et de fusion de fichiers et de dossiers
Comment[ga]=Uirlis a chuireann comhaid agus comhadlanna i gcomparáid agus a chumascann iad más gá
Comment[gl]=Unha ferramenta de comparación e fusión de ficheiros e cartafoles
Comment[hi]=फ़ाइल तथा डिरेक्ट्री तुलना करने व मिलाने का औजार
Comment[hne]=फाइल अउ डिरेक्टरी तुलना करे अउ मिलाय के औजार
Comment[hu]=Egy fájl és könyvtár összehasonlítási és egyesítési eszköz
Comment[it]=Uno strumento di confronto e fusione di file e cartelle
Comment[ja]=ファイルやディレクトリの比較/マージを行うツール
Comment[km]=ការ​ប្រៀបធៀប​ថត និង​ឯកសារ និង​ឧបករណ៌​បញ្ចូល​គ្នា
Comment[ko]=파일과 디렉터리 비교 및 병합 도구
Comment[ml]=ഫയലും അറകളും താരതമ്യം ചെയ്യാനും ലയിപ്പിക്കാനുമുള്ള ഒരു ആയുധം
Comment[nb]=Et verktøy for å sammelnlikne og flette filer og mapper
Comment[nds]=En Warktüüch för't Verglieken un Tosamenföhren vun Dateien un Ornern
Comment[nl]=Hulpmiddel voor het vergelijken en samenvoegen van bestanden en mappen
Comment[nn]=Eit program for samanlikning og fletting av filer og mapper
Comment[pl]=Narzędzie do porównywania i łączenia plików i katalogów
Comment[pt]=Uma Ferramenta de Comparação e Junção de Ficheiros e Pastas
Comment[pt_BR]=Uma ferramenta de comparação e junção de arquivos e diretórios
Comment[pt_BR]=Uma ferramenta de comparação e junção de arquivos e pastas
Comment[ro]=Un instrument de comparare și unire a fișierelor și directoarelor
Comment[sv]=Ett jämförelseverktyg för fil- och katalogjämförelser
Comment[tr]=Bir Dosya Ve Klasör Karşılaştırma Ve Birleştirme Aracı
......@@ -60,3 +115,4 @@ Comment[x-test]=xxA File And Directory Comparison And Merge Toolxx
Comment[zh_CN]=一个文件和目录的比较和合并的工具
Comment[zh_TW]=一個檔案與目錄比較與合併的工具
Terminal=false
Categories=Qt;KDE;Development;
......@@ -24,8 +24,8 @@
#include <kstandardaction.h>
#include <kfiledialog.h>
#include <qfile.h>
#include <qtextstream.h>
#include <QFile>
#include <QTextStream>
#include <QProcess>
#include "kdiff3.h"
......
......@@ -73,7 +73,7 @@ KDiff3Shell::KDiff3Shell( bool bCompleteInit )
{
// if we couldn't find our Part, we exit since the Shell by
// itself can't do anything useful
KMessageBox::error(this, i18n("Could not initialize our part!\n"
KMessageBox::error(this, i18n("Could not initialize the KDiff3 part.\n"
"This usually happens due to an installation problem. "
"Please read the README-file in the source package for details.")
);
......
[Desktop Entry]
Name=KDiff3Part
Name[bg]=KDiff3Part
Name[ca]=KDiff3Part
Name[ca@valencia]=KDiff3Part
Name[cs]=KDiff3Part
Name[da]=KDiff3Part
Name[de]=KDiff3Part
Name[el]=KDiff3Part
Name[en_GB]=KDiff3Part
Name[es]=KDiff3Part
Name[et]=KDiff3 komponent
Name[fr]=KDiff3Part
Name[ga]=KDiff3Part
Name[gl]=KDiff3Part
Name[hi]=के-डिफ3पार्ट
Name[hne]=के-डिफ3पार्ट
Name[hu]=KDiff3Part
Name[it]=KDiff3Part
Name[ja]=KDiff3Part
Name[km]=KDiff3Part
Name[ko]=KDiff3Part
Name[ml]=കെഡിഫ്3ഭാഗം
Name[nb]=KDiff3Part
Name[nds]=KDiff3Part
Name[nl]=KDiff3Part
Name[nn]=KDiff3Part
Name[pl]=KDiff3Part
Name[pt]=KDiff3Part
Name[pt_BR]=KDiff3Part
Name[ro]=KDiff3Part
Name[sv]=Kdiff3-del
Name[tr]=KDiff3Part
Name[uk]=KDiff3Part
Name[x-test]=xxKDiff3Partxx
Name[zh_CN]=KDiff3Part
Name[zh_TW]=KDiff3Part
MimeType=text/x-diff;
ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-KDE-Library=libkdiff3part
......
......@@ -21,10 +21,10 @@
#include <windows.h>
#include <shlobj.h>
#include <malloc.h>
#include <qstring.h>
#include <qstringlist.h>
#include <QString>
#include <QStringList>
#include <qwidget.h>
#include <qdir.h>
#include <QDir>
#include <QMenu>
#include "ShellContextMenu.h"
......
......@@ -21,17 +21,17 @@
#include <assert.h>
#include <qnamespace.h>
#include <qmessagebox.h>
#include <qmenu.h>
#include <qmenubar.h>
#include <qpainter.h>
#include <qcolordialog.h>
#include <qfontdialog.h>
#include <qlabel.h>
#include <qtextbrowser.h>
#include <qtextstream.h>
#include <qlayout.h>
#include <Qt> //namespace
#include <QMessageBox>
#include <QMenu>
#include <QMenuBar>
#include <QPainter>
#include <QColorDialog>
#include <QFontDialog>
#include <QLabel>
#include <QTextBrowser>
#include <QTextStream>
#include <QLayout>
#include <QTabWidget>
#include <QPaintEvent>
#include <QPixmap>
......@@ -676,7 +676,7 @@ KToggleAction* KStandardAction::showToolbar( QWidget* parent, const char* slot,
KToggleAction* KStandardAction::showStatusbar( QWidget* parent, const char* slot, KActionCollection* actionCollection)
{
KMainWindow* p = actionCollection->m_pMainWindow;
KToggleAction* a = new KToggleAction( i18n("Show &Statusbar"), 0, parent, slot, actionCollection, "showstatusbar", false );
KToggleAction* a = new KToggleAction( i18n("Show &Status Bar"), 0, parent, slot, actionCollection, "showstatusbar", false );
if(p) p->settingsMenu->addAction( a );
return a;
}
......
......@@ -21,9 +21,9 @@
#include "kdiff3_shell.h"
#include <kstandarddirs.h>
#include "version.h"
#include <qtextcodec.h>
#include <qfile.h>
#include <qtextstream.h>
#include <QTextCodec>
#include <QFile>
#include <QTextStream>
#include <QTranslator>
#include <QLocale>
#include <QFont>
......@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
const KLocalizedString i18nName = ki18n("kdiff3");
const QByteArray& appVersion = QByteArray( VERSION );
const KLocalizedString description = ki18n("Tool for Comparison and Merge of Files and Directories");
const KLocalizedString copyright = ki18n("(c) 2002-2010 Joachim Eibl");
const KLocalizedString copyright = ki18n("(c) 2002-2011 Joachim Eibl");
const QByteArray& homePage = "http://kdiff3.sourceforge.net/";
const QByteArray& bugsAddress = "joachim.eibl" "@" "gmx.de";
KAboutData aboutData( appName, appCatalog, i18nName,
......@@ -185,6 +185,7 @@ int main(int argc, char *argv[])
aboutData.addCredit(ki18n("Michael Schmidt"), ki18n("Mac support"));
aboutData.addCredit(ki18n("Valentin Rusu"), ki18n("KDE4 porting"), QByteArray("kde" "@" "rusu.info"));
aboutData.addCredit(ki18n("Albert Astals Cid"), ki18n("KDE4 porting"), QByteArray("aacid" "@" "kde.org"));
aboutData.addCredit(ki18n("Silvan Scherrer"), ki18n("OS2 port") );
aboutData.addCredit(ki18n("+ Many thanks to those who reported bugs and contributed ideas!"));
......
......@@ -733,7 +733,7 @@ void OptionDialog::setupEditPage( void )
gbox->addWidget( pReplaceTabs, line, 0, 1, 2 );
pReplaceTabs->setToolTip( i18n(
"On: Pressing tab generates the appropriate number of spaces.\n"
"Off: A Tab-character will be inserted.")
"Off: A tab character will be inserted.")
);
++line;
......@@ -964,7 +964,7 @@ void OptionDialog::setupMergePage( void )
m_pHistoryStartRegExpLineEdit = new OptionLineEdit( ".*\\$Log.*\\$.*", "HistoryStartRegExp", &m_historyStartRegExp, page, this );
gbox->addWidget( m_pHistoryStartRegExpLineEdit, line, 1 );
s_historyStartRegExpToolTip = i18n("Regular expression for the start of the version control history entry.\n"
"Usually this line contains the \"$Log$\"-keyword.\n"
"Usually this line contains the \"$Log$\" keyword.\n"
"Default value: \".*\\$Log.*\\$.*\"");
label->setToolTip( s_historyStartRegExpToolTip );
++line;
......@@ -1005,7 +1005,7 @@ void OptionDialog::setupMergePage( void )
gbox->addWidget( label, line, 0 );
m_pHistorySortKeyOrderLineEdit = new OptionLineEdit( defaultSortKeyOrder, "HistoryEntryStartSortKeyOrder", &m_historyEntryStartSortKeyOrder, page, this );
gbox->addWidget( m_pHistorySortKeyOrderLineEdit, line, 1 );
s_historyEntryStartSortKeyOrderToolTip = i18n("Each parentheses used in the regular expression for the history start entry\n"
s_historyEntryStartSortKeyOrderToolTip = i18n("Each pair of parentheses used in the regular expression for the history start entry\n"
"groups a key that can be used for sorting.\n"
"Specify the list of keys (that are numbered in order of occurrence\n"
"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"
......@@ -1047,9 +1047,9 @@ void OptionDialog::setupMergePage( void )
OptionCheckBox* pAutoSaveAndQuit = new OptionCheckBox( i18n("Auto save and quit on merge without conflicts"), false,
"AutoSaveAndQuitOnMergeWithoutConflicts", &m_bAutoSaveAndQuitOnMergeWithoutConflicts, page, this );
gbox->addWidget( pAutoSaveAndQuit, line, 0, 1, 2 );
pAutoSaveAndQuit->setToolTip( i18n("When KDiff3 was started for a file-merge from the commandline and all\n"
pAutoSaveAndQuit->setToolTip( i18n("If KDiff3 was started for a file-merge from the command line and all\n"
"conflicts are solvable without user interaction then automatically save and quit.\n"
"(Similar to command line option \"--auto\".") );
"(Similar to command line option \"--auto\".)") );
++line;
topLayout->addStretch(10);
......@@ -1113,7 +1113,7 @@ void OptionDialog::setupDirectoryMergePage( void )
gbox->addWidget( pUseCvsIgnore, line, 0, 1, 2 );
pUseCvsIgnore->setToolTip( i18n(
"Extends the antipattern to anything that would be ignored by CVS.\n"
"Via local \".cvsignore\"-files this can be directory specific."
"Via local \".cvsignore\" files this can be directory specific."
));
++line;
......@@ -1181,9 +1181,9 @@ void OptionDialog::setupDirectoryMergePage( void )
"Useful for big directories or slow networks.") );
pBGLayout->addWidget( pTrustDate );
OptionRadioButton* pTrustDateFallbackToBinary = new OptionRadioButton( i18n("Trust the size and date, but use binary comparison if date doesn't match (unsafe)"), false, "TrustDateFallbackToBinary", &m_bDmTrustDateFallbackToBinary, pBG, this );
OptionRadioButton* pTrustDateFallbackToBinary = new OptionRadioButton( i18n("Trust the size and date, but use binary comparison if date does not match (unsafe)"), false, "TrustDateFallbackToBinary", &m_bDmTrustDateFallbackToBinary, pBG, this );
pTrustDateFallbackToBinary->setToolTip( i18n("Assume that files are equal if the modification date and file length are equal.\n"
"If the date isn't equal but the sizes are, use binary comparison.\n"
"If the dates are not equal but the sizes are, use binary comparison.\n"
"Useful for big directories or slow networks.") );
pBGLayout->addWidget( pTrustDateFallbackToBinary );
......@@ -1225,8 +1225,8 @@ void OptionDialog::setupDirectoryMergePage( void )
OptionCheckBox* pCreateBakFiles = new OptionCheckBox( i18n("Backup files (.orig)"), true, "CreateBakFiles", &m_bDmCreateBakFiles, page, this );
gbox->addWidget( pCreateBakFiles, line, 0, 1, 2 );
pCreateBakFiles->setToolTip( i18n(
"When a file would be saved over an old file, then the old file\n"
"will be renamed with a '.orig'-extension instead of being deleted."));
"If a file would be saved over an old file, then the old file\n"
"will be renamed with a '.orig' extension instead of being deleted."));
++line;
topLayout->addStretch(10);
......@@ -1441,9 +1441,8 @@ static const char* countryMap[]={
pLanguage->addItem( languageId );
}
label->setToolTip( i18n(
"Choose the language of the GUI-strings or \"Auto\".\n"
"Choose the language of the GUI strings or \"Auto\".\n"
"For a change of language to take place, quit and restart KDiff3.")
);
++line;
......@@ -1568,7 +1567,7 @@ void OptionDialog::setupIntegrationPage( void )
label->setToolTip( i18n(
"List of command line options that should be ignored when KDiff3 is used by other tools.\n"
"Several values can be specified if separated via ';'\n"
"This will suppress the \"Unknown option\"-error."
"This will suppress the \"Unknown option\" error."
));
++line;
......@@ -1577,7 +1576,7 @@ void OptionDialog::setupIntegrationPage( void )
gbox->addWidget( pEscapeKeyQuits, line, 0, 1, 2 );
pEscapeKeyQuits->setToolTip( i18n(
"Fast method to exit.\n"
"For those who are used to using the Escape-key." ) );
"For those who are used to using the Escape key." ) );
++line;
#ifdef _WIN32
......@@ -1585,7 +1584,7 @@ void OptionDialog::setupIntegrationPage( void )
gbox->addWidget( pIntegrateWithClearCase, line, 0 );
pIntegrateWithClearCase->setToolTip( i18n(
"Integrate with Rational ClearCase from IBM.\n"
"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n"
"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n"
"(Only enabled when ClearCase \"bin\" directory is in the path.)"));
connect(pIntegrateWithClearCase, SIGNAL(clicked()),this, SLOT(slotIntegrateWithClearCase()) );
pIntegrateWithClearCase->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 );
......@@ -1593,7 +1592,7 @@ void OptionDialog::setupIntegrationPage( void )
QPushButton* pRemoveClearCaseIntegration = new QPushButton( i18n("Remove ClearCase Integration"), page);
gbox->addWidget( pRemoveClearCaseIntegration, line, 1 );
pRemoveClearCaseIntegration->setToolTip( i18n(
"Restore the old \"map\" file from before doing the Clearcase integration."));
"Restore the old \"map\" file from before doing the ClearCase integration."));
connect(pRemoveClearCaseIntegration, SIGNAL(clicked()),this, SLOT(slotRemoveClearCaseIntegration()) );
pRemoveClearCaseIntegration->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 );
......
......@@ -23,7 +23,7 @@
#include <kpagedialog.h>
#include <qstringlist.h>
#include <QStringList>
#include <list>
#include <kcmdlineargs.h>
......
......@@ -24,15 +24,15 @@
#include <algorithm>
#include <ctype.h>
#include <qclipboard.h>
#include <qscrollbar.h>
#include <qlayout.h>
#include <qcheckbox.h>
#include <qsplitter.h>
#include <qdir.h>
#include <qfile.h>
#include <qlineedit.h>
#include <qcombobox.h>
#include <QClipboard>
#include <QScrollBar>
#include <QLayout>
#include <QCheckBox>
#include <QSplitter>
#include <QDir>
#include <QFile>
#include <QLineEdit>
#include <QComboBox>
#include <QDropEvent>
#include <QUrl>
#include <QProcess>
......
......@@ -421,7 +421,7 @@ RegExpTester::RegExpTester( QWidget* pParent, const QString& autoMergeRegExpTool
l = new QLabel(i18n("Example auto merge line:"), this);
pGrid->addWidget(l,line,0);
l->setToolTip( i18n("For auto merge test copy a line as used in your files.") );
l->setToolTip( i18n("To test auto merge, copy a line as used in your files.") );
m_pAutoMergeExampleEdit = new QLineEdit(this);
pGrid->addWidget(m_pAutoMergeExampleEdit,line,1);
connect( m_pAutoMergeExampleEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotRecalc()));
......@@ -571,7 +571,7 @@ void RegExpTester::slotRecalc()
bool bSuccess = findParenthesesGroups( m_pHistoryEntryStartRegExpEdit->text(), parenthesesGroups );
if ( ! bSuccess )
{
m_pHistoryEntryStartMatchResult->setText( i18n("Opening and closing parentheses don't match in regular expression.") );
m_pHistoryEntryStartMatchResult->setText( i18n("Opening and closing parentheses do not match in regular expression.") );
m_pHistorySortKeyResult->setText( "" );
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment