Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Wed Jun 8 16:27:39 CEST 2011. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2011-04-28 18:13:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2011-06-02 19:53:37.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jun 2 19:53:30 CEST 2011 - dmueller@suse.de + +- update to 4.6.4 + * Bugfixes over KDE 4.6.3 + * see http://kde.org/announcements/changelogs/changelog4_6_3to4_6_4.php for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-runtime-4.6.3.tar.bz2 New: ---- kdebase-runtime-4.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.D3YuaM/_old 2011-06-08 16:27:01.000000000 +0200 +++ /var/tmp/diff_new_pack.D3YuaM/_new 2011-06-08 16:27:01.000000000 +0200 @@ -22,7 +22,7 @@ Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.6.3 +Version: 4.6.4 Release: 1 BuildRequires: libkde4-devel >= %version BuildRequires: NetworkManager-devel bluez-devel libqimageblitz-devel openslp-devel ++++++ kdebase-runtime-4.6.3.tar.bz2 -> kdebase-runtime-4.6.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/CMakeLists.txt new/kdebase-runtime-4.6.4/CMakeLists.txt --- old/kdebase-runtime-4.6.3/CMakeLists.txt 2011-04-28 15:19:33.000000000 +0200 +++ new/kdebase-runtime-4.6.4/CMakeLists.txt 2011-06-02 19:27:35.000000000 +0200 @@ -10,8 +10,8 @@ endif(WINCE) #search packages used by KDE -set(KDE_MIN_VERSION "4.6.3") # for the < 4.2 macro -find_package(KDE4 4.6.3 REQUIRED) +set(KDE_MIN_VERSION "4.6.4") # for the < 4.2 macro +find_package(KDE4 4.6.4 REQUIRED) find_package(Strigi REQUIRED) include(KDE4Defaults) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/activitymanager/kactivitymanagerd.desktop new/kdebase-runtime-4.6.4/activitymanager/kactivitymanagerd.desktop --- old/kdebase-runtime-4.6.3/activitymanager/kactivitymanagerd.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/activitymanager/kactivitymanagerd.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -62,7 +62,7 @@ Name[sv]=Aktivitetshanterare Name[tg]=Мудири фаъолият Name[th]=ตัวจัดการกิจกรรม -Name[tr]=Eylem Yöneticisi +Name[tr]=Etkinlik Yöneticisi Name[uk]=Керування просторами дій Name[wa]=Manaedjeu di l' activité Name[x-test]=xxActivity Managerxx Files old/kdebase-runtime-4.6.3/doc/documentationnotfound/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/documentationnotfound/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/glossary/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/glossary/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/attica/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/attica/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/bookmarks/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/bookmarks/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/cache/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/cache/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/componentchooser/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/componentchooser/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/cookies/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/cookies/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/ebrowsing/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/ebrowsing/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/emoticons/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/emoticons/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/filemanager/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/filemanager/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/filetypes/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/filetypes/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/history/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/history/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/icons/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/icons/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/kcmcgi/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/kcmcgi/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/kcmcss/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/kcmcss/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/kcmlaunch/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/kcmlaunch/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/kcmnotify/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/kcmnotify/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/kded/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/kded/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/khtml-adblock/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/khtml-adblock/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/khtml-behavior/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/khtml-behavior/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/khtml-general/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/khtml-general/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/khtml-java-js/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/khtml-java-js/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/khtml-plugins/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/khtml-plugins/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/language/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/language/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/nepomuk/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/nepomuk/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/netpref/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/netpref/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/performance/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/performance/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/phonon/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/phonon/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/proxy/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/proxy/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/smb/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/smb/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/solid-device-automounter/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/solid-device-automounter/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/spellchecking/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/spellchecking/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/trash/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/trash/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kcontrol/useragent/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kcontrol/useragent/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kdebugdialog/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kdebugdialog/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kdesu/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kdesu/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/khelpcenter/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/khelpcenter/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/bookmarks/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/bookmarks/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/bzip2/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/bzip2/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/cgi/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/cgi/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/finger/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/finger/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/fish/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/fish/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/floppy/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/floppy/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/gzip/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/gzip/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/info/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/info/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/man/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/man/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/nepomuksearch/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/nepomuksearch/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/network/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/network/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/nfs/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/nfs/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/sftp/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/sftp/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/smb/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/smb/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/tar/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/tar/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/thumbnail/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/thumbnail/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/kioslave/xz/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/kioslave/xz/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/knetattach/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/knetattach/index.cache.bz2 differ Files old/kdebase-runtime-4.6.3/doc/onlinehelp/index.cache.bz2 and new/kdebase-runtime-4.6.4/doc/onlinehelp/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/drkonqi/data/mappings new/kdebase-runtime-4.6.4/drkonqi/data/mappings --- old/kdebase-runtime-4.6.3/drkonqi/data/mappings 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/drkonqi/data/mappings 2011-06-02 19:27:34.000000000 +0200 @@ -105,6 +105,11 @@ nspluginscan=konqueror|nsplugins nspluginviewer=konqueror|nspluginviewer +# KDE Telepathy +telepathy-kde-contactlist=telepathy|contactlist +telepathy-kde-text-ui=telepathy|text-chat-ui +telepathy-kde-call-ui=telepathy|call-ui + #Other KDE Applications and Technologies ksysguardd=ksysguard|ksysguardd kmixctrl=kmix|general diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/drkonqi/reportassistantpages_bugzilla_duplicates.cpp new/kdebase-runtime-4.6.4/drkonqi/reportassistantpages_bugzilla_duplicates.cpp --- old/kdebase-runtime-4.6.3/drkonqi/reportassistantpages_bugzilla_duplicates.cpp 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/drkonqi/reportassistantpages_bugzilla_duplicates.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -622,18 +622,29 @@ } //Generate html for comments (with proper numbering) + QLatin1String duplicatesMark = QLatin1String("has been marked as a duplicate of this bug."); + QString comments; QStringList commentList = report.comments(); for (int i = 0; i < commentList.count(); i++) { QString comment = commentList.at(i); - comment.replace('\n', "<br />"); - comments += i18nc("comment $number to use as subtitle", "<h4>Comment %1:</h4>", (i+1)) - + "<p>" + comment + "</p><hr />"; + //Don't add duplicates mark comments + if (!comment.contains(duplicatesMark)) { + comment.replace('\n', "<br />"); + comments += i18nc("comment $number to use as subtitle", "<h4>Comment %1:</h4>", (i+1)) + + "<p>" + comment + "</p><hr />"; + //Count the inline attached crashes (DrKonqi feature) + QLatin1String attachedCrashMark = + QLatin1String("New crash information added by DrKonqi"); + if (comment.contains(attachedCrashMark)) { + m_duplicatesCount++; + } + } else { + //Count duplicate + m_duplicatesCount++; + } } - //Count duplicates (simple check) - m_duplicatesCount = comments.count("has been marked as a duplicate of this bug."); - //Generate a non-geek readable status QString customStatusString; if (report.bugStatus() == QLatin1String("UNCONFIRMED")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kcontrol/componentchooser/componentservices/kcm_browser.desktop new/kdebase-runtime-4.6.4/kcontrol/componentchooser/componentservices/kcm_browser.desktop --- old/kdebase-runtime-4.6.3/kcontrol/componentchooser/componentservices/kcm_browser.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kcontrol/componentchooser/componentservices/kcm_browser.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -145,7 +145,7 @@ Comment[tg]=Здесь можно настроить веб-браузер по умолчанию. Все приложения KDE, в которых можно вызвать гиперссылку, будут использовать этот параметр. Comment[th]=คุณสามารถปรับแต่งเว็บเบราว์เซอร์ปริยายของคุณได้ที่นี่ โปรแกรมของ KDE ทุกตัวที่คุณสามารถเลือกส่วนเชื่อมโยงได้ จะทำตามค่าที่ตั้งนี้ Comment[tr]=Burada öntanımlı web tarayıcınızı yapılandırabilirsiniz. Tüm KDE uygulamalarında bulunan bağlantılar bu seçenek kullanılarak açılacaktır. -Comment[uk]=Тут можна налаштувати ваш типовий навігатор інтернету. Всі програми KDE, які підтримують роботу з гіперпосиланнями, будуть користуватися вказаними тут параметрами. +Comment[uk]=Тут можна налаштувати ваш типову програму для перегляду сторінок інтернету. Всі програми KDE, які підтримують роботу з гіперпосиланнями, будуть користуватися вказаними тут параметрами. Comment[vi]=Dịch vụ này cho phép bạn cấu hình trình duyệt mạng mặc định. Tất cả các chương trình của KDE có chứa liên kết mạng sẽ cần một trình duyệt dựa vào thiết lập này. Comment[wa]=Vos ploz chal apontyî vosse prémetou betchteu waibe. Cwand vos tchoeziroz loyén dins telminme programe di KDE, i l' drovrè sorlon cisse tchuze. Comment[x-test]=xxHere you can configure your default web browser. All KDE applications in which you can select hyperlinks should honor this setting.xx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kcontrol/locale/kcmlocale.cpp new/kdebase-runtime-4.6.4/kcontrol/locale/kcmlocale.cpp --- old/kdebase-runtime-4.6.3/kcontrol/locale/kcmlocale.cpp 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kcontrol/locale/kcmlocale.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -410,19 +410,48 @@ // Throw away any unsaved changes then reload from file m_userConfig->markAsClean(); m_userConfig->reparseConfiguration(); - m_currentConfig->reparseConfiguration(); + + // Get the currently installed translations + m_installedTranslations.clear(); + m_installedTranslations = m_kcmLocale->installedLanguages(); + + // Check if any of the user requested translations are no longer installed + // If any missing remove them and save the settings, we'll tell the user later m_kcmTranslations.clear(); + QStringList missingLanguages; + QStringList userTranslations = m_userSettings.readEntry( "Language", QString() ).split( ':', QString::SkipEmptyParts ); + foreach ( const QString &languageCode, userTranslations ) { + if ( m_installedTranslations.contains( languageCode ) ) { + m_kcmTranslations.append( languageCode ); + } else { + missingLanguages.append( languageCode ); + } + } + if (!missingLanguages.isEmpty()) { + m_userSettings.writeEntry( "Language", m_kcmTranslations.join( ":" ), KConfig::Persistent | KConfig::Global ); + m_userConfig->sync(); + } + + // Now load the new current settings + m_currentConfig->reparseConfiguration(); m_currentTranslations = m_userSettings.readEntry( "Language", QString() ); - m_kcmTranslations = m_currentTranslations.split( ':', QString::SkipEmptyParts ); // Then create the new settings using the default, include user settings mergeSettings(); - // Save the current translations for checking later - m_currentTranslations = m_kcmSettings.readEntry( "Language", QString() ); - // The update all the widgets to use the new settings initAllWidgets(); + + // Now we have a ui built tell the user about the missing languages + foreach ( const QString &languageCode, missingLanguages ) { + KMessageBox::information(this, ki18n("You have the language with code '%1' in your list " + "of languages to use for translation but the " + "localization files for it could not be found. The " + "language has been removed from your configuration. " + "If you want to add it again please install the " + "localization files for it and add the language again.") + .subs( languageCode ).toString( m_kcmLocale ) ); + } } // Defaults == User has clicked on Defaults to load default settings @@ -1109,25 +1138,6 @@ QString enUS; QString defaultLang = ki18nc( "%1 = default language name", "%1 (Default)" ).subs( enUS ).toString( m_kcmLocale ); - // Get the installed translations - m_installedTranslations.clear(); - m_installedTranslations = m_kcmLocale->installedLanguages(); - // Get the users choice of languages - m_kcmTranslations.clear(); - m_kcmTranslations = m_kcmSettings.readEntry( "Language" ).split( ':', QString::SkipEmptyParts ); - // Set up the locale, note it will throw away invalid langauges - m_kcmLocale->setLanguage( m_kcmTranslations ); - - // Check if any of the user requested translations are no longer installed - // If any missing remove them, we'll tell the user later - QStringList missingLanguages; - foreach ( const QString &languageCode, m_kcmTranslations ) { - if ( !m_installedTranslations.contains( languageCode ) ) { - missingLanguages.append( languageCode ); - m_kcmTranslations.removeAll( languageCode ); - } - } - // Clear the selector before reloading m_ui->m_selectTranslations->availableListWidget()->clear(); m_ui->m_selectTranslations->selectedListWidget()->clear(); @@ -1167,17 +1177,6 @@ m_ui->m_selectTranslations, m_ui->m_buttonDefaultTranslations ); m_ui->m_selectTranslations->blockSignals( false ); - - // Now tell the user about the missing languages - foreach ( const QString &languageCode, missingLanguages ) { - KMessageBox::information(this, ki18n("You have the language with code '%1' in your list " - "of languages to use for translation but the " - "localization files for it could not be found. The " - "language has been removed from your configuration. " - "If you want to add it again please install the " - "localization files for it and add the language again.") - .subs( languageCode ).toString( m_kcmLocale ) ); - } } void KCMLocale::defaultTranslations() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kcontrol/locale/language.desktop new/kdebase-runtime-4.6.4/kcontrol/locale/language.desktop --- old/kdebase-runtime-4.6.3/kcontrol/locale/language.desktop 2011-04-28 15:15:29.000000000 +0200 +++ new/kdebase-runtime-4.6.4/kcontrol/locale/language.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -125,7 +125,7 @@ Comment[eu]=Zure herrialdeari dagozkion hizkuntza, zenbaki, eta denbora ezarpenak Comment[fa]=زبان، عدد، و تنظیمات زمان برای منطقه خاص شما Comment[fi]=Alueen kielen, ajan ja lukujen asetukset -Comment[fr]=Configuration de la langue, des nombres, et du format d'heure +Comment[fr]=Configuration de la langue, des nombres et du format d'heure Comment[fy]=Taal-, numeryk, en tiidsynstelling foar jo eigen regio Comment[ga]=Socruithe teanga, uimhreacha, agus ama le haghaidh do réigiúin Comment[gl]=Lingua e parámetros numéricos/horarios da súa rexión diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/khelpcenter/kcmhelpcenter.desktop new/kdebase-runtime-4.6.4/khelpcenter/kcmhelpcenter.desktop --- old/kdebase-runtime-4.6.3/khelpcenter/kcmhelpcenter.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/khelpcenter/kcmhelpcenter.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -123,7 +123,7 @@ Comment[eu]=Laguntza guneko bilaketa indizearen konfigurazio eta sorkuntza Comment[fa]=تولید و پیکربندی نمایه جستجوی مرکز کمک Comment[fi]=Opastekeskuksen hakuindeksin asetukset ja tuottaminen -Comment[fr]=Configuration et génération de l'index de recherche du Centre d'aide +Comment[fr]=Configuration et génération de l'index de recherche du centre d'aide Comment[fy]=Sykjeyndeks fan it helpsintrum ynstellen en generearen Comment[ga]=Cumraíocht agus giniúint an innéacs cuardaigh don lárionad cabhrach Comment[gl]=Configuración e xeración do índice de procura do centro de axuda diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/khelpcenter/khelpcenter.desktop new/kdebase-runtime-4.6.4/khelpcenter/khelpcenter.desktop --- old/kdebase-runtime-4.6.3/khelpcenter/khelpcenter.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/khelpcenter/khelpcenter.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -113,7 +113,7 @@ Comment[eu]=KDE laguntza gunea Comment[fa]=مرکز کمک KDE Comment[fi]=KDE:n Opastekeskus -Comment[fr]=Le centre de documentation de KDE +Comment[fr]=Le centre d'aide de KDE Comment[fy]=It KDE-dokumintaasjesintrum Comment[ga]=Lárionad Cabhrach KDE Comment[gl]=O centro de axuda de KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/khelpcenter/plugins/kcontrolmodules.desktop new/kdebase-runtime-4.6.4/khelpcenter/plugins/kcontrolmodules.desktop --- old/kdebase-runtime-4.6.3/khelpcenter/plugins/kcontrolmodules.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/khelpcenter/plugins/kcontrolmodules.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -24,7 +24,7 @@ Name[eu]=Kontrol Gunearen moduluak Name[fa]=پیمانههای مرکز کنترل Name[fi]=Ohjauskeskuksen moduulit -Name[fr]=Modules du Centre de Configuration +Name[fr]=Modules du Centre de configuration Name[fy]=Konfiguraasjemodules Name[ga]=Modúil an Lárionad Rialaithe Name[gl]=Módulos do centro de control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/khelpcenter/plugins/kicmodules.desktop new/kdebase-runtime-4.6.4/khelpcenter/plugins/kicmodules.desktop --- old/kdebase-runtime-4.6.3/khelpcenter/plugins/kicmodules.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/khelpcenter/plugins/kicmodules.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -24,7 +24,7 @@ Name[eu]=KInfoCenter moduluak Name[fa]=پیمانههای KInfoCenter Name[fi]=KInfoCenter-moduulit -Name[fr]=Modules du centre d'informations +Name[fr]=Modules du centre d'information Name[fy]=Ynformaasjesintrummodules Name[ga]=Modúil KInfoCenter Name[gl]=Módulos de KInfoCenter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kioslave/desktop/directory.trash new/kdebase-runtime-4.6.4/kioslave/desktop/directory.trash --- old/kdebase-runtime-4.6.3/kioslave/desktop/directory.trash 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kioslave/desktop/directory.trash 2011-06-02 19:27:34.000000000 +0200 @@ -99,7 +99,7 @@ Comment[et]=Sisaldab eemaldatud faile Comment[eu]=Kendutako fitxategiak ditu Comment[fi]=Sisältää poistetut tiedostot -Comment[fr]=Contiens les fichiers effacés +Comment[fr]=Contient les fichiers effacés Comment[fy]=Befetter fuortsmiten triemmen Comment[ga]=Comhaid bhainte atá ann Comment[gl]=Contén ficheiros eliminados diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kioslave/sftp/kio_sftp.cpp new/kdebase-runtime-4.6.4/kioslave/sftp/kio_sftp.cpp --- old/kdebase-runtime-4.6.3/kioslave/sftp/kio_sftp.cpp 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kioslave/sftp/kio_sftp.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -1581,7 +1581,7 @@ } void sftpProtocol::rename(const KUrl& src, const KUrl& dest, KIO::JobFlags flags) { - kDebug(KIO_SFTP_DB) << "rename " << src << " to " << dest; + kDebug(KIO_SFTP_DB) << "rename " << src << " to " << dest << flags; openConnection(); if (!mConnected) { @@ -1603,7 +1603,18 @@ return; } - del(dest, sb->type == SSH_FILEXFER_TYPE_DIRECTORY ? true : false); + // Delete the existing destination file/dir... + if (sb->type == SSH_FILEXFER_TYPE_DIRECTORY) { + if (sftp_rmdir(mSftp, qdest.constData()) < 0) { + reportError(dest, sftp_get_error(mSftp)); + return; + } + } else { + if (sftp_unlink(mSftp, qdest.constData()) < 0) { + reportError(dest, sftp_get_error(mSftp)); + return; + } + } } sftp_attributes_free(sb); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/knotify/hardwarenotifications.notifyrc new/kdebase-runtime-4.6.4/knotify/hardwarenotifications.notifyrc --- old/kdebase-runtime-4.6.3/knotify/hardwarenotifications.notifyrc 2011-04-28 15:15:29.000000000 +0200 +++ new/kdebase-runtime-4.6.4/knotify/hardwarenotifications.notifyrc 2011-06-02 19:27:34.000000000 +0200 @@ -133,7 +133,7 @@ Name[et]=Seadmete teadustaja Name[eu]=Gailu jakinarazlea Name[fi]=Laitehuomautin -Name[fr]=Notification de nouveau périphérique +Name[fr]=Notificateur de périphérique Name[fy]=Apparaat meidieler Name[ga]=Fógróir Gléis Name[gl]=Notificador de dispositivos @@ -397,8 +397,8 @@ Name[sk]=Zariadenie je možné bezpečne odstrániť Name[sl]=Napravo je varno odstraniti Name[sr]=Уређај се може безбедно уклонити -Name[sr@ijekavian]=Уређај се може безбедно уклонити -Name[sr@ijekavianlatin]=Uređaj se može bezbedno ukloniti +Name[sr@ijekavian]=Уређај се може безбједно уклонити +Name[sr@ijekavianlatin]=Uređaj se može bezbjedno ukloniti Name[sr@latin]=Uređaj se može bezbedno ukloniti Name[sv]=Enheten kan urkopplas säkert Name[th]=สามารถถอดอุปกรณ์ได้อย่างปลอดภัย @@ -418,6 +418,7 @@ Comment[es]=Es seguro extraer el dispositivo que se acaba de desmontar. Comment[et]=Äsja lahutatud seadme saab nüüd turvaliselt eemaldada Comment[eu]=Oraintxe desmuntatua izan den gailua arriskurik gabe kendu daiteke. +Comment[fi]=Juuri irrotettu laite on nyt turvallista poistaa. Comment[fr]=Le périphérique qui vient d'être libéré peut maintenant être débranché en sécurité. Comment[he]=ההתקן שהעגינה שלו בדיוק הוסרה ניתן עכשיו להסרה בבטחה. Comment[hr]=Uređaj koji ste upravo demontirali možete sigurno ukloniti. @@ -441,8 +442,8 @@ Comment[sk]=Zariadenie, ktoré bolo práve odpojené, je možné teraz bezpečne odstrániť. Comment[sl]=Napravo, ki je bila odklopljena, je sedaj varno odstraniti. Comment[sr]=Управо демонтирани уређај може се сада безбедно уклонити. -Comment[sr@ijekavian]=Управо демонтирани уређај може се сада безбедно уклонити. -Comment[sr@ijekavianlatin]=Upravo demontirani uređaj može se sada bezbedno ukloniti. +Comment[sr@ijekavian]=Управо демонтирани уређај може се сада безбједно уклонити. +Comment[sr@ijekavianlatin]=Upravo demontirani uređaj može se sada bezbjedno ukloniti. Comment[sr@latin]=Upravo demontirani uređaj može se sada bezbedno ukloniti. Comment[sv]=Enheten som precis har avmonterats kan nu urkopplas säkert. Comment[th]=อุปกรณ์ที่เพิ่งยกเลิกการเมานท์สามารถถอดออกได้อย่างปลอดภัย diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/knotify/kde.notifyrc new/kdebase-runtime-4.6.4/knotify/kde.notifyrc --- old/kdebase-runtime-4.6.3/knotify/kde.notifyrc 2011-04-28 15:15:29.000000000 +0200 +++ new/kdebase-runtime-4.6.4/knotify/kde.notifyrc 2011-06-02 19:27:34.000000000 +0200 @@ -480,7 +480,7 @@ Comment[et]=Ühtegi sobivat lõpetust ei leitud Comment[eu]=Bat datorren osatzerik ez Comment[fi]=Sopivaa täydennystä ei löytynyt -Comment[fr]=Aucune correspondance de complément n'a été trouvée +Comment[fr]=Aucune correspondance d'auto-complément n'a été trouvée Comment[fy]=Gjin oerienkomstige kompletearings binne fun Comment[ga]=Níor aimsíodh aon chomhlánú comhoiriúnach Comment[gl]=Non se atopou ningún acabamento @@ -888,7 +888,7 @@ Name[et]=Märguanne Name[eu]=Jakinarazpena Name[fi]=Huomautus -Name[fr]=Notifications +Name[fr]=Notification Name[fy]=Notifikaasje Name[ga]=Fógairt Name[gl]=Notificación @@ -1294,7 +1294,7 @@ Comment[et]=Tekkis väga tõsine viga, mis sundis programmi tööd lõpetama Comment[eu]=Oso errore larria gertatu da, programa ateraraztea eragin duena, gutxienez Comment[fi]=Tapahtui erittäin vakava virhe, joka aiheutti ainakin ohjelman keskeytymisen -Comment[fr]=Une erreur très sérieuse s'est produite, provoquant au minimum la sortie du programme +Comment[fr]=Une erreur très sérieuse s'est produite, provoquant au minimum la fin du programme Comment[fy]=In serieuse flater had him foardien wertroch it programma sluten is Comment[ga]=Tharla earráid thromchúiseach, a thug ar an gclár éirí as, ar a laghad Comment[gl]=Aconteceu un erro moi grave, que como mínimo fixo que o programa se pechase diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/kuriikwsfiltereng.cpp new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/kuriikwsfiltereng.cpp --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/kuriikwsfiltereng.cpp 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/kuriikwsfiltereng.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -357,13 +357,13 @@ bool isMalformed ) const { SubstMap map; - return formatResult (url, cset1, cset2, query, isMalformed, map); + return formatResult (url, cset1, cset2, QUrl::toPercentEncoding(query), isMalformed, map); } QString KURISearchFilterEngine::formatResult( const QString& url, const QString& cset1, const QString& cset2, - const QString& query, + const QByteArray& query, bool /* isMalformed */, SubstMap& map ) const { @@ -393,7 +393,7 @@ } // Decode user query: - QString userquery = QUrl::fromPercentEncoding( query.toUtf8() ); + const QString userquery (QUrl::fromPercentEncoding( query )); PDVAR ("user query", userquery); PDVAR ("query definition", url); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/kuriikwsfiltereng.h new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/kuriikwsfiltereng.h --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/kuriikwsfiltereng.h 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/kuriikwsfiltereng.h 2011-06-02 19:27:34.000000000 +0200 @@ -54,7 +54,7 @@ protected: QString formatResult (const QString& url, const QString& cset1, const QString& cset2, - const QString& query, bool isMalformed, SubstMap& map) const; + const QByteArray& query, bool isMalformed, SubstMap& map) const; private: KURISearchFilterEngine(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/7digital.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/7digital.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/7digital.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/7digital.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -18,7 +18,7 @@ Name[et]=7Digital Name[eu]=7Digital Name[fi]=7Digital -Name[fr]=7 numérique +Name[fr]=7Digital Name[ga]=7Digital Name[gu]=૭ ડિજીટલ Name[he]=7Digital diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/bugft.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/bugft.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/bugft.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/bugft.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -25,7 +25,7 @@ Name[eu]=KDEren erroreen datu-baseko testu erako bilaketa Name[fa]=جستجوی متن کامل دادگان اشکال KDE Name[fi]=KDE-vikailmoitustietokannan tekstihaku -Name[fr]=Recherche textuelle de bogues de KDE +Name[fr]=Recherche textuelle dans la base de données de bogues de KDE Name[fy]=KDE Bug Databank - folsleine-tekst-sykaksje Name[ga]=Cuardach Lán-Téacs i mBunachar Sonraí Fabhtanna KDE Name[gl]=Procura de texto completo na base de datos de erros de KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/bugno.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/bugno.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/bugno.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/bugno.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -24,7 +24,7 @@ Name[eu]=Akats zenbakiaren bidezko bilaketa KDEren akats datu-basean Name[fa]=جستجوی شماره اشکال دادگان اشکال KDE Name[fi]=KDE-vikailmoitustietokannan numerohaku -Name[fr]=Recherche de bogues de KDE par numéro +Name[fr]=Recherche dans la base de données de bogues de KDE par numéro Name[fy]=KDE Bug Databank - sykje op breknûmer Name[ga]=Cuardach bugs.kde.org de réir uimhir an fhabht Name[gl]=Procura numérica na base de datos de erros de KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/dbug.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/dbug.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/dbug.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/dbug.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -25,7 +25,7 @@ Name[eu]=Debianen BTS akats bilaketa Name[fa]=جستجوی اشکال BTS دبیان Name[fi]=Debianin vikajärjestelmän haku -Name[fr]=Recherche dans le système de gestion des bogues Debian +Name[fr]=Recherche dans le système de gestion des bogues Debian (BTS) Name[fy]=Debian BTS Bug Search Name[ga]=Cuardach Fabht i BTS Debian Name[gl]=Procura no BTS de Debian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/foldoc.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/foldoc.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/foldoc.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/foldoc.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -25,7 +25,7 @@ Name[eu]=Konputazioari buruzko lineako hiztegi librea Name[fa]=واژهنامه برخط رایگان محاسبات Name[fi]=Vapaa tietokonealan sanasto -Name[fr]=Dictionnaire de l'informatique gratuit en ligne +Name[fr]=Dictionnaire gratuit et en ligne de l'informatique Name[fy]=Free On-Line Dictionary Of Computing (IT-wurdboek) Name[ga]=Free On-Line Dictionary of Computing Name[gl]=Dicionario libre en liña da computación diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/google_code.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/google_code.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/google_code.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/google_code.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -18,7 +18,7 @@ Name[et]=Google Code Name[eu]=Google Code Name[fi]=Google Code -Name[fr]=Google Code +Name[fr]=Code Google Name[ga]=Cód Google Name[gu]=ગુગલ કોડ Name[he]=Google Code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/google_maps.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/google_maps.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/google_maps.desktop 2011-04-01 12:54:01.000000000 +0200 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/google_maps.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -16,7 +16,7 @@ Name[et]=Google Maps Name[eu]=Google Mapak Name[fi]=Google Maps (kartat) -Name[fr]=Google Maps +Name[fr]=Google cartes Name[ga]=Mapaí Google Name[gu]=ગુગલ નકશાઓ Name[he]=Google מפות diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/google_movie.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/google_movie.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/google_movie.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/google_movie.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -25,7 +25,7 @@ Name[eu]=Google pelikulak Name[fa]=فیلمهای Google Name[fi]=Googlen elokuvat -Name[fr]=Google vidéo +Name[fr]=Google vidéos Name[fy]=Google Films Name[ga]=Scannáin Google Name[gl]=Películas de Google diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/kde_look.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/kde_look.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/kde_look.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/kde_look.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -18,7 +18,7 @@ Name[et]=KDE Look Name[eu]=KDE Look Name[fi]=KDE Look -Name[fr]=KDE Look +Name[fr]=Apparence de KDE Name[ga]=KDE Look Name[gu]=કેડીઈ લૂક Name[he]=KDE Look diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/rae.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/rae.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/rae.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/rae.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -28,7 +28,7 @@ Name[eu]=Gazteleraren Akademiaren hiztegia (RAE) Name[fa]=واژهنامه فرهنگستان اسپانیایی (RAE) Name[fi]=Espanjan Akatemian sanakirja (RAE) -Name[fr]=Dictionnaire de l'Académie Espagnole (RAE)Dictionnaire de l'Académie Espagnole (RAE) +Name[fr]=Dictionnaire de l'Académie Espagnole (RAE) Name[fy]=Wurdboek fan de Spaanske akademy (RAE) Name[ga]=Diccionario de la lengua española (RAE) Name[gl]=Dicionario da real academia española (RAE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/uspto.desktop new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/uspto.desktop --- old/kdebase-runtime-4.6.3/kurifilter-plugins/ikws/searchproviders/uspto.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/kurifilter-plugins/ikws/searchproviders/uspto.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -26,7 +26,7 @@ Name[eu]=EEBB patente datu-basea Name[fa]=دادگان امتیاز امریکایی Name[fi]=Yhdysvaltojen patenttitietokanta -Name[fr]=Base de données des brevets aux U.S.A. +Name[fr]=Base de données des brevets aux U.S.A Name[fy]=U.S. Patent-database Name[ga]=Bunachar Sonraí Paitinní S.A.M. Name[gl]=Base de datos de patentes dos EEUU diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/l10n/ag/entry.desktop new/kdebase-runtime-4.6.4/l10n/ag/entry.desktop --- old/kdebase-runtime-4.6.3/l10n/ag/entry.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/l10n/ag/entry.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -25,7 +25,7 @@ Name[eu]=Antigua eta Barbuda Name[fa]=آنتیگوا و باربودا Name[fi]=Antigua ja Barbuda -Name[fr]=Antigua-et-Barbuda +Name[fr]=Antigua et Barbuda Name[fy]=Antigua en Barbuda Name[ga]=Antigua agus Barbúda Name[gl]=Antigua e Barbuda diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/l10n/ar/entry.desktop new/kdebase-runtime-4.6.4/l10n/ar/entry.desktop --- old/kdebase-runtime-4.6.3/l10n/ar/entry.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/l10n/ar/entry.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -24,7 +24,7 @@ Name[et]=Argentina Name[eu]=Argentina Name[fa]=آرژانتین -Name[fi]=Agentiina +Name[fi]=Argentiina Name[fr]=Argentine Name[fy]=Argentinië Name[ga]=An Airgintín diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/l10n/gb/entry.desktop new/kdebase-runtime-4.6.4/l10n/gb/entry.desktop --- old/kdebase-runtime-4.6.3/l10n/gb/entry.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/l10n/gb/entry.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -25,7 +25,7 @@ Name[eu]=Erresuma Batua Name[fa]=بریتانیای کبیر Name[fi]=Iso-Britannia -Name[fr]=Royaume-Uni +Name[fr]=Royaume Uni Name[fy]=Ferienigd Keninkryk Name[ga]=An Ríocht Aontaithe Name[gl]=Reino Unido diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/l10n/ly/entry.desktop new/kdebase-runtime-4.6.4/l10n/ly/entry.desktop --- old/kdebase-runtime-4.6.3/l10n/ly/entry.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/l10n/ly/entry.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -25,7 +25,7 @@ Name[eu]=Libia Name[fa]=لیبی Name[fi]=Libya -Name[fr]=Lybie +Name[fr]=Libye Name[fy]=Libië Name[ga]=An Libia Name[gl]=Libia diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/l10n/mh/entry.desktop new/kdebase-runtime-4.6.4/l10n/mh/entry.desktop --- old/kdebase-runtime-4.6.3/l10n/mh/entry.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/l10n/mh/entry.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -80,7 +80,7 @@ Name[tg]=Ҷазираҳои Маршал Name[th]=หมู่เกาะมาแชลล์ Name[tr]=Marşal Adaları -Name[uk]=Маршальські острови +Name[uk]=Маршаллові острови Name[uz]=Marshall Orollari Name[uz@cyrillic]=Маршалл Ороллари Name[vi]=Đảo Marshall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/l10n/sk/entry.desktop new/kdebase-runtime-4.6.4/l10n/sk/entry.desktop --- old/kdebase-runtime-4.6.3/l10n/sk/entry.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/l10n/sk/entry.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -81,7 +81,7 @@ Name[tg]=Словакия Name[th]=สโลวาเกีย Name[tr]=Slovakya -Name[uk]=Словакія +Name[uk]=Словаччина Name[uz]=Slovakiya Name[uz@cyrillic]=Словакия Name[vi]=Xlô-vák diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/localization/currency/adp.desktop new/kdebase-runtime-4.6.4/localization/currency/adp.desktop --- old/kdebase-runtime-4.6.3/localization/currency/adp.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/localization/currency/adp.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -20,7 +20,7 @@ Name[et]=Andorra peseeta Name[eu]=Andorrako Pezeta Name[fi]=Andorran peseta -Name[fr]=Pesète andorrane +Name[fr]=Peseta andorrane Name[fy]=Andoraanske peseta Name[ga]=Peseta Andóra Name[gu]=એન્ડોરન પેસેતા diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/localization/currency/aon.desktop new/kdebase-runtime-4.6.4/localization/currency/aon.desktop --- old/kdebase-runtime-4.6.3/localization/currency/aon.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/localization/currency/aon.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -20,7 +20,7 @@ Name[et]=Angola uus kwanza Name[eu]=Angola Novo Kwanza Name[fi]=Angolan uusi kwansa -Name[fr]=Nouveau Kwanza angollais +Name[fr]=Nouveau Kwanza angolais Name[fy]=Angolaanske novo kwanza Name[ga]=Novo Kwanza Angólach Name[gu]=એન્ગોલિઅન નોવો ક્વાન્ઝા diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/localization/currency/ars.desktop new/kdebase-runtime-4.6.4/localization/currency/ars.desktop --- old/kdebase-runtime-4.6.3/localization/currency/ars.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/localization/currency/ars.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -19,7 +19,7 @@ Name[es]=Peso argentino Name[et]=Argentina peeso Name[eu]=Argentinako Pesoa -Name[fi]=Agentiinan peso +Name[fi]=Argentiinan peso Name[fr]=Peso argentin Name[fy]=Argentinyske peso Name[ga]=Peso na hAirgintíne diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/menu/desktop/kde-education.directory new/kdebase-runtime-4.6.4/menu/desktop/kde-education.directory --- old/kdebase-runtime-4.6.3/menu/desktop/kde-education.directory 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/menu/desktop/kde-education.directory 2011-06-02 19:27:34.000000000 +0200 @@ -33,7 +33,7 @@ Name[he]=חינוך Name[hi]=शिक्षा Name[hne]=सिक्छा -Name[hr]=Education +Name[hr]=Obrazovanje Name[hsb]=Wuknjenje a hrajkanje Name[hu]=Oktatás Name[ia]=Education diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/menu/desktop/kde-science.directory new/kdebase-runtime-4.6.4/menu/desktop/kde-science.directory --- old/kdebase-runtime-4.6.3/menu/desktop/kde-science.directory 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/menu/desktop/kde-science.directory 2011-06-02 19:27:34.000000000 +0200 @@ -28,7 +28,7 @@ Name[eu]=Zientzia eta matematikaa Name[fa]=علوم و ریاضی Name[fi]=Tiede ja matematiikka -Name[fr]=Science et mathématiques +Name[fr]=Sciences et mathématiques Name[fy]=Wittenskiplik en wiskunde Name[ga]=Eolaíocht agus Matamaitic Name[gl]=Ciencia e matemáticas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/interfaces/org.kde.nepomuk.Strigi.xml new/kdebase-runtime-4.6.4/nepomuk/interfaces/org.kde.nepomuk.Strigi.xml --- old/kdebase-runtime-4.6.3/nepomuk/interfaces/org.kde.nepomuk.Strigi.xml 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/interfaces/org.kde.nepomuk.Strigi.xml 2011-06-02 19:27:34.000000000 +0200 @@ -18,6 +18,7 @@ <method name="resume" /> <method name="updateFolder"> <arg name="path" type="s" direction="in" /> + <arg name="recursive" type="b" direction="in" /> <arg name="forced" type="b" direction="in" /> </method> <method name="updateAllFolders"> @@ -25,6 +26,7 @@ </method> <method name="indexFolder"> <arg name="path" type="s" direction="in" /> + <arg name="recursive" type="b" direction="in" /> <arg name="forced" type="b" direction="in" /> </method> <method name="indexFile"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop new/kdebase-runtime-4.6.4/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop --- old/kdebase-runtime-4.6.3/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -82,7 +82,7 @@ Comment[et]=KIO abimoodul Nepomuki otsinguloendite automaatseks uuendamiseks. Comment[eu]=KIOrentzako modulu laguntzailea nepomuksearch zerrenden eguneraketa automatikoa ziurtatzeko. Comment[fi]=KIO-apumoduuli, joka takaa nepomuksearch-luettelointien automaattiset päivitykset -Comment[fr]=Module assistant pour KIO qui assure les mises à jours automatiques des listes de NepomukSearch +Comment[fr]=Module assistant pour KIO qui assure les mises à jours automatiques des listes de Nepomuk-Search Comment[ga]=Modúl cabhrach le haghaidh KIO a dhéanann cinnte go bhfuil eolairí nepomuksearch nuashonraithe go huathoibríoch. Comment[he]=מודול עזרה עבור KIO המבטיח עידכון אוטומטי של הרשימות של nepomuksearch. Comment[hr]=Pomoćni modul za KIO koji osigurava automatsko ažuriranje izlistavanja nepomuk pretraga. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/server/nepomukserver.desktop new/kdebase-runtime-4.6.4/nepomuk/server/nepomukserver.desktop --- old/kdebase-runtime-4.6.3/nepomuk/server/nepomukserver.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/server/nepomukserver.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -60,7 +60,7 @@ Name[pa]=ਨਿਪੋਮੁਕ ਸਰਵਰ Name[pl]=Serwer Nepomuk Name[pt]=Servidor do Nepomuk -Name[pt_BR]=Servidor Nepomuk +Name[pt_BR]=Servidor do Nepomuk Name[ro]=Server Nepomuk Name[ru]=Сервер Nepomuk Name[se]=Nepomuk-bálvá diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/server/nepomukservice.desktop new/kdebase-runtime-4.6.4/nepomuk/server/nepomukservice.desktop --- old/kdebase-runtime-4.6.3/nepomuk/server/nepomukservice.desktop 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/server/nepomukservice.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -57,7 +57,7 @@ Comment[pa]=ਨਿਪੋਮੁਕ ਸਰਵਿਸ Comment[pl]=Usługa Nepomuk Comment[pt]=Serviço do Nepomuk -Comment[pt_BR]=Serviço Nepomuk +Comment[pt_BR]=Serviço do Nepomuk Comment[ro]=Serviciu Nepomuk Comment[ru]=Служба Nepomuk Comment[si]=Nepomuk සේවාව diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/backupsync/service/nepomukbackupsync.desktop new/kdebase-runtime-4.6.4/nepomuk/services/backupsync/service/nepomukbackupsync.desktop --- old/kdebase-runtime-4.6.3/nepomuk/services/backupsync/service/nepomukbackupsync.desktop 2011-04-01 12:54:01.000000000 +0200 +++ new/kdebase-runtime-4.6.4/nepomuk/services/backupsync/service/nepomukbackupsync.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -36,7 +36,7 @@ Name[pa]=ਨਿਪੋਮੁਕ ਬੈਕਅੱਪ ਅਤੇ ਸਿੰਕਨਿਪੋਮੁਕ ਬੈਕਅਨਿਪੋਮੁਕ ਬੈਕਅੱਤ Name[pl]=Kopia zapasowa i synchronizacja Nepomuka Name[pt]=Salvaguarda e Sincronização do Nepomuk -Name[pt_BR]=Backup e Sincronização do Nepomuk +Name[pt_BR]=Cópia de segurança e sincronização do Nepomuk Name[ro]=Copie de siguranță și sincronizare Nepomuk Name[ru]=Резервное копирование и синхронизация Nepomuk Name[sk]=Zálohovanie a synchronizácia Nepomuku @@ -81,7 +81,7 @@ Comment[pa]=ਨਿਪੋਮੁਕ ਸਰਵਿਸ, ਜੋ ਕਿ ਬੈਕਅੱਪ ਤੇ ਸਿੰਕ ਨੂੰ ਹੈਂਡਸ ਕਰਦੀ ਹੈ। Comment[pl]=Usługa Nepomuka, która zajmuje się kopiami zapasowymi i synchronizacją. Comment[pt]=O serviço do Nepomuk que lida com a salvaguarda e a sincronização dos dados. -Comment[pt_BR]=O serviço do Nepomuk que lida com o backup e a sincronização dos dados. +Comment[pt_BR]=Serviço de cópia de segurança e sincronização de dados do Nepomuk. Comment[ro]=Serviciu Nepomuk care se ocupă de copii de siguranță și sincronizare. Comment[ru]=Служба Nepomuk, отвечающая за резервное копирование и синхронизацию Comment[sk]=Služba Nepomuk, ktorá ovláda zálohovanie a synchronizáciu. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/filewatch/nepomukfilewatch.cpp new/kdebase-runtime-4.6.4/nepomuk/services/filewatch/nepomukfilewatch.cpp --- old/kdebase-runtime-4.6.3/nepomuk/services/filewatch/nepomukfilewatch.cpp 2011-02-25 22:54:12.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/services/filewatch/nepomukfilewatch.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -91,12 +91,14 @@ { Q_UNUSED( flags ); - //Only watch the strigi index folders for file creation. + //Only watch the strigi index folders for file creation and change. if( Nepomuk::StrigiServiceConfig::self()->shouldFolderBeIndexed( path ) ) { modes |= KInotify::EventCreate; + modes |= KInotify::EventModify; } else { modes &= (~KInotify::EventCreate); + modes &= (~KInotify::EventModify); } return true; @@ -174,7 +176,7 @@ #ifdef BUILD_KINOTIFY if ( m_dirWatch && !m_dirWatch->watchingPath( path ) ) m_dirWatch->addWatch( path, - KInotify::WatchEvents( KInotify::EventMove|KInotify::EventDelete|KInotify::EventDeleteSelf|KInotify::EventCreate ), + KInotify::WatchEvents( KInotify::EventMove|KInotify::EventDelete|KInotify::EventDeleteSelf|KInotify::EventCreate|KInotify::EventModify ), KInotify::WatchFlags() ); #endif } @@ -249,7 +251,7 @@ // org::kde::nepomuk::Strigi strigi( "org.kde.nepomuk.services.nepomukstrigiservice", "/nepomukstrigiservice", QDBusConnection::sessionBus() ); if ( strigi.isValid() ) { - strigi.updateFolder( path, false /* no forced update */ ); + strigi.updateFolder( path, false /* non-recursive */, false /* no forced update */ ); } } } @@ -297,5 +299,4 @@ #endif } - #include "nepomukfilewatch.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/filewatch/nepomukfilewatch.desktop new/kdebase-runtime-4.6.4/nepomuk/services/filewatch/nepomukfilewatch.desktop --- old/kdebase-runtime-4.6.3/nepomuk/services/filewatch/nepomukfilewatch.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/services/filewatch/nepomukfilewatch.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -59,7 +59,7 @@ Name[pa]=ਨਿਪੋਮੁਕਫਾਇਲਵਾਚ Name[pl]=Nepomuk - zmiany w plikach Name[pt]=NepomukFileWatch -Name[pt_BR]=NepomukFileWatch +Name[pt_BR]=Inspeção de arquivos do Nepomuk Name[ro]=NepomukFileWatch Name[ru]=NepomukFileWatch Name[si]=NepomukFileWatch @@ -131,7 +131,7 @@ Comment[pa]=ਫਾਇਲ ਬਦਲਾਅ ਉੱਤੇ ਨਿਗਰਾਨੀ ਲਈ ਨਿਪੋਮੁਕ ਫਾਇਥ ਵਾਚ ਸਰਵਿਸ Comment[pl]=Usługa Nepomuka do monitorowania zmian w plikach Comment[pt]=O serviço de vigilância de ficheiros para vigiar as alterações dos ficheiros -Comment[pt_BR]=O serviço de inspeção de arquivos Nepomuk para monitorar as alterações dos arquivos +Comment[pt_BR]=O serviço de inspeção de arquivos do Nepomuk para monitoramento de alterações Comment[ro]=Serviciu de supraveghere a fișierelor Nepomuk, pentru monitorizarea modificării fișierelor Comment[ru]=Отслеживание изменений в файлах Comment[si]=The Nepomuk ගොනු නැරඹීමේ සේවාව ගොනු වෙනස්කම් පිරික්සයි diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/queryservice/folder.cpp new/kdebase-runtime-4.6.4/nepomuk/services/queryservice/folder.cpp --- old/kdebase-runtime-4.6.3/nepomuk/services/queryservice/folder.cpp 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/services/queryservice/folder.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -145,10 +145,10 @@ } if ( m_initialListingDone ) { - m_newResults += newResults; + m_newResults += QSet<Result>::fromList(results); } else { - m_results += newResults; + m_results += QSet<Result>::fromList(results); } if( !newResults.isEmpty() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/removablestorage/removablestorageservice.cpp new/kdebase-runtime-4.6.4/nepomuk/services/removablestorage/removablestorageservice.cpp --- old/kdebase-runtime-4.6.3/nepomuk/services/removablestorage/removablestorageservice.cpp 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/services/removablestorage/removablestorageservice.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -286,7 +286,7 @@ org::kde::nepomuk::Strigi( "org.kde.nepomuk.services.nepomukstrigiservice", "/nepomukstrigiservice", QDBusConnection::sessionBus() ) - .indexFolder( entry.m_lastMountPath, false ); + .indexFolder( entry.m_lastMountPath, true /* recursive */, false /* no force */ ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/strigi/indexscheduler.cpp new/kdebase-runtime-4.6.4/nepomuk/services/strigi/indexscheduler.cpp --- old/kdebase-runtime-4.6.3/nepomuk/services/strigi/indexscheduler.cpp 2011-04-01 12:54:01.000000000 +0200 +++ new/kdebase-runtime-4.6.4/nepomuk/services/strigi/indexscheduler.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -471,10 +471,10 @@ } -void Nepomuk::IndexScheduler::updateDir( const QString& path, bool forceUpdate ) +void Nepomuk::IndexScheduler::updateDir( const QString& path, UpdateDirFlags flags ) { QMutexLocker lock( &m_dirsToUpdateMutex ); - m_dirsToUpdate.prependDir( path, UpdateDirFlags( forceUpdate ? ForceUpdate : NoUpdateFlags ) ); + m_dirsToUpdate.prependDir( path, flags & ~AutoUpdateFolder ); m_dirsToUpdateWc.wakeAll(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/strigi/indexscheduler.h new/kdebase-runtime-4.6.4/nepomuk/services/strigi/indexscheduler.h --- old/kdebase-runtime-4.6.3/nepomuk/services/strigi/indexscheduler.h 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/services/strigi/indexscheduler.h 2011-06-02 19:27:34.000000000 +0200 @@ -143,10 +143,14 @@ * Slot to connect to certain event systems like KDirNotify * or KDirWatch * - * Updates a complete folder (non-recursively). Makes sense for + * Updates a complete folder. Makes sense for * signals like KDirWatch::dirty. + * + * \param path The folder to update + * \param flags Additional flags, all except AutoUpdateFolder are supported. This + * also means that by default \p path is updated non-recursively. */ - void updateDir( const QString& path, bool forceUpdate = false ); + void updateDir( const QString& path, UpdateDirFlags flags = NoUpdateFlags ); /** * Updates all configured folders. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/strigi/strigiservice.cpp new/kdebase-runtime-4.6.4/nepomuk/services/strigi/strigiservice.cpp --- old/kdebase-runtime-4.6.3/nepomuk/services/strigi/strigiservice.cpp 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/services/strigi/strigiservice.cpp 2011-06-02 19:27:34.000000000 +0200 @@ -217,7 +217,7 @@ } -void Nepomuk::StrigiService::updateFolder(const QString& path, bool forced) +void Nepomuk::StrigiService::updateFolder(const QString& path, bool recursive, bool forced) { kDebug() << "Called with path: " << path; QFileInfo info( path ); @@ -229,8 +229,7 @@ dirPath = info.absolutePath(); if ( StrigiServiceConfig::self()->shouldFolderBeIndexed( dirPath ) ) { - kDebug() << "Updating : " << dirPath; - m_indexScheduler->updateDir( dirPath, forced ); + indexFolder(path, recursive, forced); } } } @@ -247,9 +246,8 @@ m_indexScheduler->analyzeFile( path ); } -//FIXME: Code duplication in updateFolder, avoid if possible. Maybe with an extra -// default parameter -void Nepomuk::StrigiService::indexFolder(const QString& path, bool forced) + +void Nepomuk::StrigiService::indexFolder(const QString& path, bool recursive, bool forced) { QFileInfo info( path ); if ( info.exists() ) { @@ -259,7 +257,15 @@ else dirPath = info.absolutePath(); - m_indexScheduler->updateDir( dirPath, forced ); + kDebug() << "Updating : " << dirPath; + + Nepomuk::IndexScheduler::UpdateDirFlags flags; + if(recursive) + flags |= Nepomuk::IndexScheduler::UpdateRecursive; + if(forced) + flags |= Nepomuk::IndexScheduler::ForceUpdate; + + m_indexScheduler->updateDir( dirPath, flags ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/nepomuk/services/strigi/strigiservice.h new/kdebase-runtime-4.6.4/nepomuk/services/strigi/strigiservice.h --- old/kdebase-runtime-4.6.3/nepomuk/services/strigi/strigiservice.h 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/nepomuk/services/strigi/strigiservice.h 2011-06-02 19:27:34.000000000 +0200 @@ -78,7 +78,7 @@ /** * Update folder \a path if it is configured to be indexed. */ - void updateFolder( const QString& path, bool forced ); + void updateFolder( const QString& path, bool recursive, bool forced ); /** * Update all folders configured to be indexed. @@ -88,7 +88,7 @@ /** * Index a folder independant of its configuration status. */ - void indexFolder( const QString& path, bool forced ); + void indexFolder( const QString& path, bool recursive, bool forced ); /** * Index a specific file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/plasma/scriptengines/javascript/data/plasma-javascriptaddon.desktop new/kdebase-runtime-4.6.4/plasma/scriptengines/javascript/data/plasma-javascriptaddon.desktop --- old/kdebase-runtime-4.6.3/plasma/scriptengines/javascript/data/plasma-javascriptaddon.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/plasma/scriptengines/javascript/data/plasma-javascriptaddon.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -12,6 +12,7 @@ Name[es]=Complemento de JavaScript para Plasma Name[et]=Plasma JavaScripti lisa Name[eu]=Plasma JavaScript gehigarria +Name[fi]=Plasma JavaScript -lisäosa Name[fr]=Module complémentaire Javascript de Plasma Name[he]=תוסף עבור JavaScript של Plasma Name[hi]=प्लाज़मा जावा-स्क्रिप्ट एडोन @@ -35,6 +36,7 @@ Name[pt]=Extensão de JavaScript do Plasma Name[pt_BR]=Complementos de JavaScript do Plasma Name[ro]=Supliment JavaScript Plasma +Name[ru]=Расширение Plasma, использующее JavaScript Name[sk]=Doplnok JavaScript pre plasmu Name[sl]=Dodatek za JavaScript za Plasmo Name[sr]=Плазма јаваскриптни додатак diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop new/kdebase-runtime-4.6.4/plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop --- old/kdebase-runtime-4.6.3/plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop 2011-04-01 12:54:01.000000000 +0200 +++ new/kdebase-runtime-4.6.4/plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -12,6 +12,7 @@ Name[es]=Complemento de JavaScript Name[et]=JavaScripti lisa Name[eu]=Javascript gehigarria +Name[fi]=Javascript-lisäosa Name[fr]=Module complémentaire Javascript Name[he]=תוסף JavaScript Name[hi]=जावास्क्रिप्ट एडोन @@ -36,6 +37,7 @@ Name[pt]=Extensão de JavaScript Name[pt_BR]=Complementos de JavaScript Name[ro]=Supliment Javascript +Name[ru]=Дополнение, использующее JavaScript Name[sk]=Doplnok JavaScript Name[sl]=Dodatek za JavaScript Name[sr]=Јаваскриптни додатак @@ -61,6 +63,7 @@ Comment[es]=Añadidos para complementos de JavaScript para Plasma Comment[et]=JavaScripti Plasma pluginate lisad Comment[eu]=Javascript Plasma pluginentzako gehigarriak +Comment[fi]=Lisäosia JavaScript Plasma -liitännäisille Comment[fr]=Module complémentaire pour les modules externes en Javascript de Plasma Comment[he]=תוספים לתוספי JavaScript של Plasma Comment[hr]=Dodaci za priključke za Javascript Plasma @@ -81,7 +84,7 @@ Comment[pt]=Extras para os 'plugins' do Plasma em JavaScript Comment[pt_BR]=Complementos para os plug-ins do Plasma em JavaScript Comment[ro]=Suplimente pentru module JavaScript Plasma -Comment[ru]=Модули, обеспечивающие поддержку JavaScript в расширениях Plasma +Comment[ru]=Модули поддержки дополнений Plasma, использующих JavaScript Comment[sk]=Doplnky pre Javascriptové moduly plasmy Comment[sl]=Dodatki za vstavke JavaScript za Plasmo Comment[sr]=Додаци за јаваскриптне плазма прикључке diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/plasma/scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop new/kdebase-runtime-4.6.4/plasma/scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop --- old/kdebase-runtime-4.6.3/plasma/scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/plasma/scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -17,7 +17,7 @@ Name[es]=Motor de javascript Name[et]=JavaScripti käivitaja Name[eu]=JavaScript abiarazlea -Name[fi]=JavaScript-suorittaja +Name[fi]=JavaScript-suoritusohjelma Name[fr]=Lanceur JavaScript Name[fy]=JavaSkript rinner Name[ga]=Feidhmitheoir JavaScript @@ -90,7 +90,7 @@ Comment[es]=Motor de javascript Comment[et]=JavaScripti käivitaja Comment[eu]=JavaScript abiarazlea -Comment[fi]=JavaScript-suorittaja +Comment[fi]=JavaScript-suoritusohjelma Comment[fr]=Lanceur JavaScript Comment[fy]=JavaSkript rinner Comment[ga]=Feidhmitheoir JavaScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/platforms/win/kwinshutdown/kwinshutdown.desktop new/kdebase-runtime-4.6.4/platforms/win/kwinshutdown/kwinshutdown.desktop --- old/kdebase-runtime-4.6.3/platforms/win/kwinshutdown/kwinshutdown.desktop 2011-04-28 15:15:29.000000000 +0200 +++ new/kdebase-runtime-4.6.4/platforms/win/kwinshutdown/kwinshutdown.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -4,8 +4,10 @@ Name[ca@valencia]=Aturada del KDE Name[cs]=Vypínání KDE Name[da]=Nedlukning af KDE +Name[el]=Τερματισμός Name[es]=Apagado de KDE Name[et]=KDE seiskamine +Name[fi]=KDE:n sammutus Name[fr]=Arrêt de KDE Name[hr]=Isključivanje KDE-a Name[hu]=KDE Shutdown @@ -36,6 +38,7 @@ Comment[da]=Dræb kørende KDE-programmer og -processer Comment[es]=Matar las aplicaciones y procesos de KDE en ejecución Comment[et]=Töötavate KDE rakenduste ja protsesside töö lõpetamine +Comment[fi]=tapa kaikki käynnissä olevat KDE-sovellukset ja prosessit Comment[fr]=tuer les applications et processus de KDE démarrés Comment[hr]=Prekini KDE-ove aplikacije i procese koji se izvršavaju Comment[hu]=Futó KDE alkalmazások és folyamatok kilövése diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-runtime-4.6.3/solidautoeject/solidautoeject.desktop new/kdebase-runtime-4.6.4/solidautoeject/solidautoeject.desktop --- old/kdebase-runtime-4.6.3/solidautoeject/solidautoeject.desktop 2011-02-25 23:07:08.000000000 +0100 +++ new/kdebase-runtime-4.6.4/solidautoeject/solidautoeject.desktop 2011-06-02 19:27:34.000000000 +0200 @@ -103,13 +103,14 @@ Comment[pt]=Liberta automaticamente as unidades quando se carrega no botão de ejecção Comment[pt_BR]=Liberar automaticamente as unidades quando o botão de ejeção for pressionado Comment[ro]=Eliberează automat unitățile la apăsarea butonului de deschidere al acestora +Comment[ru]=Выбрасывает сменный носитель из привода при нажатии кнопки извлечения Comment[si]=ධාවක වල ඉවත් කරන් බොත්තම එබූ විගස ඒවා ස්වයංව නිදහස් කරන්න Comment[sk]=Umožňuje automaticky uvoľniť mechaniku pri stlačení tlačidla vysunúť Comment[sl]=Samodejno odklopi pogon, ko se na njem pritisne gumb za izmet -Comment[sr]=Аутоматско ослобађање јединица када им се присне дугме за избацивање -Comment[sr@ijekavian]=Аутоматско ослобађање јединица када им се присне дугме за избацивање -Comment[sr@ijekavianlatin]=Automatsko oslobađanje jedinica kada im se prisne dugme za izbacivanje -Comment[sr@latin]=Automatsko oslobađanje jedinica kada im se prisne dugme za izbacivanje +Comment[sr]=Аутоматско ослобађање јединица када им се притисне дугме за избацивање +Comment[sr@ijekavian]=Аутоматско ослобађање јединица када им се притисне дугме за избацивање +Comment[sr@ijekavianlatin]=Automatsko oslobađanje jedinica kada im se pritisne dugme za izbacivanje +Comment[sr@latin]=Automatsko oslobađanje jedinica kada im se pritisne dugme za izbacivanje Comment[sv]=Frisläpper automatiskt enheter vid tryck på deras utmatningsknapp Comment[th]=เปิดถาดไดรฟ์ให้อัตโนมัติเมื่อมีการกดปุ่มเอาแผ่นสื่อออก Comment[tr]=Çıkarma düğmesine basıldığında sürücüleri otomatik olarak ayırır ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org