From: <er...@us...> - 2007-09-14 22:36:53
|
Revision: 2548 http://krusader.svn.sourceforge.net/krusader/?rev=2548&view=rev Author: erlich Date: 2007-09-14 15:36:57 -0700 (Fri, 14 Sep 2007) Log Message: ----------- all compiles... now linker errors... Modified Paths: -------------- trunk/krusader_kde4/Krusader.kdevelop trunk/krusader_kde4/krusader/CMakeLists.txt trunk/krusader_kde4/krusader/UserAction/CMakeLists.txt trunk/krusader_kde4/krusader/UserAction/useraction.cpp trunk/krusader_kde4/krusader/krusaderapp.h Added Paths: ----------- trunk/krusader_kde4/krusader/krusaderapp.cpp Modified: trunk/krusader_kde4/Krusader.kdevelop =================================================================== --- trunk/krusader_kde4/Krusader.kdevelop 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/Krusader.kdevelop 2007-09-14 22:36:57 UTC (rev 2548) @@ -2,7 +2,7 @@ <kdevelop> <general> <author>Shie Erlich & Rafi Yanai</author> - <email></email> + <email/> <version>$VERSION$</version> <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> @@ -10,15 +10,15 @@ <projectname>Krusader</projectname> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> - <description></description> - <defaultencoding></defaultencoding> + <description/> + <defaultencoding/> </general> <kdevcustomproject> <run> <mainprogram>/home/shie/src/krusader_kde4/$APPNAMELC$</mainprogram> <directoryradio>executable</directoryradio> - <programargs></programargs> - <globaldebugarguments></globaldebugarguments> + <programargs/> + <globaldebugarguments/> <globalcwd>/home/shie/src/krusader_kde4</globalcwd> <useglobalprogram>false</useglobalprogram> <terminal>false</terminal> @@ -29,16 +29,16 @@ </run> <build> <buildtool>make</buildtool> - <builddir></builddir> + <builddir/> </build> <make> <abortonerror>true</abortonerror> <numberofjobs>1</numberofjobs> <prio>0</prio> <dontact>false</dontact> - <makebin></makebin> - <defaulttarget></defaulttarget> - <makeoptions></makeoptions> + <makebin/> + <defaulttarget/> + <makeoptions/> <selectedenvironment>default</selectedenvironment> <environments> <default/> @@ -47,11 +47,11 @@ </kdevcustomproject> <kdevdebugger> <general> - <dbgshell></dbgshell> - <gdbpath></gdbpath> - <configGdbScript></configGdbScript> - <runShellScript></runShellScript> - <runGdbScript></runGdbScript> + <dbgshell/> + <gdbpath/> + <configGdbScript/> + <runShellScript/> + <runGdbScript/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> @@ -124,7 +124,7 @@ <root></root> <designerintegration>EmbeddedKDevDesigner</designerintegration> <qmake>/usr/bin/qmake</qmake> - <designer></designer> + <designer>/usr/bin/designer</designer> <designerpluginpaths/> </qt> <codecompletion> @@ -151,7 +151,7 @@ <includePaths>.;</includePaths> </codecompletion> <creategettersetter> - <prefixGet></prefixGet> + <prefixGet/> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> <parameterName>theValue</parameterName> @@ -182,7 +182,7 @@ </tree> </kdevfileview> <ctagspart> - <customArguments></customArguments> + <customArguments/> <customTagfilePath>/home/shie/src/krusader_kde4/tags</customTagfilePath> <activeTagsFiles/> </ctagspart> Modified: trunk/krusader_kde4/krusader/CMakeLists.txt =================================================================== --- trunk/krusader_kde4/krusader/CMakeLists.txt 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/krusader/CMakeLists.txt 2007-09-14 22:36:57 UTC (rev 2548) @@ -33,7 +33,8 @@ krusaderview.cpp krusader.cpp krslots.cpp - kicons.cpp ) + kicons.cpp + krusaderapp.cpp ) kde4_add_executable(krusader ${krusader_SRCS}) Modified: trunk/krusader_kde4/krusader/UserAction/CMakeLists.txt =================================================================== --- trunk/krusader_kde4/krusader/UserAction/CMakeLists.txt 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/krusader/UserAction/CMakeLists.txt 2007-09-14 22:36:57 UTC (rev 2548) @@ -8,7 +8,8 @@ kraction.cpp expander.cpp useractionpopupmenu.cpp - kractionbase.cpp ) + kractionbase.cpp + useraction.cpp ) kde4_add_library(UserAction ${UserAction_SRCS} ) Modified: trunk/krusader_kde4/krusader/UserAction/useraction.cpp =================================================================== --- trunk/krusader_kde4/krusader/UserAction/useraction.cpp 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/krusader/UserAction/useraction.cpp 2007-09-14 22:36:57 UTC (rev 2548) @@ -12,6 +12,7 @@ #include <kdebug.h> #include <kurl.h> +#include <kactioncollection.h> #include <kmenu.h> #include <kstandarddirs.h> #include <kmessagebox.h> @@ -52,8 +53,8 @@ void UserAction::populateMenu( KMenu* menu ) { for ( KrAction* action = _actions.first(); action; action = _actions.next() ) - if ( ! action->isPlugged( menu ) ) - action->plug( menu ); + if ( !menu->actions().contains(action) ) + menu->addAction(action); } QStringList UserAction::allCategories() { @@ -76,13 +77,13 @@ } void UserAction::readAllFiles() { - QString filename = locate( "data", ACTION_XML ); // locate returns the local file if it exists, else the global one is retrieved. + QString filename = KStandardDirs::locate( "data", ACTION_XML ); // locate returns the local file if it exists, else the global one is retrieved. if ( ! filename.isEmpty() ) - readFromFile( locate( "data", ACTION_XML ), renameDoublicated ); + readFromFile( KStandardDirs::locate( "data", ACTION_XML ), renameDoublicated ); - filename = locate( "data", ACTION_XML_EXAMPLES ); + filename = KStandardDirs::locate( "data", ACTION_XML_EXAMPLES ); if ( ! filename.isEmpty() ) - readFromFile( locate( "data", ACTION_XML_EXAMPLES ), ignoreDoublicated ); // ignore samples which are already in the normal file + readFromFile( KStandardDirs::locate( "data", ACTION_XML_EXAMPLES ), ignoreDoublicated ); // ignore samples which are already in the normal file } void UserAction::readFromFile( const QString& filename, ReadMode mode, KrActionList* list ) { @@ -143,13 +144,13 @@ continue; } - if ( mode == ignoreDoublicated && krApp->actionCollection()->action( name.toLatin1() ) ) + if ( mode == ignoreDoublicated && krApp->actionCollection()->action( name ) ) continue; QString basename = name + "_%1"; int i = 0; // appent a counter till the name is unique... (this checks every action, not only useractions) - while ( krApp->actionCollection()->action( name.toLatin1() ) ) + while ( krApp->actionCollection()->action( name ) ) name = basename.arg( ++i ); KrAction* act = new KrAction( krApp->actionCollection(), name.toLatin1() ); Added: trunk/krusader_kde4/krusader/krusaderapp.cpp =================================================================== --- trunk/krusader_kde4/krusader/krusaderapp.cpp (rev 0) +++ trunk/krusader_kde4/krusader/krusaderapp.cpp 2007-09-14 22:36:57 UTC (rev 2548) @@ -0,0 +1,17 @@ +#include "krusaderapp.h" + +KrusaderApp::KrusaderApp(): KApplication() {} + +bool KrusaderApp::x11EventFilter ( XEvent *e ) { + switch (e->type) { + case FocusIn: + emit windowActive(); + break; + case FocusOut: + emit windowInactive(); + break; + + } + //return false; // event should be processed normally + return KApplication::x11EventFilter(e); + } Modified: trunk/krusader_kde4/krusader/krusaderapp.h =================================================================== --- trunk/krusader_kde4/krusader/krusaderapp.h 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/krusader/krusaderapp.h 2007-09-14 22:36:57 UTC (rev 2548) @@ -8,20 +8,9 @@ class KrusaderApp: public KApplication { Q_OBJECT public: - KrusaderApp(): KApplication() {} - bool x11EventFilter ( XEvent *e ) { - switch (e->type) { - case FocusIn: - emit windowActive(); - break; - case FocusOut: - emit windowInactive(); - break; - - } - //return false; // event should be processed normally - return KApplication::x11EventFilter(e); - } + KrusaderApp(); + bool x11EventFilter ( XEvent *e ); + signals: void windowActive(); void windowInactive(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ck...@us...> - 2008-01-14 07:06:20
|
Revision: 2651 http://krusader.svn.sourceforge.net/krusader/?rev=2651&view=rev Author: ckarai Date: 2008-01-13 23:06:23 -0800 (Sun, 13 Jan 2008) Log Message: ----------- Q3CString -> QByteArray Modified Paths: -------------- trunk/krusader_kde4/iso/iso.cpp trunk/krusader_kde4/iso/iso.h trunk/krusader_kde4/iso/kiso.cpp trunk/krusader_kde4/krArc/krarc.cpp trunk/krusader_kde4/krArc/krarc.h trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.h trunk/krusader_kde4/krusader/Panel/krdrag.cpp trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp trunk/krusader_kde4/krusader/krusader.cpp trunk/krusader_kde4/krusader/krusader.h trunk/krusader_kde4/krusader/main.cpp trunk/krusader_kde4/tar/tar.h trunk/krusader_kde4/virt/virt.h Modified: trunk/krusader_kde4/iso/iso.cpp =================================================================== --- trunk/krusader_kde4/iso/iso.cpp 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/iso/iso.cpp 2008-01-14 07:06:23 UTC (rev 2651) @@ -29,7 +29,7 @@ #include <kde_file.h> #include <qfile.h> //Added by qt3to4: -#include <Q3CString> +#include <QByteArray> #include <kurl.h> #include <kdebug.h> #include <kcomponentdata.h> @@ -81,7 +81,7 @@ }; -kio_isoProtocol::kio_isoProtocol( const Q3CString &pool, const Q3CString &app ) : SlaveBase( "iso", pool, app ) +kio_isoProtocol::kio_isoProtocol( const QByteArray &pool, const QByteArray &app ) : SlaveBase( "iso", pool, app ) { kDebug() << "kio_isoProtocol::kio_isoProtocol" << endl; m_isoFile = 0L; @@ -216,7 +216,7 @@ QString path; if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) ) { - Q3CString _path( QFile::encodeName(url.path())); + QByteArray _path( QFile::encodeName(url.path())); kDebug() << "Checking (stat) on " << _path << endl; struct stat buff; if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) { @@ -302,7 +302,7 @@ { // We may be looking at a real directory - this happens // when pressing up after being in the root of an archive - Q3CString _path( QFile::encodeName(url.path())); + QByteArray _path( QFile::encodeName(url.path())); kDebug() << "kio_isoProtocol::stat (stat) on " << _path << endl; struct stat buff; if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) { Modified: trunk/krusader_kde4/iso/iso.h =================================================================== --- trunk/krusader_kde4/iso/iso.h 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/iso/iso.h 2008-01-14 07:06:23 UTC (rev 2651) @@ -2,7 +2,7 @@ iso.h ------------------- begin : Oct 25 2002 - copyright : (C) 2002 by Szombathelyi Gy\xF6rgy + copyright : (C) 2002 by Szombathelyi Gy�rgy email : gy...@us... ***************************************************************************/ @@ -26,14 +26,14 @@ #include <sys/types.h> #include "kisofile.h" //Added by qt3to4: -#include <Q3CString> +#include <QByteArray> class KIso; class kio_isoProtocol : public KIO::SlaveBase { public: - kio_isoProtocol( const Q3CString &pool, const Q3CString &app ); + kio_isoProtocol( const QByteArray &pool, const QByteArray &app ); virtual ~kio_isoProtocol(); virtual void listDir( const KUrl & url ); Modified: trunk/krusader_kde4/iso/kiso.cpp =================================================================== --- trunk/krusader_kde4/iso/kiso.cpp 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/iso/kiso.cpp 2008-01-14 07:06:23 UTC (rev 2651) @@ -27,7 +27,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include <q3cstring.h> #include <qdir.h> #include <qfile.h> #include <kdebug.h> Modified: trunk/krusader_kde4/krArc/krarc.cpp =================================================================== --- trunk/krusader_kde4/krArc/krarc.cpp 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krArc/krarc.cpp 2008-01-14 07:06:23 UTC (rev 2651) @@ -27,7 +27,7 @@ #include <qregexp.h> #include <qdir.h> //Added by qt3to4: -#include <Q3CString> +#include <QByteArray> #include <kfileitem.h> #include <kdebug.h> @@ -79,7 +79,7 @@ } // extern "C" -kio_krarcProtocol::kio_krarcProtocol(const Q3CString &pool_socket, const Q3CString &app_socket) +kio_krarcProtocol::kio_krarcProtocol(const QByteArray &pool_socket, const QByteArray &app_socket) : SlaveBase("kio_krarc", pool_socket, app_socket), archiveChanged(true), arcFile(0L),extArcReady(false), password(QString()) { @@ -350,7 +350,7 @@ } // the follwing block is ripped from KDE file KIO::Slave // $Id: krarc.cpp,v 1.43 2007/01/13 13:39:51 ckarai Exp $ - Q3CString _path( QFile::encodeName(arcTempDir+file) ); + QByteArray _path( QFile::encodeName(arcTempDir+file) ); KDE_struct_stat buff; if( KDE_lstat( _path.data(), &buff ) == -1 ) { if ( errno == EACCES ) Modified: trunk/krusader_kde4/krArc/krarc.h =================================================================== --- trunk/krusader_kde4/krArc/krarc.h 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krArc/krarc.h 2008-01-14 07:06:23 UTC (rev 2651) @@ -18,7 +18,6 @@ #define __krarc_h__ #include <qstring.h> -#include <q3cstring.h> #include <q3dict.h> #include <qfile.h> #include <sys/types.h> @@ -31,12 +30,12 @@ class K3Process; class KFileItem; -class Q3CString; +class QByteArray; class kio_krarcProtocol : public QObject, public KIO::SlaveBase { Q_OBJECT public: - kio_krarcProtocol(const Q3CString &pool_socket, const Q3CString &app_socket); + kio_krarcProtocol(const QByteArray &pool_socket, const QByteArray &app_socket); virtual ~kio_krarcProtocol(); virtual void stat( const KUrl & url ); virtual void get(const KUrl& url); Modified: trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp 2008-01-14 07:06:23 UTC (rev 2651) @@ -26,7 +26,7 @@ #include <qfile.h> #include <q3textstream.h> //Added by qt3to4: -#include <Q3CString> +#include <QByteArray> #include <kdebug.h> #include <k3process.h> @@ -72,7 +72,7 @@ **/ void KDiskFreeSpace::receivedDFStdErrOut(K3Process *, char *data, int len) { - Q3CString tmp(data,len+1); // adds a zero-byte + QByteArray tmp(data,len+1); // adds a zero-byte dfStringErrOut.append(tmp); } Modified: trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.h =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.h 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.h 2008-01-14 07:06:23 UTC (rev 2651) @@ -30,7 +30,7 @@ #include <qobject.h> #include <qstring.h> //Added by qt3to4: -#include <Q3CString> +#include <QByteArray> class K3Process; @@ -78,7 +78,7 @@ private: K3Process *dfProc; - Q3CString dfStringErrOut; + QByteArray dfStringErrOut; QString m_mountPoint; bool readingDFStdErrOut; class KDiskFreeSpPrivate; Modified: trunk/krusader_kde4/krusader/Panel/krdrag.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdrag.cpp 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krusader/Panel/krdrag.cpp 2008-01-14 07:06:23 UTC (rev 2651) @@ -32,7 +32,7 @@ #include <k3urldrag.h> //Added by qt3to4: #include <Q3StrList> -#include <Q3CString> +#include <QByteArray> KRDrag * KRDrag::newDrag( const KUrl::List & urls, bool move, QWidget * dragSource ) { @@ -66,11 +66,11 @@ QByteArray KRDrag::encodedData( const char* mime ) const { QByteArray a; - Q3CString mimetype( mime ); + QByteArray mimetype( mime ); if ( mimetype == "text/uri-list" ) return Q3UriDrag::encodedData( mime ); else if ( mimetype == "application/x-kde-cutselection" ) { - Q3CString s ( m_bCutSelection ? "1" : "0" ); + QByteArray s ( m_bCutSelection ? "1" : "0" ); a.resize( s.length() + 1 ); // trailing zero memcpy( a.data(), s.data(), s.length() + 1 ); } @@ -79,7 +79,7 @@ QStringList uris; for (Q3StrListIterator it(m_urls); *it; ++it) uris.append(K3URLDrag::stringToUrl(*it).prettyUrl()); - Q3CString s = uris.join( "\n" ).local8Bit(); + QByteArray s = uris.join( "\n" ).local8Bit(); if( uris.count() > 1 ) s.append( "\n" ); a.resize( s.length() + 1 ); // trailing zero Modified: trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-01-14 07:06:23 UTC (rev 2651) @@ -36,7 +36,7 @@ #include <qdir.h> #include <qtimer.h> //Added by qt3to4: -#include <Q3CString> +#include <QByteArray> // KDE includes #include <kmessagebox.h> #include <kmimetype.h> @@ -237,7 +237,7 @@ vfile* normal_vfs::vfileFromName(const QString& name){ QString path = vfs_workingDir()+"/"+name; - Q3CString fileName = path.local8Bit(); + QByteArray fileName = path.local8Bit(); KDE_struct_stat stat_p; KDE_lstat(fileName.data(),&stat_p); @@ -280,7 +280,7 @@ { acl = defAcl = QString(); #if defined( HAVE_POSIX_ACL ) - Q3CString fileName = file->vfile_getUrl().path( KUrl::RemoveTrailingSlash ).local8Bit(); + QByteArray fileName = file->vfile_getUrl().path( KUrl::RemoveTrailingSlash ).local8Bit(); #if HAVE_NON_POSIX_ACL_EXTENSIONS if ( acl_extended_file( fileName.data() ) ) { Modified: trunk/krusader_kde4/krusader/krusader.cpp =================================================================== --- trunk/krusader_kde4/krusader/krusader.cpp 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krusader/krusader.cpp 2008-01-14 07:06:23 UTC (rev 2651) @@ -66,7 +66,6 @@ #include <QResizeEvent> #include <QShowEvent> #include <QHideEvent> -#include <Q3CString> #include <QDesktopWidget> #include <krandom.h> #include <QtDBus/QtDBus> Modified: trunk/krusader_kde4/krusader/krusader.h =================================================================== --- trunk/krusader_kde4/krusader/krusader.h 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krusader/krusader.h 2008-01-14 07:06:23 UTC (rev 2651) @@ -48,7 +48,6 @@ #include <q3textstream.h> //Added by qt3to4: #include <QMoveEvent> -#include <Q3CString> #include <QShowEvent> #include <QResizeEvent> #include <QHideEvent> @@ -91,9 +90,7 @@ */ static const char* privIcon(); static QStringList supportedTools(); // find supported tools -#if 0 // TODO: PORTME - virtual bool process (const Q3CString &fun, const QByteArray &data, Q3CString &replyType, QByteArray &replyData); -#endif + void moveToTop(); public slots: Modified: trunk/krusader_kde4/krusader/main.cpp =================================================================== --- trunk/krusader_kde4/krusader/main.cpp 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/krusader/main.cpp 2008-01-14 07:06:23 UTC (rev 2651) @@ -41,7 +41,6 @@ #include <QtDBus/QtDBus> //Added by qt3to4: #include <QPixmap> -#include <Q3CString> #include <QAbstractEventDispatcher> // Krusader includes Modified: trunk/krusader_kde4/tar/tar.h =================================================================== --- trunk/krusader_kde4/tar/tar.h 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/tar/tar.h 2008-01-14 07:06:23 UTC (rev 2651) @@ -23,11 +23,11 @@ #include <kio/slavebase.h> #include <sys/types.h> //Added by qt3to4: -#include <Q3CString> +#include <QByteArray> class ArchiveProtocol : public KIO::SlaveBase { public: - ArchiveProtocol( const Q3CString &pool, const Q3CString &app ); + ArchiveProtocol( const QByteArray &pool, const QByteArray &app ); virtual ~ArchiveProtocol(); virtual void listDir( const KUrl & url ); Modified: trunk/krusader_kde4/virt/virt.h =================================================================== --- trunk/krusader_kde4/virt/virt.h 2008-01-13 21:02:36 UTC (rev 2650) +++ trunk/krusader_kde4/virt/virt.h 2008-01-14 07:06:23 UTC (rev 2651) @@ -21,13 +21,13 @@ #include <sys/types.h> #include <q3dict.h> //Added by qt3to4: -#include <Q3CString> +#include <QByteArray> #include <kconfig.h> #include <kio/slavebase.h> class VirtProtocol : public KIO::SlaveBase { public: - VirtProtocol( const Q3CString &pool, const Q3CString &app ); + VirtProtocol( const QByteArray &pool, const QByteArray &app ); virtual ~VirtProtocol(); virtual void listDir ( const KUrl & url ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ck...@us...> - 2008-01-14 21:26:06
|
Revision: 2652 http://krusader.svn.sourceforge.net/krusader/?rev=2652&view=rev Author: ckarai Date: 2008-01-14 13:26:07 -0800 (Mon, 14 Jan 2008) Log Message: ----------- FIXED: putting files to krarc bug Modified Paths: -------------- trunk/krusader_kde4/krArc/krarc.cpp trunk/krusader_kde4/krArc/krarc.h trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp trunk/krusader_kde4/krusader/VFS/ftp_vfs.cpp Modified: trunk/krusader_kde4/krArc/krarc.cpp =================================================================== --- trunk/krusader_kde4/krArc/krarc.cpp 2008-01-14 07:06:23 UTC (rev 2651) +++ trunk/krusader_kde4/krArc/krarc.cpp 2008-01-14 21:26:07 UTC (rev 2652) @@ -39,6 +39,7 @@ #include <kde_file.h> #include <kstandarddirs.h> #include <kio/job.h> +#include <kio/jobclasses.h> #include <ktar.h> #include <iostream> @@ -48,6 +49,9 @@ #define TRIES_WITH_PASSWORDS 3 #if 0 + +#include <q3textstream.h> + #define KRDEBUG(X...) do{ \ QFile f("/tmp/debug"); \ f.open(QIODevice::WriteOnly | QIODevice::Append); \ @@ -174,8 +178,12 @@ finished(); } -void kio_krarcProtocol::put(const KUrl& url,int permissions,bool overwrite,bool resume){ +void kio_krarcProtocol::put(const KUrl& url,int permissions, KIO::JobFlags flags){ KRDEBUG(url.path()); + + bool overwrite = !!( flags & KIO::Overwrite ); + bool resume = !!( flags & KIO::Resume ); + if( !setArcFile( url ) ) { error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); return; @@ -198,7 +206,10 @@ QString arcDir = findArcDirectory(url); QString tmpFile = arcTempDir + arcDir.mid(1) + url.path().mid(url.path().findRev("/")+1); - QString tmpDir = arcTempDir+arcDir.mid(1)+"/"; + QString tmpDir = arcTempDir+arcDir.mid(1); + if( !tmpDir.endsWith( "/" ) ) + tmpDir += "/"; + for( int i=arcTempDir.length();i<tmpDir.length(); i=tmpDir.find("/",i+1)){ QDir("/").mkdir(tmpDir.left(i)); } @@ -513,9 +524,10 @@ } else error( KIO::ERR_DOES_NOT_EXIST, path ); } -void kio_krarcProtocol::copy (const KUrl &url, const KUrl &dest, int, bool overwrite) { +void kio_krarcProtocol::copy (const KUrl &url, const KUrl &dest, int, KIO::JobFlags flags) { KRDEBUG(url.path()); - + bool overwrite = !!(flags & KIO::Overwrite ); + // KDE HACK: opening the password dlg in copy causes error for the COPY, and further problems // that's why encrypted files are not allowed to copy if( !encrypted && dest.isLocalFile() ) Modified: trunk/krusader_kde4/krArc/krarc.h =================================================================== --- trunk/krusader_kde4/krArc/krarc.h 2008-01-14 07:06:23 UTC (rev 2651) +++ trunk/krusader_kde4/krArc/krarc.h 2008-01-14 21:26:07 UTC (rev 2652) @@ -39,11 +39,11 @@ virtual ~kio_krarcProtocol(); virtual void stat( const KUrl & url ); virtual void get(const KUrl& url); - virtual void put(const KUrl& url,int permissions,bool overwrite,bool resume); + virtual void put(const KUrl& url,int permissions, KIO::JobFlags flags); virtual void mkdir(const KUrl& url,int permissions); virtual void listDir(const KUrl& url); virtual void del(KUrl const & url, bool isFile); - virtual void copy (const KUrl &src, const KUrl &dest, int permissions, bool overwrite); + virtual void copy (const KUrl &src, const KUrl &dest, int permissions, KIO::JobFlags flags); public slots: void receivedData(K3Process* proc,char* buf,int len); Modified: trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp 2008-01-14 07:06:23 UTC (rev 2651) +++ trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp 2008-01-14 21:26:07 UTC (rev 2652) @@ -52,7 +52,7 @@ "application/x-gzip,application/x-jar," "application/x-lha,application/x-lha-compressed," "application/x-rar,application/x-rar-compressed," - "application/x-rpm," + "application/x-rpm,application/zip" "application/x-zip,application/x-zip-compressed"; QString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz," "application/x-compressed-tar," Modified: trunk/krusader_kde4/krusader/VFS/ftp_vfs.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/ftp_vfs.cpp 2008-01-14 07:06:23 UTC (rev 2651) +++ trunk/krusader_kde4/krusader/VFS/ftp_vfs.cpp 2008-01-14 21:26:07 UTC (rev 2652) @@ -219,10 +219,13 @@ switch( mode ) { case KIO::CopyJob::Copy: job = KIO::copy( *fileUrls, destUrl ); + break; case KIO::CopyJob::Move: job = KIO::move( *fileUrls, destUrl ); + break; case KIO::CopyJob::Link: job = KIO::link( *fileUrls, destUrl ); + break; } connect( job, SIGNAL( result( KJob* ) ), this, SLOT( vfs_refresh( KJob* ) ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ck...@us...> - 2008-01-17 06:32:41
|
Revision: 2656 http://krusader.svn.sourceforge.net/krusader/?rev=2656&view=rev Author: ckarai Date: 2008-01-16 22:32:43 -0800 (Wed, 16 Jan 2008) Log Message: ----------- Q3TextStream -> QTextStream Modified Paths: -------------- trunk/krusader_kde4/krArc/krarc.cpp trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp trunk/krusader_kde4/krusader/Dialogs/krkeydialog.cpp trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp trunk/krusader_kde4/krusader/GUI/mediabutton.cpp trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp trunk/krusader_kde4/krusader/Panel/panelfunc.cpp trunk/krusader_kde4/krusader/Search/krsearchmod.cpp trunk/krusader_kde4/krusader/UserAction/expander.cpp trunk/krusader_kde4/krusader/UserAction/kraction.cpp trunk/krusader_kde4/krusader/UserAction/useraction.cpp trunk/krusader_kde4/krusader/VFS/krarchandler.cpp trunk/krusader_kde4/krusader/VFS/krquery.cpp trunk/krusader_kde4/krusader/VFS/temp_vfs.cpp trunk/krusader_kde4/krusader/krusader.h Modified: trunk/krusader_kde4/krArc/krarc.cpp =================================================================== --- trunk/krusader_kde4/krArc/krarc.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krArc/krarc.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -50,12 +50,12 @@ #if 0 -#include <q3textstream.h> +#include <qtextstream.h> #define KRDEBUG(X...) do{ \ QFile f("/tmp/debug"); \ f.open(QIODevice::WriteOnly | QIODevice::Append); \ - Q3TextStream stream( &f ); \ + QTextStream stream( &f ); \ stream << "Pid:" << (int)getpid() << " " <<__FUNCTION__<<"(" <<__LINE__<<"): "; \ stream << X << endl; \ f.close(); \ Modified: trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp =================================================================== --- trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -7,6 +7,7 @@ #include <kiconloader.h> #include <kmessagebox.h> //Added by qt3to4: +#include <qtextstream.h> #include <QMouseEvent> #include <QEvent> #include <kactioncollection.h> @@ -163,8 +164,8 @@ QString filename = KStandardDirs::locateLocal( "data", BOOKMARKS_FILE ); QFile file(filename); if ( file.open( QIODevice::WriteOnly ) ) { - Q3TextStream stream( &file ); - stream.setEncoding(stream.UnicodeUTF8); + QTextStream stream( &file ); + stream.setCodec( "UTF-8" ); stream << doc.toString(); file.close(); } else { Modified: trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -14,7 +14,7 @@ #include <kcursor.h> #include <kmessagebox.h> #include <qfile.h> -#include <q3textstream.h> +#include <qtextstream.h> #include <kfiledialog.h> #include <q3frame.h> #include <kiconloader.h> @@ -622,7 +622,7 @@ file.errorString()); return false; } - Q3TextStream stream(&file); + QTextStream stream(&file); for ( QStringList::ConstIterator it = data.constBegin(); it != data.constEnd(); ++it) stream << *it << "\n"; file.close(); Modified: trunk/krusader_kde4/krusader/Dialogs/krkeydialog.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krkeydialog.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/Dialogs/krkeydialog.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -13,6 +13,7 @@ #include <qlayout.h> #include <q3boxlayout.h> +#include <qtextstream.h> #include <klocale.h> #include <kpushbutton.h> #include <kmessagebox.h> @@ -91,7 +92,7 @@ // check if there's an info file with the keymap QFile info(file+".info"); if (info.open(QIODevice::ReadOnly)) { - Q3TextStream stream(&info); + QTextStream stream(&info); QStringList infoText = QStringList::split("\n", stream.read()); if (KMessageBox::questionYesNoList(krApp, i18n("The following information was attached to the keymap. Do you really want to import this keymap?"), infoText)!=KMessageBox::Yes) return; Modified: trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp =================================================================== --- trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -37,6 +37,7 @@ #include <QHBoxLayout> #include <QGridLayout> #include <QPixmap> +#include <qtextstream.h> #include <klocale.h> #include <qlayout.h> #include <qlabel.h> @@ -472,8 +473,8 @@ return; } // and read it into the temporary array - Q3TextStream t ( &data ); - while ( !data.atEnd() ) + QTextStream t ( &data ); + while ( !t.atEnd() ) { QString s = t.readLine(); QString name = s.left ( s.find ( ':' ) ); Modified: trunk/krusader_kde4/krusader/GUI/mediabutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/mediabutton.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/GUI/mediabutton.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -40,6 +40,7 @@ #include <qfile.h> #include <qfontmetrics.h> //Added by qt3to4: +#include <qtextstream.h> #include <QPixmap> #include <QMouseEvent> #include <QEvent> @@ -279,7 +280,7 @@ QFile m(QString("/proc/ide/") + devname + "/media"); if(m.open(QIODevice::ReadOnly)) { - Q3TextStream in(&m); + QTextStream in(&m); QString buf=in.readLine(); if(buf.contains("cdrom")) isCd=true; Modified: trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -24,7 +24,7 @@ #include "kdiskfreesp.h" #include <qfile.h> -#include <q3textstream.h> +#include <qtextstream.h> //Added by qt3to4: #include <QByteArray> @@ -100,11 +100,11 @@ { readingDFStdErrOut=true; - Q3TextStream t (dfStringErrOut, QIODevice::ReadOnly); + QTextStream t (dfStringErrOut, QIODevice::ReadOnly); QString s=t.readLine(); if ( (s.isEmpty()) || ( s.left(10) != QString::fromLatin1("Filesystem") ) ) kError() << "Error running df command... got [" << s << "]" << endl; - while ( !t.eof() ) { + while ( !t.atEnd() ) { QString u,v; s=t.readLine(); s=s.simplified(); @@ -112,7 +112,7 @@ //kDebug(kfile_area) << "GOT: [" << s << "]" << endl; if (s.find(BLANK)<0) // devicename was too long, rest in next line - if ( !t.eof() ) { // just appends the next line + if ( !t.atEnd() ) { // just appends the next line v=t.readLine(); s=s.append(v); s=s.simplified(); Modified: trunk/krusader_kde4/krusader/Panel/panelfunc.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -30,7 +30,6 @@ #include <unistd.h> // Qt Includes #include <qdir.h> -#include <q3textstream.h> #include <qeventloop.h> #include <qclipboard.h> //Added by qt3to4: Modified: trunk/krusader_kde4/krusader/Search/krsearchmod.cpp =================================================================== --- trunk/krusader_kde4/krusader/Search/krsearchmod.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/Search/krsearchmod.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -43,7 +43,6 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> -#include <q3textstream.h> #include <qregexp.h> #include <kde_file.h> Modified: trunk/krusader_kde4/krusader/UserAction/expander.cpp =================================================================== --- trunk/krusader_kde4/krusader/UserAction/expander.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/UserAction/expander.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -37,6 +37,7 @@ #include <qstringlist.h> #include <qclipboard.h> //Added by qt3to4: +#include <qtextstream.h> #include <QList> #include <functional> @@ -508,7 +509,7 @@ return QString(); } - Q3TextStream stream( tmpFile.file() ); + QTextStream stream( tmpFile.file() ); stream << separateAndQuote( fileList(panel, parameter.isEmpty() ? QString() : parameter[0].toLower(), Modified: trunk/krusader_kde4/krusader/UserAction/kraction.cpp =================================================================== --- trunk/krusader_kde4/krusader/UserAction/kraction.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/UserAction/kraction.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -16,6 +16,7 @@ #include <kinputdialog.h> #include <kactioncollection.h> #include <q3textedit.h> +#include <qtextstream.h> #include <qboxlayout.h> #include <qlayout.h> #include <qsplitter.h> @@ -175,7 +176,7 @@ return; } - Q3TextStream stream( &file ); + QTextStream stream( &file ); stream << _currentTextEdit->text(); file.close(); } Modified: trunk/krusader_kde4/krusader/UserAction/useraction.cpp =================================================================== --- trunk/krusader_kde4/krusader/UserAction/useraction.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/UserAction/useraction.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -16,6 +16,7 @@ #include <kmenu.h> #include <kstandarddirs.h> #include <kmessagebox.h> +#include <qtextstream.h> #include <qstring.h> #include <qdom.h> @@ -218,8 +219,8 @@ } */ - Q3TextStream ts( &file ); - ts.setEncoding(ts.UnicodeUTF8); + QTextStream ts( &file ); + ts.setCodec("UTF-8"); ts << doc.toString(); file.close(); Modified: trunk/krusader_kde4/krusader/VFS/krarchandler.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/krarchandler.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/VFS/krarchandler.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -28,7 +28,6 @@ * * ***************************************************************************/ // QT includes -#include <q3textstream.h> // KDE includes #include <k3process.h> #include <k3tempfile.h> Modified: trunk/krusader_kde4/krusader/VFS/krquery.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/krquery.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/VFS/krquery.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -37,7 +37,6 @@ #include "krarchandler.h" #include "krpermhandler.h" -#include <q3textstream.h> #include <qtextcodec.h> #include <qregexp.h> #include <kde_file.h> Modified: trunk/krusader_kde4/krusader/VFS/temp_vfs.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/temp_vfs.cpp 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/VFS/temp_vfs.cpp 2008-01-17 06:32:43 UTC (rev 2656) @@ -56,7 +56,7 @@ } temp_vfs::~temp_vfs(){ - if( vfs_type == "-iso" ){ + if( 1 /*vfs_type == "-iso"*/ ){ // unmount the ISO image K3ShellProcess umount; umount << "umount -f" << tmpDir; Modified: trunk/krusader_kde4/krusader/krusader.h =================================================================== --- trunk/krusader_kde4/krusader/krusader.h 2008-01-16 21:29:02 UTC (rev 2655) +++ trunk/krusader_kde4/krusader/krusader.h 2008-01-17 06:32:43 UTC (rev 2656) @@ -45,7 +45,6 @@ #include <kconfig.h> #include <kconfiggroup.h> #include <qstringlist.h> -#include <q3textstream.h> //Added by qt3to4: #include <QMoveEvent> #include <QShowEvent> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ck...@us...> - 2008-01-28 07:27:55
|
Revision: 2681 http://krusader.svn.sourceforge.net/krusader/?rev=2681&view=rev Author: ckarai Date: 2008-01-27 23:27:59 -0800 (Sun, 27 Jan 2008) Log Message: ----------- Removed: '//Added by qt3to4:' comments Modified Paths: -------------- trunk/krusader_kde4/iso/iso.cpp trunk/krusader_kde4/iso/iso.h trunk/krusader_kde4/krArc/krarc.cpp trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.h trunk/krusader_kde4/krusader/ActionMan/useractionpage.cpp trunk/krusader_kde4/krusader/BookMan/kraddbookmarkdlg.cpp trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.h trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp trunk/krusader_kde4/krusader/Dialogs/krdialogs.cpp trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.cpp trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.h trunk/krusader_kde4/krusader/Dialogs/krpleasewait.cpp trunk/krusader_kde4/krusader/Dialogs/krpleasewait.h trunk/krusader_kde4/krusader/Dialogs/krprogress.cpp trunk/krusader_kde4/krusader/Dialogs/krprogress.h trunk/krusader_kde4/krusader/Dialogs/krspecialwidgets.cpp trunk/krusader_kde4/krusader/Dialogs/krspecialwidgets.h trunk/krusader_kde4/krusader/Dialogs/krspwidgets.cpp trunk/krusader_kde4/krusader/Dialogs/krspwidgets.h trunk/krusader_kde4/krusader/Dialogs/krsqueezedtextlabel.cpp trunk/krusader_kde4/krusader/Dialogs/krsqueezedtextlabel.h trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.cpp trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.h trunk/krusader_kde4/krusader/Dialogs/newftpgui.cpp trunk/krusader_kde4/krusader/Dialogs/newftpgui.h trunk/krusader_kde4/krusader/Dialogs/packguibase.cpp trunk/krusader_kde4/krusader/Dialogs/packguibase.h trunk/krusader_kde4/krusader/Dialogs/percentalsplitter.cpp trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp trunk/krusader_kde4/krusader/DiskUsage/diskusage.cpp trunk/krusader_kde4/krusader/DiskUsage/diskusage.h trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.cpp trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.h trunk/krusader_kde4/krusader/DiskUsage/dufilelight.cpp trunk/krusader_kde4/krusader/DiskUsage/dufilelight.h trunk/krusader_kde4/krusader/DiskUsage/dulines.cpp trunk/krusader_kde4/krusader/DiskUsage/dulines.h trunk/krusader_kde4/krusader/DiskUsage/dulistview.cpp trunk/krusader_kde4/krusader/DiskUsage/dulistview.h trunk/krusader_kde4/krusader/DiskUsage/radialMap/map.cpp trunk/krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.cpp trunk/krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.h trunk/krusader_kde4/krusader/DiskUsage/radialMap/widget.cpp trunk/krusader_kde4/krusader/DiskUsage/radialMap/widget.h trunk/krusader_kde4/krusader/DiskUsage/radialMap/widgetEvents.cpp trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp trunk/krusader_kde4/krusader/Filter/filterdialog.cpp trunk/krusader_kde4/krusader/Filter/filtertabs.h trunk/krusader_kde4/krusader/Filter/generalfilter.cpp trunk/krusader_kde4/krusader/Filter/generalfilter.h trunk/krusader_kde4/krusader/GUI/dirhistorybutton.cpp trunk/krusader_kde4/krusader/GUI/dirhistorybutton.h trunk/krusader_kde4/krusader/GUI/kcmdline.cpp trunk/krusader_kde4/krusader/GUI/kcmdline.h trunk/krusader_kde4/krusader/GUI/kfnkeys.cpp trunk/krusader_kde4/krusader/GUI/kfnkeys.h trunk/krusader_kde4/krusader/GUI/mediabutton.cpp trunk/krusader_kde4/krusader/GUI/mediabutton.h trunk/krusader_kde4/krusader/GUI/syncbrowsebutton.h trunk/krusader_kde4/krusader/KViewer/diskusageviewer.cpp trunk/krusader_kde4/krusader/KViewer/diskusageviewer.h trunk/krusader_kde4/krusader/KViewer/kimagefilepreview.cpp trunk/krusader_kde4/krusader/KViewer/kimagefilepreview.h trunk/krusader_kde4/krusader/KViewer/krviewer.cpp trunk/krusader_kde4/krusader/KViewer/krviewer.h trunk/krusader_kde4/krusader/Konfigurator/kgadvanced.cpp trunk/krusader_kde4/krusader/Konfigurator/kgarchives.cpp trunk/krusader_kde4/krusader/Konfigurator/kgcolors.cpp trunk/krusader_kde4/krusader/Konfigurator/kgcolors.h trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.h trunk/krusader_kde4/krusader/Konfigurator/kggeneral.cpp trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp trunk/krusader_kde4/krusader/Konfigurator/kgstartup.cpp trunk/krusader_kde4/krusader/Konfigurator/kguseractions.cpp trunk/krusader_kde4/krusader/Konfigurator/kgwelcome.cpp trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp trunk/krusader_kde4/krusader/Konfigurator/konfigurator.h trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.h trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.cpp trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.h trunk/krusader_kde4/krusader/Konfigurator/krresulttable.cpp trunk/krusader_kde4/krusader/Konfigurator/krresulttable.h trunk/krusader_kde4/krusader/Konfigurator/krresulttabledialog.cpp trunk/krusader_kde4/krusader/Konfigurator/krresulttabledialog.h trunk/krusader_kde4/krusader/Locate/locate.cpp trunk/krusader_kde4/krusader/Locate/locate.h trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.h trunk/krusader_kde4/krusader/MountMan/kmountmangui.cpp trunk/krusader_kde4/krusader/MountMan/kmountmangui.h trunk/krusader_kde4/krusader/Panel/krbriefview.cpp trunk/krusader_kde4/krusader/Panel/krbriefview.h trunk/krusader_kde4/krusader/Panel/krbriefviewitem.cpp trunk/krusader_kde4/krusader/Panel/krbriefviewitem.h trunk/krusader_kde4/krusader/Panel/krcalcspacedialog.cpp trunk/krusader_kde4/krusader/Panel/krcalcspacedialog.h trunk/krusader_kde4/krusader/Panel/krcolorcache.cpp trunk/krusader_kde4/krusader/Panel/krcolorcache.h trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp trunk/krusader_kde4/krusader/Panel/krdetailedview.h trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.cpp trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.h trunk/krusader_kde4/krusader/Panel/krdrag.cpp trunk/krusader_kde4/krusader/Panel/krdrag.h trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp trunk/krusader_kde4/krusader/Panel/krpopupmenu.h trunk/krusader_kde4/krusader/Panel/krpreviewpopup.cpp trunk/krusader_kde4/krusader/Panel/krview.cpp trunk/krusader_kde4/krusader/Panel/krview.h trunk/krusader_kde4/krusader/Panel/krviewitem.cpp trunk/krusader_kde4/krusader/Panel/krviewitem.h trunk/krusader_kde4/krusader/Panel/listpanel.cpp trunk/krusader_kde4/krusader/Panel/panelfunc.cpp trunk/krusader_kde4/krusader/Panel/panelpopup.cpp trunk/krusader_kde4/krusader/Panel/panelpopup.h trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp trunk/krusader_kde4/krusader/Queue/queue_mgr.h trunk/krusader_kde4/krusader/RemoteMan/remotemanbase.cpp trunk/krusader_kde4/krusader/RemoteMan/remotemanbase.h trunk/krusader_kde4/krusader/Search/krsearchdialog.cpp trunk/krusader_kde4/krusader/Search/krsearchdialog.h trunk/krusader_kde4/krusader/Synchronizer/feedtolistboxdialog.cpp trunk/krusader_kde4/krusader/Synchronizer/synchronizedialog.cpp trunk/krusader_kde4/krusader/Synchronizer/synchronizer.cpp trunk/krusader_kde4/krusader/Synchronizer/synchronizer.h trunk/krusader_kde4/krusader/Synchronizer/synchronizergui.cpp trunk/krusader_kde4/krusader/Synchronizer/synchronizergui.h trunk/krusader_kde4/krusader/UserAction/expander.cpp trunk/krusader_kde4/krusader/UserAction/kraction.cpp trunk/krusader_kde4/krusader/VFS/arc_vfs.h trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp trunk/krusader_kde4/krusader/VFS/preservingcopyjob.cpp trunk/krusader_kde4/krusader/VFS/vfs.cpp trunk/krusader_kde4/krusader/kicons.cpp trunk/krusader_kde4/krusader/krslots.cpp trunk/krusader_kde4/krusader/krusader.cpp trunk/krusader_kde4/krusader/krusader.h trunk/krusader_kde4/krusader/krusaderview.cpp trunk/krusader_kde4/krusader/krusaderview.h trunk/krusader_kde4/krusader/main.cpp trunk/krusader_kde4/krusader/panelmanager.cpp trunk/krusader_kde4/krusader/panelmanager.h trunk/krusader_kde4/krusader/paneltabbar.h trunk/krusader_kde4/tar/tar.h trunk/krusader_kde4/virt/virt.h Modified: trunk/krusader_kde4/iso/iso.cpp =================================================================== --- trunk/krusader_kde4/iso/iso.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/iso/iso.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -28,7 +28,6 @@ #include <kde_file.h> #include <qfile.h> -//Added by qt3to4: #include <QByteArray> #include <kurl.h> #include <kdebug.h> Modified: trunk/krusader_kde4/iso/iso.h =================================================================== --- trunk/krusader_kde4/iso/iso.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/iso/iso.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -25,7 +25,6 @@ #include <kio/slavebase.h> #include <sys/types.h> #include "kisofile.h" -//Added by qt3to4: #include <QByteArray> class KIso; Modified: trunk/krusader_kde4/krArc/krarc.cpp =================================================================== --- trunk/krusader_kde4/krArc/krarc.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krArc/krarc.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -26,7 +26,6 @@ #include <qfileinfo.h> #include <qregexp.h> #include <qdir.h> -//Added by qt3to4: #include <QByteArray> #include <kfileitem.h> Modified: trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp =================================================================== --- trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -26,7 +26,6 @@ #include <qlayout.h> #include <qlabel.h> #include <qtoolbutton.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QFrame> #include <QVBoxLayout> Modified: trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.h =================================================================== --- trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -16,7 +16,6 @@ #include <kmenu.h> #include <kdialog.h> #include "../UserAction/expander.h" -//Added by qt3to4: #include <QList> class QString; Modified: trunk/krusader_kde4/krusader/ActionMan/useractionpage.cpp =================================================================== --- trunk/krusader_kde4/krusader/ActionMan/useractionpage.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/ActionMan/useractionpage.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -16,7 +16,6 @@ #include <qlayout.h> #include <qtoolbutton.h> #include <qclipboard.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QVBoxLayout> #include <klineedit.h> Modified: trunk/krusader_kde4/krusader/BookMan/kraddbookmarkdlg.cpp =================================================================== --- trunk/krusader_kde4/krusader/BookMan/kraddbookmarkdlg.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/BookMan/kraddbookmarkdlg.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -5,7 +5,6 @@ #include <q3header.h> #include <qlayout.h> #include <qlabel.h> -//Added by qt3to4: #include <QGridLayout> #include <kinputdialog.h> #include <kiconloader.h> Modified: trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp =================================================================== --- trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -6,7 +6,6 @@ #include "../VFS/vfs.h" #include <kiconloader.h> #include <kmessagebox.h> -//Added by qt3to4: #include <qtextstream.h> #include <QMouseEvent> #include <QEvent> Modified: trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.h =================================================================== --- trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/BookMan/krbookmarkhandler.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -4,7 +4,6 @@ #include "krbookmark.h" #include <qobject.h> #include <qpointer.h> -//Added by qt3to4: #include <QEvent> #include <kmenu.h> #include <kurl.h> Modified: trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -5,7 +5,6 @@ #include <qlayout.h> #include <qlabel.h> #include <qcheckbox.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QGridLayout> #include <klineedit.h> Modified: trunk/krusader_kde4/krusader/Dialogs/krdialogs.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krdialogs.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krdialogs.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -36,7 +36,6 @@ #include <qwidget.h> #include <qapplication.h> #include <qfontmetrics.h> -//Added by qt3to4: #include <QFrame> #include <QLabel> #include <QVBoxLayout> Modified: trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -37,7 +37,6 @@ #include <qlayout.h> #include <qvariant.h> #include <qmessagebox.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QVBoxLayout> #include <klocale.h> Modified: trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -31,7 +31,6 @@ #define KRMASKCHOICE_H #include <qdialog.h> -//Added by qt3to4: #include <QVBoxLayout> #include <QGridLayout> #include <QHBoxLayout> Modified: trunk/krusader_kde4/krusader/Dialogs/krpleasewait.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krpleasewait.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krpleasewait.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include <qdatetime.h> #include <qapplication.h> #include <qpushbutton.h> -//Added by qt3to4: #include <QLabel> #include <QCloseEvent> #include <Q3ProgressBar> Modified: trunk/krusader_kde4/krusader/Dialogs/krpleasewait.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krpleasewait.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krpleasewait.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -34,7 +34,6 @@ #include <q3progressdialog.h> #include <qtimer.h> #include <qpointer.h> -//Added by qt3to4: #include <QCloseEvent> #include <kio/jobclasses.h> Modified: trunk/krusader_kde4/krusader/Dialogs/krprogress.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krprogress.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krprogress.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -19,7 +19,6 @@ #include <qtimer.h> #include <qlayout.h> #include <qdatetime.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QCloseEvent> #include <QGridLayout> Modified: trunk/krusader_kde4/krusader/Dialogs/krprogress.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krprogress.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krprogress.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -22,7 +22,6 @@ #define __kr_progress_h__ #include <qlabel.h> -//Added by qt3to4: #include <QCloseEvent> #include <kio/global.h> Modified: trunk/krusader_kde4/krusader/Dialogs/krspecialwidgets.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krspecialwidgets.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krspecialwidgets.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -40,7 +40,6 @@ #include <klocale.h> #include <klineedit.h> #include <kdebug.h> -//Added by qt3to4: #include <QKeyEvent> #include <QPaintEvent> Modified: trunk/krusader_kde4/krusader/Dialogs/krspecialwidgets.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krspecialwidgets.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krspecialwidgets.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -35,7 +35,6 @@ #include <qwidget.h> #include <qpainter.h> #include <qcolor.h> -//Added by qt3to4: #include <QKeyEvent> #include <QPaintEvent> #include <klineedit.h> Modified: trunk/krusader_kde4/krusader/Dialogs/krspwidgets.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krspwidgets.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krspwidgets.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -41,7 +41,6 @@ #include <q3listbox.h> #include <qspinbox.h> #include <qnamespace.h> -//Added by qt3to4: #include <QMouseEvent> #include <QEvent> #include <klocale.h> Modified: trunk/krusader_kde4/krusader/Dialogs/krspwidgets.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krspwidgets.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krspwidgets.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -30,7 +30,6 @@ #ifndef KRSPWIDGETS_H #define KRSPWIDGETS_H -//Added by qt3to4: #include <QMouseEvent> #include <QEvent> #include <kurl.h> Modified: trunk/krusader_kde4/krusader/Dialogs/krsqueezedtextlabel.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krsqueezedtextlabel.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krsqueezedtextlabel.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -2,7 +2,6 @@ #include <kstringhandler.h> #include <k3urldrag.h> #include <qtooltip.h> -//Added by qt3to4: #include <QMouseEvent> #include <QDropEvent> #include <QDragEnterEvent> Modified: trunk/krusader_kde4/krusader/Dialogs/krsqueezedtextlabel.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krsqueezedtextlabel.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/krsqueezedtextlabel.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -2,7 +2,6 @@ #define KRSQUEEZEDTEXTLABEL_H #include <ksqueezedtextlabel.h> -//Added by qt3to4: #include <QResizeEvent> #include <QMouseEvent> #include <QDropEvent> Modified: trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include <qpixmap.h> #include <qcursor.h> #include <qlayout.h> -//Added by qt3to4: #include <QGridLayout> #include <QKeyEvent> #include <kfiledialog.h> Modified: trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -34,7 +34,6 @@ #include <qwidget.h> #include <q3listbox.h> #include <qtoolbutton.h> -//Added by qt3to4: #include <QKeyEvent> #include <klineedit.h> #include <kurl.h> Modified: trunk/krusader_kde4/krusader/Dialogs/newftpgui.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/newftpgui.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/newftpgui.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -16,7 +16,6 @@ #include <qvariant.h> #include <qimage.h> #include <qpixmap.h> -//Added by qt3to4: #include <QEvent> #include <QHBoxLayout> #include <QVBoxLayout> Modified: trunk/krusader_kde4/krusader/Dialogs/newftpgui.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/newftpgui.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/newftpgui.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -11,7 +11,6 @@ #include <qvariant.h> #include <qdialog.h> -//Added by qt3to4: #include <QVBoxLayout> #include <QEvent> #include <QGridLayout> Modified: trunk/krusader_kde4/krusader/Dialogs/packguibase.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/packguibase.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/packguibase.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -41,7 +41,6 @@ #include <qpixmap.h> #include <qspinbox.h> #include <qslider.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QGridLayout> #include <QFrame> Modified: trunk/krusader_kde4/krusader/Dialogs/packguibase.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/packguibase.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/packguibase.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include <klocale.h> #include <qdialog.h> #include <qmap.h> -//Added by qt3to4: #include <QGridLayout> #include <QHBoxLayout> #include <QVBoxLayout> Modified: trunk/krusader_kde4/krusader/Dialogs/percentalsplitter.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/percentalsplitter.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/percentalsplitter.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -31,7 +31,6 @@ #include "percentalsplitter.h" #include <qpainter.h> #include <qapplication.h> -//Added by qt3to4: #include <QLabel> #include <QList> #include <QFrame> Modified: trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -1,7 +1,6 @@ #include <kmessagebox.h> #include <klocale.h> #include <qpushbutton.h> -//Added by qt3to4: #include <QGridLayout> #include <qlist.h> #include <k3listview.h> Modified: trunk/krusader_kde4/krusader/DiskUsage/diskusage.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/diskusage.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/diskusage.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -30,7 +30,6 @@ #include <time.h> #include <qlayout.h> -//Added by qt3to4: #include <QKeyEvent> #include <QLabel> #include <QGridLayout> Modified: trunk/krusader_kde4/krusader/DiskUsage/diskusage.h =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/diskusage.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/diskusage.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -39,7 +39,6 @@ #include <q3dict.h> #include <q3ptrdict.h> #include <qstack.h> -//Added by qt3to4: #include <QResizeEvent> #include <QPixmap> #include <QKeyEvent> Modified: trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -35,7 +35,6 @@ #include "../Dialogs/krdialogs.h" #include <qtimer.h> -//Added by qt3to4: #include <QResizeEvent> #include <QGridLayout> #include <QHBoxLayout> Modified: trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.h =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -34,7 +34,6 @@ #include <qdialog.h> #include <qlayout.h> #include <qtoolbutton.h> -//Added by qt3to4: #include <QResizeEvent> #include <kurl.h> #include <ksqueezedtextlabel.h> Modified: trunk/krusader_kde4/krusader/DiskUsage/dufilelight.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/dufilelight.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/dufilelight.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include <kmenu.h> #include <klocale.h> #include <kinputdialog.h> -//Added by qt3to4: #include <QPixmap> #include <QMouseEvent> Modified: trunk/krusader_kde4/krusader/DiskUsage/dufilelight.h =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/dufilelight.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/dufilelight.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -34,7 +34,6 @@ #include "diskusage.h" #include "radialMap/widget.h" #include "filelightParts/Config.h" -//Added by qt3to4: #include <QMouseEvent> class DUFilelight : public RadialMap::Widget Modified: trunk/krusader_kde4/krusader/DiskUsage/dulines.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/dulines.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/dulines.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -32,7 +32,6 @@ #include "../kicons.h" #include "../krusader.h" #include "../VFS/krpermhandler.h" -//Added by qt3to4: #include <QPixmap> #include <QMouseEvent> #include <QKeyEvent> Modified: trunk/krusader_kde4/krusader/DiskUsage/dulines.h =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/dulines.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/dulines.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -32,7 +32,6 @@ #define __DU_LINES_H__ #include <qpixmap.h> -//Added by qt3to4: #include <QMouseEvent> #include <QKeyEvent> #include <QResizeEvent> Modified: trunk/krusader_kde4/krusader/DiskUsage/dulistview.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/dulistview.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/dulistview.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include "../kicons.h" #include "../VFS/krpermhandler.h" #include <qfontmetrics.h> -//Added by qt3to4: #include <QMouseEvent> #include <QKeyEvent> #include <klocale.h> Modified: trunk/krusader_kde4/krusader/DiskUsage/dulistview.h =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/dulistview.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/dulistview.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -32,7 +32,6 @@ #define __DU_LISTVIEW_H__ #include "../GUI/krtreewidget.h" -//Added by qt3to4: #include <QMouseEvent> #include <QKeyEvent> #include "diskusage.h" Modified: trunk/krusader_kde4/krusader/DiskUsage/radialMap/map.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/radialMap/map.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/radialMap/map.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -9,7 +9,6 @@ #include <qfont.h> //ctor #include <qfontmetrics.h> //ctor #include <qpainter.h> -//Added by qt3to4: #include <Q3PointArray> #include "builder.h" Modified: trunk/krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -10,7 +10,6 @@ #include <klocale.h> #include <qpainter.h> #include <qtooltip.h> //for its palette -//Added by qt3to4: #include <QEvent> Modified: trunk/krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.h =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -6,7 +6,6 @@ #include <qpixmap.h> #include <qwidget.h> -//Added by qt3to4: #include <QEvent> class File; Modified: trunk/krusader_kde4/krusader/DiskUsage/radialMap/widget.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/radialMap/widget.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/radialMap/widget.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -9,7 +9,6 @@ #include <qbitmap.h> //ctor - finding cursor size #include <qcursor.h> //slotPostMouseEvent() #include <qtimer.h> //member -//Added by qt3to4: #include <QEvent> #include <QMouseEvent> Modified: trunk/krusader_kde4/krusader/DiskUsage/radialMap/widget.h =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/radialMap/widget.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/radialMap/widget.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -6,7 +6,6 @@ #include <kurl.h> #include <qtimer.h> -//Added by qt3to4: #include <QResizeEvent> #include <QMouseEvent> #include <QPaintEvent> Modified: trunk/krusader_kde4/krusader/DiskUsage/radialMap/widgetEvents.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/radialMap/widgetEvents.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/DiskUsage/radialMap/widgetEvents.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -19,7 +19,6 @@ #include <qapplication.h>//QApplication::setOverrideCursor() #include <qpainter.h> #include <qtimer.h> //::resizeEvent() -//Added by qt3to4: #include <QPaintEvent> #include <QResizeEvent> #include <QMouseEvent> Modified: trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp =================================================================== --- trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include "../Dialogs/krdialogs.h" #include <qgroupbox.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QGridLayout> #include <QPixmap> Modified: trunk/krusader_kde4/krusader/Filter/filterdialog.cpp =================================================================== --- trunk/krusader_kde4/krusader/Filter/filterdialog.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Filter/filterdialog.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include "generalfilter.h" #include <klocale.h> -//Added by qt3to4: #include <QGridLayout> FilterDialog::FilterDialog ( QWidget *parent ) Modified: trunk/krusader_kde4/krusader/Filter/filtertabs.h =================================================================== --- trunk/krusader_kde4/krusader/Filter/filtertabs.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Filter/filtertabs.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -32,7 +32,6 @@ #define FILTERTABS_H #include <qtabwidget.h> -//Added by qt3to4: #include <QList> #include "filterbase.h" Modified: trunk/krusader_kde4/krusader/Filter/generalfilter.cpp =================================================================== --- trunk/krusader_kde4/krusader/Filter/generalfilter.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Filter/generalfilter.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -38,7 +38,6 @@ #include <kmessagebox.h> #include <kiconloader.h> #include <qpushbutton.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QGridLayout> #include <QLabel> Modified: trunk/krusader_kde4/krusader/Filter/generalfilter.h =================================================================== --- trunk/krusader_kde4/krusader/Filter/generalfilter.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Filter/generalfilter.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -42,7 +42,6 @@ #include <qcheckbox.h> #include <qlabel.h> #include <q3listbox.h> -//Added by qt3to4: #include <QHBoxLayout> #include <kcombobox.h> #include <kshellcompletion.h> Modified: trunk/krusader_kde4/krusader/GUI/dirhistorybutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/dirhistorybutton.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/dirhistorybutton.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -21,7 +21,6 @@ #include "../VFS/vfs.h" #include <qmenu.h> #include <qdir.h> -//Added by qt3to4: #include <QPixmap> #include <klocale.h> #include <kiconloader.h> Modified: trunk/krusader_kde4/krusader/GUI/dirhistorybutton.h =================================================================== --- trunk/krusader_kde4/krusader/GUI/dirhistorybutton.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/dirhistorybutton.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -20,7 +20,6 @@ #include <qwidget.h> #include <qtoolbutton.h> -//Added by qt3to4: #include <kurl.h> class QMenu; Modified: trunk/krusader_kde4/krusader/GUI/kcmdline.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/kcmdline.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/kcmdline.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include "stdlib.h" #include <unistd.h> #include <qmessagebox.h> -//Added by qt3to4: #include <QGridLayout> #include <QFrame> #include <QLabel> Modified: trunk/krusader_kde4/krusader/GUI/kcmdline.h =================================================================== --- trunk/krusader_kde4/krusader/GUI/kcmdline.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/kcmdline.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -38,7 +38,6 @@ #include <qlabel.h> #include <qlayout.h> #include <qtoolbutton.h> -//Added by qt3to4: #include <QKeyEvent> // KDE includes Modified: trunk/krusader_kde4/krusader/GUI/kfnkeys.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/kfnkeys.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/kfnkeys.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -28,7 +28,6 @@ * * ***************************************************************************/ -//Added by qt3to4: #include <QGridLayout> #include <klocale.h> #include <kglobalsettings.h> Modified: trunk/krusader_kde4/krusader/GUI/kfnkeys.h =================================================================== --- trunk/krusader_kde4/krusader/GUI/kfnkeys.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/kfnkeys.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -35,7 +35,6 @@ #include <qwidget.h> #include <qlayout.h> #include <qpushbutton.h> -//Added by qt3to4: #include <QGridLayout> // Function Keys widget Modified: trunk/krusader_kde4/krusader/GUI/mediabutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/mediabutton.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/mediabutton.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -39,7 +39,6 @@ #include <qfile.h> #include <qfontmetrics.h> -//Added by qt3to4: #include <qtextstream.h> #include <QPixmap> #include <QMouseEvent> Modified: trunk/krusader_kde4/krusader/GUI/mediabutton.h =================================================================== --- trunk/krusader_kde4/krusader/GUI/mediabutton.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/mediabutton.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include <qwidget.h> #include <qtoolbutton.h> -//Added by qt3to4: #include <QEvent> #include <QMenu> #include <kurl.h> Modified: trunk/krusader_kde4/krusader/GUI/syncbrowsebutton.h =================================================================== --- trunk/krusader_kde4/krusader/GUI/syncbrowsebutton.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/GUI/syncbrowsebutton.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -29,7 +29,6 @@ #define SYNCBROWSEBUTTON_H #include <qtoolbutton.h> -//Added by qt3to4: #include <QPixmap> // No synchrone browsing Modified: trunk/krusader_kde4/krusader/KViewer/diskusageviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/diskusageviewer.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/KViewer/diskusageviewer.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include "../Panel/listpanel.h" #include "../Panel/panelfunc.h" #include "diskusageviewer.h" -//Added by qt3to4: #include <QGridLayout> #include <QLabel> Modified: trunk/krusader_kde4/krusader/KViewer/diskusageviewer.h =================================================================== --- trunk/krusader_kde4/krusader/KViewer/diskusageviewer.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/KViewer/diskusageviewer.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -35,7 +35,6 @@ #include <kurl.h> #include <qlayout.h> #include <qlabel.h> -//Added by qt3to4: #include <QGridLayout> class DiskUsageViewer : public QWidget Modified: trunk/krusader_kde4/krusader/KViewer/kimagefilepreview.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/kimagefilepreview.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/KViewer/kimagefilepreview.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -12,7 +12,6 @@ #include <qcombobox.h> #include <qcheckbox.h> #include <qtimer.h> -//Added by qt3to4: #include <QPixmap> #include <QResizeEvent> #include <QVBoxLayout> Modified: trunk/krusader_kde4/krusader/KViewer/kimagefilepreview.h =================================================================== --- trunk/krusader_kde4/krusader/KViewer/kimagefilepreview.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/KViewer/kimagefilepreview.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -14,7 +14,6 @@ #define KrusaderImageFilePreview_H #include <qpixmap.h> -//Added by qt3to4: #include <QResizeEvent> #include <QLabel> Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -18,7 +18,6 @@ #include <qdatastream.h> #include <qfile.h> #include <qtimer.h> -//Added by qt3to4: #include <QKeyEvent> #include <QEvent> // KDE includes Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.h =================================================================== --- trunk/krusader_kde4/krusader/KViewer/krviewer.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/KViewer/krviewer.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -19,7 +19,6 @@ #define KRVIEWER_H #include <qwidget.h> -//Added by qt3to4: #include <QEvent> #include <QList> #include <QKeyEvent> Modified: trunk/krusader_kde4/krusader/Konfigurator/kgadvanced.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgadvanced.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgadvanced.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -31,7 +31,6 @@ #include "kgadvanced.h" #include "../defaults.h" #include <klocale.h> -//Added by qt3to4: #include <QGridLayout> #include <QLabel> #include <sys/param.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/kgarchives.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgarchives.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgarchives.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -29,7 +29,6 @@ ***************************************************************************/ #include <qpushbutton.h> -//Added by qt3to4: #include <QGridLayout> #include "kgarchives.h" Modified: trunk/krusader_kde4/krusader/Konfigurator/kgcolors.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgcolors.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgcolors.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -38,7 +38,6 @@ #include <kstandarddirs.h> #include <q3header.h> #include <qtabwidget.h> -//Added by qt3to4: #include <QList> #include <QLabel> #include <QGridLayout> Modified: trunk/krusader_kde4/krusader/Konfigurator/kgcolors.h =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgcolors.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgcolors.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -35,7 +35,6 @@ #include <qlist.h> #include <q3listview.h> #include <qstackedwidget.h> -//Added by qt3to4: #include <QGridLayout> #include <QLabel> Modified: trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -32,7 +32,6 @@ #include "../krservices.h" #include "../krusader.h" #include <qtabwidget.h> -//Added by qt3to4: #include <QGridLayout> #include <klocale.h> #include <kmessagebox.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.h =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -32,7 +32,6 @@ #define __KGDEPENDENCIES_H__ #include "konfiguratorpage.h" -//Added by qt3to4: #include <QGridLayout> class QTabWidget; Modified: trunk/krusader_kde4/krusader/Konfigurator/kggeneral.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kggeneral.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kggeneral.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -30,7 +30,6 @@ #include <qlabel.h> #include <qfontmetrics.h> -//Added by qt3to4: #include <QGridLayout> #include <QFrame> #include <QPixmap> Modified: trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include "../defaults.h" #include "../Dialogs/krdialogs.h" #include <qtabwidget.h> -//Added by qt3to4: #include <QGridLayout> #include <QLabel> #include <QVBoxLayout> Modified: trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgprotocols.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -35,7 +35,6 @@ #include <kprotocolinfo.h> #include <kmimetype.h> #include <q3header.h> -//Added by qt3to4: #include <QGridLayout> #include <QVBoxLayout> #include <kiconloader.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/kgstartup.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgstartup.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgstartup.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -34,7 +34,6 @@ #include "../krusader.h" #include <klocale.h> #include <klineedit.h> -//Added by qt3to4: #include <QGridLayout> #include <QLabel> Modified: trunk/krusader_kde4/krusader/Konfigurator/kguseractions.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kguseractions.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kguseractions.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -36,7 +36,6 @@ #include <klocale.h> #include <kpushbutton.h> #include <kdebug.h> -//Added by qt3to4: #include <QGridLayout> #include <QLabel> Modified: trunk/krusader_kde4/krusader/Konfigurator/kgwelcome.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgwelcome.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/kgwelcome.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -30,7 +30,6 @@ #include "kgwelcome.h" #include <kstandarddirs.h> -//Added by qt3to4: #include <QPixmap> #include <QGridLayout> #include <QLabel> Modified: trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -37,7 +37,6 @@ #include <kfiledialog.h> #include <qwidget.h> -//Added by qt3to4: #include <QPixmap> #include <klocale.h> #include <kglobal.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/konfigurator.h =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfigurator.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/konfigurator.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -35,7 +35,6 @@ #include "konfiguratorpage.h" #include <qwidget.h> -//Added by qt3to4: #include <kdialog.h> #include <kpagedialog.h> #include <qtimer.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -34,7 +34,6 @@ #include <qpainter.h> #include <qpen.h> #include <qcolordialog.h> -//Added by qt3to4: #include <QPixmap> #include <QLabel> #include <kiconloader.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.h =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -40,7 +40,6 @@ #include <q3listbox.h> #include <qlist.h> #include <qlineedit.h> -//Added by qt3to4: #include <QPixmap> #include <kurlrequester.h> #include <qboxlayout.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -30,7 +30,6 @@ #include "konfiguratorpage.h" #include <qlayout.h> -//Added by qt3to4: #include <QHBoxLayout> #include <QGridLayout> #include <QFrame> Modified: trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.h =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -36,7 +36,6 @@ #include <qgroupbox.h> #include <qlabel.h> #include <qlayout.h> -//Added by qt3to4: #include <QGridLayout> struct KONFIGURATOR_CHECKBOX_PARAM; Modified: trunk/krusader_kde4/krusader/Konfigurator/krresulttable.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/krresulttable.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/krresulttable.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -30,7 +30,6 @@ #include "krresulttable.h" #include <iostream> -//Added by qt3to4: #include <QGridLayout> #include <QLabel> #include <qlist.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/krresulttable.h =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/krresulttable.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/krresulttable.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -36,7 +36,6 @@ #include <qlayout.h> #include <qstringlist.h> #include <qlist.h> -//Added by qt3to4: #include <QGridLayout> #include <kiconloader.h> Modified: trunk/krusader_kde4/krusader/Konfigurator/krresulttabledialog.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/krresulttabledialog.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/krresulttabledialog.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -29,7 +29,6 @@ ***************************************************************************/ #include "krresulttabledialog.h" -//Added by qt3to4: #include <QVBoxLayout> #include <QLabel> #include <QFrame> Modified: trunk/krusader_kde4/krusader/Konfigurator/krresulttabledialog.h =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/krresulttabledialog.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Konfigurator/krresulttabledialog.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -34,7 +34,6 @@ #include <qlabel.h> #include <qlayout.h> #include <qstringlist.h> -//Added by qt3to4: #include <QVBoxLayout> #include <kdialog.h> Modified: trunk/krusader_kde4/krusader/Locate/locate.cpp =================================================================== --- trunk/krusader_kde4/krusader/Locate/locate.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Locate/locate.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -47,7 +47,6 @@ #include <qfontmetrics.h> #include <qtreewidget.h> #include <qheaderview.h> -//Added by qt3to4: #include <QKeyEvent> #include <QGridLayout> #include <QFrame> Modified: trunk/krusader_kde4/krusader/Locate/locate.h =================================================================== --- trunk/krusader_kde4/krusader/Locate/locate.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Locate/locate.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -36,7 +36,6 @@ #include <k3process.h> #include <khistorycombobox.h> #include <qcheckbox.h> -//Added by qt3to4: #include <QKeyEvent> class KrTreeWidget; Modified: trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -25,7 +25,6 @@ #include "kdiskfreesp.h" #include <qfile.h> #include <qtextstream.h> -//Added by qt3to4: #include <QByteArray> #include <kdebug.h> Modified: trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.h =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/MountMan/kdiskfreesp.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -29,7 +29,6 @@ #include <qobject.h> #include <qstring.h> -//Added by qt3to4: #include <QByteArray> class K3Process; Modified: trunk/krusader_kde4/krusader/MountMan/kmountmangui.cpp =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kmountmangui.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/MountMan/kmountmangui.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -39,7 +39,6 @@ #include "../VFS/vfs.h" #include <klocale.h> #include <qpixmap.h> -//Added by qt3to4: #include <QGridLayout> #include <QList> #include <kmenu.h> Modified: trunk/krusader_kde4/krusader/MountMan/kmountmangui.h =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kmountmangui.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/MountMan/kmountmangui.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -36,7 +36,6 @@ #include <sys/param.h> #include <kdialog.h> #include <q3listview.h> -//Added by qt3to4: #include <QFrame> #include <qtimer.h> #include <kurl.h> Modified: trunk/krusader_kde4/krusader/Panel/krbriefview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krbriefview.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krbriefview.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -39,7 +39,6 @@ #include "../VFS/krquery.h" #include "../Dialogs/krspecialwidgets.h" #include <q3header.h> -//Added by qt3to4: #include <QDragLeaveEvent> #include <QKeyEvent> #include <QDragMoveEvent> Modified: trunk/krusader_kde4/krusader/Panel/krbriefview.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/krbriefview.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krbriefview.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -34,7 +34,6 @@ #include "krviewitem.h" #include <k3iconview.h> #include <qtimer.h> -//Added by qt3to4: #include <QDragMoveEvent> #include <QDropEvent> #include <QDragLeaveEvent> Modified: trunk/krusader_kde4/krusader/Panel/krbriefviewitem.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krbriefviewitem.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krbriefviewitem.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -9,7 +9,6 @@ #include <qpainter.h> #include <q3pointarray.h> -//Added by qt3to4: #include <QPixmap> #define PROPS _viewProperties Modified: trunk/krusader_kde4/krusader/Panel/krbriefviewitem.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/krbriefviewitem.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krbriefviewitem.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -36,7 +36,6 @@ #include "../VFS/vfile.h" #include <k3iconview.h> #include <qpointer.h> -//Added by qt3to4: #include <QPixmap> #define FASTER Modified: trunk/krusader_kde4/krusader/Panel/krcalcspacedialog.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krcalcspacedialog.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krcalcspacedialog.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -33,7 +33,6 @@ #include <qtimer.h> #include <qlayout.h> #include <qlabel.h> -//Added by qt3to4: #include <QVBoxLayout> // KDE Includes #include <klocale.h> Modified: trunk/krusader_kde4/krusader/Panel/krcalcspacedialog.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/krcalcspacedialog.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krcalcspacedialog.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -40,7 +40,6 @@ #include <kio/jobclasses.h> // Qt Includes #include <qthread.h> -//Added by qt3to4: #include <QLabel> // Krusader Includes #include "../VFS/vfs.h" Modified: trunk/krusader_kde4/krusader/Panel/krcolorcache.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krcolorcache.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krcolorcache.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -32,7 +32,6 @@ #include "../defaults.h" #include <kcolorscheme.h> #include <qfile.h> -//Added by qt3to4: #include <QList> Modified: trunk/krusader_kde4/krusader/Panel/krcolorcache.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/krcolorcache.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krcolorcache.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -3,7 +3,6 @@ #include <qobject.h> #include <q3dict.h> -//Added by qt3to4: #include <QList> #include <qcolor.h> #include <qpalette.h> Modified: trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -45,7 +45,6 @@ #include <qdir.h> #include <q3header.h> #include <qstyle.h> -//Added by qt3to4: #include <QWheelEvent> #include <QMouseEvent> #include <QKeyEvent> Modified: trunk/krusader_kde4/krusader/Panel/krdetailedview.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedview.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krdetailedview.h 2008-01-28 07:27:59 UTC (rev 2681) @@ -36,7 +36,6 @@ #include <qwidget.h> #include <qtimer.h> #include <qdatetime.h> -//Added by qt3to4: #include <QDragMoveEvent> #include <QDropEvent> #include <QWheelEvent> Modified: trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.cpp 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.cpp 2008-01-28 07:27:59 UTC (rev 2681) @@ -40,7 +40,6 @@ #include <sys/types.h> #include <time.h> #include <qpainter.h> -//Added by qt3to4: #include <QPixmap> #include <pwd.h> #include <grp.h> Modified: trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.h 2008-01-28 00:06:41 UTC (rev 2680) +++ trunk/krusader_kde4/krusader/Panel/krdetailedv... [truncated message content] |
From: <ck...@us...> - 2008-01-30 07:02:34
|
Revision: 2688 http://krusader.svn.sourceforge.net/krusader/?rev=2688&view=rev Author: ckarai Date: 2008-01-29 23:02:38 -0800 (Tue, 29 Jan 2008) Log Message: ----------- FIXED: KMimeType null reference bug Modified Paths: -------------- trunk/krusader_kde4/iso/kiso.cpp trunk/krusader_kde4/krArc/krarc.cpp trunk/krusader_kde4/krusader/DiskUsage/diskusage.cpp trunk/krusader_kde4/krusader/DiskUsage/dulistview.cpp trunk/krusader_kde4/krusader/GUI/mediabutton.cpp trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.cpp trunk/krusader_kde4/krusader/Panel/krviewitem.cpp trunk/krusader_kde4/krusader/Panel/panelpopup.cpp trunk/krusader_kde4/krusader/Search/krsearchmod.cpp trunk/krusader_kde4/krusader/UserAction/kraction.cpp trunk/krusader_kde4/krusader/VFS/vfile.cpp trunk/krusader_kde4/krusader/VFS/vfile.h Modified: trunk/krusader_kde4/iso/kiso.cpp =================================================================== --- trunk/krusader_kde4/iso/kiso.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/iso/kiso.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -115,7 +115,10 @@ bool forced = true; if ( mimetype.isEmpty() ) { - mimetype = KMimeType::findByFileContent( filename )->name(); + KSharedPtr<KMimeType> result = KMimeType::findByFileContent( filename ); + if( result ) + mimetype = result->name(); + kDebug() << "KIso::KIso mimetype=" << mimetype << endl; // Don't move to prepareDevice - the other constructor theoretically allows ANY filter Modified: trunk/krusader_kde4/krArc/krarc.cpp =================================================================== --- trunk/krusader_kde4/krArc/krarc.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krArc/krarc.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -324,7 +324,8 @@ // Determine the mimetype of the file to be retrieved, and emit it. // This is mandatory in all slaves (for KRun/BrowserRun to work). KMimeType::Ptr mt = KMimeType::findByUrl( arcTempDir+file, 0, false /* NOT local URL */ ); - emit mimeType( mt->name() ); + if( mt ) + emit mimeType( mt->name() ); proc << getCmd << convertName( arcFile->url().path() )+" "; if( arcType != "gzip" && arcType != "bzip2" ) proc << convertFileName( file ); connect(&proc,SIGNAL(receivedStdout(K3Process*,char*,int)), @@ -385,7 +386,8 @@ // Determine the mimetype of the file to be retrieved, and emit it. // This is mandatory in all slaves (for KRun/BrowserRun to work). KMimeType::Ptr mt = KMimeType::findByUrl( arcTempDir+file, buff.st_mode, true /* local URL */ ); - emit mimeType( mt->name() ); + if( mt ) + emit mimeType( mt->name() ); KIO::filesize_t processed_size = 0; @@ -511,7 +513,10 @@ if( QFileInfo(path).exists() ){ KDE_struct_stat buff; KDE_stat( path.local8Bit(), &buff ); - QString mime = KMimeType::findByPath(path,buff.st_mode)->name(); + QString mime; + KMimeType::Ptr result = KMimeType::findByPath(path,buff.st_mode); + if( result ) + mime = result->name(); statEntry(KFileItem(path,mime,buff.st_mode).entry()); finished(); return; Modified: trunk/krusader_kde4/krusader/DiskUsage/diskusage.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/diskusage.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/DiskUsage/diskusage.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -999,7 +999,13 @@ if ( mime == "Broken Link !" ) icon = FL_LOADICON( "file_broken" ); else - icon = FL_LOADICON( KMimeType::mimeType( mime ) ->iconName() ); + { + KMimeType::Ptr mt = KMimeType::mimeType( mime ); + if( mt ) + icon = FL_LOADICON( mt->iconName() ); + else + icon = FL_LOADICON( "file_broken" ); + } // insert it into the cache QPixmapCache::insert( mime, icon ); @@ -1050,7 +1056,9 @@ QString DiskUsage::getToolTip( File *item ) { KMimeType::Ptr mimePtr = KMimeType::mimeType( item->mime() ); - QString mime = mimePtr->comment(); + QString mime; + if( mimePtr ) + mime = mimePtr->comment(); time_t tma = item->time(); struct tm* t=localtime((time_t *)&tma); Modified: trunk/krusader_kde4/krusader/DiskUsage/dulistview.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/dulistview.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/DiskUsage/dulistview.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -129,7 +129,9 @@ File *item = *it; KMimeType::Ptr mimePtr = KMimeType::mimeType( item->mime() ); - QString mime = mimePtr->comment(); + QString mime; + if( mimePtr ) + mime = mimePtr->comment(); time_t tma = item->time(); struct tm* t=localtime((time_t *)&tma); Modified: trunk/krusader_kde4/krusader/GUI/mediabutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/mediabutton.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/GUI/mediabutton.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -174,7 +174,10 @@ if( text != "." && text != ".." ) { int index = popupMenu->count(); - QPixmap pixmap = FL_LOADICON( KMimeType::mimeType( mime ) ->iconName() ); + KMimeType::Ptr mt = KMimeType::mimeType( mime ); + QPixmap pixmap; + if( mt ) + pixmap = FL_LOADICON( mt->iconName() ); mediaUrls.append( url ); @@ -386,7 +389,11 @@ mimes[ i ] = mimes[ i ].replace( "_mounted", "_unmounted" ); } - QPixmap pixmap = FL_LOADICON( KMimeType::mimeType( mimes[ i ] ) ->iconName() ); + KMimeType::Ptr mt = KMimeType::mimeType( mimes[ i ] ); + QPixmap pixmap; + if( mt ) + pixmap = FL_LOADICON( mt->iconName() ); + idActionMap[ i ]->setIcon( pixmap ); } else if( mimes[ i ].contains( "hdd_" ) ) @@ -478,7 +485,10 @@ this, SLOT( gettingSpaceData( const QString&, quint64, quint64, quint64 ) ) ); } - QPixmap pixmap = FL_LOADICON( KMimeType::mimeType( mime ) ->iconName() ); + KMimeType::Ptr mt = KMimeType::mimeType( mime ); + QPixmap pixmap; + if( mt ) + pixmap = FL_LOADICON( mt->iconName() ); if( overwrite == -1 ) { int index = popupMenu->count(); @@ -681,7 +691,10 @@ if( mimes[ index ].contains( "_unmounted" ) && mounted ) mimes[ index ] = mimes[ index ].replace( "_unmounted", "_mounted" ); - QPixmap pixmap = FL_LOADICON( KMimeType::mimeType( mimes[ index ] ) ->iconName() ); + KMimeType::Ptr mt = KMimeType::mimeType( mimes[ index ] ); + QPixmap pixmap; + if( mt ) + pixmap = FL_LOADICON( mt->iconName() ); idActionMap[ index ]->setIcon( pixmap ); idActionMap[ index ]->setText( text ); Modified: trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -60,7 +60,8 @@ curl = url; if( mode == KrViewer::Generic ){ - cmimetype = KMimeType::findByUrl( curl ) ->name(); + KMimeType::Ptr mt = KMimeType::findByUrl( curl ); + cmimetype = mt ? mt->name() : QString(); cpart = ( *mimes ) [ cmimetype ]; if ( !cpart ){ cpart = getPart( cmimetype ); @@ -214,7 +215,8 @@ curl = url; if( mode == KrViewer::Generic ){ - cmimetype = KMimeType::findByUrl( curl ) ->name(); + KMimeType::Ptr mt = KMimeType::findByUrl( curl ); + cmimetype = mt ? mt->name() : QString(); cpart = ( *mimes ) [ cmimetype ]; if ( !cpart ){ cpart = getPart( cmimetype ); Modified: trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/Panel/krdetailedviewitem.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -104,7 +104,9 @@ // set text in columns, according to what columns are available int id = KrDetailedViewProperties::Unused; if ((id = COLUMN(Mime)) != -1) { - tmp = KMimeType::mimeType(_vf->vfile_getMime())->comment(); + KMimeType::Ptr mt = KMimeType::mimeType(_vf->vfile_getMime()); + if( mt ) + tmp = mt->comment(); setText( id, tmp ); } if ((id = COLUMN(Size)) != -1) { Modified: trunk/krusader_kde4/krusader/Panel/krviewitem.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krviewitem.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/Panel/krviewitem.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -48,7 +48,10 @@ if (dummyVfile) return i18n("Climb up the directory tree"); // else is implied QString text = _vf->vfile_getName(); - QString comment = KMimeType::mimeType(_vf->vfile_getMime())->comment(_vf->vfile_getUrl()); + QString comment; + KMimeType::Ptr mt = KMimeType::mimeType(_vf->vfile_getMime()); + if( mt ) + comment = mt->comment(_vf->vfile_getUrl()); QString myLinkDest = _vf->vfile_getSymDest(); KIO::filesize_t mySize = _vf->vfile_getSize(); @@ -57,8 +60,8 @@ if (_vf->vfile_isSymLink() ){ QString tmp; - if ( comment.isEmpty() ) tmp = i18n ( "Symbolic Link" ) ; - else if( _vf->vfile_getMime() == "Broken Link !" ) tmp = i18n("(broken link !)"); + if ( _vf->vfile_getMime() == "Broken Link !" ) tmp = i18n("(broken link !)"); + else if ( comment.isEmpty() ) tmp = i18n ( "Symbolic Link" ) ; else tmp = i18n("%1 (Link)", comment); text += "->"; Modified: trunk/krusader_kde4/krusader/Panel/panelpopup.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/panelpopup.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/Panel/panelpopup.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -278,7 +278,8 @@ } void PanelPopup::handleOpenUrlRequest(const KUrl &url) { - if (KMimeType::findByUrl(url.url())->name() == "inode/directory") ACTIVE_PANEL->func->openUrl(url); + KMimeType::Ptr mime = KMimeType::findByUrl(url.url()); + if (mime && mime->name() == "inode/directory") ACTIVE_PANEL->func->openUrl(url); } @@ -342,12 +343,15 @@ dataLine->setText( i18n("View: ")+url.fileName() ); break; case DskUsage: - if( url.fileName() == ".." ) - url.setFileName( "" ); - if (KMimeType::findByUrl(url.url())->name() != "inode/directory") - url = url.upUrl(); - dataLine->setText( i18n("Disk Usage: ")+url.fileName() ); - diskusage->openUrl(url); + { + if( url.fileName() == ".." ) + url.setFileName( "" ); + KMimeType::Ptr mt = KMimeType::findByUrl(url.url()); + if (!mt || mt->name() != "inode/directory") + url = url.upUrl(); + dataLine->setText( i18n("Disk Usage: ")+url.fileName() ); + diskusage->openUrl(url); + } break; case Tree: // nothing to do break; Modified: trunk/krusader_kde4/krusader/Search/krsearchmod.cpp =================================================================== --- trunk/krusader_kde4/krusader/Search/krsearchmod.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/Search/krsearchmod.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -144,7 +144,11 @@ QString mime = QString(); if ( query->searchInArchives() || !query->hasMimeType() ) - mime = KMimeType::findByUrl( url, stat_p.st_mode, true, false ) ->name(); + { + KMimeType::Ptr mt = KMimeType::findByUrl( url, stat_p.st_mode, true, false ); + if( mt ) + mime = mt->name(); + } // creating a vfile object for matching with krquery vfile * vf = new vfile(name, (KIO::filesize_t)stat_p.st_size, KRpermHandler::mode2QString(stat_p.st_mode), Modified: trunk/krusader_kde4/krusader/UserAction/kraction.cpp =================================================================== --- trunk/krusader_kde4/krusader/UserAction/kraction.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/UserAction/kraction.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -367,20 +367,23 @@ if ( ! _showonlyMime.empty() ) { available = false; KMimeType::Ptr mime = KMimeType::findByUrl( currentURL ); - for ( QStringList::Iterator it = _showonlyMime.begin(); it != _showonlyMime.end(); ++it ) { - if ( (*it).contains("/") ) { - if ( mime->is( *it ) ) { // don't use ==; use 'is()' instead, which is aware of inheritence (ie: text/x-makefile is also text/plain) - available = true; - break; + if( mime ) + { + for ( QStringList::Iterator it = _showonlyMime.begin(); it != _showonlyMime.end(); ++it ) { + if ( (*it).contains("/") ) { + if ( mime->is( *it ) ) { // don't use ==; use 'is()' instead, which is aware of inheritence (ie: text/x-makefile is also text/plain) + available = true; + break; + } } - } - else { - if ( mime->name().find( *it ) == 0 ) { // 0 is the beginning, -1 is not found - available = true; - break; + else { + if ( mime->name().find( *it ) == 0 ) { // 0 is the beginning, -1 is not found + available = true; + break; + } } - } - } //for + } //for + } } //check the mime-type: done //check filename Modified: trunk/krusader_kde4/krusader/VFS/vfile.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/vfile.cpp 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/VFS/vfile.cpp 2008-01-30 07:02:38 UTC (rev 2688) @@ -148,7 +148,8 @@ const QString& vfile::vfile_getMime(bool fast){ if( vfile_mimeType == QString() ){ // mimetype == "" is OK so don't check mimetype.empty() ! - vfile_mimeType = KMimeType::findByUrl( vfile_getUrl(),vfile_getMode(),vfile_getUrl().isLocalFile(),fast)->name(); + KMimeType::Ptr mt = KMimeType::findByUrl( vfile_getUrl(),vfile_getMode(),vfile_getUrl().isLocalFile(),fast); + vfile_mimeType = mt ? mt->name() : "Broken Link !"; if( vfile_mimeType.contains("directory") ) vfile_perm[0] = 'd', vfile_isdir = true; } return vfile_mimeType; Modified: trunk/krusader_kde4/krusader/VFS/vfile.h =================================================================== --- trunk/krusader_kde4/krusader/VFS/vfile.h 2008-01-30 00:29:51 UTC (rev 2687) +++ trunk/krusader_kde4/krusader/VFS/vfile.h 2008-01-30 07:02:38 UTC (rev 2688) @@ -158,7 +158,8 @@ if ( mime == "Broken Link !" ) vfile_icon = "file_broken"; else { - vfile_icon = KMimeType::mimeType( mime ) ->iconName(); + KMimeType::Ptr mt = KMimeType::mimeType( mime ); + vfile_icon = mt ? mt->iconName() : "file_broken"; } } return vfile_icon; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ck...@us...> - 2008-01-31 00:46:34
|
Revision: 2690 http://krusader.svn.sourceforge.net/krusader/?rev=2690&view=rev Author: ckarai Date: 2008-01-30 16:46:40 -0800 (Wed, 30 Jan 2008) Log Message: ----------- Q3Dict -> QHash, part II., krpermhandler Modified Paths: -------------- trunk/krusader_kde4/iso/kiso.h trunk/krusader_kde4/krusader/Panel/krcolorcache.h trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp trunk/krusader_kde4/krusader/VFS/krpermhandler.h Modified: trunk/krusader_kde4/iso/kiso.h =================================================================== --- trunk/krusader_kde4/iso/kiso.h 2008-01-30 22:41:16 UTC (rev 2689) +++ trunk/krusader_kde4/iso/kiso.h 2008-01-31 00:46:40 UTC (rev 2690) @@ -28,7 +28,6 @@ #include <qdatetime.h> #include <qstring.h> #include <qstringlist.h> -#include <q3dict.h> #include "kisofile.h" #include "kisodirectory.h" Modified: trunk/krusader_kde4/krusader/Panel/krcolorcache.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/krcolorcache.h 2008-01-30 22:41:16 UTC (rev 2689) +++ trunk/krusader_kde4/krusader/Panel/krcolorcache.h 2008-01-31 00:46:40 UTC (rev 2690) @@ -2,7 +2,6 @@ #define KRCOLORCACHE_H #include <qobject.h> -#include <q3dict.h> #include <QList> #include <qcolor.h> #include <qpalette.h> Modified: trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-01-30 22:41:16 UTC (rev 2689) +++ trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-01-31 00:46:40 UTC (rev 2690) @@ -57,7 +57,6 @@ #include <klocale.h> #include <kmenu.h> #include <kcolorscheme.h> -#include <q3dict.h> #include <qstyle.h> ////////////////////////////////////////////////////////////////////////// Modified: trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp 2008-01-30 22:41:16 UTC (rev 2689) +++ trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp 2008-01-31 00:46:40 UTC (rev 2690) @@ -48,8 +48,8 @@ #include "krpermhandler.h" #include "../resources.h" -Q3Dict<uid_t> *KRpermHandler::passwdCache = 0L; -Q3Dict<gid_t> *KRpermHandler::groupCache = 0L; +QHash<QString, uid_t> *KRpermHandler::passwdCache = 0L; +QHash<QString, gid_t> *KRpermHandler::groupCache = 0L; QHash<int, char> *KRpermHandler::currentGroups = 0L; QHash<int, QString> *KRpermHandler::uidCache = 0L; QHash<int, QString> *KRpermHandler::gidCache = 0L; @@ -166,22 +166,16 @@ int groupNo = getgroups( 50, groupList ); // init the groups and user caches - passwdCache = new Q3Dict<uid_t>( 317 ); - groupCache = new Q3Dict<gid_t>( 317 ); + passwdCache = new QHash<QString, uid_t>(); + groupCache = new QHash<QString, gid_t>(); currentGroups = new QHash<int, char>(); uidCache = new QHash<int, QString>(); gidCache = new QHash<int, QString>(); - - passwdCache->setAutoDelete( true ); - groupCache->setAutoDelete( true ); - // fill the UID cache struct passwd *pass; - uid_t* uid_temp; while ( ( pass = getpwent() ) != 0L ) { - uid_temp = new uid_t( pass->pw_uid ); - passwdCache->insert( pass->pw_name, uid_temp ); + passwdCache->insert( pass->pw_name, pass->pw_uid ); (*uidCache)[ pass->pw_uid ] = QString( pass->pw_name ); } delete pass; @@ -189,10 +183,8 @@ // fill the GID cache struct group *gr; - gid_t* gid_temp; while ( ( gr = getgrent() ) != 0L ) { - gid_temp = new gid_t( gr->gr_gid ); - groupCache->insert( gr->gr_name, gid_temp ); + groupCache->insert( gr->gr_name, gr->gr_gid ); (*gidCache)[ gr->gr_gid ] = QString( gr->gr_name ); } delete gr; @@ -321,14 +313,14 @@ } gid_t KRpermHandler::group2gid( QString group ) { - gid_t * gid = groupCache->find( group ); - if ( gid ) return * gid; - return getgid(); + if( groupCache->find( group ) == groupCache->end() ) + return getgid(); + return (*groupCache)[ group ]; } uid_t KRpermHandler::user2uid ( QString user ) { - uid_t * uid = passwdCache->find( user ); - if ( uid ) return * uid; - return getuid(); + if( passwdCache->find( user ) == passwdCache->end() ) + return getuid(); + return (*passwdCache)[ user ]; } QString KRpermHandler::gid2group( gid_t groupId ) { Modified: trunk/krusader_kde4/krusader/VFS/krpermhandler.h =================================================================== --- trunk/krusader_kde4/krusader/VFS/krpermhandler.h 2008-01-30 22:41:16 UTC (rev 2689) +++ trunk/krusader_kde4/krusader/VFS/krpermhandler.h 2008-01-31 00:46:40 UTC (rev 2690) @@ -35,7 +35,6 @@ #include <qstring.h> #include <qfileinfo.h> #include <sys/types.h> -#include <q3dict.h> #include <qhash.h> #include <kio/global.h> @@ -79,11 +78,11 @@ private: // cache for passwd and group entries - static Q3Dict<uid_t> *passwdCache; - static Q3Dict<gid_t> *groupCache; - static QHash<int, char> *currentGroups; - static QHash<int, QString> *uidCache; - static QHash<int, QString> *gidCache; + static QHash<QString, uid_t> *passwdCache; + static QHash<QString, gid_t> *groupCache; + static QHash<int, char> *currentGroups; + static QHash<int, QString> *uidCache; + static QHash<int, QString> *gidCache; }; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jb...@us...> - 2008-02-02 01:37:41
|
Revision: 2701 http://krusader.svn.sourceforge.net/krusader/?rev=2701&view=rev Author: jbaehr Date: 2008-02-01 17:37:33 -0800 (Fri, 01 Feb 2008) Log Message: ----------- forward port KDE3 -> KDE4: FIXED: [ 1736496 ] always sort dirs by name not working CVS reference of the KDE3 change by ckarai: *** krdetailedview.cpp 16 Jan 2007 22:21:32 -0000 1.172 --- krdetailedview.cpp 27 Jun 2007 18:56:01 -0000 1.173 Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-02-02 00:36:57 UTC (rev 2700) +++ trunk/krusader_kde4/ChangeLog 2008-02-02 01:37:33 UTC (rev 2701) @@ -1,3 +1,4 @@ + FIXED: [ 1736496 ] always sort dirs by name not working FIXED: untranslatable strings, patch by Vaclav Juza, thanks Modified: trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-02-02 00:36:57 UTC (rev 2700) +++ trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-02-02 01:37:33 UTC (rev 2701) @@ -1586,6 +1586,8 @@ sp = static_cast<KrViewProperties::SortSpec>(sp | KrViewProperties::IgnoreCase); if (sortMode() & KrViewProperties::Descending) sp = static_cast<KrViewProperties::SortSpec>(sp | KrViewProperties::Descending); + if (sortMode() & KrViewProperties::AlwaysSortDirsByName) + sp = static_cast<KrViewProperties::SortSpec>(sp | KrViewProperties::AlwaysSortDirsByName); // fix the ascending/decending stuff if (sortMode() == sp) { if (sp & KrViewProperties::Descending) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jb...@us...> - 2008-02-02 01:38:01
|
Revision: 2702 http://krusader.svn.sourceforge.net/krusader/?rev=2702&view=rev Author: jbaehr Date: 2008-02-01 17:38:02 -0800 (Fri, 01 Feb 2008) Log Message: ----------- forward port KDE3 -> KDE4: FIXED: [ 1645179 ] shortcut keys are not sent to the terminal CVS reference of the KDE3 change by ckarai: *** krusaderview.cpp 27 Mar 2007 20:10:18 -0000 1.39 --- krusaderview.cpp 28 Jun 2007 05:13:16 -0000 1.40 Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/krusaderview.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-02-02 01:37:33 UTC (rev 2701) +++ trunk/krusader_kde4/ChangeLog 2008-02-02 01:38:02 UTC (rev 2702) @@ -1,3 +1,4 @@ + FIXED: [ 1645179 ] shortcut keys are not sent to the terminal FIXED: [ 1736496 ] always sort dirs by name not working FIXED: untranslatable strings, patch by Vaclav Juza, thanks Modified: trunk/krusader_kde4/krusader/krusaderview.cpp =================================================================== --- trunk/krusader_kde4/krusader/krusaderview.cpp 2008-02-02 01:37:33 UTC (rev 2701) +++ trunk/krusader_kde4/krusader/krusaderview.cpp 2008-02-02 01:38:02 UTC (rev 2702) @@ -300,6 +300,11 @@ ke->accept(); return true; } + if( ( ke->modifiers() == Qt::NoModifier || ke->modifiers() == Qt::ShiftModifier ) && + ( ke->key() >= 32 ) && (ke->key() <= 127 ) ) { + ke->accept(); + return true; + } } else if( e->type() == QEvent::KeyPress && konsole_part && konsole_part->widget() == watched ) { QKeyEvent *ke = (QKeyEvent *)e; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jb...@us...> - 2008-02-02 01:38:16
|
Revision: 2703 http://krusader.svn.sourceforge.net/krusader/?rev=2703&view=rev Author: jbaehr Date: 2008-02-01 17:38:21 -0800 (Fri, 01 Feb 2008) Log Message: ----------- forward port KDE3 -> KDE4: FIXED: [ 1681270 ] right clicking pops context menu immediately CVS reference of the KDE3 change by ckarai: *** krbriefview.cpp 23 Jan 2007 10:38:27 -0000 1.21 --- krbriefview.cpp 28 Jun 2007 18:39:53 -0000 1.22 *** krdetailedview.cpp 27 Jun 2007 18:56:01 -0000 1.173 --- krdetailedview.cpp 28 Jun 2007 18:39:53 -0000 1.174 Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/Panel/krbriefview.cpp trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-02-02 01:38:02 UTC (rev 2702) +++ trunk/krusader_kde4/ChangeLog 2008-02-02 01:38:21 UTC (rev 2703) @@ -1,3 +1,4 @@ + FIXED: [ 1681270 ] right clicking pops context menu immediately FIXED: [ 1645179 ] shortcut keys are not sent to the terminal FIXED: [ 1736496 ] always sort dirs by name not working FIXED: untranslatable strings, patch by Vaclav Juza, thanks Modified: trunk/krusader_kde4/krusader/Panel/krbriefview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krbriefview.cpp 2008-02-02 01:38:02 UTC (rev 2702) +++ trunk/krusader_kde4/krusader/Panel/krbriefview.cpp 2008-02-02 01:38:21 UTC (rev 2703) @@ -500,6 +500,33 @@ processEvent = false; e->accept(); } + + if( !KrSelectionMode::getSelectionHandler()->rightButtonPreservesSelection() && KrSelectionMode::getSelectionHandler()->showContextMenu() >= 0) + { + if( (e->modifiers() & Qt::ControlModifier) && !(e->modifiers() & Qt::AltModifier) ) + { + if( newCurrent ) + { + newCurrent->setSelected(!newCurrent->isSelected()); + newCurrent->repaint(); + selectionChanged = true; + callDefaultHandler = false; + e->accept(); + } + } + else if( !(e->modifiers() & Qt::ControlModifier) && !(e->modifiers() & Qt::AltModifier) ) + { + clearSelection(); + if( newCurrent ) + { + newCurrent->setSelected( true ); + newCurrent->repaint(); + } + selectionChanged = true; + callDefaultHandler = false; + e->accept(); + } + } } else { Modified: trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-02-02 01:38:02 UTC (rev 2702) +++ trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-02-02 01:38:21 UTC (rev 2703) @@ -565,6 +565,33 @@ processEvent = false; e->accept(); } + + if( !KrSelectionMode::getSelectionHandler()->rightButtonPreservesSelection() && KrSelectionMode::getSelectionHandler()->showContextMenu() >= 0) + { + if( (e->modifiers() & Qt::ControlModifier) && !(e->modifiers() & Qt::AltModifier) ) + { + if( newCurrent ) + { + newCurrent->setSelected(!newCurrent->isSelected()); + newCurrent->repaint(); + selectionChanged = true; + callDefaultHandler = false; + e->accept(); + } + } + else if( !(e->modifiers() & Qt::ControlModifier) && !(e->modifiers() & Qt::AltModifier) ) + { + clearSelection(); + if( newCurrent ) + { + newCurrent->setSelected( true ); + newCurrent->repaint(); + } + selectionChanged = true; + callDefaultHandler = false; + e->accept(); + } + } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jb...@us...> - 2008-02-02 22:14:08
|
Revision: 2705 http://krusader.svn.sourceforge.net/krusader/?rev=2705&view=rev Author: jbaehr Date: 2008-02-02 14:14:12 -0800 (Sat, 02 Feb 2008) Log Message: ----------- forward port KDE3 -> KDE4: FIXED: [ 1619452 ] Profile doesn't save status of sync-browse mode CVS reference of the KDE3 change by ckarai: *** listpanel.cpp 20 Jan 2007 13:27:34 -0000 1.172 --- listpanel.cpp 29 Jun 2007 19:04:10 -0000 1.173 *** listpanel.h 17 Jan 2007 22:08:50 -0000 1.50 --- listpanel.h 29 Jun 2007 19:04:10 -0000 1.51 *** krusader.cpp 27 Mar 2007 20:10:18 -0000 1.221 --- krusader.cpp 29 Jun 2007 19:04:10 -0000 1.222 *** krusaderview.cpp 28 Jun 2007 05:13:16 -0000 1.40 --- krusaderview.cpp 29 Jun 2007 19:04:10 -0000 1.41 *** krusaderview.h 18 Mar 2007 20:27:29 -0000 1.18 --- krusaderview.h 29 Jun 2007 19:04:10 -0000 1.19 *** panelmanager.cpp 23 Jan 2007 10:38:27 -0000 1.47 --- panelmanager.cpp 29 Jun 2007 19:04:10 -0000 1.48 *** panelmanager.h 17 Jan 2007 22:08:50 -0000 1.22 --- panelmanager.h 29 Jun 2007 19:04:10 -0000 1.23 Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/Panel/listpanel.cpp trunk/krusader_kde4/krusader/Panel/listpanel.h trunk/krusader_kde4/krusader/krusader.cpp trunk/krusader_kde4/krusader/krusaderview.cpp trunk/krusader_kde4/krusader/krusaderview.h trunk/krusader_kde4/krusader/panelmanager.cpp trunk/krusader_kde4/krusader/panelmanager.h Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-02-02 07:30:50 UTC (rev 2704) +++ trunk/krusader_kde4/ChangeLog 2008-02-02 22:14:12 UTC (rev 2705) @@ -1,3 +1,4 @@ + FIXED: [ 1619452 ] Profile doesn't save status of sync-browse mode FIXED: [ 1681270 ] right clicking pops context menu immediately FIXED: [ 1645179 ] shortcut keys are not sent to the terminal FIXED: [ 1736496 ] always sort dirs by name not working Modified: trunk/krusader_kde4/krusader/Panel/listpanel.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/listpanel.cpp 2008-02-02 07:30:50 UTC (rev 2704) +++ trunk/krusader_kde4/krusader/Panel/listpanel.cpp 2008-02-02 22:14:12 UTC (rev 2705) @@ -387,6 +387,22 @@ delete layout; } +int ListPanel::getProperties() +{ + int props = 0; + if( syncBrowseButton->state() == SYNCBROWSE_CD ) + props |= PROP_SYNC_BUTTON_ON; + return props; +} + +void ListPanel::setProperties( int prop ) +{ + if( prop & PROP_SYNC_BUTTON_ON ) + syncBrowseButton->setOn( true ); + else + syncBrowseButton->setOn( false ); +} + bool ListPanel::eventFilter ( QObject * watched, QEvent * e ) { if( e->type() == QEvent::KeyPress && origin->lineEdit() == watched ) { QKeyEvent *ke = (QKeyEvent *)e; Modified: trunk/krusader_kde4/krusader/Panel/listpanel.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/listpanel.h 2008-02-02 07:30:50 UTC (rev 2704) +++ trunk/krusader_kde4/krusader/Panel/listpanel.h 2008-02-02 22:14:12 UTC (rev 2705) @@ -59,6 +59,8 @@ #include "krview.h" #include "../Dialogs/krsqueezedtextlabel.h" +#define PROP_SYNC_BUTTON_ON 1 + class vfs; class vfile; class KrView; @@ -102,6 +104,9 @@ void jumpBack(); void setJumpBack( KUrl url ); + int getProperties(); + void setProperties( int ); + public slots: void gotStats( const QString &mountPoint, quint64 kBSize, quint64 kBUsed, quint64 kBAvail); // displays filesystem status void popRightClickMenu( const QPoint& ); Modified: trunk/krusader_kde4/krusader/krusader.cpp =================================================================== --- trunk/krusader_kde4/krusader/krusader.cpp 2008-02-02 07:30:50 UTC (rev 2704) +++ trunk/krusader_kde4/krusader/krusader.cpp 2008-02-02 22:14:12 UTC (rev 2705) @@ -280,14 +280,18 @@ QStringList rightTabs = gs.readPathEntry( "Right Tab Bar", QStringList() ); QStringList leftTabTypes = gs.readEntry( "Left Tab Bar Types", QStringList() ); QStringList rightTabTypes = gs.readEntry( "Right Tab Bar Types", QStringList() ); + QList<int> leftTabProps = gs.readEntry( "Left Tab Bar Props", QList<int>() ); + QList<int> rightTabProps = gs.readEntry( "Right Tab Bar Props", QList<int>() ); int leftActiveTab = gs.readEntry( "Left Active Tab", 0 ); int rightActiveTab = gs.readEntry( "Right Active Tab", 0 ); QString startProfile = gs.readEntry("Starter Profile Name", QString() ); + bool leftActive = gs.readEntry( "Left Side Is Active", false ); // get command-line arguments if ( args->isSet( "left" ) ) { leftTabs = QStringList::split( ',', args->getOption( "left" ) ); leftTabTypes.clear(); + leftTabProps.clear(); leftActiveTab = 0; @@ -303,6 +307,7 @@ if ( args->isSet( "right" ) ) { rightTabs = QStringList::split( ',', args->getOption( "right" ) ); rightTabTypes.clear(); + rightTabProps.clear(); rightActiveTab = 0; @@ -320,6 +325,10 @@ leftTabTypes += defaultType; while( rightTabTypes.count() < rightTabs.count() ) rightTabTypes += defaultType; + while( leftTabProps.count() < leftTabs.count() ) + leftTabProps += 0; + while( rightTabProps.count() < rightTabs.count() ) + rightTabProps += 0; if ( args->isSet( "profile" ) ) startProfile = args->getOption( "profile" ); @@ -327,8 +336,10 @@ if( !startProfile.isEmpty() ) { leftTabs.clear(); leftTabTypes.clear(); + leftTabProps.clear(); rightTabs.clear(); rightTabTypes.clear(); + rightTabProps.clear(); leftActiveTab = rightActiveTab = 0; } @@ -336,15 +347,18 @@ { leftTabs.push_back( QDir::homePath() ); leftTabTypes.push_back( defaultType ); + leftTabProps.push_back( 0 ); } if( rightTabs.count() == 0 ) { rightTabs.push_back( QDir::homePath() ); rightTabTypes.push_back( defaultType ); + rightTabProps.push_back( 0 ); } // starting the panels - mainView->start( leftTabs, leftTabTypes, leftActiveTab, rightTabs, rightTabTypes, rightActiveTab ); + mainView->start( leftTabs, leftTabTypes, leftTabProps, leftActiveTab, rightTabs, + rightTabTypes, rightTabProps, rightActiveTab, leftActive ); // create the user menu userMenu = new UserMenu( this ); @@ -783,6 +797,7 @@ cfg = config->group( "Startup" ); cfg.writeEntry( "Left Active Tab", mainView->leftMng->activeTab() ); cfg.writeEntry( "Right Active Tab", mainView->rightMng->activeTab() ); + cfg.writeEntry( "Left Side Is Active", mainView->activePanel->isLeft() ); mainView->leftMng->saveSettings( &cfg, "Left Tab Bar" ); mainView->rightMng->saveSettings( &cfg, "Right Tab Bar" ); Modified: trunk/krusader_kde4/krusader/krusaderview.cpp =================================================================== --- trunk/krusader_kde4/krusader/krusaderview.cpp 2008-02-02 07:30:50 UTC (rev 2704) +++ trunk/krusader_kde4/krusader/krusaderview.cpp 2008-02-02 22:14:12 UTC (rev 2705) @@ -58,7 +58,9 @@ KrusaderView::KrusaderView( QWidget *parent ) : QWidget( parent ), activePanel(0), konsole_part( 0L ) {} -void KrusaderView::start( QStringList leftTabs, QStringList leftTypes, int leftActiveTab, QStringList rightTabs, QStringList rightTypes, int rightActiveTab ) { +void KrusaderView::start( QStringList leftTabs, QStringList leftTypes, QList<int> leftProps, int leftActiveTab, + QStringList rightTabs, QStringList rightTypes, QList<int> rightProps, int rightActiveTab, + bool leftSideActive ) { //////////////////////////////// // make a 1x1 mainLayout, it will auto-expand: mainLayout = new QGridLayout( this ); @@ -121,15 +123,22 @@ leftMng->startPanel( left, leftTabs[ 0 ] ); activePanel = left; activePanel->slotFocusOnMe(); // left starts out active + left->setProperties( leftProps[ 0 ] ); + right->setProperties( rightProps[ 0 ] ); for(int i = 1; i < leftTabs.count(); i++ ) - leftMng->slotNewTab( leftTabs[ i ], false, leftTypes[ i ] ); + leftMng->slotNewTab( leftTabs[ i ], false, leftTypes[ i ], leftProps[ i ] ); for(int j = 1; j < rightTabs.count(); j++ ) - rightMng->slotNewTab( rightTabs[ j ], false, rightTypes[ j ] ); + rightMng->slotNewTab( rightTabs[ j ], false, rightTypes[ j ], rightProps[ j ] ); leftMng->setActiveTab( leftActiveTab ); rightMng->setActiveTab( rightActiveTab ); + + if( leftSideActive ) + MAIN_VIEW->left->slotFocusOnMe(); + else + MAIN_VIEW->right->slotFocusOnMe(); } // updates the command line whenever current panel changes Modified: trunk/krusader_kde4/krusader/krusaderview.h =================================================================== --- trunk/krusader_kde4/krusader/krusaderview.h 2008-02-02 07:30:50 UTC (rev 2704) +++ trunk/krusader_kde4/krusader/krusaderview.h 2008-02-02 22:14:12 UTC (rev 2705) @@ -59,7 +59,9 @@ public: KrusaderView(QWidget *parent=0); virtual ~KrusaderView(){} - void start(QStringList leftTabs, QStringList leftTypes, int leftActiveTab, QStringList rightTabs, QStringList rightTypes, int rightActiveTab); + void start(QStringList leftTabs, QStringList leftTypes, QList<int> leftProps, int leftActiveTab, + QStringList rightTabs, QStringList rightTypes, QList<int> rightProps, int rightActiveTab, + bool leftSideActive); void cmdLineFocus(); // command line receive's keyboard focus void cmdLineUnFocus();// return focus from command line to active panel inline PanelManager *activeManager() const { return (activePanel==left ? leftMng : rightMng); } Modified: trunk/krusader_kde4/krusader/panelmanager.cpp =================================================================== --- trunk/krusader_kde4/krusader/panelmanager.cpp 2008-02-02 07:30:50 UTC (rev 2704) +++ trunk/krusader_kde4/krusader/panelmanager.cpp 2008-02-02 22:14:12 UTC (rev 2705) @@ -101,23 +101,27 @@ void PanelManager::saveSettings( KConfigGroup *config, const QString& key, bool localOnly ) { QStringList l; QStringList types; + QList<int> props; int i=0, cnt=0; while (cnt < _tabbar->count()) { ListPanel *panel = _tabbar->getPanel(i); if (panel) { l << ( localOnly ? panel->realPath() : panel->virtualPath().pathOrUrl() ); types << panel->getType(); + props << panel->getProperties(); ++cnt; } ++i; } config->writePathEntry( key, l ); config->writeEntry( key + " Types", types ); + config->writeEntry( key + " Props", props ); } void PanelManager::loadSettings( KConfigGroup *config, const QString& key ) { QStringList l = config->readPathEntry( key, QStringList() ); QStringList types = config->readEntry( key + " Types", QStringList() ); + QList<int> props = config->readEntry( key + " Props", QList<int>() ); if( l.count() < 1 ) return; @@ -127,7 +131,9 @@ KConfigGroup cg( krConfig, "Look&Feel"); types << cg.readEntry( "Default Panel Type", _DefaultPanelType ); } - + while( props.count() < l.count() ) + props << 0; + int i=0, totalTabs = _tabbar->count(); while (i < totalTabs && i < (int)l.count() ) @@ -137,6 +143,7 @@ { if( panel->getType() != types[ i ] ) panel->changeType( types[ i ] ); + panel->setProperties( props[ i ] ); panel->otherPanel = _other; _other->otherPanel = panel; panel->func->files()->vfs_enableRefresh( true ); @@ -149,10 +156,10 @@ slotCloseTab( --totalTabs ); for(; i < (int)l.count(); i++ ) - slotNewTab( KUrl(l[i]), false, types[ i ] ); + slotNewTab( KUrl(l[i]), false, types[ i ], props[ i ] ); } -void PanelManager::slotNewTab(const KUrl& url, bool setCurrent, QString type) { +void PanelManager::slotNewTab(const KUrl& url, bool setCurrent, QString type, int props) { if( type.isNull() ) { KConfigGroup group( krConfig, "Look&Feel"); @@ -167,6 +174,7 @@ _other->otherPanel = _self; } startPanel( p, url ); + p->setProperties( props ); } void PanelManager::slotNewTab() { Modified: trunk/krusader_kde4/krusader/panelmanager.h =================================================================== --- trunk/krusader_kde4/krusader/panelmanager.h 2008-02-02 07:30:50 UTC (rev 2704) +++ trunk/krusader_kde4/krusader/panelmanager.h 2008-02-02 22:14:12 UTC (rev 2705) @@ -52,7 +52,7 @@ * Called externally to start a new tab. Example of usage would be the "open in a new tab" * action, from the context-menu. */ - void slotNewTab(const KUrl& url, bool setCurrent = true, QString type = QString() ); + void slotNewTab(const KUrl& url, bool setCurrent = true, QString type = QString(), int props = 0 ); void slotNewTab(); void slotNextTab(); void slotPreviousTab(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jb...@us...> - 2008-02-02 23:42:31
|
Revision: 2706 http://krusader.svn.sourceforge.net/krusader/?rev=2706&view=rev Author: jbaehr Date: 2008-02-02 15:42:32 -0800 (Sat, 02 Feb 2008) Log Message: ----------- forward port KDE3 -> KDE4: FIXED: searcher doesn't always find content in binary files This is last forward port of bugfixes from the KDE3 codebase. We're in sync now with the 1.80.0 release! (NB: This is only true for the codebase. The documentation is not yet in sync!) CVS reference of the KDE3 change by ckarai: *** krquery.cpp 31 Dec 2006 10:06:58 -0000 1.21 --- krquery.cpp 11 Jul 2007 20:16:45 -0000 1.22 *** krquery.h 31 Dec 2006 10:06:58 -0000 1.13 --- krquery.h 11 Jul 2007 20:16:45 -0000 1.14 Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/VFS/krquery.cpp trunk/krusader_kde4/krusader/VFS/krquery.h Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-02-02 22:14:12 UTC (rev 2705) +++ trunk/krusader_kde4/ChangeLog 2008-02-02 23:42:32 UTC (rev 2706) @@ -1,3 +1,7 @@ +Codebase in sync with the KDE3 1.80.0 release "Final 3rd Stone" +=============================================================== + + FIXED: searcher doesn't always find content in binary files FIXED: [ 1619452 ] Profile doesn't save status of sync-browse mode FIXED: [ 1681270 ] right clicking pops context menu immediately FIXED: [ 1645179 ] shortcut keys are not sent to the terminal @@ -2,5 +6,9 @@ FIXED: [ 1736496 ] always sort dirs by name not working - FIXED: untranslatable strings, patch by Vaclav Juza, thanks +Branched of KDE4 development +============================ + I18N: Fixed untranslatable strings, patch by Vaclav Juza, thanks + + 1.80.0-beta2 "Last Unstable Stone" Modified: trunk/krusader_kde4/krusader/VFS/krquery.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/krquery.cpp 2008-02-02 22:14:12 UTC (rev 2705) +++ trunk/krusader_kde4/krusader/VFS/krquery.cpp 2008-02-02 23:42:32 UTC (rev 2706) @@ -267,8 +267,7 @@ bool KRQuery::checkBuffer( const char *buf, int len ) const { if( len == 0 ) { // last block? if( receivedBuffer ) { - bool result = checkLines( QTextCodec::codecForLocale()->toUnicode( receivedBuffer, - receivedBufferLen ) ); + bool result = checkLines( receivedBuffer, receivedBufferLen ); delete []receivedBuffer; receivedBuffer = 0; return result; @@ -277,7 +276,7 @@ } int after = len; - while( buf[ after-1 ] != '\n' ) { + while( buf[ after-1 ] != '\n' && buf[ after-1 ] != 0 ) { after--; if( after <= 0 || after <= len - MAX_LINE_LEN ) { after = len; // if there's no <ENTER> in MAX_LINE_LEN, we break the line @@ -287,7 +286,7 @@ if( receivedBuffer ) { int previous = 0; - while( previous < after && previous < MAX_LINE_LEN && buf[previous] != '\n' ) + while( previous < after && previous < MAX_LINE_LEN && buf[previous] != '\n' && buf[previous] != 0 ) previous++; char * str = new char[ receivedBufferLen + previous ]; @@ -296,17 +295,16 @@ receivedBuffer = 0; memcpy( str + receivedBufferLen, buf, previous ); - if( checkLines( QTextCodec::codecForLocale()->toUnicode( str, receivedBufferLen+previous ) ) ) { + if( checkLines( str, receivedBufferLen+previous ) ) { delete []str; return true; } delete []str; - if( after > previous && checkLines( QTextCodec::codecForLocale()-> - toUnicode( buf+previous, after-previous ) ) ) + if( after > previous && checkLines( buf+previous, after-previous ) ) return true; - } else if( checkLines( QTextCodec::codecForLocale()->toUnicode( buf, after ) ) ) + } else if( checkLines( buf, after ) ) return true; if( after < len ) { @@ -317,10 +315,33 @@ return false; } -bool KRQuery::checkLines( QString lines ) const +bool KRQuery::checkLines( const char * buf, int len ) const { - QStringList list = QStringList::split( '\n', lines ); + QStringList list; + int start = 0; + int k = 0; + while( k < len ) + { + if( buf[ k ] == 0 || buf[ k ] == '\n' ) + { + if( k != start ) + { + QString line = QTextCodec::codecForLocale()->toUnicode( buf + start, k - start ); + if( !line.isEmpty() ) + list << line; + } + start = k + 1; + } + k++; + } + if( start != k ) + { + QString line = QTextCodec::codecForLocale()->toUnicode( buf + start, k - start ); + if( !line.isEmpty() ) + list << line; + } + for( int i=0; i != list.count(); i++ ) { QString line = list[ i ]; Modified: trunk/krusader_kde4/krusader/VFS/krquery.h =================================================================== --- trunk/krusader_kde4/krusader/VFS/krquery.h 2008-02-02 22:14:12 UTC (rev 2705) +++ trunk/krusader_kde4/krusader/VFS/krquery.h 2008-02-02 23:42:32 UTC (rev 2706) @@ -183,7 +183,7 @@ bool containsContent( QString file ) const; bool containsContent( KUrl url ) const; bool checkBuffer( const char *buffer, int len ) const; - bool checkLines( QString line ) const; + bool checkLines( const char *buffer, int len ) const; bool checkTimer() const; QStringList split( QString ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jb...@us...> - 2008-02-03 00:41:54
|
Revision: 2707 http://krusader.svn.sourceforge.net/krusader/?rev=2707&view=rev Author: jbaehr Date: 2008-02-02 16:41:56 -0800 (Sat, 02 Feb 2008) Log Message: ----------- FIXED: Filter: Don't list comments in user/group chooser At least on Mac OS X /etc/passwd contains comments starting with '#'. These comment lines caused the seachdialog to be way too large for the screen. If there are platforms which allow the #-sign in user or groupnames this change can be #ifdef'ed for __APPLE__ but I don't think it's nesseary. Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-02-02 23:42:32 UTC (rev 2706) +++ trunk/krusader_kde4/ChangeLog 2008-02-03 00:41:56 UTC (rev 2707) @@ -1,3 +1,6 @@ + FIXED: Filter: Don't list comments in user/group chooser + + Codebase in sync with the KDE3 1.80.0 release "Final 3rd Stone" =============================================================== Modified: trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp =================================================================== --- trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp 2008-02-02 23:42:32 UTC (rev 2706) +++ trunk/krusader_kde4/krusader/Filter/advancedfilter.cpp 2008-02-03 00:41:56 UTC (rev 2707) @@ -475,7 +475,8 @@ { QString s = t.readLine(); QString name = s.left ( s.find ( ':' ) ); - list->insertItem ( name ); + if (!name.startsWith('#')) + list->insertItem ( name ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ck...@us...> - 2008-02-03 22:57:50
|
Revision: 2708 http://krusader.svn.sourceforge.net/krusader/?rev=2708&view=rev Author: ckarai Date: 2008-02-03 14:57:53 -0800 (Sun, 03 Feb 2008) Log Message: ----------- Q3Dict -> QHash, final FIXED: virtual copyjob overwrite all / skip all Modified Paths: -------------- trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp trunk/krusader_kde4/krusader/Dialogs/popularurls.h trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp trunk/krusader_kde4/krusader/KViewer/panelviewer.h trunk/krusader_kde4/krusader/Panel/krbriefview.cpp trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp trunk/krusader_kde4/krusader/Panel/krview.cpp trunk/krusader_kde4/krusader/Panel/krview.h trunk/krusader_kde4/krusader/Panel/panelfunc.cpp trunk/krusader_kde4/krusader/VFS/virtualcopyjob.cpp trunk/krusader_kde4/krusader/VFS/virtualcopyjob.h trunk/krusader_kde4/virt/virt.h Modified: trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp 2008-02-03 22:57:53 UTC (rev 2708) @@ -110,14 +110,14 @@ appendNode(pnode); ranks.insert(tmpurl.url(), head); } else { - pnode = ranks.find(tmpurl.url()); - if (!pnode) { // is the added url new? if so, append it + if( ranks.find(tmpurl.url()) == ranks.end() ) { // is the added url new? if so, append it pnode = new UrlNode; pnode->rank = STARTING_RANK; pnode->url = tmpurl; appendNode(pnode); ranks.insert(tmpurl.url(), pnode); } else { + pnode = ranks[ tmpurl.url() ]; pnode->rank += INCREASE; } } Modified: trunk/krusader_kde4/krusader/Dialogs/popularurls.h =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/popularurls.h 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/Dialogs/popularurls.h 2008-02-03 22:57:53 UTC (rev 2708) @@ -3,7 +3,7 @@ #include <qobject.h> #include <kurl.h> -#include <q3dict.h> +#include <qhash.h> #include <kdialog.h> // the class holds a list of most popular links in a dual data structure @@ -52,7 +52,7 @@ private: UrlNodeP head, tail; - Q3Dict<UrlNode> ranks; // actually holds UrlNode* + QHash<QString, UrlNode *> ranks; // actually holds UrlNode* int count; static const int maxUrls = 30; PopularUrlsDlg *dlg; Modified: trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-02-03 22:57:53 UTC (rev 2708) @@ -5,7 +5,7 @@ #include <kparts/part.h> #include <kparts/browserextension.h> #include <kmessagebox.h> -#include <q3dict.h> +#include <qhash.h> #include <qlabel.h> #include <kmimetype.h> #include <k3tempfile.h> @@ -27,9 +27,8 @@ PanelViewerBase::PanelViewerBase( QWidget *parent ) : QStackedWidget( parent ), mimes( 0 ), cpart( 0 ) { setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored ) ); - - mimes = new Q3Dict<KParts::ReadOnlyPart>( DICTSIZE, false ); - mimes->setAutoDelete( true ); + + mimes = new QHash<QString, KParts::ReadOnlyPart *>(); cpart = 0; fallback = new QLabel( i18n( "No file selected or selected file can't be displayed." ), this ); fallback->setAlignment( Qt::AlignCenter | Qt::ExpandTabs | Qt::WordBreak ); @@ -40,6 +39,9 @@ PanelViewerBase::~PanelViewerBase() { // cpart->queryClose(); closeUrl(); + QHashIterator< QString, KParts::ReadOnlyPart *> lit( *mimes ); + while( lit.hasNext() ) + delete lit.next().value(); mimes->clear(); delete mimes; delete fallback; @@ -62,11 +64,12 @@ if( mode == KrViewer::Generic ){ KMimeType::Ptr mt = KMimeType::findByUrl( curl ); cmimetype = mt ? mt->name() : QString(); - cpart = ( *mimes ) [ cmimetype ]; - if ( !cpart ){ + if( mimes->find( cmimetype ) == mimes->end() ) { cpart = getPart( cmimetype ); mimes->insert( cmimetype, cpart ); } + else + cpart = ( *mimes ) [ cmimetype ]; } K3TempFile tmpFile; @@ -217,11 +220,12 @@ if( mode == KrViewer::Generic ){ KMimeType::Ptr mt = KMimeType::findByUrl( curl ); cmimetype = mt ? mt->name() : QString(); - cpart = ( *mimes ) [ cmimetype ]; - if ( !cpart ){ + if( mimes->find( cmimetype ) == mimes->end() ) { cpart = getPart( cmimetype ); mimes->insert( cmimetype, cpart ); } + else + cpart = ( *mimes ) [ cmimetype ]; } if ( !cpart ) cpart = getPart( "text/plain" ); Modified: trunk/krusader_kde4/krusader/KViewer/panelviewer.h =================================================================== --- trunk/krusader_kde4/krusader/KViewer/panelviewer.h 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/KViewer/panelviewer.h 2008-02-03 22:57:53 UTC (rev 2708) @@ -7,7 +7,7 @@ #include <kparts/part.h> #include <kio/job.h> #include <k3tempfile.h> -#include <q3dict.h> +#include <qhash.h> #include <qlabel.h> #include "krviewer.h" @@ -35,7 +35,7 @@ void urlChanged( PanelViewerBase *, const KUrl & ); protected: - Q3Dict<KParts::ReadOnlyPart> *mimes; + QHash<QString, KParts::ReadOnlyPart*> *mimes; KParts::ReadOnlyPart *cpart; QString cmimetype; Modified: trunk/krusader_kde4/krusader/Panel/krbriefview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krbriefview.cpp 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/Panel/krbriefview.cpp 2008-02-03 22:57:53 UTC (rev 2708) @@ -325,9 +325,9 @@ } void KrBriefView::setCurrentItem( const QString& name ) { - KrBriefViewItem * it = dynamic_cast<KrBriefViewItem*>(_dict[ name ]); - if ( it ) - K3IconView::setCurrentItem( it ); + QHash<QString, KrViewItem*>::iterator itr = _dict.find( name ); + if ( itr != _dict.end() ) + K3IconView::setCurrentItem( dynamic_cast<KrBriefViewItem*>( *itr ) ); } void KrBriefView::clear() { @@ -602,7 +602,7 @@ K3IconView::contentsMousePressEvent( e ); - if( name.isEmpty() || _dict.find( name ) == 0 ) // is the file still valid? + if( name.isEmpty() || _dict.find( name ) == _dict.end() ) // is the file still valid? newCurrent = 0; // if not, don't do any crash... } else { // emitting the missing signals from QIconView::contentsMousePressEvent(); Modified: trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-02-03 22:57:53 UTC (rev 2708) @@ -381,9 +381,9 @@ } void KrDetailedView::setCurrentItem( const QString& name ) { - KrDetailedViewItem * it = dynamic_cast<KrDetailedViewItem*>(_dict[ name ]); - if ( it ) - K3ListView::setCurrentItem( it ); + QHash<QString, KrViewItem*>::iterator itr = _dict.find( name ); + if ( itr != _dict.end() ) + K3ListView::setCurrentItem( dynamic_cast<KrDetailedViewItem*>( *itr ) ); } void KrDetailedView::clear() { @@ -691,7 +691,7 @@ K3ListView::contentsMousePressEvent( e ); - if( name.isEmpty() || _dict.find( name ) == 0 ) // is the file still valid? + if( name.isEmpty() || _dict.find( name ) == _dict.end() ) // is the file still valid? newCurrent = 0; // if not, don't do any crash... } else { // emitting the missing signals from QListView::contentsMousePressEvent(); Modified: trunk/krusader_kde4/krusader/Panel/krview.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/krview.cpp 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/Panel/krview.cpp 2008-02-03 22:57:53 UTC (rev 2708) @@ -243,11 +243,13 @@ } void KrView::delItem(const QString &name) { - KrViewItem * it = _dict[ name ]; - if ( !it ) { - krOut << "got signal deletedVfile(" << name << ") but can't find KrViewItem" << endl; + QHash<QString, KrViewItem*>::iterator itr = _dict.find( name ); + if ( itr == _dict.end() ) { + krOut << "got signal deletedVfile(" << name << ") but can't find KrViewItem" << endl; return; - } + } + + KrViewItem * it = *itr; if (!preDelItem(it)) return; // do not delete this after all // remove from dict @@ -291,11 +293,12 @@ void KrView::updateItem(vfile *vf) { // since we're deleting the item, make sure we keep // it's properties first and repair it later - KrViewItem * it = _dict[ vf->vfile_getName() ]; - if ( !it ) { + QHash<QString, KrViewItem*>::iterator itr = _dict.find( vf->vfile_getName() ); + if ( itr == _dict.end() ) { krOut << "got signal updatedVfile(" << vf->vfile_getName() << ") but can't find KrViewItem" << endl; } else { - bool selected = it->isSelected(); + KrViewItem * it = *itr; + bool selected = it->isSelected(); bool current = ( getCurrentKrViewItem() == it ); delItem( vf->vfile_getName() ); KrViewItem *updatedItem = addItem( vf ); Modified: trunk/krusader_kde4/krusader/Panel/krview.h =================================================================== --- trunk/krusader_kde4/krusader/Panel/krview.h 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/Panel/krview.h 2008-02-03 22:57:53 UTC (rev 2708) @@ -32,7 +32,7 @@ #include <qpixmap.h> #include <qvariant.h> -#include <q3dict.h> +#include <qhash.h> #include <QDropEvent> #include <QList> #include "../krusader.h" @@ -239,7 +239,7 @@ bool _left; KrViewProperties *_properties; KrViewOperator *_operator; - Q3Dict<KrViewItem> _dict; + QHash<QString, KrViewItem*> _dict; bool _focused; QString _nameInKConfig; }; Modified: trunk/krusader_kde4/krusader/Panel/panelfunc.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-02-03 22:57:53 UTC (rev 2708) @@ -451,7 +451,7 @@ if( !virtualBaseURL.isEmpty() ) { // keep the directory structure for virtual paths - VirtualCopyJob *vjob = new VirtualCopyJob( &fileNames, files(), dest, virtualBaseURL, pmode, KIO::CopyJob::Move, false, true ); + VirtualCopyJob *vjob = new VirtualCopyJob( &fileNames, files(), dest, virtualBaseURL, pmode, KIO::CopyJob::Move, true ); connect( vjob, SIGNAL( result( KJob* ) ), this, SLOT( refresh() ) ); if ( dest.equals( panel->otherPanel->virtualPath(), KUrl::CompareWithoutTrailingSlash ) ) connect( vjob, SIGNAL( result( KJob* ) ), panel->otherPanel->func, SLOT( refresh() ) ); @@ -599,7 +599,7 @@ if( !virtualBaseURL.isEmpty() ) { // keep the directory structure for virtual paths - VirtualCopyJob *vjob = new VirtualCopyJob( &fileNames, files(), dest, virtualBaseURL, pmode, KIO::CopyJob::Copy, false, true ); + VirtualCopyJob *vjob = new VirtualCopyJob( &fileNames, files(), dest, virtualBaseURL, pmode, KIO::CopyJob::Copy, true ); connect( vjob, SIGNAL( result( KJob* ) ), this, SLOT( refresh() ) ); if ( dest.equals( panel->otherPanel->virtualPath(), KUrl::CompareWithoutTrailingSlash ) ) connect( vjob, SIGNAL( result( KJob* ) ), panel->otherPanel->func, SLOT( refresh() ) ); Modified: trunk/krusader_kde4/krusader/VFS/virtualcopyjob.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/virtualcopyjob.cpp 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/VFS/virtualcopyjob.cpp 2008-02-03 22:57:53 UTC (rev 2708) @@ -40,12 +40,89 @@ #define REPORT_TIMEOUT 200 +class MyUiDelegate : public KIO::JobUiDelegate { +public: + MyUiDelegate( VirtualCopyJob * ref ) : KIO::JobUiDelegate(), copyJobRef( ref ) {} + + virtual KIO::RenameDialog_Result askFileRename(KJob * job, const QString & caption, const QString& src, + const QString & dest, KIO::RenameDialog_Mode mode, + QString& newDest, KIO::filesize_t sizeSrc = (KIO::filesize_t) -1, + KIO::filesize_t sizeDest = (KIO::filesize_t) -1, + time_t ctimeSrc = (time_t) -1, time_t ctimeDest = (time_t) -1, + time_t mtimeSrc = (time_t) -1, time_t mtimeDest = (time_t) -1) + { + if( copyJobRef->isSkipAll() ) + { + if( mode & KIO::M_MULTI ) + return KIO::R_AUTO_SKIP; + else + return KIO::R_SKIP; + } + if( copyJobRef->isOverwriteAll() ) + { + if( mode & KIO::M_MULTI ) + return KIO::R_OVERWRITE_ALL; + else + return KIO::R_OVERWRITE; + } + + KIO::RenameDialog_Mode mmode = (KIO::RenameDialog_Mode)0; + if( copyJobRef->isMulti() ) + mmode = (KIO::RenameDialog_Mode)( mmode | KIO::M_MULTI | KIO::M_SKIP ); + else + mmode = (KIO::RenameDialog_Mode)( mmode | KIO::M_SINGLE ); + + if( mode & KIO::M_OVERWRITE ) + mmode = (KIO::RenameDialog_Mode)( mmode | KIO::M_OVERWRITE ); + if( mode & KIO::M_OVERWRITE_ITSELF ) + mmode = (KIO::RenameDialog_Mode)( mmode | KIO::M_OVERWRITE_ITSELF ); + + KIO::RenameDialog_Result res = KIO::JobUiDelegate::askFileRename( job, caption, src, dest, mode, newDest, + sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest ); + + if( res == KIO::R_AUTO_SKIP ) { + copyJobRef->setSkipAll(); + if( !(mode & KIO::M_MULTI) ) + res = KIO::R_SKIP; + } + if( res == KIO::R_OVERWRITE_ALL ) { + copyJobRef->setOverwriteAll(); + if( !(mode & KIO::M_MULTI) ) + res = KIO::R_OVERWRITE; + } + return res; + } + + virtual KIO::SkipDialog_Result askSkip(KJob * job, bool multi, const QString & error_text) + { + if( copyJobRef->isSkipAll() ) + { + if( multi ) + return KIO::S_AUTO_SKIP; + else + return KIO::S_SKIP; + } + + KIO::SkipDialog_Result res = KIO::JobUiDelegate::askSkip( job, copyJobRef->isMulti(), error_text ); + if( res == KIO::S_AUTO_SKIP ) { + copyJobRef->setSkipAll(); + if( !multi ) + res = KIO::S_SKIP; + } + + return res; + } + +private: + VirtualCopyJob * copyJobRef; +}; + VirtualCopyJob::VirtualCopyJob( const QStringList *names, vfs * vfs, const KUrl& dest, const KUrl& baseURL, - PreserveMode pmode, KIO::CopyJob::CopyMode mode, bool asMethod, bool showProgressInfo ) : - KIO::Job(), m_totalSize( 0 ), m_totalFiles( 0 ), m_totalSubdirs( 0 ), + PreserveMode pmode, KIO::CopyJob::CopyMode mode, bool showProgressInfo ) : KIO::Job(), m_overwriteAll( false ), + m_skipAll( false ), m_multi( false ), m_totalSize( 0 ), m_totalFiles( 0 ), m_totalSubdirs( 0 ), m_processedSize( 0 ), m_processedFiles( 0 ), m_processedSubdirs( 0 ), m_tempSize( 0 ), m_tempFiles( 0 ), - m_tempSubdirs( 0 ), m_dirsToGetSize(), m_filesToCopy(), m_size(), m_filenum(), m_subdirs(), m_baseURL( baseURL ), - m_dest( dest ), m_pmode( pmode ), m_mode( mode ), m_asMethod( asMethod ), m_showProgressInfo( showProgressInfo ), + m_dirsToGetSize(), m_filesToCopy(), m_size(), m_filenum(), m_subdirs(), m_baseURL( baseURL ), + m_dest( dest ), m_pmode( pmode ), m_mode( mode ), m_showProgressInfo( showProgressInfo ), m_state( ST_STARTING ), m_reportTimer(), m_current(), m_currentDir(), m_dirStack() { m_dest.adjustPath( KUrl::AddTrailingSlash ); @@ -82,7 +159,7 @@ } if ( showProgressInfo ) { - setUiDelegate(new KIO::JobUiDelegate() ); + setUiDelegate(new MyUiDelegate( this ) ); KIO::getJobTracker()->registerJob(this); } @@ -113,7 +190,7 @@ break; case ST_COPYING: { - setProcessedAmount( KJob::Directories, m_processedSubdirs + m_tempSubdirs ); + setProcessedAmount( KJob::Directories, m_processedSubdirs ); setProcessedAmount( KJob::Files, m_processedFiles + m_tempFiles ); setProcessedAmount( KJob::Bytes, m_processedSize + m_tempSize ); @@ -161,6 +238,9 @@ void VirtualCopyJob::createNextDir() { m_state = ST_CREATING_DIRECTORY; + if( m_totalFiles + m_totalSubdirs > 1 ) + m_multi = true; + QHashIterator<QString, KUrl::List *> diter( m_filesToCopy ); if( !diter.hasNext() ) { emitResult(); @@ -208,7 +288,24 @@ KUrl url = (static_cast<KIO::SimpleJob*>(job) )->url(); if ( job && job->error() ) { - job->uiDelegate()->showErrorMessage(); + if( ui() && !m_skipAll ) { + KIO::SkipDialog_Result skipResult = ui()->askSkip( this, m_multi, + job->errorString() ); + switch( skipResult ) + { + case KIO::S_CANCEL: + setError( KIO::ERR_USER_CANCELED ); + emitResult(); + return; + case KIO::S_AUTO_SKIP: + m_skipAll = true; + break; + case KIO::S_SKIP: + default: + break; + } + } + directoryFinished( m_currentDir ); createNextDir(); return; @@ -230,18 +327,16 @@ m_state = ST_COPYING; KIO::CopyJob * copy_job = PreservingCopyJob::createCopyJob( m_pmode, *m_filesToCopy[ m_currentDir ], m_current, - m_mode, m_asMethod, false ); + m_mode, false, false ); + copy_job->setParentJob( this ); + copy_job->setUiDelegate(new MyUiDelegate( this ) ); connect( copy_job, SIGNAL( copying(KIO::Job *, const KUrl &, const KUrl &) ), this, SLOT( slotCopying(KIO::Job *, const KUrl &, const KUrl &) ) ); connect( copy_job, SIGNAL( moving(KIO::Job *, const KUrl &, const KUrl &) ), this, SLOT( slotMoving(KIO::Job *, const KUrl &, const KUrl &) ) ); - connect( copy_job, SIGNAL( creatingDir(KIO::Job *, const KUrl &) ), - this, SLOT( slotCreatingDir(KIO::Job *, const KUrl &) ) ); connect( copy_job, SIGNAL( processedFiles (KIO::Job *, unsigned long) ), this, SLOT( slotProcessedFiles (KIO::Job *, unsigned long) ) ); - connect( copy_job, SIGNAL( processedDirs (KIO::Job *, unsigned long) ), - this, SLOT( slotProcessedDirs (KIO::Job *, unsigned long) ) ); connect( copy_job, SIGNAL( processedSize (KJob *, qulonglong) ), this, SLOT( slotProcessedSize (KJob *, qulonglong) ) ); connect( copy_job, SIGNAL( result( KJob* ) ), this, SLOT( slotCopyResult( KJob* ) ) ); @@ -249,7 +344,17 @@ void VirtualCopyJob::slotCopyResult( KJob *job ) { if ( job && job->error() ) { - job->uiDelegate()->showErrorMessage(); + setError( job->error() ); + setErrorText( job->errorText() ); + + if( job->error() == KIO::ERR_USER_CANCELED ) { + emitResult(); + return; + } + + if( uiDelegate() ) + uiDelegate()->showErrorMessage(); + setError( 0 ); } directoryFinished( m_currentDir ); @@ -264,7 +369,7 @@ m_processedFiles += m_filenum[ name ]; m_processedSubdirs += m_subdirs[ name ]; - m_tempSize = m_tempFiles = m_tempSubdirs = 0; + m_tempSize = m_tempFiles = 0; m_size.remove( name ); m_filenum.remove( name ); @@ -283,17 +388,10 @@ qMakePair(i18n("Destination"), dest.prettyUrl())); } -void VirtualCopyJob::slotCreatingDir(KIO::Job *, const KUrl &) { -} - void VirtualCopyJob::slotProcessedFiles (KIO::Job *, unsigned long filenum) { m_tempFiles = filenum; } -void VirtualCopyJob::slotProcessedDirs (KIO::Job *, unsigned long subdirs) { - m_tempSubdirs = subdirs; -} - void VirtualCopyJob::slotProcessedSize (KJob *, qulonglong size) { m_tempSize = size; } Modified: trunk/krusader_kde4/krusader/VFS/virtualcopyjob.h =================================================================== --- trunk/krusader_kde4/krusader/VFS/virtualcopyjob.h 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/krusader/VFS/virtualcopyjob.h 2008-02-03 22:57:53 UTC (rev 2708) @@ -53,9 +53,15 @@ public: VirtualCopyJob( const QStringList *names, vfs * vfs, const KUrl& dest, const KUrl& baseURL, - PreserveMode pmode, KIO::CopyJob::CopyMode mode, bool asMethod, bool showProgressInfo ); + PreserveMode pmode, KIO::CopyJob::CopyMode mode, bool showProgressInfo ); virtual ~VirtualCopyJob(); + inline bool isSkipAll() { return m_skipAll; } + inline void setSkipAll() { m_skipAll = true; } + inline bool isOverwriteAll() { return m_overwriteAll; } + inline void setOverwriteAll() { m_overwriteAll = true; } + inline bool isMulti() { return m_multi; } + protected: void statNextDir(); void createNextDir(); @@ -73,10 +79,8 @@ void slotCopying(KIO::Job *, const KUrl &, const KUrl &); void slotMoving(KIO::Job *, const KUrl &, const KUrl &); - void slotCreatingDir(KIO::Job *, const KUrl &); - void slotProcessedFiles (KIO::Job *, unsigned long); - void slotProcessedDirs (KIO::Job *, unsigned long); + void slotProcessedFiles (KIO::Job *, unsigned long ); void slotProcessedSize (KJob *, qulonglong); signals: @@ -86,6 +90,10 @@ void processedDirs( KIO::Job *job, unsigned long dirs ); private: + bool m_overwriteAll; + bool m_skipAll; + bool m_multi; + KIO::filesize_t m_totalSize; unsigned long m_totalFiles; unsigned long m_totalSubdirs; @@ -96,7 +104,6 @@ qulonglong m_tempSize; unsigned long m_tempFiles; - unsigned long m_tempSubdirs; QList<KUrl> m_dirsToGetSize; @@ -110,7 +117,6 @@ KUrl m_dest; PreserveMode m_pmode; KIO::CopyJob::CopyMode m_mode; - bool m_asMethod; bool m_showProgressInfo; State m_state; Modified: trunk/krusader_kde4/virt/virt.h =================================================================== --- trunk/krusader_kde4/virt/virt.h 2008-02-03 00:41:56 UTC (rev 2707) +++ trunk/krusader_kde4/virt/virt.h 2008-02-03 22:57:53 UTC (rev 2708) @@ -19,7 +19,7 @@ #define _VIRT_H #include <sys/types.h> -#include <q3dict.h> +#include <qhash.h> #include <QByteArray> #include <kconfig.h> #include <kio/slavebase.h> @@ -46,7 +46,7 @@ bool addDir(QString& path); - static Q3Dict<KUrl::List> kioVirtDict; + static QHash<QString, KUrl::List*> kioVirtDict; static KConfig* kio_virt_db; bool rewriteURL(const KUrl&, KUrl&); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jb...@us...> - 2008-03-15 22:49:09
|
Revision: 2742 http://krusader.svn.sourceforge.net/krusader/?rev=2742&view=rev Author: jbaehr Date: 2008-03-15 15:49:15 -0700 (Sat, 15 Mar 2008) Log Message: ----------- Konfigurator: Dependency lists are now scrollable This allows a little smaller Konfigurator window. Here on Mac OS X I still have some problems with the bg-color of the scrollarea, neither autoFillBackground nor backgroundRole could fix this... Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-03-15 22:48:52 UTC (rev 2741) +++ trunk/krusader_kde4/ChangeLog 2008-03-15 22:49:15 UTC (rev 2742) @@ -1,3 +1,4 @@ + FIXED: Konfigurator: Dependency lists are now scrollable FIXED: Filter: Don't list comments in user/group chooser Modified: trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp 2008-03-15 22:48:52 UTC (rev 2741) +++ trunk/krusader_kde4/krusader/Konfigurator/kgdependencies.cpp 2008-03-15 22:49:15 UTC (rev 2742) @@ -33,6 +33,7 @@ #include "../krusader.h" #include <qtabwidget.h> #include <QGridLayout> +#include <QScrollArea> #include <klocale.h> #include <kmessagebox.h> #include <kurl.h> @@ -51,7 +52,10 @@ tabWidget = new QTabWidget( this ); QWidget *general_tab = new QWidget( tabWidget ); - tabWidget->insertTab( general_tab, i18n( "General" ) ); + QScrollArea* general_scroll = new QScrollArea( tabWidget ); + general_scroll->setWidget( general_tab ); // this also sets scrollacrea as the new parent for widget + general_scroll->setWidgetResizable( true ); // let the widget use every space available + tabWidget->insertTab( general_scroll, i18n( "General" ) ); QGridLayout *pathsGrid = new QGridLayout( general_tab ); pathsGrid->setSpacing( 6 ); @@ -73,7 +77,10 @@ // ---------------------------- PACKERS TAB ------------------------------------- QWidget *packers_tab = new QWidget( tabWidget ); - tabWidget->insertTab( packers_tab, i18n( "Packers" ) ); + QScrollArea* packers_scroll = new QScrollArea( tabWidget ); + packers_scroll->setWidget( packers_tab ); // this also sets scrollacrea as the new parent for widget + packers_scroll->setWidgetResizable( true ); // let the widget use every space available + tabWidget->insertTab( packers_scroll, i18n( "Packers" ) ); QGridLayout *archGrid1 = new QGridLayout( packers_tab ); archGrid1->setSpacing( 6 ); @@ -97,7 +104,10 @@ // ---------------------------- CHECKSUM TAB ------------------------------------- QWidget *checksum_tab = new QWidget( tabWidget ); - tabWidget->insertTab( checksum_tab, i18n( "Checksum Utilities" ) ); + QScrollArea* checksum_scroll = new QScrollArea( tabWidget ); + checksum_scroll->setWidget( checksum_tab ); // this also sets scrollacrea as the new parent for widget + checksum_scroll->setWidgetResizable( true ); // let the widget use every space available + tabWidget->insertTab( checksum_scroll, i18n( "Checksum Utilities" ) ); QGridLayout *archGrid2 = new QGridLayout( checksum_tab ); archGrid2->setSpacing( 6 ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Cod...@us...> - 2008-03-25 20:06:43
|
Revision: 2743 http://krusader.svn.sourceforge.net/krusader/?rev=2743&view=rev Author: Codeknight Date: 2008-03-25 13:06:47 -0700 (Tue, 25 Mar 2008) Log Message: ----------- Codebase in sync with the KDE3 1.90.0 release "Power Stone" I18N: Updated Catalan translation (thanks Joaquim Perez) I18N: Updated French translation (thanks Tourneur Henry-Nicolas) Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/po/ca.po trunk/krusader_kde4/po/fr.po Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-03-15 22:49:15 UTC (rev 2742) +++ trunk/krusader_kde4/ChangeLog 2008-03-25 20:06:47 UTC (rev 2743) @@ -1,7 +1,13 @@ FIXED: Konfigurator: Dependency lists are now scrollable FIXED: Filter: Don't list comments in user/group chooser +Codebase in sync with the KDE3 1.90.0 release "Power Stone" +=========================================================== + I18N: Updated Catalan translation (thanks Joaquim Perez) + I18N: Updated French translation (thanks Tourneur Henry-Nicolas) + + Codebase in sync with the KDE3 1.80.0 release "Final 3rd Stone" =============================================================== Modified: trunk/krusader_kde4/po/ca.po =================================================================== --- trunk/krusader_kde4/po/ca.po 2008-03-15 22:49:15 UTC (rev 2742) +++ trunk/krusader_kde4/po/ca.po 2008-03-25 20:06:47 UTC (rev 2743) @@ -3,21 +3,22 @@ # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai # Copyright (C) 2004-2007, Krusader Krew # This file is distributed under the same license as the Krusader package -# Rafael Munoz Rodriguez <raf...@ne...>, 2003 -# Quim Perez Noguer <no...@os...>, 2004, 2005. # +# Rafael Munoz Rodriguez <raf...@ne...>, 2003. +# Quim Perez Noguer <no...@os...>, 2004, 2005. +# Joaquim Perez <no...@gm...>, 2008. msgid "" msgstr "" -"Project-Id-Version: krusader-1.80.0-beta2\n" +"Project-Id-Version: krusader-1.80.0\n" "Report-Msgid-Bugs-To: Dirk Eschler <des...@us...>\n" "POT-Creation-Date: 2007-03-27 15:16+0200\n" -"PO-Revision-Date: 2005-02-28 05:38+0100\n" -"Last-Translator: Quim Perez Noguer <no...@os...>\n" -"Language-Team: Catalan\n" +"PO-Revision-Date: 2008-01-13 15:37+0100\n" +"Last-Translator: Joaquim Perez <no...@gm...>\n" +"Language-Team: Catalan <gi...@ll...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.0\n" +"X-Generator: KBabel 1.11.4\n" #: GUI/dirhistorybutton.cpp:35 msgid "Open the directory history list" @@ -52,64 +53,57 @@ msgstr "Entreu el nom del perfil:" #: GUI/krremoteencodingmenu.cpp:97 -#, fuzzy msgid "Reload" -msgstr "Vermell" +msgstr "Actualitza" #: GUI/krremoteencodingmenu.cpp:98 Konfigurator/konfiguratoritems.cpp:539 -#, fuzzy msgid "Default" msgstr "Per defecte" #: GUI/mediabutton.cpp:81 -#, fuzzy msgid "Open the available media list" -msgstr "Obre la llista historial de carpetes" +msgstr "Obre la llista de mitjans" #: GUI/mediabutton.cpp:454 msgid "Hard Disk" -msgstr "" +msgstr "Disc dur" #: GUI/mediabutton.cpp:456 msgid "CD-ROM" -msgstr "" +msgstr "CD-ROM" #: GUI/mediabutton.cpp:458 msgid "CD Recorder" -msgstr "" +msgstr "CD Gravador" #: GUI/mediabutton.cpp:461 msgid "DVD Recorder" -msgstr "" +msgstr "DVD Gravador" #: GUI/mediabutton.cpp:464 msgid "DVD" -msgstr "" +msgstr "DVD" #: GUI/mediabutton.cpp:466 GUI/mediabutton.cpp:468 -#, fuzzy msgid "Remote Share" -msgstr "RemoteMan" +msgstr "Compartició remota" #: GUI/mediabutton.cpp:470 GUI/mediabutton.cpp:472 -#, fuzzy msgid "Floppy" -msgstr "Copia " +msgstr "Disquet" #: GUI/mediabutton.cpp:474 msgid "Zip Disk" -msgstr "" +msgstr "Disc Zip" #: GUI/mediabutton.cpp:477 -#, fuzzy msgid "Unknown" -msgstr "desconegut" +msgstr "Desconegut" #: BookMan/krbookmarkhandler.cpp:538 GUI/mediabutton.cpp:529 #: Panel/krpopupmenu.cpp:61 -#, fuzzy msgid "Open" -msgstr "&Obre" +msgstr "Obre" #: BookMan/krbookmarkhandler.cpp:539 GUI/mediabutton.cpp:530 msgid "Open in a new tab" @@ -118,12 +112,12 @@ #: GUI/mediabutton.cpp:533 MountMan/kmountman.cpp:287 #: MountMan/kmountmangui.cpp:333 Panel/krpopupmenu.cpp:174 msgid "Mount" -msgstr "Monta" +msgstr "Munta" #: GUI/mediabutton.cpp:535 MountMan/kmountman.cpp:287 #: MountMan/kmountmangui.cpp:337 Panel/krpopupmenu.cpp:172 msgid "Unmount" -msgstr "Desmonta" +msgstr "Desmunta" #: GUI/mediabutton.cpp:537 MountMan/kmountmangui.cpp:343 #: Panel/krpopupmenu.cpp:176 @@ -149,38 +143,36 @@ msgstr "Carpeta on s'executaran les ordres en l'intèrpret" #: GUI/kcmdline.cpp:94 -#, fuzzy msgid "" "<qt><p>Well, it's actually quite simple: You type your command here and " "Krusader obeys.</p><p><b>Tip</b>: Move within command line history with <" "Up> and <Down> arrows.</p></qt>" msgstr "" -"<qt>Senzillament: Escriviu en la línia d'ordres i el Krusader obeirà.<p><Tip:" -">Prement les tecles de pujar i baixar, recuperareu les ordres que heu escrit " -"abans.</qt>" +"<qt><p>Bé, és força senzill: escriviu les vostres ordres aquí i el Krusader " +"les obeirà.</p><p><b>Consell</b>: utilitzeu l'historial d'ordres amb les " +"fletxes <Amunt> i <Avall>.</p></qt>" #: ActionMan/actionpropertybase.cpp:418 GUI/kcmdline.cpp:102 -#, fuzzy msgid "Add <b>Placeholders</b> for the selected files in the panel." -msgstr "Afegeix un agafador d'espai per els fitxers seleccionats en el plafó" +msgstr "" +"Afegeix un <b>paràmetre de substitució<b> al plafó per als fitxers " +"seleccionats." #: GUI/kfnkeys.cpp:50 msgid "F2 Term " msgstr "F2 Terminal " #: GUI/kfnkeys.cpp:51 -#, fuzzy msgid "" "<p>Open terminal in current directory.</p><p>The terminal can be defined in " "Konfigurator, default is <b>konsole</b>.</p>" msgstr "" -"<qt>Obre una finestra de terminal, en la carpeta actual.</p>En el " -"Konfigurator podeu canviar el valor per defecte 'konsole', per algun altre " -"terminal.</qt>" +"<p>Obre un terminal, en la carpeta actual.</p><p>El terminal està definit en " +"el Konfigurador, per defecte és el <b>konsole</b>.</p>" #: GUI/kfnkeys.cpp:57 msgid "F3 View " -msgstr "F3 Veure " +msgstr "F3 Mostra " #: GUI/kfnkeys.cpp:58 msgid "Open file in viewer." @@ -191,13 +183,12 @@ msgstr "F4 Edita " #: GUI/kfnkeys.cpp:63 -#, fuzzy msgid "" "<p>Edit file.</p><p>The editor can be defined in Konfigurator, default is " "<b>internal editor</b>.</p>" msgstr "" -"<qt>Edita el fitxer.<p>L'editor es pot configurar en el Konfigurator, per " -"defecte està posat l'editor intern del krusader.</qt>" +"<qt>Edita el fitxer.<p>L'editor es pot configurar en el Konfigurador, per " +"defecte és <b>un editor intern</b>.</qt>" #: GUI/kfnkeys.cpp:69 msgid "F5 Copy " @@ -289,7 +280,7 @@ "Malformed URL:\n" "%1" msgstr "" -"URL incorrecta:\n" +"URL incorrecte:\n" "%1" #: VFS/ftp_vfs.cpp:167 @@ -298,6 +289,9 @@ "If it is not the case, please check and change the Proxy settings in " "kcontrol." msgstr "" +"El Krusader no permet l'accés FTP via HTTP.\n" +"Si no és el cas, comproveu i canvieu si de cas la configuració del servidor " +"intermediari des del kcontrol." #: VFS/ftp_vfs.cpp:169 #, c-format @@ -305,13 +299,14 @@ "Protocol not supported by Krusader:\n" "%1" msgstr "" -"El Krusader no soporta aquest protocol:\n" +"El Krusader no permet aquest protocol:\n" "%1" #: VFS/arc_vfs.cpp:217 -#, fuzzy msgid "<qt>Can't read <b>%1</b>. Archive might be corrupted!</qt>" -msgstr "El fitxer potser està corromput !" +msgstr "" +"<qt>No s'ha pogut llegir el fitxer <b>%1</b>, l'arxiu potser està malmès!</" +"qt>" #: VFS/arc_vfs.cpp:322 VFS/arc_vfs.cpp:579 msgid "Deleting Files..." @@ -338,7 +333,7 @@ #: VFS/normal_vfs.cpp:100 VFS/normal_vfs.cpp:106 VFS/virt_vfs.cpp:87 #: VFS/virt_vfs.cpp:173 msgid "Error" -msgstr "" +msgstr "Error" #: Synchronizer/synchronizerdirlist.cpp:101 VFS/normal_vfs.cpp:100 msgid "Can't open the %1 directory!" @@ -357,13 +352,13 @@ "You can't copy files directly to the 'virt:/' directory.\n" "You can create a sub directory and copy your files into it." msgstr "" -"No es pot copiar fitxers directametn a la carpeta 'virt:/'.\n" -"Però si que podeu crear-hi una subcarpeta i copiar-hi tots els vostres " +"No es pot copiar fitxers directament a la carpeta 'virt:/'.\n" +"Però si que podeu crear-hi una subdirectori i copiar-hi tots els vostres " "fitxers." #: VFS/virt_vfs.cpp:173 msgid "Creating new directories is allowed only in the 'virt:/' directory." -msgstr "Només es permet crear subcarpetes en la carpeta 'virt:/'." +msgstr "Només es permet crear subdirectoris en la carpeta 'virt:/'." #: Filter/generalfilter.cpp:94 Konfigurator/konfigurator.cpp:107 #: VFS/krquery.cpp:138 @@ -380,11 +375,11 @@ #: Filter/generalfilter.cpp:97 VFS/krquery.cpp:141 msgid "Text Files" -msgstr "Fitxers de texte" +msgstr "Fitxers de text" #: Filter/generalfilter.cpp:98 VFS/krquery.cpp:142 msgid "Video Files" -msgstr "Fitxers de video" +msgstr "Fitxers de vídeo" #: Filter/generalfilter.cpp:99 VFS/krquery.cpp:143 msgid "Audio Files" @@ -392,11 +387,11 @@ #: VFS/krquery.cpp:144 msgid "Custom" -msgstr "Personalizat" +msgstr "Personalitzat" #: VFS/krquery.cpp:432 msgid "Searching content of '%1' (%2%)" -msgstr "" +msgstr "Cercant «%1» en el contingut (%2%)" #: VFS/krarchandler.cpp:184 msgid "Counting files in archive" @@ -404,45 +399,43 @@ #: VFS/krarchandler.cpp:205 msgid "Failed to list the content of the archive (%1)!" -msgstr "" +msgstr "No s'ha pogut obtenir la llista del contingut de l'arxiu (%1)!" #: VFS/krarchandler.cpp:225 msgid "Failed to unpack" -msgstr "Hi ha hagut un error al descomprimir" +msgstr "No s'ha pogut descomprimir" #: VFS/krarchandler.cpp:262 msgid "Failed to convert rpm (%1) to cpio!" -msgstr "" +msgstr "No s'ha pogut convertir de rpm (%1) a cpio" #: VFS/krarchandler.cpp:279 msgid "Failed to convert deb (%1) to tar!" -msgstr "" +msgstr "No s'ha pogut convertir de deb (%1) a tar" #: VFS/krarchandler.cpp:313 msgid "Unpacking File(s)" msgstr "S'estan descomprimint els fitxers" #: VFS/krarchandler.cpp:339 -#, fuzzy msgid "Failed to unpack %1!" -msgstr "Hi ha hagut un error al descomprimir" +msgstr "No s'ha pogut descomprimir %1" #: VFS/krarchandler.cpp:340 VFS/krarchandler.cpp:509 msgid "User cancelled." -msgstr "" +msgstr "L'usuari ho ha cancel·lat." #: VFS/krarchandler.cpp:384 msgid "Testing Archive" -msgstr "S'estan comprovant els fitxers" +msgstr "S'està comprovant l'arxiu" #: VFS/krarchandler.cpp:490 msgid "Packing File(s)" msgstr "S'estan comprimint els fitxers" #: VFS/krarchandler.cpp:508 -#, fuzzy msgid "Failed to pack %1!" -msgstr "Hi ha hagut un error al comprimir: " +msgstr "No s'ha pogut comprimir %1" #: VFS/krarchandler.cpp:517 msgid "Failed to pack: " @@ -450,7 +443,7 @@ #: VFS/krarchandler.cpp:548 msgid "This archive is encrypted, please supply the password:" -msgstr "Aquest fitxer comprimit està encriptat, cal introduir la constrasenya:" +msgstr "Aquest fitxer comprimit està encriptat, cal introduir la contrasenya:" #: KrJS/krjs.cpp:65 msgid "" @@ -458,6 +451,9 @@ "Uncaught JavaScript exception '%2'\n" "%3" msgstr "" +"En %1:\n" +"S'ha produït una excepció JavaScript «%2»\n" +"%3" #: KrJS/krjs.cpp:66 msgid "" @@ -465,17 +461,21 @@ "Uncaught JavaScript exception '%2' at line %3\n" "%4" msgstr "" +"En %1:\n" +"S'ha produït una excepció JavaScript «%2» a la línia %3\n" +"%4" #: KrJS/krjs.cpp:68 KrJS/krjs.cpp:73 -#, fuzzy msgid "JavaScript error" -msgstr "Consola Javascript" +msgstr "Error Javascript" #: KrJS/krjs.cpp:72 msgid "" "In %1:\n" "There is an error in the JavaScript" msgstr "" +"En %1:\n" +"S'ha produït un error JavaScript" #: Filter/filtertabs.cpp:44 msgid "&General" @@ -487,9 +487,8 @@ msgstr "&Avançat" #: Filter/filterdialog.cpp:38 -#, fuzzy msgid "Krusader::Choose Files" -msgstr "Selecció de fitxers" +msgstr "Krusader::Selecció de fitxers" #: Filter/generalfilter.cpp:55 msgid "File name" @@ -497,7 +496,7 @@ #: Filter/generalfilter.cpp:65 msgid "&Case sensitive" -msgstr "Distingeix majús&coles/minúscoles" +msgstr "Distingeix majús&cules/minúscules" #: Filter/generalfilter.cpp:70 msgid "Search &for:" @@ -522,6 +521,23 @@ "code></ul><b>Note</b>: the search term '<code>text</code>' is equivalent to " "'<code>*text*</code>'.</p>" msgstr "" +"<p>El criteri del filtre per al nom del fitxer es defineix aquí.</p><p> " +"Podeu utilitzar els símbols comodins. Per incloure diversos patrons separeu-" +"los amb un espai (com a O lògica) i si voleu excloure un patró utilitzeu el " +"símbol pipe.</p><p> Si el patró acaba amb una barra inclinada (<code>*abc*/</" +"code>), això voldrà dir que el patró fa referència a una cerca recursiva " +"dels directoris.<ul><li><code>abc</code> - significa que es cercaran els " +"fitxers i directoris amb nom <code>abc</code>, la cerca recursiva correrà " +"dins de tots els subdirectoris independentment de si corresponen al " +"patró<code>abc</code></li><li><code>abc/</code> - significa que cercarà " +"fitxers i directoris, però la cerca recursiva la farà només dels directoris " +"que tinguin per nom <code>abc</code></li></ul><p></p><p>Per als noms que " +"continguin espais es poden utilitzar les cometes. El filtre <code>" +"\"Program Files\"</code> cercarà fitxers i directoris que es diguin " +"<code>Program Files</code>.</p><p>Exemples:<ul><code><li>*.o</li><li>*." +"h *.c??</li><li>*.cpp *.h | *.moc.cpp</li><li>* | CVS/ .svn/</li></code></" +"ul><b>Nota</b>: la cerca '<code>text</code>' és equivalent a '<code>*text*</" +"code>'.</p>" #: Filter/generalfilter.cpp:86 msgid "&Of type:" @@ -533,46 +549,43 @@ #: Filter/generalfilter.cpp:115 msgid "&Profile handler" -msgstr "" +msgstr "&Gestor de perfils" #: ActionMan/actionpropertybase.cpp:417 Filter/generalfilter.cpp:127 -#, fuzzy msgid "&Add" -msgstr "&Avançat" +msgstr "&Afegeix" #: Filter/generalfilter.cpp:130 -#, fuzzy msgid "&Load" -msgstr "&Ubicació" +msgstr "&Carrega" #: Filter/generalfilter.cpp:134 Panel/panelfunc.cpp:813 msgid "&Overwrite" msgstr "&Sobreescriu" #: Filter/generalfilter.cpp:138 RemoteMan/remotemanbase.cpp:155 -#, fuzzy msgid "&Remove" -msgstr "esborra" +msgstr "&Esborra" #: Filter/generalfilter.cpp:155 msgid "&Search in" -msgstr "Cerca &dins:" +msgstr "Cerca &dins" #: Filter/generalfilter.cpp:175 msgid "&Don't search in" -msgstr "&No cercar dins:" +msgstr "&No cerquis dins" #: Filter/generalfilter.cpp:195 msgid "Containing text" -msgstr "Amb el texte " +msgstr "Amb el text" #: Filter/generalfilter.cpp:210 msgid "&Text:" -msgstr "&Texte:" +msgstr "&Text:" #: Filter/generalfilter.cpp:230 msgid "&Remote content search" -msgstr "" +msgstr "Cerca de contingut &remot" #: Filter/generalfilter.cpp:238 msgid "&Match whole word only" @@ -580,15 +593,15 @@ #: Filter/generalfilter.cpp:244 msgid "Cas&e sensitive" -msgstr "Disting&eix majúscoles/minúscoles" +msgstr "Disting&eix majúscules/minúscules" #: Filter/generalfilter.cpp:263 msgid "Search in s&ubdirectories" -msgstr "Cerca també en les s&ubcarpetes" +msgstr "Cerca en les s&ubdirectoris" #: Filter/generalfilter.cpp:268 msgid "Search in arch&ives" -msgstr "Cerca dins els f&itxer comprimits" +msgstr "Cerca d&ins els arxius" #: Filter/generalfilter.cpp:272 msgid "Follow &links" @@ -738,91 +751,86 @@ msgstr "La data entrada no és vàlida." #: Filter/advancedfilter.cpp:475 -#, fuzzy msgid "" "The date %1 is not valid according to your locale. Please re-enter a valid " "date (use the date button for easy access)." msgstr "" -"' no és vàlida segons la seva configuració regional.\n" -"Si us plau torneu-la a entrar correctament ( podeu fer servir el botó " -"calendari )" +"La data %1 no és vàlida segons la vostra configuració regional.\n" +"Torneu-la a escriure-la correctament (utilitzeu el botó delcalendari)." #: Filter/advancedfilter.cpp:508 msgid "Specified sizes are inconsistent!" msgstr "No es pot realitza la cerca entre les mides introduïdes !" #: Filter/advancedfilter.cpp:509 -#, fuzzy msgid "" "Please re-enter the values, so that the left side size will be smaller than " "(or equal to) the right side size." msgstr "" -"Cal que la mida introduïda a l'esquerra sigui menor o igual a la de la dreta." +"Cal que torneu a escriure els valors, de manera que la mida de l'esquerra " +"sigui menor o igual al de la dreta." #: Filter/advancedfilter.cpp:526 Filter/advancedfilter.cpp:584 msgid "Dates are inconsistent!" msgstr "No es pot realitza la cerca entre les dates introduïdes !" #: Filter/advancedfilter.cpp:527 -#, fuzzy msgid "" "The date on the left is later than the date on the right. Please re-enter " "the dates, so that the left side date will be earlier than the right side " "date." msgstr "" -"Cal que la data introduïda a l'esquerra sigui anterior a la de la dreta." +"La data de l'esquerra és posterior a la data de la dreta.Cal que torneu a " +"escriure els valors de forma correcta i coherent." #: Filter/advancedfilter.cpp:585 -#, fuzzy msgid "" "The date on top is later than the date on the bottom. Please re-enter the " "dates, so that the top date will be earlier than the bottom date." -msgstr "Cal que la data introduïda a dalt sigui anterior a la de baix." +msgstr "" +"La primera data és posterior a la segona data.Cal que torneu a escriure els " +"valors de forma correcta i coherent." #: UserAction/expander.cpp:55 #, c-format msgid "Needed panel specification missing in expander %1" -msgstr "" +msgstr "Falta l'especificació necessària per al plafó en l'expander %1" #: UserAction/expander.cpp:70 msgid "Expander: Bad argument to %1: %2 is not valid item specifier" msgstr "" +"Expander: el paràmetre per a %1 és dolent, ja que %2 no és un bon " +"especificador d'element" #: UserAction/expander.cpp:357 -#, fuzzy msgid "Panel's Path..." -msgstr "Adreça del plafó" +msgstr "Camí del plafó..." #: UserAction/expander.cpp:360 UserAction/expander.cpp:422 #: UserAction/expander.cpp:456 UserAction/expander.cpp:488 #: UserAction/expander.cpp:775 -#, fuzzy msgid "Automatically escape spaces" msgstr "Protegeix els caràcters espai automàticament" #: UserAction/expander.cpp:380 -#, fuzzy msgid "Number of..." -msgstr "nombre de ..." +msgstr "Nombre de..." #: UserAction/expander.cpp:383 -#, fuzzy msgid "Count:" -msgstr "Monta" +msgstr "Compta:" #: UserAction/expander.cpp:398 msgid "Expander: Bad argument to Count: %1 is not valid item specifier" -msgstr "" +msgstr "Expander: l'argument Compta: %1 no és un valor vàlid" #: UserAction/expander.cpp:407 -#, fuzzy msgid "Filter Mask (*.h, *.cpp, etc.)" -msgstr "mascara del filtre (*.h, *.cpp ...)" +msgstr "Màscara del filtre (*.h, *.cpp, etc...)" #: UserAction/expander.cpp:418 -#, fuzzy msgid "Current File (!= Selected File)..." -msgstr "Fitxer actiu (diferent que el fitxer seleccionat)" +msgstr "Fitxer indicat (a part del seleccionat)..." #: UserAction/expander.cpp:421 UserAction/expander.cpp:454 #: UserAction/expander.cpp:486 UserAction/expander.cpp:773 @@ -830,31 +838,26 @@ msgstr "Omet la carpeta actual (opcional)" #: UserAction/expander.cpp:449 -#, fuzzy msgid "Item List of..." -msgstr "Llista d'elements de ..." +msgstr "Llista d'elements de..." #: UserAction/expander.cpp:452 UserAction/expander.cpp:484 #: UserAction/expander.cpp:772 -#, fuzzy msgid "Which items:" -msgstr "Quins elements" +msgstr "Quins elements:" #: UserAction/expander.cpp:453 -#, fuzzy msgid "Separator between the items (optional):" -msgstr "Separador entre elements (opcional)" +msgstr "Separador entre elements (opcional):" #: UserAction/expander.cpp:455 UserAction/expander.cpp:487 #: UserAction/expander.cpp:774 -#, fuzzy msgid "Mask (optional, all but 'Selected'):" -msgstr "Mascara (opcional, no es pot posar 'Selected')" +msgstr "Màscara (opcional, no es pot posar 'Selected'):" #: UserAction/expander.cpp:481 -#, fuzzy msgid "Filename of an Item List..." -msgstr "Fitxer de l'elment ..." +msgstr "Nom de fitxer d'un element de la llista..." #: UserAction/expander.cpp:485 msgid "Separator between the items (optional)" @@ -862,262 +865,240 @@ #: UserAction/expander.cpp:504 msgid "Expander: tempfile couldn't be opened (%1)" -msgstr "" +msgstr "Expander: el fitxer temporal no s'ha pogut obrir (%1)" #: UserAction/expander.cpp:524 -#, fuzzy msgid "Manipulate the Selection..." -msgstr "Selecciona:" +msgstr "Manipula la selecció..." #: UserAction/expander.cpp:527 -#, fuzzy msgid "Selection mask:" -msgstr "Mascara de la selecció" +msgstr "Mascara de la selecció:" #: UserAction/expander.cpp:528 -#, fuzzy msgid "Manipulate in which way:" -msgstr "Manipula de la següent forma" +msgstr "Manipula-la de la següent forma:" #: UserAction/expander.cpp:553 -#, fuzzy msgid "Jump to a Location..." -msgstr "Salta a la ubicació" +msgstr "Salta a la ubicació..." #: UserAction/expander.cpp:556 -#, fuzzy msgid "Choose a path:" -msgstr "si us plau escolliu una ubicació" +msgstr "Selecciona una ubicació:" #: UserAction/expander.cpp:557 -#, fuzzy msgid "Open location in a new tab" -msgstr "obre el lloc en una nova pestanya" +msgstr "Obre la ubicació en una nova pestanya" #: UserAction/expander.cpp:593 msgid "Ask Parameter from User..." -msgstr "" +msgstr "Pregunta un paràmetre a l'usuari..." #: UserAction/expander.cpp:596 -#, fuzzy msgid "Question:" -msgstr "Pregunta" +msgstr "Pregunta:" #: UserAction/expander.cpp:597 -#, fuzzy msgid "Preset (optional):" -msgstr "Predefinir (opcional)" +msgstr "Valor per defecte (opcional)" #: UserAction/expander.cpp:598 -#, fuzzy msgid "Caption (optional):" -msgstr "Texte (opcional)" +msgstr "Text (opcional)" #: UserAction/expander.cpp:604 msgid "User Action" msgstr "Acció definida per l'usuari" #: UserAction/expander.cpp:629 -#, fuzzy msgid "Copy to Clipboard..." -msgstr "Copia al porta-retalls" +msgstr "Copia al porta-retalls..." #: UserAction/expander.cpp:632 UserAction/expander.cpp:655 msgid "What to copy:" -msgstr "" +msgstr "Què cal copiar:" #: UserAction/expander.cpp:633 -#, fuzzy msgid "Append to current clipboard content with this separator (optional):" -msgstr "Afegeix aquest separador al porta-retalls (opcional)" +msgstr "Afegeix aquest separador al contingut del porta-retalls (opcional):" #: UserAction/expander.cpp:639 msgid "Expander: %Each% may not be in the second argument of %Clipboard%" -msgstr "" +msgstr "Expander: %Each% no pot ser el segon paràmetre de %Clipboard%" #: UserAction/expander.cpp:652 -#, fuzzy msgid "Copy a File/Folder..." -msgstr "Copia un fitxer/carpeta" +msgstr "Copia un fitxer/carpeta..." #: UserAction/expander.cpp:656 -#, fuzzy msgid "Where to copy:" -msgstr "On s'hauria de copiar" +msgstr "On s'ha copiar:" #: UserAction/expander.cpp:663 msgid "Expander: %Each% may not be in the second argument of %Copy%" -msgstr "" +msgstr "Expander: %Each% no pot ser el segon paràmetre de %Copy%" #: UserAction/expander.cpp:673 msgid "Expander: invalid URL's in %_Copy(\"src\", \"dest\")%" msgstr "" +"Expander: L'URL no és correcte en l'expressió %_Copy(\"src\", \"dest\")%" #: UserAction/expander.cpp:684 -#, fuzzy msgid "Move/Rename a File/Folder..." -msgstr "Copia/reanomena un fitxer o carpeta" +msgstr "Mou o canvia el nom d'un fitxer o carpeta..." #: UserAction/expander.cpp:687 -#, fuzzy msgid "What to move/rename:" -msgstr "Origen" +msgstr "Què cal moure o canviar de nom:" #: UserAction/expander.cpp:688 -#, fuzzy msgid "New target/name:" -msgstr "Destinació" +msgstr "Nova destinació o nou nom:" #: UserAction/expander.cpp:694 msgid "%Each% may not be in the second argument of %Move%" -msgstr "" +msgstr "%Each% no pot ser el segon paràmetre de %Move%" #: UserAction/expander.cpp:704 msgid "Expander: invalid URL's in %_Move(\"src\", \"dest\")%" msgstr "" +"Expander: L'URL no és correcte en l'expressió %_Move(\"src\", \"dest\")%" #: UserAction/expander.cpp:715 -#, fuzzy msgid "Load a Synchronizer Profile..." -msgstr "Mode sincronització" +msgstr "Carrega un perfil de sincronització..." #: UserAction/expander.cpp:718 UserAction/expander.cpp:736 #: UserAction/expander.cpp:754 -#, fuzzy msgid "Choose a profile:" -msgstr "Selector de mode" +msgstr "Selecció del perfil:" #: UserAction/expander.cpp:722 msgid "Expander: no profile specified for %_Sync(profile)%" -msgstr "" +msgstr "Expander: no hi ha cap perfil definit per a %_Sync(profile)%" #: UserAction/expander.cpp:733 -#, fuzzy msgid "Load a Searchmodule Profile..." -msgstr "Mode cercador" +msgstr "Carrega un perfil de cerca de mòduls..." #: UserAction/expander.cpp:740 msgid "Expander: no profile specified for %_NewSearch(profile)%" -msgstr "" +msgstr "Expander: no hi ha cap perfil definit per a %_NewSearch(profile)%" #: UserAction/expander.cpp:751 -#, fuzzy msgid "Load a Panel Profile..." -msgstr "Carrega un mode en el plafó" +msgstr "Carrega un perfil de plafó..." #: UserAction/expander.cpp:758 msgid "Expander: no profile specified for %_Profile(profile)%; abort..." msgstr "" +"Expander: no hi ha cap perfil definit per a %_Profile(profile)%; abort..." #: UserAction/expander.cpp:769 -#, fuzzy msgid "Separate Program Call for Each..." -msgstr "Fes una crida separada per cada ..." +msgstr "Fes una crida de programa diferent per a cada..." #: UserAction/expander.cpp:801 -#, fuzzy msgid "Set Sorting for This Panel..." -msgstr "Selector del criteri d'ordenació per aquest plafó" +msgstr "Defineix l'ordenació d'aquest plafó..." #: UserAction/expander.cpp:804 -#, fuzzy msgid "Choose a column:" -msgstr "Selector de columnes" +msgstr "Seleccioneu una columna:" #: UserAction/expander.cpp:805 -#, fuzzy msgid "Choose a sort sequence:" -msgstr "Selecciona una seqüència d'ordenació" +msgstr "Escolliu una seqüència d'ordenació:" #: UserAction/expander.cpp:811 msgid "Expander: no column specified for %_ColSort(column)%" -msgstr "" +msgstr "Expander: no s'ha especificat cap columna per a %_ColSort(column)%" #: UserAction/expander.cpp:883 msgid "Expander: unknown column specified for %_ColSort(%1)%" -msgstr "" +msgstr "Expander: la columna especificada és incorrecta per a %_ColSort(%1)%" #: UserAction/expander.cpp:895 -#, fuzzy msgid "Set Relation Between the Panels..." -msgstr "Estableix una relació entre els dos plafons" +msgstr "Estableix una relació entre els dos plafons..." #: UserAction/expander.cpp:898 -#, fuzzy msgid "Set the new size in percent:" -msgstr "Modifica la mida en tant per cent" +msgstr "Definiu una nova mida en tant per cent:" #: UserAction/expander.cpp:910 msgid "" "Expander: Value %1 out of range for %_PanelSize(percent)%. The first " "parameter has to be >0 and <100" msgstr "" +"Expander: El valor %1 està fora dels límits per a %_PanelSize(percent)%. El " +"primer paràmetre ha d'estar entre 0 i 100" #: UserAction/expander.cpp:934 -#, fuzzy msgid "Execute a JavaScript Extension..." -msgstr "Executa una extensió Javascript" +msgstr "Executa una extensió JavaScript..." #: UserAction/expander.cpp:937 msgid "Location of the script" msgstr "Ubicació de la seqüència d'ordres" #: UserAction/expander.cpp:938 -#, fuzzy msgid "" "Set some variables for the execution (optional).\n" "i.e. \"return=return_var;foo=bar\", consult the handbook for more information" msgstr "" "Introduïu el valor dels paràmetres de l'execució (opcional).\n" -"Per exemple \"nom=ElFitxer;any=2005\", si teniu dubtes consulteu el manual" +"Per exemple \"return=variable_retorn;any=2005\", si teniu dubtes consulteu " +"el manual" #: UserAction/expander.cpp:942 msgid "Expander: no script specified for %_Script(script)%" -msgstr "" +msgstr "Expander: no s'ha especificat cap guió per a %_Script(script)%" #: UserAction/expander.cpp:984 msgid "View File with Krusader's Internal Viewer..." -msgstr "" +msgstr "Visualitza el fitxer amb el visualitzador intern del Krusader..." #: UserAction/expander.cpp:987 msgid "Which file to view (normally '%aCurrent%'):" -msgstr "" +msgstr "Nom del fitxer a visualitzar (normalment '%aCurrent%'):" #: UserAction/expander.cpp:988 -#, fuzzy msgid "Choose a view mode:" -msgstr "Selector de mode" +msgstr "Escolliu un mode de visualització:" #: UserAction/expander.cpp:991 -#, fuzzy msgid "Choose a window mode:" -msgstr "Selector de columnes" +msgstr "Escolliu un mode de finestra:" #: UserAction/expander.cpp:995 msgid "Expander: no file to view in %_View(filename)%" -msgstr "" +msgstr "Expander: no hi ha cap fitxer per a visualitzar %_View(filename)%" #: UserAction/expander.cpp:1032 #, c-format msgid "%Each% is not allowed in parameter to %1" -msgstr "" +msgstr "%Each% no és un valor permès per al paràmetre per a %1" #: UserAction/expander.cpp:1053 msgid "Expander: Bad panel specifier %1 in placeholder %2" msgstr "" +"Expander: L'especificador del plafó %1 no és correcte en el paràmetre de " +"substitució %2" #: UserAction/expander.cpp:1082 #, c-format msgid "Error: unterminated % in Expander::expandCurrent" -msgstr "" +msgstr "Error: no s'ha tancat el símbol % en l'Expander::expandCurrent" #: UserAction/expander.cpp:1112 msgid "Error: unrecognized %%%1%2%% in Expander::expand" -msgstr "" +msgstr "Error: no s'ha reconegut %%%1%2%% en l'Expander::expand" #: UserAction/expander.cpp:1148 msgid "Error: missing ')' in Expander::separateParameter" -msgstr "" +msgstr "Error: falta el símbol ')' en l'Expander::separateParameter" #: UserAction/kractionbase.cpp:51 msgid "Confirm execution" @@ -1129,9 +1110,8 @@ #: Konfigurator/konfigurator.cpp:69 Search/krsearchdialog.cpp:139 #: Synchronizer/synchronizergui.cpp:1471 UserAction/kraction.cpp:49 -#, fuzzy msgid "Close" -msgstr "Colors" +msgstr "Tanca" #: UserAction/kraction.cpp:52 msgid "Kill" @@ -1139,11 +1119,11 @@ #: UserAction/kraction.cpp:52 msgid "Kill the running process" -msgstr "Mata el pròces en execució" +msgstr "Mata el procés en execució" #: UserAction/kraction.cpp:54 msgid "Save as" -msgstr "" +msgstr "Anomena i desa" #: UserAction/kraction.cpp:63 msgid "Standard Output (stdout)" @@ -1151,7 +1131,7 @@ #: UserAction/kraction.cpp:70 msgid "Standard Error (stderr)" -msgstr "Sotrida d'errors (stderr)" +msgstr "Sortida d'errors (stderr)" #: UserAction/kraction.cpp:76 msgid "Output" @@ -1159,26 +1139,27 @@ #: UserAction/kraction.cpp:98 msgid "Use font with fixed width" -msgstr "" +msgstr "Utilitza una font de mida fixa" #: UserAction/kraction.cpp:132 -#, fuzzy msgid "" "*.txt|Text files\n" "*|all files" -msgstr "*.xml|fitxers xml" +msgstr "" +"*.txt|Fitxers de text\n" +"*|Tots els fitxers" #: UserAction/kraction.cpp:139 -#, fuzzy msgid "" "This file already exists.\n" "Do you want to overwrite it or append the output?" -msgstr " ja existeix, voleu sobreescriure'l ?" +msgstr "" +"El fitxer ja existeix.\n" +"Voleu sobreescriure'l o bé voleu afegir-ho al final?" #: UserAction/kraction.cpp:140 -#, fuzzy msgid "Overwrite or append?" -msgstr "Sobreescriu" +msgstr "Voleu sobreescriure'l o afegir-li al final?" #: ActionMan/useractionpage.cpp:248 ActionMan/useractionpage.cpp:257 #: Dialogs/checksumdlg.cpp:573 Dialogs/krkeydialog.cpp:135 @@ -1187,56 +1168,61 @@ msgstr "Sobreescriu" #: UserAction/kraction.cpp:142 -#, fuzzy msgid "Append" -msgstr "&Obre" +msgstr "Afegeix al final" #: ActionMan/useractionpage.cpp:271 UserAction/kraction.cpp:154 msgid "" "Can't open %1 for writing!\n" "Nothing exported." msgstr "" +"No s'ha pogut obrir %1 per escriure-hi.\n" +"No 's'ha pogut fer l'exportació." #: ActionMan/useractionpage.cpp:272 UserAction/kraction.cpp:155 -#, fuzzy msgid "Export failed!" -msgstr "Fitxers de texte" +msgstr "No s'ha pogut fer l'exportació." #: UserAction/kraction.cpp:200 msgid "" "Support for more than one command doesn't work in a terminal. Only the first " "is executed in the terminal." msgstr "" +"No es permet més d'una ordre al terminal. Només s'executarà la primera ordre " +"en el terminal." #: UserAction/kraction.cpp:204 msgid "" "Embedded terminal emulator does not work, using output collection instead." msgstr "" +"L'emulador de terminal no funciona, per tant s'utilitzarà la captura de la " +"sortida en el seu lloc." #: UserAction/useraction.cpp:100 msgid "The file %1 does not contain valid UserActions.\n" -msgstr "" +msgstr "El fitxer %1 no conté accions vàlides.\n" #: UserAction/useraction.cpp:101 UserAction/useraction.cpp:112 #: UserAction/useraction.cpp:124 -#, fuzzy msgid "UserActions - can't read from file!" -msgstr "No s'ha pogut llegir el fitxer" +msgstr "No es poden llegir accions del fitxer." #: UserAction/useraction.cpp:123 -#, fuzzy, c-format +#, c-format msgid "Unable to open actionfile %1" -msgstr "No es pot escriure a " +msgstr "No s'ha pogut obrir el fitxer d'accions %1" #: UserAction/useraction.cpp:140 msgid "" "Action without name detected. This action will not be imported!\n" "This is an error in the file, you may want to correct it." msgstr "" +"Hi ha una acció sense nom. Aquesta acció no es pot importar.\n" +"Això és un error del fitxer que hauríeu de corregir." #: UserAction/useraction.cpp:141 msgid "UserActions - invalid action" -msgstr "" +msgstr "Acció invàlida" #: Panel/krdetailedviewitem.cpp:78 Panel/krdetailedviewitem.cpp:110 #: Synchronizer/synchronizergui.cpp:1982 Synchronizer/synchronizergui.cpp:1989 @@ -1278,8 +1264,8 @@ "Open menu with bookmarks. You can also add current location to the list, " "edit bookmarks or add subfolder to the list." msgstr "" -"Obre el menú d'adreçes d'interès. Podeu afegir a la llista l'adreça actual , " -"editar les adreces existents o crear una subcarpeta." +"Obre el menú d'adreces d'interès. Podeu afegir l'adreça actual a la llista, " +"editar les adreces existents o crear una carpeta." #: Panel/listpanel.cpp:163 msgid "" @@ -1294,13 +1280,13 @@ msgstr "Obre el menú emergent" #: Panel/listpanel.cpp:198 -#, fuzzy msgid "Clear the location bar" -msgstr "Salta a la ubicació" +msgstr "Buida la barra de navegació" #: Panel/listpanel.cpp:206 msgid "Use superb KDE file dialog to choose location. " -msgstr "Per escullir el lloc utilitza el magnífic diàleg del KDE." +msgstr "" +"Per a escollir la ubicació utilitzeu el magnífic diàleg de fitxers del KDE." #: Panel/listpanel.cpp:211 msgid "" @@ -1376,7 +1362,7 @@ #: Panel/listpanel.cpp:724 msgid "Mt.Man: working ..." -msgstr "El gestor de dispositius muntats Mountman està fent ..." +msgstr "Mt.Man: està treballant ..." #: Panel/listpanel.cpp:738 msgid "unknown" @@ -1405,9 +1391,8 @@ #: Dialogs/krmaskchoice.cpp:135 Dialogs/packguibase.cpp:289 #: DiskUsage/diskusage.cpp:155 Panel/listpanel.cpp:836 #: Panel/panelpopup.cpp:379 -#, fuzzy msgid "Cancel" -msgstr "Plafó" +msgstr "Cancel·la" #: Panel/listpanel.cpp:1052 msgid ">> Reading..." @@ -1568,11 +1553,13 @@ msgstr "Espai ocupat total: %1" #: Panel/krcalcspacedialog.cpp:151 -#, fuzzy, c-format +#, c-format msgid "" "_n: in %n directory\n" "in %n directories" -msgstr "Obre la llista historial de carpetes" +msgstr "" +"_n: en %n directori\n" +"en %n directoris" #: Panel/krcalcspacedialog.cpp:153 #, c-format @@ -1580,18 +1567,18 @@ "_n: and %n file\n" "and %n files" msgstr "" +"_n: i %n fitxer\n" +"i %n fitxers" #: Panel/krpopupmenu.cpp:59 -#, fuzzy msgid "Open/Run" -msgstr "Botó 'Obre'" +msgstr "Obre/executa" #: Panel/krpopupmenu.cpp:61 msgid "Run" msgstr "Executa" #: Panel/krpopupmenu.cpp:64 Panel/krpopupmenu.cpp:65 -#, fuzzy msgid "Open in New Tab" msgstr "Obre en una nova pestanya" @@ -1609,74 +1596,62 @@ msgstr "Altres..." #: Panel/krpopupmenu.cpp:104 -#, fuzzy msgid "Open With" -msgstr "Obrir amb" +msgstr "Obre amb" #: Konfigurator/konfigurator.cpp:113 Panel/krpopupmenu.cpp:109 msgid "User Actions" msgstr "Accions de l'usuari" #: Panel/krpopupmenu.cpp:123 -#, fuzzy msgid "Konqueror Menu" msgstr "Menú Konqueror" #: Panel/krpopupmenu.cpp:131 krusader.cpp:760 -#, fuzzy msgid "Copy..." -msgstr "Copia " +msgstr "Copia..." #: Panel/krpopupmenu.cpp:134 krusader.cpp:762 -#, fuzzy msgid "Move..." -msgstr "Mou " +msgstr "Mou..." #: Panel/krpopupmenu.cpp:143 -#, fuzzy msgid "Move to Trash" -msgstr "Mou a la paparera" +msgstr "Mou a la paperera" #: BookMan/krbookmarkhandler.cpp:541 Dialogs/krmaskchoice.cpp:110 #: Dialogs/kurllistrequester.cpp:149 DiskUsage/diskusage.cpp:757 #: Konfigurator/kgcolors.cpp:474 Panel/krpopupmenu.cpp:145 krusader.cpp:766 -#, fuzzy msgid "Delete" -msgstr " Esborra" +msgstr "Esborra" #: Panel/krpopupmenu.cpp:149 msgid "Shred" msgstr "Estripa" #: Panel/krpopupmenu.cpp:156 krusader.cpp:729 -#, fuzzy msgid "New Symlink..." -msgstr "nou enllaç simbòlic" +msgstr "Nou enllaç simbòlic..." #: Panel/krpopupmenu.cpp:157 -#, fuzzy msgid "New Hardlink..." -msgstr "nou enllaç hardlink" +msgstr "Nou enllaç fort..." #: Panel/krpopupmenu.cpp:159 -#, fuzzy msgid "Redirect Link..." -msgstr "redefineix enllaç" +msgstr "Canvia l'enllaç..." #: Panel/krpopupmenu.cpp:161 -#, fuzzy msgid "Link Handling" -msgstr "Enllaç" +msgstr "Gestió de l'enllaç" #: Panel/krpopupmenu.cpp:181 -#, fuzzy msgid "Send by Email" -msgstr "Envia per email" +msgstr "Envia per correu" #: Panel/krpopupmenu.cpp:186 -#, fuzzy msgid "Synchronize Selected Files..." -msgstr "Sincronitza carpetes" +msgstr "Sincronitza els fitxers seleccionats..." #: Panel/krpopupmenu.cpp:191 krusader.cpp:544 msgid "Copy to Clipboard" @@ -1691,31 +1666,28 @@ msgstr "Enganxa del porta-retalls" #: Panel/krpopupmenu.cpp:215 -#, fuzzy msgid "Folder..." -msgstr "Nova carpeta" +msgstr "Carpeta..." #: Panel/krpopupmenu.cpp:216 -#, fuzzy msgid "Text File..." -msgstr "Fitxers de texte" +msgstr "Fitxer de text..." #: Panel/krpopupmenu.cpp:219 -#, fuzzy msgid "Create New" -msgstr "Crea dins:" +msgstr "Crea un nou" #: Panel/krpopupmenu.cpp:261 -#, fuzzy msgid "" "<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone " "forever!</qt>" -msgstr "? Un cop estripats, els fitxers es perdran per sempre !!!" +msgstr "" +"<qt>Segur que voleu estripar<b>%1</b>? Un cop s'ha estripat, el fitxer es " +"perdrà per sempre.</qt>" #: Panel/krpopupmenu.cpp:339 -#, fuzzy msgid "Can't open \"%1\"" -msgstr "No s'ha pogut obrir " +msgstr "No s'ha pogut obrir «%1»" #: Panel/panelfunc.cpp:270 msgid "You can edit links only on local file systems" @@ -1723,15 +1695,15 @@ #: Panel/panelfunc.cpp:281 msgid "The current file is not a link, so I can't redirect it." -msgstr "El fitxer actual no és un enllaç, no es pot redefinir l'enllaç." +msgstr "El fitxer actual no és un enllaç, no es pot canviar l'enllaç." #: Panel/panelfunc.cpp:288 msgid "Link Redirection" -msgstr "Segueix la redirecció" +msgstr "Canvi d'enllaç" #: Panel/panelfunc.cpp:289 msgid "Please enter the new link destination:" -msgstr "Si us plau introduiu el nou destí de l'enllaç:" +msgstr "Introduïu la nova destinació de l'enllaç:" #: Panel/panelfunc.cpp:296 msgid "Can't remove old link: " @@ -1770,9 +1742,8 @@ msgstr "No es tenen permisos per veure aquest fitxer." #: Panel/panelfunc.cpp:380 -#, fuzzy msgid "<qt>Can't open <b>%1</b></qt>" -msgstr "No s'ha pogut obrir " +msgstr "<qt>No s'ha pogut obrir <b>%1</b></qt>" #: Panel/panelfunc.cpp:391 msgid "You can't edit a directory" @@ -1787,9 +1758,8 @@ msgstr "No es permet moure fitxers dins un fitxer comprimit" #: Panel/panelfunc.cpp:426 -#, fuzzy msgid "Move %1 to:" -msgstr "S'estan movent %d fitxers a:" +msgstr "Mou %1 a:" #: Panel/panelfunc.cpp:428 #, c-format @@ -1797,6 +1767,8 @@ "_n: Move %n file to:\n" "Move %n files to:" msgstr "" +"_n: Mou %n fitxer a:\n" +"Mou %n fitxers a:" #: Panel/panelfunc.cpp:472 msgid "You can't move files to this file system" @@ -1811,9 +1783,8 @@ msgstr "Nom de la carpeta:" #: Panel/panelfunc.cpp:581 -#, fuzzy msgid "Copy %1 to:" -msgstr "S'estan copiant %d fitxers a:" +msgstr "Copia %1 a:" #: Panel/panelfunc.cpp:583 #, c-format @@ -1821,6 +1792,8 @@ "_n: Copy %n file to:\n" "Copy %n files to:" msgstr "" +"_n Copia %n fitxer a:\n" +"Copia %n fitxers a:" #: Panel/panelfunc.cpp:619 msgid "You can't copy files to this file system" @@ -1836,6 +1809,8 @@ "_n: Do you really want to move this item to the trash?\n" "Do you really want to move these %n items to the trash?" msgstr "" +"_n: Esteu segur que voleu moure aquest element a la paperera?\n" +"Esteu segur que voleu moure %n elements a la paperera?" #: DiskUsage/diskusage.cpp:597 Panel/panelfunc.cpp:649 msgid "&Trash" @@ -1848,13 +1823,16 @@ "Do you really want to delete these virtual items (physical files stay " "untouched)?" msgstr "" +"_n: Segur que voleu esborrar aquest element virtual (el fitxer físic no es " +"tocarà)?\n" +"Segur que voleu esborrar %n elements virtuals (els fitxers físics no es " +"tocaran)?" #: DiskUsage/diskusage.cpp:600 DiskUsage/radialMap/widgetEvents.cpp:172 #: DiskUsage/radialMap/widgetEvents.cpp:194 Panel/panelfunc.cpp:652 #: Panel/panelfunc.cpp:655 Panel/panelfunc.cpp:658 -#, fuzzy msgid "&Delete" -msgstr " Esborra" +msgstr "&Esborra" #: Panel/panelfunc.cpp:654 #, c-format @@ -1864,6 +1842,10 @@ "<qt>Do you really want to delete these %n items <b>physically</b> (not just " "removing them from the virtual items)?</qt>" msgstr "" +"_n: <qt>Segur que voleu esborrar aquest element <b>físicament</b> " +"(s'esborraran també els elements virtuals)?</qt>\n" +"<qt>Segur que voleu esborrar %n elements <b>físicament</b> (s'esborraran " +"també els elements virtuals)?</qt>" #: Panel/panelfunc.cpp:657 #, c-format @@ -1871,22 +1853,22 @@ "_n: Do you really want to delete this item?\n" "Do you really want to delete these %n items?" msgstr "" +"_n Segur que voleu esborrar aquest element?\n" +"Segur que voleu esborrar aquests %n elements?" #: Dialogs/checksumdlg.cpp:573 Dialogs/krkeydialog.cpp:135 #: DiskUsage/diskusage.cpp:607 Konfigurator/kgcolors.cpp:523 #: Panel/panelfunc.cpp:664 -#, fuzzy msgid "Warning" -msgstr "S'està treballant" +msgstr "Atenció" #: Panel/panelfunc.cpp:682 -#, fuzzy msgid "" "<qt><p>Directory <b>%1</b> is not empty!</p><p>Skip this one or Delete All?</" "p></qt>" msgstr "" -" no està buida\n" -"Voleu saltar-vos aquest carpeta o esborrar-la del tot?" +"<qt><p>El directori <b>%1</b> no està buit</p><p>El voleu ometre o voleu " +"esborrar-lo del tot?</p></qt>" #: Panel/panelfunc.cpp:683 msgid "&Skip" @@ -1898,24 +1880,25 @@ #: Panel/panelfunc.cpp:797 msgid "Cannot pack files onto a virtual destination!" -msgstr "" +msgstr "No es poden empaquetar els fitxers en una ubicació virtual." #: Panel/panelfunc.cpp:809 -#, fuzzy msgid "" "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?" "</p><p>All data in the previous archive will be lost!</p></qt>" -msgstr " ja existeix, voleu sobreescriure'l ?" +msgstr "" +"<qt><p>L'arxiu <b>%1.%2</b> ja existeix. Voleu sobreescriure'l?</p><p>Es " +"perdran les dades de l'arxiu antic.</p></qt>" #: Panel/panelfunc.cpp:811 -#, fuzzy msgid "" "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?" "</p><p>Zip will replace identically named entries in the zip archive or add " "entries for new names.</p></qt>" msgstr "" -"(ZIP es sobreescriuran els fitxers que ja existeixin i s'afegiran el fitxers " -"nous)" +"<qt><p>L'arxiu <b>%1.%2</b> ja existeix. Voleu sobreescriure'l?</p><p>El Zip " +"substituirà els fitxers amb el mateix nom dins de l'arxiu zip o bé afegirà " +"els fitxers amb un nom nou.</p></qt>" #: Panel/panelfunc.cpp:818 msgid "Counting files to pack" @@ -1939,9 +1922,8 @@ msgstr "%1, no ha passat el test !" #: Panel/panelfunc.cpp:916 -#, fuzzy msgid "Unpack %1 to:" -msgstr "Descomprimeix " +msgstr "Descomprimeix %1 a:" #: Panel/panelfunc.cpp:918 #, c-format @@ -1949,6 +1931,8 @@ "_n: Unpack %n file to:\n" "Unpack %n files to:" msgstr "" +"_n: Desempaqueta %n fitxer a:\n" +"Desempaqueta %n fitxers a:" #: Panel/panelfunc.cpp:964 msgid "%1, unknown archive type" @@ -1956,17 +1940,16 @@ #: Panel/panelfunc.cpp:1147 msgid "Cannot cut a virtual URL collection to the clipboard!" -msgstr "" +msgstr "No es pot retallar una llista d'URL virtuals al porta-retalls." #: Panel/panelfunc.cpp:1149 msgid "Cannot copy a virtual URL collection onto the clipboard!" -msgstr "" +msgstr "No es pot copiar una llista d'URL virtuals al porta-retalls." #: Locate/locate.cpp:101 Locate/locate.cpp:241 Search/krsearchdialog.cpp:135 #: Synchronizer/synchronizergui.cpp:1455 -#, fuzzy msgid "Stop" -msgstr "a" +msgstr "Atura" #: Locate/locate.cpp:101 msgid "Update DB" @@ -1994,7 +1977,7 @@ #: Locate/locate.cpp:132 msgid "Case Sensitive" -msgstr "Distingeix majúscoles/minúscoles" +msgstr "Distingeix majúscules/minúscules" #: Locate/locate.cpp:152 msgid "Results" @@ -2003,19 +1986,19 @@ #: Locate/locate.cpp:231 msgid "Can't start 'locate'! Check the 'Dependencies' page in konfigurator." msgstr "" -" No es pot arrencar 'locate'! Comprova les 'Dependencies' en el konfigurator." +" No es pot arrencar 'locate'! Comprova les 'Dependències' en el Konfigurador." #: Locate/locate.cpp:269 msgid "" "Locate produced the following error message:\n" "\n" msgstr "" -"Locate ha donat els següents missatges d'error:\n" +"El Locate ha donat els següents missatges d'error:\n" "\n" #: Locate/locate.cpp:272 msgid "Error during the start of 'locate' process!" -msgstr "S'ha produït un error a l'arrencar el procés `locate` !" +msgstr "S'ha produït un error quan s'ha iniciat el procés 'locate'." #: Locate/locate.cpp:282 Search/krsearchdialog.cpp:124 #: Synchronizer/synchronizergui.cpp:1460 @@ -2043,9 +2026,8 @@ msgstr "Cerca l'anterior (Ctrl+P)" #: Locate/locate.cpp:368 Search/krsearchdialog.cpp:541 -#, fuzzy msgid "Copy selected to clipboard" -msgstr "Copia al porta-retalls" +msgstr "Copia la selecció al porta-retalls" #: Locate/locate.cpp:487 Locate/locate.cpp:504 msgid "Search string not found!" @@ -2077,9 +2059,10 @@ "Note: Your bookmarks and keybindings will remain intact.\n" " Krusader will now run Konfigurator." msgstr "" -"S'ha trobat una configuració anterior o igual a la versió 1.51, el " -"Krusader, \n" -"reinicialitzarà els valors de la configuració i executarà Konfigurator." +"S'ha trobat una configuració anterior o igual a la versió 1.51, el Krusader " +"haurà de recuperar els valors per defecte.\n" +"Nota: es conservaran les dreceres de teclat i les adreces d'interès.\n" +"El Krusader iniciarà el Konfigurador." #: krusader.cpp:442 msgid "" @@ -2087,6 +2070,10 @@ "will now be checked for external applications. Then the Konfigurator will be " "launched where you can customize Krusader to your needs.</p></qt>" msgstr "" +"<qt><b>Benvingut al Krusader!</b><p>Com que aquest és el primer cop que " +"l'executeu, es cercaran les aplicacions de la teva màquina. A continuació " +"s'executarà el Konfigurador per tal que podeu personalitzar el Krusader a la " +"vostra mida.</p></qt>" #: krusader.cpp:508 msgid "F3 View Dialog" @@ -2094,12 +2081,11 @@ #: krusader.cpp:511 msgid "Tab: switch panel" -msgstr "Tab: alterna de plafó esquerra/dreta" +msgstr "Tab: canvia de plafó" #: krusader.cpp:534 -#, fuzzy msgid "&Reload" -msgstr "&Ubicació" +msgstr "&Actualitza" #: krusader.cpp:536 msgid "Show Actions Toolbar" @@ -2118,14 +2104,12 @@ msgstr "Mostra l'&Emulador de Terminal" #: krusader.cpp:558 -#, fuzzy msgid "&Detailed View" -msgstr "Veure detall" +msgstr "Visualització en &detall" #: krusader.cpp:561 -#, fuzzy msgid "&Brief View" -msgstr "Veure línia" +msgstr "Visualització &breu" #: krusader.cpp:564 msgid "Show &Hidden Files" @@ -2136,91 +2120,76 @@ msgstr "&Intercanvia Plafons" #: krusader.cpp:568 -#, fuzzy msgid "Sw&ap Sides" -msgstr "Intercanvia plafons" +msgstr "Inter&canvia plafons" #: krusader.cpp:574 msgid "popup cmdline" msgstr "línia de comandes emergent" #: krusader.cpp:578 -#, fuzzy msgid "&New Text File..." -msgstr "&Edita un nou fitxer" +msgstr "&Crea un nou fitxer..." #: krusader.cpp:579 -#, fuzzy msgid "Start &Root Mode Krusader" msgstr "Engega el Krusader en mode &Root" #: krusader.cpp:581 -#, fuzzy msgid "T&est Archive" -msgstr "T&esteja el fitxer comprimit" +msgstr "Comprova l'ar&xiu" #: krusader.cpp:585 -#, fuzzy msgid "New Net &Connection..." -msgstr "Nova &Conexió de Xarxa" +msgstr "Crea una connexió de &xarxa..." #: krusader.cpp:587 msgid "Pro&files" msgstr "Per&fils" #: krusader.cpp:589 -#, fuzzy msgid "Calculate &Occupied Space" -msgstr "Calcula l'espai ocupat" +msgstr "Calcula l'espai &ocupat" #: krusader.cpp:591 -#, fuzzy msgid "Create Checksum..." -msgstr "Crea dins:" +msgstr "Crea un checksum..." #: krusader.cpp:593 -#, fuzzy msgid "Verify Checksum..." -msgstr "Trocejant el fitxer %1..." +msgstr "Verifica el checksum..." #: krusader.cpp:595 -#, fuzzy msgid "&Properties..." -msgstr "&Propietats" +msgstr "&Propietats..." #: krusader.cpp:597 -#, fuzzy msgid "Pac&k..." -msgstr "Com&primeix" +msgstr "Com&primeix..." #: krusader.cpp:599 -#, fuzzy msgid "&Unpack..." -msgstr "&Descomprimeix" +msgstr "&Descomprimeix..." #: krusader.cpp:601 -#, fuzzy msgid "Sp&lit File..." -msgstr "Troce&ja fitxer" +msgstr "Trosse&ja fitxer..." #: krusader.cpp:603 -#, fuzzy msgid "Com&bine Files..." -msgstr "Reaj&unta fitxers" +msgstr "Reaj&unta fitxers..." #: krusader.cpp:605 -#, fuzzy msgid "Select &Group..." -msgstr "Selecciona un &grup" +msgstr "Selecciona un &grup..." #: krusader.cpp:607 msgid "&Select All" msgstr "&Selecciona-ho tot" #: krusader.cpp:609 -#, fuzzy msgid "&Unselect Group..." -msgstr "Deselecciona el Gr&up" +msgstr "Deselecciona el gr&up..." #: krusader.cpp:611 msgid "U&nselect All" @@ -2232,105 +2201,87 @@ #: krusader.cpp:615 msgid "&Compare Directories" -msgstr "&Compara carpetes" +msgstr "&Compara els directoris" #: krusader.cpp:617 -#, fuzzy msgid "&Select Newer and Single" -msgstr "&Marca els actualitzats i els nous" +msgstr "&Selecciona els més nous i els desaparellats" #: krusader.cpp:619 -#, fuzzy msgid "Select &Newer" -msgstr "Selecciona un &grup" +msgstr "Selecciona els més &nous" #: krusader.cpp:621 -#, fuzzy msgid "Select &Single" -msgstr " Selecciona fitxers " +msgstr "Selecciona els &desaparellats" #: krusader.cpp:623 -#, fuzzy msgid "Select Different &and Single" -msgstr "Marc&a els diferents i els nous" +msgstr "Selecciona els diferents &i els desaparellats" #: krusader.cpp:625 -#, fuzzy msgid "Select &Different" -msgstr "Marca els &diferents" +msgstr "Selecciona els &diferents" #: krusader.cpp:635 msgid "Start and &Forget" -msgstr "" +msgstr "Inicia i &oblida" #: krusader.cpp:639 -#, fuzzy msgid "Display &Separated Standard and Error Output" -msgstr "Separa el que surt com error" +msgstr "Mostra la &sortida estàndard i d'error per separat" #: krusader.cpp:643 msgid "Display &Mixed Standard and Error Output" -msgstr "" +msgstr "Mostra la &sortida estàndard i d'error juntes" #: krusader.cpp:647 -#, fuzzy msgid "Start in &New Terminal" -msgstr "Terminal" +msgstr "Inicia en un &nou terminal" #: krusader.cpp:651 -#, fuzzy msgid "Send to &Embedded Terminal Emulator" -msgstr "Mostra l'&Emulador de Terminal" +msgstr "Envia'l a l'&emulador de terminal integrat" #: krusader.cpp:663 -#, fuzzy msgid "Start &Terminal" -msgstr "Terminal" +msgstr "Inicia el &terminal" #: krusader.cpp:665 -#, fuzzy msgid "Disconnect &from Net" msgstr "Desconnecta de la &xarxa" #: krusader.cpp:668 krusader.cpp:673 -#, fuzzy msgid "&MountMan..." -msgstr "&MountMan" +msgstr "&MountMan..." #: krusader.cpp:677 -#, fuzzy msgid "&Search..." -msgstr "&Cerca" +msgstr "&Cerca..." #: krusader.cpp:679 -#, fuzzy msgid "&Locate..." -msgstr "&Ubicació" +msgstr "&Ubicació..." #: krusader.cpp:681 -#, fuzzy msgid "Synchronize &Directories..." -msgstr "Sincronitza &carpetes" +msgstr "Sincronitza els &directoris..." #: krusader.cpp:683 -#, fuzzy msgid "S&ynchron Directory Changes" -msgstr "&Sincronitza" +msgstr "S&incronitza els canvis dels directoris" #: krusader.cpp:685 -#, fuzzy msgid "D&isk Usage..." -msgstr "&Informació del disc" +msgstr "&Utilització del disc..." #: krusader.cpp:687 -#, fuzzy msgid "Configure &Krusader..." -msgstr "Configura el &Krusader" +msgstr "Configura el &Krusader..." #: krusader.cpp:689 -#, fuzzy msgid "Back" -msgstr "Negre" +msgstr "Torna" #: krusader.cpp:693 msgid "Save &Position" @@ -2345,177 +2296,149 @@ msgstr "&Personalitza" #: krusader.cpp:701 -#, fuzzy msgid "Compare b&y Content..." -msgstr "Compara per &contingut" +msgstr "Compara per &contingut..." #: krusader.cpp:703 -#, fuzzy msgid "Multi &Rename..." -msgstr "&Renomena massivament" +msgstr "&Renomena massivament..." #: krusader.cpp:705 -#, fuzzy msgid "Right-click Menu" msgstr "Menú del clic amb el botó dret" #: krusader.cpp:707 -#, fuzzy msgid "Right Bookmarks" -msgstr "Punts de la banda dreta" +msgstr "Adreces d'interès de la dreta" #: krusader.cpp:709 -#, fuzzy msgid "Left Bookmarks" -msgstr "Punts de la banda esquerra" +msgstr "Adreces d'interès de l'esquerra" #: BookMan/kraddbookmarkdlg.cpp:71 BookMan/krbookmarkbutton.cpp:19 #: BookMan/krbookmarkhandler.cpp:30 krusader.cpp:711 -#, fuzzy msgid "Bookmarks" -msgstr "Posa un punt" +msgstr "Adreces d'interès" #: BookMan/krbookmarkhandler.cpp:399 krusader.cpp:713 msgid "Bookmark Current" -msgstr "Adreça d'interès actual" +msgstr "Afegeix com a adreça d'interès" #: krusader.cpp:715 -#, fuzzy msgid "History" -msgstr "Històric (esq)" +msgstr "Historial" #: krusader.cpp:717 msgid "Sync Panels" msgstr "Sinc Plafons" #: krusader.cpp:719 -#, fuzzy msgid "Left History" -msgstr "Històric (esq)" +msgstr "Historial (esq)" #: krusader.cpp:721 -#, fuzzy msgid "Right History" -msgstr "Històric (dreta)" +msgstr "Historial (dreta)" #: BookMan/krbookmark.cpp:12 krusader.cpp:723 -#, fuzzy msgid "Media" -msgstr "edita" +msgstr "Suports" #: krusader.cpp:725 -#, fuzzy msgid "Left Media" -msgstr "Plafó Esquerrra" +msgstr "Suports (esq)" #: krusader.cpp:727 -#, fuzzy msgid "Right Media" -msgstr "Plafó Dret" +msgstr "Suports (dreta)" #: krusader.cpp:731 msgid "Toggle Popup Panel" -msgstr "Tanca el menú emergent" +msgstr "Commuta el plafó emergent" #: krusader.cpp:733 msgid "Vertical Mode" msgstr "Mode vertical" #: krusader.cpp:735 -#, fuzzy msgid "New Tab" msgstr "Nova pestanya" #: krusader.cpp:737 -#, fuzzy msgid "Duplicate Current Tab" -msgstr "Duplica pestanya" +msgstr "Duplica la pestanya" #: krusader.cpp:739 -#, fuzzy msgid "Close Current Tab" msgstr "Tanca la pestanya" #: krusader.cpp:741 -#, fuzzy msgid "Next Tab" -msgstr "Següent pestanya" +msgstr "Pestanya següent" #: krusader.cpp:743 -#, fuzzy msgid "Previous Tab" -msgstr "Anterior pestanya" +msgstr "Pestanya anterior" #: krusader.cpp:749 -#, fuzzy msgid "Manage User Actions..." -msgstr "Gestor d'accions" +msgstr "Gestió d'accions d'usuari..." #: krusader.cpp:751 -#, fuzzy msgid "Select Remote Charset" -msgstr "Selecciona" +msgstr "Selecciona un joc de caràcters remot" #: krusader.cpp:754 msgid "Start Terminal Here" -msgstr "" +msgstr "Inicia un terminal aquí" #: krusader.cpp:756 -#, fuzzy msgid "View File" -msgstr "Fitxers de video" +msgstr "Visualitza el fitxer" #: krusader.cpp:758 -#, fuzzy msgid "Edit File" -msgstr "Edita fitxer (F4)" +msgstr "Edita el fitxer" #: krusader.cpp:764 -#, fuzzy msgid "New Directory..." -msgstr "Nova carpeta" +msgstr "Crea un directori..." #: krusader.cpp:770 -#, fuzzy msgid "Quit" -msgstr "Silenciós" +msgstr "Surt" #: krusader.cpp:772 -#, fuzzy msgid "Popular URLs..." -msgstr "URLs famoses" +msgstr "URL famosos..." #: krusader.cpp:774 -#, fuzzy msgid "Go to Location Bar" -msgstr "Salta a la ubicació" +msgstr "Salta a la barra de navegació" #: krusader.cpp:776 -#, fuzzy msgid "Jump Back" -msgstr "Negre" +msgstr "Torna a un punt de retorn" #: krusader.cpp:778 msgid "Set Jump Back Point" -msgstr "" +msgstr "Marca un punt de retorn" #: krusader.cpp:780 -#, fuzzy msgid "Toggle Fullwidget Terminal Emulator" -msgstr "Mostra l'emulador de terminal" +msgstr "Commuta l'intèrpret de terminal complet" #: krusader.cpp:784 msgid "Select files using a filter" -msgstr "Resalta els fitxers fent servir un filtre" +msgstr "Selecciona fitxers amb un filtre" #: krusader.cpp:785 msgid "Select all files in the current directory" -msgstr "Resalta tots els fitxers de la carpeta actual" +msgstr "Selecciona tots els fitxers del directori" #: krusader.cpp:786 -#, fuzzy msgid "Unselect all selected files" -msgstr "Seleccioneu només un sol fitxer a reajuntar!" +msgstr "Deselecciona tots els fitxers" #: krusader.cpp:787 msgid "Setup Krusader the way you like it" @@ -2534,9 +2457,8 @@ msgstr "Cerca fitxers" #: krusader.cpp:796 -#, fuzzy msgid "JavaScript Console..." -msgstr "Consola Javascript" +msgstr "Consola Javascript..." #: krusader.cpp:932 msgid "Are you sure you want to quit?" @@ -2552,44 +2474,39 @@ #: KViewer/krviewer.cpp:85 msgid "&Generic viewer" -msgstr "Visualitzador &Genèric" +msgstr "Visualitzador &genèric" #: KViewer/krviewer.cpp:86 msgid "&Text viewer" -msgstr "Visusalitzador de &Texte" +msgstr "Visualitzador de &text" #: KViewer/krviewer.cpp:87 msgid "&Hex viewer" -msgstr "Visusalitzador &Hexadecimal" +msgstr "Visualitzador &hexadecimal" #: KViewer/krviewer.cpp:89 msgid "Text &editor" -msgstr "&Editor de texte" +msgstr "&Editor de text" #: KViewer/krviewer.cpp:91 -#, fuzzy msgid "&Next tab" -msgstr "Següent pestanya" +msgstr "Pestanya &següent" #: KViewer/krviewer.cpp:92 -#, fuzzy msgid "&Previous tab" -msgstr "Anterior pestanya" +msgstr "Pestanya &anterior" #: KViewer/krviewer.cpp:94 -#, fuzzy msgid "&Detach tab" -msgstr "Següent pestanya" +msgstr "Se¶ la pestanya" #: KViewer/krviewer.cpp:101 -#, fuzzy msgid "&Close current tab" -msgstr "Tanca la pestanya" +msgstr "&Tanca la pestanya" #: KViewer/krviewer.cpp:102 -#, fuzzy msgid "&Quit" -msgstr " Surt" +msgstr "&Surt" #: KViewer/krviewer.cpp:159 msgid "&KrViewer" @@ -2597,9 +2514,8 @@ #: KViewer/krviewer.cpp:259 KViewer/krviewer.cpp:327 KViewer/krviewer.cpp:411 #: KViewer/krviewer.cpp:420 KViewer/krviewer.cpp:429 KViewer/krviewer.cpp:503 -#, fuzzy msgid "Viewing" -msgstr "Veure:" +msgstr "S'està visualitzant" #: KViewer/krviewer.cpp:284 krslots.cpp:500 msgid "Can't open " @@ -2607,9 +2523,8 @@ #: KViewer/krviewer.cpp:292 KViewer/krviewer.cpp:327 KViewer/krviewer.cpp:438 #: KViewer/krviewer.cpp:501 -#, fuzzy msgid "Editing" -msgstr " Edita" +msgstr "S'està editant" #: KViewer/krviewer.cpp:579 msgid "Sorry, can't find internal editor" @@ -2636,9 +2551,8 @@ msgstr "Permisos" #: Search/krsearchdialog.cpp:222 -#, fuzzy msgid "Text found:" -msgstr "Color de la lletra (carpetes):" +msgstr "Text trobat:" #: Search/krsearchdialog.cpp:232 msgid "&Results" @@ -2656,7 +2570,7 @@ msgstr "" "Quan es cerqui dins de fitxers comprimits cal tenir en compte les següents " "limitacions:\n" -"No es podrà buscar per texte." +"No es podrà buscar per text." #: Search/krsearchdialog.cpp:433 msgid "Finished searching." @@ -2689,12 +2603,12 @@ #: BookMan/krbookmarkbutton.cpp:15 msgid "BookMan II" -msgstr "Gestor d'adreces II" +msgstr "BookMan II" #: BookMan/krbookmarkhandler.cpp:172 -#, fuzzy, c-format +#, c-format msgid "Unable to write to %1" -msgstr "No es pot escriure a " +msgstr "No es pot escriure a %1" #: BookMan/krbookmarkhandler.cpp:180 msgid " instead of " @@ -2706,27 +2620,25 @@ msgstr "falta marcador" #: BookMan/krbookmarkhandler.cpp:261 -#, fuzzy msgid "%1 doesn't seem to be a valid Bookmarks file" -msgstr " no sembla que sigui un fitxer d'adreces d'interès vàlid" +msgstr "El fitxer %1 no sembla un fitxer d'adreces d'interès vàlid" #: BookMan/krbookmarkhandler.cpp:268 -#, fuzzy, c-format +#, c-format msgid "Error reading bookmarks file: %1" -msgstr "No es pot llegir el fitxer d'adreces d'interès:" +msgstr "No s'ha pogut llegir el fitxer d'adreces d'interès: %1" #: BookMan/krbookmarkha... [truncated message content] |
From: <vac...@us...> - 2008-04-18 12:39:29
|
Revision: 2748 http://krusader.svn.sourceforge.net/krusader/?rev=2748&view=rev Author: vaclavjuza Date: 2008-04-18 05:39:33 -0700 (Fri, 18 Apr 2008) Log Message: ----------- Mention origin of l10n scripts Modified Paths: -------------- trunk/krusader_kde4/extractrc trunk/krusader_kde4/messages-extract Modified: trunk/krusader_kde4/extractrc =================================================================== --- trunk/krusader_kde4/extractrc 2008-04-18 09:44:58 UTC (rev 2747) +++ trunk/krusader_kde4/extractrc 2008-04-18 12:39:33 UTC (rev 2748) @@ -1,5 +1,7 @@ #! /usr/bin/env perl +# taken from http://websvn.kde.org/trunk/KDE/kdesdk/scripts/extractrc + ### TODO: other copyrights, license? # Copyright (c) 2004 Richard Evans <ri...@ri...> Modified: trunk/krusader_kde4/messages-extract =================================================================== --- trunk/krusader_kde4/messages-extract 2008-04-18 09:44:58 UTC (rev 2747) +++ trunk/krusader_kde4/messages-extract 2008-04-18 12:39:33 UTC (rev 2748) @@ -1,5 +1,7 @@ #! /bin/bash +# modified version of file from http://websvn.kde.org/trunk/l10n-kde4/scripts/extract-messages.sh + podir="${PWD}"/po srcdir="${PWD}" dirs="krusader krArc tar iso" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Cod...@us...> - 2008-04-18 20:32:44
|
Revision: 2750 http://krusader.svn.sourceforge.net/krusader/?rev=2750&view=rev Author: Codeknight Date: 2008-04-18 13:09:15 -0700 (Fri, 18 Apr 2008) Log Message: ----------- ADDED: credit for V?\195?\161clav in the about box Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/main.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-04-18 12:45:42 UTC (rev 2749) +++ trunk/krusader_kde4/ChangeLog 2008-04-18 20:09:15 UTC (rev 2750) @@ -1,3 +1,6 @@ + + ADDED: credit for Václav in the about box + FIXED: Konfigurator: Dependency lists are now scrollable FIXED: Filter: Don't list comments in user/group chooser Modified: trunk/krusader_kde4/krusader/main.cpp =================================================================== --- trunk/krusader_kde4/krusader/main.cpp 2008-04-18 12:45:42 UTC (rev 2749) +++ trunk/krusader_kde4/krusader/main.cpp 2008-04-18 20:09:15 UTC (rev 2750) @@ -114,6 +114,7 @@ aboutData.addAuthor(ki18n("Karai Csaba"), ki18n("Developer"), "ck...@us...", 0); aboutData.addAuthor(ki18n("Heiner Eichmann"), ki18n("Developer"), "h.e...@gm...", 0); aboutData.addAuthor(ki18n("Jonas Baehr"), ki18n("Developer"), "jon...@we...", 0); + aboutData.addAuthor(ki18n("Václav Juza"), ki18n("Developer"), "vac...@gm...", 0); aboutData.addAuthor(ki18n("Dirk Eschler"), ki18n("Webmaster and i18n coordinator"), "des...@us...", 0); aboutData.addAuthor(ki18n("Frank Schoolmeesters"), ki18n("Documentation and marketing coordinator"), "fra...@ya...", 0); aboutData.addAuthor(ki18n("Richard Holt"), ki18n("Documentation & Proofing"), "ric...@gm...", 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vac...@us...> - 2008-04-18 21:19:30
|
Revision: 2751 http://krusader.svn.sourceforge.net/krusader/?rev=2751&view=rev Author: vaclavjuza Date: 2008-04-18 14:19:35 -0700 (Fri, 18 Apr 2008) Log Message: ----------- forward port KDE3 -> KDE4: FIXED: Actionman, sometimes the command field is empty (the text was rolled), cvs reference: revision 1.5 date: 2008/02/05 14:44:01; author: codeknight; state: Exp; lines: +1 -0 FIXED: Actionman, sometimes the command field is empty, patch by Vaclav Juza, thanks Crazy bug, it happened to me only for very few combinations (for example when changing from Unmount to Mount), depending on lengths of both commands (the first longer, but the second quite long as well). When I clicked to that field, the text appeared. It seems, that the text is initially scrolled out of the visible area. Probably a KDE or Qt bug. It could be worked around by the attached patch (Puts cursor at the beginning). Vaclav Revision Links: -------------- http://krusader.svn.sourceforge.net/krusader/?rev=1&view=rev Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/ActionMan/actionproperty.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-04-18 20:09:15 UTC (rev 2750) +++ trunk/krusader_kde4/ChangeLog 2008-04-18 21:19:35 UTC (rev 2751) @@ -7,6 +7,8 @@ Codebase in sync with the KDE3 1.90.0 release "Power Stone" =========================================================== + FIXED: Actionman, sometimes the command field is empty (the text was rolled), + I18N: Updated Catalan translation (thanks Joaquim Perez) I18N: Updated French translation (thanks Tourneur Henry-Nicolas) Modified: trunk/krusader_kde4/krusader/ActionMan/actionproperty.cpp =================================================================== --- trunk/krusader_kde4/krusader/ActionMan/actionproperty.cpp 2008-04-18 20:09:15 UTC (rev 2750) +++ trunk/krusader_kde4/krusader/ActionMan/actionproperty.cpp 2008-04-18 21:19:35 UTC (rev 2751) @@ -145,6 +145,7 @@ leTooltip->setText( _action->toolTip() ); textDescription->setText( _action->whatsThis() ); leCommandline->setText( _action->command() ); + leCommandline->home(false); leStartpath->setText( _action->startpath() ); KeyButtonShortcut->setKeySequence( _action->shortcut().primary() ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vac...@us...> - 2008-04-18 21:32:01
|
Revision: 2752 http://krusader.svn.sourceforge.net/krusader/?rev=2752&view=rev Author: vaclavjuza Date: 2008-04-18 14:32:05 -0700 (Fri, 18 Apr 2008) Log Message: ----------- forward port KDE3 -> KDE4: FIXED: Current working directory not restored in populateVfsList cvs reference: revision 1.70 date: 2008/03/06 20:45:44; author: codeknight; state: Exp; lines: +2 -0 So my last patch seems to have solved only some symptoms, but not the problem (/Panel/listpanel.cpp). This patch really solves the problem (when refreshing the panel, current working dir was changed to read the contents of the directory and was not changed back). My previous patch (/Panel/listpanel.cpp) is no more necessary (or useful). Vaclav Revision Links: -------------- http://krusader.svn.sourceforge.net/krusader/?rev=1&view=rev Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-04-18 21:19:35 UTC (rev 2751) +++ trunk/krusader_kde4/ChangeLog 2008-04-18 21:32:05 UTC (rev 2752) @@ -7,6 +7,7 @@ Codebase in sync with the KDE3 1.90.0 release "Power Stone" =========================================================== + FIXED: Current working directory not returned in populateVfsList FIXED: Actionman, sometimes the command field is empty (the text was rolled), I18N: Updated Catalan translation (thanks Joaquim Perez) Modified: trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp =================================================================== --- trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-04-18 21:19:35 UTC (rev 2751) +++ trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-04-18 21:32:05 UTC (rev 2752) @@ -103,6 +103,7 @@ } // change directory to the new directory + QString save = getcwd( 0, 0 ); if (chdir(path.local8Bit()) != 0) { if( !quietMode ) KMessageBox::error(krApp, i18n("Access denied to")+path, i18n("Error")); closedir(dir); @@ -125,6 +126,7 @@ } // clean up closedir(dir); + chdir( save.local8Bit() ); if( panelConnected ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vac...@us...> - 2008-04-18 22:28:22
|
Revision: 2753 http://krusader.svn.sourceforge.net/krusader/?rev=2753&view=rev Author: vaclavjuza Date: 2008-04-18 15:28:27 -0700 (Fri, 18 Apr 2008) Log Message: ----------- forward port KDE3 -> KDE4: FIXED: Eject DVD with right-click menu cvs reference: revision 1.49 date: 2008/02/05 14:53:43; author: codeknight; state: Exp; lines: +2 -2 FIXED: Eject DVD with right-click menu http://www.krusader.org/phpBB/viewtopic.php?p=9069 Patch by Heiner, thanks! Revision Links: -------------- http://krusader.svn.sourceforge.net/krusader/?rev=1&view=rev Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/MountMan/kmountman.cpp Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-04-18 21:32:05 UTC (rev 2752) +++ trunk/krusader_kde4/ChangeLog 2008-04-18 22:28:27 UTC (rev 2753) @@ -8,6 +8,7 @@ =========================================================== FIXED: Current working directory not returned in populateVfsList + FIXED: Eject DVD with right-click menu FIXED: Actionman, sometimes the command field is empty (the text was rolled), I18N: Updated Catalan translation (thanks Joaquim Perez) Modified: trunk/krusader_kde4/krusader/MountMan/kmountman.cpp =================================================================== --- trunk/krusader_kde4/krusader/MountMan/kmountman.cpp 2008-04-18 21:32:05 UTC (rev 2752) +++ trunk/krusader_kde4/krusader/MountMan/kmountman.cpp 2008-04-18 22:28:27 UTC (rev 2753) @@ -206,12 +206,12 @@ "CantExecuteEjectWarning" ); // don't-show-again config-key } -// returns true if the path is an ejectable mount point (at the moment CDROM) +// returns true if the path is an ejectable mount point (at the moment CDROM and DVD) bool KMountMan::ejectable( QString path ) { #if !defined(BSD) && !defined(_OS_SOLARIS_) KMountPoint::List possible = KMountPoint::possibleMountPoints(); KSharedPtr<KMountPoint> m = findInListByMntPoint(possible, path); - if (m && (m->mountType()=="iso9660" || m->mountedFrom().left(7)=="/dev/cd")) + if (m && (m->mountType()=="iso9660" || m->mountedFrom().left(7)=="/dev/cd" || m->mountedFrom().left(8)=="/dev/dvd")) return KrServices::cmdExist( "eject" ); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vac...@us...> - 2008-04-18 23:28:28
|
Revision: 2754 http://krusader.svn.sourceforge.net/krusader/?rev=2754&view=rev Author: vaclavjuza Date: 2008-04-18 16:28:35 -0700 (Fri, 18 Apr 2008) Log Message: ----------- forward port KDE3 -> KDE4: missing part of commit 2008/02/03 08:57:53 FIXED: GCC 4.3: missing #includes thanks to Fathi Boudra (main fixes already done) cvs reference: date: 2008/02/03 08:57:53; author: codeknight; state: Exp; lines: +1 -1 FIXED: GCC 4.3: missing #includes thanks to Fathi Boudra Debian Bug #455657 FTBFS with GCC 4.3: missing #includes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455657 krusader/UserAction/expander.cpp iso/isoservice.desktop krusader/Konfigurator/kgcolors.cpp Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/iso/isoservice.desktop Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-04-18 22:28:27 UTC (rev 2753) +++ trunk/krusader_kde4/ChangeLog 2008-04-18 23:28:35 UTC (rev 2754) @@ -10,6 +10,7 @@ FIXED: Current working directory not returned in populateVfsList FIXED: Eject DVD with right-click menu FIXED: Actionman, sometimes the command field is empty (the text was rolled), + FIXED: GCC 4.3: missing #includes thanks to Fathi Boudra I18N: Updated Catalan translation (thanks Joaquim Perez) I18N: Updated French translation (thanks Tourneur Henry-Nicolas) Modified: trunk/krusader_kde4/iso/isoservice.desktop =================================================================== --- trunk/krusader_kde4/iso/isoservice.desktop 2008-04-18 22:28:27 UTC (rev 2753) +++ trunk/krusader_kde4/iso/isoservice.desktop 2008-04-18 23:28:35 UTC (rev 2754) @@ -11,4 +11,4 @@ Name=ISO9660 View Name[hu]=ISO9660 Nézet Name[fr]=Lecteur ISO9660 -Exec= \ No newline at end of file +Exec=kfmclient exec iso:%f This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vac...@us...> - 2008-04-19 00:39:50
|
Revision: 2756 http://krusader.svn.sourceforge.net/krusader/?rev=2756&view=rev Author: vaclavjuza Date: 2008-04-18 17:39:57 -0700 (Fri, 18 Apr 2008) Log Message: ----------- i18n: use kde-format flag so as to avoid spurious warnings, escpecially in message "Unterminated % in expander" Modified Paths: -------------- trunk/krusader_kde4/messages-extract trunk/krusader_kde4/po/bg.po trunk/krusader_kde4/po/bs.po trunk/krusader_kde4/po/ca.po trunk/krusader_kde4/po/cs.po trunk/krusader_kde4/po/da.po trunk/krusader_kde4/po/de.po trunk/krusader_kde4/po/el.po trunk/krusader_kde4/po/es.po trunk/krusader_kde4/po/fr.po trunk/krusader_kde4/po/hu.po trunk/krusader_kde4/po/it.po trunk/krusader_kde4/po/ja.po trunk/krusader_kde4/po/krusader.pot trunk/krusader_kde4/po/lt.po trunk/krusader_kde4/po/nl.po trunk/krusader_kde4/po/pl.po trunk/krusader_kde4/po/pt.po trunk/krusader_kde4/po/pt_BR.po trunk/krusader_kde4/po/ru.po trunk/krusader_kde4/po/sk.po trunk/krusader_kde4/po/sl.po trunk/krusader_kde4/po/sr.po trunk/krusader_kde4/po/sr@Latn.po trunk/krusader_kde4/po/sv.po trunk/krusader_kde4/po/tr.po trunk/krusader_kde4/po/uk.po trunk/krusader_kde4/po/zh_CN.po Modified: trunk/krusader_kde4/messages-extract =================================================================== --- trunk/krusader_kde4/messages-extract 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/messages-extract 2008-04-19 00:39:57 UTC (rev 2756) @@ -9,7 +9,7 @@ EXTRACTATTR=${EXTRACTATTR:-extractattr} PREPARETIPS=${PREPARETIPS:-preparetips} export EXTRACTRC EXTRACTATTR PREPARETIPS -XGETTEXT_FLAGS="--copyright-holder=This_file_is_part_of_KDE --from-code=UTF-8 -C --qt -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 -kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 --msgid-bugs-address=http://bugs.kde.org" +XGETTEXT_FLAGS="--copyright-holder=This_file_is_part_of_the_Krusader --from-code=UTF-8 -C --kde -ci18n -ki18n -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 -kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 --flag=i18n:1:kde-format --flag=i18nc:2:kde-format --flag=i18np:2:kde-format --flag=i18ncp:3:kde-format --msgid-bugs-address=kru...@go..." export XGETTEXT_FLAGS > ${podir}/krusader.pot Modified: trunk/krusader_kde4/po/bg.po =================================================================== --- trunk/krusader_kde4/po/bg.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/bg.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5143,6 +5143,7 @@ msgstr[1] "Наистина ли искате да преместите тези %1 елемента в кошчето?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/bs.po =================================================================== --- trunk/krusader_kde4/po/bs.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/bs.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5226,6 +5226,7 @@ msgstr[2] "" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/ca.po =================================================================== --- trunk/krusader_kde4/po/ca.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/ca.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5129,6 +5129,7 @@ msgstr[1] "Esteu segur que voleu moure %1 elements a la paperera?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/cs.po =================================================================== --- trunk/krusader_kde4/po/cs.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/cs.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -1,18 +1,19 @@ -# translation of cs-new.po to # Translation of krusader.pot to Czech + # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai # Copyright (C) 2004-2007, Krusader Krew -# This file is distributed under the same license as the Krusader package# +# This file is distributed under the same license as the Krusader package + # Martin Sixta <luk...@se...>, 2003, 2004. # Václav Jůza <vac...@se...>, 2005, 2006, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: cs-new\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Project-Id-Version: krusader-kde4\n" +"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n" "POT-Creation-Date: 2008-04-16 22:49+0200\n" "PO-Revision-Date: 2008-04-17 13:12+0200\n" -"Last-Translator: \n" -"Language-Team: <cs...@li...>\n" +"Last-Translator: Václav Jůza <vac...@se...>\n" +"Language-Team: krusader-i18n <kru...@go...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -5076,6 +5077,7 @@ msgstr[2] "Opravdu chcete těchto %1 položek vyhodit do koše?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/da.po =================================================================== --- trunk/krusader_kde4/po/da.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/da.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5178,7 +5178,7 @@ msgstr[1] "Ønsker du virkelig at flytte disse %1 genstande til papirkurv?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 -#, fuzzy +#, fuzzy, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/de.po =================================================================== --- trunk/krusader_kde4/po/de.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/de.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5146,6 +5146,7 @@ msgstr[1] "Möchten Sie diese %1 Elemente wirklich in den Mülleimer werfen?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/el.po =================================================================== --- trunk/krusader_kde4/po/el.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/el.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5154,6 +5154,7 @@ "απορριμμάτων;" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/es.po =================================================================== --- trunk/krusader_kde4/po/es.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/es.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5171,6 +5171,7 @@ msgstr[1] "¿Esta seguro que quiere mover estos %1 objetos a la basura?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/fr.po =================================================================== --- trunk/krusader_kde4/po/fr.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/fr.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5166,6 +5166,7 @@ "Voulez vous vraiment déplacer ces %1 objets vers la corbeille ?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/hu.po =================================================================== --- trunk/krusader_kde4/po/hu.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/hu.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5203,6 +5203,7 @@ msgstr[0] "Valóban áthelyezi ezt a(z) %1 elemet a szemetesbe?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/it.po =================================================================== --- trunk/krusader_kde4/po/it.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/it.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5123,6 +5123,7 @@ msgstr[1] "Vuoi veramente spostare nel cestino questi %1 elementi?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 +#, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/ja.po =================================================================== --- trunk/krusader_kde4/po/ja.po 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/ja.po 2008-04-19 00:39:57 UTC (rev 2756) @@ -5544,7 +5544,7 @@ msgstr[0] "本当にこれら %1 項目をゴミ箱に移動させますか?" #: Panel/panelfunc.cpp:653 Panel/panelfunc.cpp~:654 -#, fuzzy +#, fuzzy, kde-format msgid "" "Do you really want to delete this virtual item (physical files stay " "untouched)?" Modified: trunk/krusader_kde4/po/krusader.pot =================================================================== --- trunk/krusader_kde4/po/krusader.pot 2008-04-18 23:49:21 UTC (rev 2755) +++ trunk/krusader_kde4/po/krusader.pot 2008-04-19 00:39:57 UTC (rev 2756) @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR This_file_is_part_of_KDE +# Copyright (C) YEAR This_file_is_part_of_the_Krusader # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-04-16 22:49+0200\n" +"Report-Msgid-Bugs-To: kru...@go...\n" +"POT-Creation-Date: 2008-04-19 02:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -18,27 +18,33 @@ "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: Dialogs/krpleasewait.cpp:49 +#, kde-format msgid "Krusader::Wait" msgstr "" #: Dialogs/krpleasewait.cpp:65 Dialogs/newftpgui.cpp:145 #: Splitter/splittergui.cpp:126 +#, kde-format msgid "&Cancel" msgstr "" #: Dialogs/krmaskchoice.cpp:57 +#, kde-format msgid "Choose Files" msgstr "" #: Dialogs/krmaskchoice.cpp:81 +#, kde-format msgid "Select the following files:" msgstr "" #: Dialogs/krmaskchoice.cpp:86 +#, kde-format msgid "Predefined Selections" msgstr "" #: Dialogs/krmaskchoice.cpp:99 +#, kde-format msgid "" "A predefined selection is a file-mask which you use often.\n" "Some examples are: \"*.c, *.h\", \"*.c, *.o\", etc.\n" @@ -50,54 +56,66 @@ msgstr "" #: Dialogs/krmaskchoice.cpp:107 +#, kde-format msgid "Add" msgstr "" #: Dialogs/krmaskchoice.cpp:108 +#, kde-format msgid "Adds the selection in the line-edit to the list" msgstr "" #: Dialogs/krmaskchoice.cpp:112 Dialogs/kurllistrequester.cpp:142 #: BookMan/krbookmarkhandler.cpp:563 Konfigurator/kgcolors.cpp:483 #: DiskUsage/diskusage.cpp:770 Panel/krpopupmenu.cpp:158 krusader.cpp:739 +#, kde-format msgid "Delete" msgstr "" #: Dialogs/krmaskchoice.cpp:113 +#, kde-format msgid "Delete the marked selection from the list" msgstr "" #: Dialogs/krmaskchoice.cpp:117 +#, kde-format msgid "Clear" msgstr "" #: Dialogs/krmaskchoice.cpp:118 +#, kde-format msgid "Clears the entire list of selections" msgstr "" #: Dialogs/krmaskchoice.cpp:133 +#, kde-format msgid "OK" msgstr "" #: Dialogs/krmaskchoice.cpp:137 Dialogs/packguibase.cpp:298 #: DiskUsage/diskusage.cpp:162 Panel/listpanel.cpp:874 -#: Panel/panelpopup.cpp:402 Panel/listpanel.cpp~:874 +#: Panel/panelpopup.cpp:402 +#, kde-format msgid "Cancel" msgstr "" #: Dialogs/krspecialwidgets.cpp:119 +#, kde-format msgid "Capacity: " msgstr "" #: Dialogs/krspecialwidgets.cpp:129 +#, kde-format msgid "Used: " msgstr "" #: Dialogs/krspecialwidgets.cpp:130 +#, kde-format msgid "Free: " msgstr "" #: Dialogs/krspecialwidgets.cpp:157 +#, kde-format msgid "Not mounted." msgstr "" @@ -108,174 +126,209 @@ msgstr "" #: Dialogs/krkeydialog.cpp:41 +#, kde-format msgid "Import shortcuts" msgstr "" #: Dialogs/krkeydialog.cpp:42 +#, kde-format msgid "Load a keybinding profile, e.g., total_commander.keymap" msgstr "" #: Dialogs/krkeydialog.cpp:46 +#, kde-format msgid "Export shortcuts" msgstr "" #: Dialogs/krkeydialog.cpp:47 +#, kde-format msgid "Save current keybindings in a keymap file." msgstr "" #: Dialogs/krkeydialog.cpp:64 Dialogs/krkeydialog.cpp:129 +#, kde-format msgid "Select a keymap file" msgstr "" #: Dialogs/krkeydialog.cpp:71 +#, kde-format msgid "" "This file does not seem to be a valid keymap.\n" "It may be a keymap using a legacy format. The import can't be undone!" msgstr "" #: Dialogs/krkeydialog.cpp:73 +#, kde-format msgid "Try to import legacy format?" msgstr "" #: Dialogs/krkeydialog.cpp:74 +#, kde-format msgid "Import anyway" msgstr "" #: Dialogs/krkeydialog.cpp:96 +#, kde-format msgid "" "The following information was attached to the keymap. Do you really want to " "import this keymap?" msgstr "" #: Dialogs/krkeydialog.cpp:123 +#, kde-format msgid "Please restart this dialog in order to see the changes" msgstr "" #: Dialogs/krkeydialog.cpp:124 +#, kde-format msgid "Legacy import completed" msgstr "" #: Dialogs/krkeydialog.cpp:135 -#, qt-format +#, kde-format msgid "" "<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>" msgstr "" #: Dialogs/krkeydialog.cpp:136 Dialogs/checksumdlg.cpp:630 #: Konfigurator/kgcolors.cpp:532 DiskUsage/diskusage.cpp:614 -#: Panel/panelfunc.cpp:666 Panel/panelfunc.cpp~:667 +#: Panel/panelfunc.cpp:666 +#, kde-format msgid "Warning" msgstr "" #: Dialogs/krkeydialog.cpp:136 Dialogs/checksumdlg.cpp:630 #: Konfigurator/kgcolors.cpp:532 UserAction/kraction.cpp:160 +#, kde-format msgid "Overwrite" msgstr "" #: Dialogs/krkeydialog.cpp:144 -#, qt-format +#, kde-format msgid "<qt>Can't open <b>%1</b> for writing!</qt>" msgstr "" #: Dialogs/krdialogs.cpp:155 +#, kde-format msgid "Preserve attributes (only for local targets)" msgstr "" #: Dialogs/krdialogs.cpp:162 +#, kde-format msgid "Keep virtual directory structure" msgstr "" #: Dialogs/krdialogs.cpp:168 +#, kde-format msgid "Base URL:" msgstr "" #: Dialogs/packgui.cpp:55 -#, qt-format +#, kde-format msgid "Pack %1" msgstr "" #: Dialogs/packgui.cpp:57 -#, qt-format +#, kde-format msgid "Pack %1 file" msgid_plural "Pack %1 files" msgstr[0] "" msgstr[1] "" #: Dialogs/packgui.cpp:96 +#, kde-format msgid "Please select a directory" msgstr "" #: Dialogs/popularurls.cpp:64 +#, kde-format msgid "Saved 'Popular Urls' are invalid. List will be cleared" msgstr "" #: Dialogs/popularurls.cpp:235 +#, kde-format msgid "Popular Urls" msgstr "" #: Dialogs/popularurls.cpp:254 +#, kde-format msgid " &Search: " msgstr "" #: Dialogs/newftpgui.cpp:51 +#, kde-format msgid "New Network Connection" msgstr "" #: Dialogs/newftpgui.cpp:65 +#, kde-format msgid "About to connect to..." msgstr "" #: Dialogs/newftpgui.cpp:75 +#, kde-format msgid "Protocol:" msgstr "" #: Dialogs/newftpgui.cpp:76 +#, kde-format msgid "Host:" msgstr "" #: Dialogs/newftpgui.cpp:77 +#, kde-format msgid "Port:" msgstr "" #: Dialogs/newftpgui.cpp:85 +#, kde-format msgid "ftp://" msgstr "" #: Dialogs/newftpgui.cpp:87 +#, kde-format msgid "smb://" msgstr "" #: Dialogs/newftpgui.cpp:89 +#, kde-format msgid "fish://" msgstr "" #: Dialogs/newftpgui.cpp:91 +#, kde-format msgid "sftp://" msgstr "" #: Dialogs/newftpgui.cpp:122 +#, kde-format msgid "Username:" msgstr "" #: Dialogs/newftpgui.cpp:124 +#, kde-format msgid "Password:" msgstr "" #: Dialogs/newftpgui.cpp:136 +#, kde-format msgid "&Connect" msgstr "" #: Dialogs/checksumdlg.cpp:205 Dialogs/checksumdlg.cpp:507 +#, kde-format msgid "Create Checksum" msgstr "" #: Dialogs/checksumdlg.cpp:211 +#, kde-format msgid "" "<qt>Can't calculate checksum since no supported tool was found. Please check " "the <b>Dependencies</b> page in Krusader's settings.</qt>" msgstr "" #: Dialogs/checksumdlg.cpp:214 Dialogs/checksumdlg.cpp:333 +#, kde-format msgid "" "<qt><b>Note</b>: you've selected directories, and probably have no recursive " "checksum tool installed. Krusader currently supports <i>md5deep, sha1deep, " @@ -283,320 +336,376 @@ msgstr "" #: Dialogs/checksumdlg.cpp:233 +#, kde-format msgid "About to calculate checksum for the following files" msgstr "" #: Dialogs/checksumdlg.cpp:234 Dialogs/checksumdlg.cpp:353 +#, kde-format msgid " and folders:" msgstr "" #: Dialogs/checksumdlg.cpp:248 +#, kde-format msgid "Select the checksum method:" msgstr "" #: Dialogs/checksumdlg.cpp:277 +#, kde-format msgid "Calculating checksums ..." msgstr "" #: Dialogs/checksumdlg.cpp:294 Dialogs/checksumdlg.cpp:428 -#, qt-format +#, kde-format msgid "<qt>There was an error while running <b>%1</b>.</qt>" msgstr "" #: Dialogs/checksumdlg.cpp:306 Dialogs/checksumdlg.cpp:437 +#, kde-format msgid "Error reading stdout or stderr" msgstr "" #: Dialogs/checksumdlg.cpp:324 Dialogs/checksumdlg.cpp:462 +#, kde-format msgid "Verify Checksum" msgstr "" #: Dialogs/checksumdlg.cpp:330 +#, kde-format msgid "" "<qt>Can't verify checksum since no supported tool was found. Please check " "the <b>Dependencies</b> page in Krusader's settings.</qt>" msgstr "" #: Dialogs/checksumdlg.cpp:352 +#, kde-format msgid "About to verify checksum for the following files" msgstr "" #: Dialogs/checksumdlg.cpp:367 +#, kde-format msgid "Checksum file:" msgstr "" #: Dialogs/checksumdlg.cpp:382 -#, qt-format +#, kde-format msgid "" "<qt>Error reading checksum file <i>%1</i>.<br />Please specify a valid " "checksum file.</qt>" msgstr "" #: Dialogs/checksumdlg.cpp:395 -#, qt-format +#, kde-format msgid "" "<qt>Krusader can't find a checksum tool that handles %1 on your system. " "Please check the <b>Dependencies</b> page in Krusader's settings.</qt>" msgstr "" #: Dialogs/checksumdlg.cpp:413 +#, kde-format msgid "Verifying checksums ..." msgstr "" #: Dialogs/checksumdlg.cpp:480 +#, kde-format msgid "Errors were detected while verifying the checksums" msgstr "" #: Dialogs/checksumdlg.cpp:481 +#, kde-format msgid "Checksums were verified successfully" msgstr "" #: Dialogs/checksumdlg.cpp:487 +#, kde-format msgid "The following files have failed:" msgstr "" #: Dialogs/checksumdlg.cpp:527 +#, kde-format msgid "Errors were detected while creating the checksums" msgstr "" #: Dialogs/checksumdlg.cpp:528 +#, kde-format msgid "Checksums were created successfully" msgstr "" #: Dialogs/checksumdlg.cpp:535 +#, kde-format msgid "Here are the calculated checksums:" msgstr "" #: Dialogs/checksumdlg.cpp:543 +#, kde-format msgid "Hash" msgstr "" #: Dialogs/checksumdlg.cpp:544 Konfigurator/kgcolors.cpp:427 +#, kde-format msgid "File" msgstr "" #: Dialogs/checksumdlg.cpp:547 +#, kde-format msgid "File and hash" msgstr "" #: Dialogs/checksumdlg.cpp:577 +#, kde-format msgid "Here are the errors received:" msgstr "" #: Dialogs/checksumdlg.cpp:592 +#, kde-format msgid "Save checksum to file:" msgstr "" #: Dialogs/checksumdlg.cpp:606 +#, kde-format msgid "Checksum file for each source file" msgstr "" #: Dialogs/checksumdlg.cpp:629 -#, qt-format +#, kde-format msgid "" "File %1 already exists.\n" "Are you sure you want to overwrite it?" msgstr "" #: Dialogs/checksumdlg.cpp:632 +#, kde-format msgid "Select a file to save to" msgstr "" #: Dialogs/checksumdlg.cpp:637 -#, qt-format +#, kde-format msgid "Error saving file %1" msgstr "" #: Dialogs/checksumdlg.cpp:649 +#, kde-format msgid "Saving checksum files..." msgstr "" #: Dialogs/checksumdlg.cpp:656 +#, kde-format msgid "Errors occured while saving multiple checksums. Stopping" msgstr "" #: Dialogs/krprogress.cpp:65 +#, kde-format msgid "Source:" msgstr "" #: Dialogs/krprogress.cpp:70 Dialogs/krprogress.cpp:246 +#, kde-format msgid "Destination:" msgstr "" #: Dialogs/krprogress.cpp:118 +#, kde-format msgid "Krusader Progress" msgstr "" #: Dialogs/krprogress.cpp:171 -#, qt-format +#, kde-format msgid "%1 directory" msgid_plural "%1 directories" msgstr[0] "" msgstr[1] "" #: Dialogs/krprogress.cpp:172 -#, qt-format +#, kde-format msgid "%1 file" msgid_plural "%1 files" msgstr[0] "" msgstr[1] "" #: Dialogs/krprogress.cpp:180 +#, kde-format msgid " (Reading)" msgstr "" #: Dialogs/krprogress.cpp:197 -#, qt-format +#, kde-format msgid "%1 of %2 complete" msgstr "" #: Dialogs/krprogress.cpp:207 Dialogs/krprogress.cpp:220 -#, qt-format +#, kde-format msgid "%2 / %1 directory" msgid_plural "%2 / %1 directories" msgstr[0] "" msgstr[1] "" #: Dialogs/krprogress.cpp:209 Dialogs/krprogress.cpp:223 -#, qt-format +#, kde-format msgid "%2 / %1 file" msgid_plural "%2 / %1 files" msgstr[0] "" msgstr[1] "" #: Dialogs/krprogress.cpp:231 +#, kde-format msgid "Working" msgstr "" #: Dialogs/krprogress.cpp:235 -#, qt-format +#, kde-format msgid "%1/s ( %2 remaining )" msgstr "" #: Dialogs/krspwidgets.cpp:155 +#, kde-format msgid "Enter a selection:" msgstr "" #: Dialogs/krspwidgets.cpp:307 Dialogs/krspwidgets.cpp:318 +#, kde-format msgid "Quick Navigation" msgstr "" #: Dialogs/krspwidgets.cpp:308 -#, qt-format +#, kde-format msgid "Already at <i>%1</i>" msgstr "" #: Dialogs/krspwidgets.cpp:319 -#, qt-format +#, kde-format msgid "Click to go to <i>%1</i>" msgstr "" #: Dialogs/packguibase.cpp:68 Dialogs/packguibase.cpp:122 +#, kde-format msgid "Pack" msgstr "" #: Dialogs/packguibase.cpp:78 +#, kde-format msgid "To archive" msgstr "" #: Dialogs/packguibase.cpp:97 +#, kde-format msgid "In directory" msgstr "" #: Dialogs/packguibase.cpp:147 +#, kde-format msgid "Multiple volume archive" msgstr "" #: Dialogs/packguibase.cpp:156 DiskUsage/diskusage.cpp:1077 +#, kde-format msgid "Size:" msgstr "" #: Dialogs/packguibase.cpp:174 +#, kde-format msgid "Set compression level" msgstr "" #: Dialogs/packguibase.cpp:195 +#, kde-format msgid "MIN" msgstr "" #: Dialogs/packguibase.cpp:196 +#, kde-format msgid "MAX" msgstr "" #: Dialogs/packguibase.cpp:220 +#, kde-format msgid "Password" msgstr "" #: Dialogs/packguibase.cpp:230 +#, kde-format msgid "Again" msgstr "" #: Dialogs/packguibase.cpp:248 +#, kde-format msgid "Encrypt headers" msgstr "" #: Dialogs/packguibase.cpp:260 +#, kde-format msgid "Command line switches:" msgstr "" #: Dialogs/packguibase.cpp:286 Dialogs/packguibase.cpp:326 #: Filter/filtertabs.cpp:49 +#, kde-format msgid "&Advanced" msgstr "" #: Dialogs/packguibase.cpp:293 +#, kde-format msgid "Ok" msgstr "" #: Dialogs/packguibase.cpp:342 +#, kde-format msgid "No password specified" msgstr "" #: Dialogs/packguibase.cpp:347 +#, kde-format msgid "The passwords are equal" msgstr "" #: Dialogs/packguibase.cpp:351 +#, kde-format msgid "The passwords are different" msgstr "" #: Dialogs/packguibase.cpp:388 +#, kde-format msgid "Cannot pack! The passwords are different!" msgstr "" #: Dialogs/packguibase.cpp:413 +#, kde-format msgid "Invalid volume size!" msgstr "" #: Dialogs/packguibase.cpp:443 +#, kde-format msgid "" "Invalid command line switch!\n" "Switch must start with '-'!" msgstr "" #: Dialogs/packguibase.cpp:455 +#, kde-format msgid "" "Invalid command line switch!\n" "Backslash cannot be the last character" msgstr "" #: Dialogs/packguibase.cpp:463 +#, kde-format msgid "" "Invalid command line switch!\n" "Unclosed quotation mark!" msgstr "" #: BookMan/krbookmarkbutton.cpp:15 +#, kde-format msgid "BookMan II" msgstr "" #: BookMan/krbookmarkbutton.cpp:19 BookMan/krbookmarkhandler.cpp:32 #: BookMan/kraddbookmarkdlg.cpp:80 krusader.cpp:707 +#, kde-format msgid "Bookmarks" msgstr "" #: BookMan/krbookmarkhandler.cpp:171 -#, qt-format +#, kde-format msgid "Unable to write to %1" msgstr "" @@ -607,124 +716,150 @@ #: VFS/krarchandler.cpp:345 VFS/krarchandler.cpp:519 VFS/krarchandler.cpp:526 #: VFS/virt_vfs.cpp:90 VFS/virt_vfs.cpp:180 VFS/normal_vfs.cpp:91 #: VFS/normal_vfs.cpp:101 VFS/normal_vfs.cpp:108 MountMan/kmountman.cpp:205 +#, kde-format msgid "Error" msgstr "" #: BookMan/krbookmarkhandler.cpp:179 +#, kde-format msgid " instead of " msgstr "" #: BookMan/krbookmarkhandler.cpp:184 BookMan/krbookmarkhandler.cpp:190 #: BookMan/krbookmarkhandler.cpp:221 +#, kde-format msgid "missing tag " msgstr "" #: BookMan/krbookmarkhandler.cpp:260 -#, qt-format +#, kde-format msgid "%1 doesn't seem to be a valid Bookmarks file" msgstr "" #: BookMan/krbookmarkhandler.cpp:267 -#, qt-format +#, kde-format msgid "Error reading bookmarks file: %1" msgstr "" #: BookMan/krbookmarkhandler.cpp:330 BookMan/krbookmarkhandler.cpp:489 +#, kde-format msgid "Popular URLs" msgstr "" #: BookMan/krbookmarkhandler.cpp:399 krusader.cpp:708 +#, kde-format msgid "Bookmark Current" msgstr "" #: BookMan/krbookmarkhandler.cpp:402 +#, kde-format msgid "Manage Bookmarks" msgstr "" #: BookMan/krbookmarkhandler.cpp:485 +#, kde-format msgid "Enable special bookmarks" msgstr "" #: BookMan/krbookmarkhandler.cpp:493 +#, kde-format msgid "Devices" msgstr "" #: BookMan/krbookmarkhandler.cpp:497 BookMan/krbookmark.cpp:13 +#, kde-format msgid "Local Network" msgstr "" #: BookMan/krbookmarkhandler.cpp:501 BookMan/krbookmark.cpp:12 +#, kde-format msgid "Virtual Filesystem" msgstr "" #: BookMan/krbookmarkhandler.cpp:505 +#, kde-format msgid "Jump back" msgstr "" #: BookMan/krbookmarkhandler.cpp:557 GUI/mediabutton.cpp:540 #: Panel/krpopupmenu.cpp:69 +#, kde-format msgid "Open" msgstr "" #: BookMan/krbookmarkhandler.cpp:559 GUI/mediabutton.cpp:542 +#, kde-format msgid "Open in a new tab" msgstr "" #: BookMan/kraddbookmarkdlg.cpp:17 +#, kde-format msgid "Add Bookmark" msgstr "" #: BookMan/kraddbookmarkdlg.cpp:20 BookMan/kraddbookmarkdlg.cpp:118 +#, kde-format msgid "New Folder" msgstr "" #: BookMan/kraddbookmarkdlg.cpp:34 DiskUsage/diskusage.cpp:1075 +#, kde-format msgid "Name:" msgstr "" #: BookMan/kraddbookmarkdlg.cpp:41 +#, kde-format msgid "URL:" msgstr "" #: BookMan/kraddbookmarkdlg.cpp:48 +#, kde-format msgid "Create in:" msgstr "" #: BookMan/kraddbookmarkdlg.cpp:74 +#, kde-format msgid "Folders" msgstr "" #: BookMan/kraddbookmarkdlg.cpp:118 +#, kde-format msgid "Folder name:" msgstr "" #: BookMan/krbookmark.cpp:11 krusader.cpp:713 +#, kde-format msgid "Media" msgstr "" #: Synchronizer/synchronizergui.cpp:1108 Synchronizer/synchronizergui.cpp:2332 #: Synchronizer/synchronizergui.cpp~:1108 #: Synchronizer/synchronizergui.cpp~:2332 +#, kde-format msgid "Krusader::Synchronize Directories" msgstr "" #: Synchronizer/synchronizergui.cpp:1127 #: Synchronizer/synchronizergui.cpp~:1127 +#, kde-format msgid "Directory Comparison" msgstr "" #: Synchronizer/synchronizergui.cpp:1138 #: Synchronizer/synchronizergui.cpp~:1138 +#, kde-format msgid "File &Filter:" msgstr "" #: Synchronizer/synchronizergui.cpp:1160 #: Synchronizer/synchronizergui.cpp~:1160 +#, kde-format msgid "The left base directory used during the synchronisation process." msgstr "" #: Synchronizer/synchronizergui.cpp:1177 #: Synchronizer/synchronizergui.cpp~:1177 Filter/generalfilter.cpp:80 +#, kde-format msgid "" "<p>The filename filtering criteria is defined here.</p><p>You can make use " "of wildcards. Multiple patterns are separated by space (means logical OR) " @@ -746,46 +881,55 @@ #: Synchronizer/synchronizergui.cpp:1193 #: Synchronizer/synchronizergui.cpp~:1193 +#, kde-format msgid "The right base directory used during the synchronisation process." msgstr "" #: Synchronizer/synchronizergui.cpp:1207 #: Synchronizer/synchronizergui.cpp~:1207 +#, kde-format msgid "Recurse subdirectories" msgstr "" #: Synchronizer/synchronizergui.cpp:1210 #: Synchronizer/synchronizergui.cpp~:1210 +#, kde-format msgid "Compare not only the base directories but their subdirectories as well." msgstr "" #: Synchronizer/synchronizergui.cpp:1211 #: Synchronizer/synchronizergui.cpp~:1211 +#, kde-format msgid "Follow symlinks" msgstr "" #: Synchronizer/synchronizergui.cpp:1215 #: Synchronizer/synchronizergui.cpp~:1215 +#, kde-format msgid "Follow symbolic links during the compare process." msgstr "" #: Synchronizer/synchronizergui.cpp:1216 #: Synchronizer/synchronizergui.cpp~:1216 +#, kde-format msgid "Compare by content" msgstr "" #: Synchronizer/synchronizergui.cpp:1219 #: Synchronizer/synchronizergui.cpp~:1219 +#, kde-format msgid "Compare duplicated files with same size by content." msgstr "" #: Synchronizer/synchronizergui.cpp:1220 #: Synchronizer/synchronizergui.cpp~:1220 +#, kde-format msgid "Ignore Date" msgstr "" #: Synchronizer/synchronizergui.cpp:1223 #: Synchronizer/synchronizergui.cpp~:1223 +#, kde-format msgid "" "<p>Ignore date information during the compare process.</p><p><b>Note</b>: " "useful if the files are located on network filesystems or in archives.</p>" @@ -793,11 +937,13 @@ #: Synchronizer/synchronizergui.cpp:1224 #: Synchronizer/synchronizergui.cpp~:1224 +#, kde-format msgid "Asymmetric" msgstr "" #: Synchronizer/synchronizergui.cpp:1227 #: Synchronizer/synchronizergui.cpp~:1227 +#, kde-format msgid "" "<p><b>Asymmetric mode</b></p><p>The left side is the destination, the right " "is the source directory. Files existing only in the left directory will be " @@ -807,11 +953,13 @@ #: Synchronizer/synchronizergui.cpp:1228 #: Synchronizer/synchronizergui.cpp~:1228 +#, kde-format msgid "Ignore Case" msgstr "" #: Synchronizer/synchronizergui.cpp:1231 #: Synchronizer/synchronizergui.cpp~:1231 +#, kde-format msgid "" "<p>Case insensitive filename compare.</p><p><b>Note</b>: useful when " "synchronizing Windows filesystems.</p>" @@ -819,56 +967,67 @@ #: Synchronizer/synchronizergui.cpp:1238 #: Synchronizer/synchronizergui.cpp~:1238 +#, kde-format msgid "S&how options" msgstr "" #: Synchronizer/synchronizergui.cpp:1257 #: Synchronizer/synchronizergui.cpp~:1257 +#, kde-format msgid "Show files marked to <i>Copy from left to right</i> (CTRL+L)." msgstr "" #: Synchronizer/synchronizergui.cpp:1267 #: Synchronizer/synchronizergui.cpp~:1267 +#, kde-format msgid "Show files considered to be identical (CTRL+E)." msgstr "" #: Synchronizer/synchronizergui.cpp:1277 #: Synchronizer/synchronizergui.cpp~:1277 +#, kde-format msgid "Show excluded files (CTRL+D)." msgstr "" #: Synchronizer/synchronizergui.cpp:1287 #: Synchronizer/synchronizergui.cpp~:1287 +#, kde-format msgid "Show files marked to <i>Copy from right to left</i> (CTRL+R)." msgstr "" #: Synchronizer/synchronizergui.cpp:1297 #: Synchronizer/synchronizergui.cpp~:1297 +#, kde-format msgid "Show files marked to delete. (CTRL+T)" msgstr "" #: Synchronizer/synchronizergui.cpp:1302 #: Synchronizer/synchronizergui.cpp~:1302 +#, kde-format msgid "Duplicates" msgstr "" #: Synchronizer/synchronizergui.cpp:1307 #: Synchronizer/synchronizergui.cpp~:1307 +#, kde-format msgid "Show files that exist on both sides." msgstr "" #: Synchronizer/synchronizergui.cpp:1311 #: Synchronizer/synchronizergui.cpp~:1311 +#, kde-format msgid "Singles" msgstr "" #: Synchronizer/synchronizergui.cpp:1316 #: Synchronizer/synchronizergui.cpp~:1316 +#, kde-format msgid "Show files that exist on one side only." msgstr "" #: Synchronizer/synchronizergui.cpp:1325 #: Synchronizer/synchronizergui.cpp~:1325 +#, kde-format msgid "The compare results of the synchronizer (CTRL+M)." msgstr "" @@ -879,6 +1038,7 @@ #: MountMan/kmountmangui.cpp:125 Panel/krdetailedview.cpp:108 #: Panel/krbriefview.cpp:156 Search/krsearchdialog.cpp:71 #: Search/krsearchdialog.cpp~:71 +#, kde-format msgid "Name" msgstr "" @@ -887,6 +1047,7 @@ #: Synchronizer/synchronizergui.cpp~:1339 Filter/advancedfilter.cpp:63 #: Panel/krdetailedview.cpp:111 Panel/krdetailedview.cpp:1484 #: Search/krsearchdialog.cpp:73 Search/krsearchdialog.cpp~:73 +#, kde-format msgid "Size" msgstr "" @@ -895,92 +1056,109 @@ #: Synchronizer/synchronizergui.cpp~:1338 DiskUsage/dulistview.cpp:60 #: Filter/advancedfilter.cpp:115 Search/krsearchdialog.cpp:74 #: Search/krsearchdialog.cpp~:74 +#, kde-format msgid "Date" msgstr "" #: Synchronizer/synchronizergui.cpp:1337 #: Synchronizer/synchronizergui.cpp~:1337 +#, kde-format msgid "<=>" msgstr "" #: Synchronizer/synchronizergui.cpp:1384 #: Synchronizer/synchronizergui.cpp~:1384 +#, kde-format msgid "&Synchronizer" msgstr "" #: Synchronizer/synchronizergui.cpp:1395 #: Synchronizer/synchronizergui.cpp~:1395 +#, kde-format msgid "&Options" msgstr "" #: Synchronizer/synchronizergui.cpp:1402 #: Synchronizer/synchronizergui.cpp~:1402 +#, kde-format msgid "Parallel threads:" msgstr "" #: Synchronizer/synchronizergui.cpp:1412 #: Synchronizer/synchronizergui.cpp~:1412 +#, kde-format msgid "Equality threshold:" msgstr "" #: Synchronizer/synchronizergui.cpp:1420 Synchronizer/synchronizergui.cpp:1435 #: Synchronizer/synchronizergui.cpp~:1420 #: Synchronizer/synchronizergui.cpp~:1435 +#, kde-format msgid "sec" msgstr "" #: Synchronizer/synchronizergui.cpp:1421 Synchronizer/synchronizergui.cpp:1436 #: Synchronizer/synchronizergui.cpp~:1421 #: Synchronizer/synchronizergui.cpp~:1436 +#, kde-format msgid "min" msgstr "" #: Synchronizer/synchronizergui.cpp:1422 Synchronizer/synchronizergui.cpp:1437 #: Synchronizer/synchronizergui.cpp~:1422 #: Synchronizer/synchronizergui.cpp~:1437 +#, kde-format msgid "hour" msgstr "" #: Synchronizer/synchronizergui.cpp:1423 Synchronizer/synchronizergui.cpp:1438 #: Synchronizer/synchronizergui.cpp~:1423 #: Synchronizer/synchronizergui.cpp~:1438 +#, kde-format msgid "day" msgstr "" #: Synchronizer/synchronizergui.cpp:1426 #: Synchronizer/synchronizergui.cpp~:1426 +#, kde-format msgid "Time shift (right-left):" msgstr "" #: Synchronizer/synchronizergui.cpp:1445 #: Synchronizer/synchronizergui.cpp~:1445 +#, kde-format msgid "Ignore hidden files" msgstr "" #: Synchronizer/synchronizergui.cpp:1459 #: Synchronizer/synchronizergui.cpp~:1459 +#, kde-format msgid "Profile manager (Ctrl+P)." msgstr "" #: Synchronizer/synchronizergui.cpp:1466 #: Synchronizer/synchronizergui.cpp~:1466 +#, kde-format msgid "Swap sides (Ctrl+S)." msgstr "" #: Synchronizer/synchronizergui.cpp:1477 #: Synchronizer/synchronizergui.cpp~:1477 +#, kde-format msgid "Compare" msgstr "" #: Synchronizer/synchronizergui.cpp:1486 Synchronizer/synchronizergui.cpp:2443 #: Synchronizer/synchronizergui.cpp~:1486 #: Synchronizer/synchronizergui.cpp~:2443 +#, kde-format msgid "Quiet" msgstr "" #: Synchronizer/synchronizergui.cpp:1488 Synchronizer/synchronizergui.cpp:2445 #: Synchronizer/synchronizergui.cpp~:1488 #: Synchronizer/synchronizergui.cpp~:2445 +#, kde-format msgid "Scroll Results" msgstr "" @@ -988,6 +1166,7 @@ #: Synchronizer/synchronizergui.cpp~:1492 Locate/locate.cpp:121 #: Locate/locate.cpp:284 Locate/locate.cpp~:121 Locate/locate.cpp~:284 #: Search/krsearchdialog.cpp:232 Search/krsearchdialog.cpp~:233 +#, kde-format msgid "Stop" msgstr "" @@ -995,11 +1174,13 @@ #: Synchronizer/synchronizergui.cpp~:1497 Locate/locate.cpp:332 #: Locate/locate.cpp~:332 Search/krsearchdialog.cpp:221 #: Search/krsearchdialog.cpp~:222 +#, kde-format msgid "Feed to listbox" msgstr "" #: Synchronizer/synchronizergui.cpp:1503 #: Synchronizer/synchronizergui.cpp~:1503 +#, kde-format msgid "Synchronize" msgstr "" @@ -1007,141 +1188,169 @@ #: Synchronizer/synchronizergui.cpp~:1508 Konfigurator/konfigurator.cpp:73 #: UserAction/kraction.cpp:59 Search/krsearchdialog.cpp:236 #: Search/krsearchdialog.cpp~:237 +#, kde-format msgid "Close" msgstr "" #: Synchronizer/synchronizergui.cpp:1623 #: Synchronizer/synchronizergui.cpp~:1623 +#, kde-format msgid "Selected files from targ&et directory:" msgstr "" #: Synchronizer/synchronizergui.cpp:1624 #: Synchronizer/synchronizergui.cpp~:1624 +#, kde-format msgid "Selected files from sou&rce directory:" msgstr "" #: Synchronizer/synchronizergui.cpp:1628 #: Synchronizer/synchronizergui.cpp~:1628 +#, kde-format msgid "Selected files from &left directory:" msgstr "" #: Synchronizer/synchronizergui.cpp:1629 #: Synchronizer/synchronizergui.cpp~:1629 +#, kde-format msgid "Selected files from &right directory:" msgstr "" #: Synchronizer/synchronizergui.cpp:1633 #: Synchronizer/synchronizergui.cpp~:1633 +#, kde-format msgid "Targ&et directory:" msgstr "" #: Synchronizer/synchronizergui.cpp:1634 #: Synchronizer/synchronizergui.cpp~:1634 +#, kde-format msgid "Sou&rce directory:" msgstr "" #: Synchronizer/synchronizergui.cpp:1638 #: Synchronizer/synchronizergui.cpp~:1638 +#, kde-format msgid "&Left directory:" msgstr "" #: Synchronizer/synchronizergui.cpp:1639 #: Synchronizer/synchronizergui.cpp~:1639 +#, kde-format msgid "&Right directory:" msgstr "" #: Synchronizer/synchronizergui.cpp:1674 #: Synchronizer/synchronizergui.cpp~:1674 +#, kde-format msgid "URL must be the descendant of either the left or the right base URL!" msgstr "" #: Synchronizer/synchronizergui.cpp:1739 #: Synchronizer/synchronizergui.cpp~:1739 +#, kde-format msgid "Synchronize Directories" msgstr "" #: Synchronizer/synchronizergui.cpp:1741 #: Synchronizer/synchronizergui.cpp~:1741 +#, kde-format msgid "E&xclude" msgstr "" #: Synchronizer/synchronizergui.cpp:1743 #: Synchronizer/synchronizergui.cpp~:1743 +#, kde-format msgid "Restore ori&ginal operation" msgstr "" #: Synchronizer/synchronizergui.cpp:1745 #: Synchronizer/synchronizergui.cpp~:1745 +#, kde-format msgid "Re&verse direction" msgstr "" #: Synchronizer/synchronizergui.cpp:1747 #: Synchronizer/synchronizergui.cpp~:1747 +#, kde-format msgid "Copy from &right to left" msgstr "" #: Synchronizer/synchronizergui.cpp:1749 #: Synchronizer/synchronizergui.cpp~:1749 +#, kde-format msgid "Copy from &left to right" msgstr "" #: Synchronizer/synchronizergui.cpp:1751 #: Synchronizer/synchronizergui.cpp~:1751 +#, kde-format msgid "&Delete (left single)" msgstr "" #: Synchronizer/synchronizergui.cpp:1756 #: Synchronizer/synchronizergui.cpp~:1756 +#, kde-format msgid "V&iew left file" msgstr "" #: Synchronizer/synchronizergui.cpp:1759 #: Synchronizer/synchronizergui.cpp~:1759 +#, kde-format msgid "Vi&ew right file" msgstr "" #: Synchronizer/synchronizergui.cpp:1762 #: Synchronizer/synchronizergui.cpp~:1762 +#, kde-format msgid "&Compare Files" msgstr "" #: Synchronizer/synchronizergui.cpp:1768 #: Synchronizer/synchronizergui.cpp~:1768 +#, kde-format msgid "C&opy selected to clipboard (left)" msgstr "" #: Synchronizer/synchronizergui.cpp:1770 #: Synchronizer/synchronizergui.cpp~:1770 +#, kde-format msgid "Co&py selected to clipboard (right)" msgstr "" #: Synchronizer/synchronizergui.cpp:1775 #: Synchronizer/synchronizergui.cpp~:1775 +#, kde-format msgid "&Select items" msgstr "" #: Synchronizer/synchronizergui.cpp:1777 #: Synchronizer/synchronizergui.cpp~:1777 +#, kde-format msgid "Deselec&t items" msgstr "" #: Synchronizer/synchronizergui.cpp:1779 #: Synchronizer/synchronizergui.cpp~:1779 +#, kde-format msgid "I&nvert selection" msgstr "" #: Synchronizer/synchronizergui.cpp:1790 #: Synchronizer/synchronizergui.cpp~:1790 +#, kde-format msgid "Synchronize with &KGet" msgstr "" #: Synchronizer/synchronizergui.cpp:1858 #: Synchronizer/synchronizergui.cpp~:1858 +#, kde-format msgid "Select items" msgstr "" #: Synchronizer/synchronizergui.cpp:1859 #: Synchronizer/synchronizergui.cpp~:1859 +#, kde-format msgid "Deselect items" msgstr "" @@ -1152,47 +1361,51 @@ #: Synchronizer/synchronizergui.cpp~:2108 #: Synchronizer/synchronizergui.cpp~:2115 Panel/krdetailedviewitem.cpp:79 #: Panel/krdetailedviewitem.cpp:113 +#, kde-format msgid "<DIR>" msgstr "" #: Synchronizer/synchronizergui.cpp:2210 #: Synchronizer/synchronizergui.cpp~:2210 +#, kde-format msgid "Synchronizer has nothing to do!" msgstr "" #: Synchronizer/synchronizergui.cpp:2331 #: Synchronizer/synchronizergui.cpp~:2331 +#, kde-format msgid "" "The synchronizer window contains data from a previous compare. If you exit, " "this data will be lost. Do you really want to exit?" msgstr "" #: Synchronizer/synchronizertask.cpp:134 Synchronizer/synchronizertask.cpp:141 -#, qt-format +#, kde-format msgid "Error at opening %1!" msgstr "" #: Synchronizer/synchronizertask.cpp:302 -#, qt-format +#, kde-format msgid "IO error at comparing file %1 with %2!" msgstr "" #: Synchronizer/synchronizertask.cpp:338 -#, qt-format +#, kde-format msgid "Comparing file %1 (%2)..." msgstr "" #: Synchronizer/synchronizerdirlist.cpp:120 VFS/normal_vfs.cpp:101 -#, qt-format +#, kde-format msgid "Can't open the %1 directory!" msgstr "" #: Synchronizer/synchronizedialog.cpp:50 +#, kde-format msgid "Krusader::Synchronize" msgstr "" #: Synchronizer/synchronizedialog.cpp:57 -#, qt-format +#, kde-format msgid "Right to left: Copy 1 file" msgid_plural "Right to left: Copy %1 files" msgstr[0] "" @@ -1200,7 +1413,7 @@ #: Synchronizer/synchronizedialog.cpp:58 Synchronizer/synchronizedialog.cpp:71 #: Synchronizer/synchronizedialog.cpp:84 -#, qt-format +#, kde-format msgid "(1 byte)" msgid_plural "(%1 bytes)" msgstr[0] "" @@ -1208,419 +1421,495 @@ #: Synchronizer/synchronizedialog.cpp:64 Synchronizer/synchronizedialog.cpp:77 #: Synchronizer/synchronizedialog.cpp:90 -#, qt-format +#, kde-format msgid "Ready: %2/1 file, %3/%4" msgid_plural "Ready: %2/%1 files, %3/%4" msgstr[0] "" msgstr[1] "" #: Synchronizer/synchronizedialog.cpp:70 -#, qt-format +#, kde-format msgid "Left to right: Copy 1 file" msgid_plural "Left to right: Copy %1 files" msgstr[0] "" msgstr[1] "" #: Synchronizer/synchronizedialog.cpp:83 -#, qt-format +#, kde-format msgid "Left: Delete 1 file" msgid_plural "Left: Delete %1 files" msgstr[0] "" msgstr[1] "" #: Synchronizer/synchronizedialog.cpp:108 +#, kde-format msgid "Confirm overwrites" msgstr "" #: Synchronizer/synchronizedialog.cpp:117 +#, kde-format msgid "&Start" msgstr "" #: Synchronizer/synchronizedialog.cpp:122 +#, kde-format msgid "&Pause" msgstr "" #: Synchronizer/synchronizedialog.cpp:126 MountMan/kmountmangui.cpp:72 +#, kde-format msgid "&Close" msgstr "" #: Synchronizer/synchronizedialog.cpp:169 #: Synchronizer/synchronizedialog.cpp:172 #: Synchronizer/synchronizedialog.cpp:175 -#, qt-format +#, kde-format msgid "\tReady: %1/%2 files, %3/%4" msgstr "" #: Synchronizer/synchronizedialog.cpp:197 Synchronizer/synchronizer.cpp:1365 #: Synchronizer/synchronizer.cpp:1378 +#, kde-format msgid "Pause" msgstr "" #: Synchronizer/synchronizedialog.cpp:205 Synchronizer/synchronizer.cpp:1380 +#, kde-format msgid "Resume" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:56 +#, kde-format msgid "Krusader::Feed to listbox" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:96 +#, kde-format msgid "No elements to feed!" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:110 +#, kde-format msgid "Synchronize results" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:121 Locate/locate.cpp:633 #: Locate/locate.cpp~:632 Search/krsearchdialog.cpp:632 #: Search/krsearchdialog.cpp~:633 +#, kde-format msgid "Here you can name the file collection" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:132 +#, kde-format msgid "Side to feed:" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:138 +#, kde-format msgid "Left" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:139 +#, kde-format msgid "Right" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:140 +#, kde-format msgid "Both" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:157 +#, kde-format msgid "Selected files only" msgstr "" #: Synchronizer/feedtolistboxdialog.cpp:208 -#, qt-format +#, kde-format msgid "Cannot open %1!" msgstr "" #: Synchronizer/synchronizer.cpp:175 Synchronizer/synchronizer.cpp:670 -#, qt-format +#, kde-format msgid "Number of files: %1" msgstr "" #: Synchronizer/synchronizer.cpp:206 -#, qt-format +#, kde-format msgid "Number of compared directories: %1" msgstr "" #: Synchronizer/synchronizer.cpp:1172 Synchronizer/synchronizer.cpp:1185 +#, kde-format msgid "File Already Exists" msgstr "" #: Synchronizer/synchronizer.cpp:1230 Synchronizer/synchronizer.cpp:1234 -#, qt-format +#, kde-format msgid "Error at copying file %1 to %2!" msgstr "" #: Synchronizer/synchronizer.cpp:1238 -#, qt-format +#, kde-format msgid "Error at deleting file %1!" msgstr "" #: Synchronizer/synchronizer.cpp:1416 +#, kde-format msgid "Krusader::Synchronizer" msgstr "" #: Synchronizer/synchronizer.cpp:1417 +#, kde-format msgid "Feeding the URLs to Kget" msgstr "" #: Synchronizer/synchronizer.cpp:1466 krslots.cpp:117 krslots.cpp:188 #: krslots.cpp:443 krslots.cpp:481 krslots.cpp:499 -#, qt-format +#, kde-format msgid "Error executing %1!" msgstr "" #: Splitter/combiner.cpp:63 +#, kde-format msgid "Krusader::Combining..." msgstr "" #: Splitter/combiner.cpp:64 -#, qt-format +#, kde-format msgid "Combining the file %1..." msgstr "" #: Splitter/combiner.cpp:74 -#, qt-format +#, kde-format msgid "" "The CRC information file (%1) is missing!\n" "Validity checking is impossible without it. Continue combining?" msgstr "" #: Splitter/combiner.cpp:112 -#, qt-format +#, kde-format msgid "Error at reading the CRC file (%1)!" msgstr "" #: Splitter/combiner.cpp:146 +#, kde-format msgid "Not a valid CRC file!" msgstr "" #: Splitter/combiner.cpp:154 +#, kde-format msgid "" "Validity checking is impossible without a good CRC file. Continue combining?" msgstr "" #: Splitter/combiner.cpp:258 -#, qt-format +#, kde-format msgid "Can't open the first split file of %1!" msgstr "" #: Splitter/combiner.cpp:270 +#, kde-format msgid "Incorrect filesize! The file might have been corrupted!" msgstr "" #: Splitter/combiner.cpp:272 +#, kde-format msgid "Incorrect CRC checksum! The file might have been corrupted!" msgstr "" #: Splitter/combiner.cpp:298 Splitter/splitter.cpp:203 -#, qt-format +#, kde-format msgid "Error writing file %1!" msgstr "" #: Splitter/splitter.cpp:71 +#, kde-format msgid "Krusader::Splitting..." msgstr "" #: Splitter/splitter.cpp:72 -#, qt-format +#, kde-format msgid "Splitting the file %1..." msgstr "" #: Splitter/splitter.cpp:76 +#, kde-format msgid "Can't split a directory!" msgstr "" #: Splitter/splitter.cpp:127 -#, qt-format +#, kde-format msgid "Error reading file %1!" msgstr "" #: Splitter/splitter.cpp:246 -#, qt-format +#, kde-format msgid "Error at writing file %1!" msgstr "" #: Splitter/splittergui.cpp:44 +#, kde-format msgid "1.44 MB (3.5\")" msgstr "" #: Splitter/splittergui.cpp:45 +#, kde-format msgid "1.2 MB (5.25\")" msgstr "" #: Splitter/splittergui.cpp:46 +#, kde-format msgid "720 kB (3.5\")" msgstr "" #: Splitter/splittergui.cpp:47 +#, kde-format msgid "360 kB (5.25\")" msgstr "" #: Splitter/splittergui.cpp:48 +#, kde-format msgid "100 MB (ZIP)" msgstr "" #: Splitter/splittergui.cpp:49 +#, kde-format msgid "250 MB (ZIP)" msgstr "" #: Splitter/splittergui.cpp:50 +#, kde-format msgid "650 MB (CD-R)" msgstr "" #: Splitter/splittergui.cpp:51 +#, kde-format msgid "700 MB (CD-R)" msgstr "" #: Splitter/splittergui.cpp:66 -#, qt-format +#, kde-format msgid "Split the file %1 to directory:" msgstr "" #: Splitter/splittergui.cpp:82 +#, kde-format msgid "User Defined" msgstr "" #: Splitter/splittergui.cpp:91 +#, kde-format msgid "Max file size:" msgstr "" #: Splitter/splittergui.cpp:100 +#, kde-format msgid "Byte" msgstr "" #: Splitter/splittergui.cpp:101 +#, kde-format msgid "kByte" msgstr "" #: Splitter/splittergui.cpp:102 +#, kde-format msgid "MByte" msgstr "" #: Splitter/splittergui.cpp:103 +#, kde-format msgid "GByte" msgstr "" #: Splitter/splittergui.cpp:122 +#, kde-format msgid "&Split" msgstr "" #: Splitter/splittergui.cpp:131 +#, kde-format msgid "Krusader::Splitter" msgstr "" #: Splitter/splittergui.cpp:207 +#, kde-format msgid "The directory path URL is malformed!" msgstr "" #: Konfigurator/konfiguratoritems.cpp:545 +#, kde-format msgid "Custom color" msgstr "" #: Konfigurator/konfiguratoritems.cpp:546 GUI/krremoteencodingmenu.cpp:132 +#, kde-format msgid "Default" msgstr "" #: Konfigurator/konfiguratoritems.cpp:554 +#, kde-format msgid "Red" msgstr "" #: Konfigurator/konfiguratoritems.cpp:555 +#, kde-format msgid "Green" msgstr "" #: Konfigurator/konfiguratoritems.cpp:556 +#, kde-format msgid "Blue" msgstr "" #: Konfigurator/konfiguratoritems.cpp:557 +#, kde-format msgid "Cyan" msgstr "" #: Konfigurator/konfiguratoritems.cpp:558 +#, kde-format msgid "Magenta" msgstr "" #: Konfigurator/konfiguratoritems.cpp:559 +#, kde-format msgid "Yellow" msgstr "" #: Konfigurator/konfiguratoritems.cpp:560 +#, kde-format msgid "Dark Red" msgstr "" #: Konfigurator/konfiguratoritems.cpp:561 +#, kde-format msgid "Dark Green" msgstr "" #: Konfigurator/konfiguratoritems.cpp:562 +#, kde-format msgid "Dark Blue" msgstr "" #: Konfigurator/konfiguratoritems.cpp:563 +#, kde-format msgid "Dark Cyan" msgstr "" #: Konfigurator/konfiguratoritems.cpp:564 +#, kde-format msgid "Dark Magenta" msgstr "" #: Konfigurator/konfiguratoritems.cpp:565 +#, kde-format msgid "Dark Yellow" msgstr "" #: Konfigurator/konfiguratoritems.cpp:566 +#, kde-format msgid "White" msgstr "" #: Konfigurator/konfiguratoritems.cpp:567 +#, kde-format msgid "Light Gray" msgstr "" #: Konfigurator/konfiguratoritems.cpp:568 +#, kde-format msgid "Gray" msgstr "" #: Konfigurator/konfiguratoritems.cpp:569 +#, kde-format msgid "Dark Gray" msgstr "" #: Konfigurator/konfiguratoritems.cpp:570 +#, kde-format msgid "Black" msgstr "" #: Konfigurator/krresulttable.cpp:125 +#, kde-format msgid "unarj not found, but arj found, which will be used for unpacking" msgstr "" #: Konfigurator/krresulttable.cpp:131 +#, kde-format msgid "rpm found, but cpio not found which is required for unpacking" msgstr "" #: Konfigurator/krresulttable.cpp:134 Konfigurator/krresulttable.cpp:287 +#, kde-format msgid "Found" msgstr "" #: Konfigurator/krresulttable.cpp:135 +#, kde-format msgid "Packing" msgstr "" #: Konfigurator/krresulttable.cpp:136 +#, kde-format msgid "Unpacking" msgstr "" #: Konfigurator/krresulttable.cpp:137 +#, kde-format msgid "Note" msgstr "" #: Konfigurator/krresulttable.cpp:200 Konfigurator/krresulttable.cpp:214 #: Konfigurator/krresulttable.cpp:367 +#, kde-format msgid "enabled" msgstr "" #: Konfigurator/krresulttable.cpp:203 Konfigurator/krresulttable.cpp:217 #: Konfigurator/krresulttable.cpp:370 +#, kde-format msgid "disabled" msgstr "" #: Konfigurator/krresulttable.cpp:280 +#, kde-format msgid "diff utility" msgstr "" #: Konfigurator/krresulttable.cpp:281 +#, kde-format msgid "email client" msgstr "" #: Konfigurator/krresulttable.cpp:282 +#, kde-format msgid "batch renamer" msgstr "" #: Konfigurator/krresulttable.cpp:283 +#, kde-format msgid "checksum utility" msgstr "" #: Konfigurator/krresulttable.cpp:285 DiskUsage/dulistview.cpp:63 #: Panel/krdetailedview.cpp:116 Panel/krdetailedview.cpp:1509 +#, kde-format msgid "Group" msgstr "" #: Konfigurator/krresulttable.cpp:286 +#, kde-format msgid "Tool" msgstr "" #: Konfigurator/krresulttable.cpp:288 +#, kde-format msgid "Status" msgstr "" @@ -1628,24 +1917,29 @@ #: Konfigurator/kgadvanced.cpp:48 Konfigurator/kgdependencies.cpp:58 #: Konfigurator/konfigurator.cpp:107 Konfigurator/kglookfeel.cpp:264 #: Konfigurator/kgarchives.cpp:51 Konfigurator/kggeneral.cpp:56 +#, kde-format msgid "General" msgstr "" #: Konfigurator/kgcolors.cpp:61 +#, kde-format msgid "Use the default KDE colors" msgstr "" #: Konfigurator/kgcolors.cpp:61 +#, kde-format msgid "" "<p>Use KDE's global color configuration.</p><p><i>KDE Control Center -> " "Appearance & Themes -> Colors</i></p>" msgstr "" #: Konfigurator/kgcolors.cpp:62 +#, kde-format msgid "Use alternate background color" msgstr "" #: Konfigurator/kgcolors.cpp:62 +#, kde-format msgid "" "<p>The <b>background color</b> and the <b>alternate background</b> color " "alternates line by line.</p><p>When you don't use the <i>KDE default colors</" @@ -1653,10 +1947,12 @@ msgstr "" #: Konfigurator/kgcolors.cpp:63 +#, kde-format msgid "Show current item even if not focused" msgstr "" #: Konfigurator/kgcolors.cpp:63 +#, kde-format msgid "" "<p>Shows the last cursor position in the non active list panel.</p><p>This " "option is only available when you don't use the <i>KDE default colors</i>.</" @@ -1664,10 +1960,12 @@ msgstr "" #: Konfigurator/kgcolors.cpp:64 +#, kde-format msgid "Dim the colors of the inactive panel" msgstr "" #: Konfigurator/kgcolors.cpp:64 +#, kde-format msgid "" "<p>The colors of the inactive panel are calculated by a dim color and a dim " "factor.</p>" @@ -1675,97 +1973,120 @@ #: Konfigurator/kgcolors.cpp:82 Konfigurator/kgcolors.cpp:224 #: Konfigurator/konfigurator.cpp:105 +#, kde-format msgid "Colors" msgstr "" #: Konfigurator/kgcolors.cpp:92 +#, kde-format msgid "Active" msgstr "" #: Konfigurator/kgcolors.cpp:98 +#, kde-format msgid "Transparent" msgstr "" #: Konfigurator/kgcolors.cpp:100 Konfigurator/kgcolors.cpp:135 +#, kde-format msgid "Foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:101 Konfigurator/kgcolors.cpp:137 +#, kde-format msgid "Directory foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:101 Konfigurator/kgcolors.cpp:102 #: Konfigurator/kgcolors.cpp:103 Konfigurator/kgcolors.cpp:104 #: Konfigurator/kgcolors.cpp:136 +#, kde-format msgid "Same as foreground" msgstr "" #: Konfigurator/kgcolors.cpp:102 Konfigurator/kgcolors.cpp:138 +#, kde-format msgid "Executable foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:103 Konfigurator/kgcolors.cpp:139 +#, kde-format msgid "Symbolic link foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:104 Konfigurator/kgcolors.cpp:140 +#, kde-format msgid "Invalid symlink foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:105 Konfigurator/kgcolors.cpp:141 +#, kde-format msgid "Background:" msgstr "" #: Konfigurator/kgcolors.cpp:106 Konfigurator/kgcolors.cpp:142 +#, kde-format msgid "Same as background" msgstr "" #: Konfigurator/kgcolors.cpp:107 Konfigurator/kgcolors.cpp:143 +#, kde-format msgid "Alternate background:" msgstr "" #: Konfigurator/kgcolors.cpp:108 Konfigurator/kgcolors.cpp:144 +#, kde-format msgid "Selected foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:109 Konfigurator/kgcolors.cpp:145 +#, kde-format msgid "Selected background:" msgstr "" #: Konfigurator/kgcolors.cpp:110 Konfigurator/kgcolors.cpp:146 +#, kde-format msgid "Same as alt. background" msgstr "" #: Konfigurator/kgcolors.cpp:111 Konfigurator/kgcolors.cpp:148 +#, kde-format msgid "Alternate selected background:" msgstr "" #: Konfigurator/kgcolors.cpp:111 Konfigurator/kgcolors.cpp:147 +#, kde-format msgid "Same as selected background" msgstr "" #: Konfigurator/kgcolors.cpp:112 Konfigurator/kgcolors.cpp:149 +#, kde-format msgid "Current foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:112 Konfigurator/kgcolors.cpp:114 #: Konfigurator/kgcolors.cpp:115 +#, kde-format msgid "Not used" msgstr "" #: Konfigurator/kgcolors.cpp:113 Konfigurator/kgcolors.cpp:150 +#, kde-format msgid "Same as selected foreground" msgstr "" #: Konfigurator/kgcolors.cpp:114 Konfigurator/kgcolors.cpp:151 +#, kde-format msgid "Selected current foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:115 Konfigurator/kgcolors.cpp:152 +#, kde-format msgid "Current background:" msgstr "" #: Konfigurator/kgcolors.cpp:125 +#, kde-format msgid "Inactive" msgstr "" @@ -1776,149 +2097,184 @@ #: Konfigurator/kgcolors.cpp:145 Konfigurator/kgcolors.cpp:148 #: Konfigurator/kgcolors.cpp:149 Konfigurator/kgcolors.cpp:151 #: Konfigurator/kgcolors.cpp:152 +#, kde-format msgid "Same as active" msgstr "" #: Konfigurator/kgcolors.cpp:171 +#, kde-format msgid "Dim target color:" msgstr "" #: Konfigurator/kgcolors.cpp:174 +#, kde-format msgid "Dim factor:" msgstr "" #: Konfigurator/kgcolors.cpp:187 +#, kde-format msgid "Synchronizer" msgstr "" #: Konfigurator/kgcolors.cpp:193 Konfigurator/kgcolors.cpp:194 +#, kde-format msgid "KDE default" msgstr "" #: Konfigurator/kgcolors.cpp:198 +#, kde-format msgid "Equals foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:199 +#, kde-format msgid "Equals background:" msgstr "" #: Konfigurator/kgcolors.cpp:200 +#, kde-format msgid "Differing foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:201 +#, kde-format msgid "Differing background:" msgstr "" #: Konfigurator/kgcolors.cpp:202 +#, kde-format msgid "Copy to left foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:203 +#, kde-format msgid "Copy to left background:" msgstr "" #: Konfigurator/kgcolors.cpp:204 +#, kde-format msgid "Copy to right foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:205 +#, kde-format msgid "Copy to right background:" msgstr "" #: Konfigurator/kgcolors.cpp:206 +#, kde-format msgid "Delete foreground:" msgstr "" #: Konfigurator/kgcolors.cpp:207 +#, kde-format msgid "Delete background:" msgstr "" #: Konfigurator/kgcolors.cpp:216 Konfigurator/kglookfeel.cpp:352 #: Panel/krpopupmenu.cpp:88 +#, kde-format msgid "Preview" msgstr "" #: Konfigurator/kgcolors.cpp:237 +#, kde-format msgid "Import color-scheme" msgstr "" #: Konfigurator/kgcolors.cpp:239 +#, kde-format msgid "Export color-scheme" msgstr "" #: Konfigurator/kgcolors.cpp:420 +#, kde-format msgid "Selected + Current" msgstr "" #: Konfigurator/kgcolors.cpp:421 +#, kde-format msgid "Selected 2" msgstr "" #: Konfigurator/kgcolors.cpp:422 +#, kde-format msgid "Selected 1" msgstr "" #: Konfigurator/kgcolors.cpp:423 +#, kde-format msgid "Current" msgstr "" #: Konfigurator/kgcolors.cpp:424 +#, kde-format msgid "Invalid symlink" msgstr "" #: Konfigurator/kgcolors.cpp:425 +#, kde-format msgid "Symbolic link" msgstr "" #: Konfigurator/kgcolors.cpp:426 +#, kde-format msgid "Application" msgstr "" #: Konfigurator/kgcolors.cpp:428 Panel/krdetailedview.cpp:312 #: Panel/krbriefview.cpp:257 +#, kde-format msgid "Directory" msgstr "" #: Konfigurator/kgcolors.cpp:484 +#, kde-format msgid "Copy to right" msgstr "" #: Konfigurator/kgcolors.cpp:485 +#, kde-format msgid "Copy to left" msgstr "" #: Konfigurator/kgcolors.cpp:486 +#, kde-format msgid "Differing" msgstr "" #: Konfigurator/kgcolors.cpp:487 +#, kde-format msgid "Equals" msgstr "" #: Konfigurator/kgcolors.cpp:513 +#, kde-format msgid "Select a color-scheme file" msgstr "" #: Konfigurator/kgcolors.cpp:517 +#, kde-format msgid "Error: unable to read from file" msgstr "" #: Konfigurator/kgcolors.cpp:527 +#, kde-format msgid "Select a color scheme file" msgstr "" #: Konfigurator/kgcolors.cpp:531 -#, qt-format +#, kde-format msgid "File %1 already exists. Are you sure you want to overwrite it?" msgstr "" #: Konfigurator/kgcolors.cpp:534 +#, kde-format msgid "Error: unable to write to file" msgstr "" #: Konfigurator/kgstartup.cpp:51 +#, kde-format msgid "" "Defines the panel profile used at startup. A panel profile contains:" "<ul><li>all the tabs paths</li><li>the current tab</li><li>the acti... [truncated message content] |
From: <vac...@us...> - 2008-04-19 01:25:32
|
Revision: 2757 http://krusader.svn.sourceforge.net/krusader/?rev=2757&view=rev Author: vaclavjuza Date: 2008-04-18 18:25:38 -0700 (Fri, 18 Apr 2008) Log Message: ----------- i18n: updated bg,el,es,fr,hu,pt,sr,sr@Latn with newer versions from kde3 branch. Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/po/bg.po trunk/krusader_kde4/po/el.po trunk/krusader_kde4/po/es.po trunk/krusader_kde4/po/fr.po trunk/krusader_kde4/po/hu.po trunk/krusader_kde4/po/pt.po trunk/krusader_kde4/po/sr.po trunk/krusader_kde4/po/sr@Latn.po Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-04-19 00:39:57 UTC (rev 2756) +++ trunk/krusader_kde4/ChangeLog 2008-04-19 01:25:38 UTC (rev 2757) @@ -25,6 +25,10 @@ FIXED: [ 1645179 ] shortcut keys are not sent to the terminal FIXED: [ 1736496 ] always sort dirs by name not working + I18N: Updated Hungarian translation + I18N: Updated French translation (thanks Henry Nicolas) + I18N: Fixed [ 1725003 ] bad spanish translation + Branched of KDE4 development ============================ Modified: trunk/krusader_kde4/po/bg.po =================================================================== --- trunk/krusader_kde4/po/bg.po 2008-04-19 00:39:57 UTC (rev 2756) +++ trunk/krusader_kde4/po/bg.po 2008-04-19 01:25:38 UTC (rev 2757) @@ -3,13 +3,13 @@ # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai # Copyright (C) 2004-2007, Krusader Krew # This file is distributed under the same license as the Krusader package -# Milen Ivanov <mil...@gm...>, 2004, 2005, 2006. +# Milen Ivanov <mil...@gm...>, 2004, 2005, 2006, 2007. # msgid "" msgstr "" -"Project-Id-Version: krusader-1.80.0-beta2\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-04-16 22:49+0200\n" +"Project-Id-Version: krusader-1.80.0\n" +"Report-Msgid-Bugs-To: kru...@go...\n" +"POT-Creation-Date: 2008-04-19 02:33+0200\n" "PO-Revision-Date: 2005-12-04 10:30+0200\n" "Last-Translator: Milen Ivanov <mil...@gm...>\n" "Language-Team: krusader-i18n <kru...@go...>\n" @@ -19,27 +19,33 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: Dialogs/krpleasewait.cpp:49 +#, kde-format msgid "Krusader::Wait" msgstr "Krusader::Изчакване" #: Dialogs/krpleasewait.cpp:65 Dialogs/newftpgui.cpp:145 #: Splitter/splittergui.cpp:126 +#, kde-format msgid "&Cancel" msgstr "&Отказ" #: Dialogs/krmaskchoice.cpp:57 +#, kde-format msgid "Choose Files" msgstr "Изберете файлове" #: Dialogs/krmaskchoice.cpp:81 +#, kde-format msgid "Select the following files:" msgstr "Избор на следните файлове:" #: Dialogs/krmaskchoice.cpp:86 +#, kde-format msgid "Predefined Selections" msgstr "Готови селекции" #: Dialogs/krmaskchoice.cpp:99 +#, kde-format msgid "" "A predefined selection is a file-mask which you use often.\n" "Some examples are: \"*.c, *.h\", \"*.c, *.o\", etc.\n" @@ -58,54 +64,66 @@ "да превъртате при нужда." #: Dialogs/krmaskchoice.cpp:107 +#, kde-format msgid "Add" msgstr "Добавяне" #: Dialogs/krmaskchoice.cpp:108 +#, kde-format msgid "Adds the selection in the line-edit to the list" msgstr "Добавяне в списъка на селекцията от реда" #: Dialogs/krmaskchoice.cpp:112 Dialogs/kurllistrequester.cpp:142 #: BookMan/krbookmarkhandler.cpp:563 Konfigurator/kgcolors.cpp:483 #: DiskUsage/diskusage.cpp:770 Panel/krpopupmenu.cpp:158 krusader.cpp:739 +#, kde-format msgid "Delete" msgstr "Изтриване" #: Dialogs/krmaskchoice.cpp:113 +#, kde-format msgid "Delete the marked selection from the list" msgstr "Изтриване на отбелязаната селекция от списъка" #: Dialogs/krmaskchoice.cpp:117 +#, kde-format msgid "Clear" msgstr "Изчистване" #: Dialogs/krmaskchoice.cpp:118 +#, kde-format msgid "Clears the entire list of selections" msgstr "Изчистване на целият списък от селекции" #: Dialogs/krmaskchoice.cpp:133 +#, kde-format msgid "OK" msgstr "ОК" #: Dialogs/krmaskchoice.cpp:137 Dialogs/packguibase.cpp:298 #: DiskUsage/diskusage.cpp:162 Panel/listpanel.cpp:874 -#: Panel/panelpopup.cpp:402 Panel/listpanel.cpp~:874 +#: Panel/panelpopup.cpp:402 +#, kde-format msgid "Cancel" msgstr "Отказ" #: Dialogs/krspecialwidgets.cpp:119 +#, kde-format msgid "Capacity: " msgstr "Капацитет: " #: Dialogs/krspecialwidgets.cpp:129 +#, kde-format msgid "Used: " msgstr "Използвано: " #: Dialogs/krspecialwidgets.cpp:130 +#, kde-format msgid "Free: " msgstr "Свободно: " #: Dialogs/krspecialwidgets.cpp:157 +#, kde-format msgid "Not mounted." msgstr "Не е монтирано." @@ -118,28 +136,34 @@ "*|всички файлове" #: Dialogs/krkeydialog.cpp:41 +#, kde-format msgid "Import shortcuts" msgstr "Внасяне на препратки" #: Dialogs/krkeydialog.cpp:42 +#, kde-format msgid "Load a keybinding profile, e.g., total_commander.keymap" msgstr "" "Зареждане на профил за клавишните комбинации, като напр. total_commander." "keymap" #: Dialogs/krkeydialog.cpp:46 +#, kde-format msgid "Export shortcuts" msgstr "Изнасяне на препратки" #: Dialogs/krkeydialog.cpp:47 +#, kde-format msgid "Save current keybindings in a keymap file." msgstr "Запис на текущите клавишни комбинации в keymap файл." #: Dialogs/krkeydialog.cpp:64 Dialogs/krkeydialog.cpp:129 +#, kde-format msgid "Select a keymap file" msgstr "Изберете файл с клавишна кодировка" #: Dialogs/krkeydialog.cpp:71 +#, kde-format msgid "" "This file does not seem to be a valid keymap.\n" "It may be a keymap using a legacy format. The import can't be undone!" @@ -149,14 +173,17 @@ "поправено!" #: Dialogs/krkeydialog.cpp:73 +#, kde-format msgid "Try to import legacy format?" msgstr "Опит за внасяне от формат legacy?" #: Dialogs/krkeydialog.cpp:74 +#, kde-format msgid "Import anyway" msgstr "Внасяне въпреки това" #: Dialogs/krkeydialog.cpp:96 +#, kde-format msgid "" "The following information was attached to the keymap. Do you really want to " "import this keymap?" @@ -165,15 +192,17 @@ "искате да внесете този файл?" #: Dialogs/krkeydialog.cpp:123 +#, kde-format msgid "Please restart this dialog in order to see the changes" msgstr "Моля, стартирайте отново диалога, за да видите промените" #: Dialogs/krkeydialog.cpp:124 +#, kde-format msgid "Legacy import completed" msgstr "Внасянето от legacy формат завършено" #: Dialogs/krkeydialog.cpp:135 -#, qt-format +#, kde-format msgid "" "<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>" msgstr "" @@ -182,113 +211,136 @@ #: Dialogs/krkeydialog.cpp:136 Dialogs/checksumdlg.cpp:630 #: Konfigurator/kgcolors.cpp:532 DiskUsage/diskusage.cpp:614 -#: Panel/panelfunc.cpp:666 Panel/panelfunc.cpp~:667 +#: Panel/panelfunc.cpp:666 +#, kde-format msgid "Warning" msgstr "Предупреждение" #: Dialogs/krkeydialog.cpp:136 Dialogs/checksumdlg.cpp:630 #: Konfigurator/kgcolors.cpp:532 UserAction/kraction.cpp:160 +#, kde-format msgid "Overwrite" msgstr "Презапис" #: Dialogs/krkeydialog.cpp:144 -#, qt-format +#, kde-format msgid "<qt>Can't open <b>%1</b> for writing!</qt>" msgstr "<qt>Отварянето на <b>%1</b> за писане е невъзможно!</qt>" #: Dialogs/krdialogs.cpp:155 +#, kde-format msgid "Preserve attributes (only for local targets)" msgstr "Запазване на атрибутите (само за локални обекти)" #: Dialogs/krdialogs.cpp:162 +#, kde-format msgid "Keep virtual directory structure" msgstr "Запазване на виртуалната структура на директорията" #: Dialogs/krdialogs.cpp:168 +#, kde-format msgid "Base URL:" msgstr "Основен URL:" #: Dialogs/packgui.cpp:55 -#, qt-format +#, kde-format msgid "Pack %1" -msgstr "Архивиране na %1" +msgstr "Архивиране на %1" #: Dialogs/packgui.cpp:57 -#, qt-format +#, kde-format msgid "Pack %1 file" msgid_plural "Pack %1 files" msgstr[0] "_n: Архивиране на %1 файл" msgstr[1] "Архивиране на %1 файла" #: Dialogs/packgui.cpp:96 +#, kde-format msgid "Please select a directory" msgstr "Изберете директория" #: Dialogs/popularurls.cpp:64 +#, kde-format msgid "Saved 'Popular Urls' are invalid. List will be cleared" msgstr "Съхранените 'Популярни Url-и' са невалидни. Списъкът ще бъде изчистен." #: Dialogs/popularurls.cpp:235 +#, kde-format msgid "Popular Urls" msgstr "Популярни Url-и" #: Dialogs/popularurls.cpp:254 +#, kde-format msgid " &Search: " msgstr " Тъ&рсене: " #: Dialogs/newftpgui.cpp:51 +#, kde-format msgid "New Network Connection" msgstr "Нова мрежова връзка" #: Dialogs/newftpgui.cpp:65 +#, kde-format msgid "About to connect to..." msgstr "Свързване с ..." #: Dialogs/newftpgui.cpp:75 +#, kde-format msgid "Protocol:" msgstr "Протокол:" #: Dialogs/newftpgui.cpp:76 +#, kde-format msgid "Host:" msgstr "Хост:" #: Dialogs/newftpgui.cpp:77 +#, kde-format msgid "Port:" msgstr "Порт:" #: Dialogs/newftpgui.cpp:85 +#, kde-format msgid "ftp://" msgstr "ftp://" #: Dialogs/newftpgui.cpp:87 +#, kde-format msgid "smb://" msgstr "smb://" #: Dialogs/newftpgui.cpp:89 +#, kde-format msgid "fish://" msgstr "fish://" #: Dialogs/newftpgui.cpp:91 +#, kde-format msgid "sftp://" msgstr "sftp://" #: Dialogs/newftpgui.cpp:122 +#, kde-format msgid "Username:" msgstr "Потребителско име:" #: Dialogs/newftpgui.cpp:124 +#, kde-format msgid "Password:" msgstr "Парола:" #: Dialogs/newftpgui.cpp:136 +#, kde-format msgid "&Connect" msgstr "&Свързване" #: Dialogs/checksumdlg.cpp:205 Dialogs/checksumdlg.cpp:507 +#, kde-format msgid "Create Checksum" msgstr "Създаване на контролна сума" #: Dialogs/checksumdlg.cpp:211 +#, kde-format msgid "" "<qt>Can't calculate checksum since no supported tool was found. Please check " "the <b>Dependencies</b> page in Krusader's settings.</qt>" @@ -297,7 +349,7 @@ "подходящ инструмент. Моля, проверете настройките в <b>Зависимости</b>.</qt>" #: Dialogs/checksumdlg.cpp:214 Dialogs/checksumdlg.cpp:333 -#, fuzzy +#, kde-format msgid "" "<qt><b>Note</b>: you've selected directories, and probably have no recursive " "checksum tool installed. Krusader currently supports <i>md5deep, sha1deep, " @@ -305,38 +357,45 @@ msgstr "" "<qt><b>Забележка</b>: избрали сте директории и вероятно нямате инсталиран " "инструмент за рекурсивно пресмятане на контролна сума. Krusader поддържа " -"<i>md5deep, sha1deep, sha256deep и tigerdeep</i></qt>" +"<i>md5deep, sha1deep, sha256deep, tigerdeep и cfv</i></qt>" #: Dialogs/checksumdlg.cpp:233 +#, kde-format msgid "About to calculate checksum for the following files" msgstr "Пресмятане контролната сума на следните файлове" #: Dialogs/checksumdlg.cpp:234 Dialogs/checksumdlg.cpp:353 +#, kde-format msgid " and folders:" msgstr " и папки:" #: Dialogs/checksumdlg.cpp:248 +#, kde-format msgid "Select the checksum method:" msgstr "Изберете метод за пресмятане:" #: Dialogs/checksumdlg.cpp:277 +#, kde-format msgid "Calculating checksums ..." msgstr "Пресмятане на контролни суми..." #: Dialogs/checksumdlg.cpp:294 Dialogs/checksumdlg.cpp:428 -#, qt-format +#, kde-format msgid "<qt>There was an error while running <b>%1</b>.</qt>" msgstr "<qt>Възникна грешка при изпълнение на <b>%1</b>.</qt>" #: Dialogs/checksumdlg.cpp:306 Dialogs/checksumdlg.cpp:437 +#, kde-format msgid "Error reading stdout or stderr" -msgstr "Грешка при четене на стандартните изход или грешка" +msgstr "Грешка при четене на stdout или stderr" #: Dialogs/checksumdlg.cpp:324 Dialogs/checksumdlg.cpp:462 +#, kde-format msgid "Verify Checksum" msgstr "Проверяване на контролна сума" #: Dialogs/checksumdlg.cpp:330 +#, kde-format msgid "" "<qt>Can't verify checksum since no supported tool was found. Please check " "the <b>Dependencies</b> page in Krusader's settings.</qt>" @@ -345,15 +404,17 @@ "инструмент. Моля, проверете настройките в <b>Зависимости</b>.</qt>" #: Dialogs/checksumdlg.cpp:352 +#, kde-format msgid "About to verify checksum for the following files" msgstr "Проверка контролната сума на следните файлове" #: Dialogs/checksumdlg.cpp:367 +#, kde-format msgid "Checksum file:" msgstr "Файл с контролна сума:" #: Dialogs/checksumdlg.cpp:382 -#, qt-format +#, kde-format msgid "" "<qt>Error reading checksum file <i>%1</i>.<br />Please specify a valid " "checksum file.</qt>" @@ -362,7 +423,7 @@ "определете валиден файл с контролна сума.</qt>" #: Dialogs/checksumdlg.cpp:395 -#, qt-format +#, kde-format msgid "" "<qt>Krusader can't find a checksum tool that handles %1 on your system. " "Please check the <b>Dependencies</b> page in Krusader's settings.</qt>" @@ -371,60 +432,72 @@ "обработи %1. Моля, проверете настройките в <b>Зависимости</b>.</qt>" #: Dialogs/checksumdlg.cpp:413 +#, kde-format msgid "Verifying checksums ..." msgstr "Проверка на контролни суми ..." #: Dialogs/checksumdlg.cpp:480 +#, kde-format msgid "Errors were detected while verifying the checksums" msgstr "При проверката на контролните суми бяха открити грешки" #: Dialogs/checksumdlg.cpp:481 +#, kde-format msgid "Checksums were verified successfully" msgstr "Контролните суми бяха успешно проверени" #: Dialogs/checksumdlg.cpp:487 +#, kde-format msgid "The following files have failed:" msgstr "Проверката не успя на следните файлове:" #: Dialogs/checksumdlg.cpp:527 +#, kde-format msgid "Errors were detected while creating the checksums" msgstr "При създаването на контролните суми бяха открити грешки" #: Dialogs/checksumdlg.cpp:528 +#, kde-format msgid "Checksums were created successfully" msgstr "Контролните суми бяха успешно създадени" #: Dialogs/checksumdlg.cpp:535 +#, kde-format msgid "Here are the calculated checksums:" msgstr "Това са пресметнатите контролни суми:" #: Dialogs/checksumdlg.cpp:543 +#, kde-format msgid "Hash" msgstr "Хеш" #: Dialogs/checksumdlg.cpp:544 Konfigurator/kgcolors.cpp:427 +#, kde-format msgid "File" msgstr "Файл" #: Dialogs/checksumdlg.cpp:547 -#, fuzzy +#, kde-format msgid "File and hash" -msgstr "Име на файл" +msgstr "Файл и хеш" #: Dialogs/checksumdlg.cpp:577 +#, kde-format msgid "Here are the errors received:" msgstr "Това са получените грешки:" #: Dialogs/checksumdlg.cpp:592 +#, kde-format msgid "Save checksum to file:" msgstr "Запис на контролната сума във файл:" #: Dialogs/checksumdlg.cpp:606 +#, kde-format msgid "Checksum file for each source file" msgstr "Файл с контролна сума за всеки файл" #: Dialogs/checksumdlg.cpp:629 -#, qt-format +#, kde-format msgid "" "File %1 already exists.\n" "Are you sure you want to overwrite it?" @@ -433,175 +506,204 @@ "Сигурни ли сте, че искате ли да го презапишете?" #: Dialogs/checksumdlg.cpp:632 +#, kde-format msgid "Select a file to save to" msgstr "Изберете файл за запис " #: Dialogs/checksumdlg.cpp:637 -#, qt-format +#, kde-format msgid "Error saving file %1" msgstr "Грешка при запис на файла %1" #: Dialogs/checksumdlg.cpp:649 +#, kde-format msgid "Saving checksum files..." msgstr "Запис на файлове с контролни суми..." #: Dialogs/checksumdlg.cpp:656 +#, kde-format msgid "Errors occured while saving multiple checksums. Stopping" msgstr "Възникна грешка при запис на множество контролни суми. Преустановено." #: Dialogs/krprogress.cpp:65 +#, kde-format msgid "Source:" msgstr "Източник:" #: Dialogs/krprogress.cpp:70 Dialogs/krprogress.cpp:246 +#, kde-format msgid "Destination:" msgstr "Назначение:" #: Dialogs/krprogress.cpp:118 +#, kde-format msgid "Krusader Progress" msgstr "Krusader Напредък" #: Dialogs/krprogress.cpp:171 -#, qt-format +#, kde-format msgid "%1 directory" msgid_plural "%1 directories" msgstr[0] "_n: %1 директория" msgstr[1] "%1 директории" #: Dialogs/krprogress.cpp:172 -#, qt-format +#, kde-format msgid "%1 file" msgid_plural "%1 files" msgstr[0] "_n: %1 файл" msgstr[1] "%1 файла" #: Dialogs/krprogress.cpp:180 +#, kde-format msgid " (Reading)" msgstr " (Четене)" #: Dialogs/krprogress.cpp:197 -#, qt-format +#, kde-format msgid "%1 of %2 complete" msgstr "%1 от %2 завършени" #: Dialogs/krprogress.cpp:207 Dialogs/krprogress.cpp:220 -#, qt-format +#, kde-format msgid "%2 / %1 directory" msgid_plural "%2 / %1 directories" msgstr[0] "%2 / %1 директории" #: Dialogs/krprogress.cpp:209 Dialogs/krprogress.cpp:223 -#, qt-format +#, kde-format msgid "%2 / %1 file" msgid_plural "%2 / %1 files" msgstr[0] "%2 / %1 файла" #: Dialogs/krprogress.cpp:231 +#, kde-format msgid "Working" msgstr "Изпълнение" #: Dialogs/krprogress.cpp:235 -#, qt-format +#, kde-format msgid "%1/s ( %2 remaining )" msgstr "%1/s ( %2 оставащо )" #: Dialogs/krspwidgets.cpp:155 +#, kde-format msgid "Enter a selection:" msgstr "Въведи селекция:" #: Dialogs/krspwidgets.cpp:307 Dialogs/krspwidgets.cpp:318 +#, kde-format msgid "Quick Navigation" msgstr "Бърза навигация" #: Dialogs/krspwidgets.cpp:308 -#, qt-format +#, kde-format msgid "Already at <i>%1</i>" msgstr "Вече е в <i>%1</i>" #: Dialogs/krspwidgets.cpp:319 -#, qt-format +#, kde-format msgid "Click to go to <i>%1</i>" msgstr "Щракни, за да отидеш в <i>%1</i>" #: Dialogs/packguibase.cpp:68 Dialogs/packguibase.cpp:122 +#, kde-format msgid "Pack" msgstr "Архивиране" #: Dialogs/packguibase.cpp:78 +#, kde-format msgid "To archive" msgstr "В архив" #: Dialogs/packguibase.cpp:97 +#, kde-format msgid "In directory" msgstr "В директория" #: Dialogs/packguibase.cpp:147 +#, kde-format msgid "Multiple volume archive" msgstr "Многотомен архив" #: Dialogs/packguibase.cpp:156 DiskUsage/diskusage.cpp:1077 +#, kde-format msgid "Size:" msgstr "Размер:" #: Dialogs/packguibase.cpp:174 +#, kde-format msgid "Set compression level" msgstr "Устано\xD0\xB2яване ниво на компресия" #: Dialogs/packguibase.cpp:195 +#, kde-format msgid "MIN" -msgstr "" +msgstr "МИН" #: Dialogs/packguibase.cpp:196 +#, kde-format msgid "MAX" -msgstr "" +msgstr "МАКС" #: Dialogs/packguibase.cpp:220 +#, kde-format msgid "Password" msgstr "Парола" #: Dialogs/packguibase.cpp:230 +#, kde-format msgid "Again" msgstr "Отново" #: Dialogs/packguibase.cpp:248 +#, kde-format msgid "Encrypt headers" msgstr "Шифриращи заглавки" #: Dialogs/packguibase.cpp:260 +#, kde-format msgid "Command line switches:" msgstr "Ключове в командния ред:" #: Dialogs/packguibase.cpp:286 Dialogs/packguibase.cpp:326 #: Filter/filtertabs.cpp:49 +#, kde-format msgid "&Advanced" msgstr "&Допълнителни" #: Dialogs/packguibase.cpp:293 +#, kde-format msgid "Ok" msgstr "Ок" #: Dialogs/packguibase.cpp:342 -#, fuzzy +#, kde-format msgid "No password specified" -msgstr "Нужна е парола" +msgstr "Не е поставена парола" #: Dialogs/packguibase.cpp:347 +#, kde-format msgid "The passwords are equal" msgstr "Паролите са еднакви" #: Dialogs/packguibase.cpp:351 +#, kde-format msgid "The passwords are different" msgstr "Паролите са различни" #: Dialogs/packguibase.cpp:388 +#, kde-format msgid "Cannot pack! The passwords are different!" msgstr "Архивирането е невъзможно! Паролите са различни!" #: Dialogs/packguibase.cpp:413 +#, kde-format msgid "Invalid volume size!" msgstr "Невалиден размер на том!" #: Dialogs/packguibase.cpp:443 +#, kde-format msgid "" "Invalid command line switch!\n" "Switch must start with '-'!" @@ -610,6 +712,7 @@ "Ключът трябва да започва с '-'" #: Dialogs/packguibase.cpp:455 +#, kde-format msgid "" "Invalid command line switch!\n" "Backslash cannot be the last character" @@ -618,6 +721,7 @@ "Обратно-н\xD0\xB0клонената черта не може да бъде последен знак" #: Dialogs/packguibase.cpp:463 +#, kde-format msgid "" "Invalid command line switch!\n" "Unclosed quotation mark!" @@ -626,16 +730,18 @@ "Незатворени кавички!" #: BookMan/krbookmarkbutton.cpp:15 +#, kde-format msgid "BookMan II" msgstr "Управление на отметки II" #: BookMan/krbookmarkbutton.cpp:19 BookMan/krbookmarkhandler.cpp:32 #: BookMan/kraddbookmarkdlg.cpp:80 krusader.cpp:707 +#, kde-format msgid "Bookmarks" msgstr "Отметки" #: BookMan/krbookmarkhandler.cpp:171 -#, qt-format +#, kde-format msgid "Unable to write to %1" msgstr "Невъзможен запис в %1" @@ -646,126 +752,150 @@ #: VFS/krarchandler.cpp:345 VFS/krarchandler.cpp:519 VFS/krarchandler.cpp:526 #: VFS/virt_vfs.cpp:90 VFS/virt_vfs.cpp:180 VFS/normal_vfs.cpp:91 #: VFS/normal_vfs.cpp:101 VFS/normal_vfs.cpp:108 MountMan/kmountman.cpp:205 +#, kde-format msgid "Error" msgstr "Гре\xD1\x88ка" #: BookMan/krbookmarkhandler.cpp:179 +#, kde-format msgid " instead of " msgstr " вместо " #: BookMan/krbookmarkhandler.cpp:184 BookMan/krbookmarkhandler.cpp:190 #: BookMan/krbookmarkhandler.cpp:221 +#, kde-format msgid "missing tag " msgstr "липсващ таг " #: BookMan/krbookmarkhandler.cpp:260 -#, qt-format +#, kde-format msgid "%1 doesn't seem to be a valid Bookmarks file" msgstr "%1 изглежда не е валиден файл с отметки" #: BookMan/krbookmarkhandler.cpp:267 -#, qt-format +#, kde-format msgid "Error reading bookmarks file: %1" msgstr "Грешка при четене на файл с отметки: %1" #: BookMan/krbookmarkhandler.cpp:330 BookMan/krbookmarkhandler.cpp:489 +#, kde-format msgid "Popular URLs" msgstr "Популярни URL-и" #: BookMan/krbookmarkhandler.cpp:399 krusader.cpp:708 +#, kde-format msgid "Bookmark Current" msgstr "Отметване на текущата селекция" #: BookMan/krbookmarkhandler.cpp:402 +#, kde-format msgid "Manage Bookmarks" msgstr "Управление на отметките" #: BookMan/krbookmarkhandler.cpp:485 +#, kde-format msgid "Enable special bookmarks" msgstr "Включване на специалните отметки" #: BookMan/krbookmarkhandler.cpp:493 +#, kde-format msgid "Devices" msgstr "Устройства" #: BookMan/krbookmarkhandler.cpp:497 BookMan/krbookmark.cpp:13 +#, kde-format msgid "Local Network" msgstr "Локална мрежа" #: BookMan/krbookmarkhandler.cpp:501 BookMan/krbookmark.cpp:12 +#, kde-format msgid "Virtual Filesystem" -msgstr "Виртуални файлови системи" +msgstr "Виртуална файлова система" #: BookMan/krbookmarkhandler.cpp:505 +#, kde-format msgid "Jump back" msgstr "Стъпка назад" #: BookMan/krbookmarkhandler.cpp:557 GUI/mediabutton.cpp:540 #: Panel/krpopupmenu.cpp:69 +#, kde-format msgid "Open" msgstr "Отваряне" #: BookMan/krbookmarkhandler.cpp:559 GUI/mediabutton.cpp:542 +#, kde-format msgid "Open in a new tab" msgstr "Отваряне в нов подпрозорец" #: BookMan/kraddbookmarkdlg.cpp:17 +#, kde-format msgid "Add Bookmark" msgstr "Добавяне на отметка" #: BookMan/kraddbookmarkdlg.cpp:20 BookMan/kraddbookmarkdlg.cpp:118 +#, kde-format msgid "New Folder" msgstr "Нова папка" #: BookMan/kraddbookmarkdlg.cpp:34 DiskUsage/diskusage.cpp:1075 +#, kde-format msgid "Name:" msgstr "Име:" #: BookMan/kraddbookmarkdlg.cpp:41 +#, kde-format msgid "URL:" msgstr "URL:" #: BookMan/kraddbookmarkdlg.cpp:48 +#, kde-format msgid "Create in:" msgstr "Създаване в:" #: BookMan/kraddbookmarkdlg.cpp:74 -#, fuzzy +#, fuzzy, kde-format msgid "Folders" msgstr "Папка..." #: BookMan/kraddbookmarkdlg.cpp:118 +#, kde-format msgid "Folder name:" msgstr "Име на папка:" #: BookMan/krbookmark.cpp:11 krusader.cpp:713 +#, kde-format msgid "Media" msgstr "Медия" #: Synchronizer/synchronizergui.cpp:1108 Synchronizer/synchronizergui.cpp:2332 #: Synchronizer/synchronizergui.cpp~:1108 #: Synchronizer/synchronizergui.cpp~:2332 +#, kde-format msgid "Krusader::Synchronize Directories" msgstr "Синхронизиране на директории с Krusader" #: Synchronizer/synchronizergui.cpp:1127 #: Synchronizer/synchronizergui.cpp~:1127 +#, kde-format msgid "Directory Comparison" msgstr "Сравняване на директории" #: Synchronizer/synchronizergui.cpp:1138 #: Synchronizer/synchronizergui.cpp~:1138 -#, fuzzy +#, kde-format msgid "File &Filter:" -msgstr "Файлов филтър:" +msgstr "Файлов &филтър:" #: Synchronizer/synchronizergui.cpp:1160 #: Synchronizer/synchronizergui.cpp~:1160 +#, kde-format msgid "The left base directory used during the synchronisation process." msgstr "Използване на директорията отляво като базова при синхронизацията." #: Synchronizer/synchronizergui.cpp:1177 #: Synchronizer/synchronizergui.cpp~:1177 Filter/generalfilter.cpp:80 +#, kde-format msgid "" "<p>The filename filtering criteria is defined here.</p><p>You can make use " "of wildcards. Multiple patterns are separated by space (means logical OR) " @@ -784,49 +914,75 @@ "code></ul><b>Note</b>: the search term '<code>text</code>' is equivalent to " "'<code>*text*</code>'.</p>" msgstr "" +"<p>Критерият за филтриране на файловете се дефинира тук.</p><p>Можете да " +"използвате глобални символи. Няколко шаблона се разделят от интервал " +"(означава логическо ИЛИ), а се изключват от търсенето със символа за " +"програмен канал (pipe).</p><p>Ако шаблонът завършва с наклонена черта " +"(<code>*шаблон*/</code>) това означава, че шаблона е с\xD0\xB2ързан с рекурсивно " +"търсене в директории.<ul><li><code>шаблон</code> - означава да се търсят " +"тези файлове/директории, чието име е <code>шаблон</code>, рекурсивно търсене " +"се осъществява през всички поддиректории, независимо от стойността на " +"<code>шаблон</code></li><li><code>шаблон</code> - означава да се търсят " +"всички файлове/директории, но рекурсивното търсене се извършва през/не през " +"директориите, чието име е <code>шаблон</code></li></ul><p></p><p>За имена, " +"които съдържат интервал може да се използват кавички. Филтърът <code>" +"\"Програма Файлове\"</code> осъществява търсене за тези файлове/" +"директории, чието име е <code>\"Програма Файлове\"</code>.</" +"p><p>Примери:<ul><code><li>*.o</li><li>*.h *.c??</li><li>*.cpp *.h | *.moc." +"cpp</li><li>* | CVS/ .svn/</li></code></ul><b>Забележка</b>: изразът за " +"търсене '<code>текст</code>' е равностоен на '<code>*текст*</code>'.</p>" #: Synchronizer/synchronizergui.cpp:1193 #: Synchronizer/synchronizergui.cpp~:1193 +#, kde-format msgid "The right base directory used during the synchronisation process." msgstr "Използване на директорията отдясно като базова при синхронизацията." #: Synchronizer/synchronizergui.cpp:1207 #: Synchronizer/synchronizergui.cpp~:1207 +#, kde-format msgid "Recurse subdirectories" msgstr "Рекурсивно в поддиректориите" #: Synchronizer/synchronizergui.cpp:1210 #: Synchronizer/synchronizergui.cpp~:1210 +#, kde-format msgid "Compare not only the base directories but their subdirectories as well." msgstr "Сравнява не само базовите директории, но също и техните поддиректории." #: Synchronizer/synchronizergui.cpp:1211 #: Synchronizer/synchronizergui.cpp~:1211 +#, kde-format msgid "Follow symlinks" msgstr "Следва връзките" #: Synchronizer/synchronizergui.cpp:1215 #: Synchronizer/synchronizergui.cpp~:1215 +#, kde-format msgid "Follow symbolic links during the compare process." msgstr "Проследява символните връзки при сравняването." #: Synchronizer/synchronizergui.cpp:1216 #: Synchronizer/synchronizergui.cpp~:1216 +#, kde-format msgid "Compare by content" msgstr "Сравнение по съдържание" #: Synchronizer/synchronizergui.cpp:1219 #: Synchronizer/synchronizergui.cpp~:1219 +#, kde-format msgid "Compare duplicated files with same size by content." msgstr "Сравнява дублиращите се файлове с еднакъв размер по съдържанието им." #: Synchronizer/synchronizergui.cpp:1220 #: Synchronizer/synchronizergui.cpp~:1220 +#, kde-format msgid "Ignore Date" msgstr "Игнориране на датата" #: Synchronizer/synchronizergui.cpp:1223 #: Synchronizer/synchronizergui.cpp~:1223 +#, kde-format msgid "" "<p>Ignore date information during the compare process.</p><p><b>Note</b>: " "useful if the files are located on network filesystems or in archives.</p>" @@ -837,11 +993,13 @@ #: Synchronizer/synchronizergui.cpp:1224 #: Synchronizer/synchronizergui.cpp~:1224 +#, kde-format msgid "Asymmetric" msgstr "Асиметрично" #: Synchronizer/synchronizergui.cpp:1227 #: Synchronizer/synchronizergui.cpp~:1227 +#, kde-format msgid "" "<p><b>Asymmetric mode</b></p><p>The left side is the destination, the right " "is the source directory. Files existing only in the left directory will be " @@ -856,11 +1014,13 @@ #: Synchronizer/synchronizergui.cpp:1228 #: Synchronizer/synchronizergui.cpp~:1228 +#, kde-format msgid "Ignore Case" msgstr "Игнориране главни/малки" #: Synchronizer/synchronizergui.cpp:1231 #: Synchronizer/synchronizergui.cpp~:1231 +#, kde-format msgid "" "<p>Case insensitive filename compare.</p><p><b>Note</b>: useful when " "synchronizing Windows filesystems.</p>" @@ -871,64 +1031,71 @@ #: Synchronizer/synchronizergui.cpp:1238 #: Synchronizer/synchronizergui.cpp~:1238 -#, fuzzy +#, kde-format msgid "S&how options" -msgstr "Възможности на обозначаване" +msgstr "Възмо&жности на обозначаване" #: Synchronizer/synchronizergui.cpp:1257 #: Synchronizer/synchronizergui.cpp~:1257 -#, fuzzy +#, kde-format msgid "Show files marked to <i>Copy from left to right</i> (CTRL+L)." -msgstr "Обозначава файловете, маркирани за <i>копиране от ляво на дясно</i>." +msgstr "" +"Обозначава ф\xD0\xB0йловете, маркирани за <i>копиране от ляво на дясно</i> (CTRL+L)." #: Synchronizer/synchronizergui.cpp:1267 #: Synchronizer/synchronizergui.cpp~:1267 -#, fuzzy +#, kde-format msgid "Show files considered to be identical (CTRL+E)." -msgstr "Обозначава файловете, преценени като идентични." +msgstr "Обозначава файловете, преценени като идентични (CTRL+E)." #: Synchronizer/synchronizergui.cpp:1277 #: Synchronizer/synchronizergui.cpp~:1277 -#, fuzzy +#, kde-format msgid "Show excluded files (CTRL+D)." -msgstr "Обозначава отхвърлените файлове." +msgstr "Обозначава отхвърлените файлове (CTRL+D)." #: Synchronizer/synchronizergui.cpp:1287 #: Synchronizer/synchronizergui.cpp~:1287 -#, fuzzy +#, kde-format msgid "Show files marked to <i>Copy from right to left</i> (CTRL+R)." -msgstr "Обозначава файловете, ма\xD1\x80кирани за <i>копиране от дясно на ляво</i>." +msgstr "" +"Обозначава файловете, маркирани за <i>копиране от дясно на ляво</i> (CTRL+R)." #: Synchronizer/synchronizergui.cpp:1297 #: Synchronizer/synchronizergui.cpp~:1297 -#, fuzzy +#, kde-format msgid "Show files marked to delete. (CTRL+T)" -msgstr "Обозначава файловете, маркирани за изтриване." +msgstr "Обозначава файловете, маркирани за изтриване. (CTRL+T)" #: Synchronizer/synchronizergui.cpp:1302 #: Synchronizer/synchronizergui.cpp~:1302 +#, kde-format msgid "Duplicates" msgstr "Дупликати" #: Synchronizer/synchronizergui.cpp:1307 #: Synchronizer/synchronizergui.cpp~:1307 +#, kde-format msgid "Show files that exist on both sides." msgstr "Обозначава файловете, които съществуват и от двете страни." #: Synchronizer/synchronizergui.cpp:1311 #: Synchronizer/synchronizergui.cpp~:1311 +#, kde-format msgid "Singles" msgstr "Единични" #: Synchronizer/synchronizergui.cpp:1316 #: Synchronizer/synchronizergui.cpp~:1316 +#, kde-format msgid "Show files that exist on one side only." msgstr "Обозначава файловете, които съществуват само от едната страна." #: Synchronizer/synchronizergui.cpp:1325 #: Synchronizer/synchronizergui.cpp~:1325 +#, kde-format msgid "The compare results of the synchronizer (CTRL+M)." -msgstr "" +msgstr "Резултатите от сравняването със синхронизатора (CTRL+M)." #: Synchronizer/synchronizergui.cpp:1334 Synchronizer/synchronizergui.cpp:1340 #: Synchronizer/synchronizergui.cpp~:1334 @@ -937,6 +1104,7 @@ #: MountMan/kmountmangui.cpp:125 Panel/krdetailedview.cpp:108 #: Panel/krbriefview.cpp:156 Search/krsearchdialog.cpp:71 #: Search/krsearchdialog.cpp~:71 +#, kde-format msgid "Name" msgstr "Име" @@ -945,6 +1113,7 @@ #: Synchronizer/synchronizergui.cpp~:1339 Filter/advancedfilter.cpp:63 #: Panel/krdetailedview.cpp:111 Panel/krdetailedview.cpp:1484 #: Search/krsearchdialog.cpp:73 Search/krsearchdialog.cpp~:73 +#, kde-format msgid "Size" msgstr "Размер" @@ -953,94 +1122,109 @@ #: Synchronizer/synchronizergui.cpp~:1338 DiskUsage/dulistview.cpp:60 #: Filter/advancedfilter.cpp:115 Search/krsearchdialog.cpp:74 #: Search/krsearchdialog.cpp~:74 +#, kde-format msgid "Date" msgstr "Дата" #: Synchronizer/synchronizergui.cpp:1337 #: Synchronizer/synchronizergui.cpp~:1337 +#, kde-format msgid "<=>" msgstr "<=>" #: Synchronizer/synchronizergui.cpp:1384 #: Synchronizer/synchronizergui.cpp~:1384 +#, kde-format msgid "&Synchronizer" msgstr "&Синхронизатор" #: Synchronizer/synchronizergui.cpp:1395 #: Synchronizer/synchronizergui.cpp~:1395 +#, kde-format msgid "&Options" msgstr "&Настройки" #: Synchronizer/synchronizergui.cpp:1402 #: Synchronizer/synchronizergui.cpp~:1402 +#, kde-format msgid "Parallel threads:" msgstr "Успоредни нишки" #: Synchronizer/synchronizergui.cpp:1412 #: Synchronizer/synchronizergui.cpp~:1412 +#, kde-format msgid "Equality threshold:" msgstr "Праг на еднаквост:" #: Synchronizer/synchronizergui.cpp:1420 Synchronizer/synchronizergui.cpp:1435 #: Synchronizer/synchronizergui.cpp~:1420 #: Synchronizer/synchronizergui.cpp~:1435 +#, kde-format msgid "sec" msgstr "сек" #: Synchronizer/synchronizergui.cpp:1421 Synchronizer/synchronizergui.cpp:1436 #: Synchronizer/synchronizergui.cpp~:1421 #: Synchronizer/synchronizergui.cpp~:1436 +#, kde-format msgid "min" msgstr "мин" #: Synchronizer/synchronizergui.cpp:1422 Synchronizer/synchronizergui.cpp:1437 #: Synchronizer/synchronizergui.cpp~:1422 #: Synchronizer/synchronizergui.cpp~:1437 +#, kde-format msgid "hour" msgstr "час" #: Synchronizer/synchronizergui.cpp:1423 Synchronizer/synchronizergui.cpp:1438 #: Synchronizer/synchronizergui.cpp~:1423 #: Synchronizer/synchronizergui.cpp~:1438 +#, kde-format msgid "day" msgstr "ден" #: Synchronizer/synchronizergui.cpp:1426 #: Synchronizer/synchronizergui.cpp~:1426 +#, kde-format msgid "Time shift (right-left):" msgstr "Смяна на време (ляво-дясно):" #: Synchronizer/synchronizergui.cpp:1445 #: Synchronizer/synchronizergui.cpp~:1445 -#, fuzzy +#, kde-format msgid "Ignore hidden files" -msgstr "Показване на скритите файлове" +msgstr "Игнориране на скритите файлове" #: Synchronizer/synchronizergui.cpp:1459 #: Synchronizer/synchronizergui.cpp~:1459 +#, kde-format msgid "Profile manager (Ctrl+P)." -msgstr "" +msgstr "Управление на профилите (Ctrl+P)." #: Synchronizer/synchronizergui.cpp:1466 #: Synchronizer/synchronizergui.cpp~:1466 -#, fuzzy +#, kde-format msgid "Swap sides (Ctrl+S)." -msgstr "Разменяне на страните." +msgstr "Разменяне на страните (Ctrl+S)." #: Synchronizer/synchronizergui.cpp:1477 #: Synchronizer/synchronizergui.cpp~:1477 +#, kde-format msgid "Compare" msgstr "Сравняване" #: Synchronizer/synchronizergui.cpp:1486 Synchronizer/synchronizergui.cpp:2443 #: Synchronizer/synchronizergui.cpp~:1486 #: Synchronizer/synchronizergui.cpp~:2443 +#, kde-format msgid "Quiet" msgstr "Тих" #: Synchronizer/synchronizergui.cpp:1488 Synchronizer/synchronizergui.cpp:2445 #: Synchronizer/synchronizergui.cpp~:1488 #: Synchronizer/synchronizergui.cpp~:2445 +#, kde-format msgid "Scroll Results" msgstr "Преглед на резултатите" @@ -1048,6 +1232,7 @@ #: Synchronizer/synchronizergui.cpp~:1492 Locate/locate.cpp:121 #: Locate/locate.cpp:284 Locate/locate.cpp~:121 Locate/locate.cpp~:284 #: Search/krsearchdialog.cpp:232 Search/krsearchdialog.cpp~:233 +#, kde-format msgid "Stop" msgstr "Стоп" @@ -1055,11 +1240,13 @@ #: Synchronizer/synchronizergui.cpp~:1497 Locate/locate.cpp:332 #: Locate/locate.cpp~:332 Search/krsearchdialog.cpp:221 #: Search/krsearchdialog.cpp~:222 +#, kde-format msgid "Feed to listbox" msgstr "Извеждане в списък" #: Synchronizer/synchronizergui.cpp:1503 #: Synchronizer/synchronizergui.cpp~:1503 +#, kde-format msgid "Synchronize" msgstr "Синхронизация" @@ -1067,164 +1254,169 @@ #: Synchronizer/synchronizergui.cpp~:1508 Konfigurator/konfigurator.cpp:73 #: UserAction/kraction.cpp:59 Search/krsearchdialog.cpp:236 #: Search/krsearchdialog.cpp~:237 +#, kde-format msgid "Close" msgstr "Затваряне" #: Synchronizer/synchronizergui.cpp:1623 #: Synchronizer/synchronizergui.cpp~:1623 -#, fuzzy +#, kde-format msgid "Selected files from targ&et directory:" -msgstr "Избрани файлове от директория-цел:" +msgstr "Избрани файлове от директория &цел:" #: Synchronizer/synchronizergui.cpp:1624 #: Synchronizer/synchronizergui.cpp~:1624 -#, fuzzy +#, kde-format msgid "Selected files from sou&rce directory:" -msgstr "Избрани файлове от директория-източник:" +msgstr "Избрани файлове от директория и&зточник:" #: Synchronizer/synchronizergui.cpp:1628 #: Synchronizer/synchronizergui.cpp~:1628 -#, fuzzy +#, kde-format msgid "Selected files from &left directory:" -msgstr "Избрани файлове от лявата директория:" +msgstr "Избрани файлове от &лявата директория:" #: Synchronizer/synchronizergui.cpp:1629 #: Synchronizer/synchronizergui.cpp~:1629 -#, fuzzy +#, kde-format msgid "Selected files from &right directory:" -msgstr "Избрани файлове от дясната директория:" +msgstr "Избрани файлове от &дясната директория:" #: Synchronizer/synchronizergui.cpp:1633 #: Synchronizer/synchronizergui.cpp~:1633 -#, fuzzy +#, kde-format msgid "Targ&et directory:" -msgstr "Директория назначен\xD0\xB8е:" +msgstr "Директория &цел:" #: Synchronizer/synchronizergui.cpp:1634 #: Synchronizer/synchronizergui.cpp~:1634 -#, fuzzy +#, kde-format msgid "Sou&rce directory:" -msgstr "Директория източник:" +msgstr "Директория и&зточник:" #: Synchronizer/synchronizergui.cpp:1638 #: Synchronizer/synchronizergui.cpp~:1638 -#, fuzzy +#, kde-format msgid "&Left directory:" -msgstr "Лява директория:" +msgstr "&Лява директория:" #: Synchronizer/synchronizergui.cpp:1639 #: Synchronizer/synchronizergui.cpp~:1639 -#, fuzzy +#, kde-format msgid "&Right directory:" -msgstr "Дясна директория:" +msgstr "&Дясна директория:" #: Synchronizer/synchronizergui.cpp:1674 #: Synchronizer/synchronizergui.cpp~:1674 +#, kde-format msgid "URL must be the descendant of either the left or the right base URL!" msgstr "URL-а трябва да произлиза от левият или десният базов URL!" #: Synchronizer/synchronizergui.cpp:1739 #: Synchronizer/synchronizergui.cpp~:1739 +#, kde-format msgid "Synchronize Directories" msgstr "Синхронизация на директории" #: Synchronizer/synchronizergui.cpp:1741 #: Synchronizer/synchronizergui.cpp~:1741 -#, fuzzy +#, kde-format msgid "E&xclude" -msgstr "Изключване" +msgstr "Изкл&ючване" #: Synchronizer/synchronizergui.cpp:1743 #: Synchronizer/synchronizergui.cpp~:1743 -#, fuzzy +#, kde-format msgid "Restore ori&ginal operation" -msgstr "Възстановяване първоначалното действие" +msgstr "Възстановяване първона&чалното действие" #: Synchronizer/synchronizergui.cpp:1745 #: Synchronizer/synchronizergui.cpp~:1745 -#, fuzzy +#, kde-format msgid "Re&verse direction" -msgstr "Смяна на посоката" +msgstr "С&мяна на посоката" #: Synchronizer/synchronizergui.cpp:1747 #: Synchronizer/synchronizergui.cpp~:1747 -#, fuzzy +#, kde-format msgid "Copy from &right to left" -msgstr "Копиране от дясно на ляво" +msgstr "Копиране от &дясно на ляво" #: Synchronizer/synchronizergui.cpp:1749 #: Synchronizer/synchronizergui.cpp~:1749 -#, fuzzy +#, kde-format msgid "Copy from &left to right" -msgstr "Копиране от ляво на дясно" +msgstr "Копиране от &ляво на дясно" #: Synchronizer/synchronizergui.cpp:1751 #: Synchronizer/synchronizergui.cpp~:1751 -#, fuzzy +#, kde-format msgid "&Delete (left single)" -msgstr "Изтриване (остава единичен)" +msgstr "&Изтриване (остава единичен)" #: Synchronizer/synchronizergui.cpp:1756 #: Synchronizer/synchronizergui.cpp~:1756 -#, fuzzy +#, kde-format msgid "V&iew left file" -msgstr "Преглед левия файл" +msgstr "Пре&глед левия файл" #: Synchronizer/synchronizergui.cpp:1759 #: Synchronizer/synchronizergui.cpp~:1759 -#, fuzzy +#, kde-format msgid "Vi&ew right file" -msgstr "Преглед десния файл" +msgstr "Пр&еглед десния файл" #: Synchronizer/synchronizergui.cpp:1762 #: Synchronizer/synchronizergui.cpp~:1762 -#, fuzzy +#, kde-format msgid "&Compare Files" -msgstr "Сравняване на файлове" +msgstr "&Сравняване на файлове" #: Synchronizer/synchronizergui.cpp:1768 #: Synchronizer/synchronizergui.cpp~:1768 -#, fuzzy +#, kde-format msgid "C&opy selected to clipboard (left)" -msgstr "Копиране на действията в клипборда" +msgstr "К&опиране на избраните в клипборда (отляво)" #: Synchronizer/synchronizergui.cpp:1770 #: Synchronizer/synchronizergui.cpp~:1770 -#, fuzzy +#, kde-format msgid "Co&py selected to clipboard (right)" -msgstr "Копиране на действията в клипборда" +msgstr "Коп&иране на избраните в клипборда (отдясно)" #: Synchronizer/synchronizergui.cpp:1775 #: Synchronizer/synchronizergui.cpp~:1775 -#, fuzzy +#, kde-format msgid "&Select items" -msgstr "Избор на обекти" +msgstr "И&збор на обекти" #: Synchronizer/synchronizergui.cpp:1777 #: Synchronizer/synchronizergui.cpp~:1777 -#, fuzzy +#, kde-format msgid "Deselec&t items" -msgstr "Отказ на избора на обекти" +msgstr "От&каз на избора на обекти" #: Synchronizer/synchronizergui.cpp:1779 #: Synchronizer/synchronizergui.cpp~:1779 -#, fuzzy +#, kde-format msgid "I&nvert selection" -msgstr "Инвертиране избора" +msgstr "И&нвертиране избора" #: Synchronizer/synchronizergui.cpp:1790 #: Synchronizer/synchronizergui.cpp~:1790 -#, fuzzy +#, kde-format msgid "Synchronize with &KGet" -msgstr "Синхронизация с KGet" +msgstr "Син&хронизация с KGet" #: Synchronizer/synchronizergui.cpp:1858 #: Synchronizer/synchronizergui.cpp~:1858 +#, kde-format msgid "Select items" msgstr "Избор на обекти" #: Synchronizer/synchronizergui.cpp:1859 #: Synchronizer/synchronizergui.cpp~:1859 +#, kde-format msgid "Deselect items" msgstr "Отказ на избора на обекти" @@ -1235,47 +1427,53 @@ #: Synchronizer/synchronizergui.cpp~:2108 #: Synchronizer/synchronizergui.cpp~:2115 Panel/krdetailedviewitem.cpp:79 #: Panel/krdetailedviewitem.cpp:113 +#, kde-format msgid "<DIR>" msgstr "<DIR>" #: Synchronizer/synchronizergui.cpp:2210 #: Synchronizer/synchronizergui.cpp~:2210 +#, kde-format msgid "Synchronizer has nothing to do!" msgstr "Синхронизатора няма какво да направи!" #: Synchronizer/synchronizergui.cpp:2331 #: Synchronizer/synchronizergui.cpp~:2331 +#, kde-format msgid "" "The synchronizer window contains data from a previous compare. If you exit, " "this data will be lost. Do you really want to exit?" msgstr "" +"В прозореца на синхронизаторът има данни от предишно сравняване. Ако го " +"затворите, тези данни ще бъдат загубени. Искате ли да продължите?" #: Synchronizer/synchronizertask.cpp:134 Synchronizer/synchronizertask.cpp:141 -#, qt-format +#, kde-format msgid "Error at opening %1!" msgstr "Грешка при отваряне на %1!" #: Synchronizer/synchronizertask.cpp:302 -#, qt-format +#, kde-format msgid "IO error at comparing file %1 with %2!" msgstr "В/И грешка при сравняване на файла %1 с %2!" #: Synchronizer/synchronizertask.cpp:338 -#, qt-format +#, kde-format msgid "Comparing file %1 (%2)..." msgstr "Сравняване на файл %1 (%2)..." #: Synchronizer/synchronizerdirlist.cpp:120 VFS/normal_vfs.cpp:101 -#, qt-format +#, kde-format msgid "Can't open the %1 directory!" msgstr "Не може да се влезе в директория %1!" #: Synchronizer/synchronizedialog.cpp:50 +#, kde-format msgid "Krusader::Synchronize" msgstr "Синхронизация с Krusader" #: Synchronizer/synchronizedialog.cpp:57 -#, qt-format +#, kde-format msgid "Right to left: Copy 1 file" msgid_plural "Right to left: Copy %1 files" msgstr[0] "_n: Отдясно на ляво: копиране на 1 файл" @@ -1283,7 +1481,7 @@ #: Synchronizer/synchronizedialog.cpp:58 Synchronizer/synchronizedialog.cpp:71 #: Synchronizer/synchronizedialog.cpp:84 -#, qt-format +#, kde-format msgid "(1 byte)" msgid_plural "(%1 bytes)" msgstr[0] "_n: (1 байт)" @@ -1291,152 +1489,169 @@ #: Synchronizer/synchronizedialog.cpp:64 Synchronizer/synchronizedialog.cpp:77 #: Synchronizer/synchronizedialog.cpp:90 -#, fuzzy, qt-format +#, fuzzy, kde-format msgid "Ready: %2/1 file, %3/%4" msgid_plural "Ready: %2/%1 files, %3/%4" msgstr[0] "_n: Готов: %2/1 файл, %4/%5" msgstr[1] "Готови: %2/%1 файла, %4/%5" #: Synchronizer/synchronizedialog.cpp:70 -#, qt-format +#, kde-format msgid "Left to right: Copy 1 file" msgid_plural "Left to right: Copy %1 files" msgstr[0] "_n: От ляво на дясно: копиране на 1 файл" msgstr[1] "От ляво на дясно: копиране на %1 файла" #: Synchronizer/synchronizedialog.cpp:83 -#, qt-format +#, kde-format msgid "Left: Delete 1 file" msgid_plural "Left: Delete %1 files" msgstr[0] "_n: Отляво: изтриване на 1 файл" msgstr[1] "Отляво: изтриване на %1 файла" #: Synchronizer/synchronizedialog.cpp:108 +#, kde-format msgid "Confirm overwrites" msgstr "Потвърждаване презапис" #: Synchronizer/synchronizedialog.cpp:117 -#, fuzzy +#, kde-format msgid "&Start" -msgstr "Старт" +msgstr "&Старт" #: Synchronizer/synchronizedialog.cpp:122 -#, fuzzy +#, kde-format msgid "&Pause" -msgstr "Пауза" +msgstr "&Пауза" #: Synchronizer/synchronizedialog.cpp:126 MountMan/kmountmangui.cpp:72 +#, kde-format msgid "&Close" msgstr "&Затваряне" #: Synchronizer/synchronizedialog.cpp:169 #: Synchronizer/synchronizedialog.cpp:172 #: Synchronizer/synchronizedialog.cpp:175 -#, qt-format +#, kde-format msgid "\tReady: %1/%2 files, %3/%4" msgstr "\tГотово: %1/%2 файла, %3/%4" #: Synchronizer/synchronizedialog.cpp:197 Synchronizer/synchronizer.cpp:1365 #: Synchronizer/synchronizer.cpp:1378 +#, kde-format msgid "Pause" msgstr "Пауза" #: Synchronizer/synchronizedialog.cpp:205 Synchronizer/synchronizer.cpp:1380 +#, kde-format msgid "Resume" msgstr "Възобновяване" #: Synchronizer/feedtolistboxdialog.cpp:56 +#, kde-format msgid "Krusader::Feed to listbox" msgstr "Krusader::Извеждане в списък" #: Synchronizer/feedtolistboxdialog.cpp:96 +#, kde-format msgid "No elements to feed!" msgstr "Няма нищо за извеждане!" #: Synchronizer/feedtolistboxdialog.cpp:110 +#, kde-format msgid "Synchronize results" msgstr "Резултати от синхронизацията" #: Synchronizer/feedtolistboxdialog.cpp:121 Locate/locate.cpp:633 #: Locate/locate.cpp~:632 Search/krsearchdialog.cpp:632 #: Search/krsearchdialog.cpp~:633 +#, kde-format msgid "Here you can name the file collection" msgstr "Тук можете да дадете име на файловата колекция" #: Synchronizer/feedtolistboxdialog.cpp:132 +#, kde-format msgid "Side to feed:" msgstr "Страна за извеждане:" #: Synchronizer/feedtolistboxdialog.cpp:138 +#, kde-format msgid "Left" msgstr "Лява" #: Synchronizer/feedtolistboxdialog.cpp:139 +#, kde-format msgid "Right" msgstr "Десна" #: Synchronizer/feedtolistboxdialog.cpp:140 +#, kde-format msgid "Both" msgstr "Двете" #: Synchronizer/feedtolistboxdialog.cpp:157 +#, kde-format msgid "Selected files only" msgstr "Само избраните файлове" #: Synchronizer/feedtolistboxdialog.cpp:208 -#, qt-format +#, kde-format msgid "Cannot open %1!" msgstr "Невъзможно отв\xD0\xB0ряне на %1!" #: Synchronizer/synchronizer.cpp:175 Synchronizer/synchronizer.cpp:670 -#, qt-format +#, kde-format msgid "Number of files: %1" msgstr "Брой файлове: %1" #: Synchronizer/synchronizer.cpp:206 -#, qt-format +#, kde-format msgid "Number of compared directories: %1" msgstr "Брой на сравнени директории: %1" #: Synchronizer/synchronizer.cpp:1172 Synchronizer/synchronizer.cpp:1185 +#, kde-format msgid "File Already Exists" msgstr "Файла вече съществува" #: Synchronizer/synchronizer.cpp:1230 Synchronizer/synchronizer.cpp:1234 -#, qt-format +#, kde-format msgid "Error at copying file %1 to %2!" msgstr "Грешка при копиране на файл %1 в %2!" #: Synchronizer/synchronizer.cpp:1238 -#, qt-format +#, kde-format msgid "Error at deleting file %1!" msgstr "Грешка при изтриване на файла %1!" #: Synchronizer/synchronizer.cpp:1416 +#, kde-format msgid "Krusader::Synchronizer" msgstr "Синхронизатор в Krusader" #: Synchronizer/synchronizer.cpp:1417 +#, kde-format msgid "Feeding the URLs to Kget" msgstr "Подаване на URL-и към kget" #: Synchronizer/synchronizer.cpp:1466 krslots.cpp:117 krslots.cpp:188 #: krslots.cpp:443 krslots.cpp:481 krslots.cpp:499 -#, fuzzy, qt-format +#, fuzzy, kde-format msgid "Error executing %1!" msgstr "Грешка при изпълнение " #: Splitter/combiner.cpp:63 +#, kde-format msgid "Krusader::Combining..." msgstr "Обединяване с Krusader" #: Splitter/combiner.cpp:64 -#, qt-format +#, kde-format msgid "Combining the file %1..." msgstr "Обединяване на файла %1..." #: Splitter/combiner.cpp:74 -#, qt-format +#, kde-format msgid "" "The CRC information file (%1) is missing!\n" "Validity checking is impossible without it. Continue combining?" @@ -1445,15 +1660,17 @@ "Без него проверката е невъзможна. Да продължи ли обединяването?" #: Splitter/combiner.cpp:112 -#, qt-format +#, kde-format msgid "Error at reading the CRC file (%1)!" msgstr "Грешка при четене на CRC файла (%1)!" #: Splitter/combiner.cpp:146 +#, kde-format msgid "Not a valid CRC file!" msgstr "Невалиден CRC файл!" #: Splitter/combiner.cpp:154 +#, kde-format msgid "" "Validity checking is impossible without a good CRC file. Continue combining?" msgstr "" @@ -1461,256 +1678,311 @@ "обединяването?" #: Splitter/combiner.cpp:258 -#, qt-format +#, kde-format msgid "Can't open the first split file of %1!" msgstr "Първият файл от разделения %1 файл не може да се отвори!" #: Splitter/combiner.cpp:270 +#, kde-format msgid "Incorrect filesize! The file might have been corrupted!" msgstr "Неправилен размер на файла! Файлът може да е повреден!" #: Splitter/combiner.cpp:272 +#, kde-format msgid "Incorrect CRC checksum! The file might have been corrupted!" msgstr "Неправилна CRC контролна сума! Файлът може да е повреден!" #: Splitter/combiner.cpp:298 Splitter/splitter.cpp:203 -#, qt-format +#, kde-format msgid "Error writing file %1!" msgstr "Грешка при записване на файла %1!" #: Splitter/splitter.cpp:71 +#, kde-format msgid "Krusader::Splitting..." msgstr "Разделяне с Krusader" #: Splitter/splitter.cpp:72 -#, qt-format +#, kde-format msgid "Splitting the file %1..." msgstr "Разделяне на файла %1..." #: Splitter/splitter.cpp:76 +#, kde-format msgid "Can't split a directory!" msgstr "Не може да се разделя директория!" #: Splitter/splitter.cpp:127 -#, qt-format +#, kde-format msgid "Error reading file %1!" msgstr "Грешка при четене на файла %1!" #: Splitter/splitter.cpp:246 -#, qt-format +#, kde-format msgid "Error at writing file %1!" msgstr "Грешка при записване на файла %1!" #: Splitter/splittergui.cpp:44 +#, kde-format msgid "1.44 MB (3.5\")" msgstr "1.44 MB (3.5\")" #: Splitter/splittergui.cpp:45 +#, kde-format msgid "1.2 MB (5.25\")" msgstr "1.2 MB (5.25\")" #: Splitter/splittergui.cpp:46 +#, kde-format msgid "720 kB (3.5\")" msgstr "720 kB (3.5\")" #: Splitter/splittergui.cpp:47 +#, kde-format msgid "360 kB (5.25\")" msgstr "360 kB (5.25\")" #: Splitter/splittergui.cpp:48 +#, kde-format msgid "100 MB (ZIP)" msgstr "100 MB (ZIP)" #: Splitter/splittergui.cpp:49 +#, kde-format msgid "250 MB (ZIP)" msgstr "250 MB (ZIP)" #: Splitter/splittergui.cpp:50 +#, kde-format msgid "650 MB (CD-R)" msgstr "650 MB (CD-R)" #: Splitter/splittergui.cpp:51 +#, kde-format msgid "700 MB (CD-R)" msgstr "700 MB (CD-R)" #: Splitter/splittergui.cpp:66 -#, qt-format +#, kde-format msgid "Split the file %1 to directory:" msgstr "Разделяне на файлът %1 в директория:" #: Splitter/splittergui.cpp:82 +#, kde-format msgid "User Defined" msgstr "Друг размер" #: Splitter/splittergui.cpp:91 +#, kde-format msgid "Max file size:" msgstr "Maкс. размер на файла:" #: Splitter/splittergui.cpp:100 +#, kde-format msgid "Byte" msgstr "Байт" #: Splitter/splittergui.cpp:101 +#, kde-format msgid "kByte" msgstr "КБайт" #: Splitter/splittergui.cpp:102 +#, kde-format msgid "MByte" msgstr "МБайт" #: Splitter/splittergui.cpp:103 +#, kde-format msgid "GByte" msgstr "ГБайт" #: Splitter/splittergui.cpp:122 +#, kde-format msgid "&Split" msgstr "&Разделяне" #: Splitter/splittergui.cpp:131 +#, kde-format msgid "Krusader::Splitter" msgstr "Разделяне с Krusader" #: Splitter/splittergui.cpp:207 +#, kde-format msgid "The directory path URL is malformed!" msgstr "URL на пътят до директорията е неверен!" #: Konfigurator/konfiguratoritems.cpp:545 +#, kde-format msgid "Custom color" msgstr "Потребителски цветове" #: Konfigurator/konfiguratoritems.cpp:546 GUI/krremoteencodingmenu.cpp:132 +#, kde-format msgid "Default" msgstr "По подразбиране" #: Konfigurator/konfiguratoritems.cpp:554 +#, kde-format msgid "Red" msgstr "Червен" #: Konfigurator/konfiguratoritems.cpp:555 +#, kde-format msgid "Green" msgstr "Зелен" #: Konfigurator/konfiguratoritems.cpp:556 +#, kde-format msgid "Blue" msgstr "Син" #: Konfigurator/konfiguratoritems.cpp:557 +#, kde-format msgid "Cyan" msgstr "Циан" #: Konfigurator/konfiguratoritems.cpp:558 +#, kde-format msgid "Magenta" msgstr "Магента" #: Konfigurator/konfiguratoritems.cpp:559 +#, kde-format msgid "Yellow" msgstr "Жълт" #: Konfigurator/konfiguratoritems.cpp:560 +#, kde-format msgid "Dark Red" msgstr "Тъмночервен" #: Konfigurator/konfiguratoritems.cpp:561 +#, kde-format msgid "Dark Green" msgstr "Тъмнозелен" #: Konfigurator/konfiguratoritems.cpp:562 +#, kde-format msgid "Dark Blue" msgstr "Тъмносин" #: Konfigurator/konfiguratoritems.cpp:563 +#, kde-format msgid "Dark Cyan" msgstr "Тъмен циан" #: Konfigurator/konfiguratoritems.cpp:564 +#, kde-format msgid "Dark Magenta" msgstr "Тъмна магента" #: Konfigurator/konfiguratoritems.cpp:565 +#, kde-format msgid "Dark Yellow" msgstr "Тъмножълт" #: Konfigurator/konfiguratoritems.cpp:566 +#, kde-format msgid "White" msgstr "Бяло" #: Konfigurator/konfiguratoritems.cpp:567 +#, kde-format msgid "Light Gray" msgstr "Светлосиво" #: Konfigurator/konfiguratoritems.cpp:568 +#, kde-format msgid "Gray" msgstr "Сиво" #: Konfigurator/konfiguratoritems.cpp:569 +#, kde-format msgid "Dark Gray" msgstr "Тъмносиво" #: Konfigurator/konfiguratoritems.cpp:570 +#, kde-format msgid "Black" msgstr "Черно" #: Konfigurator/krresulttable.cpp:125 +#, kde-format msgid "unarj not found, but arj found, which will be used for unpacking" msgstr "" "unarj не е намерен, но arj е наличен и ще бъде използван за разархивиране" #: Konfigurator/krresulttable.cpp:131 +#, kde-format msgid "rpm found, but cpio not found which is required for unpacking" msgstr "rpm е намерен, но необходимия за разархивиране cpio липсва" #: Konfigurator/krresulttable.cpp:134 Konfigurator/krresulttable.cpp:287 +#, kde-format msgid "Found" msgstr "Намерен" #: Konfigurator/krresulttable.cpp:135 +#, kde-format msgid "Packing" msgstr "Архивиране" #: Konfigurator/krresulttable.cpp:136 +#, kde-format msgid "Unpacking" msgstr "Разархивиране" #: Konfigurator/krresulttable.cpp:137 +#, kde-format msgid "Note" msgstr "Забележка" #: Konfigurator/krresulttable.cpp:200 Konfigurator/krresulttable.cpp:214 #: Konfigurator/krresulttable.cpp:367 +#, kde-format msgid "enabled" msgstr "включен" #: Konfigurator/krresulttable.cpp:203 Konfigurator/krresulttable.cpp:217 #: Konfigurator/krresulttable.cpp:370 +#, kde-format msgid "disabled" msgstr "изключен" #: Konfigurator/krresulttable.cpp:280 +#, kde-format msgid "diff utility" msgstr "помощна програма diff" #: Konfigurator/krresulttable.cpp:281 +#, kde-format msgid "email client" msgstr "пощенски клиент" #: Konfigurator/krresulttable.cpp:282 +#, kde-format msgid "batch renamer" msgstr "пакетно преименуване" #: Konfigurator/krresulttable.cpp:283 +#, kde-format msgid "checksum utility" msgstr "помощна програма за контролна сума" #: Konfigurator/krresulttable.cpp:285 DiskUsage/dulistview.cpp:63 #: Panel/krdetailedview.cpp:116 Panel/krdetailedview.cpp:1509 +#, kde-format msgid "Group" msgstr "Група" #: Konfigurator/krresulttable.cpp:286 +#, kde-format msgid "Tool" msgstr "Инструмент" #: Konfigurator/krresulttable.cpp:288 +#, kde-format msgid "Status" msgstr "Състояние" @@ -1718,14 +1990,17 @@ #: Konfigurator/kgadvanced.cpp:48 Konfigurator/kgdependencies.cpp:58 #: Konfigurator/konfigurator.cpp:107 Konfigurator/kglookfeel.cpp:264 #: Konfigurator/kgarchives.cpp:51 Konfigurator/kggeneral.cpp:56 +#, kde-format msgid "General" msgstr "Основни" #: Konfigurator/kgcolors.cpp:61 +#, kde-format msgid "Use the default KDE colors" msgstr "Използване на цветовете на KDE" #: Konfigurator/kgcolors.cpp:61 +#, kde-format msgid "" "<p>Use KDE's global color configuration.</p><p><i>KDE Control Center -> " "Appearance & Themes -> Colors</i></p>" @@ -1734,10 +2009,12 @@ "Appearance & Themes -> Colors</i></p>" #: Konfigurator/kgcolors.cpp:62 +#, kde-format msgid "Use alternate background color" msgstr "Редуващ се фонов цвят" #: Konfigurator/kgcolors.cpp:62 +#, kde-format msgid "" "<p>The <b>background color</b> and the <b>alternate background</b> color " "alternates line by line.</p><p>When you don't use the <i>KDE default colors</" @@ -1748,10 +2025,12 @@ "можете да настроите тази подредба.</p>" #: Konfigurator/kgcolors.cpp:63 +#, kde-format msgid "Show current item even if not focused" msgstr "Показване на текущият обект, дори и да не е под маркера" #: Konfigurator/kgcolors.cpp:63 +#, kde-format msgid "" "<p>Shows the last cursor position in the non active list panel.</p><p>This " "option is only available when you don't use the <i>KDE default colors</i>.</" @@ -1761,10 +2040,12 @@ "настройка е достъпна само ако не използвате <i>цветовете на KDE</i>.</p>" #: Konfigurator/kgcolors.cpp:64 +#, kde-format msgid "Dim the colors of the inactive panel" msgstr "Избледняване на цветовете в неактивния панел" #: Konfigurator/kgcolors.cpp:64 +#, kde-format msgid "" "<p>The colors of the inactive panel are calculated by a dim color and a dim " "factor.</p>" @@ -1774,97 +2055,120 @@ #: Konfigurator/kgcolors.cpp:82 Konfigurator/kgcolors.cpp:224 #: Konfigurator/konfigurator.cpp:105 +#, kde-format msgid "Colors" msgstr "Цветове" #: Konfigurator/kgcolors.cpp:92 +#, kde-format msgid "Active" msgstr "Активни" #: Konfigurator/kgcolors.cpp:98 +#, kde-format msgid "Transparent" msgstr "Прозрачен" #: Konfigurator/kgcolors.cpp:100 Konfigurator/kgcolors.cpp:135 +#, kde-format msgid "Foreground:" msgstr "Текст:" #: Konfigurator/kgcolors.cpp:101 Konfigurator/kgcolors.cpp:137 +#, kde-format msgid "Directory foreground:" msgstr "Директория:" #: Konfigurator/kgcolors.cpp:101 Konfigurator/kgcolors.cpp:102 #: Konfigurator/kgcolors.cpp:103 Konfigurator/kgcolors.cpp:104 #: Konfigurator/kgcolors.cpp:136 +#, kde-format msgid "Same as foreground" msgstr "Както текста" #: Konfigurator/kgcolors.cpp:102 Konfigurator/kgcolors.cpp:138 +#, kde-format msgid "Executable foreground:" msgstr "Изпълними файлове:" #: Konfigurator/kgcolors.cpp:103 Konfigurator/kgcolors.cpp:139 +#, kde-format msgid "Symbolic link foreground:" msgstr "Символни връзки:" #: Konfigurator/kgcolors.cpp:104 Konfigurator/kgcolors.cpp:140 +#, kde-format msgid "Invalid symlink foreground:" msgstr "Невалидни симвръзки:" #: Konfigurator/kgcolors.cpp:105 Konfigurator/kgcolors.cpp:141 +#, kde-format msgid "Background:" msgstr "Фон:" #: Konfigurator/kgcolors.cpp:106 Konfigurator/kgcolors.cpp:142 +#, kde-format msgid "Same as background" msgstr "Също като маркиран фон" #: Konfigurator/kgcolors.cpp:107 Konfigurator/kgcolors.cpp:143 +#, kde-format msgid "Alternate background:" msgstr "Редуващ се цвят:" #: Konfigurator/kgcolors.cpp:108 Konfigurator/kgcolors.cpp:144 +#, kde-format msgid "Selected foreground:" msgstr "Маркиран текст:" #: Konfigurator/kgcolors.cpp:109 Konfigurator/kgcolors.cpp:145 +#, kde-format msgid "Selected background:" msgstr "Маркиран фон:" #: Konfigurator/kgcolors.cpp:110 Konfigurator/kgcolors.cpp:146 +#, kde-format msgid "Same as alt. background" msgstr "Като маркиран ред. фон" #: Konfigurator/kgcolors.cpp:111 Konfigurator/kgcolors.cpp:148 +#, kde-format msgid "Alternate selected background:" msgstr "Редуване на маркиран фон:" #: Konfigurator/kgcolors.cpp:111 Konfigurator/kgcolors.cpp:147 +#, kde-format msgid "Same as selected background" msgstr "Като маркиран фон" #: Konfigurator/kgcolors.cpp:112 Konfigurator/kgcolors.cpp:149 +#, kde-format msgid "Current foreground:" msgstr "Текущ текс... [truncated message content] |
From: <ck...@us...> - 2008-04-20 20:35:44
|
Revision: 2758 http://krusader.svn.sourceforge.net/krusader/?rev=2758&view=rev Author: ckarai Date: 2008-04-20 13:35:51 -0700 (Sun, 20 Apr 2008) Log Message: ----------- Slaves don't use support libs any more Modified Paths: -------------- trunk/krusader_kde4/CMakeLists.txt trunk/krusader_kde4/iso/CMakeLists.txt trunk/krusader_kde4/iso/iso.cpp trunk/krusader_kde4/iso/kiso.cpp trunk/krusader_kde4/iso/kisofile.cpp trunk/krusader_kde4/iso/qfilehack.cpp trunk/krusader_kde4/krArc/CMakeLists.txt trunk/krusader_kde4/krArc/krarc.cpp trunk/krusader_kde4/krArc/krarc.h trunk/krusader_kde4/krusader/CMakeLists.txt Modified: trunk/krusader_kde4/CMakeLists.txt =================================================================== --- trunk/krusader_kde4/CMakeLists.txt 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/CMakeLists.txt 2008-04-20 20:35:51 UTC (rev 2758) @@ -5,7 +5,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) -add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT=1 -DKDE3_SUPPORT=1) +add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions( -DVERSION='"2.0-alpha"' ) add_definitions( -DRELEASE_NAME='"Initial version."' ) Modified: trunk/krusader_kde4/iso/CMakeLists.txt =================================================================== --- trunk/krusader_kde4/iso/CMakeLists.txt 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/iso/CMakeLists.txt 2008-04-20 20:35:51 UTC (rev 2758) @@ -1,4 +1,3 @@ - include( libisofs/CMakeLists.txt ) include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) @@ -15,7 +14,7 @@ kde4_add_plugin(kio_iso ${kio_iso_PART_SRCS} ${libisofs_SRCS} ) -target_link_libraries(kio_iso ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ) +target_link_libraries(kio_iso ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ) install(TARGETS kio_iso DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: trunk/krusader_kde4/iso/iso.cpp =================================================================== --- trunk/krusader_kde4/iso/iso.cpp 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/iso/iso.cpp 2008-04-20 20:35:51 UTC (rev 2758) @@ -132,7 +132,7 @@ fullPath += '/'; kDebug() << "the full path is " << fullPath << endl; - while ( (pos=fullPath.find( '/', pos+1 )) != -1 ) + while ( (pos=fullPath.indexOf( '/', pos+1 )) != -1 ) { QString tryPath = fullPath.left( pos ); kDebug() << fullPath << " trying " << tryPath << endl; Modified: trunk/krusader_kde4/iso/kiso.cpp =================================================================== --- trunk/krusader_kde4/iso/kiso.cpp 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/iso/kiso.cpp 2008-04-20 20:35:51 UTC (rev 2758) @@ -134,16 +134,20 @@ QFile file( filename ); if ( file.open( QIODevice::ReadOnly ) ) { - unsigned char firstByte = file.getch(); - unsigned char secondByte = file.getch(); - unsigned char thirdByte = file.getch(); - if ( firstByte == 0037 && secondByte == 0213 ) + char firstByte; + char secondByte; + char thirdByte; + file.getChar( &firstByte ); + file.getChar( &secondByte ); + file.getChar( &thirdByte ); + if ( firstByte == 0037 && secondByte == (char)0213 ) mimetype = "application/x-gzip"; else if ( firstByte == 'B' && secondByte == 'Z' && thirdByte == 'h' ) mimetype = "application/x-bzip2"; else if ( firstByte == 'P' && secondByte == 'K' && thirdByte == 3 ) { - unsigned char fourthByte = file.getch(); + char fourthByte; + file.getChar( &fourthByte ); if ( fourthByte == 4 ) mimetype = "application/x-zip"; } @@ -195,7 +199,7 @@ QIODevice* dev = ( static_cast<KIso*> (udata) )->device(); - if (dev->at(start<<11)) { + if (dev->seek(start<<11)) { if ((dev->read(buf, len<<11)) != -1) return (len); } kDebug() << "KIso::ReadRequest failed start: " << start << " len: " << len << endl; @@ -262,7 +266,7 @@ if (idr->name[i]) path+=(idr->name[i]); } } - if (path.endsWith(".")) path.setLength(path.length()-1); + if (path.endsWith(".")) path.resize(path.length()-1); } } if (iso->showrr) FreeRR(&rr); @@ -358,7 +362,7 @@ /* We'll use the permission and user/group of the 'host' file except * in Rock Ridge, where the permissions are stored on the file system */ - if (::stat( m_filename.local8Bit(), &buf )<0) { + if (::stat( m_filename.toLocal8Bit(), &buf )<0) { /* defaults, if stat fails */ memset(&buf,0,sizeof(struct stat)); buf.st_mode=0777; @@ -380,7 +384,7 @@ root=rootDir(); if (trackno>1) { path=QString(); - QTextOStream(&path) << "Track " << tracks[(i<<1)+1]; + QTextStream(&path) << "Track " << tracks[(i<<1)+1]; root = new KIsoDirectory( this, path, access | S_IFDIR, buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, QString() ); rootDir()->addEntry(root); @@ -415,7 +419,7 @@ idr=(struct iso_directory_record*) &( ((struct iso_primary_descriptor*) &desc->data)->root_directory_record); joliet = JolietLevel(&desc->data); if (joliet) { - QTextOStream(&path) << "Joliet level " << joliet; + QTextStream(&path) << "Joliet level " << joliet; if (c_j>1) path += " (" + QString::number(c_j) + ")"; } else { path = "ISO9660"; Modified: trunk/krusader_kde4/iso/kisofile.cpp =================================================================== --- trunk/krusader_kde4/iso/kisofile.cpp 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/iso/kisofile.cpp 2008-04-20 20:35:51 UTC (rev 2758) @@ -42,7 +42,7 @@ QByteArray r; int rlen; - if ( archive()->device()->at(position()+pos) ) { + if ( archive()->device()->seek(position()+pos) ) { r.resize( ((pos+count) < size()) ? count : size()-pos); if( r.size() ) { Modified: trunk/krusader_kde4/iso/qfilehack.cpp =================================================================== --- trunk/krusader_kde4/iso/qfilehack.cpp 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/iso/qfilehack.cpp 2008-04-20 20:35:51 UTC (rev 2758) @@ -30,11 +30,11 @@ bool ret; #ifdef __linux__ - m |= IO_Async; //On linux, set O_NONBLOCK, opens CD-ROMs faster +// m |= IO_Async; //On linux, set O_NONBLOCK, opens CD-ROMs faster #endif ret=QFile::open(m); - if (ret && isSequential() ) { - setOpenMode( m | (QFile::OpenMode)IO_Direct); - } +// if (ret && isSequential() ) { +// setOpenMode( m | (QFile::OpenMode)IO_Direct); +// } return ret; } Modified: trunk/krusader_kde4/krArc/CMakeLists.txt =================================================================== --- trunk/krusader_kde4/krArc/CMakeLists.txt 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/krArc/CMakeLists.txt 2008-04-20 20:35:51 UTC (rev 2758) @@ -8,7 +8,7 @@ kde4_add_plugin(kio_krarc ${kio_krarc_PART_SRCS}) -target_link_libraries(kio_krarc ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ) +target_link_libraries(kio_krarc ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ) install(TARGETS kio_krarc DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: trunk/krusader_kde4/krArc/krarc.cpp =================================================================== --- trunk/krusader_kde4/krArc/krarc.cpp 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/krArc/krarc.cpp 2008-04-20 20:35:51 UTC (rev 2758) @@ -34,12 +34,13 @@ #include <kcomponentdata.h> #include <klocale.h> #include <kurl.h> -#include <k3tempfile.h> +#include <ktemporaryfile.h> #include <kde_file.h> #include <kstandarddirs.h> #include <kio/job.h> #include <kio/jobclasses.h> #include <ktar.h> +#include <kprocess.h> #include <iostream> #include "krarc.h" @@ -99,19 +100,18 @@ /* ---------------------------------------------------------------------------------- */ kio_krarcProtocol::~kio_krarcProtocol(){ // delete the temp directory - KrShellProcess proc; - proc << "rm -rf "<< arcTempDir; - proc.start(K3Process::Block); + KProcess proc; + proc << fullPathName( "rm" ) << "-rf" << arcTempDir; + proc.start(); + proc.waitForFinished(); } /* ---------------------------------------------------------------------------------- */ -void kio_krarcProtocol::receivedData(K3Process*,char* buf,int len){ - QByteArray d(len); - d.setRawData(buf,len); - data(d); - d.resetRawData(buf,len); - processedSize(len); - decompressedLen += len; +void kio_krarcProtocol::receivedData(KProcess *, QByteArray &d){ + QByteArray buf( d ); + data(buf); + processedSize(d.length()); + decompressedLen += d.length(); } void kio_krarcProtocol::mkdir(const KUrl& url,int permissions){ @@ -144,28 +144,29 @@ //QString tmpDir = arcTempDir+url.path(); QString arcDir = findArcDirectory(url); - QString tmpDir = arcTempDir + arcDir.mid(1) + url.path().mid(url.path().findRev("/")+1); + QString tmpDir = arcTempDir + arcDir.mid(1) + url.path().mid(url.path().lastIndexOf("/")+1); if( tmpDir.right(1) != "/" ) tmpDir = tmpDir+"/"; if( permissions == -1 ) permissions = 0777; //set default permissions - for( int i=arcTempDir.length();i<tmpDir.length(); i=tmpDir.find("/",i+1)){ - ::mkdir(tmpDir.left(i).local8Bit(),permissions); + for( int i=arcTempDir.length();i<tmpDir.length(); i=tmpDir.indexOf("/",i+1)){ + ::mkdir(tmpDir.left(i).toLocal8Bit(),permissions); } if( tmpDir.endsWith( "/" ) ) tmpDir.truncate( tmpDir.length() - 1 ); // pack the directory - KrShellProcess proc; - proc << putCmd << convertName( arcFile->url().path() ) + " " << convertFileName( tmpDir.mid(arcTempDir.length()) ); + KrLinecountingProcess proc; + proc << putCmd << arcFile->url().path() << tmpDir.mid(arcTempDir.length() ); infoMessage(i18n("Creating %1 ...", url.fileName() ) ); QDir::setCurrent(arcTempDir); - proc.start(K3Process::Block,K3Process::AllOutput); + proc.start(); + proc.waitForFinished(); // delete the temp directory QDir().rmdir(arcTempDir); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) { + if( proc.exitStatus() != QProcess::NormalExit || !checkStatus( proc.exitCode() ) ) { error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() ); return; } @@ -201,18 +202,18 @@ } QString arcDir = findArcDirectory(url); - QString tmpFile = arcTempDir + arcDir.mid(1) + url.path().mid(url.path().findRev("/")+1); + QString tmpFile = arcTempDir + arcDir.mid(1) + url.path().mid(url.path().lastIndexOf("/")+1); QString tmpDir = arcTempDir+arcDir.mid(1); if( !tmpDir.endsWith( "/" ) ) tmpDir += "/"; - for( int i=arcTempDir.length();i<tmpDir.length(); i=tmpDir.find("/",i+1)){ + for( int i=arcTempDir.length();i<tmpDir.length(); i=tmpDir.indexOf("/",i+1)){ QDir("/").mkdir(tmpDir.left(i)); } int fd; if ( resume ) { - fd = KDE_open( tmpFile.local8Bit(), O_RDWR ); // append if resuming + fd = KDE_open( tmpFile.toLocal8Bit(), O_RDWR ); // append if resuming KDE_lseek(fd, 0, SEEK_END); // Seek to end } else { // WABA: Make sure that we keep writing permissions ourselves, @@ -223,7 +224,7 @@ else initialMode = 0666; - fd = KDE_open(tmpFile.local8Bit(), O_CREAT | O_TRUNC | O_WRONLY, initialMode); + fd = KDE_open(tmpFile.toLocal8Bit(), O_CREAT | O_TRUNC | O_WRONLY, initialMode); } QByteArray buffer; int readResult; @@ -234,15 +235,17 @@ } while( readResult > 0 ); ::close(fd); // pack the file - KrShellProcess proc; - proc << putCmd << convertName( arcFile->url().path() )+ " " <<convertFileName( tmpFile.mid(arcTempDir.length()) ); + KrLinecountingProcess proc; + proc << putCmd << arcFile->url().path() << tmpFile.mid(arcTempDir.length()); infoMessage(i18n("Packing %1 ...", url.fileName() ) ); QDir::setCurrent(arcTempDir); - proc.start(K3Process::Block,K3Process::AllOutput); + proc.start(); + proc.waitForFinished(); + // remove the file QFile::remove(tmpFile); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) { + if( proc.exitStatus() != QProcess::NormalExit || !checkStatus( proc.exitCode() ) ) { error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() ); return; } @@ -285,10 +288,14 @@ KIO::filesize_t expectedSize = KFileItem(*entry,url).size(); // for RPM files extract the cpio file first if( !extArcReady && arcType == "rpm"){ - KrShellProcess cpio; - cpio << "rpm2cpio" << convertName( arcFile->url().path(KUrl::RemoveTrailingSlash) ) << " > " << arcTempDir+"contents.cpio"; - cpio.start(K3Process::Block,K3Process::AllOutput); - if( !cpio.normalExit() || cpio.exitStatus() != 0 ) { + KrLinecountingProcess cpio; + cpio << "rpm2cpio" << arcFile->url().path(KUrl::RemoveTrailingSlash); + cpio.setStandardOutputFile( arcTempDir+"contents.cpio" ); + + cpio.start(); + cpio.waitForFinished(); + + if( cpio.exitStatus() != QProcess::NormalExit || !checkStatus( cpio.exitCode() ) ) { error(ERR_COULD_NOT_READ,url.path() + "\n\n" + cpio.getErrorMsg() ); return; } @@ -296,10 +303,14 @@ } // for DEB files extract the tar file first if ( !extArcReady && arcType == "deb" ) { - KrShellProcess dpkg; - dpkg << cmd + " --fsys-tarfile" << convertName( arcFile->url().path( KUrl::RemoveTrailingSlash ) ) << " > " << arcTempDir + "contents.cpio"; - dpkg.start( K3Process::Block, K3Process::AllOutput ); - if( !dpkg.normalExit() || dpkg.exitStatus() != 0 ) { + KrLinecountingProcess dpkg; + dpkg << cmd << "--fsys-tarfile" << arcFile->url().path( KUrl::RemoveTrailingSlash ); + dpkg.setStandardOutputFile( arcTempDir + "contents.cpio" ); + + dpkg.start(); + dpkg.waitForFinished(); + + if( dpkg.exitStatus() != QProcess::NormalExit || !checkStatus( dpkg.exitCode() ) ) { error(ERR_COULD_NOT_READ,url.path() + "\n\n" + dpkg.getErrorMsg() ); return; } @@ -308,13 +319,13 @@ // Use the external unpacker to unpack the file QString file = url.path().mid(arcFile->url().path().length()+1); - KrShellProcess proc; + KrLinecountingProcess proc; if( extArcReady ){ - proc << getCmd << arcTempDir+"contents.cpio " << convertName( "*"+file ); + proc << getCmd << arcTempDir+"contents.cpio" << "*"+file; } else if( arcType == "arj" || arcType == "ace" || arcType == "7z" ) { - proc << getCmd << convertName( arcFile->url().path(KUrl::RemoveTrailingSlash) )+ " " << convertFileName( file ); + proc << getCmd << arcFile->url().path(KUrl::RemoveTrailingSlash) << file; if( arcType == "ace" && QFile( "/dev/ptmx" ).exists() ) // Don't remove, unace crashes if missing!!! - proc << "<" << "/dev/ptmx"; + proc.setStandardInputFile("/dev/ptmx"); file = url.fileName(); decompressToFile = true; } else { @@ -324,18 +335,19 @@ KMimeType::Ptr mt = KMimeType::findByUrl( arcTempDir+file, 0, false /* NOT local URL */ ); if( mt ) emit mimeType( mt->name() ); - proc << getCmd << convertName( arcFile->url().path() )+" "; - if( arcType != "gzip" && arcType != "bzip2" ) proc << convertFileName( file ); - connect(&proc,SIGNAL(receivedStdout(K3Process*,char*,int)), - this,SLOT(receivedData(K3Process*,char*,int)) ); + proc << getCmd << arcFile->url().path(); + if( arcType != "gzip" && arcType != "bzip2" ) proc << file; + connect(&proc,SIGNAL(newOutputData(KProcess *, QByteArray &)), + this,SLOT(receivedData(KProcess *, QByteArray &)) ); } infoMessage(i18n("Unpacking %1 ...", url.fileName() ) ); // change the working directory to our arcTempDir QDir::setCurrent(arcTempDir); - proc.start(K3Process::Block,K3Process::AllOutput); + proc.start(); + proc.waitForFinished(); if( !extArcReady && !decompressToFile ) { - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) || ( arcType != "bzip2" && expectedSize != decompressedLen ) ) { + if( proc.exitStatus() != QProcess::NormalExit || !checkStatus( proc.exitCode() ) || ( arcType != "bzip2" && expectedSize != decompressedLen ) ) { if( encrypted && tries ) { invalidatePassword(); get( url, tries - 1 ); @@ -346,7 +358,7 @@ } } else{ - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) || !QFileInfo( arcTempDir+file ).exists() ) { + if( proc.exitStatus() != QProcess::NormalExit || !checkStatus( proc.exitCode() ) || !QFileInfo( arcTempDir+file ).exists() ) { if( decompressToFile ) QFile(arcTempDir+file).remove(); if( encrypted && tries ) { @@ -392,11 +404,7 @@ QString resumeOffset = metaData("resume"); if ( !resumeOffset.isEmpty() ){ bool ok; -#if QT_VERSION >= 0x030200 KIO::fileoffset_t offset = resumeOffset.toLongLong(&ok); -#else - KIO::fileoffset_t offset = resumeOffset.toULong(&ok); -#endif if (ok && (offset > 0) && (offset < buff.st_size)){ if (KDE_lseek(fd, offset, SEEK_SET) == offset){ canResume (); @@ -408,7 +416,6 @@ totalSize( buff.st_size ); char buffer[ MAX_IPC_SIZE ]; - QByteArray array; while( 1 ){ int n = ::read( fd, buffer, MAX_IPC_SIZE ); if (n == -1){ @@ -421,9 +428,10 @@ if (n == 0) break; // Finished - array.setRawData(buffer, n); - data( array ); - array.resetRawData(buffer, n); + { + QByteArray array = QByteArray::fromRawData( buffer, n); + data( array ); + } processed_size += n; } @@ -470,11 +478,12 @@ if( !isFile && file.right(1) != "/" ) { if(arcType == "zip") file = file + "/"; } - KrShellProcess proc; - proc << delCmd << convertName( arcFile->url().path() )+" " << convertFileName( file ); + KrLinecountingProcess proc; + proc << delCmd << arcFile->url().path() << file; infoMessage(i18n("Deleting %1 ...", url.fileName() ) ); - proc.start(K3Process::Block, K3Process::AllOutput); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) { + proc.start(); + proc.waitForFinished(); + if( proc.exitStatus() != QProcess::NormalExit || !checkStatus( proc.exitCode() ) ) { error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() ); return; } @@ -510,7 +519,7 @@ // we might be stating a real file if( QFileInfo(path).exists() ){ KDE_struct_stat buff; - KDE_stat( path.local8Bit(), &buff ); + KDE_stat( path.toLocal8Bit(), &buff ); QString mime; KMimeType::Ptr result = KMimeType::findByPath(path,buff.st_mode); if( result ) @@ -560,21 +569,23 @@ QString destDir = dest.path( KUrl::RemoveTrailingSlash ); if( !QDir( destDir ).exists() ) { - int ndx = destDir.findRev( '/' ); + int ndx = destDir.lastIndexOf( '/' ); if( ndx != -1 ) destDir.truncate( ndx+1 ); } - QDir::setCurrent( destDir.local8Bit() ); + QDir::setCurrent( destDir.toLocal8Bit() ); - KrShellProcess proc; - proc << copyCmd << convertName( arcFile->url().path(KUrl::RemoveTrailingSlash) )+" " << convertFileName( file ); + KrLinecountingProcess proc; + proc << copyCmd << arcFile->url().path(KUrl::RemoveTrailingSlash) << file; if( arcType == "ace" && QFile( "/dev/ptmx" ).exists() ) // Don't remove, unace crashes if missing!!! - proc << "<" << "/dev/ptmx"; + proc.setStandardInputFile("/dev/ptmx"); + proc.setOutputChannelMode(KProcess::SeparateChannels); // without this output redirection has no effect infoMessage(i18n("Unpacking %1 ...", url.fileName() ) ); - proc.start(K3Process::Block, K3Process::AllOutput); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) { + proc.start(); + proc.waitForFinished(); + if( proc.exitStatus() != QProcess::NormalExit || !checkStatus( proc.exitCode() ) ) { error(KIO::ERR_COULD_NOT_WRITE, dest.path(KUrl::RemoveTrailingSlash) + "\n\n" + proc.getErrorMsg() ); return; } @@ -623,7 +634,7 @@ return; } QString arcDir = path.mid(arcFile->url().path().length()); - arcDir.truncate(arcDir.findRev("/")); + arcDir.truncate(arcDir.lastIndexOf("/")); if(arcDir.right(1) != "/") arcDir = arcDir+"/"; if( dirDict.find(arcDir) == dirDict.end() ) { @@ -666,11 +677,11 @@ } QString newPath = path; if(newPath.right(1) != "/") newPath = newPath+"/"; - for(int pos=0; pos >= 0; pos = newPath.find("/",pos+1)){ + for(int pos=0; pos >= 0; pos = newPath.indexOf("/",pos+1)){ QFileInfo qfi(newPath.left(pos)); if( qfi.exists() && !qfi.isDir() ){ KDE_struct_stat stat_p; - KDE_lstat(newPath.left(pos).local8Bit(),&stat_p); + KDE_lstat(newPath.left(pos).toLocal8Bit(),&stat_p); arcFile = new KFileItem(KUrl( newPath.left(pos) ),QString(),stat_p.st_mode); break; } @@ -702,7 +713,7 @@ if( arcType.isEmpty() ) { arcType = arcFile->mimetype(); - arcType = arcType.mid(arcType.findRev("-")+1); + arcType = arcType.mid(arcType.lastIndexOf("-")+1); if( arcType == "jar" ) arcType = "zip"; @@ -723,18 +734,31 @@ return false; /* if the archive was changed refresh the file information */ // write the temp file - KrShellProcess proc; - K3TempFile temp( QString(), "tmp" ); - temp.setAutoDelete(true); + KrLinecountingProcess proc; + KTemporaryFile temp; + + // parse the temp file + if (!temp.open()) { + error(ERR_COULD_NOT_READ,temp.fileName() ); + return false; + } + if( arcType != "bzip2" ){ - if( arcType == "rpm" ) - proc << listCmd << convertName( arcPath ) <<" > " << temp.name(); - else - proc << listCmd << convertName( arcFile->url().path(KUrl::RemoveTrailingSlash) ) <<" > " << temp.name(); + if( arcType == "rpm" ) { + proc << listCmd << arcPath; + proc.setStandardOutputFile( temp.fileName() ); + } + else { + proc << listCmd << arcFile->url().path(KUrl::RemoveTrailingSlash); + proc.setStandardOutputFile( temp.fileName() ); + } if( arcType == "ace" && QFile( "/dev/ptmx" ).exists() ) // Don't remove, unace crashes if missing!!! - proc << "<" << "/dev/ptmx"; - proc.start(K3Process::Block,K3Process::AllOutput); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) return false; + proc.setStandardInputFile( "/dev/ptmx" ); + + proc.setOutputChannelMode(KProcess::SeparateChannels); // without this output redirection has no effect + proc.start(); + proc.waitForFinished(); + if( proc.exitStatus() != QProcess::NormalExit || !checkStatus( proc.exitCode() ) ) return false; } // clear the dir dictionary @@ -757,12 +781,10 @@ if( arcType == "bzip2" ){ KRDEBUG("Got me here..."); - parseLine(0,"",temp.file()); + parseLine(0,""); return true; } - // parse the temp file - temp.file()->open(QIODevice::ReadOnly); char buf[1000]; QString line; @@ -770,12 +792,12 @@ bool invalidLine = false; // the rar list is started with a ------ line. if(arcType == "rar" || arcType == "arj" || arcType == "lha" || arcType == "7z" ){ - while(temp.file()->readLine(buf,1000) != -1){ + while(temp.readLine(buf,1000) != -1){ line = QString::fromLocal8Bit(buf); if( line.startsWith("----------") ) break; } } - while(temp.file()->readLine(buf,1000) != -1) { + while(temp.readLine(buf,1000) != -1) { line = QString::fromLocal8Bit(buf); if( arcType == "rar" ) { // the rar list is ended with a ------ line. @@ -786,7 +808,7 @@ if( invalidLine ) continue; else{ - temp.file()->readLine(buf,1000); + temp.readLine(buf,1000); line = line+QString::fromLocal8Bit(buf); if( line[0]=='*' ) // encrypted archives starts with '*' line[0]=' '; @@ -805,11 +827,11 @@ if( invalidLine ) continue; else { - temp.file()->readLine(buf,1000); + temp.readLine(buf,1000); line = line+QString::fromLocal8Bit(buf); - temp.file()->readLine(buf,1000); + temp.readLine(buf,1000); line = line+QString::fromLocal8Bit(buf); - temp.file()->readLine(buf,1000); + temp.readLine(buf,1000); line = line+QString::fromLocal8Bit(buf); } } @@ -817,10 +839,10 @@ // the arj list is ended with a ------ line. if( line.startsWith("----------") ) break; } - parseLine(lineNo++,line.trimmed(),temp.file()); + parseLine(lineNo++,line.trimmed()); } // close and delete our file - temp.file()->close(); + temp.close(); archiveChanged = false; return true; @@ -834,7 +856,7 @@ return QString(); } QString arcDir = path.mid(arcFile->url().path().length()); - arcDir.truncate(arcDir.findRev("/")); + arcDir.truncate(arcDir.lastIndexOf("/")); if(arcDir.right(1) != "/") arcDir = arcDir+"/"; return arcDir; @@ -853,7 +875,7 @@ if( arcFile->url().path(KUrl::RemoveTrailingSlash) == url.path(KUrl::RemoveTrailingSlash) ) name = "."; // the "/" case else{ if( name.right(1) == "/" ) name.truncate(name.length()-1); - name = name.mid(name.findRev("/")+1); + name = name.mid(name.lastIndexOf("/")+1); } UDSEntryList::iterator entry; @@ -868,7 +890,7 @@ QString kio_krarcProtocol::nextWord(QString &s,char d) { s=s.trimmed(); - int j=s.find(d,0); + int j=s.indexOf(d,0); QString temp=s.left(j); // find the leftmost word. s.remove(0,j); return temp; @@ -905,10 +927,10 @@ return itef.value(); // set dir to the parent dir - dir = addNewDir(path.left(path.findRev("/",-2)+1)); + dir = addNewDir(path.left(path.lastIndexOf("/",-2)+1)); // add a new entry in the parent dir - QString name = path.mid(path.findRev("/",-2)+1); + QString name = path.mid(path.lastIndexOf("/",-2)+1); name = name.left(name.length()-1); UDSEntry entry; @@ -928,7 +950,7 @@ return dir; } -void kio_krarcProtocol::parseLine(int lineNo, QString line, QFile*) { +void kio_krarcProtocol::parseLine(int lineNo, QString line) { UDSEntryList* dir; UDSEntry entry; @@ -1048,7 +1070,7 @@ nextWord(line); // full name fullName = nextWord(line); - fullName = fullName.mid(fullName.findRev("/")+1); + fullName = fullName.mid(fullName.lastIndexOf("/")+1); } if( arcType == "bzip2" ){ // There is no way to list bzip2 files, so we take our information from @@ -1070,7 +1092,7 @@ // ignore the next field nextWord(line); // date & time - int month = (QStringList::split(',', "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec")).findIndex( nextWord(line) ) + 1; + int month = ( QString("Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec").split(',') ).indexOf( nextWord(line) ) + 1; int day = nextWord(line).toInt(); int year = QDate::currentDate().year(); QString third = nextWord(line); @@ -1126,8 +1148,8 @@ fullName = nextWord( line, '\n' ).mid( 1 ); //if ( fullName.right( 1 ) == "/" ) return; if( fullName.contains("->") ){ - symlinkDest = fullName.mid(fullName.find("->")+2); - fullName = fullName.left(fullName.find("->")-1); + symlinkDest = fullName.mid(fullName.indexOf("->")+2); + fullName = fullName.left(fullName.indexOf("->")-1); } } if(arcType == "7z"){ @@ -1160,7 +1182,7 @@ if( fullName.right(1) == "/" ) fullName = fullName.left(fullName.length()-1); if( !fullName.startsWith("/") ) fullName = "/"+fullName; - QString path = fullName.left(fullName.findRev("/")+1); + QString path = fullName.left(fullName.lastIndexOf("/")+1); // set/create the directory UDSEntryList QHash<QString, KIO::UDSEntryList *>::iterator itef = dirDict.find( path ); if( itef == dirDict.end() ) @@ -1168,7 +1190,7 @@ else dir = itef.value(); - QString name = fullName.mid(fullName.findRev("/")+1); + QString name = fullName.mid(fullName.lastIndexOf("/")+1); // file name entry.insert( KIO::UDSEntry::UDS_NAME, name ); // file type @@ -1221,136 +1243,135 @@ bool kio_krarcProtocol::initArcParameters() { KRDEBUG("arcType: "<<arcType); + cmd = QString(); + listCmd = QStringList(); + getCmd = QStringList(); + copyCmd = QStringList(); + delCmd = QStringList(); + putCmd = QStringList(); + if(arcType == "zip"){ cmd = fullPathName( "unzip" ); - listCmd = fullPathName( "unzip" ) + " -ZTs-z-t-h "; - getCmd = fullPathName( "unzip" ) + " -p "; - copyCmd = fullPathName( "unzip" ) + " -jo "; + listCmd << fullPathName( "unzip" ) << "-ZTs-z-t-h"; + getCmd << fullPathName( "unzip" ) << "-p"; + copyCmd << fullPathName( "unzip" ) << "-jo"; if( KStandardDirs::findExe( "zip" ).isEmpty() ) { - delCmd = QString(); - putCmd = QString(); + delCmd = QStringList(); + putCmd = QStringList(); } else { - delCmd = fullPathName( "zip" ) + " -d "; - putCmd = fullPathName( "zip" ) + " -ry "; + delCmd << fullPathName( "zip" ) << "-d"; + putCmd << fullPathName( "zip" ) << "-ry"; } if( !getPassword().isEmpty() ) { - getCmd += "-P '"+password+"' "; - copyCmd += "-P '"+password+"' "; - putCmd += "-P '"+password+"' "; + getCmd << "-P" << password; + copyCmd << "-P" << password; + putCmd << "-P" << password; } } else if (arcType == "rar") { if( KStandardDirs::findExe( "rar" ).isEmpty() ) { cmd = fullPathName( "unrar" ); - listCmd = fullPathName( "unrar" ) + " -c- -v v "; - getCmd = fullPathName( "unrar" ) + " p -ierr -idp -c- -y "; - copyCmd = fullPathName( "unrar" ) + " e -y "; - delCmd = QString(); - putCmd = QString(); + listCmd << fullPathName( "unrar" ) << "-c-" << "-v" << "v"; + getCmd << fullPathName( "unrar" ) << "p" << "-ierr" << "-idp" << "-c-" << "-y"; + copyCmd << fullPathName( "unrar" ) << "e" << "-y"; + delCmd = QStringList(); + putCmd = QStringList(); } else { cmd = fullPathName( "rar" ); - listCmd = fullPathName( "rar" ) + " -c- -v v "; - getCmd = fullPathName( "rar" ) + " p -ierr -idp -c- -y "; - copyCmd = fullPathName( "rar" ) + " e -y "; - delCmd = fullPathName( "rar" ) + " d "; - putCmd = fullPathName( "rar" ) + " -r a "; + listCmd << fullPathName( "rar" ) << "-c-" << "-v" << "v"; + getCmd << fullPathName( "rar" ) << "p" << "-ierr" << "-idp" << "-c-" << "-y"; + copyCmd << fullPathName( "rar" ) << "e" << "-y"; + delCmd << fullPathName( "rar" ) << "d"; + putCmd << fullPathName( "rar" ) << "-r" << "a"; } if( !getPassword().isEmpty() ) { - getCmd += "-p'"+password+"' "; - listCmd += "-p'"+password+"' "; - copyCmd += "-p'"+password+"' "; + getCmd << QString("-p%1").arg(password); + listCmd << QString("-p%1").arg(password); + copyCmd << QString("-p%1").arg(password); if( !putCmd.isEmpty() ) { - putCmd += "-p'"+password+"' "; - delCmd += "-p'"+password+"' "; + putCmd << QString("-p%1").arg(password); + delCmd << QString("-p%1").arg(password); } } } else if(arcType == "rpm") { cmd = fullPathName( "rpm" ); - listCmd = fullPathName( "rpm" ) + " --dump -lpq "; - getCmd = fullPathName( "cpio" ) + " --force-local --no-absolute-filenames -iuvdF"; - delCmd = QString(); - putCmd = QString(); - copyCmd = QString(); + listCmd << fullPathName( "rpm" ) << "--dump" << "-lpq"; + getCmd << fullPathName( "cpio" ) << "--force-local" << "--no-absolute-filenames" << "-iuvdF"; + delCmd = QStringList(); + putCmd = QStringList(); + copyCmd = QStringList(); } else if(arcType == "gzip") { cmd = fullPathName( "gzip" ); - listCmd = fullPathName( "gzip" ) + " -l"; - getCmd = fullPathName( "gzip" ) + " -dc"; - copyCmd = QString(); - delCmd = QString(); - putCmd = QString(); + listCmd << fullPathName( "gzip" ) << "-l"; + getCmd << fullPathName( "gzip" ) << "-dc"; + copyCmd = QStringList(); + delCmd = QStringList(); + putCmd = QStringList(); } else if(arcType == "bzip2") { cmd = fullPathName( "bzip2" ); - listCmd = fullPathName( "bzip2" ); - getCmd = fullPathName( "bzip2" ) + " -dc"; - copyCmd = QString(); - delCmd = QString(); - putCmd = QString(); + listCmd << fullPathName( "bzip2" ); + getCmd << fullPathName( "bzip2" ) << "-dc"; + copyCmd = QStringList(); + delCmd = QStringList(); + putCmd = QStringList(); } else if(arcType == "arj"){ cmd = fullPathName( "arj" ); - listCmd = fullPathName( "arj" ) + " v -y -v "; - getCmd = fullPathName( "arj" ) + " -jyov -v e "; - copyCmd = fullPathName( "arj" ) + " -jyov -v e "; - delCmd = fullPathName( "arj" ) + " d "; - putCmd = fullPathName( "arj" ) + " -r a "; + listCmd << fullPathName( "arj" ) << "v" << "-y" << "-v"; + getCmd << fullPathName( "arj" ) << "-jyov" << "-v" << "e"; + copyCmd << fullPathName( "arj" ) << "-jyov" << "-v" << "e"; + delCmd << fullPathName( "arj" ) << "d"; + putCmd << fullPathName( "arj" ) << "-r" << "a"; if( !getPassword().isEmpty() ) { - getCmd += "-g'"+password+"' "; - copyCmd += "-g'"+password+"' "; - putCmd += "-g'"+password+"' "; + getCmd << QString("-g%1").arg(password); + copyCmd << QString("-g%1").arg(password); + putCmd << QString("-g%1").arg(password); } } else if(arcType == "lha") { cmd = fullPathName( "lha" ); - listCmd = fullPathName( "lha" ) + " l "; - getCmd = fullPathName( "lha" ) + " pq "; - copyCmd = fullPathName( "lha" ) + " eif "; - delCmd = fullPathName( "lha" ) + " d "; - putCmd = fullPathName( "lha" ) + " a "; + listCmd << fullPathName( "lha" ) << "l"; + getCmd << fullPathName( "lha" ) << "pq"; + copyCmd << fullPathName( "lha" ) << "eif"; + delCmd << fullPathName( "lha" ) << "d"; + putCmd << fullPathName( "lha" ) << "a"; } else if(arcType == "ace") { cmd = fullPathName( "unace" ); - listCmd = fullPathName( "unace" ) + " v"; - getCmd = fullPathName( "unace" ) + " e -o "; - copyCmd = fullPathName( "unace" ) + " e -o "; - delCmd = QString(); - putCmd = QString(); + listCmd << fullPathName( "unace" ) << "v"; + getCmd << fullPathName( "unace" ) << "e" << "-o"; + copyCmd << fullPathName( "unace" ) << "e" << "-o"; + delCmd = QStringList(); + putCmd = QStringList(); if( !getPassword().isEmpty() ) { - getCmd += "-p'"+password+"' "; - copyCmd += "-p'"+password+"' "; + getCmd << QString("-p%1").arg(password); + copyCmd << QString("-p%1").arg(password); } } else if ( arcType == "deb" ) { cmd = fullPathName("dpkg"); - listCmd = fullPathName("dpkg")+" -c"; - getCmd = fullPathName("tar")+" xvf "; - copyCmd = QString(); - delCmd = QString(); - putCmd = QString(); + listCmd << fullPathName("dpkg") << "-c"; + getCmd << fullPathName("tar") << "xvf"; + copyCmd = QStringList(); + delCmd = QStringList(); + putCmd = QStringList(); } else if (arcType == "7z") { cmd = fullPathName( "7z" ); if( KStandardDirs::findExe(cmd).isEmpty() ) cmd = fullPathName( "7za" ); - listCmd = cmd + " l -y "; - getCmd = cmd + " e -y "; - copyCmd = cmd + " e -y "; - delCmd = cmd + " d -y "; - putCmd = cmd + " a -y "; + listCmd << cmd << "l" << "-y"; + getCmd << cmd << "e" << "-y"; + copyCmd << cmd << "e" << "-y"; + delCmd << cmd << "d" << "-y"; + putCmd << cmd << "a" << "-y"; if( !getPassword().isEmpty() ) { - getCmd += "-p'"+password+"' "; - listCmd += "-p'"+password+"' "; - copyCmd += "-p'"+password+"' "; + getCmd << QString("-p%1").arg(password); + listCmd << QString("-p%1").arg(password); + copyCmd << QString("-p%1").arg(password); if( !putCmd.isEmpty() ) { - putCmd += "-p'"+password+"' "; - delCmd += "-p'"+password+"' "; + putCmd << QString("-p%1").arg(password); + delCmd << QString("-p%1").arg(password); } } } - else { - cmd = QString(); - listCmd = QString(); - getCmd = QString(); - copyCmd = QString(); - delCmd = QString(); - putCmd = QString(); - } if( KStandardDirs::findExe(cmd).isEmpty() ){ error( KIO::ERR_CANNOT_LAUNCH_PROCESS, @@ -1497,11 +1518,12 @@ QString testCmd = tester + " t -y "; lastData = encryptedArchPath = ""; - KrShellProcess proc; - proc << testCmd << convertName( fileName ); - connect( &proc, SIGNAL( receivedStdout(K3Process*,char*,int) ), - this, SLOT( checkOutputForPassword( K3Process*,char*,int ) ) ); - proc.start(K3Process::Block,K3Process::AllOutput); + KrLinecountingProcess proc; + proc << testCmd << fileName; + connect( &proc, SIGNAL( newOutputData(KProcess *, QByteArray &) ), + this, SLOT( checkOutputForPassword( KProcess *, QByteArray & ) ) ); + proc.start(); + proc.waitForFinished(); encrypted = this->encrypted; if( encrypted ) @@ -1534,19 +1556,16 @@ return QString(); } -void kio_krarcProtocol::checkOutputForPassword( K3Process *proc,char *buf,int len ) { - QByteArray d(len); - d.setRawData(buf,len); - QString data = QString( d ); - d.resetRawData(buf,len); +void kio_krarcProtocol::checkOutputForPassword( KProcess * proc, QByteArray & buf ) { + QString data = QString( buf ); QString checkable = lastData + data; - QStringList lines = QStringList::split( '\n', checkable ); + QStringList lines = checkable.split( '\n' ); lastData = lines[ lines.count() - 1 ]; for( int i=0; i != lines.count(); i++ ) { QString line = lines[ i ].trimmed().toLower(); - int ndx = line.find( "testing" ); + int ndx = line.indexOf( "testing" ); if( ndx >=0 ) line.truncate( ndx ); if( line.isEmpty() ) @@ -1617,34 +1636,29 @@ return password; } +QString kio_krarcProtocol::detectFullPathName(QString name) +{ + QStringList path = QString::fromLocal8Bit( getenv("PATH") ).split(":"); + + for ( QStringList::Iterator it = path.begin(); it != path.end(); ++it ) + { + if( QDir(*it).exists( name ) ) + { + QString dir = *it; + if( !dir.endsWith( "/" ) ) + dir+="/"; + + return dir+name; + } + } + return name; +} + QString kio_krarcProtocol::fullPathName( QString name ) { QString supposedName = confGrp.readEntry( name, name ); if( supposedName.isEmpty() ) - supposedName = name; - return escape( supposedName ); + supposedName = detectFullPathName( name ); + return supposedName; } -QString kio_krarcProtocol::convertFileName( QString name ) { - if( arcType == "zip" ) - name = name.replace( "[", "[[]" ); - return convertName( name ); -} - -QString kio_krarcProtocol::convertName( QString name ) { - if( !name.contains( '\'' ) ) - return "'" + name + "'"; - if( !name.contains( '"' ) && !name.contains( '$' ) ) - return "\"" + name + "\""; - return escape( name ); -} - -QString kio_krarcProtocol::escape( QString name ) { - const QString evilstuff = "\\\"'`()[]{}!?;$&<>| "; // stuff that should get escaped - - for ( int i = 0; i < evilstuff.length(); ++i ) - name.replace( evilstuff[ i ], ('\\' + evilstuff[ i ]) ); - - return name; -} - #include "krarc.moc" Modified: trunk/krusader_kde4/krArc/krarc.h =================================================================== --- trunk/krusader_kde4/krArc/krarc.h 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/krArc/krarc.h 2008-04-20 20:35:51 UTC (rev 2758) @@ -25,10 +25,9 @@ #include <kurl.h> #include <kio/global.h> #include <kio/slavebase.h> -#include <k3process.h> +#include <kprocess.h> #include <kconfiggroup.h> -class K3Process; class KFileItem; class QByteArray; @@ -46,25 +45,25 @@ virtual void copy (const KUrl &src, const KUrl &dest, int permissions, KIO::JobFlags flags); public slots: - void receivedData(K3Process* proc,char* buf,int len); - void checkOutputForPassword( K3Process*,char*,int ); + void receivedData(KProcess *, QByteArray &); + void checkOutputForPassword( KProcess *, QByteArray & ); protected: virtual bool initDirDict(const KUrl& url,bool forced = false); virtual bool initArcParameters(); QString detectArchive( bool &encrypted, QString fileName ); - virtual void parseLine(int lineNo, QString line, QFile* temp); + virtual void parseLine(int lineNo, QString line); virtual bool setArcFile(const KUrl& url); virtual QString getPassword(); virtual void invalidatePassword(); // archive specific commands - QString cmd; ///< the archiver name. - QString listCmd; ///< list files. - QString getCmd; ///< unpack files command. - QString delCmd; ///< delete files command. - QString putCmd; ///< add file command. - QString copyCmd; ///< copy to file command. + QString cmd; ///< the archiver name. + QStringList listCmd; ///< list files. + QStringList getCmd; ///< unpack files command. + QStringList delCmd; ///< delete files command. + QStringList putCmd; ///< add file command. + QStringList copyCmd; ///< copy to file command. private: void get(const KUrl& url, int tries); @@ -81,9 +80,7 @@ /** add a new directory (file list container). */ KIO::UDSEntryList* addNewDir(QString path); QString fullPathName( QString name ); - QString convertFileName( QString name ); - static QString convertName( QString name ); - static QString escape( QString name ); + static QString detectFullPathName( QString name ); QHash<QString, KIO::UDSEntryList *> dirDict; //< the directoris data structure. bool encrypted; //< tells whether the archive is encrypted @@ -104,40 +101,50 @@ QString encryptedArchPath; }; -class KrShellProcess : public K3ShellProcess { +class KrLinecountingProcess : public KProcess { Q_OBJECT public: - KrShellProcess() : K3ShellProcess(), errorMsg( QString() ), outputMsg( QString() ) { - connect(this,SIGNAL(receivedStderr(K3Process*,char*,int)), - this,SLOT(receivedErrorMsg(K3Process*,char*,int)) ); - connect(this,SIGNAL(receivedStdout(K3Process*,char*,int)), - this,SLOT(receivedOutputMsg(K3Process*,char*,int)) ); + KrLinecountingProcess() : KProcess() { + setOutputChannelMode(KProcess::SeparateChannels); // without this output redirection has no effect! + connect(this, SIGNAL(readyReadStandardError()), SLOT(receivedError()) ); + connect(this, SIGNAL(readyReadStandardOutput()), SLOT(receivedOutput()) ); } - + QString getErrorMsg() { - if( errorMsg.trimmed().isEmpty() ) - return outputMsg.right( 500 ); + if( errorData.trimmed().isEmpty() ) + return QString::fromLocal8Bit(outputData); else - return errorMsg.right( 500 ); + return QString::fromLocal8Bit(errorData); } public slots: - void receivedErrorMsg(K3Process*, char *buf, int len) { - errorMsg += QString::fromLocal8Bit( buf, len ); - if( errorMsg.length() > 500 ) - errorMsg = errorMsg.right( 500 ); - receivedOutputMsg( 0, buf, len ); + void receivedError() { + QByteArray newData(this->readAllStandardError()); + emit newErrorLines(newData.count('\n')); + errorData += newData; + if( errorData.length() > 500 ) + errorData = errorData.right( 500 ); + receivedOutput(newData); } - void receivedOutputMsg(K3Process*, char *buf, int len) { - outputMsg += QString::fromLocal8Bit( buf, len ); - if( outputMsg.length() > 500 ) - outputMsg = outputMsg.right( 500 ); + void receivedOutput(QByteArray newData = QByteArray()) { + if (newData.isEmpty()) + newData = this->readAllStandardOutput(); + emit newOutputLines(newData.count('\n')); + emit newOutputData( this, newData ); + outputData += newData; + if( outputData.length() > 500 ) + outputData = outputData.right( 500 ); } - + +signals: + void newOutputLines(int count); + void newErrorLines(int count); + void newOutputData( KProcess *, QByteArray & ); + private: - QString errorMsg; - QString outputMsg; + QByteArray errorData; + QByteArray outputData; }; #endif Modified: trunk/krusader_kde4/krusader/CMakeLists.txt =================================================================== --- trunk/krusader_kde4/krusader/CMakeLists.txt 2008-04-19 01:25:38 UTC (rev 2757) +++ trunk/krusader_kde4/krusader/CMakeLists.txt 2008-04-20 20:35:51 UTC (rev 2758) @@ -1,3 +1,4 @@ +add_definitions( -DQT3_SUPPORT=1 -DKDE3_SUPPORT=1) add_subdirectory( ActionMan ) add_subdirectory( BookMan ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |